From 7ac83a66f66021f5d6a4b951d8f7fec749e13d09 Mon Sep 17 00:00:00 2001 From: Hazzer Date: Mon, 1 Aug 2022 13:15:07 +0200 Subject: [PATCH 1/2] 2.7.7 --- 1.3/Assemblies/Locks.dll | Bin 47616 -> 48128 bytes .../AddCompLockArchitectExpandedFences.xml | 26 ++++++++++++ ...dInspectTabLockArchitectExpandedFences.xml | 26 ++++++++++++ 1.3/Patches/AddInspectTabLts.xml | 37 ++++++++++-------- About/About.xml | 2 +- Languages/English/Keyed/Keys.xml | 4 +- README.md | 2 +- Source/CompLock.cs | 5 ++- Source/Locks.csproj | 9 +++++ Source/Options/LocksMod.cs | 5 +++ Source/Options/LocksSettings.cs | 3 ++ changelog.txt | 4 ++ 12 files changed, 102 insertions(+), 21 deletions(-) create mode 100644 1.3/Patches/AddCompLockArchitectExpandedFences.xml create mode 100644 1.3/Patches/AddInspectTabLockArchitectExpandedFences.xml diff --git a/1.3/Assemblies/Locks.dll b/1.3/Assemblies/Locks.dll index f80711c8465d6b84658173f5e0ae5caf20b2abb5..ca4dba03c7398057fe3fb9de2e5e7be1b273ab83 100644 GIT binary patch delta 13523 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 IoBEpn7ynwajsO4v delta 13219 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 + + + +
  • Architect Expanded - Fences (Continued)
    • +     + + /Defs/ThingDef[thingClass = "BuildLib.Building_Gate"]/comps + + /Defs/ThingDef[thingClass = "BuildLib.Building_Gate"] + + +
  • + + + + + /Defs/ThingDef[thingClass = "BuildLib.Building_Gate"]/comps + +
  • + + + + + + \ No newline at end of file diff --git a/1.3/Patches/AddInspectTabLockArchitectExpandedFences.xml b/1.3/Patches/AddInspectTabLockArchitectExpandedFences.xml new file mode 100644 index 0000000..ca1c31a --- /dev/null +++ b/1.3/Patches/AddInspectTabLockArchitectExpandedFences.xml @@ -0,0 +1,26 @@ + + + + +
  • Architect Expanded - Fences (Continued)
    • + + + /Defs/ThingDef[thingClass = "BuildLib.Building_Gate"]/inspectorTabs + + /Defs/ThingDef[thingClass = "BuildLib.Building_Gate"] + + +
  • Locks.ITab_Lock
    • +     +     +     + + /Defs/ThingDef[thingClass = "BuildLib.Building_Gate"]/inspectorTabs + +
  • Locks.ITab_Lock
    • +     +     +     +     + +     \ No newline at end of file diff --git a/1.3/Patches/AddInspectTabLts.xml b/1.3/Patches/AddInspectTabLts.xml index 7e054e6..ef2cafb 100644 --- a/1.3/Patches/AddInspectTabLts.xml +++ b/1.3/Patches/AddInspectTabLts.xml @@ -1,21 +1,26 @@ - + + +
  • [LTS]Furnishing
    • +     + + /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))]/inspectorTabs + + /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))] + + +
  • Locks.ITab_Lock
    • +     +     +     + /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))]/inspectorTabs - - /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))] - - -
  • Locks.ITab_Lock
    • -     -     -     - - /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))]/inspectorTabs - -
  • Locks.ITab_Lock
    • -     -     -     + +
  • Locks.ITab_Lock
    • +     + + +     \ No newline at end of file diff --git a/About/About.xml b/About/About.xml index 9986d94..9533657 100644 --- a/About/About.xml +++ b/About/About.xml @@ -24,5 +24,5 @@ https://github.com/pardeike/HarmonyRimWorld/releases/latest - Version 2.7.6\nThis addon adds Lock command on every door.\n - Left-click to lock toggle.\n - Right click for more options\n - Alternatively you can use "Lock" inspector tab\n\nNote: Door lock must be flicked by colonist. + Version 2.7.7\nThis addon adds Lock command on every door.\n - Left-click to lock toggle.\n - Right click for more options\n - Alternatively you can use "Lock" inspector tab\n\nNote: Door lock must be flicked by colonist. diff --git a/Languages/English/Keyed/Keys.xml b/Languages/English/Keyed/Keys.xml index 801f749..1aac52d 100644 --- a/Languages/English/Keyed/Keys.xml +++ b/Languages/English/Keyed/Keys.xml @@ -3,6 +3,8 @@ Locks Child lock minimal age: {0} Minimal age needed for humanlike pawn to open doors + Always pens door + When enabled every door will has "pens door" option turn on after construction. Lock When unlocked all pawn will be allowed to use this door.\n[Right click for more options] @@ -29,7 +31,7 @@ When disabled all animals will not be allowed to pass through this door. This setting is checked after pens and pet door settings. Children lock When enabled only humanlike pawn over age (check options) are allowed to pass through this door. Works only on pawn from that same faction as door. - + Owners Change lock in order to apply settings! diff --git a/README.md b/README.md index 1b6d31c..0bf86cb 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

    - v2.7.6 + v2.7.7

    diff --git a/Source/CompLock.cs b/Source/CompLock.cs index d5aca9a..41a7d7e 100644 --- a/Source/CompLock.cs +++ b/Source/CompLock.cs @@ -1,4 +1,5 @@ -using RimWorld; +using Locks.Options; +using RimWorld; using System; using System.Collections.Generic; using System.Linq; @@ -49,7 +50,7 @@ public override IEnumerable CompGetGizmosExtra() public override void PostSpawnSetup(bool respawningAfterLoad) { - if (this.parent.def.defName == FENCE && !respawningAfterLoad) + if ((this.parent.def.defName == FENCE || LocksSettings.alwaysPensDoor) && !respawningAfterLoad) { LockUtility.GetData(this.parent).CurrentState.pensDoor = true; LockUtility.GetData(this.parent).WantedState.pensDoor = true; diff --git a/Source/Locks.csproj b/Source/Locks.csproj index e9aa929..7ba7d38 100644 --- a/Source/Locks.csproj +++ b/Source/Locks.csproj @@ -105,6 +105,9 @@ Patches\AddCompLock.xml + + Patches\AddCompLockArchitectExpandedFences.xml + Patches\AddCompLockDoorsExpanded.xml @@ -117,12 +120,18 @@ Patches\AddInspectTab.xml + + Patches\AddInspectTabLockArchitectExpandedFences.xml + Patches\AddInspectTabLockDoorsExpanded.xml Patches\AddInspectTabLockLinkableDoors.xml + + Patches\AddInspectTabLts.xml + Patches\AddInspectTabSoS2.xml diff --git a/Source/Options/LocksMod.cs b/Source/Options/LocksMod.cs index 3b5edb2..2246eb6 100644 --- a/Source/Options/LocksMod.cs +++ b/Source/Options/LocksMod.cs @@ -15,6 +15,8 @@ class LocksMod : Mod private const string CHILD_LOCK_DESC = "Lock_ChildrenLock_Description"; private const string PRISON_BREAK= "Locks_PrisonBreak"; private const string SLAVE_REBELION ="Locks_SlaveRebel"; + private const string ALWAYS_PENS_DOOR = "Locks_AlwaysPensDoor"; + private const string ALWAYS_PENS_DOOR_DESC = "Locks_AlwaysPensDoor_Description"; public LocksMod(ModContentPack content) : base(content) { @@ -38,6 +40,9 @@ public override void DoSettingsWindowContents(Rect inRect) listingStandard.CheckboxLabeled(SLAVE_REBELION.Translate(), ref LocksSettings.revoltRespectsLocks); listingStandard.Gap(12f); + listingStandard.CheckboxLabeled(ALWAYS_PENS_DOOR.Translate(), ref LocksSettings.alwaysPensDoor, ALWAYS_PENS_DOOR_DESC.Translate()); + listingStandard.Gap(12f); + listingStandard.End(); } diff --git a/Source/Options/LocksSettings.cs b/Source/Options/LocksSettings.cs index b979be0..f48a348 100644 --- a/Source/Options/LocksSettings.cs +++ b/Source/Options/LocksSettings.cs @@ -12,6 +12,7 @@ public class LocksSettings : ModSettings public static int childLockAge = 6; public static bool prisonerBreakRespectsLock = true; public static bool revoltRespectsLocks = true; + public static bool alwaysPensDoor = false; public override void ExposeData() { @@ -19,6 +20,8 @@ public override void ExposeData() Scribe_Values.Look(ref prisonerBreakRespectsLock, "Locks_BreakRespectsLocks", true, true); Scribe_Values.Look(ref revoltRespectsLocks, "Locks_RevoltRespectLocks", true, true); + + Scribe_Values.Look(ref alwaysPensDoor, "Locks_AlwaysPensDoor", false, true); } } } diff --git a/changelog.txt b/changelog.txt index 4704752..4c90b96 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,8 @@ Changelog: +2.7.7 +- Fixes for patch [LTS]Furnitures. +- Compatibility patches for Architect Expanded - Fences (Continued). +- Added option to auto turn on pens door after construction. 2.7.6 - Fence gate force turn on pens doors option after load fixed - Compatibility patches for [LTS]Furnitures. Hope it works fine. From 18750282c1e1f614269c150fc774ccebf286a88b Mon Sep 17 00:00:00 2001 From: Hazzer Date: Mon, 1 Aug 2022 13:31:35 +0200 Subject: [PATCH 2/2] LTS fix --- 1.3/Patches/AddInspectTabLts.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/1.3/Patches/AddInspectTabLts.xml b/1.3/Patches/AddInspectTabLts.xml index ef2cafb..c47fe6d 100644 --- a/1.3/Patches/AddInspectTabLts.xml +++ b/1.3/Patches/AddInspectTabLts.xml @@ -5,9 +5,9 @@
  • [LTS]Furnishing
    • - /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))]/inspectorTabs + /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or @ParentName = "LTS_ArchedDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))]/inspectorTabs - /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))] + /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or @ParentName = "LTS_ArchedDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))]
  • Locks.ITab_Lock
    • @@ -15,7 +15,7 @@     - /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))]/inspectorTabs + /Defs/ThingDef[@ParentName = "LTS_MedievalDoor" or @ParentName = "LTS_FuturisticDoor" or @ParentName = "LTS_SimpleDoor" or @ParentName = "LTS_SingleDoor" or @ParentName = "LTS_FancyDoor" or @ParentName = "LTS_ArchedDoor" or (@ParentName = "LTS_DoorBase" and not(@Abstract="True"))]/inspectorTabs
  • Locks.ITab_Lock
    •