Overhaul fabricators and deconstructors to have minCondition, maxCondition (deconstructor) and outCondition

Implement several suggestions listed in https://github.com/Regalis11/Barotrauma/issues/196
Add more fabricatables and deconstructables
This commit is contained in:
Alex Noir
2017-12-22 21:33:14 +03:00
parent 9610444e67
commit 6d30557860
13 changed files with 172 additions and 64 deletions
@@ -134,8 +134,9 @@
<Deconstruct time="20">
<Item name="Steel Bar"/>
<Item name="Copper Bar"/>
<Item name="Polycarbonate Bar"/>
<Item name="Polycarbonate Bar"/>
<Item name="FPGA Circuit"/>
</Deconstruct>
<Sprite texture ="Scooter.png" depth="0.55"/>
@@ -99,6 +99,11 @@
price="100"
description="Field-programmable gate array - a multi-purpose circuit which can be reconfigured for use in a large variety of electrical devices.">
<Deconstruct time="5">
<Item name="Copper Bar"/>
<Item name="Copper Bar"/>
</Deconstruct>
<Sprite texture="signalcomp.png" depth="0.8" sourcerect="32,16,16,16"/>
<Body width="16" height="16" density="30"/>
@@ -15,16 +15,22 @@
<sound file="fabricator.ogg" type="OnActive" range="1000.0" loop="true"/>
<fabricableitem name="Harpoon Gun" requireditems="Steel Bar, Polycarbonate Bar, Aluminium" requiredtime="20">
<fabricableitem name="Harpoon Gun" requireditems="Steel Bar, Polycarbonate Bar" requiredtime="20">
<RequiredSkill name="Construction" level="30"/>
<Item name="Aluminium" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name="Spear" requireditems="Steel Bar" requiredtime="10"/>
<fabricableitem name="Plasma Cutter" requireditems="Steel Bar, Polycarbonate Bar, Aluminium" requiredtime="20">
<RequiredSkill name="Construction" level="30"/>
<fabricableitem name="Revolver Round" requireditems="Copper Bar" requiredtime="10">
<Item name="Aluminium" mincondition="0.5" usecondition="true"/>
</fabricableitem>
<fabricableitem name="Welding Tool" requireditems="Steel Bar, Polycarbonate Bar, Aluminium" requiredtime="20">
<fabricableitem name="Plasma Cutter" requireditems="Steel Bar, Polycarbonate Bar" requiredtime="20">
<RequiredSkill name="Construction" level="30"/>
<Item name="Aluminium" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name="Welding Tool" requireditems="Steel Bar, Polycarbonate Bar" requiredtime="20">
<RequiredSkill name="Construction" level="30"/>
<Item name="Aluminium" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name="Railgun Shell" requireditems="Steel Bar, Steel Bar, Polycarbonate Bar" requiredtime="20">
@@ -33,13 +39,23 @@
<fabricableitem name="Nuclear Shell" requireditems="Steel Bar, Steel Bar, Uranium Bar, Polycarbonate Bar" requiredtime="30">
<RequiredSkill name="Construction" level="40"/>
</fabricableitem>
<fabricableitem name="Depth Charge Shell" requireditems="Steel Bar, Steel Bar" requiredtime="20">
<RequiredSkill name="Construction" level="25"/>
</fabricableitem>
<fabricableitem name="Nuclear Depth Charge Shell" requireditems="Steel Bar, Steel Bar, Uranium 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">
<fabricableitem name="Diving Suit" requireditems="Steel Bar, Polycarbonate Bar, Polycarbonate Bar" requiredtime="30">
<RequiredSkill name="Construction" level="40"/>
<Item name="Aluminium" count="2" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name="Fire Extinguisher" requireditems="Steel Bar, Polycarbonate Bar" requiredtime="10"/>
<fabricableitem name="Flashlight" requireditems="Copper Bar, Polycarbonate Bar" requiredtime="10"/>
<fabricableitem name="Wire" requireditems="Copper Bar" requiredtime="5"/>
<fabricableitem name="Button" requireditems="Steel Bar, FPGA Circuit" requiredtime="10"/>
@@ -62,25 +78,42 @@
<fabricableitem name="Underwater Scooter" requireditems="Steel Bar, Polycarbonate Bar, Polycarbonate Bar, FPGA Circuit" requiredtime="30"/>
<fabricableitem name="Fulgurium Battery Cell" requireditems="Steel Bar, Fulgurium Bar, Sulphuric Acid" requiredtime="10"/>
<fabricableitem name="Flare" requireditems="Phosphorus,Aluminium" requiredtime="10"/>
<fabricableitem name ="Stun Grenade" requireditems="Steel Bar, Flash Powder, Chloral Hydrate" requiredtime="20">
<RequiredSkill name="Construction" level="30"/>
<fabricableitem name="Fulgurium Battery Cell" requireditems="Steel Bar, Fulgurium Bar" requiredtime="10">
<Item name="Sulphuric Acid" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name ="Incendium Grenade" requireditems="Stun Grenade, Incendium Bar" requiredtime="20">
<fabricableitem name="Flare" requiredtime="10">
<Item name="Phosphorus" mincondition="0.25" usecondition="true"/>
<Item name="Aluminium" mincondition="0.25" usecondition="true"/>
</fabricableitem>
<fabricableitem name ="Stun Grenade" requireditems="Steel Bar" requiredtime="20">
<RequiredSkill name="Construction" level="30"/>
<Item name="Flash Powder" mincondition="0.75"/>
<Item name="Chloral Hydrate" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name ="Incendium Grenade" requireditems="Steel Bar, Incendium Bar" requiredtime="20">
<RequiredSkill name="Construction" level="40"/>
<Item name="Flash Powder" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name ="IC-4 Block" requireditems="C-4 Block, Incendium Bar" requiredtime="20"/>
<fabricableitem name="Battery Cell" requireditems="Steel Bar, Copper Bar, Sulphuric Acid" requiredtime="10"/>
<fabricableitem name="Battery Cell" requireditems="Steel Bar, Copper Bar" requiredtime="10">
<Item name="Sulphuric Acid" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name="Fuel Rod" requireditems="Steel Bar, Uranium Bar"/>
<fabricableitem name="Incendium Fuel Rod" requireditems="Steel Bar, Incendium Bar"/>
<fabricableitem name="Uranium Bar">
<Item name="Uranium Powder" count="3" mincondition="0.75"/>
</fabricableitem>
<fabricableitem name="Oxygen Tank" requireditems="Steel Bar" outcondition="0.0"/>
<fabricableitem name="Welding Fuel Tank" requireditems="Steel Bar" outcondition="0.0"/>
</Fabricator>
<ConnectionPanel selectkey="Action" canbeselected = "true">
@@ -4,7 +4,9 @@
category="Equipment"
tags="smallitem"
description="Allows remote communication between the crew.">
description="Allows remote communication between the crew."
price="10">
<Sprite texture ="headset.png" depth="0.6"/>
@@ -61,7 +61,9 @@
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="Uranium Bar" requirefullcondition="true"/>
<Item name="Uranium Powder" mincondition="0.1" maxcondition="0.5"/>
<Item name="Uranium Powder" mincondition="0.1" maxcondition="0.9"/>
<Item name="Uranium Bar" mincondition="0.9"/>
</Deconstruct>
<Sprite texture ="fuelrod.png" depth="0.55"/>
@@ -79,7 +81,7 @@
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="Incendium Bar" requirefullcondition="true"/>
<Item name="Incendium Bar" mincondition="0.95"/>
</Deconstruct>
<Sprite texture ="fuelrod.png" depth="0.55"/>
@@ -93,7 +95,7 @@
<Item
name="Heat Absorber"
Tags="smallitem"
>
price="50">
<Sprite texture ="heatabsorber.png"/>
@@ -271,8 +271,10 @@
tags="smallitem">
<Deconstruct time="10">
<Item name="Phosphorus"/>
<Item name="Aluminium"/>
<Item name="Phosphorus" mincondition="0.9" outcondition="0.25"/>
<Item name="Aluminium" mincondition="0.9" outcondition="0.25"/>
<Item name="Phosphorus" mincondition="0.5" maxcondition="0.9" outcondition="0.1"/>
<Item name="Aluminium" mincondition="0.5" maxcondition="0.9" outcondition="0.1"/>
</Deconstruct>
@@ -144,6 +144,12 @@
price="200"
tags="smallitem,weapon">
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="Flash Powder" mincondition="0.9"/>
<Item name="Chloral Hydrate" mincondition="0.9"/>
</Deconstruct>
<Sprite texture="weapons.png" sourcerect="98,0,11,24" depth="0.55"/>
<Body width="11" height="24" density="30"/>
@@ -161,6 +167,12 @@
category="Equipment"
tags="smallitem,weapon">
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="Flash Powder" mincondition="0.9"/>
<Item name="Incendium Bar" mincondition="0.9"/>
</Deconstruct>
<Sprite texture="weapons.png" sourcerect="98,0,11,24" depth="0.55"/>
<Body width="11" height="24" density="30"/>
@@ -222,8 +234,8 @@
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="FPGA Circuit"/>
<Item name="Sulphuric Acid"/>
<Item name="Copper Bar" mincondition="0.5"/>
<Item name="Sulphuric Acid" mincondition="0.9"/>
</Deconstruct>
<Sprite texture="weapons.png" sourcerect="0,0,20,9" depth="0.8"/>
@@ -242,8 +254,8 @@
<Deconstruct time="10">
<Item name="Steel Bar"/>
<Item name="FPGA Circuit"/>
<Item name="Fulgurium Bar"/>
<Item name="Fulgurium Bar" mincondition="0.8"/>
<Item name="Sulphuric Acid" mincondition="0.9"/>
</Deconstruct>
<Sprite texture="weapons.png" sourcerect="0,0,20,9" depth="0.8"/>