From 0cf4839c40d169ca032b26a7729288aaf354d553 Mon Sep 17 00:00:00 2001 From: Andreas Pardeike Date: Sun, 14 Jul 2019 00:38:31 +0200 Subject: [PATCH] v1.1.7 adds an option that makes walkable cells standable --- About/About.xml | 5 ++++- About/Manifest.xml | 2 +- About/ModSync.xml | 2 +- Assemblies/SameSpot.dll | Bin 36864 -> 37376 bytes Source/CrossPromotion.cs | 4 ++-- Source/Main.cs | 19 +++++++++++++++++++ Source/Properties/AssemblyInfo.cs | 4 ++-- Source/Settings.cs | 3 +++ 8 files changed, 32 insertions(+), 7 deletions(-) diff --git a/About/About.xml b/About/About.xml index 164ec1a..606393d 100644 --- a/About/About.xml +++ b/About/About.xml @@ -2,7 +2,10 @@ SameSpot Andreas Pardeike - 1.0.0 + +
  • 0.19
  • +
  • 1.0
  • +
    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 index e18782f..0d7d17c 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@  net.pardeike.rimworld.mod.samespot - 1.1.6.0 + 1.1.7.0
  • 0.19.0
  • 1.0.0
  • diff --git a/About/ModSync.xml b/About/ModSync.xml index 8998925..62801d0 100644 --- a/About/ModSync.xml +++ b/About/ModSync.xml @@ -2,7 +2,7 @@ da39eefe-71cc-4419-a91c-884eb1c6ea39 SameSpot - 1.1.6.0 + 1.1.7.0 False pardeike diff --git a/Assemblies/SameSpot.dll b/Assemblies/SameSpot.dll index 001c8658405707fa2f1c4df2389724c80271793f..4e82a85d53fb18e2f055f697028ee68c1d587f20 100644 GIT binary patch delta 13974 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 Fe*ynOzd`^2 delta 13684 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 diff --git a/Source/CrossPromotion.cs b/Source/CrossPromotion.cs index ff6af9e..b5ab5be 100644 --- 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 index 5d9f10b..ca43f0c 100644 --- 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 index 5f33637..ba4bbc4 100644 --- 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 index 17a918e..424065f 100644 --- 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(); } }