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

Fixed DelayedEffect applying when dropped from hands

Browse Source 
Amanitin is now craftable from Erythrozine, Flash Powder and Sulphuric Acid with 60 medical skill
Diving Mask and Diving Suit are now craftable
Diving Suit is now deconstructable
Fixed buttons yielding different materials on deconstruction
This commit is contained in:
Alex Noir
2017-12-21 23:03:25 +03:00
parent 9251dbf83a
commit c26cef89c6
6 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Barotrauma/BarotraumaShared/Content/Items/Button/button.xml
View File

@@ -10,7 +10,7 @@
<Sprite texture ="button.png" sourcerect="0,0,24,27" depth="0.8"/>
<Deconstruct time="10">
<Item name="Polycarbonate Bar"/>
<Item name="Steel Bar"/>
<Item name="FPGA Circuit"/>
</Deconstruct>
@@ -43,7 +43,7 @@
<Sprite texture ="button.png" sourcerect="24,0,11,16" depth="0.79"/>
<Deconstruct time="10">
<Item name="Polycarbonate Bar"/>
<Item name="Steel Bar"/>
<Item name="FPGA Circuit"/>
</Deconstruct>

8
Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
View File

@@ -68,6 +68,14 @@
fireproof="true"
description="An atmospheric diving suit capable of withstanding the immense pressure under Europa's crust.">
<Deconstruct time="30">
<Item name="Steel Bar"/>
<Item name="Aluminium"/>
<Item name="Aluminium"/>
<Item name="Polycarbonate Bar"/>
<Item name="Polycarbonate Bar"/>
</Deconstruct>
<Sprite texture ="DivingSuit.png" sourcerect="85,0,43,128" depth="0.55"/>
<Body width="37" height="113" density="15"/>

10
Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
View File

@@ -33,6 +33,12 @@
<fabricableitem name="Nuclear Shell" requireditems="Steel Bar, Steel Bar, Uranium Bar, Polycarbonate Bar" requiredtime="30">
<RequiredSkill name="Construction" level="40"/>
</fabricableitem>
<fabricableitem name="Diving Mask" requireditems="Polycarbonate Bar" requiredtime="20">
<RequiredSkill name="Construction" level="25"/>
</fabricableitem>
<fabricableitem name="Diving Suit" requireditems="Steel Bar, Aluminium, Aluminium, Polycarbonate Bar, Polycarbonate Bar" requiredtime="30">
<RequiredSkill name="Construction" level="40"/>
</fabricableitem>
<fabricableitem name="Wire" requireditems="Copper Bar" requiredtime="5"/>
@@ -145,6 +151,10 @@
<fabricableitem name="Calyxanide" requireditems="Velonaceps Calyx Eggs, Corrigodone" requiredtime="30">
<RequiredSkill name="Medical" level="60"/>
</fabricableitem>
<fabricableitem name="Amanitin" requireditems="Erythrozine, Flash Powder, Sulphuric Acid" requiredtime="30">
<RequiredSkill name="Medical" level="60"/>
</fabricableitem>
</Fabricator>
<ConnectionPanel selectkey="Action" canbeselected = "true">

10
Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml
View File

@@ -36,6 +36,10 @@
<Body width="10" radius="10" density="10"/>
<Deconstruct time="10">
<Item name="Bike Horn"/>
</Deconstruct>
<Wearable limbtype="Head" slots="Any,Face">
<sprite texture="clownmask.png" limb="Head" origin="0.5,0.5"/>
<StatusEffect type="OnWearing" target="Character" HideFace="true"/>
@@ -53,6 +57,12 @@
<Body width="53" height="18" density="30"/>
<Deconstruct time="40">
<Item name="Bike Horn"/>
<Item name="Bike Horn"/>
<Item name="Bike Horn"/>
</Deconstruct>
<Wearable slots="Any,Torso+Legs">
<sprite texture="clownshirt.png" limb="Torso" sourcerect="0,3,30,58" origin="0.5,0.48" depth="0.02"/>

2
Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
View File

@@ -223,7 +223,7 @@
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="FPGA Circuit"/>
<Item name="Copper Bar"/>
<Item name="Sulphuric Acid"/>
</Deconstruct>
<Sprite texture="weapons.png" sourcerect="0,0,20,9" depth="0.8"/>

2
Barotrauma/BarotraumaShared/Source/Characters/DelayedEffect.cs
View File

@@ -24,7 +24,7 @@ namespace Barotrauma
public override void Apply(ActionType type, float deltaTime, Entity entity, List<ISerializableEntity> targets)
{
if (this.type != type) return;
if (this.type != type || !HasRequiredItems(entity)) return;
DelayedListElement element = new DelayedListElement();
element.Parent = this;
element.StartTimer = delay;