Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Dubwise56 committed May 16, 2021
1 parent 5b09372 commit a40e9ee
Show file tree
Hide file tree
Showing 8 changed files with 163 additions and 159 deletions.
Binary file modified 1.2/Assemblies/BadHygiene.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions 1.2/Defs/HediffDefs/Hediffs_Hygiene_Bionics.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<Mass>2</Mass>
</statBases>
<recipeMaker>
<researchPrerequisite>HygieneBionics</researchPrerequisite>
<researchPrerequisite MayRequire="dbhlitemode">HygieneBionics</researchPrerequisite>
</recipeMaker>
</ThingDef>

Expand Down Expand Up @@ -107,7 +107,7 @@
<Mass>2</Mass>
</statBases>
<recipeMaker>
<researchPrerequisite>HygieneBionics</researchPrerequisite>
<researchPrerequisite MayRequire="dbhlitemode">HygieneBionics</researchPrerequisite>
</recipeMaker>
</ThingDef>

Expand Down
4 changes: 2 additions & 2 deletions 1.2/Defs/ThingDefs_Buildings/BuildingsF_Irrigation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<isEdifice>false</isEdifice>
<canBuildNonEdificesUnder>true</canBuildNonEdificesUnder>
</building>
<pathCost>8</pathCost>
<pathCost>0</pathCost>
<size>(1,1)</size>
<costList>
<Steel>15</Steel>
Expand Down Expand Up @@ -95,7 +95,7 @@
<isEdifice>false</isEdifice>
<canBuildNonEdificesUnder>true</canBuildNonEdificesUnder>
</building>
<pathCost>8</pathCost>
<pathCost>0</pathCost>
<size>(1,1)</size>
<costList>
<Steel>15</Steel>
Expand Down
309 changes: 155 additions & 154 deletions 1.2/Defs/ThingDefs_Items/Items_Resource_Stuff.xml
Original file line number Diff line number Diff line change
@@ -1,166 +1,167 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingDef Name="ResourceBasedMom" Abstract="True">
<thingClass>ThingWithComps</thingClass>
<category>Item</category>
<resourceReadoutPriority>Middle</resourceReadoutPriority>
<useHitPoints>true</useHitPoints>
<selectable>true</selectable>
<altitudeLayer>Item</altitudeLayer>
<stackLimit>75</stackLimit>
<statBases>
<Beauty>-7</Beauty>
</statBases>
<comps>
<li Class="CompProperties_Forbiddable"/>
</comps>
<alwaysHaulable>true</alwaysHaulable>
<drawGUIOverlay>true</drawGUIOverlay>
<rotatable>false</rotatable>
<pathCost>15</pathCost>
</ThingDef>
<ThingDef Name="ResourceBasedMom" Abstract="True">
<thingClass>ThingWithComps</thingClass>
<category>Item</category>
<resourceReadoutPriority>Middle</resourceReadoutPriority>
<useHitPoints>true</useHitPoints>
<selectable>true</selectable>
<altitudeLayer>Item</altitudeLayer>
<stackLimit>75</stackLimit>
<statBases>
<Beauty>-7</Beauty>
</statBases>
<comps>
<li Class="CompProperties_Forbiddable"/>
</comps>
<alwaysHaulable>true</alwaysHaulable>
<drawGUIOverlay>true</drawGUIOverlay>
<rotatable>false</rotatable>
<pathCost>15</pathCost>
</ThingDef>

<ThingDef>
<defName>BedPan</defName>
<label>bed pan</label>
<description>A receptacle used by a bedridden patient for urine and faeces.</description>
<graphicData>
<graphicClass>Graphic_Single</graphicClass>
<texPath>DBH/Things/Resource/bedPan</texPath>
<onGroundRandomRotateAngle>65</onGroundRandomRotateAngle>
</graphicData>
<selectable>True</selectable>
<useHitPoints>True</useHitPoints>
<drawGUIOverlay>true</drawGUIOverlay>
<altitudeLayer>Item</altitudeLayer>
<alwaysHaulable>True</alwaysHaulable>
<tickerType>Never</tickerType>
<thingClass>Thing</thingClass>
<category>Item</category>
<thingCategories>
<li>Waste</li>
</thingCategories>
<randomizeRotationOnSpawn>true</randomizeRotationOnSpawn>
<stackLimit>1</stackLimit>
<tradeability>None</tradeability>
<statBases>
<MaxHitPoints>100</MaxHitPoints>
<Beauty>-40</Beauty>
<Cleanliness>-25</Cleanliness>
<Mass>0.2</Mass>
<Flammability>1.0</Flammability>
<DeteriorationRate>2</DeteriorationRate>
</statBases>
<pathCost>5</pathCost>
</ThingDef>
<ThingDef>
<defName>BedPan</defName>
<label>bed pan</label>
<description>A receptacle used by a bedridden patient for urine and faeces.</description>
<graphicData>
<graphicClass>Graphic_Single</graphicClass>
<texPath>DBH/Things/Resource/bedPan</texPath>
<onGroundRandomRotateAngle>65</onGroundRandomRotateAngle>
</graphicData>
<selectable>True</selectable>
<useHitPoints>True</useHitPoints>
<drawGUIOverlay>true</drawGUIOverlay>
<altitudeLayer>Item</altitudeLayer>
<alwaysHaulable>True</alwaysHaulable>
<tickerType>Never</tickerType>
<thingClass>Thing</thingClass>
<category>Item</category>
<thingCategories>
<li>Waste</li>
</thingCategories>
<randomizeRotationOnSpawn>true</randomizeRotationOnSpawn>
<stackLimit>1</stackLimit>
<tradeability>None</tradeability>
<statBases>
<MaxHitPoints>100</MaxHitPoints>
<Beauty>-40</Beauty>
<Cleanliness>-25</Cleanliness>
<Mass>0.2</Mass>
<Flammability>1.0</Flammability>
<DeteriorationRate>2</DeteriorationRate>
</statBases>
<pathCost>5</pathCost>
</ThingDef>

<ThingDef ParentName="ResourceBasedMom" DBHLite="true">
<defName>Biosolids</defName>
<label>biosolids</label>
<description>When properly treated and processed, sewage sludge becomes biosolids that offer a small boost to terrain fertility. Useful for harsh environments with limited space to grow. Biosolids also produce a large boost to the fertility of sand which can make it fertile when combined with irrigation.</description>
<graphicData>
<texPath>DBH/Things/Resource/bagSoil</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
<MaxHitPoints>100</MaxHitPoints>
<MarketValue>0.1</MarketValue>
<Flammability>5.0</Flammability>
<Mass>0.05</Mass>
</statBases>
<thingCategories>
<li>Waste</li>
</thingCategories>
<stackLimit>250</stackLimit>
<tradeNeverStack>false</tradeNeverStack>
<drawGUIOverlay>true</drawGUIOverlay>
</ThingDef>
<ThingDef ParentName="ResourceBasedMom" DBHLite="true">
<defName>Biosolids</defName>
<label>biosolids</label>
<description>When properly treated and processed, sewage sludge becomes biosolids that offer a small boost to terrain fertility. Useful for harsh environments with limited space to grow. Biosolids also produce a large boost to the fertility of sand which can make it fertile when combined with irrigation.</description>
<graphicData>
<texPath>DBH/Things/Resource/bagSoil</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
<MaxHitPoints>100</MaxHitPoints>
<MarketValue>0.1</MarketValue>
<Flammability>5.0</Flammability>
<Mass>0.05</Mass>
</statBases>
<thingCategories>
<li>Waste</li>
</thingCategories>
<stackLimit>250</stackLimit>
<tradeNeverStack>false</tradeNeverStack>
<drawGUIOverlay>true</drawGUIOverlay>
</ThingDef>

<ThingDef ParentName="ResourceBasedMom" DBHLite="true">
<defName>FecalSludge</defName>
<label>fecal sludge</label>
<description>A barrel filled with fecal sludge. Can be dumped, burned, or composted into biosolids.</description>
<graphicData>
<texPath>DBH/Things/Resource/BurnBarrel</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
<MaxHitPoints>100</MaxHitPoints>
<Flammability>1.0</Flammability>
<Mass>0.05</Mass>
<Cleanliness>-100</Cleanliness>
</statBases>
<thingCategories>
<li>Waste</li>
</thingCategories>
<comps>
<li Class="DubsBadHygiene.CompProperties_KickOver"/>
</comps>
<stackLimit>500</stackLimit>
<tradeNeverStack>false</tradeNeverStack>
<drawGUIOverlay>true</drawGUIOverlay>
<tradeability>None</tradeability>
</ThingDef>
<ThingDef ParentName="ResourceBasedMom" DBHLite="true">
<defName>FecalSludge</defName>
<label>fecal sludge</label>
<description>A barrel filled with fecal sludge. Can be dumped, burned, or composted into biosolids.</description>
<graphicData>
<texPath>DBH/Things/Resource/BurnBarrel</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<statBases>
<MaxHitPoints>100</MaxHitPoints>
<Flammability>1.0</Flammability>
<Mass>0.05</Mass>
<Cleanliness>-100</Cleanliness>
</statBases>
<thingCategories>
<li>Waste</li>
</thingCategories>
<comps>
<li Class="DubsBadHygiene.CompProperties_KickOver"/>
</comps>
<stackLimit>500</stackLimit>
<tradeNeverStack>false</tradeNeverStack>
<drawGUIOverlay>true</drawGUIOverlay>
<tradeability>None</tradeability>
</ThingDef>


<!--Example of a drink for the thirst need, modExtension makes anything ingestible work as a drink, this is patched out when thirst is disabled-->
<ThingDef ParentName="ResourceBasedMom" DBHThirst="true">
<defName>DBH_WaterBottle</defName>
<label>water</label>
<description>A bottle of water.</description>
<modExtensions>
<li Class="DubsBadHygiene.WaterExt">
<water>1</water>
<UseForWashing>true</UseForWashing>
</li>
</modExtensions>

<!--Example of a drink for the thirst need, modExtension makes anything ingestible work as a drink, this is patched out when thirst is disabled-->
<ThingDef ParentName="ResourceBasedMom" DBHThirst="true">
<defName>DBH_WaterBottle</defName>
<label>water</label>
<description>A bottle of water.</description>
<modExtensions>
<li Class="DubsBadHygiene.WaterExt">
<water>1</water>
<UseForWashing>true</UseForWashing>
<SeekForThirst>true</SeekForThirst>
</li>
</modExtensions>


<graphicData>
<texPath>DBH/Things/Resource/WaterBot</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>0.75</drawSize>
</graphicData>
<comps>
<li Class="CompProperties">
<compClass>DubsBadHygiene.CompContamination</compClass>
</li>
</comps>
<category>Item</category>
<resourceReadoutPriority>Middle</resourceReadoutPriority>
<statBases>
<MaxHitPoints>60</MaxHitPoints>
<Flammability>0.2</Flammability>
<Mass>0.5</Mass>
</statBases>
<thingCategories>
<li>Foods</li>
</thingCategories>
<rotatable>false</rotatable>
<pathCost>15</pathCost>
<generateAllowChance>0</generateAllowChance>
<generateCommonality>0</generateCommonality>
<stackLimit>10</stackLimit>
<tradeNeverStack>false</tradeNeverStack>
<drawGUIOverlay>true</drawGUIOverlay>
<tradeability>None</tradeability>
<ingestible>
<baseIngestTicks>240</baseIngestTicks>
<preferability>NeverForNutrition</preferability>
<foodType>Fluid</foodType>
<nurseable>false</nurseable>
<ingestSound>Ingest_Beer</ingestSound>
<ingestHoldOffsetStanding>
<northDefault>
<offset>(0.18,0,0)</offset>
</northDefault>
</ingestHoldOffsetStanding>
<ingestCommandString>Drink {0}</ingestCommandString>
<ingestReportString>Drinking {0}.</ingestReportString>
<chairSearchRadius>5</chairSearchRadius>
</ingestible>
</ThingDef>

<graphicData>
<texPath>DBH/Things/Resource/WaterBot</texPath>
<graphicClass>Graphic_Single</graphicClass>
<drawSize>0.75</drawSize>
</graphicData>
<comps>
<li Class="CompProperties">
<compClass>DubsBadHygiene.CompContamination</compClass>
</li>
</comps>
<category>Item</category>
<resourceReadoutPriority>Middle</resourceReadoutPriority>
<statBases>
<MaxHitPoints>60</MaxHitPoints>
<Flammability>0.2</Flammability>
<Mass>0.5</Mass>
</statBases>
<thingCategories>
<li>Foods</li>
</thingCategories>
<rotatable>false</rotatable>
<pathCost>15</pathCost>
<generateAllowChance>0</generateAllowChance>
<generateCommonality>0</generateCommonality>
<stackLimit>10</stackLimit>
<tradeNeverStack>false</tradeNeverStack>
<drawGUIOverlay>true</drawGUIOverlay>
<tradeability>None</tradeability>
<ingestible>
<baseIngestTicks>240</baseIngestTicks>
<preferability>NeverForNutrition</preferability>
<foodType>Fluid</foodType>
<nurseable>false</nurseable>
<ingestSound>Ingest_Beer</ingestSound>
<ingestHoldOffsetStanding>
<northDefault>
<offset>(0.18,0,0)</offset>
</northDefault>
</ingestHoldOffsetStanding>
<ingestCommandString>Drink {0}</ingestCommandString>
<ingestReportString>Drinking {0}.</ingestReportString>
<chairSearchRadius>5</chairSearchRadius>
</ingestible>
</ThingDef>

</Defs>
2 changes: 1 addition & 1 deletion About/Manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Manifest>
<identifier>Dubs-Bad-Hygiene</identifier>
<version>2.9.2035</version>
<version>2.9.2051</version>
<manifestUri>https://raw.githubusercontent.com/Dubwise56/Dubs-Bad-Hygiene/master/About/Manifest.xml</manifestUri>
<downloadUri>https://github.com/Dubwise56/Dubs-Bad-Hygiene/releases/latest</downloadUri>
</Manifest>
3 changes: 3 additions & 0 deletions Languages/English/Keyed/DubsHygiene.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
<WashingNoSpace>No space</WashingNoSpace>
<NoUnreservedSource>No unreserved water sources of the highest available quality.</NoUnreservedSource>
<!--Water-->
<RaiseFillRate>Flow +50L</RaiseFillRate>
<LowerFillRate>Flow -50L</LowerFillRate>
<WaterFillRate>Fill Rate: {0}L/h</WaterFillRate>
<dbhDrink>Drink</dbhDrink>
<CommandDesignateOpenCloseValveLabel>Toggle valve</CommandDesignateOpenCloseValveLabel>
<CommandDesignateOpenCloseValveDesc>Toggle the valve between open and closed.</CommandDesignateOpenCloseValveDesc>
Expand Down
Binary file added Textures/DBH/UI/LowerFlowRate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Textures/DBH/UI/RaiseFlowRate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a40e9ee

Please sign in to comment.