Merge pull request #30 from Adventurer13/1.1.1.0-Update

Expanded Woodworking for 1.1 Release of Rimworld

Defs/ThingCategoryDefs/Category_Wood.xml → 1.0/Defs/ThingCategoryDefs/Category_Wood.xml

@@ -4,7 +4,7 @@
 
     <ThingCategoryDef>
         <defName>WoodTypes</defName>
-        <label>plant/wood logs</label>
+        <label>wood logs</label>
         <parent>ResourcesRaw</parent>
         <resourceReadoutRoot>false</resourceReadoutRoot>
         <iconPath>Things/Resources/BasicWoodLog</iconPath>

Defs/ThingDefs/Buildings_Production.xml → 1.0/Defs/ThingDefs/Buildings_Production.xml

@@ -4,7 +4,7 @@
         <defName>TableWoodworking</defName>
         <label>woodworking table</label>
         <thingClass>Building_WorkTable_HeatPush</thingClass>
-        <description>A foot powered woodworking table. Works at 70% of the speed of an electric woodworking table.</description>
+        <description>A foot powered woodworking table. Works at 60% of the speed of an electric woodworking table.</description>
         <graphicData>
             <texPath>Things/Building/TableWoodworking/TableWoodworkingFoot</texPath>
             <graphicClass>Graphic_Multi</graphicClass>
@@ -36,7 +36,7 @@
 			<MaxHitPoints>180</MaxHitPoints>
             <Flammability>1.0</Flammability>
 			<Cleanliness>-5</Cleanliness>
-			<WorkTableWorkSpeedFactor>0.7</WorkTableWorkSpeedFactor>
+			<WorkTableWorkSpeedFactor>0.6</WorkTableWorkSpeedFactor>
         </statBases>
         <size>(3,1)</size>
         <designationCategory>Production</designationCategory>
@@ -69,7 +69,7 @@
         <defName>ElectricTableWoodworking</defName>
         <label>electric woodworking table</label>
         <thingClass>Building_WorkTable_HeatPush</thingClass>
-        <description>An electric woodworking table. Can work without electricity at 70% of normal speed.</description>
+        <description>An electric woodworking table. Can work without electricity at 60% of normal speed.</description>
         <graphicData>
             <texPath>Things/Building/TableWoodworking/TableWoodworking</texPath>
             <graphicClass>Graphic_Multi</graphicClass>
@@ -116,7 +116,7 @@
         </inspectorTabs>
 		<building>
 			<workSpeedPenaltyOutdoors>false</workSpeedPenaltyOutdoors>
-			<unpoweredWorkTableWorkSpeedFactor>0.7</unpoweredWorkTableWorkSpeedFactor>
+			<unpoweredWorkTableWorkSpeedFactor>0.6</unpoweredWorkTableWorkSpeedFactor>
 			<spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
 			<heatPerTickWhileWorking>0.08</heatPerTickWhileWorking>
 		</building>

Patches/UniMisc.xml → 1.0/Patches/UniMisc.xml

@@ -10,10 +10,7 @@
 			<success>Always</success>
 			<operations>
 				<li Class= "PatchOperationRemove">
-					<xpath>Defs/ThingDef[defName = "SPBoats_RowboatBlueprint"]/costList/WoodLog	|
-							Defs/ThingDef[defName = "SPBoats_FishingBoatBlueprint"]/costList/WoodLog	|
-							Defs/ThingDef[defName = "SPBoats_CaravelBlueprint"]/costList/WoodLog	|
-							Defs/ThingDef[defName = "SPBoats_GalleonBlueprint"]/costList/WoodLog</xpath>
+					<xpath>Defs/ThingDef[defName = "SPBoats_RowboatBlueprint" or defName = "SPBoats_FishingBoatBlueprint" or defName = "SPBoats_CaravelBlueprint" or defName = "SPBoats_GalleonBlueprint"]/costList/WoodLog</xpath>
 				</li>
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName = "SPBoats_RowboatBlueprint"]</xpath>
@@ -54,7 +51,40 @@
 			</operations>
 		</match>
 	</Operation>
-
+
+	<!--  [RF] Fertile Fields -->
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>[RF] Fertile Fields [1.0]</li>
+		</mods>
+		<match Class= "PatchOperationSequence">
+			<success>Always</success>
+			<operations>
+				<li Class= "PatchOperationRemove">
+					<xpath>Defs/ThingDef[defName = "CompostBarrel"]/costList/WoodLog	|
+							Defs/ThingDef[defName = "CompostBarrel"]/constructEffect</xpath>
+				</li>
+				<!-- <li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName = "CompostBin"]</xpath>
+					<value>
+						<stuffCategories>
+							<li>Woody</li>
+						</stuffCategories>
+						<costStuffCount>2</costStuffCount>
+					</value>
+				</li> -->
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName = "CompostBarrel"]</xpath>
+					<value>
+						<stuffCategories>
+							<li>Woody</li>
+						</stuffCategories>
+						<costStuffCount>10</costStuffCount>
+					</value>
+				</li>
+			</operations>
+		</match>
+	</Operation>
 
   <!-- UN-Colony -->
   <!-- Recipes -->

Patches/Z_CE.xml → 1.0/Patches/Z_CE.xml

@@ -18,8 +18,8 @@
 								<li>Blunt</li>
 							</capacities>
 							<power>2</power>
-                          <cooldownTime>0.99</cooldownTime>
-                          <armorPenetrationBlunt>0.288</armorPenetrationBlunt>
+							<cooldownTime>0.99</cooldownTime>
+							<armorPenetrationBlunt>0.288</armorPenetrationBlunt>
 						</li>
 					</tools>
 				</value>
@@ -29,8 +29,8 @@
 				<value>
 					<equippedStatOffsets>
 						<MeleeCritChance>0.2</MeleeCritChance>
-				<MeleeParryChance>1</MeleeParryChance>
-				<MeleeDodgeChance>0.13</MeleeDodgeChance>
+						<MeleeParryChance>1</MeleeParryChance>
+						<MeleeDodgeChance>0.13</MeleeDodgeChance>
 					</equippedStatOffsets>
 				</value>
 			</li>
@@ -53,7 +53,7 @@
 					<StuffPower_Armor_Blunt>0.2</StuffPower_Armor_Blunt>
 				</value>
 			</li>
-            <li Class="PatchOperationReplace">
+			<li Class="PatchOperationReplace">
 				<xpath>Defs/ThingDef[@Name="WoodLogBase"]/statBases/StuffPower_Armor_Heat</xpath>
 				<value>
 					<StuffPower_Armor_Heat>0.025</StuffPower_Armor_Heat>
@@ -122,18 +122,23 @@
 			<li Class="ExpandedWoodworking.PatchOperationModCompat">
 				<modName>Combat Extended</modName>
 			</li>
-			<li Class="PatchOperationAdd">
-				<xpath>Defs/ThingDef[defName = "Pila"]</xpath>
+			<li Class="PatchOperationReplace">
+				<xpath>Defs/RecipeDef[defName = "MakeAmmo_Pilum"]/ingredients/li/filter/thingDefs[li = "WoodLog"]</xpath>
 				<value>
-					<costList>
-						<Steel>1</Steel>
-					</costList>
+					<categories>
+						<li>WoodTypes</li>
+					</categories>
 				</value>
 			</li>
-			<li Class="PatchOperationReplace">
-				<xpath>Defs/ThingDef[defName = "Pila"]/costStuffCount</xpath>
+			<li Class="PatchOperationRemove">
+				<xpath>Defs/RecipeDef[defName = "MakeAmmo_Pilum"]/fixedIngredientFilter/thingDefs/li[.="WoodLog"]</xpath>
+			</li>
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/RecipeDef[defName = "MakeAmmo_Pilum"]/fixedIngredientFilter</xpath>
 				<value>
-					<costStuffCount>1</costStuffCount>
+					<categories>
+						<li>WoodTypes</li>
+					</categories>
 				</value>
 			</li>
 		</operations>