git commit from PowerShell in C#JecsTools Added a try and catch to th…

…e ProjectileExtension Harmony patch for CanHitCellFromCellIgnoringRange. This should allow for proper ability casting again.
jecrell · Oct 19, 2018 · b44537e · b44537e
1 parent d98435d
commit b44537e
Show file tree

Hide file tree

Showing 23 changed files with 66 additions and 50 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -4,7 +4,7 @@
   <author>jecrell</author>
   <url>https://discord.gg/AaVFA7V</url>
   <targetVersion>1.0.2059</targetVersion>
-  <description>1.1.0.8 (10-18-2018)
+  <description>1.1.0.9 (10-19-2018)
 
 Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more!
 
@@ -63,6 +63,10 @@ Lumberjack, Shibby Says, TheJagermeister, Cory Bonifay, Kiya Nicoll, Matt Harris
 ========================
 Changelog
 ========================
+1.1.0.9 (10-19-2018)
+========================
+Added a try and catch to the ProjectileExtension Harmony patch for CanHitCellFromCellIgnoringRange. This should allow for proper ability casting again.
+
 1.1.0.8 (10-18-2018)
 ========================
 Changed very few issues to allow for the update for RimWorld 1.0.

diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,3 +1,7 @@
+1.1.0.9 (10-19-2018)
+========================
+Added a try and catch to the ProjectileExtension Harmony patch for CanHitCellFromCellIgnoringRange. This should allow for proper ability casting again.
+
 1.1.0.8 (10-18-2018)
 ========================
 Changed very few issues to allow for the update for RimWorld 1.0.

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
-    <identifier>JecsTools</identifier>
-    <version>1.1.0.7</version>
-    <dependencies />
-    <incompatibleWith />
-    <loadBefore>
-        <li>DoorsExpanded</li>
-        <li>CoC-Factions</li>
-        <li>CoC-Cults</li>
-        <li>CoC-ElderThings</li>
-        <li>HPLovecraftStoryteller</li>
-        <li>IA-ObjectsAndFurniture</li>
-        <li>IA-SteamCorp</li>
-        <li>LotR-Dwarves</li>
-        <li>LotR-Elves</li>
-        <li>LotR-Hobbits</li>
-        <li>LotR-MenAndBeasts</li>
-        <li>LotR-OrcsAndGoblins</li>
-        <li>LotR-TheThirdAge</li>
-        <li>RoM-Arachnophobia</li>
-        <li>RoM-Vampires</li>
-        <li>RoM-Werewolves</li>
-        <li>RimQuest</li>
-        <li>RimWriter</li>
-        <li>SW-Factions</li>
-        <li>SW-Lightsabers</li>
-        <li>SW-TheForce</li>
-    </loadBefore>
-    <loadAfter>
-        <li>HugsLib</li>
-    </loadAfter>
-    <manifestUri>https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Manifest.xml</manifestUri>
-    <downloadUri>https://github.com/jecrell/JecsTools/releases</downloadUri>
+  <identifier>JecsTools</identifier>
+  <version>1.1.0.9</version>
+  <dependencies />
+  <incompatibleWith />
+  <loadBefore>
+    <li>DoorsExpanded</li>
+    <li>CoC-Factions</li>
+    <li>CoC-Cults</li>
+    <li>CoC-ElderThings</li>
+    <li>HPLovecraftStoryteller</li>
+    <li>IA-ObjectsAndFurniture</li>
+    <li>IA-SteamCorp</li>
+    <li>LotR-Dwarves</li>
+    <li>LotR-Elves</li>
+    <li>LotR-Hobbits</li>
+    <li>LotR-MenAndBeasts</li>
+    <li>LotR-OrcsAndGoblins</li>
+    <li>LotR-TheThirdAge</li>
+    <li>RoM-Arachnophobia</li>
+    <li>RoM-Vampires</li>
+    <li>RoM-Werewolves</li>
+    <li>RimQuest</li>
+    <li>RimWriter</li>
+    <li>SW-Factions</li>
+    <li>SW-Lightsabers</li>
+    <li>SW-TheForce</li>
+  </loadBefore>
+  <loadAfter>
+    <li>HugsLib</li>
+  </loadAfter>
+  <manifestUri>https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Manifest.xml</manifestUri>
+  <downloadUri>https://github.com/jecrell/JecsTools/releases</downloadUri>
 </Manifest>
diff --git a/About/Version.txt b/About/Version.txt
@@ -1 +1 @@
-1.1.0.8
+1.1.0.9
diff --git a/Assemblies/0JecsTools.dll b/Assemblies/0JecsTools.dll
diff --git a/Assemblies/AbilityUser.dll b/Assemblies/AbilityUser.dll
diff --git a/Assemblies/AbilityUserAI.dll b/Assemblies/AbilityUserAI.dll
diff --git a/Assemblies/CompActivatableEffect.dll b/Assemblies/CompActivatableEffect.dll
diff --git a/Assemblies/CompAnimated.dll b/Assemblies/CompAnimated.dll
diff --git a/Assemblies/CompBalloon.dll b/Assemblies/CompBalloon.dll
diff --git a/Assemblies/CompDelayedSpawner.dll b/Assemblies/CompDelayedSpawner.dll
diff --git a/Assemblies/CompExtraSounds.dll b/Assemblies/CompExtraSounds.dll
diff --git a/Assemblies/CompInstalledPart.dll b/Assemblies/CompInstalledPart.dll
diff --git a/Assemblies/CompLumbering.dll b/Assemblies/CompLumbering.dll
diff --git a/Assemblies/CompOverlays.dll b/Assemblies/CompOverlays.dll
diff --git a/Assemblies/CompOversizedWeapon.dll b/Assemblies/CompOversizedWeapon.dll
diff --git a/Assemblies/CompSlotLoadable.dll b/Assemblies/CompSlotLoadable.dll
diff --git a/Assemblies/CompToggleDef.dll b/Assemblies/CompToggleDef.dll
diff --git a/Assemblies/PawnShields.dll b/Assemblies/PawnShields.dll
diff --git a/Source/.vs/JecsTools/v15/.suo b/Source/.vs/JecsTools/v15/.suo
diff --git a/Source/.vs/JecsTools/v15/Server/sqlite3/storage.ide-shm b/Source/.vs/JecsTools/v15/Server/sqlite3/storage.ide-shm
diff --git a/Source/AllModdingComponents/JecsTools/HarmonyPatches.cs b/Source/AllModdingComponents/JecsTools/HarmonyPatches.cs
@@ -100,15 +100,23 @@ static HarmonyPatches()
         //Allows a bullet to pass through walls when fired.
         public static bool CanHitCellFromCellIgnoringRange_Prefix(Verb __instance, IntVec3 sourceSq, IntVec3 targetLoc, bool includeCorners, ref bool __result)
         {
-            if (__instance?.EquipmentCompSource?.PrimaryVerb?.verbProps?.defaultProjectile is ThingDef proj &&
-                proj?.HasModExtension<ProjectileExtension>() == true &&
-                proj.GetModExtension<ProjectileExtension>() is ProjectileExtension ext)
+            try
             {
-                if (ext.passesWalls)
-                    __result = true;
-                return false;
+
+                if (__instance?.EquipmentCompSource?.PrimaryVerb?.verbProps?.defaultProjectile is ThingDef proj &&
+                    proj?.HasModExtension<ProjectileExtension>() == true &&
+                    proj?.GetModExtension<ProjectileExtension>() is ProjectileExtension ext)
+                {
+                    if (ext.passesWalls)
+                        __result = true;
+                    return false;
+                }
+
             }
+            catch (Exception e)
+            {
 
+            }
             return true;
         }
 

diff --git a/updateinfo b/updateinfo
@@ -3,14 +3,14 @@
 ==============================
 
 JecsTools Update
+v1.1.0.8 (10-18-2018)
 ====================
-Version: 1.1.0.7
-Updated: 10-02-2018
-Description: The wall placeworker now also allows other types of walls.
-====================
+
+Changed very few issues to allow for the update for RimWorld 1.0.
+--------------------
 
 Download now on...
-- Patreon: https://www.patreon.com/posts/jecstools-for-0-21059900
+- Patreon: https://www.patreon.com/posts/22139730
 - GitHub: https://github.com/jecrell/JecsTools
 - Steam: https://steamcommunity.com/sharedfiles/filedetails/?id=932008009
 Discuss the mod on...
@@ -25,12 +25,12 @@ 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.7
-Updated: 10-02-2018
-Description: [color=orange]The wall placeworker now also allows other types of walls.[/color]
+Version: 1.1.0.8
+Updated: 10-18-2018
+Description: [color=orange]Changed very few issues to allow for the update for RimWorld 1.0.[/color]
 [hr]
 [b]Download now on...[/b]
-[url=https://www.patreon.com/posts/jecstools-for-0-21059900]Patreon[/url]
+[url=https://www.patreon.com/posts/22139730]Patreon[/url]
 [url=https://github.com/jecrell/JecsTools]GitHub[/url]
 [url=https://steamcommunity.com/sharedfiles/filedetails/?id=932008009]Steam[/url]
 [b]Discuss the mod on...[/b]