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

Merge pull request #501 from BlueTheKing/master

Browse Source 
Revolver, Plasma Cutter, Oxygen Generator, Oxygenite Tank changed
This commit is contained in:
Joonas Rikkonen
2018-07-24 16:28:22 +03:00
committed by GitHub
parent 756278bb81 7a7958ba49
commit 8c2c517f74
6 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
+6 -5
View File
@@ -15,14 +15,14 @@
<Body width="12" height="33" density="5"/>
<Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
<Holdable slots="Any,RightHand,LeftHand" holdpos="30,-15" handle1="0,5" handle2="0,-5">
<StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true">
<Conditional Condition="gt 25"/>
<sound file="Content/Items/Reactor/explosion.ogg"/>
<Explosion range="250.0" structuredamage="10" damage="20" stun="5" force="3.0"/>
</StatusEffect>
<StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true"/>
</Pickable>
</Holdable>
</Item>
<Item
@@ -42,12 +42,13 @@
<Body width="12" height="33" density="9.9"/>
<Pickable holdpos="30,-15" handle1="0,1" slots="RightHand,LeftHand,Any">
<Holdable slots="Any,RightHand,LeftHand" holdpos="30,-15" handle1="0,5" handle2="0,-5">
<StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true">
<Conditional Condition="gt 20"/>
<sound file="Content/Items/Reactor/explosion.ogg"/>
<Explosion range="250.0" structuredamage="10" damage="20" stun="5" force="3.0"/>
<Explosion range="280.0" structuredamage="20" damage="30" stun="8" force="3.0"/>
</StatusEffect>
</Pickable>
</Holdable>
</Item>
<Item
Barotrauma/BarotraumaShared/Content/Items/OxygenGenerator/oxygengenerator.xml
+15
View File
@@ -5,16 +5,31 @@
linkable="true">
<Sprite texture="oxygengenerator.png" depth="0.8" sourcerect="0,0,128,128"/>
<fixrequirement name="Mechanical repairs">
<skill name="Construction" level="30"/>
<item name="Welding Tool"/>
<item name="Wrench"/>
</fixrequirement>
<OxygenGenerator powerconsumption="1000.0" minvoltage="0.5" canbeselected = "true">
<StatusEffect type="OnFire" target="This" Condition="-0.5"/>
<StatusEffect type="OnActive" target="Contained" targetnames="Oxygen Tank" Condition="2.0"/>
<StatusEffect type="OnActive" target="Contained" targetnames="Oxygenite Tank" Condition="0.0"/>
<sound file="Content/Items/OxygenGenerator/oxygengenerator.ogg" type="OnActive" range="1000.0" volume="CurrFlow" volumemultiplier="0.001f" loop="true"/>
<StatusEffect type="OnBroken" target="This" disabledeltatime="true">
<sound file="Content/Items/Reactor/explosion.ogg"/>
<Explosion range="50" damage="0" stun="0" force="3.0" flames="false" shockwave="false" sparks="true"/>
</StatusEffect>
</OxygenGenerator>
<trigger/>
<ItemContainer capacity="5" canbeselected = "true" msg="Insert oxygen tank to refill it">
<Containable name="Oxygen Tank"/>
<Containable name="Oxygenite Tank"/>
</ItemContainer>
<ConnectionPanel selectkey="Action" canbeselected = "true" msg="Rewire [Screwdriver]">
Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml
+2 -1
View File
@@ -104,7 +104,8 @@
<RequiredSkill name="Construction" level="30"/>
<StatusEffect type="OnFailure" target="Contained" targetnames="Welding Fuel Tank,Oxygen Tank" Condition="-3.0"/>
<StatusEffect type="OnFailure" target="Contained" targetnames="Welding Fuel Tank,Oxygen Tank" Condition="-3.0"/>
<StatusEffect type="OnFailure" target="Contained" targetnames="Oxygenite Tank" Condition="-1.5"/>
<LightComponent LightColor="0.8,0.7,1.0,1.0" Flicker="0.5">
<sprite texture="Content/Items/Electricity/lightsprite.png" origin="0.5,0.5"/>
Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
+6 -6
View File
@@ -120,14 +120,14 @@
<Item name="Polycarbonate Bar"/>
</Deconstruct>
<Sprite texture="weapons.png" sourcerect="26,97,25,19" depth="0.55"/>
<Body width="25" height="15" density="50"/>
<Sprite texture="weapons.png" sourcerect="24,102,37,19" depth="0.55"/>
<Body width="37" height="18" density="50"/>
<Holdable slots="Any,RightHand,LeftHand" controlpose="true"
aimpos="90,10" handle1="-11,-7"/>
aimpos="75,18" handle1="-10,-5"/>
<RangedWeapon barrelpos="14,6" spread="0" unskilledspread="2">
<RangedWeapon barrelpos="37,3" spread="0" unskilledspread="2">
<Sound file="Content/Items/Weapons/revolver.ogg" type="OnUse" range="3000"/>
<StatusEffect type="OnUse">
<Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" sparks="false" camerashake="5.0"/>
@@ -136,7 +136,7 @@
<RequiredSkill name="Weapons" level="40"/>
</RangedWeapon>
<ItemContainer capacity="4" hideitems="true">
<ItemContainer capacity="6" hideitems="true">
<Containable name="Revolver Round"/>
</ItemContainer>
</Item>
Barotrauma/BarotraumaShared/Content/Jobs.xml
+5 -4
View File
@@ -16,10 +16,11 @@
<Item name="Headset" equip="true">
<Item name="Battery Cell"/>
</Item>
<Item name="Revolver" equip="false">
<Item name="Revolver Round"/>
<Item name="Revolver Round"/>
</Item>
<Item name="Revolver" equip="false">
<Item name="Revolver Round"/>
<Item name="Revolver Round"/>
<Item name="Revolver Round"/>
</Item>
</Items>
</Job>