Fixing items if sufficient skills+tools, choosing server port

2015-07-19 23:29:47 +03:00
parent 2dd0a60bc4
commit fb0e8ea54c
19 changed files with 357 additions and 124 deletions
@@ -356,24 +356,39 @@ namespace Subsurface
        }

        public bool HasRequiredSkills(Character character)
+        {
+            Skill temp;
+            return HasRequiredSkills(character, out temp);
+        }
+
+        public bool HasRequiredSkills(Character character, out Skill insufficientSkill)
        {
            foreach (Skill skill in requiredSkills)
            {
                int characterLevel = character.GetSkillLevel(skill.Name);
-                if (characterLevel < skill.Level) return false;
+                if (characterLevel < skill.Level)
+                {
+                    insufficientSkill = skill;
+                    return false;
+                }
            }
-
+            insufficientSkill = null;
            return true;
        }

-        protected bool UseFailed(Character character)
+        protected bool DoesUseFail(Character character)
        {
            foreach (Skill skill in requiredSkills)
            {
                int characterLevel = character.GetSkillLevel(skill.Name);
                if (characterLevel > skill.Level) continue;

-                if (Rand.Int(characterLevel) - skill.Level < 0) return true;                
+                if (Rand.Int(characterLevel) - skill.Level < 0)
+                {
+                    item.ApplyStatusEffects(ActionType.OnFailure, 1.0f, character);
+                    //Item.ApplyStatusEffects();
+                    return true;
+                }
            }

            return false;