Merge pull request #192 from Hazzer/weekly-ups

Release
Aviuz · Jun 18, 2020 · c778b87 · c778b87
2 parents ceb2106 + 2e85149
commit c778b87
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 7 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
 	</li>
 	</modDependencies>
 
-	<description>Version 1.1.7
+	<description>Version 1.1.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/MakeRelease.bat b/MakeRelease.bat
@@ -0,0 +1,43 @@
+SET mod_name=PrisonLabor
+SET target_directory=D:\Gry\Steam\steamapps\common\RimWorld\Mods\%mod_name%
+SET zip_directory=C:\Users\Hazzer\Desktop\%mod_name%.zip
+
+:: ========= Copy ==========
+
+rd "%target_directory%" /s /q
+mkdir "%target_directory%"
+
+:: About
+mkdir "%target_directory%\About"
+xcopy "About\*.*" "%target_directory%\About" /e
+
+:: Assemblies
+mkdir "%target_directory%\Assemblies"
+xcopy "Assemblies\*.*" "%target_directory%\Assemblies" /e
+
+:: Defs 
+mkdir "%target_directory%\Defs"
+xcopy "Defs\*.*" "%target_directory%\Defs" /e
+
+:: Languages
+mkdir "%target_directory%\Languages"
+xcopy "Languages\*.*" "%target_directory%\Languages" /e
+
+:: Textures
+mkdir "%target_directory%\Textures"
+xcopy "Textures\*.*" "%target_directory%\Textures" /e
+
+:: 1.0
+mkdir "%target_directory%\1.0"
+xcopy "1.0\*.*" "%target_directory%\1.0" /e
+
+:: LoadFolders.xml
+copy "LoadFolders.xml" "%target_directory%\LoadFolders.xml"
+
+:: changelog.txt
+copy "changelog.txt" "%target_directory%\changelog.txt"
+
+
+:: ========= Zip archive ==========
+
+"D:\Programy\7-Zip\7z.exe" a -r "%zip_directory%" "%target_directory%\*"
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.1.7-orange.svg?style=flat" alt="v1.1.7" />
+    <img src="https://img.shields.io/badge/version-1.1.8-orange.svg?style=flat" alt="v1.1.8" />
   </a>
 </p>
 

diff --git a/Source/Core/Meta/Version.cs b/Source/Core/Meta/Version.cs
@@ -57,6 +57,7 @@ public enum Version
         v1_1_4,
         v1_1_5,
         v1_1_6,
-        v1_1_7
+        v1_1_7,
+        v1_1_8
     }
 }
diff --git a/Source/Core/Meta/VersionUtility.cs b/Source/Core/Meta/VersionUtility.cs
@@ -5,8 +5,8 @@ namespace PrisonLabor.Core.Meta
 {
     class VersionUtility
     {
-        public const Version versionNumber = Version.v1_1_7;
-        public const string versionString = "1.1.7";
+        public const Version versionNumber = Version.v1_1_8;
+        public const string versionString = "1.1.8";
 
         public static Version VersionOfSaveFile { get; set; }
 

diff --git a/Source/Core/Settings/SettingsMenu.cs b/Source/Core/Settings/SettingsMenu.cs
@@ -168,6 +168,7 @@ public override void WriteSettings()
             PrisonLaborPrefs.EnableRevolts = enableRevolts;
             PrisonLaborPrefs.ShowTreatmentHappiness = showTreatmentHappiness;
             PrisonLaborPrefs.AdvancedGrowing = advancedGrowing;
+            PrisonLaborPrefs.EnableSuicide = enableSuicide;
             PrisonLaborPrefs.DefaultInteractionMode = interactionModeList[defaultInteractionMode].defName;
             PrisonLaborPrefs.Save();
             Log.Message("Prison Labor settings saved");

diff --git a/Source/HarmonyPatches/Patches_GUI/GUI_PrisonerTab/Patch_AddScrollToPrisonerTab.cs b/Source/HarmonyPatches/Patches_GUI/GUI_PrisonerTab/Patch_AddScrollToPrisonerTab.cs
@@ -86,11 +86,11 @@ private static IEnumerable<CodeInstruction> Transpiler(ILGenerator gen, IEnumera
                     yield return instruction;
                 }
 
-                // resize
+/*                // resize
                 if (HPatcher.IsFragment(opCodes3, operands3, ci, ref step3, "AddScrollToPrisonerTab3"))
                 {
 
-                }
+                }*/
 
                 yield return ci;
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,7 @@
 Changelog:
+1.1.8
+- Turn on/off prisoner suicide should work now
+- Performance optimalisation (https://github.com/kbatbouta)
 1.1.7
 - fix for NPR in quarry patches
 1.1.6
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ public enum Version @@
             v1_1_4,
             v1_1_5,
             v1_1_6,
-            v1_1_7
+            v1_1_7,
+            v1_1_8
         }
     }