(ded4a3e0a) v0.9.0.7

Barotrauma/BarotraumaShared/Source/Items/Components/Repairable.cs

@@ -9,12 +9,14 @@ namespace Barotrauma.Items.Components
 {
     partial class Repairable : ItemComponent, IServerSerializable, IClientSerializable
     {
-        public static float SkillIncreaseMultiplier = 0.4f;
+        public static float SkillIncreasePerRepair = 5.0f;
 
         private string header;
 
         private float deteriorationTimer;
 
+        bool wasBroken;
+
         public float LastActiveTime;
 
         [Serialize(0.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 100.0f, DecimalCount = 2, ToolTip = "How fast the condition of the item deteriorates per second.")]
@@ -173,16 +175,13 @@ namespace Barotrauma.Items.Components
             if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }
 
             float successFactor = requiredSkills.Count == 0 ? 1.0f : 0.0f;
-            foreach (Skill skill in requiredSkills)
+            
+            //item must have been below 50% condition for the player to get an achievement or XP for repairing it
+            if (item.Condition < ShowRepairUIThreshold)
             {
-                float characterSkillLevel = CurrentFixer.GetSkillLevel(skill.Identifier);
-                if (characterSkillLevel >= skill.Level) successFactor += 1.0f / requiredSkills.Count;
-                CurrentFixer.Info.IncreaseSkillLevel(skill.Identifier,
-                    SkillIncreaseMultiplier * deltaTime / Math.Max(characterSkillLevel, 1.0f),
-                     CurrentFixer.WorldPosition + Vector2.UnitY * 100.0f);
+                wasBroken = true;
             }
 
-            bool wasBroken = !item.IsFullCondition;
             float fixDuration = MathHelper.Lerp(FixDurationLowSkill, FixDurationHighSkill, successFactor);
             if (fixDuration <= 0.0f)
             {
@@ -195,8 +194,16 @@ namespace Barotrauma.Items.Components
 
             if (wasBroken && item.IsFullCondition)
             {
+                foreach (Skill skill in requiredSkills)
+                {
+                    float characterSkillLevel = CurrentFixer.GetSkillLevel(skill.Identifier);
+                    CurrentFixer.Info.IncreaseSkillLevel(skill.Identifier,
+                        SkillIncreasePerRepair / Math.Max(characterSkillLevel, 1.0f),
+                        CurrentFixer.WorldPosition + Vector2.UnitY * 100.0f);
+                }
                 SteamAchievementManager.OnItemRepaired(item, currentFixer);
                 deteriorationTimer = Rand.Range(MinDeteriorationDelay, MaxDeteriorationDelay);
+                wasBroken = false;
 #if SERVER
                 item.CreateServerEvent(this);
 #endif