fixed: caravan mounts being roped

rheirman · Aug 6, 2021 · d207b26 · d207b26
1 parent fef09e0
commit d207b26
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 Source/Giddy-up-Caravan/.vs/*
 Source/Giddy-up-Caravan/obj/*
 v1.1/Source/Giddy-up-Caravan/obj/*
+v1.3/Source/Giddy-up-Caravan/obj/*
diff --git a/v1.3/Assemblies/GiddyUpCaravan.dll b/v1.3/Assemblies/GiddyUpCaravan.dll
diff --git a/v1.3/Source/Giddy-up-Caravan/GiddyUpCaravan.csproj b/v1.3/Source/Giddy-up-Caravan/GiddyUpCaravan.csproj
@@ -35,6 +35,10 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Remove="Harmony\GiddyUpCore\**" />
+    <None Remove="Harmony\GiddyUpCore\**" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="0MultiplayerAPI">
       <HintPath>packages\0MultiplayerAPI.dll</HintPath>
@@ -53,6 +57,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Base.cs" />
+    <Compile Include="Harmony\AnimalPenUtility.cs" />
     <Compile Include="Harmony\CaravanArrivalTimeEstimator.cs" />
     <Compile Include="Harmony\CaravanRideableUtility.cs" />
     <Compile Include="Harmony\CaravanTicksPerMoveUtility.cs" />
@@ -90,7 +95,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Harmony\GiddyUpCore\" />
     <Folder Include="Properties\" />
   </ItemGroup>
   <Target Name="MyCode" BeforeTargets="UpdateReferences">

diff --git a/v1.3/Source/Giddy-up-Caravan/Harmony/AnimalPenUtility.cs b/v1.3/Source/Giddy-up-Caravan/Harmony/AnimalPenUtility.cs
@@ -0,0 +1,27 @@
+using GiddyUpCore.Storage;
+using HarmonyLib;
+using RimWorld.Planet;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace GiddyUpCaravan.Harmony
+{
+    [HarmonyPatch(typeof(AnimalPenUtility), "NeedsToBeManagedByRope")]
+    class AnimalPenUtility_NeedsToBeManagedByRope
+    {
+        static void Postfix(Pawn pawn, ref bool __result)
+        {
+            if (__result && pawn.IsFormingCaravan())
+            {
+                ExtendedDataStorage store = GiddyUpCore.Base.Instance.GetExtendedDataStorage();
+                var caravanRider = store.GetExtendedDataFor(pawn).caravanRider;
+                __result = caravanRider == null;
+                return;
+            }
+        }
+    }
+}
diff --git a/v1.3/Source/Giddy-up-Caravan/obj/Debug/GiddyUpCaravan.csproj.CoreCompileInputs.cache b/v1.3/Source/Giddy-up-Caravan/obj/Debug/GiddyUpCaravan.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-32a13aa16c467cec9fa00b82c992d6f40e91ac18
+55ea0c9ad7b5d4a68b873d24339c5252a1053b85
diff --git a/v1.3/Source/Giddy-up-Caravan/obj/Debug/GiddyUpCaravan.csprojAssemblyReference.cache b/v1.3/Source/Giddy-up-Caravan/obj/Debug/GiddyUpCaravan.csprojAssemblyReference.cache
diff --git a/v1.3/Source/Giddy-up-Caravan/obj/Debug/GiddyUpCaravan.dll b/v1.3/Source/Giddy-up-Caravan/obj/Debug/GiddyUpCaravan.dll
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		32a13aa16c467cec9fa00b82c992d6f40e91ac18
		55ea0c9ad7b5d4a68b873d24339c5252a1053b85