git commit from PowerShell in C#JecsTools A (potential) fix for an is…

…sue shared between Hospitality and JecsTools.
jecrell · Sep 17, 2018 · ad9a865 · ad9a865
1 parent 82c15c5
commit ad9a865
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 33 deletions.
diff --git a/About/Version.txt b/About/Version.txt
@@ -1 +1 @@
-1.1.0.2
+1.1.0.4
diff --git a/Assemblies/0JecsTools.dll b/Assemblies/0JecsTools.dll
diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
diff --git a/Assemblies/CompDeflector.dll b/Assemblies/CompDeflector.dll
diff --git a/Source/AllModdingComponents/JecsTools/HarmonyPatches.cs b/Source/AllModdingComponents/JecsTools/HarmonyPatches.cs
@@ -28,7 +28,7 @@ static HarmonyPatches()
             var harmony = HarmonyInstance.Create("rimworld.jecrell.jecstools.main");
             //Allow fortitude to soak damage
             var type = typeof(HarmonyPatches);
-            
+
             //Debug Line
             //------------
 //            harmony.Patch(
@@ -94,9 +94,11 @@ public static void GenerateStartingApparelFor_PostFix(Pawn pawn, PawnGenerationR
                     {
                         pawn.apparel.Wear(apparel, false);
                     }
+
                     destroyables.Add(swap);
                 }
             }
+
             if (destroyables == null || destroyables?.Count <= 0) return;
             while (destroyables?.Count > 0)
             {
@@ -177,6 +179,7 @@ public static bool Notify_MemberDied(Faction __instance, Pawn member, DamageInfo
             {
                 return false;
             }
+
             return true;
         }
 
@@ -189,38 +192,49 @@ public static bool Notify_MemberDied(Faction __instance, Pawn member, DamageInfo
         /// <param name="__result"></param>
         public static void Post_CanWearTogether(ThingDef A, ThingDef B, BodyDef body, ref bool __result)
         {
-            var aHasExt = A.HasModExtension<ApparelExtension>();
-            var bHasExt = B.HasModExtension<ApparelExtension>();
-            if (aHasExt && bHasExt)
+            try
             {
-                var aExt = A.GetModExtension<ApparelExtension>();
-                var bExt = B.GetModExtension<ApparelExtension>();
-                var check = new Dictionary<string, int>();
-                for (int i = 0; i < aExt.coverage.Count; i++)
+                if (A == null || B == null || body == null || __result == true) return;
+                var aHasExt = A.HasModExtension<ApparelExtension>();
+                var bHasExt = B.HasModExtension<ApparelExtension>();
+                if (aHasExt && bHasExt)
                 {
-                    if (!check.ContainsKey(aExt.coverage[i]))
-                        check.Add(aExt.coverage[i].ToLowerInvariant(), 1);
-                    else
-                    {
-                        Log.Warning("JecsTools :: ApparelExtension :: Warning:: " + A.label +
-                                    " has multiple of the same tags.");
-                        return;
-                    }
+                    var aExt = A.GetModExtension<ApparelExtension>();
+                    var bExt = B.GetModExtension<ApparelExtension>();
+                    var check = new Dictionary<string, int>();
+                    if (aExt.coverage?.Count > 0)
+                        for (int i = 0; i < aExt.coverage.Count; i++)
+                        {
+                            if (!check.ContainsKey(aExt.coverage[i]))
+                                check.Add(aExt.coverage[i].ToLowerInvariant(), 1);
+                            else
+                            {
+                                Log.Warning("JecsTools :: ApparelExtension :: Warning:: " + A.label +
+                                            " has multiple of the same tags.");
+                                return;
+                            }
+                        }
+
+                    if (bExt.coverage?.Count > 0)
+                        for (int j = 0; j < bExt.coverage.Count; j++)
+                        {
+                            if (!check.ContainsKey(bExt.coverage[j]))
+                                check.Add(bExt.coverage[j].ToLowerInvariant(), 1);
+                            else
+                            {
+                                __result = false;
+                                break;
+                            }
+                        }
                 }
-                for (int j = 0; j < bExt.coverage.Count; j++)
+                else if ((aHasExt && !bHasExt) || (!aHasExt && bHasExt))
                 {
-                    if (!check.ContainsKey(bExt.coverage[j]))
-                        check.Add(bExt.coverage[j].ToLowerInvariant(), 1);
-                    else
-                    {
-                        __result = false;
-                        break;
-                    }
+                    __result = true;
                 }
             }
-            else if ((aHasExt && !bHasExt) || (!aHasExt && bHasExt))
+            catch (Exception e)
             {
-                __result = true;
+                Log.Message(e.ToString());
             }
         }
 
@@ -249,6 +263,7 @@ public static void Post_GetPostArmorDamage(Pawn pawn, float amount, BodyPartReco
                 {
                     DamageSoakedMote(pawn, tempDamageAbsorbed.Value);
                 }
+
                 tempDamageAbsorbed = null;
             }
         }
@@ -295,6 +310,7 @@ public static bool PreApplyDamage_PrePatch(Pawn_HealthTracker __instance, ref Da
                         {
                         }
                     }
+
                     if (dinfo.Weapon is ThingDef weaponDef && !weaponDef.IsRangedWeapon)
                         if (dinfo.Instigator is Pawn instigator)
                         {
@@ -316,6 +332,7 @@ public static bool PreApplyDamage_PrePatch(Pawn_HealthTracker __instance, ref Da
                         }
                 }
             }
+
             tempDamageAmount = (int) dinfo.Amount;
             absorbed = false;
             //Log.Message("Current Damage :" + dinfo.Amount);
@@ -352,6 +369,7 @@ private static void PreApplyDamage_ApplyKnockback(Pawn instigator, Pawn pawn)
                         explosion.damageFalloff = false; // dealMoreDamageAtCenter = false;
                         explosion.StartExplosion(null);
                     }
+
                     if (pawn != instigator && !pawn.Dead && !pawn.Downed && pawn.Spawned)
                     {
                         if (knocker.Props.stunChance > -1 && knocker.Props.stunChance >= Rand.Value)
@@ -379,10 +397,13 @@ private static bool PreApplyDamage_ApplyExtraDamages(out bool absorbed, Pawn ins
                         StopPreApplyDamageCheck = false;
                         return true;
                     }
+
                     pawn.TakeDamage(new DamageInfo(dmg.def, dmg.amount, dmg.armorPenetration, -1, instigator));
                 }
+
                 StopPreApplyDamageCheck = false;
             }
+
             absorbed = false;
             return false;
         }
@@ -459,6 +480,7 @@ private static bool PreApplyDamage_ApplyDamageSoakers(ref DamageInfo dinfo, out
                     }
                 }
             }
+
             absorbed = false;
             return false;
         }
@@ -497,6 +519,7 @@ public static Vector3 PushResult(Thing Caster, Thing thingToPush, int pushDist,
                     }
                 }
             }
+
             collision = collisionResult;
             return result;
         }

diff --git a/updateinfo b/updateinfo
@@ -4,9 +4,9 @@
 
 JecsTools Update
 ====================
-Version: 1.1.0.2
-Updated: 09-16-2018
-Description: Fixed the second error caused by deflection systems (from Xen)
+Version: 1.1.0.3
+Updated: 09-17-2018
+Description: Neglected to include latest compiled fix. 
 ====================
 
 Download now on...
@@ -25,9 +25,9 @@ Discuss the mod on...
 [img width=260]https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Preview.png[/img]
 [hr]
 [b]JecsTools
-Version: 1.1.0.2
-Updated: 09-16-2018
-Description: [color=orange]Fixed the second error caused by deflection systems (from Xen)[/color]
+Version: 1.1.0.3
+Updated: 09-17-2018
+Description: [color=orange]Neglected to include latest compiled fix. [/color]
 [hr]
 [b]Download now on...[/b]
 [url=https://www.patreon.com/posts/jecstools-for-0-21059900]Patreon[/url]