Removed the need for batteries in diving suits, now the light stays on as long as the suit is worn by a living character.

This commit is contained in:
Joonas Rikkonen
2018-04-23 15:24:55 +03:00
parent eff5976461
commit f2842c265c
2 changed files with 4 additions and 13 deletions

View File

@@ -85,6 +85,9 @@
<sprite texture="DivingSuit.png" limb="Torso" sourcerect="42,0,42,97" origin="0.5,0.55" depth="0.004" inheritlimbdepth="false" depthlimb="Head" hidelimb="true">
<LightComponent range="100.0" lightcolor="1.0,1.0,1.0,0.1" powerconsumption="10" IsOn="true">
<StatusEffect type="OnWearing" target="This,Character" Voltage="1.0" setvalue="true">
<Conditional IsDead="false"/>
</StatusEffect>
<sprite texture="Content/Items/Diving/DivingSuitLight.png" depth="0.025" origin="0.1,0.82" alpha="1.0"/>
</LightComponent>
</sprite>
@@ -121,13 +124,9 @@
<damagemodifier damagetype="Slash" armorsector="0.0,360.0" damagemultiplier="0.5" bleedingmultiplier="0.0" damagesound="LimbArmor" deflectprojectiles="true"/>
</Wearable>
<ItemContainer capacity="2" hideitems="true">
<ItemContainer capacity="1" hideitems="true">
<Containable name="Oxygen Tank"/>
<Containable name="Welding Fuel Tank"/>
<Containable name="Oxygenite Shard"/>
<Containable name="Battery Cell, Fulgurium Battery Cell">
<StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true"/>
</Containable>
</ItemContainer>
</Item>

View File

@@ -517,14 +517,6 @@ namespace Barotrauma.Networking
Spawner.CreateNetworkEvent(oxyTank, false);
divingSuit.Combine(oxyTank);
respawnItems.Add(oxyTank);
if (batteryPrefab != null)
{
var battery = new Item(batteryPrefab, pos, respawnSub);
Spawner.CreateNetworkEvent(battery, false);
divingSuit.Combine(battery);
respawnItems.Add(battery);
}
}
if (scooterPrefab != null && batteryPrefab != null)