Updated for 1.1

mantrasong · Mar 1, 2020 · 49eedba · 49eedba
1 parent 61f25bd
commit 49eedba
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 130 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -4,7 +4,8 @@
   <author>mantrasong</author>
   <url>https://ludeon.com/forums/index.php?topic=32190</url>
   <supportedVersions>
-	<li>1.0</li>
+	<li>1.1</li>
   </supportedVersions>
+  <packageId>Mantrasong.SurvAdd.1</packageId>
   <description>Adds new features for primitive and tribal playthroughs.</description>
 </ModMetaData>
diff --git a/Assemblies/SurvivalistsAdditions.dll b/Assemblies/SurvivalistsAdditions.dll
diff --git a/Defs/HediffDefs/Hediffs.xml b/Defs/HediffDefs/Hediffs.xml
@@ -3,6 +3,7 @@
 
 	<HediffDef>
 		<defName>SRV_AteSmokedMeat</defName>
+		 <description>A mood boost from eating good food</description>
 		<hediffClass>HediffWithComps</hediffClass>
 		<label>smoked meat</label>
 		<defaultLabelColor>(0.8,0.5,0.5)</defaultLabelColor>
@@ -28,6 +29,7 @@
 	<HediffDef>
 		<defName>SRV_SnaredLarge</defName>
 		<hediffClass>HediffWithComps</hediffClass>
+		 <description>The pawn has been caught by a snare! It will probably escape</description>
 		<label>snared</label>
 		<defaultLabelColor>(0.8,0.5,0.5)</defaultLabelColor>
 		<minSeverity>0.001</minSeverity>
@@ -65,6 +67,7 @@
 
 	<HediffDef>
 		<defName>SRV_SnaredSmall</defName>
+		<description>The pawn has been caught by a snare! It will probably die</description>
 		<hediffClass>HediffWithComps</hediffClass>
 		<label>snared (suffocating)</label>
 		<defaultLabelColor>(0.8,0.5,0.5)</defaultLabelColor>

diff --git a/Defs/RecipeDefs/Recipes.xml b/Defs/RecipeDefs/Recipes.xml
@@ -5,7 +5,7 @@
 
 	<RecipeDef Name="SRV_MakeBurlapBase" Abstract="True">
 		<jobString>Processing burlap.</jobString>
-		<workSpeedStat>TailoringSpeed</workSpeedStat>
+		<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
 		<workSkill>Crafting</workSkill>
 		<effectWorking>Tailor</effectWorking>
 		<soundWorking>Recipe_Tailor</soundWorking>

diff --git a/Defs/ThingDefs/Plants.xml b/Defs/ThingDefs/Plants.xml
@@ -50,10 +50,6 @@
 			<wildClusterRadius>7</wildClusterRadius>
 			<wildClusterWeight>80</wildClusterWeight>
 			<wildOrder>1</wildOrder>
-			<visualSizeRange>
-				<min>0.3</min>
-				<max>1</max>
-			</visualSizeRange>
 		</plant>
 	</ThingDef>
 
@@ -106,10 +102,6 @@
 			<wildClusterRadius>6</wildClusterRadius>
 			<wildClusterWeight>80</wildClusterWeight>
 			<wildOrder>1</wildOrder>
-			<visualSizeRange>
-				<min>0.3</min>
-				<max>1</max>
-			</visualSizeRange>
 		</plant>
 	</ThingDef>
 
@@ -153,10 +145,6 @@
 			<growDays>8</growDays>
 			<harvestYield>18</harvestYield>
 			<fertilitySensitivity>0.0</fertilitySensitivity>
-			<visualSizeRange>
-				<min>1.3</min>
-				<max>3.0</max>
-			</visualSizeRange>
 		</plant>
 	</ThingDef>
 
@@ -171,30 +159,9 @@
 			<fertilitySensitivity>0.8</fertilitySensitivity>
 			<sowTags>
 				<li>Ground</li>
-			</sowTags>
-			<visualSizeRange>
-				<min>1</min>
-				<max>2.5</max>
-			</visualSizeRange>
-		</plant>
-	</ThingDef>
-
-	<ThingDef ParentName="SRV_JuteBase">
-		<defName>SRV_HydroJute</defName>
-		<statBases>
-			<Nutrition>0.35</Nutrition>
-		</statBases>
-		<ingestible />
-		<plant>
-			<harvestYield>14</harvestYield>
-			<fertilitySensitivity>0.8</fertilitySensitivity>
-			<sowTags>
 				<li>Hydroponic</li>
-			</sowTags>
-			<visualSizeRange>
-				<min>1.1</min>
-				<max>2.8</max>
-			</visualSizeRange>
+			  </sowTags>
+			 <visualSizeRange>0.3~1.4</visualSizeRange>
 		</plant>
 	</ThingDef>
 
@@ -227,10 +194,7 @@
 			<growOptimalGlow>0</growOptimalGlow>
 			<fertilityMin>0</fertilityMin>
 			<maxMeshCount>9</maxMeshCount>
-			<visualSizeRange>
-				<min>0.4</min>
-				<max>0.65</max>
-			</visualSizeRange>
+			 <visualSizeRange>0.4~0.65</visualSizeRange>
 		</plant>
 	</ThingDef>
 
@@ -262,10 +226,7 @@
 			<harvestYield>30</harvestYield>
 			<harvestAfterGrowth>0.30</harvestAfterGrowth>
 			<fertilitySensitivity>0.0</fertilitySensitivity>
-			<visualSizeRange>
-				<min>1.0</min>
-				<max>2.0</max>
-			</visualSizeRange>
+			<visualSizeRange>0.3~1.05</visualSizeRange>
 		</plant>
 	</ThingDef>
 

diff --git a/Defs/ThingDefs_Items/Usables.xml b/Defs/ThingDefs_Items/Usables.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-	<ThingDef Name="GrilledBase" ParentName="MealRottable" Abstract="True">
+	<ThingDef Name="GrilledBase" ParentName="MealCooked" Abstract="True">
 		<description>A smoky meal slowly cooked over an open flame.</description>
 		<graphicData>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -23,7 +23,7 @@
 		</tradeTags>
 	</ThingDef>
 
-	<ThingDef ParentName="MealRottable">
+	<ThingDef ParentName="MealCooked">
 		<defName>SRV_MealTurnipSalad</defName>
 		<label>turnip salad</label>
 		<description>Fresh garden veggies chopped up and mixed together - hopefully with a clean knife.</description>
@@ -50,7 +50,7 @@
 		</tradeTags>
 	</ThingDef>
 
-	<ThingDef ParentName="MealRottable">
+	<ThingDef ParentName="MealCooked">
 		<defName>SRV_MealCabbageSalad</defName>
 		<label>cabbage salad</label>
 		<description>Fresh garden veggies chopped up and mixed together - hopefully with a clean knife.</description>

diff --git a/Defs/ThingDefs_Objects/Stations.xml b/Defs/ThingDefs_Objects/Stations.xml
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-	<ThingDef ParentName="BenchBase">
+	<ThingDef Name="SRV_OutdoorBenchBase" ParentName="BuildingBase"  Abstract="True">
+		 <canOverlapZones>false</canOverlapZones>
+		<minifiedDef>MinifiedThing</minifiedDef>
+		<terrainAffordanceNeeded>Medium</terrainAffordanceNeeded>
+		<thingCategories>
+		  <li>BuildingsProduction</li>
+		</thingCategories>
+		<statBases>
+		  <Mass>20</Mass>
+		</statBases>
+		<interactionCellIcon>DiningChair</interactionCellIcon>
+	</ThingDef>
+
+	<ThingDef ParentName="SRV_OutdoorBenchBase">
 		<defName>SRV_Grill</defName>
 		<label>grill</label>
 		<thingClass>Building_WorkTable_HeatPush</thingClass>
@@ -25,6 +38,7 @@
 			<Beauty>1</Beauty>
 			<Flammability>0</Flammability>
 			<Mass>12</Mass>
+			<WorkTableWorkSpeedFactor>0.9</WorkTableWorkSpeedFactor>
 		</statBases>
 		<size>(1,1)</size>
 		<designationCategory>Production</designationCategory>
@@ -40,7 +54,6 @@
 			<li>SRV_GrillMealVeg</li>
 			<li>SRV_GrillMealVegDouble</li>
 			<li>SRV_GrillMealFine</li>
-			<!--<li>SRV_MakePemmicanGrill</li>-->
 		</recipes>
 		<inspectorTabs>
 			<li>ITab_Bills</li>
@@ -72,12 +85,10 @@
 			<isMealSource>true</isMealSource>
 			<heatPerTickWhileWorking>0.10</heatPerTickWhileWorking>
 			<spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
-			<workSpeedPenaltyOutdoors>false</workSpeedPenaltyOutdoors>
-			<workSpeedPenaltyTemperature>false</workSpeedPenaltyTemperature>
 		</building>
 	</ThingDef>
 
-	<ThingDef ParentName="BuildingBase">
+	<ThingDef ParentName="SRV_OutdoorBenchBase">
 		<defName>SRV_Forge</defName>
 		<label>forge</label>
 		<thingClass>Building_WorkTable_HeatPush</thingClass>
@@ -151,8 +162,6 @@
 		<building>
 			<spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
 			<heatPerTickWhileWorking>0.25</heatPerTickWhileWorking>
-			<workSpeedPenaltyOutdoors>false</workSpeedPenaltyOutdoors>
-			<workSpeedPenaltyTemperature>false</workSpeedPenaltyTemperature>
 		</building>
 		<placeWorkers>
 			<li>PlaceWorker_ShowFacilitiesConnections</li>
@@ -162,7 +171,7 @@
 		</researchPrerequisites>
 	</ThingDef>
 
-	<ThingDef ParentName="BenchBase">
+	<ThingDef ParentName="SRV_OutdoorBenchBase">
 		<defName>SRV_Smoker</defName>
 		<label>smoker</label>
 		<thingClass>SurvivalistsAdditions.Building_Smoker</thingClass>
@@ -219,13 +228,9 @@
 		<placeWorkers>
 			<li>PlaceWorker_NotUnderRoof</li>
 		</placeWorkers>
-		<building>	
-			<workSpeedPenaltyOutdoors>false</workSpeedPenaltyOutdoors>
-			<workSpeedPenaltyTemperature>false</workSpeedPenaltyTemperature>
-		</building>
 	</ThingDef>
 
-	<ThingDef Name="CampTableBase" ParentName="BenchBase" Abstract="True">
+	<ThingDef Name="CampTableBase" ParentName="SRV_OutdoorBenchBase" Abstract="True">
 		<thingClass>Building_WorkTable</thingClass>
 		<graphicData>
 			<graphicClass>Graphic_Multi</graphicClass>
@@ -259,8 +264,6 @@
 		</inspectorTabs>
 		<building>
 			<spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
-			<!--<workSpeedPenaltyOutdoors>true</workSpeedPenaltyOutdoors>
-			<workSpeedPenaltyTemperature>true</workSpeedPenaltyTemperature>-->
 		</building>
 		<comps>
 			<li>

diff --git a/Defs/ThingDefs_Objects/Utility.xml b/Defs/ThingDefs_Objects/Utility.xml
@@ -5,7 +5,7 @@
 	<!-- ======================== Facilities ======================= -->
 
 
-	<ThingDef ParentName="BenchBase">
+	<ThingDef ParentName="SRV_OutdoorBenchBase">
 		<defName>SRV_Bellows</defName>
 		<thingClass>Building</thingClass>
 		<label>bellows</label>
@@ -52,17 +52,14 @@
 		<researchPrerequisites>
 			<li>SRV_Forge</li>
 		</researchPrerequisites>
-		<building>
-			<workSpeedPenaltyOutdoors>false</workSpeedPenaltyOutdoors>
-			<workSpeedPenaltyTemperature>false</workSpeedPenaltyTemperature>
-		</building>
+
 	</ThingDef>
 
 
 	<!-- ======================== Utility ======================= -->
 
 
-	<ThingDef Name="SRV_Barrel" ParentName="BenchBase">
+	<ThingDef Name="SRV_Barrel" ParentName="SRV_OutdoorBenchBase">
 		<defName>SRV_VinegarBarrel</defName>
 		<thingClass>SurvivalistsAdditions.Building_VinegarBarrel</thingClass>
 		<label>vinegar barrel</label>

diff --git a/Source/SurvivalistsAdditions/Map/IncidentWorker_MushroomSprout.cs b/Source/SurvivalistsAdditions/Map/IncidentWorker_MushroomSprout.cs
@@ -54,7 +54,7 @@ protected override bool TryExecuteWorker(IncidentParms parms)
             {
                 return false;
             }
-            SendStandardLetter(thing, null);
+            SendStandardLetter(parms, null);
             return true;
         }
 

diff --git a/Source/SurvivalistsAdditions/PlaceWorkers/PlaceWorker_Roofed.cs b/Source/SurvivalistsAdditions/PlaceWorkers/PlaceWorker_Roofed.cs
@@ -4,7 +4,7 @@ namespace SurvivalistsAdditions {
 
   public class PlaceWorker_Roofed : PlaceWorker {
 
-		public override AcceptanceReport AllowsPlacing(BuildableDef checkingDef, IntVec3 loc, Rot4 rot, Map map, Thing thingToIgnore = null) {
+		public override AcceptanceReport AllowsPlacing(BuildableDef checkingDef, IntVec3 loc, Rot4 rot, Map map, Thing thingToIgnore = null, Thing thing = null) {
       foreach (IntVec3 current in GenAdj.CellsOccupiedBy(loc, rot, checkingDef.Size)) {
         if (!map.roofGrid.Roofed(current)) {
           return new AcceptanceReport ("SRV_NeedsRoof".Translate(new object[] { checkingDef.LabelCap }));