17

Dubwise56 · Feb 28, 2019 · becf20a · becf20a
1 parent c1baae5
commit becf20a
Show file tree

Hide file tree

Showing 44 changed files with 672 additions and 203 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -2,8 +2,8 @@
 
 <ModMetaData>
 	<name>Dubs Hygiene and Central Heating</name>
-	<author>Dubwise56</author>
+	<author>Dubwise</author>
 	<url></url>
-	<targetVersion>0.16.1393</targetVersion>
-	<description>Adds a sewage system, toilets, showers, wash basins. And hygiene related needs and moods</description>
+	<targetVersion>0.17.1543</targetVersion>
+	<description>Adds hygiene related needs and mood effects, plumbing, bathroom fixtures and central heating.</description>
 </ModMetaData>
diff --git a/About/Preview - Copy.png b/About/Preview - Copy.png
diff --git a/Assemblies/BadHygiene.dll b/Assemblies/BadHygiene.dll
diff --git a/Defs/Effects/Mote_Visual.xml b/Defs/Effects/Mote_Visual.xml
@@ -23,5 +23,32 @@
     <defName>Mote_FecalBit</defName>
   </ThingDef>
 
+  <ThingDef Name="BasedMote" Abstract="True">
+    <thingClass>MoteThrown</thingClass>
+    <label>Mote</label>
+    <category>Mote</category>
+    <graphicData>
+      <graphicClass>Graphic_Mote</graphicClass>
+      <shaderType>Mote</shaderType>
+    </graphicData>
+    <altitudeLayer>MoteLow</altitudeLayer>
+    <tickerType>Normal</tickerType>
+    <useHitPoints>false</useHitPoints>
+    <isSaveable>false</isSaveable>
+    <rotatable>false</rotatable>
+  </ThingDef>
+
+  <ThingDef ParentName="BasedMote">
+    <defName>Mote_Sewage</defName>
+    <graphicData>
+      <texPath>Things/Mote/sewage2</texPath>
+    </graphicData>
+    <altitudeLayer>MoteLow</altitudeLayer>
+    <mote>
+      <fadeInTime>0.40</fadeInTime>
+      <solidTime>2</solidTime>
+      <fadeOutTime>2</fadeOutTime>
+    </mote>
+  </ThingDef>
 
 </Defs>
diff --git a/Defs/HediffDefs/Hediffs_Global_Misc.xml b/Defs/HediffDefs/Hediffs_Global_Misc.xml
@@ -2,12 +2,13 @@
 <Defs>
 
   <HediffDef>
+    <defName>DiarrheaVomiting</defName>
+    <label>diarrhea and vomiting</label>
     <hediffClass>HediffWithComps</hediffClass>
     <defaultLabelColor>(0.8, 0.8, 0.35)</defaultLabelColor>
     <initialSeverity>0.001</initialSeverity>
-
-		<defName>DiarrheaVomiting</defName>
-		<label>diarrhea and vomiting</label>
+    <makesSickThought>true</makesSickThought>
+    <tendable>false</tendable>
 		<comps>
 			<li Class="HediffCompProperties_Disappears">
 				<disappearsAfterTicks>

diff --git a/Defs/JobDefs/Jobs_Work.xml b/Defs/JobDefs/Jobs_Work.xml
@@ -1,64 +1,65 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-	<JobDef>
-		<defName>lightBurnBarrel</defName>
-		<driverClass>DubsBadHygiene.JobDriver_lightBurnBarrel</driverClass>
-		<reportString>setting fire to TargetA.</reportString>
-	</JobDef>
+  <JobDef>
+    <defName>lightBurnBarrel</defName>
+    <driverClass>DubsBadHygiene.JobDriver_lightBurnBarrel</driverClass>
+    <reportString>setting fire to TargetA.</reportString>
+  </JobDef>
 
-	<JobDef>
-		<defName>emptyLatrine</defName>
-		<driverClass>DubsBadHygiene.JobDriver_emptyLatrine</driverClass>
-		<reportString>hauling TargetA.</reportString>
-	</JobDef>
+  <JobDef>
+    <defName>emptyLatrine</defName>
+    <driverClass>DubsBadHygiene.JobDriver_emptyLatrine</driverClass>
+    <reportString>hauling TargetA.</reportString>
+  </JobDef>
 
-	<JobDef>
-		<defName>UseToilet</defName>
-		<driverClass>DubsBadHygiene.JobDriver_UseToilet</driverClass>
-		<reportString>having bowel movement at TargetA.</reportString>
-	</JobDef>
-
-		<JobDef>
-		<defName>haveWildPoo</defName>
-		<driverClass>DubsBadHygiene.JobDriver_poopOutside</driverClass>
-		<reportString>having bowel movement outside.</reportString>
-	</JobDef>
+  <JobDef>
+    <defName>UseToilet</defName>
+    <driverClass>DubsBadHygiene.JobDriver_UseToilet</driverClass>
+    <reportString>having bowel movement at TargetA.</reportString>
+  </JobDef>
 
-	<JobDef>
-		<defName>useWetWipe</defName>
-		<driverClass>DubsBadHygiene.JobDriver_useWetWipe</driverClass>
-		<reportString>cleaning with TargetA.</reportString>
-	</JobDef>
+  <JobDef>
+    <defName>haveWildPoo</defName>
+    <driverClass>DubsBadHygiene.JobDriver_poopOutside</driverClass>
+    <reportString>having bowel movement outside.</reportString>
+  </JobDef>
 
-	<JobDef>
-		<defName>takeShower</defName>
-		<driverClass>DubsBadHygiene.JobDriver_takeShower</driverClass>
-		<reportString>washing with TargetA.</reportString>
-	</JobDef>
-
-		<JobDef>
-		<defName>takeBath</defName>
-		<driverClass>DubsBadHygiene.JobDriver_takeBath</driverClass>
-		<reportString>washing with TargetA.</reportString>
-	</JobDef>
+  <JobDef>
+    <defName>useWetWipe</defName>
+    <driverClass>DubsBadHygiene.JobDriver_useWetWipe</driverClass>
+    <reportString>cleaning with TargetA.</reportString>
+  </JobDef>
 
-	<JobDef>
-		<defName>washHands</defName>
-		<driverClass>DubsBadHygiene.JobDriver_washHands</driverClass>
-		<reportString>washing hands at TargetA.</reportString>
-	</JobDef>
+  <JobDef>
+    <defName>takeShower</defName>
+    <driverClass>DubsBadHygiene.JobDriver_takeShower</driverClass>
+    <reportString>washing with TargetA.</reportString>
+  </JobDef>
 
-	<JobDef>
-		<defName>washPatient</defName>
-		<driverClass>DubsBadHygiene.JobDriver_washPatient</driverClass>
-		<reportString>washing TargetA.</reportString>
-	</JobDef>
+  <JobDef>
+    <defName>takeBath</defName>
+    <driverClass>DubsBadHygiene.JobDriver_takeBath</driverClass>
+    <reportString>washing with TargetA.</reportString>
+    <joyKind>Passive</joyKind>
+  </JobDef>
 
-	<JobDef>
-		<defName>provideBedpan</defName>
-		<driverClass>DubsBadHygiene.JobDriver_cleanBedpan</driverClass>
-		<reportString>cleaning up bedpan.</reportString>
-	</JobDef>
+  <JobDef>
+    <defName>washHands</defName>
+    <driverClass>DubsBadHygiene.JobDriver_washHands</driverClass>
+    <reportString>washing hands at TargetA.</reportString>
+  </JobDef>
+
+  <JobDef>
+    <defName>washPatient</defName>
+    <driverClass>DubsBadHygiene.JobDriver_washPatient</driverClass>
+    <reportString>washing TargetA.</reportString>
+  </JobDef>
+
+  <JobDef>
+    <defName>provideBedpan</defName>
+    <driverClass>DubsBadHygiene.JobDriver_cleanBedpan</driverClass>
+    <reportString>cleaning up bedpan.</reportString>
+  </JobDef>
 
 </Defs>
diff --git a/Defs/RecipeDefs/Recipes_Production.xml b/Defs/RecipeDefs/Recipes_Production.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RecipeDefs>
+
+	<RecipeDef>
+		<defName>MakeFecalSludge</defName>
+		<label>make fecal sludge</label>
+		<description>Make fecal sludge from human waste.</description>
+		<jobString>Refining chemfuel from wood.</jobString>
+		<effectWorking>Cook</effectWorking>
+		<soundWorking>Recipe_CookMeal</soundWorking>
+		<workAmount>2500</workAmount>
+		<workSkill>Intellectual</workSkill>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>BurnBarrel</li>
+					</thingDefs>
+				</filter>
+				<count>1</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>BurnBarrel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+      <fecalsludge>35</fecalsludge>
+		</products>
+    <recipeUsers>
+      <li>CraftingSpot</li>
+    </recipeUsers>
+	</RecipeDef>
+
+</RecipeDefs>
diff --git a/Defs/ResearchProjectDefs/ResearchProjects_Tier1_Misc.xml b/Defs/ResearchProjectDefs/ResearchProjects_Tier1_Misc.xml
@@ -6,17 +6,17 @@
   <ResearchProjectDef>
     <defName>Plumbing</defName>
     <label>plumbing</label>
-    <description>Create networks of pipes for sewage management.</description>
-    <baseCost>1200</baseCost>
-    <techLevel>Industrial</techLevel>
+    <description>Use pipes, plumbing fixtures, tanks, and other apparatuses to provide heating, waste removal, and potable water.</description>
+    <baseCost>700</baseCost>
+    <techLevel>Medieval</techLevel>
     <researchViewX>2</researchViewX>
     <researchViewY>4</researchViewY>
   </ResearchProjectDef>
 
   <ResearchProjectDef>
-    <defName>CentralHeating</defName>
-    <label>Central Heating</label>
-    <description>Central heating provides warmth to the whole interior of a building from one point to multiple rooms.</description>
+    <defName>PoweredPlumbing</defName>
+    <label>Powered Plumbing</label>
+    <description>Build powered sewage treatment, immersion and solar heaters.</description>
     <baseCost>1200</baseCost>
     <techLevel>Industrial</techLevel>
     <prerequisites>

diff --git a/Defs/Rooms/RoomRoles.xml b/Defs/Rooms/RoomRoles.xml
@@ -14,11 +14,4 @@
     </relatedStats>
   </RoomRoleDef>
 
-
-  <RoomRoleDef>
-    <defName>Barn</defName>
-    <label>barn</label>
-    <workerClass>DubsBadHygiene.RoomRoleWorker_Barn</workerClass>
-  </RoomRoleDef>
-
 </RoomRoleDefs>
diff --git a/Defs/Storyteller/Incidents_Map_Misc.xml b/Defs/Storyteller/Incidents_Map_Misc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+	<IncidentDef>
+		<defName>DiarrheaVomiting</defName>
+		<label>Diarrhea and Vomiting</label>
+    <workerClass>DubsBadHygiene.IncidentWorker_Disease</workerClass>
+		<category>Misc</category>
+		<targetType>MapPlayerHome</targetType>
+		<baseChance>1.0</baseChance>
+		<minRefireDays>15</minRefireDays>
+    <diseaseIncident>DiarrheaVomiting</diseaseIncident>
+    <diseaseVictimFractionRange>
+      <min>0.2</min>
+      <max>0.5</max>
+    </diseaseVictimFractionRange>
+	</IncidentDef>
+
+</Defs>