fix

Killface1980 · Jan 11, 2017 · 4ca4d39 · 4ca4d39
1 parent ee2e15e
commit 4ca4d39
Show file tree

Hide file tree

Showing 13 changed files with 140 additions and 146 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-	<name>Outfitter 0.16.0.1</name>
+	<name>Outfitter 0.16.0.2</name>
 	<author>Killface</author>
 	<url></url>
 	<targetVersion>0.16.1386</targetVersion>

diff --git a/Assemblies/Outfitter.dll b/Assemblies/Outfitter.dll
diff --git a/Source/.vs/Outfitter/v14/.suo b/Source/.vs/Outfitter/v14/.suo
diff --git a/Source/Outfitter/ApparelStatCache.cs b/Source/Outfitter/ApparelStatCache.cs
@@ -209,7 +209,7 @@ public float ApparelScoreRaw(Apparel apparel, Pawn pawn)
                     equippedOffsets.Add(equippedStatOffset.stat);
                 }
             }
-
+            
             HashSet<StatDef> statBases = new HashSet<StatDef>();
             if (apparel.def.statBases != null)
             {
@@ -274,6 +274,8 @@ public float ApparelScoreRaw(Apparel apparel, Pawn pawn)
 
             }
 
+            score += apparel.GetSpecialApparelScoreOffset();
+
             score += ApparelScoreRaw_Temperature(apparel, pawn);
 
             score += 0.05f * ApparelScoreRaw_ProtectionBaseStat(apparel);
@@ -282,10 +284,16 @@ public float ApparelScoreRaw(Apparel apparel, Pawn pawn)
             if (apparel.def.useHitPoints)
             {
                 float x = apparel.HitPoints / (float)apparel.MaxHitPoints;
-                score = score * 0.15f + score * 0.85f * ApparelStatsHelper.HitPointsPercentScoreFactorCurve.Evaluate(x);
+                score = score * 0.25f + score * 0.75f * ApparelStatsHelper.HitPointsPercentScoreFactorCurve.Evaluate(x);
+            }
+            if (apparel.WornByCorpse)
+            {
+                score -= 0.5f;
+                if (score > 0f)
+                {
+                    score *= 0.1f;
+                }
             }
-
-
             return score;
         }
 
@@ -353,7 +361,7 @@ public float ApparelScoreRaw_Temperature(Apparel apparel, Pawn pawn)
             DoApparelScoreRaw_PawnStatsHandlers(_pawn, apparel, StatDefOf.ComfyTemperatureMax, ref insulationHeat);
 
             // if this gear is currently worn, we need to make sure the contribution to the pawn's comfy temps is removed so the gear is properly scored
-            //if (pawn.apparel.WornApparel.Contains(apparel))
+            if (pawn.apparel.WornApparel.Contains(apparel))
             {
                 List<Apparel> wornApparel = pawn.apparel.WornApparel;
 
@@ -376,8 +384,8 @@ public float ApparelScoreRaw_Temperature(Apparel apparel, Pawn pawn)
                     }
                 }
 
-                //minComfyTemperature -= insulationCold;
-                //maxComfyTemperature -= insulationHeat;
+                minComfyTemperature -= insulationCold;
+                maxComfyTemperature -= insulationHeat;
             }
 
             // now for the interesting bit.
@@ -530,11 +538,11 @@ public void UpdateTemperatureIfNecessary(bool force = false, bool forceweight =
                     pawnSave.TargetTemperatures = new FloatRange(Math.Max(temp - 7.5f, ApparelStatsHelper.MinMaxTemperatureRange.min),
                                                           Math.Min(temp + 7.5f, ApparelStatsHelper.MinMaxTemperatureRange.max));
 
-                    if (pawnSave.TargetTemperatures.min >= 10)
-                        pawnSave.TargetTemperatures.min = 10;
+                    if (pawnSave.TargetTemperatures.min >= 12)
+                        pawnSave.TargetTemperatures.min = 12;
 
-                    if (pawnSave.TargetTemperatures.max <= 20)
-                        pawnSave.TargetTemperatures.max = 20;
+                    if (pawnSave.TargetTemperatures.max <= 32)
+                        pawnSave.TargetTemperatures.max = 32;
 
                     _lastTempUpdate = Find.TickManager.TicksGame;
                 }
@@ -784,6 +792,9 @@ private bool CalculateApparelScoreGain(Apparel apparel, float score, out float c
                 }
             }
 
+            candidateScore += apparel.GetSpecialApparelScoreOffset();
+
+
             // increase score if this piece can be worn without replacing existing gear.
             if (!willReplace)
             {