Fire EXTINGUISHER

Content/Items/Alien/alienitems.xml

@@ -475,7 +475,7 @@
         <sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5" />
       </LightComponent>
     </RepairTool>
-    <Propulsion force="-120" usablein="both">
+    <Propulsion force="-40" usablein="both">
       <RequiredItems items="alienpowercell" type="Contained" />
     </Propulsion>
     <!-- Legacy feature: can be used as a railgun ammunition. Requires "railgunammo" tag to work. Disabled because glitches with the new loaders and holders.

Content/Items/Assemblies/DivingGearCabinetLarge.xml

@@ -148,7 +148,7 @@
   <Item name="" identifier="underwaterscooter" ID="119" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <Propulsion force="450" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
+    <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="120" />
@@ -156,7 +156,7 @@
   <Item name="" identifier="underwaterscooter" ID="117" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <Propulsion force="450" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
+    <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="118" />
@@ -164,7 +164,7 @@
   <Item name="" identifier="underwaterscooter" ID="115" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <Propulsion force="450" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
+    <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="116" />
@@ -172,7 +172,7 @@
   <Item name="" identifier="underwaterscooter" ID="113" rect="50029,-15071,70,51" noninteractable="False" nonplayerteaminteractable="False" rotation="0" scale="0.5" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative,scooter,light" displaysidebysidewhenlinked="False" disallowedupgrades="" spritedepth="0.55" hiddeningame="False" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" flicker="0" flickerspeed="1" pulsefrequency="0" pulseamount="0" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" />
-    <Propulsion force="450" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
+    <Propulsion force="150" pickingtime="0" canbepicked="False" allowingameediting="True" msg="">
       <requireditem items="mobilebattery" type="Contained" optional="false" ignoreineditor="false" msg="ItemMsgBatteryCellRequired" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" containablerestrictions="" autofill="True" pickingtime="0" canbepicked="False" allowingameediting="True" msg="" contained="114" />

Content/Items/Assemblies/DivingGearCabinetSmall.xml

@@ -82,7 +82,7 @@
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="45" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
-    <Propulsion force="450" pickingtime="0" allowingameediting="True" msg="">
+    <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" allowingameediting="True" msg="" contained="46" />
@@ -90,7 +90,7 @@
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="43" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
-    <Propulsion force="450" pickingtime="0" allowingameediting="True" msg="">
+    <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" allowingameediting="True" msg="" contained="44" />
@@ -98,7 +98,7 @@
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="35" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
-    <Propulsion force="450" pickingtime="0" allowingameediting="True" msg="">
+    <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" allowingameediting="True" msg="" contained="36" />
@@ -106,7 +106,7 @@
   <Item name="Underwater Scooter" identifier="underwaterscooter" ID="33" rect="208,-96,64,64" hiddeningame="False" spritecolor="255,255,255,255" inventoryiconcolor="255,255,255,255" containercolor="255,255,255,255" condition="100" tags="smallitem,provocative" displaysidebysidewhenlinked="False" spritedepth="0.55" scale="0.5" hideinassemblypreview="true">
     <Holdable holdpos="0,0" holdangle="0" swingamount="0,0" swingspeed="0" swingwhenholding="False" swingwhenaiming="False" swingwhenusing="False" pickingtime="0" canbepicked="True" allowingameediting="True" msg="ItemMsgPickUpSelect" />
     <LightComponent range="4000" castshadows="True" drawbehindsubs="False" ison="False" blinkfrequency="0" lightcolor="255,255,255,204" minvoltage="0.5" powerconsumption="0" vulnerabletoemp="True" pickingtime="0" allowingameediting="True" msg="" />
-    <Propulsion force="450" pickingtime="0" allowingameediting="True" msg="">
+    <Propulsion force="150" pickingtime="0" allowingameediting="True" msg="">
       <requireditem identifiers="batterycell,fulguriumbatterycell" type="Contained" msg="Battery cell required" />
     </Propulsion>
     <ItemContainer itempos="0,0" iteminterval="0,0" pickingtime="0" allowingameediting="True" msg="" contained="34" />

Content/Items/Diving/divinggear.xml

@@ -247,7 +247,7 @@
       <!-- Battery drain when using the light, adds up with propulsion -->
       <StatusEffect type="OnSecondaryUse" target="Contained" Condition="-0.05" />
     </Holdable>
-    <Propulsion force="450" usablein="water" particles="bubbles">
+    <Propulsion force="150" usablein="water" particles="bubbles">
       <RequiredItems items="mobilebattery" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <StatusEffect type="OnUse" target="Contained" Condition="-0.2">
         <RequiredItem items="mobilebattery" type="Contained" />

Content/Items/Jobgear/Engineer/engineer_talent_items.xml

@@ -523,7 +523,7 @@
       <!-- Battery drain when using the light, adds up with propulsion -->
       <StatusEffect type="OnSecondaryUse" target="Contained" targetslot="0" Condition="-0.05" />
     </Holdable>
-    <Propulsion force="450" usablein="water" particles="bubbles">
+    <Propulsion force="150" usablein="water" particles="bubbles">
       <RequiredItems items="mobilebattery" targetslot="0" type="Contained" msg="ItemMsgBatteryCellRequired" />
       <StatusEffect type="OnUse" target="Contained" targetslot="0" Condition="-0.2">
         <RequiredItem items="mobilebattery" type="Contained" />

Content/Items/Tools/tools.xml

@@ -421,7 +421,7 @@
     <Holdable slots="RightHand+LeftHand" controlpose="true" aimpos="40,-20" handle1="-6,10" handle2="-10,40" msg="ItemMsgPickUpSelect" />
     <RepairTool extinguishamount="240" range="2000" barrelpos="21,25" repairthroughholes="true" hititems="false" IgnoreCharacters="true">
       <ParticleEmitter particle="extinguisher" velocitymin="1000.0" velocitymax="1650.0" particlespersecond="100" />
-      <StatusEffect type="OnUse" targettype="This" Condition="-0.25" />
+      <StatusEffect type="OnUse" targettype="This" Condition="-2.0" />
       <sound file="Content/Items/Tools/Extinguisher.ogg" type="OnUse" range="500.0" loop="true" />
     </RepairTool>
     <RepairTool range="2000" barrelpos="21,25" IgnoreCharacters="false">
@@ -430,7 +430,7 @@
         <ReduceAffliction identifier="burning" amount="15.0" />
       </StatusEffect>
     </RepairTool>
-    <Propulsion force="-240" usablein="water" particles="bubbles" />
+    <Propulsion force="-80" usablein="water" particles="bubbles" />
     <aitarget sightrange="1000" soundrange="1000" fadeouttime="1" />
     <Upgrade gameversion="0.10.0.0" scale="0.5" />
   </Item>

Content/Items/Weapons/weapons.xml

@@ -1724,7 +1724,7 @@
       <RequiredItems items="hmgammo" type="Contained" msg="ItemMsgAmmoRequired" />
       <RequiredSkill identifier="weapons" level="90" />
     </RangedWeapon>
-    <Propulsion force="-90" usablein="both" ApplyToHands="false">
+    <Propulsion force="-30" usablein="both" ApplyToHands="false">
       <RequiredItems items="hmgammo" type="Contained" />
     </Propulsion>
     <ItemContainer capacity="1" maxstacksize="60" hideitems="false" containedstateindicatorslot="0" containedstateindicatorstyle="bullet" containedspritedepth="0.56">

cookother.yml

@@ -164,17 +164,3 @@
     round(v1 * 4, 2)
   files:
     - "Content/Items/**/tools.xml"
-
-- name: morelongerextinguisher
-  regex: <RepairTool.{0,100}?extinguishamount="[^"]+".{0,400}?StatusEffect.{0,60}?Condition="!num"
-  lua: |
-    v1 = round(v1 / 8, 2)
-  files:
-    - "Content/Items/**/tools.xml"
-
-- name: propulsionforce
-  regex: (?-s)<Propulsion!anyforce="!num"
-  lua: |
-    round(v1 * 3, 2)
-  files:
-    - "Content/Items/**/*.xml"