Merge pull request #3982 from TheLonerD/update-locks-mod

Update Locks mod from workshop.
skyarkhangel · Dec 21, 2024 · 22c8afb · 22c8afb
2 parents 326cfe9 + 393dea9
commit 22c8afb
Show file tree

Hide file tree

Showing 12 changed files with 130 additions and 69 deletions.
diff --git a/Mods/Locks/1.5/Assemblies/Locks.dll b/Mods/Locks/1.5/Assemblies/Locks.dll
diff --git a/Mods/Locks/1.5/Patches/AddCompLockSoS2.xml b/Mods/Locks/1.5/Patches/AddCompLockSoS2.xml
@@ -5,17 +5,17 @@
       <li>Save Our Ship 2</li>
     </mods>
     <match Class="PatchOperationConditional">
-      <xpath>/Defs/ThingDef[thingClass = "Building_ShipAirlock"]/comps</xpath>
+      <xpath>/Defs/ThingDef[thingClass = "SaveOurShip2.Building_ShipAirlock"]/comps</xpath>
       <nomatch Class="PatchOperationAdd">
-        <xpath>/Defs/ThingDef[thingClass = "Building_ShipAirlock"]</xpath>
+        <xpath>/Defs/ThingDef[thingClass = "SaveOurShip2.Building_ShipAirlock"]</xpath>
         <value>
           <comps>
             <li Class="Locks.CompProperties_Lock"/>
           </comps>
         </value>
       </nomatch>
       <match Class="PatchOperationAdd">
-        <xpath>/Defs/ThingDef[thingClass = "Building_ShipAirlock"]/comps</xpath>
+        <xpath>/Defs/ThingDef[thingClass = "SaveOurShip2.Building_ShipAirlock"]/comps</xpath>
         <value>
           <li Class="Locks.CompProperties_Lock"/>
         </value>

diff --git a/Mods/Locks/1.5/Patches/AddInspectTabSoS2.xml b/Mods/Locks/1.5/Patches/AddInspectTabSoS2.xml
@@ -5,17 +5,17 @@
       <li>Save Our Ship 2</li>
     </mods>
     <match Class="PatchOperationConditional">
-      <xpath>/Defs/ThingDef[thingClass = "Building_ShipAirlock"]/inspectorTabs</xpath>
+      <xpath>/Defs/ThingDef[thingClass = "SaveOurShip2.Building_ShipAirlock"]/inspectorTabs</xpath>
       <nomatch Class="PatchOperationAdd">
-        <xpath>/Defs/ThingDef[thingClass = "Building_ShipAirlock"]</xpath>
+        <xpath>/Defs/ThingDef[thingClass = "SaveOurShip2.Building_ShipAirlock"]</xpath>
         <value>
           <inspectorTabs>
             <li>Locks.ITab_Lock</li>
           </inspectorTabs>
         </value>
       </nomatch>
       <match Class="PatchOperationAdd">
-        <xpath>/Defs/ThingDef[thingClass = "Building_ShipAirlock"]/inspectorTabs</xpath>
+        <xpath>/Defs/ThingDef[thingClass = "SaveOurShip2.Building_ShipAirlock"]/inspectorTabs</xpath>
         <value>
           <li>Locks.ITab_Lock</li>
         </value>

diff --git a/Mods/Locks/About/About.xml b/Mods/Locks/About/About.xml
@@ -26,5 +26,5 @@
       <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
     </li>
   </modDependencies>
-  <description>Version 2.9.1\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.</description>
+  <description>Version 2.9.3\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.</description>
 </ModMetaData>
diff --git a/Mods/Locks/Languages/English/Keyed/Keys.xml b/Mods/Locks/Languages/English/Keyed/Keys.xml
@@ -12,7 +12,7 @@
   <Locks_Description>When unlocked all pawn will be allowed to use this door.\n[Right click for more options]</Locks_Description>
 
   <Locks_PrisonBreak>Escaping prisoners respecting locks</Locks_PrisonBreak>
-  <Locks_SlaveRebel>Rebeling slaves respecting locks</Locks_SlaveRebel>
+  <Locks_SlaveRebel>Rebelling slaves respecting locks</Locks_SlaveRebel>
 
   <Locks_StatePrefix>Door</Locks_StatePrefix>
   <Locks_StateLocked>locked</Locks_StateLocked>

diff --git a/Mods/Locks/Languages/Russian/DefInjected/JobDef/JobDefs.xml b/Mods/Locks/Languages/Russian/DefInjected/JobDef/JobDefs.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <Locks_Flick.reportString>Закрытие/открытие TargetA.</Locks_Flick.reportString>
+  <!-- EN: locking/unlocking TargetA. -->
+  <Locks_Flick.reportString>запирает/отпирает TargetA.</Locks_Flick.reportString>
 
 </LanguageData>
diff --git a/Mods/Locks/Languages/Russian/DefInjected/WorkGiverDef/WorkGivers.xml b/Mods/Locks/Languages/Russian/DefInjected/WorkGiverDef/WorkGivers.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
 
-  <Locks_Flick.label>Закрыть/открыть дверь</Locks_Flick.label>
-  <Locks_Flick.verb>Закройте/откройте дверь</Locks_Flick.verb>
-  <Locks_Flick.gerund>Закройте/откройте дверь</Locks_Flick.gerund>
+  <!-- EN: lock/unlock door -->
+  <Locks_Flick.label>запирать/отпирать дверь</Locks_Flick.label>
+  <!-- EN: lock/unlock -->
+  <Locks_Flick.verb>запереть/отпереть</Locks_Flick.verb>
+  <!-- EN: locking/unlocking -->
+  <Locks_Flick.gerund>запереть/отпереть</Locks_Flick.gerund>
 
 </LanguageData>
diff --git a/Mods/Locks/Languages/Russian/Keyed/Keys.xml b/Mods/Locks/Languages/Russian/Keyed/Keys.xml
diff --git a/Mods/Locks/Textures/lock.dds b/Mods/Locks/Textures/lock.dds
diff --git a/Mods/Locks/Textures/lock_designator.dds b/Mods/Locks/Textures/lock_designator.dds
diff --git a/Mods/Locks/Textures/unlock.dds b/Mods/Locks/Textures/unlock.dds
diff --git a/Mods/Locks/changelog.txt b/Mods/Locks/changelog.txt
@@ -1,4 +1,8 @@
 Changelog:
+2.9.3
+- Save Our Ship 2 fix (https://github.com/ThisIsSP4RTAN)
+2.9.2
+- Doors Expanded fix
 2.9.1
 - Reverted back files version for Rimworld 1.4
 - Future new futures will be only for Rimworld 1.5+