vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #401 from BlueTheKing/master

Browse Source 
Added oxygenite tank, ancient weapon changes
This commit is contained in:
Joonas Rikkonen
2018-05-30 11:16:00 +03:00
committed by GitHub
parent 144122b5e1 eb6bf56379
commit 05add5b82d
4 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml
+2
View File
@@ -195,6 +195,8 @@
<ItemContainer capacity="1" hideitems="false" itempos="9,-15"> <ItemContainer capacity="1" hideitems="false" itempos="9,-15">
<Containable name="Welding Fuel Tank"/> <Containable name="Welding Fuel Tank"/>
<Containable name="Oxygen Tank"/> <Containable name="Oxygen Tank"/>
<Containable name="Oxygenite Tank"/>
<Containable name="Oxygenite Shard"/>
</ItemContainer> </ItemContainer>
</Item> </Item>
Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
+35 -2
View File
@@ -23,6 +23,31 @@
</Pickable> </Pickable>
</Item> </Item>
<Item
name="Oxygenite Tank"
category="Equipment,Misc"
Tags="meditem,oxygensource"
description="A Tank containing liquid Oxygenite.">
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="Liquid Oxygenite" mincondition="0.1"/>
<Item name="Liquid Oxygenite" mincondition="0.5"/>
<Item name="Liquid Oxygenite" mincondition="0.9"/>
</Deconstruct>
<Sprite texture ="Content/Items/Tools/tools.png" sourcerect="39,31,12,33" depth="0.55"/>
<Body width="12" height="33" density="9.9"/>
<Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
<StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true">
<sound file="Content/Items/Reactor/explosion.ogg"/>
<Explosion range="250.0" structuredamage="10" damage="20" stun="5" force="3.0"/>
</StatusEffect>
</Pickable>
</Item>
<Item <Item
name="Diving Mask" name="Diving Mask"
category="Equipment" category="Equipment"
@@ -48,15 +73,19 @@
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="-100.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"/> <RequiredItem type="Contained" name="Welding Fuel Tank"/>
</StatusEffect> </StatusEffect>
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1"> <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" SpeedMultiplier="1.2" Condition="-0.3">
<RequiredItem type="Contained" name="Oxygenite Shard"/> <RequiredItem type="Contained" name="Oxygenite Shard"/>
</StatusEffect> </StatusEffect>
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
<RequiredItem type="Contained" name="Oxygenite Tank"/>
</StatusEffect>
</Wearable> </Wearable>
<ItemContainer capacity="1" hideitems="true"> <ItemContainer capacity="1" hideitems="true">
<Containable name="Oxygen Tank"/> <Containable name="Oxygen Tank"/>
<Containable name="Welding Fuel Tank"/> <Containable name="Welding Fuel Tank"/>
<Containable name="Oxygenite Shard"/> <Containable name="Oxygenite Shard"/>
<Containable name="Oxygenite Tank"/>
</ItemContainer> </ItemContainer>
</Item> </Item>
@@ -114,9 +143,12 @@
<StatusEffect type="OnWearing" target="Contained,Character" Oxygen="-20.0" Condition="-0.5"> <StatusEffect type="OnWearing" target="Contained,Character" Oxygen="-20.0" Condition="-0.5">
<RequiredItem type="Contained" name="Welding Fuel Tank"/> <RequiredItem type="Contained" name="Welding Fuel Tank"/>
</StatusEffect> </StatusEffect>
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1"> <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" SpeedMultiplier="1.2" Condition="-0.3">
<RequiredItem type="Contained" name="Oxygenite Shard"/> <RequiredItem type="Contained" name="Oxygenite Shard"/>
</StatusEffect> </StatusEffect>
<StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1500.0" SpeedMultiplier="1.3" Condition="-0.1">
<RequiredItem type="Contained" name="Oxygenite Tank"/>
</StatusEffect>
<StatusEffect type="OnWearing" target="Character" OxygenAvailable="-100.0"/> <StatusEffect type="OnWearing" target="Character" OxygenAvailable="-100.0"/>
<damagemodifier damagetype="Burn" armorsector="0.0,360.0" damagemultiplier="0.6"/> <damagemodifier damagetype="Burn" armorsector="0.0,360.0" damagemultiplier="0.6"/>
@@ -128,6 +160,7 @@
<Containable name="Oxygen Tank"/> <Containable name="Oxygen Tank"/>
<Containable name="Welding Fuel Tank"/> <Containable name="Welding Fuel Tank"/>
<Containable name="Oxygenite Shard"/> <Containable name="Oxygenite Shard"/>
<Containable name="Oxygenite Tank"/>
</ItemContainer> </ItemContainer>
</Item> </Item>
Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
+1
View File
@@ -109,6 +109,7 @@
</fabricableitem> </fabricableitem>
<fabricableitem name="Oxygen Tank" requireditems="Steel Bar" outcondition="0.0"/> <fabricableitem name="Oxygen Tank" requireditems="Steel Bar" outcondition="0.0"/>
<fabricableitem name="Oxygenite Tank" requireditems="Steel Bar, Liquid Oxygenite, Liquid Oxygenite, Liquid Oxygenite" outcondition="100.0" requiredtime="5" />
<fabricableitem name="Welding Fuel Tank" requireditems="Steel Bar" outcondition="0.0"/> <fabricableitem name="Welding Fuel Tank" requireditems="Steel Bar" outcondition="0.0"/>
</Fabricator> </Fabricator>
Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
+4 -1
View File
@@ -60,6 +60,7 @@
<ItemContainer capacity="1" hideitems="false" itempos="-17,-21"> <ItemContainer capacity="1" hideitems="false" itempos="-17,-21">
<Containable name="Welding Fuel Tank"/> <Containable name="Welding Fuel Tank"/>
<Containable name="Oxygen Tank"/> <Containable name="Oxygen Tank"/>
<Containable name="Oxygenite Tank"/>
</ItemContainer> </ItemContainer>
</Item> </Item>
@@ -85,8 +86,9 @@
aimpos="50,0" handle1="-12,4"/> aimpos="50,0" handle1="-12,4"/>
<RepairTool structurefixamount="-2.0" limbfixamount="-0.5" range="100" barrelpos="28,8"> <RepairTool structurefixamount="-2.0" limbfixamount="-0.5" range="100" barrelpos="28,8">
<RequiredItems name="Oxygen Tank" type="Contained" msg="Oxygen tank required"/> <RequiredItems name="Oxygen Tank,Oxygenite Tank" type="Contained" msg="Oxygen tank required"/>
<StatusEffect type="OnUse" target="Contained" targetnames="Oxygen Tank" Condition="-1.0"/> <StatusEffect type="OnUse" target="Contained" targetnames="Oxygen Tank" Condition="-1.0"/>
<StatusEffect type="OnUse" target="Contained" targetnames="Oxygenite Tank" Condition="-0.5"/>
<StatusEffect type="OnUse" target="UseTarget" targetnames="Door,Windowed Door,Hatch,Duct Block,Alien Door,Alien Hatch" Stuck="-20.0" Condition="-3.0"/> <StatusEffect type="OnUse" target="UseTarget" targetnames="Door,Windowed Door,Hatch,Duct Block,Alien Door,Alien Hatch" Stuck="-20.0" Condition="-3.0"/>
<ParticleEmitter particle="plasma" particlespersecond="50"/> <ParticleEmitter particle="plasma" particlespersecond="50"/>
@@ -112,6 +114,7 @@
<ItemContainer capacity="1" hideitems="false" itempos="9,-15"> <ItemContainer capacity="1" hideitems="false" itempos="9,-15">
<Containable name="Welding Fuel Tank"/> <Containable name="Welding Fuel Tank"/>
<Containable name="Oxygen Tank"/> <Containable name="Oxygen Tank"/>
<Containable name="Oxygenite Tank"/>
</ItemContainer> </ItemContainer>
</Item> </Item>