well jeez who'da thunk it's my sorry ass forgetting to remove the second updateoxygen

Reverted OxygenAvailable values for diving gear + oxygen mask back to -100
Keeping sufforin OxygenAvailable at -10000 tho, that seems like the way to completely cut off any and all oxygen suppliers from acting
This commit is contained in:
Alex Noir
2017-12-28 19:28:45 +03:00
parent 31bef06fd8
commit ed98a6bc0b
2 changed files with 2 additions and 4 deletions

View File

@@ -45,7 +45,7 @@
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.5">
<RequiredItem type="Contained" name="Oxygen Tank"/>
</StatusEffect>
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="-200.0" Oxygen="-20.0" Condition="-0.5">
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="-100.0" Oxygen="-20.0" Condition="-0.5">
<RequiredItem type="Contained" name="Welding Fuel Tank"/>
</StatusEffect>
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
@@ -110,7 +110,7 @@
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
<RequiredItem type="Contained" name="Oxygenite Shard"/>
</StatusEffect>
<StatusEffect type="OnWearing" target="Character" OxygenAvailable="-200.0"/>
<StatusEffect type="OnWearing" target="Character" OxygenAvailable="-100.0"/>
<damagemodifier damagetype="Burn" armorsector="0.0,360.0" damagemultiplier="0.6"/>
<damagemodifier damagetype="Blunt" armorsector="0.0,360.0" damagemultiplier="0.8" bleedingmultiplier="0.3" damagesound="LimbArmor" deflectprojectiles="true"/>

View File

@@ -1601,8 +1601,6 @@ namespace Barotrauma
lowPassMultiplier = MathHelper.Lerp(lowPassMultiplier, 1.0f, 0.1f);
if (needsAir) UpdateOxygen(deltaTime);
if (DoesBleed)
{
Health -= bleeding * deltaTime;