From 5c0d819d077193f33c0adab31123b6490c0b830f Mon Sep 17 00:00:00 2001 From: UnlimitedHugs Date: Mon, 26 Dec 2016 17:47:53 +0400 Subject: [PATCH] 2.5.2: Minor addition - "Allow all" will now include only haulable items by default - Hold Ctrl to include other things, such as buildings --- Mods/AllowTool/About/About.xml | 2 +- Mods/AllowTool/Assemblies/$HugsLibChecker.dll | Bin 13312 -> 13312 bytes Mods/AllowTool/Assemblies/AllowTool.dll | Bin 22016 -> 22016 bytes .../Defs/ThingDesignatorDefs/Designators.xml | 1 + .../Designators.xml | 1 + Properties/AssemblyInfo.cs | 4 ++-- Source/Designator_AllowAll.cs | 3 ++- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Mods/AllowTool/About/About.xml b/Mods/AllowTool/About/About.xml index 9ab49c9..5d18139 100644 --- a/Mods/AllowTool/About/About.xml +++ b/Mods/AllowTool/About/About.xml @@ -4,7 +4,7 @@ UnlimitedHugs 0.16.0 https://ludeon.com/forums/index.php?topic=17218.0 - Version: 2.5.1 + Version: 2.5.2 <size=20>Description</size> A set of tools to make handling forbidden items easier. diff --git a/Mods/AllowTool/Assemblies/$HugsLibChecker.dll b/Mods/AllowTool/Assemblies/$HugsLibChecker.dll index 0d614bb7be19ce7e609193371f622a03078da1e0..45c2daa2a7840ddf6c07eadaed009c221c117863 100644 GIT binary patch delta 56 zcmZq3Xvmn*!F<&-a$~o+Ft?e+Gdl(_D4nP%y!n9e3PFKj?W4~E3T%8DTZNvs|M5`X JT%p>*2LL8%6cGRb delta 56 zcmZq3Xvmn*!Tj(-(8g|YVQvG7=2!+WD4nP%y!n9e3PFMV#Xl~qpS|wUqqMfjFmQp+ J<_gsgJ^)9w6#@VN diff --git a/Mods/AllowTool/Assemblies/AllowTool.dll b/Mods/AllowTool/Assemblies/AllowTool.dll index 8d9c9baed1082e4c7056ce4530198ea1a33a6b3e..99fa261b40e71e57c93850fd755c421626010e3b 100644 GIT binary patch delta 3264 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 diff --git a/Mods/AllowTool/Defs/ThingDesignatorDefs/Designators.xml b/Mods/AllowTool/Defs/ThingDesignatorDefs/Designators.xml index 7b99f4d..0f93d61 100644 --- a/Mods/AllowTool/Defs/ThingDesignatorDefs/Designators.xml +++ b/Mods/AllowTool/Defs/ThingDesignatorDefs/Designators.xml @@ -52,6 +52,7 @@ Click and drag over an area to use. Unforbids all forbidden items on the map. Click to activate. +Hold Ctrl to include buildings. Hold Shift to include skeletons and non-fresh corpses. allowAll allowHighlight diff --git a/Mods/AllowTool/Languages/Russian/DefInjected/AllowTool.ThingDesignatorDefs/Designators.xml b/Mods/AllowTool/Languages/Russian/DefInjected/AllowTool.ThingDesignatorDefs/Designators.xml index b0a0b2a..e2ba036 100644 --- a/Mods/AllowTool/Languages/Russian/DefInjected/AllowTool.ThingDesignatorDefs/Designators.xml +++ b/Mods/AllowTool/Languages/Russian/DefInjected/AllowTool.ThingDesignatorDefs/Designators.xml @@ -9,6 +9,7 @@ Разрешить всё Снимает метку запрещения с запрещенных предметов на всей карте. +Удерживать Ctrl чтобы снять запрещение также со зданий. Удерживать Shift чтобы снять запрещение также со скелетов и несвежих трупов. Массовое выделение diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index d93b9b1..d06935a 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,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("2.5.1")] -[assembly: AssemblyFileVersion("2.5.1")] +[assembly: AssemblyVersion("2.5.2")] +[assembly: AssemblyFileVersion("2.5.2")] diff --git a/Source/Designator_AllowAll.cs b/Source/Designator_AllowAll.cs index 794d7cd..4d22ace 100644 --- a/Source/Designator_AllowAll.cs +++ b/Source/Designator_AllowAll.cs @@ -27,13 +27,14 @@ protected override int ProcessCell(IntVec3 cell) { private void AllowAllTheThings() { var includeRotten = AllowToolUtility.ShiftIsHeld; + var includeNonHaulable = AllowToolUtility.ControlIsHeld; if(Find.VisibleMap == null) return; var things = Find.VisibleMap.listerThings.AllThings; var tallyCount = 0; for (var i = 0; i < things.Count; i++) { var thing = things[i]; var comp = thing is ThingWithComps ? (thing as ThingWithComps).GetComp() : null; - if (comp != null && comp.Forbidden) { + if (comp != null && comp.Forbidden && (includeNonHaulable || (thing.def != null && thing.def.EverHaulable))) { CompRottable rottable; if (includeRotten || !(thing is Corpse) || (rottable = (thing as ThingWithComps).GetComp()) == null || rottable.Stage < RotStage.Rotting) { comp.Forbidden = false;