release (#267)

Aviuz · Mar 19, 2024 · 1a5e92d · 1a5e92d
1 parent 758abc5
commit 1a5e92d
Show file tree

Hide file tree

Showing 25 changed files with 341 additions and 273 deletions.
diff --git a/1.4/Assemblies/PrisonLabor.dll b/1.4/Assemblies/PrisonLabor.dll
diff --git a/1.4/CashRegistry/Assemblies/PrisonLaborCashRegistryCompatibility.dll b/1.4/CashRegistry/Assemblies/PrisonLaborCashRegistryCompatibility.dll
diff --git a/1.4/CleaningArea/Assemblies/PrisonLaborCleaningAreaCompatibility.dll b/1.4/CleaningArea/Assemblies/PrisonLaborCleaningAreaCompatibility.dll
diff --git a/1.4/ColonyGroups/Assemblies/PrisonLaborColonyGroupsCompatibility.dll b/1.4/ColonyGroups/Assemblies/PrisonLaborColonyGroupsCompatibility.dll
diff --git a/1.4/Defs/Interrogation/InterrogationDefs.xml b/1.4/Defs/Interrogation/InterrogationDefs.xml
@@ -4,61 +4,9 @@
     <defName>PL_GenQuest</defName>
     <questScriptDefs>
       <li>OpportunitySite_ItemStash</li>
-      <li>OpportunitySite_WorkSite</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">OpportunitySite_WorkSite</li>
     </questScriptDefs>
   </PrisonLabor.Core.Interrogation.InterrogationQuestGenDef>
-  <ThingDef ParentName="ArtableFurnitureBase">
-    <defName>PL_InterrogationChair</defName>
-    <label>interrogation chair</label>
-    <description>Not comfortable chair used to interrogate prisoners.</description>
-    <graphicData>
-      <texPath>Things/Building/Furniture/DiningChair</texPath>
-      <graphicClass>Graphic_Multi</graphicClass>
-      <drawSize>(1,1)</drawSize>
-      <damageData>
-        <rectN>(0.25,0.234375,0.5,0.28125)</rectN>
-        <rectS>(0.25,0.234375,0.5,0.28125)</rectS>
-        <rectE>(0.28125,0.25,0.453125,0.25)</rectE>
-        <rectW>(0.28125,0.25,0.453125,0.25)</rectW>
-      </damageData>
-      <shadowData>
-        <volume>(0.23, 0.26, 0.23)</volume>
-      </shadowData>
-    </graphicData>
-    <altitudeLayer>Building</altitudeLayer>
-    <statBases>
-      <MaxHitPoints>100</MaxHitPoints>
-      <WorkToBuild>8000</WorkToBuild>
-      <Mass>5</Mass>
-      <Flammability>1.0</Flammability>
-      <Beauty>1</Beauty>
-      <Comfort>0.30</Comfort>
-      <StyleDominance MayRequire="Ludeon.RimWorld.Ideology">5</StyleDominance>
-    </statBases>
-    <socialPropernessMatters>true</socialPropernessMatters>
-    <stuffCategories>
-      <li>Metallic</li>
-      <li>Woody</li>
-    </stuffCategories>
-    <costStuffCount>45</costStuffCount>
-    <pathCost>30</pathCost>
-    <designationHotKey>Misc7</designationHotKey>
-    <fillPercent>0.35</fillPercent>
-    <defaultPlacingRot>South</defaultPlacingRot>
-    <uiOrder>2410</uiOrder>
-    <building>
-      <isSittable>true</isSittable>
-      <paintable>true</paintable>
-    </building>
-    <constructionSkillPrerequisite>4</constructionSkillPrerequisite>
-    <researchPrerequisites>
-      <li>ComplexFurniture</li>
-    </researchPrerequisites>
-    <comps>
-      <li Class="CompProperties_Styleable"/>
-      <li Class="PrisonLabor.Core.Interrogation.CompPropertiesInterrogation"/>
-    </comps>
-  </ThingDef>
   <RoomRoleDef>
     <defName>PL_InterrogationRoom</defName>
     <label>interrogation room</label>

diff --git a/1.4/Defs/Interrogation/InterrogationPatterns.xml b/1.4/Defs/Interrogation/InterrogationPatterns.xml
@@ -22,7 +22,7 @@
     <defName>PL_Interrogation</defName>
     <ritualOnlyForIdeoMembers>false</ritualOnlyForIdeoMembers>
     <ritualBehavior>PL_Interrogation</ritualBehavior>
-    <ritualTargetFilter>SelectedThing</ritualTargetFilter>
+    <ritualTargetFilter>PL_SelectedThing</ritualTargetFilter>
     <ritualObligationTargetFilter>PL_InterrogationRoom</ritualObligationTargetFilter>
     <ritualOutcomeEffect>PL_Interrogation</ritualOutcomeEffect>
     <playsIdeoMusic>false</playsIdeoMusic>
@@ -93,7 +93,7 @@
         <roleBehaviors>
           <li>
             <roleId>warden</roleId>
-            <dutyDef>DeliverPawnToCell</dutyDef>
+            <dutyDef>PL_DeliverPawnToCell</dutyDef>
             <customPositions>
               <li Class="PrisonLabor.Core.Interrogation.Ritual.RitualPosition_ThingCenter"/>
             </customPositions>
@@ -123,7 +123,7 @@
           </li>
           <li>
             <roleId>prisoner</roleId>
-            <dutyDef>StandOnCell</dutyDef>
+            <dutyDef>PL_StandOnCell</dutyDef>
           </li>
         </roleBehaviors>
       </li>
@@ -145,12 +145,43 @@
           </subNodes>
         </li>
         <li Class="PrisonLabor.Core.Interrogation.Ritual.JobGiver_Interrogate">
-          <soundDefMale>Speech_Ideoligious_Male</soundDefMale>
-          <soundDefFemale>Speech_Ideoligious_Female</soundDefFemale>
+          <soundDefMale MayRequire="Ludeon.RimWorld.Ideology">Speech_Ideoligious_Male</soundDefMale>
+          <soundDefFemale MayRequire="Ludeon.RimWorld.Ideology">Speech_Ideoligious_Female</soundDefFemale>
         </li>
       </subNodes>
     </thinkNode>
   </DutyDef>
+    <DutyDef>
+    <defName>PL_DeliverPawnToCell</defName>
+    <hook>HighPriority</hook>
+    <socialModeMax>Off</socialModeMax>
+    <thinkNode Class="ThinkNode_Priority">
+      <subNodes>
+        <!-- Goto pawn -->
+        <li Class="JobGiver_DeliverPawnToCell">
+          <exactCell>true</exactCell>
+          <locomotionUrgency>Jog</locomotionUrgency>
+        </li>
+      </subNodes>
+    </thinkNode>
+  </DutyDef>
+    <DutyDef>
+    <defName>PL_StandOnCell</defName>
+    <thinkNode Class="ThinkNode_Priority">
+      <subNodes>
+
+        <li Class="JobGiver_Idle">
+          <ticks>60</ticks>
+        </li>
+
+      </subNodes>
+    </thinkNode>
+  </DutyDef>
+
+  <RitualTargetFilterDef>
+    <defName>PL_SelectedThing</defName>
+    <workerClass>RitualTargetFilter_SelectedThing</workerClass>
+  </RitualTargetFilterDef>
   <JobDef>
     <defName>PL_Interrogate</defName>
     <driverClass>PrisonLabor.Core.Interrogation.Ritual.JobDriver_Interrogate</driverClass>

diff --git a/1.4/Hospitality/Assemblies/PrisonLaborHospitalityCompatibility.dll b/1.4/Hospitality/Assemblies/PrisonLaborHospitalityCompatibility.dll
diff --git a/1.4/Ideology/Defs/PL_Ideology_InterrogationDefs.xml b/1.4/Ideology/Defs/PL_Ideology_InterrogationDefs.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <ThingDef ParentName="ArtableFurnitureBase">
+    <defName>PL_InterrogationChair</defName>
+    <label>interrogation chair</label>
+    <description>Not comfortable chair used to interrogate prisoners.</description>
+    <graphicData>
+      <texPath>Things/Building/Furniture/DiningChair</texPath>
+      <graphicClass>Graphic_Multi</graphicClass>
+      <drawSize>(1,1)</drawSize>
+      <damageData>
+        <rectN>(0.25,0.234375,0.5,0.28125)</rectN>
+        <rectS>(0.25,0.234375,0.5,0.28125)</rectS>
+        <rectE>(0.28125,0.25,0.453125,0.25)</rectE>
+        <rectW>(0.28125,0.25,0.453125,0.25)</rectW>
+      </damageData>
+      <shadowData>
+        <volume>(0.23, 0.26, 0.23)</volume>
+      </shadowData>
+    </graphicData>
+    <altitudeLayer>Building</altitudeLayer>
+    <statBases>
+      <MaxHitPoints>100</MaxHitPoints>
+      <WorkToBuild>8000</WorkToBuild>
+      <Mass>5</Mass>
+      <Flammability>1.0</Flammability>
+      <Beauty>1</Beauty>
+      <Comfort>0.30</Comfort>
+      <StyleDominance MayRequire="Ludeon.RimWorld.Ideology">5</StyleDominance>
+    </statBases>
+    <socialPropernessMatters>true</socialPropernessMatters>
+    <stuffCategories>
+      <li>Metallic</li>
+      <li>Woody</li>
+    </stuffCategories>
+    <costStuffCount>45</costStuffCount>
+    <pathCost>30</pathCost>
+    <designationHotKey>Misc7</designationHotKey>
+    <fillPercent>0.35</fillPercent>
+    <defaultPlacingRot>South</defaultPlacingRot>
+    <uiOrder>2410</uiOrder>
+    <building>
+      <isSittable>true</isSittable>
+      <paintable>true</paintable>
+    </building>
+    <constructionSkillPrerequisite>4</constructionSkillPrerequisite>
+    <researchPrerequisites>
+      <li>ComplexFurniture</li>
+    </researchPrerequisites>
+    <comps>
+      <li Class="CompProperties_Styleable"/>
+      <li Class="PrisonLabor.Core.Interrogation.CompPropertiesInterrogation"/>
+    </comps>
+  </ThingDef>
+</Defs>
diff --git a/1.4/Kijin/Assemblies/PrisonLaborKijinCompatibility.dll b/1.4/Kijin/Assemblies/PrisonLaborKijinCompatibility.dll
diff --git a/1.4/Quarry/Assemblies/PrisonLaborQuarryCompatibility.dll b/1.4/Quarry/Assemblies/PrisonLaborQuarryCompatibility.dll
diff --git a/1.4/Therapy/Assemblies/PrisonLaborTherapyCompatibility.dll b/1.4/Therapy/Assemblies/PrisonLaborTherapyCompatibility.dll
diff --git a/About/About.xml b/About/About.xml
@@ -35,7 +35,7 @@
   </modDependencies>
 
   <description>
-        Version 1.4.8
+        Version 1.4.9
 
         This mod force prisoners to work. To enable this feature prisoners must have "Force to work" option checked ("Prisoner" tab). Prison labor needs management that consist:
         - Motivation - prisoners need to be motivated by presence of colonists. Wardens have new job - supervising prisoners. Low motivation can lead to revolts.

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 </p>
 <p align="center">
   <a href="https://github.com/Aviuz/PrisonLabor/releases">
-    <img src="https://img.shields.io/badge/version-1.4.8-orange.svg?style=flat" alt="v1.4.8" />
+    <img src="https://img.shields.io/badge/version-1.4.9-orange.svg?style=flat" alt="v1.4.9" />
   </a>
 </p>
 

diff --git a/Source/Core/Interrogation/InterrogationDefsOf.cs b/Source/Core/Interrogation/InterrogationDefsOf.cs
@@ -9,16 +9,24 @@
 
 namespace PrisonLabor.Core.Interrogation
 {
-  [DefOf]
+  [DefOf]  
   public static class InterrogationDefsOf
   {
+    [MayRequireIdeology]
     public static InterrogationQuestGenDef PL_GenQuest;
+    [MayRequireIdeology]
     public static ThoughtDef PL_BitMe;
+    [MayRequireIdeology]
     public static ThoughtDef PL_KindInterrogation;
+    [MayRequireIdeology]
     public static ThoughtDef PL_Interrogated;
+    [MayRequireIdeology]
     public static ThoughtDef PL_BrutallyInterrogated;
+    [MayRequireIdeology]
     public static JobDef PL_Interrogate;
+    [MayRequireIdeology]
     public static InteractionDef PL_InterrogateInteraction;
+    [MayRequireIdeology]
     public static InteractionDef PL_BeIntrrogatedInteraction;
   }
 }
diff --git a/Source/Core/Interrogation/Ritual/JobGiver_Interrogate.cs b/Source/Core/Interrogation/Ritual/JobGiver_Interrogate.cs
@@ -45,6 +45,7 @@ protected override Job TryGiveJob(Pawn pawn)
       {
         job.interaction = lordToil_Ritual.stage.BehaviorForRole(lordJob_Ritual.RoleFor(pawn).id).speakerInteraction;
       }
+
       job.speechSoundMale = (soundDefMale ?? SoundDefOf.Speech_Leader_Male);
       job.speechSoundFemale = (soundDefFemale ?? SoundDefOf.Speech_Leader_Female);
       job.speechFaceSpectatorsIfPossible = faceSpectatorsIfPossible;

diff --git a/Source/Core/Meta/Version.cs b/Source/Core/Meta/Version.cs
@@ -88,6 +88,7 @@ public enum Version
         v1_4_5,
         v1_4_6,
         v1_4_7,
-        v1_4_8
+        v1_4_8,
+        v1_4_9
     }
 }
diff --git a/Source/Core/Meta/VersionUtility.cs b/Source/Core/Meta/VersionUtility.cs
@@ -5,8 +5,8 @@ namespace PrisonLabor.Core.Meta
 {
     public class VersionUtility
     {
-        public const Version versionNumber = Version.v1_4_8;
-        public const string versionString = "1.4.8";
+        public const Version versionNumber = Version.v1_4_9;
+        public const string versionString = "1.4.9";
 
         public static Version VersionOfSaveFile { get; set; }
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,6 +88,7 @@ public enum Version @@
             v1_4_5,
             v1_4_6,
             v1_4_7,
-            v1_4_8
+            v1_4_8,
+            v1_4_9
         }
     }