v2.3.3 improves RimConnect integration

pardeike · Aug 19, 2021 · 02d8fa8 · 02d8fa8
1 parent 0ac6d43
commit 02d8fa8
Show file tree

Hide file tree

Showing 10 changed files with 218 additions and 206 deletions.
diff --git a/1.3/Assemblies/ZombieLand.dll b/1.3/Assemblies/ZombieLand.dll
diff --git a/About/About.xml b/About/About.xml
@@ -16,6 +16,9 @@
 			<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
 		</li>
 	</modDependencies>
+	<loadBefore>
+		<li>betterscenes.rimconnect</li>
+	</loadBefore>
 	<loadAfter>
 		<li>ceteam.combatextended</li>
 	</loadAfter>

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>net.pardeike.rimworld.mod.zombieland</identifier>
-  <version>2.3.2.0</version>
+  <version>2.3.3.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>
@@ -13,8 +13,10 @@
   <incompatibleWith>
   </incompatibleWith>
   <loadBefore>
+    <li>betterscenes.rimconnect</li>
   </loadBefore>
   <loadAfter>
+    <li>ceteam.combatextended</li>
   </loadAfter>
   <manifestUri>https://raw.githubusercontent.com/pardeike/Zombieland/latest/About/Manifest.xml</manifestUri>
   <downloadUri>https://github.com/pardeike/Zombieland/releases/latest</downloadUri>

diff --git a/Source/Dialog_ZombieDebugActionMenu.cs b/Source/Dialog_ZombieDebugActionMenu.cs
@@ -89,27 +89,27 @@ public override void DoListingItems()
 				{
 					base.DebugToolMap($"Trigger: Zombie incident ({size})", delegate
 					{
-						var success = ZombiesRising.TryExecute(map, size, IntVec3.Invalid);
+						var success = ZombiesRising.TryExecute(map, size, IntVec3.Invalid, false, false);
 						if (success == false)
 							Log.Error("Incident creation failed. Most likely no valid spawn point found.");
 					}, highlightedIndex == i++);
 				}
 			}
 			base.DebugToolMap("Spawn: Zombie incident (4)", delegate
 			{
-				_ = ZombiesRising.TryExecute(map, 4, UI.MouseCell(), true);
+				_ = ZombiesRising.TryExecute(map, 4, UI.MouseCell(), false, true);
 			}, highlightedIndex == i++);
 			base.DebugToolMap("Spawn: Zombie incident (25)", delegate
 			{
-				_ = ZombiesRising.TryExecute(map, 25, UI.MouseCell(), true);
+				_ = ZombiesRising.TryExecute(map, 25, UI.MouseCell(), false, true);
 			}, highlightedIndex == i++);
 			base.DebugToolMap("Spawn: Zombie incident (100)", delegate
 			{
-				_ = ZombiesRising.TryExecute(map, 100, UI.MouseCell(), true);
+				_ = ZombiesRising.TryExecute(map, 100, UI.MouseCell(), false, true);
 			}, highlightedIndex == i++);
 			base.DebugToolMap("Spawn: Zombie incident (200)", delegate
 			{
-				_ = ZombiesRising.TryExecute(map, 200, UI.MouseCell(), true);
+				_ = ZombiesRising.TryExecute(map, 200, UI.MouseCell(), false, true);
 			}, highlightedIndex == i++);
 			base.DebugToolMap("Convert: Make Zombie", delegate
 			{

diff --git a/Source/Patches.cs b/Source/Patches.cs
@@ -2121,7 +2121,7 @@ static bool Prefix(ref bool __result, IncidentParms parms)
 
 				var oldMode = ZombieSettings.Values.spawnHowType;
 				ZombieSettings.Values.spawnHowType = parms.raidArrivalMode.walkIn ? SpawnHowType.FromTheEdges : SpawnHowType.AllOverTheMap;
-				_ = ZombiesRising.TryExecute(Find.CurrentMap, Mathf.FloorToInt(parms.points), parms.spawnCenter);
+				_ = ZombiesRising.TryExecute(Find.CurrentMap, Mathf.FloorToInt(parms.points), parms.spawnCenter, false, false);
 				ZombieSettings.Values.spawnHowType = oldMode;
 				__result = false;
 				return false;