jecrell · jptrrs · Mar 6, 2020 · Mar 6, 2020
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,6 @@ Source/AllModdingComponents/CompSlotLoadable/Properties
 Source/AllModdingComponents/CompVehicle/obj
 Source/AllModdingComponents/CompVehicle/Properties
 Source/DiscordWebhookToken.txt
+/Source/.vs/RimWriter/v16
+/Source/packages/Lib.Harmony.2.0.0.8
+/.vs
diff --git a/About/About.xml b/About/About.xml
@@ -2,7 +2,21 @@
 <ModMetaData>
   <name>RimWriter - Books, Scrolls, Tablets, and Libraries</name>
   <author>Jecrell</author>
-  <targetVersion>1.0.2059</targetVersion>
+  <supportedVersions>
+    <li>1.1</li>
+  </supportedVersions>
+  <packageId>jecrell.RimWriter</packageId>
+  <modDependencies>
+    <li>
+      <packageId>brrainz.harmony</packageId>
+      <displayName>Harmony</displayName>
+      <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
+      <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
+    </li>
+  </modDependencies>
+  <loadAfter>
+    <li>brrainz.harmony</li>
+  </loadAfter>
   <description>1.20.0.2 (01-04-2019)
 
 Add tablets, books, scrolls and more to your RimWorld playthroughs.

diff --git a/Assemblies/0Harmony.dll b/Assemblies/0Harmony.dll
diff --git a/Assemblies/RimWriter.dll b/Assemblies/RimWriter.dll
diff --git a/Defs/RecipeDefs/RimWriter_BookBinding.xml b/Defs/RecipeDefs/RimWriter_BookBinding.xml
@@ -70,7 +70,7 @@
         <description>Makes a book by hand at a crafting spot by writing out flattened stationery such as paper or parchment and binding together the pieces.</description>
         <jobString>Making a book by hand.</jobString>
         <workAmount>20000</workAmount>
-        <workSpeedStat>SculptingSpeed</workSpeedStat>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
         <workSkill>Artistic</workSkill>
         <unfinishedThingDef>UnfinishedWriting</unfinishedThingDef>
         <soundWorking>RimWriter_SoundManualPencil</soundWorking>

diff --git a/Defs/RecipeDefs/RimWriter_BurnBooks.xml b/Defs/RecipeDefs/RimWriter_BurnBooks.xml
@@ -7,7 +7,7 @@
 		<description>Burn unwanted books to completely destroy them without any mess.</description>
 		<jobString>Burning books.</jobString>
 		<workAmount>60</workAmount>
-        <workSpeedStat>UnskilledLaborSpeed</workSpeedStat>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
 		<requiredGiverWorkType>Hauling</requiredGiverWorkType>
 		<effectWorking>Cremate</effectWorking>
 		<soundWorking>Recipe_Cremate</soundWorking>
@@ -35,7 +35,7 @@
 		<description>Burn unwanted scrolls to completely destroy them without any mess.</description>
 		<jobString>Burning scrolls.</jobString>
 		<workAmount>60</workAmount>
-        <workSpeedStat>UnskilledLaborSpeed</workSpeedStat>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
 		<requiredGiverWorkType>Hauling</requiredGiverWorkType>
 		<effectWorking>Cremate</effectWorking>
 		<soundWorking>Recipe_Cremate</soundWorking>

diff --git a/Defs/RecipeDefs/RimWriter_MaterialCrafting.xml b/Defs/RecipeDefs/RimWriter_MaterialCrafting.xml
@@ -15,7 +15,7 @@
         <description>Makes around one hundred pages from a few logs of wood.</description>
         <jobString>Making pages.</jobString>
         <workAmount>3500</workAmount>
-        <workSpeedStat>SculptingSpeed</workSpeedStat>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
         <workSkill>Artistic</workSkill>
         <unfinishedThingDef>UnfinishedWriting</unfinishedThingDef>
         <soundWorking>Recipe_Tailor</soundWorking>
@@ -58,7 +58,7 @@
         <description>Makes around one hundred parchments from leather.</description>
         <jobString>Making parchment.</jobString>
         <workAmount>3500</workAmount>
-        <workSpeedStat>SculptingSpeed</workSpeedStat>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
         <workSkill>Artistic</workSkill>
         <unfinishedThingDef>UnfinishedWriting</unfinishedThingDef>
         <soundWorking>Recipe_Tailor</soundWorking>
@@ -103,7 +103,7 @@
         <description>Makes around one hundred cloth papers from various types of fabric.</description>
         <jobString>Making cloth paper.</jobString>
         <workAmount>3500</workAmount>
-        <workSpeedStat>SculptingSpeed</workSpeedStat>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
         <workSkill>Artistic</workSkill>
         <unfinishedThingDef>UnfinishedWriting</unfinishedThingDef>
         <soundWorking>Recipe_Tailor</soundWorking>

diff --git a/Defs/ThingDefs_Buildings/RimWriter_Bookcases.xml b/Defs/ThingDefs_Buildings/RimWriter_Bookcases.xml
@@ -38,9 +38,9 @@
     <designationCategory>Joy</designationCategory>
     <designationHotKey>Misc2</designationHotKey>
 	<comps>
-	  <li Class="CompProperties_RoomIdentifier">
+	  <!--<li Class="CompProperties_RoomIdentifier">
 		<roomStat>Impressiveness</roomStat>
-	  </li>
+	  </li>-->
 	  <li Class="RimWriter.CompProperties_StorageGraphic">
 	    <graphicEmpty>
 		  <texPath>Building/Production/LibraryBookcase/Jecrell_BookcaseEmpty</texPath>
@@ -110,9 +110,9 @@
 	  <drawSize>3</drawSize>
     </graphicData>
 	<comps Inherit="False">
-	  <li Class="CompProperties_RoomIdentifier">
+	  <!--<li Class="CompProperties_RoomIdentifier">
 		<roomStat>Impressiveness</roomStat>
-	  </li>
+	  </li>-->
 	  <li Class="RimWriter.CompProperties_StorageGraphic">
 	    <graphicEmpty>
 		  <texPath>Building/Production/ShortBookcase/Jecrell_ShortBookcaseEmpty</texPath>

diff --git a/Defs/ThingDefs_Buildings/RimWriter_Scrollcases.xml b/Defs/ThingDefs_Buildings/RimWriter_Scrollcases.xml
@@ -37,9 +37,9 @@
     <designationCategory>Joy</designationCategory>
     <designationHotKey>Misc2</designationHotKey>
 	<comps>
-	  <li Class="CompProperties_RoomIdentifier">
+	  <!--<li Class="CompProperties_RoomIdentifier">
 		<roomStat>Impressiveness</roomStat>
-	  </li>
+	  </li>-->
 	  <li Class="RimWriter.CompProperties_StorageGraphic">
 	    <graphicEmpty>
 		  <texPath>Building/Production/LibraryScrollcase/Jecrell_ScrollcaseEmpty</texPath>
@@ -109,9 +109,9 @@
 	  <drawSize>3</drawSize>
     </graphicData>
 	<comps Inherit="False">
-	  <li Class="CompProperties_RoomIdentifier">
+	  <!--<li Class="CompProperties_RoomIdentifier">
 		<roomStat>Impressiveness</roomStat>
-	  </li>
+	  </li>-->
 	  <li Class="RimWriter.CompProperties_StorageGraphic">
 	    <graphicEmpty>
 		  <texPath>Building/Production/ShortScrollcase/Jecrell_ShortScrollcaseEmpty</texPath>

diff --git a/Defs/ThingDefs_Item/RimWriter_Materials.xml b/Defs/ThingDefs_Item/RimWriter_Materials.xml
@@ -16,7 +16,7 @@
     </costList>
     <recipeMaker>
       <productCount>100</productCount>
-      <workSpeedStat>SculptingSpeed</workSpeedStat>
+      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
       <workSkill>Artistic</workSkill>
       <unfinishedThingDef>UnfinishedWriting</unfinishedThingDef>
       <soundWorking>RimWriter_SoundManualPencil</soundWorking>
@@ -38,7 +38,7 @@
     </stuffCategories>
     <recipeMaker>
       <productCount>100</productCount>
-      <workSpeedStat>SculptingSpeed</workSpeedStat>
+      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
       <workSkill>Artistic</workSkill>
       <unfinishedThingDef>UnfinishedWriting</unfinishedThingDef>
       <soundWorking>RimWriter_SoundManualPencil</soundWorking>
@@ -60,7 +60,7 @@
     </stuffCategories>
     <recipeMaker>
       <productCount>100</productCount>
-      <workSpeedStat>SculptingSpeed</workSpeedStat>
+      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
       <workSkill>Artistic</workSkill>
       <unfinishedThingDef>UnfinishedWriting</unfinishedThingDef>
       <soundWorking>RimWriter_SoundManualPencil</soundWorking>

diff --git a/Defs/ThingDefs_Item/RimWriter_Tablets.xml b/Defs/ThingDefs_Item/RimWriter_Tablets.xml
@@ -29,7 +29,7 @@
     <techLevel>Neolithic</techLevel>
     <filthLeaving>Filth_RubbleRock</filthLeaving>
     <recipeMaker>
-      <workSpeedStat>SculptingSpeed</workSpeedStat>
+      <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
       <workSkill>Intellectual</workSkill>
       <unfinishedThingDef>UnfinishedWritingTablet</unfinishedThingDef>
       <soundWorking>Recipe_MakeStoneBlocks</soundWorking>

diff --git a/Source/CompProperties_StorageGraphic.cs b/Source/CompProperties_StorageGraphic.cs
@@ -17,7 +17,7 @@ public class CompProperties_StorageGraphic : CompProperties
 
         public CompProperties_StorageGraphic()
         {
-            this.compClass = typeof(CompStorageGraphic);
+            compClass = typeof(CompStorageGraphic);
         }
     }
 }
diff --git a/Source/CompStorageGraphic.cs b/Source/CompStorageGraphic.cs
@@ -10,9 +10,15 @@ namespace RimWriter
     public class CompStorageGraphic : ThingComp
     {
         private Graphic cachedGraphic = null;
-        public CompProperties_StorageGraphic Props => this.props as CompProperties_StorageGraphic;
+        public CompProperties_StorageGraphic Props
+        {
+            get
+            {
+                return (CompProperties_StorageGraphic)props;
+            }
+        }
 
-        public void UpdateGraphics()
+public void UpdateGraphics()
         {
             cachedGraphic = null;
         }

diff --git a/Source/GuideBook.cs b/Source/GuideBook.cs
@@ -1,5 +1,5 @@
 using System;
-using Harmony;
+using HarmonyLib;
 using JetBrains.Annotations;
 using RimWorld;
 using UnityEngine;

diff --git a/Source/ModMain.cs b/Source/ModMain.cs
@@ -1,5 +1,5 @@
 using System;
-using Harmony;
+using HarmonyLib;
 using RimWorld;
 using UnityEngine;
 using Verse;

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 
 [assembly: Guid("a8e081b6-8768-4fe9-817f-f0ee42cf13ef")]
 
-[assembly: AssemblyVersion("1.1.0.7")]
-[assembly: AssemblyFileVersion("1.1.0.7")]
+[assembly: AssemblyVersion("1.2")]
+[assembly: AssemblyFileVersion("1.2")]