diff --git a/1.3/Assemblies/0JecsTools.dll b/1.3/Assemblies/0JecsTools.dll index e850cf9e..1d1e9ad6 100644 Binary files a/1.3/Assemblies/0JecsTools.dll and b/1.3/Assemblies/0JecsTools.dll differ diff --git a/1.3/Assemblies/AbilityUser.dll b/1.3/Assemblies/AbilityUser.dll index fb35f06a..ae8a9723 100644 Binary files a/1.3/Assemblies/AbilityUser.dll and b/1.3/Assemblies/AbilityUser.dll differ diff --git a/1.3/Assemblies/AbilityUserAI.dll b/1.3/Assemblies/AbilityUserAI.dll index d57223b8..256cd3d0 100644 Binary files a/1.3/Assemblies/AbilityUserAI.dll and b/1.3/Assemblies/AbilityUserAI.dll differ diff --git a/1.3/Assemblies/CompActivatableEffect.dll b/1.3/Assemblies/CompActivatableEffect.dll index 44f2563e..54173842 100644 Binary files a/1.3/Assemblies/CompActivatableEffect.dll and b/1.3/Assemblies/CompActivatableEffect.dll differ diff --git a/1.3/Assemblies/CompAnimated.dll b/1.3/Assemblies/CompAnimated.dll index 5d4e20b6..7591c0fc 100644 Binary files a/1.3/Assemblies/CompAnimated.dll and b/1.3/Assemblies/CompAnimated.dll differ diff --git a/1.3/Assemblies/CompBalloon.dll b/1.3/Assemblies/CompBalloon.dll index 43e15a89..807b2514 100644 Binary files a/1.3/Assemblies/CompBalloon.dll and b/1.3/Assemblies/CompBalloon.dll differ diff --git a/1.3/Assemblies/CompBigBox.dll b/1.3/Assemblies/CompBigBox.dll index 621f945d..8b4202c6 100644 Binary files a/1.3/Assemblies/CompBigBox.dll and b/1.3/Assemblies/CompBigBox.dll differ diff --git a/1.3/Assemblies/CompDeflector.dll b/1.3/Assemblies/CompDeflector.dll index c446f27c..e40d2a23 100644 Binary files a/1.3/Assemblies/CompDeflector.dll and b/1.3/Assemblies/CompDeflector.dll differ diff --git a/1.3/Assemblies/CompDelayedSpawner.dll b/1.3/Assemblies/CompDelayedSpawner.dll index b9750dd7..5dcd00aa 100644 Binary files a/1.3/Assemblies/CompDelayedSpawner.dll and b/1.3/Assemblies/CompDelayedSpawner.dll differ diff --git a/1.3/Assemblies/CompExtraSounds.dll b/1.3/Assemblies/CompExtraSounds.dll index c35bfd99..537abfbb 100644 Binary files a/1.3/Assemblies/CompExtraSounds.dll and b/1.3/Assemblies/CompExtraSounds.dll differ diff --git a/1.3/Assemblies/CompInstalledPart.dll b/1.3/Assemblies/CompInstalledPart.dll index 847d1b5d..4683b0ce 100644 Binary files a/1.3/Assemblies/CompInstalledPart.dll and b/1.3/Assemblies/CompInstalledPart.dll differ diff --git a/1.3/Assemblies/CompLumbering.dll b/1.3/Assemblies/CompLumbering.dll index 0153434e..53b96929 100644 Binary files a/1.3/Assemblies/CompLumbering.dll and b/1.3/Assemblies/CompLumbering.dll differ diff --git a/1.3/Assemblies/CompOverlays.dll b/1.3/Assemblies/CompOverlays.dll index 9e36a1da..6df32bef 100644 Binary files a/1.3/Assemblies/CompOverlays.dll and b/1.3/Assemblies/CompOverlays.dll differ diff --git a/1.3/Assemblies/CompOversizedWeapon.dll b/1.3/Assemblies/CompOversizedWeapon.dll index 20d922b6..26406693 100644 Binary files a/1.3/Assemblies/CompOversizedWeapon.dll and b/1.3/Assemblies/CompOversizedWeapon.dll differ diff --git a/1.3/Assemblies/CompSlotLoadable.dll b/1.3/Assemblies/CompSlotLoadable.dll index 1f950d04..52bb0dc8 100644 Binary files a/1.3/Assemblies/CompSlotLoadable.dll and b/1.3/Assemblies/CompSlotLoadable.dll differ diff --git a/1.3/Assemblies/CompToggleDef.dll b/1.3/Assemblies/CompToggleDef.dll index 5393a718..f457f552 100644 Binary files a/1.3/Assemblies/CompToggleDef.dll and b/1.3/Assemblies/CompToggleDef.dll differ diff --git a/1.3/Assemblies/PawnShields.dll b/1.3/Assemblies/PawnShields.dll index 352a6be8..5fe855f8 100644 Binary files a/1.3/Assemblies/PawnShields.dll and b/1.3/Assemblies/PawnShields.dll differ diff --git a/1.3/Assemblies/ThinkNodes.dll b/1.3/Assemblies/ThinkNodes.dll index 3643b3e4..f7e15d17 100644 Binary files a/1.3/Assemblies/ThinkNodes.dll and b/1.3/Assemblies/ThinkNodes.dll differ diff --git a/About/About.xml b/About/About.xml index 8966fcf5..1548d1fc 100644 --- a/About/About.xml +++ b/About/About.xml @@ -18,7 +18,7 @@ https://github.com/pardeike/HarmonyRimWorld/releases/latest - 1.3.0.1 (07-24-2021) + 1.3.0.2 (07-29-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.2 (07-29-2021) +======================== +Carny Senpai's Enable Oversized Weapons is now supported and JecsTools CompOversizedWeapon will yield for it. + 1.3.0.1 (07-24-2021) ======================== Fix regression in RW 1.1 & 1.2 by using separate defs for 1.1+1.2 and 1.3 @@ -83,7 +87,6 @@ Fix regression in RW 1.1 & 1.2 by using separate defs for 1.1+1.2 and 1.3 ======================== lbmaian's 1.3 and 1.2 updates have been merged and are now available on the main JecsTools branch. Stay tuned for updates to out of date mods as we move into 1.3. - 1.2.0.0 (07-24-2021) ======================== Note: Starting from this version, changes only apply to RimWorld 1.3+. diff --git a/About/Changelog.txt b/About/Changelog.txt index c7e2b716..c43da8cd 100644 --- a/About/Changelog.txt +++ b/About/Changelog.txt @@ -1,3 +1,7 @@ +1.3.0.2 (07-29-2021) +======================== +Carny Senpai's Enable Oversized Weapons is now supported and JecsTools CompOversizedWeapon will yield for it. + 1.3.0.1 (07-24-2021) ======================== Fix regression in RW 1.1 & 1.2 by using separate defs for 1.1+1.2 and 1.3 diff --git a/About/Manifest.xml b/About/Manifest.xml index cd08c5d7..711bfc29 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@  JecsTools - 1.3.0.1 + 1.3.0.2 https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Manifest.xml diff --git a/About/Version.txt b/About/Version.txt index d0399b85..0b9546c1 100644 --- a/About/Version.txt +++ b/About/Version.txt @@ -1 +1 @@ -1.3.0.1 +1.3.0.2 diff --git a/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs b/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs index 4d7434d1..8ed2ca9f 100644 --- a/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs +++ b/Source/AllModdingComponents/CompOversizedWeapon/HarmonyCompOversizedWeapon.cs @@ -6,12 +6,21 @@ namespace CompOversizedWeapon { [StaticConstructorOnStartup] + internal static class HarmonyCompOversizedWeapon { static HarmonyCompOversizedWeapon() { var harmony = new Harmony("jecstools.jecrell.comps.oversized"); var type = typeof(HarmonyCompOversizedWeapon); + 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"); harmony.Patch(AccessTools.Method(typeof(PawnRenderer), nameof(PawnRenderer.DrawEquipmentAiming)), prefix: new HarmonyMethod(type, nameof(DrawEquipmentAimingPreFix))); diff --git a/Source/AllModdingComponents/Directory.Build.props b/Source/AllModdingComponents/Directory.Build.props index 7a15382d..1954dc7c 100644 --- a/Source/AllModdingComponents/Directory.Build.props +++ b/Source/AllModdingComponents/Directory.Build.props @@ -8,7 +8,7 @@ true 9.0 false - 1.2.0.1 + 1.3.0.2