rimwolrd 1.0 update

sulusdacor · Oct 26, 2018 · a41a8ce · a41a8ce
1 parent 1e283ae
commit a41a8ce
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 107 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,15 +2,16 @@
 <ModMetaData>
   <name>[sd] luciferium production</name>
   <author>sulusdacor</author>
-  <targetVersion>0.18.1722</targetVersion>
+  <targetVersion>1.0.2059</targetVersion>
   <url>https://ludeon.com/forums/index.php?topic=26276.0</url>
 	<description>"luciferium production"
+	Ver.: 1.0-1.0.0
 
 	"These mechanoids could be the devil's spawn" - one colonist said and a crazy scientist started researching^^
 
 	- adds a way to produce luciferium
 	- needs research to build/produce/start, recipes need pawns with 10 crafting (extracting) and 7 medicine (medicine just for recipe on druglab)
-	- how to get: kill mechs, get mech oil from them, distille it to raw luciferium batches, make luciferium with neutroamine at druglab
+	- how to get: kill mechs, get mech oil from them (sideproduct of disassembly), distille it to raw luciferium batches, make luciferium with neutroamine at druglab
 	- can build a stasis pod to extract mech oil
 	- all stuff can be traded (exotic goods traders)
 

diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -69,4 +69,11 @@ personal changelog for mod "[sd] luciferium production""
 
 - 15/01/2018
 
-	- added modsync
+	- added modsync
+
+- 26/10/2018
+
+	- rimworld 1.0 update
+	- assembly update,mostly some stuff that was renamed
+	- xml updates
+	- changed oil to be a side product of disassembly of mechs (since shut down was removed)
diff --git a/Assemblies/sd_luciprod.dll b/Assemblies/sd_luciprod.dll
diff --git a/Defs/RecipeDefs/sd_luciprod_RecipeDefs.xml b/Defs/RecipeDefs/sd_luciprod_RecipeDefs.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
+<!--============ 
   <RecipeDef>
 		<defName>sd_luciprod_extract_mechanites_scyther</defName>
 		<label>extract mechanite oil</label>
 		<description>Extract mechanite oil from scyther. yields: 1</description>
-		<workerClass>Recipe_ShutDown</workerClass>
+		<workerClass>Recipe_ExecuteByCut</workerClass>
 		<jobString>Extracting.</jobString>
 		<workAmount>2000</workAmount>
 		<hideBodyPartNames>true</hideBodyPartNames>
-		<addsHediff>ShutDown</addsHediff>
     <effectWorking>Repair</effectWorking>
     <isViolation>true</isViolation>
 	<skillRequirements>
@@ -20,19 +20,19 @@
 			<sd_luciprod_mechanite_oil>1</sd_luciprod_mechanite_oil>
 		</products>
 		<recipeUsers>
-	      <li>Mechanoid_Scyther</li>
+	      <li>Mech_Scyther</li>
+		  <li>Mech_Lancer</li>
 	    </recipeUsers>
   </RecipeDef>
   
   <RecipeDef>
 		<defName>sd_luciprod_extract_mechanites_centipede</defName>
 		<label>extract mechanite oil</label>
 		<description>Extract mechanite oil from centipede. yields: 2</description>
-		<workerClass>Recipe_ShutDown</workerClass>
+		<workerClass>Recipe_ExecuteByCut</workerClass>
 		<jobString>Extracting.</jobString>
 		<workAmount>2000</workAmount>
 		<hideBodyPartNames>true</hideBodyPartNames>
-		<addsHediff>ShutDown</addsHediff>
     <effectWorking>Repair</effectWorking>
     <isViolation>true</isViolation>
 	<skillRequirements>
@@ -43,10 +43,10 @@
 			<sd_luciprod_mechanite_oil>2</sd_luciprod_mechanite_oil>
 		</products>
 		<recipeUsers>
-	      <li>Mechanoid_Centipede</li>
+	      <li>Mech_Centipede</li>
 	    </recipeUsers>
   </RecipeDef>
-  
+====-->
   <RecipeDef>
 		<defName>sd_luciprod_extract_oil_pod</defName>
 		<label>extract mechanite oil</label>
@@ -110,7 +110,7 @@
 		<description>produce 5 luciferium pills out of 10 neutroamine and 10 raw luciferium batches</description>
 		<jobString>Producing Luciferium.</jobString>
 		<workAmount>1000</workAmount>
-		<workSpeedStat>DrugProductionSpeed</workSpeedStat>
+		<workSpeedStat>DrugSynthesisSpeed</workSpeedStat>
 		<effectWorking>Cook</effectWorking>
 		<soundWorking>Recipe_Brewing</soundWorking>
 		<ingredients>
@@ -174,7 +174,7 @@
 		<products>
 			<Steel>25</Steel>
 			<Plasteel>5</Plasteel>
-			<Component>1</Component>
+			<ComponentIndustrial>1</ComponentIndustrial>
 		</products>
 	<skillRequirements>
 			<Crafting>10</Crafting>

diff --git a/Defs/ResearchProjectDefs/sd_luciprod_ResearchProjectDefs.xml b/Defs/ResearchProjectDefs/sd_luciprod_ResearchProjectDefs.xml
@@ -9,9 +9,6 @@
 		<description>Produce luciferium by harvesting mechanoid corpses for traces of mechanites to turn them into luciferium.</description>
 		<baseCost>3000</baseCost>
 		<techLevel>Spacer</techLevel>
-		<tags>
-			<li>Spacer</li>
-		</tags>
 		<prerequisites>
 			<li>DrugProduction</li>
 			<li>MicroelectronicsBasics</li>

diff --git a/Defs/ThingDefs_Buildings/sd_luciprod_ThingDefs_Buildings.xml b/Defs/ThingDefs_Buildings/sd_luciprod_ThingDefs_Buildings.xml
@@ -14,7 +14,10 @@
         <rect>(0.05,0.1,0.9,0.9)</rect>
       </damageData>
     </graphicData>
-    <minifiedDef>MinifiedFurniture</minifiedDef>
+    <minifiedDef>MinifiedThing</minifiedDef>
+    <thingCategories>
+      <li>BuildingsProduction</li>
+    </thingCategories>
 	<castEdgeShadows>true</castEdgeShadows>
     <altitudeLayer>Building</altitudeLayer>
     <passability>PassThroughOnly</passability>
@@ -29,7 +32,7 @@
     <description>A distillery will turn 10 units of mechanite oil into 5 raw luciferium batches. These are used to produce luciferium pills at the drug lab.</description>
     <costList>
       <Steel>30</Steel>
-      <Component>1</Component>
+      <ComponentIndustrial>1</ComponentIndustrial>
     </costList>
     <tickerType>Rare</tickerType>
     <rotatable>true</rotatable>
@@ -39,7 +42,7 @@
 		<li Class="CompProperties_Power">
 			<compClass>CompPowerTrader</compClass>
 			<basePowerConsumption>100</basePowerConsumption>
-			<startElectricalFires>true</startElectricalFires>
+			<shortCircuitInRain>true</shortCircuitInRain>
 		</li>
 		<li Class="CompProperties_Flickable"/>
 		<li Class="CompProperties_Glower">
@@ -76,11 +79,14 @@
         <rect>(0.3,0.1,2.4,1.8)</rect>
       </damageData>
     </graphicData>
-	<minifiedDef>MinifiedFurniture</minifiedDef>
+	<minifiedDef>MinifiedThing</minifiedDef>
+    <thingCategories>
+      <li>BuildingsProduction</li>
+    </thingCategories>
 	<rotatable>true</rotatable>
     <costList>
       <Steel>100</Steel>
-      <Component>2</Component>
+      <ComponentIndustrial>2</ComponentIndustrial>
 	  <sd_luciprod_mechanite_oil>20</sd_luciprod_mechanite_oil>
 	  <sd_luciprod_prep_mech_corpse>1</sd_luciprod_prep_mech_corpse>
     </costList>
@@ -108,7 +114,7 @@
       <li Class="CompProperties_Power">
         <compClass>CompPowerTrader</compClass>
         <basePowerConsumption>2500</basePowerConsumption>
-        <startElectricalFires>true</startElectricalFires>
+        <shortCircuitInRain>true</shortCircuitInRain>
       </li>
       <li Class="CompProperties_Flickable"/>
       <li Class="CompProperties_Glower">

diff --git a/Defs/ThingDefs_Buildings/sd_luciprod_ThingDefs_Buildings_bases.xml b/Defs/ThingDefs_Buildings/sd_luciprod_ThingDefs_Buildings_bases.xml
@@ -6,13 +6,13 @@
 	<ThingDef Name="BuildingBase" Abstract="True">
 		<category>Building</category>
 		<thingClass>Building</thingClass>
-		<soundImpactDefault>BulletImpactMetal</soundImpactDefault>
+		<soundImpactDefault>BulletImpact_Metal</soundImpactDefault>
 		<selectable>true</selectable>
 		<drawerType>MapMeshAndRealTime</drawerType>
 		<terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
 		<repairEffect>Repair</repairEffect>
 		<leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
-		<filthLeaving>BuildingRubble</filthLeaving>
+		<filthLeaving>Filth_RubbleBuilding</filthLeaving>
 			<statBases>
 				<SellPriceFactor>0.70</SellPriceFactor>
 			</statBases>

diff --git a/Patches/sd_luciprod_patch_mechanoidsextraordinaire.xml b/Patches/sd_luciprod_patch_mechanoidsextraordinaire.xml
diff --git a/Patches/sd_luciprod_patch_moremechanoids.xml b/Patches/sd_luciprod_patch_moremechanoids.xml
diff --git a/Patches/sd_luciprod_patch_vanilla.xml b/Patches/sd_luciprod_patch_vanilla.xml
@@ -9,5 +9,14 @@
 		  <li>sd_luciprod.Designator_sd_luciprod_ExtractOil</li>
 		</value>
 	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>*/RecipeDef[defName = "ButcherCorpseMechanoid"]</xpath>
+		<value>
+			<products>
+				<sd_luciprod_mechanite_oil>1</sd_luciprod_mechanite_oil>
+			</products>
+		</value>
+	</Operation>
 
 </Patch>