Merge pull request #47 from Adventurer13/hotfix-1.2.2.2

Hotfix 1.2.2.2
Adventurer13 · Nov 28, 2020 · e46a62e · e46a62e
2 parents 5ae1172 + 9625b4c
commit e46a62e
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 5 deletions.
diff --git a/1.2/Defs/RecipeDefs/Recipe_Woodworking.xml b/1.2/Defs/RecipeDefs/Recipe_Woodworking.xml
@@ -21,11 +21,24 @@
 
 <!-- Lumber -->		
 
-	<RecipeDef ParentName="MakeWoodLumberBase">
+	<RecipeDef>
 		<defName>MakeWoodLumberAny</defName>
 		<label>make any lumber</label>
 		<description>Process raw logs into lumber for construction.</description>
 		<workerCounterClass>ExpandedWoodworking.RecipeWorkerCounter_MakeWoodLumber</workerCounterClass>
+		<jobString>Processing lumber from wood.</jobString>
+		<workAmount>500</workAmount>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+		<workSkill>Crafting</workSkill>
+		<workSkillLearnFactor>0.25</workSkillLearnFactor>
+		<effectWorking>CutStone</effectWorking>
+		<soundWorking>Recipe_MakeWoodPlanks_Electric</soundWorking>
+		<requiredGiverWorkType>Crafting</requiredGiverWorkType>
+		<targetCountAdjustment>15</targetCountAdjustment>
+		<recipeUsers>
+			<li>TableWoodworking</li>
+			<li>ElectricTableWoodworking</li>
+		</recipeUsers>
 		<ingredients>
 			<li>
 				<filter>

diff --git a/1.2/Patches/A_ExpWoodVanilla.xml b/1.2/Patches/A_ExpWoodVanilla.xml
@@ -680,5 +680,30 @@
 			</nomatch>
 		</nomatch>
 	</Operation>
+
+	<!-- Sound: Interact Sustainers Work -->
+	<Operation Class="PatchOperationSequence">
+		<success>Always</success>
+		<operations>
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/SoundDef[defName = "Recipe_MakeWoodPlanks_Electric"]/subSounds/li[grains/li[@Class="AudioGrain_Folder"]/clipFolderPath[.="Interact/Work/Construct/Wood/Wood_Saw_Circular"]]/volumeRange</xpath>
+				<value>
+					<volumeRange>8.2504~9.1252</volumeRange> <!-- Default: 10.2504~11.1252 -->
+				</value>
+			</li>
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/SoundDef[defName = "Recipe_MakeWoodPlanks_Electric"]/subSounds/li[grains/li[@Class="AudioGrain_Folder"]/clipFolderPath[.="Interact/Work/Construct/Circular_Saw/Saw_Circular_Cuts"]]/volumeRange</xpath>
+				<value>
+					<volumeRange>10~10</volumeRange> <!-- Default: 12~12 -->
+				</value>
+			</li>
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/SoundDef[defName = "Recipe_CircularSaw_Off"]/subSounds/li[grains/li[@Class="AudioGrain_Clip"]/clipPath[.="Interact/Work/Construct/Circular_Saw/Saw_Circular_Off/Wood_Saw_Circular_Off"]]/volumeRange</xpath>
+				<value>
+					<volumeRange>9~9</volumeRange> <!-- Default: 11~11 -->
+				</value>
+			</li>
+		</operations>
+	</Operation>
 
 </Patch>
diff --git a/About/About.xml b/About/About.xml
@@ -12,7 +12,7 @@
 	<description>An upgrade of Qwynn's Expanded Woodworking which was an update of ItchyFlea's Extended Woodworking. Each tree type now produces a unique wood specific to that tree. These new wood types can be converted into lumber and, like the base game metals, can be used to construct various furnitures, buildings, and other objects which are designated as 'Woody' in their stuff category. Supports any starting scenario through using the crafting spot to make lumber.
 
 
-Current Version: 1.2.2.1 (2020-11-23)
+Current Version: 1.2.2.2 (2020-11-28)
 Previous versions can be found on GitHub.
 	</description>
 	<incompatibleWith>

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -2,7 +2,7 @@
 
 <Manifest>
     <identifier>ExpandedWoodworking</identifier>
-    <version>1.2.2.1</version>
+    <version>1.2.2.2</version>
     <incompatibleWith>
 		<li>ExtendedWoodworking</li>
     </incompatibleWith>

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>976825fd-8dd7-4bbd-bc51-84afbe9b02a2</ID>
   <ModName>Expanded Woodworking</ModName>
-  <Version>v1.2.2.1</Version>
+  <Version>v1.2.2.2</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>Adventurer13</Owner>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 
-**Current:** [v1.2.2.1](https://github.com/Adventurer13/ExpandedWoodworking/releases/tag/v1.2.2.1 )
+**Current:** [v1.2.2.2](https://github.com/Adventurer13/ExpandedWoodworking/releases/tag/v1.2.2.2 )
+
+## [1.2.2.2] - 2020-11-28
+### Fixed
+- Errors with "make any lumber" recipe by removing the unfinished item functionality for it.
+- Decreased the sound volume of the recipes on the woodworking tables by a value of two.
 
 ## [1.2.2.1] - 2020-11-23
 ### New