v1.1.7 adds an option that makes walkable cells standable

pardeike · Jul 13, 2019 · 0cf4839 · 0cf4839
1 parent 23cd238
commit 0cf4839
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 7 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,10 @@
 <ModMetaData>
 	<name>SameSpot</name>
 	<author>Andreas Pardeike</author>
-	<targetVersion>1.0.0</targetVersion>
+	<supportedVersions>
+		<li>0.19</li>
+		<li>1.0</li>
+	</supportedVersions>
 	<description>Allows multiple colonists to be drafted at the same location
 
 Powered by Harmony Patch Library

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.samespot</identifier>
-  <version>1.1.6.0</version>
+  <version>1.1.7.0</version>
   <targetVersions>
     <li>0.19.0</li>
     <li>1.0.0</li>

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>da39eefe-71cc-4419-a91c-884eb1c6ea39</ID>
   <ModName>SameSpot</ModName>
-  <Version>1.1.6.0</Version>
+  <Version>1.1.7.0</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>pardeike</Owner>

diff --git a/Assemblies/SameSpot.dll b/Assemblies/SameSpot.dll
diff --git a/Source/CrossPromotion.cs b/Source/CrossPromotion.cs
@@ -274,11 +274,11 @@ static void ContentPart(Rect mainRect, float leftColumn, ModMetaData mod, Page_M
 
 			var outRect = new Rect(0f, 0f, leftColumn, mainRect.height);
 			var width = outRect.width - 20f;
-			var imageRect = new Rect(0f, 0f, width, width * mod.previewImage.height / mod.previewImage.width);
+			var imageRect = new Rect(0f, 0f, width, width * mod.PreviewImage.height / mod.PreviewImage.width);
 			var textRect = new Rect(0f, 24f + 10f + imageRect.height, width, Text.CalcHeight(description, width));
 			var innerRect = new Rect(0f, 0f, width, imageRect.height + 20f + 8f + 10f + textRect.height);
 			Widgets.BeginScrollView(outRect, ref leftScroll, innerRect, true);
-			GUI.DrawTexture(imageRect, mod.previewImage, ScaleMode.ScaleToFit);
+			GUI.DrawTexture(imageRect, mod.PreviewImage, ScaleMode.ScaleToFit);
 			var widgetRow = new WidgetRow(imageRect.xMax, imageRect.yMax + 8f, UIDirection.LeftThenDown, width, 8f);
 			if (isLocalFile == false)
 			{

diff --git a/Source/Main.cs b/Source/Main.cs
@@ -44,6 +44,9 @@ public static class Main
 
 		public static bool CustomStandable(this IntVec3 c, Map map)
 		{
+			if (SameSpotMod.Settings.walkableMode)
+				return map.pathGrid.Walkable(c);
+
 			var edifice = c.GetEdifice(map);
 			return edifice == null || (edifice as Building_Door) != null;
 		}
@@ -83,6 +86,22 @@ static void Postfix()
 		}
 	}
 
+	[HarmonyPatch(typeof(GenGrid))]
+	[HarmonyPatch("Standable")]
+	static class GenGrid_Standable_Patch
+	{
+		[HarmonyPriority(10000)]
+		static bool Prefix(IntVec3 c, Map map, ref bool __result)
+		{
+			if (SameSpotMod.Settings.walkableMode)
+			{
+				__result = map.pathGrid.Walkable(c);
+				return false;
+			}
+			return true;
+		}
+	}
+
 	[HarmonyPatch(typeof(PawnUtility))]
 	[HarmonyPatch("PawnBlockingPathAt")]
 	static class PawnUtility_PawnBlockingPathAt_Patch

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.6.0")]
-[assembly: AssemblyFileVersion("1.1.6.0")]
+[assembly: AssemblyVersion("1.1.7.0")]
+[assembly: AssemblyFileVersion("1.1.7.0")]
diff --git a/Source/Settings.cs b/Source/Settings.cs
@@ -7,12 +7,14 @@ public class SameSpotModSettings : ModSettings
 	{
 		public bool enableDragDrop = true;
 		public bool hardcoreMode = false;
+		public bool walkableMode = false;
 
 		public override void ExposeData()
 		{
 			base.ExposeData();
 			Scribe_Values.Look(ref enableDragDrop, "enableDragDrop", true);
 			Scribe_Values.Look(ref hardcoreMode, "hardcoreMode", false);
+			Scribe_Values.Look(ref walkableMode, "walkableMode", false);
 		}
 
 		public void DoWindowContents(Rect inRect)
@@ -22,6 +24,7 @@ public void DoWindowContents(Rect inRect)
 			list.Gap(12f);
 			list.CheckboxLabeled("Enable Drag'n Drop", ref enableDragDrop);
 			list.CheckboxLabeled("SameSpot also for enemies", ref hardcoreMode);
+			list.CheckboxLabeled("Make walkable also standable", ref walkableMode);
 			list.End();
 		}
 	}