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 0d614bb..45c2daa 100644 Binary files a/Mods/AllowTool/Assemblies/$HugsLibChecker.dll and b/Mods/AllowTool/Assemblies/$HugsLibChecker.dll differ diff --git a/Mods/AllowTool/Assemblies/AllowTool.dll b/Mods/AllowTool/Assemblies/AllowTool.dll index 8d9c9ba..99fa261 100644 Binary files a/Mods/AllowTool/Assemblies/AllowTool.dll and b/Mods/AllowTool/Assemblies/AllowTool.dll differ 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;