Hotfix 3

Reverts back to previous changes. Removes changes related to Carny Senpai's Enable Oversized Weapons. There are compatibility issues that need to be reviewed.
jecrell · Jul 30, 2021 · 90bfe24 · 90bfe24
1 parent d04c160
commit 90bfe24
Show file tree

Hide file tree

Showing 23 changed files with 18 additions and 10 deletions.
diff --git a/1.3/Assemblies/0JecsTools.dll b/1.3/Assemblies/0JecsTools.dll
diff --git a/1.3/Assemblies/AbilityUser.dll b/1.3/Assemblies/AbilityUser.dll
diff --git a/1.3/Assemblies/AbilityUserAI.dll b/1.3/Assemblies/AbilityUserAI.dll
diff --git a/1.3/Assemblies/CompActivatableEffect.dll b/1.3/Assemblies/CompActivatableEffect.dll
diff --git a/1.3/Assemblies/CompAnimated.dll b/1.3/Assemblies/CompAnimated.dll
diff --git a/1.3/Assemblies/CompBalloon.dll b/1.3/Assemblies/CompBalloon.dll
diff --git a/1.3/Assemblies/CompBigBox.dll b/1.3/Assemblies/CompBigBox.dll
diff --git a/1.3/Assemblies/CompDeflector.dll b/1.3/Assemblies/CompDeflector.dll
diff --git a/1.3/Assemblies/CompDelayedSpawner.dll b/1.3/Assemblies/CompDelayedSpawner.dll
diff --git a/1.3/Assemblies/CompExtraSounds.dll b/1.3/Assemblies/CompExtraSounds.dll
diff --git a/1.3/Assemblies/CompInstalledPart.dll b/1.3/Assemblies/CompInstalledPart.dll
diff --git a/1.3/Assemblies/CompLumbering.dll b/1.3/Assemblies/CompLumbering.dll
diff --git a/1.3/Assemblies/CompOverlays.dll b/1.3/Assemblies/CompOverlays.dll
diff --git a/1.3/Assemblies/CompOversizedWeapon.dll b/1.3/Assemblies/CompOversizedWeapon.dll
diff --git a/1.3/Assemblies/CompSlotLoadable.dll b/1.3/Assemblies/CompSlotLoadable.dll
diff --git a/1.3/Assemblies/CompToggleDef.dll b/1.3/Assemblies/CompToggleDef.dll
diff --git a/1.3/Assemblies/PawnShields.dll b/1.3/Assemblies/PawnShields.dll
diff --git a/1.3/Assemblies/ThinkNodes.dll b/1.3/Assemblies/ThinkNodes.dll
diff --git a/About/About.xml b/About/About.xml
@@ -18,7 +18,7 @@
       <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
     </li>
   </modDependencies>
-  <description>1.3.0.2 (07-29-2021)
+  <description>1.3.0.3 (07-30-2021)
 
 Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more!
 
@@ -75,6 +75,10 @@ Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gon
 ========================
 Changelog
 ========================
+1.3.0.3 (07-30-2021)
+========================
+Due to comptability issues, the patch for Enable Oversized Weapons will require additional work. Reverting back to the previous version.
+
 1.3.0.2 (07-29-2021)
 ========================
 Carny Senpai's Enable Oversized Weapons is now supported and JecsTools CompOversizedWeapon will yield for it.

diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,3 +1,7 @@
+1.3.0.3 (07-30-2021)
+========================
+Due to comptability issues, the patch for Enable Oversized Weapons will require additional work. Reverting back to the previous version.
+
 1.3.0.2 (07-29-2021)
 ========================
 Carny Senpai's Enable Oversized Weapons is now supported and JecsTools CompOversizedWeapon will yield for it.

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>JecsTools</identifier>
-  <version>1.3.0.2</version>
+  <version>1.3.0.3</version>
   <dependencies />
   <incompatibleWith />
   <manifestUri>https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Manifest.xml</manifestUri>

diff --git a/About/Version.txt b/About/Version.txt
@@ -1 +1 @@
-1.3.0.2
+1.3.0.3
diff --git a/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs b/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs
@@ -13,14 +13,14 @@ static HarmonyCompOversizedWeapon()
         {
             var harmony = new Harmony("jecstools.jecrell.comps.oversized");
             var type = typeof(HarmonyCompOversizedWeapon);
-            var CarnySenpaiEnableOversizedWeaponsModLoaded = ModsConfig.IsActive("CarnySenpai.EnableOversizedWeapons");
+            //var CarnySenpaiEnableOversizedWeaponsModLoaded = ModsConfig.IsActive("CarnySenpai.EnableOversizedWeapons");
 
-            if (CarnySenpaiEnableOversizedWeaponsModLoaded)
-            {
-                Log.Message("JecsTools:: Using Carny Senpai's Enable Oversized Weapons instead of CompOversizedWeapon");
-                return;
-            }
-            Log.Warning("JecsTools CompOversizedWeapon Loaded:: This component is no longer recommended for performance. Please see Carny Senpai's Enable Oversized Weapons mod. Once the Carny Senpai's mod is loaded, it will be used instead of CompOversizedWeapon");
+           // if (CarnySenpaiEnableOversizedWeaponsModLoaded)
+           // {
+            //    Log.Message("JecsTools:: Using Carny Senpai's Enable Oversized Weapons instead of CompOversizedWeapon");
+            //    return;
+            //}
+            //Log.Warning("JecsTools CompOversizedWeapon Loaded:: This component is no longer recommended for performance. Please see Carny Senpai's Enable Oversized Weapons mod. Once the Carny Senpai's mod is loaded, it will be used instead of CompOversizedWeapon");
 
             harmony.Patch(AccessTools.Method(typeof(PawnRenderer), nameof(PawnRenderer.DrawEquipmentAiming)),
                 prefix: new HarmonyMethod(type, nameof(DrawEquipmentAimingPreFix)));