0.8.8

- changed slow from prisoners chains to act as factor instead offset - fixed compatibility issues with Seeds Please (again)
Aviuz · Oct 8, 2017 · ae5855a · ae5855a
1 parent e50974f
commit ae5855a
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 11 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -3,7 +3,7 @@
 	<name>Prison Labor</name>
 	<author>Avius</author>
 	<targetVersion>0.17.0</targetVersion>
-	<description>Version 0.8.7
+	<description>Version 0.8.8
 
 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/Assemblies/PrisonLabor.dll b/Assemblies/PrisonLabor.dll
diff --git a/Defs/Hediffs.xml b/Defs/Hediffs.xml
@@ -18,7 +18,7 @@
             </li>
             <li>
               <capacity>Moving</capacity>
-              <offset>-0.5</offset>
+              <postFactor>0.5</postFactor>
             </li>
           </capMods>
         </li>

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-0.8.7-orange.svg?style=flat" alt="v0.8.7" />
+    <img src="https://img.shields.io/badge/version-0.8.8-orange.svg?style=flat" alt="v0.8.8" />
   </a>
 </p>
 

diff --git a/Source/CompatibilityPatches/SeedsPlease.cs b/Source/CompatibilityPatches/SeedsPlease.cs
@@ -15,9 +15,9 @@ static public void Init()
             {
                 try
                 {
-                    WorkGiverDef seedsPleaseDef = DefDatabase<WorkGiverDef>.GetNamed("PrisonLabor_GrowerSow_Tweak");
+                    WorkGiverDef seedsPleaseDef = DefDatabase<WorkGiverDef>.GetNamed("GrowerSow");
                     seedsPleaseDef.giverClass = typeof(SeedsPlease_WorkGiver);
-                    JobDef prisonLaborDef = DefDatabase<JobDef>.GetNamed("PrisonLabor_Harvest_Tweak");
+                    JobDef prisonLaborDef = JobDefOf.Harvest;
                     SeedsPlease_WorkDriver_Patch.Run();
                     prisonLaborDef.driverClass = DefDatabase<JobDef>.GetNamed("Harvest").driverClass;
                 }
@@ -27,5 +27,10 @@ static public void Init()
                 }
             }
         }
+
+        static public bool CanOverrideHarvest()
+        {
+            return DefDatabase<JobDef>.GetNamed("SowWithSeeds", false) == null;
+        }
     }
 }
diff --git a/Source/CompatibilityPatches/SeedsPlease_WorkDriver_Patch.cs b/Source/CompatibilityPatches/SeedsPlease_WorkDriver_Patch.cs
@@ -22,7 +22,7 @@ public class SeedsPlease_WorkDriver_Patch
         public static void Run()
         {
             var harmony = HarmonyInstance.Create("Harmony_PrisonLabor_SeedsPlease");
-            var harvestDriverClass = DefDatabase<JobDef>.GetNamed("Harvest").driverClass;
+            var harvestDriverClass = JobDefOf.Harvest.driverClass;
             harmony.Patch(
                 harvestDriverClass.GetMethod("HarvestSeedsToil", BindingFlags.NonPublic | BindingFlags.Instance),
                 new HarmonyMethod(null), new HarmonyMethod(null), new HarmonyMethod(typeof(SeedsPlease_WorkDriver_Patch).GetMethod("MethodFinder")));

diff --git a/Source/NewsDialog.cs b/Source/NewsDialog.cs
@@ -45,6 +45,16 @@ public void Init()
             List<string> titlesList = new List<string>();
             List<string[]> itemsList = new List<string[]>();
 
+            // 0.8.8 (silent)
+            if (showAll)
+            {
+                titlesList.Add("Prison Labor Beta v0.8.8");
+                string[] itemsArray =
+                {
+                    "changed slow from prisoners chains to act as factor instead offset",
+                    "fixed compatibility issues with Seeds Please(again)",
+                };
+            }
             // 0.8.7 (silent)
             if (showAll)
             {

diff --git a/Source/PrefsData.cs b/Source/PrefsData.cs
@@ -45,7 +45,8 @@ public enum Version
         v0_8_4,
         v0_8_5,
         v0_8_6,
-        v0_8_7
+        v0_8_7,
+        v0_8_8
     }
 
     [Flags]

diff --git a/Source/Tweaks/ClassInjector.cs b/Source/Tweaks/ClassInjector.cs
@@ -24,8 +24,11 @@ public static void Init()
             cutPlantJob.driverClass = typeof(JobDriver_PlantCut_Tweak);
 
             // Harvest
-            var harvestJob = JobDefOf.Harvest;
-            harvestJob.driverClass = typeof(JobDriver_PlantHarvest_Tweak);
+            if (CompatibilityPatches.SeedsPlease.CanOverrideHarvest())
+            {
+                var harvestJob = JobDefOf.Harvest;
+                harvestJob.driverClass = typeof(JobDriver_PlantHarvest_Tweak);
+            }
 
             // Grow
             var growWorkGiver = DefDatabase<WorkGiverDef>.GetNamed("GrowerSow");

diff --git a/Source/VersionUtility.cs b/Source/VersionUtility.cs
@@ -8,8 +8,8 @@ namespace PrisonLabor
 {
     class VersionUtility
     {
-        public const Version versionNumber = Version.v0_8_7;
-        public const string versionString = "0.8.7";
+        public const Version versionNumber = Version.v0_8_8;
+        public const string versionString = "0.8.8";
 
         public static void CheckVersion()
         {

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,7 @@
 Changelog:
+0.8.8
+- changed slow from prisoners chains to act as factor instead offset
+- fixed compatibility issues with Seeds Please (again)
 0.8.7
 - fixed bug with dropping motivation while in bed
 - prisoners will now get different weapons when revolt triggers (molotovs, bows, or clubs)
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,8 @@ public enum Version @@
             v0_8_4,
             v0_8_5,
             v0_8_6,
-            v0_8_7
+            v0_8_7,
+            v0_8_8
         }
         [Flags]
@@ Expand Down @@