Merge pull request #19 from lbmaian/master

Workaround for mod lists that contain other mods with an outdated copy of CompOversizedWeapon that's loaded before ours
jecrell · Jul 31, 2021 · 61f737c · 61f737c
2 parents 90bfe24 + 2cc7087
commit 61f737c
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 8 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/CompActivatableEffect.dll b/1.3/Assemblies/CompActivatableEffect.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/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/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/About/About.xml b/About/About.xml
@@ -69,7 +69,7 @@ Improvements by lbmaian
 
 Thank you to my Patrons for supporting me in my efforts. Without you, none of this would be possible.
 
-These are the most excellent rim dwellers who support me: 
+These are the most excellent rim dwellers who support me:
 Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gonschorek, Genaeve , RainerWingel , Lea Stannard, David Silberstein, 수현 남, Matt Harris, Kiya Nicoll, Paul Fenwick, Matthew Isom, Elodie , Михаил Юрченко, Charlie Garnham, Populous25 , Landon Cash, Marcus Sireanu, Maaxar , logan sheppard-organ, TinyATuin, Don Homer, Sharp Spook, roxxploxx , Dan Jones, Kaz, Justin Andres, Alex Mederer, Justin , iknowdude00, E_T , Alexander , Ken Birdwell, Michael Cailler, Jigsawjohn , Daniel Schott, Penelope Charli Whitman, Jerome Gonschorek, Genaeve , RainerWingel , Lea Stannard, David Silberstein, 수현 남, Matt Harris, Kiya Nicoll, Paul Fenwick, Matthew Isom, Elodie , Михаил Юрченко, Charlie Garnham, Populous25 , Landon Cash, Marcus Sireanu, Maaxar , logan sheppard-organ, TinyATuin, Don Homer, Sharp Spook, roxxploxx , Dan Jones, Kaz, Justin Andres, Alex Mederer, Justin , iknowdude00, E_T , Alexander , Ken Birdwell
 
 ========================
@@ -131,6 +131,7 @@ New features and fixes:
   - knockDistance now accepts floating points
   - add knockDistanceAbsorbedPercentCurve and knockDistanceMassCurve that controls how damage soak and mass affect knock distance
   - improve push angle algorithm so that it's no longer always a diagonal
+  - prevent multiple knockbacks occurring due to multiple damage infos (e.g. extra damage) for same instigator+target
   - FlyingObject: configurable props (ProjectileProperties) and accuracyRadius
   - FlyingObject_Equipable allows equipping apparel along (not just weapons)
 - PawnShields: support generating biocoded shields when generating pawns

diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -54,6 +54,7 @@ New features and fixes:
   - knockDistance now accepts floating points
   - add knockDistanceAbsorbedPercentCurve and knockDistanceMassCurve that controls how damage soak and mass affect knock distance
   - improve push angle algorithm so that it's no longer always a diagonal
+  - prevent multiple knockbacks occurring due to multiple damage infos (e.g. extra damage) for same instigator+target
   - FlyingObject: configurable props (ProjectileProperties) and accuracyRadius
   - FlyingObject_Equipable allows equipping apparel along (not just weapons)
 - PawnShields: support generating biocoded shields when generating pawns

diff --git a/Source/AllModdingComponents/CompAbilityUser/FlyingObject_Equipable.cs b/Source/AllModdingComponents/CompAbilityUser/FlyingObject_Equipable.cs
@@ -11,7 +11,7 @@ protected override void Impact(Thing hitThing)
             if (flyingThing != null)
             {
                 GenSpawn.Spawn(flyingThing, Position, Map);
-                if (launcher is Pawn equipper && equipper.equipment != null && flyingThing is ThingWithComps flyingThingWithComps)
+                if (launcher is Pawn {equipment: not null} equipper && flyingThing is ThingWithComps flyingThingWithComps)
                     Equip(equipper, flyingThingWithComps);
             }
             Destroy();
@@ -21,7 +21,7 @@ public void Equip(Pawn equipper, ThingWithComps thingWithComps)
         {
             if (thingWithComps.def.IsApparel)
             {
-                Apparel apparel = (Apparel)thingWithComps;
+                var apparel = (Apparel)thingWithComps;
                 equipper.apparel.Wear(apparel);
                 equipper.outfits?.forcedHandler.SetForced(apparel, true);
             }

diff --git a/Source/AllModdingComponents/CompActivatableEffect/HarmonyCompActivatableEffect.cs b/Source/AllModdingComponents/CompActivatableEffect/HarmonyCompActivatableEffect.cs
@@ -123,7 +123,7 @@ public static void DrawEquipmentAimingPostFix(Pawn ___pawn, Thing eq, Vector3 dr
             var weaponComp = compActivatableEffect.GetOversizedWeapon;
             if (weaponComp != null)
             {
-                offset = weaponComp.Props.OffsetFromRotation(___pawn.Rotation);
+                offset = OffsetFromRotation(weaponComp.Props, ___pawn.Rotation);
             }
 
             if (compActivatableEffect.CompDeflectorIsAnimatingNow)
@@ -147,6 +147,20 @@ public static void DrawEquipmentAimingPostFix(Pawn ___pawn, Thing eq, Vector3 dr
             Graphics.DrawMesh(flip ? MeshPool.plane10Flip : MeshPool.plane10, matrix, matSingle, 0);
         }
 
+        // Workaround for mod lists that contain other mods with an outdated copy of CompOversizedWeapon that's loaded before ours:
+        // avoid calling new code that's in our version.
+        private static Vector3 OffsetFromRotation(CompOversizedWeapon.CompProperties_OversizedWeapon weaponComp, Rot4 rotation)
+        {
+            if (rotation == Rot4.North)
+                return weaponComp.northOffset;
+            else if (rotation == Rot4.East)
+                return weaponComp.eastOffset;
+            else if (rotation == Rot4.West)
+                return weaponComp.westOffset;
+            else
+                return weaponComp.southOffset;
+        }
+
         public static void GetGizmosPostfix(Pawn_EquipmentTracker __instance, ref IEnumerable<Gizmo> __result)
         {
             if (__instance.Primary?.GetCompActivatableEffect() is CompActivatableEffect compActivatableEffect)

diff --git a/Source/AllModdingComponents/CompOversizedWeapon/CompProperties_OversizedWeapon.cs b/Source/AllModdingComponents/CompOversizedWeapon/CompProperties_OversizedWeapon.cs
@@ -1,5 +1,4 @@
-using System;
-using UnityEngine;
+using UnityEngine;
 using Verse;
 
 namespace CompOversizedWeapon

diff --git a/Source/AllModdingComponents/Directory.Build.props b/Source/AllModdingComponents/Directory.Build.props
@@ -10,7 +10,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <Version>1.3.0.2</Version>
     <!--
-    For some reason, although SDK projects should default Deterministic to true, when importing this props build,
+    For some reason, although SDK projects should default Deterministic to true, when importing this props file,
     builds become non-deterministic unless Deterministic is explicitly set to true here.
     -->
     <Deterministic>true</Deterministic>
@@ -40,6 +40,6 @@
     </When>
   </Choose>
   <ItemGroup>
-    <PackageReference Include="Lib.Harmony" Version="2.1.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Lib.Harmony" Version="2.1.*" ExcludeAssets="runtime" />
   </ItemGroup>
 </Project>