Skip to content

Commit

Permalink
19
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dubwise56
Dubwise56 committed Feb 28, 2019
1 parent 6b55768 commit cd537ff
Show file tree
Hide file tree
Showing 233 changed files with 4,522 additions and 700 deletions.
4 changes: 2 additions & 2 deletions About/About.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<name>Dubs Bad Hygiene</name>
<author>Dubwise</author>
<url>https://ludeon.com/forums/index.php?topic=29043.0</url>
<targetVersion>0.18.1722</targetVersion>
<description>Adds hygiene and bladder needs, plumbing, bathroom fixtures, water, sewage, irrigation, central heating, air conditioning, and more!. v2.2.4</description>
<targetVersion>0.19.2009</targetVersion>
<description>Adds a sewage system, toilets, bathing, hygiene related needs and mood effects, central heating, water, irrigation, fertilizer, air conditioning, hot tubs, kitchen sinks, you name it!. v2.3.541</description>
</ModMetaData>
Binary file modified Assemblies/0Harmony.dll
View file
Binary file not shown.
Binary file modified Assemblies/BadHygiene.dll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Defs/Designations/Designations.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Defs>

<DesignationDef>
<defName>RemoveSewage</defName>
<defName>RemoveSewageDes</defName>
<texturePath>Designations/Haul</texturePath>
<targetType>Cell</targetType>
</DesignationDef>
Expand Down
51 changes: 38 additions & 13 deletions Defs/HediffDefs/Hediffs_Hygiene.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<label>moderate</label>
<statOffsets>
<FoodPoisonChance>0.05</FoodPoisonChance>
<RecruitPrisonerChance>-0.05</RecruitPrisonerChance>
<!--<RecruitPrisonerChance>-0.05</RecruitPrisonerChance>-->
<SocialImpact>-0.05</SocialImpact>
</statOffsets>
</li>
Expand All @@ -35,7 +35,7 @@
<minSeverity>0.5</minSeverity>
<statOffsets>
<FoodPoisonChance>0.1</FoodPoisonChance>
<RecruitPrisonerChance>-0.1</RecruitPrisonerChance>
<!--<RecruitPrisonerChance>-0.1</RecruitPrisonerChance>-->
<SocialImpact>-0.1</SocialImpact>
</statOffsets>
</li>
Expand All @@ -44,7 +44,7 @@
<minSeverity>0.75</minSeverity>
<statOffsets>
<FoodPoisonChance>0.15</FoodPoisonChance>
<RecruitPrisonerChance>-0.15</RecruitPrisonerChance>
<!--<RecruitPrisonerChance>-0.15</RecruitPrisonerChance>-->
<SocialImpact>-0.15</SocialImpact>
</statOffsets>
</li>
Expand All @@ -55,19 +55,44 @@
<defName>Diarrhea</defName>
<label>Diarrhea</label>
<scenarioCanAdd>true</scenarioCanAdd>
<initialSeverity>1</initialSeverity>
<comps>
<li Class="HediffCompProperties_Disappears">
<disappearsAfterTicks>
<min>90000</min>
<max>120000</max>
</disappearsAfterTicks>
<li Class="HediffCompProperties_SeverityPerDay">
<severityPerDay>-1</severityPerDay>
</li>
</comps>
<stages>
<li>
<hungerRateFactorOffset>0.5</hungerRateFactorOffset>
<painOffset>0.2</painOffset>
<vomitMtbDays>0.5</vomitMtbDays>
<label>recovering</label>
<vomitMtbDays>1</vomitMtbDays>
<capMods>
<li>
<capacity>Consciousness</capacity>
<postFactor>0.75</postFactor>
</li>
</capMods>
</li>
<li>
<label>major</label>
<minSeverity>0.2</minSeverity>
<vomitMtbDays>0.75</vomitMtbDays>
<capMods>
<li>
<capacity>Consciousness</capacity>
<postFactor>0.5</postFactor>
</li>
</capMods>
</li>
<li>
<label>initial</label>
<minSeverity>0.8</minSeverity>
<vomitMtbDays>0.75</vomitMtbDays>
<capMods>
<li>
<capacity>Consciousness</capacity>
<postFactor>0.75</postFactor>
</li>
</capMods>
</li>
</stages>
</HediffDef>
Expand All @@ -88,7 +113,7 @@
</stages>
<comps>
<li Class="HediffCompProperties_TendDuration">
<tendDuration>60000</tendDuration>
<baseTendDurationHours>12</baseTendDurationHours>
<severityPerDayTended>-0.13</severityPerDayTended>
</li>
<li Class="HediffCompProperties_Immunizable">
Expand Down Expand Up @@ -116,7 +141,7 @@
</stages>
<comps>
<li Class="HediffCompProperties_TendDuration">
<tendDuration>60000</tendDuration>
<baseTendDurationHours>12</baseTendDurationHours>
<severityPerDayTended>-0.12</severityPerDayTended>
</li>
<li Class="HediffCompProperties_Immunizable">
Expand Down
18 changes: 14 additions & 4 deletions Defs/JobDefs/Jobs_Hygiene.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<JobDef>
<defName>TriggerFireSprinkler</defName>
<driverClass>DubsBadHygiene.JobDriver_TriggerSprinkler</driverClass>
<reportString>Activating TargetA.</reportString>
</JobDef>

<JobDef>
<defName>emptySeptictank</defName>
<driverClass>DubsBadHygiene.JobDriver_emptySepticTank</driverClass>
Expand Down Expand Up @@ -37,7 +43,6 @@
<driverClass>DubsBadHygiene.JobDriver_WatchWashingMachine</driverClass>
<reportString>watching the spin cycle.</reportString>
<joyDuration>4000</joyDuration>
<joyGainRate>1</joyGainRate>
<joyKind>Meditative</joyKind>
</JobDef>

Expand All @@ -46,15 +51,14 @@
<driverClass>DubsBadHygiene.JobDriver_UseHotTub</driverClass>
<reportString>relaxing.</reportString>
<joyDuration>4000</joyDuration>
<joyGainRate>1</joyGainRate>
<joyMaxParticipants>2</joyMaxParticipants>
<joyKind>Social</joyKind>
</JobDef>

<JobDef>
<defName>DBHDrinkFromGround</defName>
<driverClass>DubsBadHygiene.JobDriver_DrinkFromGround</driverClass>
<reportString>Drinking surface water.</reportString>
<reportString>Drinking water.</reportString>
</JobDef>

<JobDef>
Expand All @@ -81,6 +85,12 @@
<reportString>washing with TargetA.</reportString>
</JobDef>

<JobDef>
<defName>washAtCell</defName>
<driverClass>DubsBadHygiene.JobDriver_washAtCell</driverClass>
<reportString>washing.</reportString>
</JobDef>

<JobDef>
<defName>takeShower</defName>
<driverClass>DubsBadHygiene.JobDriver_takeShower</driverClass>
Expand All @@ -91,7 +101,7 @@
<defName>takeBath</defName>
<driverClass>DubsBadHygiene.JobDriver_takeBath</driverClass>
<reportString>Having a bath.</reportString>
<joyKind>Passive</joyKind>
<joyKind>Meditative</joyKind>
</JobDef>

<JobDef>
Expand Down
12 changes: 6 additions & 6 deletions Defs/ModOptions/ModOptions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,19 +185,19 @@
</li>
<li>
<label>Easy</label>
<value>100</value>
<value>50</value>
</li>
<li>
<label>Normal</label>
<value>50</value>
<value>25</value>
</li>
<li>
<label>Challange</label>
<value>25</value>
<label>Challenge</label>
<value>15</value>
</li>
<li>
<label>Extreme</label>
<value>10</value>
<value>5</value>
</li>
</options>
</DubsBadHygiene.DubsModOptions>
Expand All @@ -220,7 +220,7 @@
<value>2</value>
</li>
<li>
<label>Challange</label>
<label>Challenge</label>
<value>1</value>
</li>
<li>
Expand Down
3 changes: 3 additions & 0 deletions Defs/NeedDefs/Needs_Misc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<needClass>DubsBadHygiene.Need_Bladder</needClass>
<label>bladder</label>
<description>To prevent the risk of disease it is important to maintain a good level of sanitation by removing or treating waste, and preventing sewage from contaminating you water supply.</description>
<onlyIfCausedByHediff>true</onlyIfCausedByHediff>
<baseLevel>0.8</baseLevel>
<listPriority>401</listPriority>
<Exemptions>
Expand All @@ -26,6 +27,7 @@
<needClass>DubsBadHygiene.Need_Hygiene</needClass>
<label>hygiene</label>
<description>Good personal hygiene is important for reducing the risk of disease and keeping colonists happy and healthy.</description>
<onlyIfCausedByHediff>true</onlyIfCausedByHediff>
<minIntelligence>Humanlike</minIntelligence>
<baseLevel>0.8</baseLevel>
<listPriority>321</listPriority>
Expand All @@ -47,6 +49,7 @@
<needClass>DubsBadHygiene.Need_Thirst</needClass>
<label>thirst</label>
<description>Water is required for many of life’s physiological processes. If this reaches zero then the creature will slowly die of dehydration</description>
<onlyIfCausedByHediff>true</onlyIfCausedByHediff>
<minIntelligence>Humanlike</minIntelligence>
<baseLevel>0.8</baseLevel>
<listPriority>402</listPriority>
Expand Down
8 changes: 4 additions & 4 deletions Defs/PollutionTypes/PollutionTypes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
</li>-->
</TerrainTypes>
<ThingTypes>
<li>
<defName>Filth_OilSlick</defName>
<toxicity>30</toxicity>
</li>
<li>
<defName>FilthAsh</defName>
<toxicity>2</toxicity>
Expand All @@ -18,10 +22,6 @@
<defName>FilthCorpseBile</defName>
<toxicity>3</toxicity>
</li>
<li>
<defName>FilthFuel</defName>
<toxicity>5</toxicity>
</li>
<li>
<defName>BurnPit</defName>
<toxicity>15</toxicity>
Expand Down
12 changes: 6 additions & 6 deletions Defs/Storyteller/Incidents_Map_Misc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<defName>TowerContamination</defName>
<label>Tower Contamination</label>
<category>Misc</category>
<targetTypes>
<li>MapPlayerHome</li>
</targetTypes>
<targetTags>
<li>Map_PlayerHome</li>
</targetTags>
<workerClass>DubsBadHygiene.IncidentWorker_TowerContamination</workerClass>
<letterLabel>Contaminated Water Tower</letterLabel>
<letterText>A water tower has become polluted, this poses a serious risk to the health of your colonists! Drain the tower to clear the contamination, or build a water treatment system.</letterText>
Expand All @@ -21,9 +21,9 @@
<defName>SewageSpill</defName>
<label>Sewage spill</label>
<category>Misc</category>
<targetTypes>
<li>MapPlayerHome</li>
</targetTypes>
<targetTags>
<li>Map_PlayerHome</li>
</targetTags>
<workerClass>DubsBadHygiene.IncidentWorker_SewageSpill</workerClass>
<letterLabel>Sewage Spill</letterLabel>
<letterText>A section of plumbing has broken and sewage has spilled out, sewage can be scooped up into barrels and moved.</letterText>
Expand Down
8 changes: 7 additions & 1 deletion Defs/ThingCategoryDefs/ThingCategories.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,11 @@
<parent>Root</parent>
<iconPath>DBH/Things/Resource/BurnBarrel</iconPath>
</ThingCategoryDef>


<ThingCategoryDef>
<defName>BuildingsHygiene</defName>
<label>hygiene</label>
<parent>Buildings</parent>
</ThingCategoryDef>

</Defs>
39 changes: 10 additions & 29 deletions Defs/ThingDefs_Buildings/BuildingsA_Pipes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<rect>(0,0.35,1,0.3)</rect>
</damageData>
</graphicData>
<blueprintGraphicData>
<texPath>DBH/Things/Building/SewagePipe_Atlas</texPath>
</blueprintGraphicData>
<building>
<blueprintGraphicData>
<texPath>DBH/Things/Building/SewagePipe_Atlas</texPath>
</blueprintGraphicData>
<isInert>true</isInert>
<isEdifice>false</isEdifice>
</building>
Expand All @@ -33,35 +33,13 @@
</statBases>
<placingDraggableDimensions>1</placingDraggableDimensions>
<rotatable>false</rotatable>
<selectable>true</selectable>
<neverMultiSelect>true</neverMultiSelect>
<soundImpactDefault>BulletImpactMetal</soundImpactDefault>
<clearBuildingArea>false</clearBuildingArea>
<placeWorkers>
<li>DubsBadHygiene.PlaceWorker_Pipe</li>
</placeWorkers>
</ThingDef>

<ThingDef ParentName="DubsDirtyPipeBase">
<defName>sewagePipe</defName>
<label>Plumbing (Legacy)</label>
<description>Plumbing for connecting plumbed things.</description>
<uiIconPath>DBH/UI/Plumbing</uiIconPath>
<costList>
<Steel>1</Steel>
</costList>
<comps>
<li Class="DubsBadHygiene.CompProperties_Pipe">
<mode>Sewage</mode>
</li>
</comps>
<researchPrerequisites>
<li>Plumbing</li>
</researchPrerequisites>
<menuHidden>true</menuHidden>
<designationCategory></designationCategory>
</ThingDef>

<ThingDef ParentName="DubsDirtyPipeBase">
<defName>sewagePipeStuff</defName>
<label>Plumbing</label>
Expand Down Expand Up @@ -99,9 +77,11 @@
<rect>(0,0.35,1,0.3)</rect>
</damageData>
</graphicData>
<blueprintGraphicData>
<texPath>DBH/Things/Building/ducting_atlas</texPath>
</blueprintGraphicData>
<building>
<blueprintGraphicData>
<texPath>DBH/Things/Building/ducting_atlas</texPath>
</blueprintGraphicData>
</building>
<uiIconPath>DBH/UI/coolingPipe</uiIconPath>
<costList>
<Steel>1</Steel>
Expand All @@ -114,6 +94,7 @@
<researchPrerequisites>
<li>MultiSplitAirCon</li>
</researchPrerequisites>
<designationCategory>HygieneMisc</designationCategory>
</ThingDef>

</Defs>
Loading

0 comments on commit cd537ff

Please sign in to comment.