shoot

Dubwise56 · Dec 3, 2019 · c80a380 · c80a380
1 parent c35a8a6
commit c80a380
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 40 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -7,5 +7,5 @@
 	  <supportedVersions>
     <li>1.0</li>
   </supportedVersions>
-	<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.7.1058\n\nMultiplayer ready</description>
+	<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.7.1061\n\nMultiplayer ready</description>
 </ModMetaData>
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -2,7 +2,7 @@
 
 <Manifest>
   <identifier>Dubs-Bad-Hygiene</identifier>
-  <version>2.7.1058</version>
+  <version>2.7.1061</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>
diff --git a/Assemblies/BadHygiene.dll b/Assemblies/BadHygiene.dll
diff --git a/Defs/ModOptions/ModOptions.xml b/Defs/ModOptions/ModOptions.xml
@@ -23,43 +23,6 @@
       </li>
     </options> 
   </DubsBadHygiene.DubsModOptions>
-
-  <DubsBadHygiene.DubsModOptions>
-    <defName>FlushSize</defName>
-    <label>Flush size</label>
-    <defaultSetting>3</defaultSetting>
-    <tip>How much sewage is produced from each flush</tip>
-    <options>
-      <li>
-        <label>Cheat</label>
-        <value>0</value>
-      </li>
-      <li>
-        <label>25%</label>
-        <value>0.25</value>
-      </li>
-      <li>
-        <label>50%</label>
-        <value>0.5</value>
-      </li>
-      <li>
-        <label>100%</label>
-        <value>1</value>
-      </li>
-      <li>
-        <label>150%</label>
-        <value>1.5</value>
-      </li>
-      <li>
-        <label>200%</label>
-        <value>2</value>
-      </li>
-      <li>
-        <label>250%</label>
-        <value>2.5</value>
-      </li>
-    </options>
-  </DubsBadHygiene.DubsModOptions>
 
   <DubsBadHygiene.DubsModOptions>
     <defName>HygieneRateD</defName>
@@ -239,9 +202,47 @@
     </options>
   </DubsBadHygiene.DubsModOptions>
 
+  <DubsBadHygiene.DubsModOptions>
+    <defName>FlushSize</defName>
+    <label>Flush size</label>
+    <defaultSetting>3</defaultSetting>
+    <tip>How much sewage is produced from each flush</tip>
+    <options>
+      <li>
+        <label>Cheat</label>
+        <value>0</value>
+      </li>
+      <li>
+        <label>25%</label>
+        <value>0.25</value>
+      </li>
+      <li>
+        <label>50%</label>
+        <value>0.5</value>
+      </li>
+      <li>
+        <label>100%</label>
+        <value>1</value>
+      </li>
+      <li>
+        <label>150%</label>
+        <value>1.5</value>
+      </li>
+      <li>
+        <label>200%</label>
+        <value>2</value>
+      </li>
+      <li>
+        <label>250%</label>
+        <value>2.5</value>
+      </li>
+    </options>
+  </DubsBadHygiene.DubsModOptions>
+
   <DubsBadHygiene.DubsModOptions>
     <defName>ThirstRateD</defName>
     <label>Thirst need rate</label>
+    <Exper>true</Exper>
     <defaultSetting>10</defaultSetting>
     <tip>How fast the thirst need falls</tip>
     <options>

diff --git a/Defs/UpdateFeatureDefs/UpdateFeatures.xml b/Defs/UpdateFeatureDefs/UpdateFeatures.xml
@@ -8,7 +8,7 @@
 
   <HugsLib.UpdateFeatureDef ParentName="UpdateFeatureBase">
 		<defName>DubsBadHygiene_2_7_1055</defName>
-		<assemblyVersion>2.7.9055</assemblyVersion>
+		<assemblyVersion>2.7.1055</assemblyVersion>
 		<content>
 New stuff:
 |img:DBH/UI/swimmingpool|caption:Added a swimming pool.

diff --git a/Languages/English/Keyed/DubsHygiene.xml b/Languages/English/Keyed/DubsHygiene.xml
@@ -2,6 +2,13 @@
 <LanguageData>
 
   <!--New-->
+  <AllowModdedDrinks>Allow modded drinks</AllowModdedDrinks>
+  <AllowModdedDrinksTip>Pawns will also be allowed to drink and pack any modded drinks, VGP and RimCuisine drinks can be used default, others will require modding an extension to the def</AllowModdedDrinksTip>
+  <AllowDrinkPacking>Pack Water Bottles</AllowDrinkPacking>
+  <AllowDrinkPackingTip>Pawns will automatically pack water bottles into their inventory when they can\n\nMay not work with some mods, for CE you will need to manually manage your loadout to include water bottles else they will keep dropping them!</AllowDrinkPackingTip>
+  <NeedsFilter>Needs Filter</NeedsFilter>
+  <MainFeatures>Main Features</MainFeatures>
+  <ExperimentalFeatures>Experimental Features</ExperimentalFeatures>
   <DBHFalloutWarning>Fallout Water Contamination</DBHFalloutWarning>
   <DBHFalloutWarningEx>After 2 days of toxic fallout the buildup will contaminate any water storage tanks connected to water wells.\n\nPrepare by creating a reserve of water and then using a valve to disconnect the wells to protect the water from contamination before it is too late.\n\nYou can also use a deep well to access uncontaminated water, or install a water treatment system which will eliminate all contamination from water reserves.</DBHFalloutWarningEx>
   <AllowAltDes>Allow modded categories</AllowAltDes>