From 7bbab35a0bacc385839886a483e4cdce79509e3a Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 10 Jan 2018 15:57:22 +0200 Subject: [PATCH] Configured cargo containers for items, metal crates can be deconstructed, spears can be contained inside metal crates --- .../Content/Items/Button/button.xml | 4 +- .../Content/Items/Containers/containers.xml | 26 +++++++-- .../Content/Items/Diving/divinggear.xml | 6 +-- .../Content/Items/Electricity/signalitems.xml | 54 +++++++++---------- .../Content/Items/Fabricators/materials.xml | 50 ++++++++--------- .../Content/Items/Jobgear/captaingear.xml | 8 +-- .../Content/Items/Jobgear/doctorgear.xml | 8 +-- .../Content/Items/Jobgear/engigear.xml | 3 +- .../Content/Items/Jobgear/misc.xml | 9 ++-- .../Content/Items/Jobgear/securitygear.xml | 7 +-- .../Content/Items/Medical/medical.xml | 43 ++++++++++++--- .../Content/Items/Reactor/reactor.xml | 5 +- .../Content/Items/Tools/tools.xml | 21 ++++---- .../Content/Items/Weapons/explosives.xml | 17 +++--- .../Content/Items/Weapons/weapons.xml | 27 ++++++---- .../BarotraumaShared/Content/Items/idcard.xml | 2 +- 16 files changed, 172 insertions(+), 118 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml b/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml index 945031ae1..c7a486d09 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml @@ -4,7 +4,7 @@ category="Electrical" linkable="true" tags="smallitem" - + cargocontainername="Metal Crate" price="10"> @@ -37,7 +37,7 @@ category="Electrical" linkable="true" tags="smallitem" - + cargocontainername="Metal Crate" price="10"> diff --git a/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml b/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml index 8dcb3d0b5..90cd64399 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Containers/containers.xml @@ -3,7 +3,7 @@ name="Steel Cabinet" linkable="true" pickdistance ="150"> - + @@ -42,6 +42,12 @@ linkable="true" pickdistance ="150"> + + + + + + @@ -49,7 +55,7 @@ - + @@ -58,10 +64,15 @@ linkable="true" pickdistance ="150"> + + + + + - + @@ -74,6 +85,11 @@ linkable="true" pickdistance ="150"> + + + + + @@ -83,7 +99,7 @@ - - + + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml index e2efdb1c1..21c5e897e 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml @@ -4,7 +4,7 @@ name="Oxygen Tank" category="Equipment,Misc" Tags="smallitem,oxygensource" - + cargocontainername="Metal Crate" price="50"> @@ -27,7 +27,7 @@ name="Diving Mask" category="Equipment" Tags="smallitem,diving" - + cargocontainername="Metal Crate" price="50" description="Small enough to carry around in case of need, but won't protect you from the water pressure in the event of a full-blown hull breach."> @@ -128,7 +128,7 @@ name="Underwater Scooter" category="Equipment" Tags="smallitem" - + cargocontainername="Metal Crate" price="50" description="A battery-powered underwater propulsion device."> diff --git a/Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml b/Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml index b7cd52e1c..503199f8a 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml @@ -5,10 +5,10 @@ @@ -29,9 +29,9 @@ category="Electrical" Tags="smallitem,wire" spritecolor="1.0,0.0,0.0,1.0" - linkable="true" canbepicked="true" + cargocontainername="Metal Crate" price="10"> @@ -50,10 +50,10 @@ name="Blue Wire" category="Electrical" Tags="smallitem,wire" - spritecolor="0.0,0.6,1.0,1.0" - + spritecolor="0.0,0.6,1.0,1.0" linkable="true" canbepicked="true" + cargocontainername="Metal Crate" price="10"> @@ -72,10 +72,10 @@ name="Orange Wire" category="Electrical" Tags="smallitem,wire" - spritecolor="1.0,0.5,0.0,1.0" - + spritecolor="1.0,0.5,0.0,1.0" linkable="true" canbepicked="true" + cargocontainername="Metal Crate" price="10"> @@ -93,9 +93,9 @@ @@ -115,8 +115,8 @@ name="And Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends a signal when both inputs receive a signal within a set period of each other."> @@ -150,8 +150,8 @@ name="Or Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends a signal if either of the inputs receive a signal."> @@ -184,8 +184,8 @@ name="Not Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends a signal when the input is NOT receiving a signal."> @@ -216,8 +216,8 @@ name="Relay Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="When switched on, forwards all received signals from the input connections to the outputs."> @@ -263,8 +263,8 @@ name="Delay Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Delays all received signals for a specific amount of time."> @@ -295,8 +295,8 @@ name="Light Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10"> @@ -330,8 +330,8 @@ name="Oxygen Detector" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends out a value between 0-100 depending on the quality of the surrounding air."> @@ -361,8 +361,8 @@ name="Water Detector" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends out a signal when the detector is submerged."> @@ -392,8 +392,8 @@ name="Motion Detector" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends out a signal when it detects movement."> @@ -423,8 +423,8 @@ name="Signal Check Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends a signal when a signal matching a specific value is received."> @@ -457,8 +457,8 @@ name="RegEx Find Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends a signal if the received signal matches a specific regular expression pattern."> @@ -490,8 +490,8 @@ name="Oscillator" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10" description="Sends out a periodic, oscillating signal."> @@ -523,8 +523,8 @@ name="Wifi Component" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="20" description="Allows remote communication between other Wifi Components that are using the same channel."> @@ -555,8 +555,8 @@ name="Emergency Siren" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10"> @@ -588,8 +588,8 @@ name="Alarm Buzzer" category="Electrical" Tags="smallitem" - linkable="true" + cargocontainername="Metal Crate" price="10"> @@ -620,11 +620,11 @@ diff --git a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/materials.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/materials.xml index 633d4b186..447ff6c45 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/materials.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/materials.xml @@ -3,9 +3,9 @@ @@ -21,13 +21,13 @@ + name="Uranium Bar" + category="Material" + Tags="smallitem" + spritecolor="0.2,0.35,0.06,1.0" + canbepicked="true" + cargocontainername="Metal Crate" + price="100"> @@ -42,13 +42,13 @@ + name="Copper Bar" + category="Material" + Tags="smallitem" + spritecolor="0.78,0.55,0.2,1.0" + canbepicked="true" + cargocontainername="Metal Crate" + price="50"> @@ -58,13 +58,13 @@ + name="Polycarbonate Bar" + category="Material" + Tags="smallitem" + spritecolor="0.9,0.9,1.0,0.9" + canbepicked="true" + cargocontainername="Metal Crate" + price="50"> @@ -77,8 +77,8 @@ name="Incendium Bar" category="Material" Tags="smallitem" - spritecolor="0.5,0.0,0.0,1.0" + cargocontainername="Metal Crate" canbepicked="true"> @@ -98,8 +98,8 @@ name="Fulgurium Bar" category="Material" Tags="smallitem" - spritecolor="1.0,0.7,0.05,1.0" + cargocontainername="Metal Crate" canbepicked="true"> diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml index d01749550..198ad5745 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/captaingear.xml @@ -2,8 +2,8 @@ @@ -17,8 +17,8 @@ @@ -39,7 +39,7 @@ diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/doctorgear.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/doctorgear.xml index d8b3bb6e7..18cf7c567 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/doctorgear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/doctorgear.xml @@ -2,8 +2,8 @@ @@ -19,8 +19,8 @@ @@ -45,7 +45,7 @@ diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/engigear.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/engigear.xml index 6856a3bdf..98cbf3c39 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/engigear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/engigear.xml @@ -4,6 +4,7 @@ category="Equipment" tags="smallitem" fireproof="true" + cargocontainername="Metal Crate" description="The fire-resistant fabric offers some protection against fires. Plenty of pockets for carrying any extra gear an engineer might need."> @@ -32,9 +33,9 @@ diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml index 372af242b..50e1d602b 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml @@ -1,11 +1,10 @@  @@ -33,7 +32,7 @@ @@ -54,7 +53,7 @@ diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/securitygear.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/securitygear.xml index 438f7cc0c..9207972bd 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/securitygear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/securitygear.xml @@ -2,8 +2,8 @@ @@ -21,8 +21,9 @@ @@ -44,7 +45,7 @@ diff --git a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml index 029b6f86d..9653d6a88 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml @@ -7,6 +7,7 @@ Tags="smallitem,medical" price="50" canuseonself="true" + cargocontainername="Chemical Crate" description="Injection is often a much more effective method of administering drugs than taking them orally."> @@ -43,6 +44,7 @@ Tags="smallitem,medical" canuseonself="true" price="20" + cargocontainername="Chemical Crate" description="Treated with a hemostatic agent that quickly seals most minor wounds."> @@ -66,7 +68,8 @@ @@ -84,7 +87,8 @@ name="Stabilozine" category="Material" spritecolor="1.0,1.0,0.7,1.0" - Tags="smallitem,chem,medical" + Tags="smallitem,chem,medical" + cargocontainername="Chemical Crate" description="A mild stimulant which is used as an ingredient in the manufacture of various medicines." canuseonself="true" price="10"> @@ -109,6 +113,7 @@ name="Chlorine" category="Material" spritecolor="1.0,1.0,1.0,0.6" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" price="20"> @@ -127,6 +132,7 @@ name="Ethanol" category="Material" spritecolor="0.0,0.9,0.1,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" canuseonself="true" price="20"> @@ -151,6 +157,7 @@ name="Aluminium" category="Material" spritecolor="0.7,0.7,0.7,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" price="20"> @@ -169,6 +176,7 @@ name="Potassium" category="Material" spritecolor="0.8,0.8,0.8,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" price="20"> @@ -191,6 +199,7 @@ name="Phosphorus" category="Material" spritecolor="0.5,0.0,0.0,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" price="20"> @@ -210,6 +219,7 @@ name="Chloromydride" category="Material" spritecolor="0.7,0.9,1.0,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" description="A strong synaptic stimulant and cardiostimulant which is used as a preventative measure against critical condition. Should only be injected once every 30 seconds." price="50"> @@ -227,10 +237,12 @@ + @@ -341,6 +357,7 @@ name="Calyxanide" category="Material" spritecolor="0.0,0.0,0.0,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" description="An antiparasitic drug used in the treatment of husk parasite infections. Might require higher dosage to cure the infection at later stages." price="300"> @@ -370,6 +387,7 @@ name="Morbusanide" category="Material" spritecolor="0.0,0.0,0.2,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" description="A morbusine antidote."> @@ -388,12 +406,13 @@ + name="Liquid Oxygenite" + category="Material" + spritecolor="0.6,0.8,1.0,1.0" + cargocontainername="Chemical Crate" + Tags="smallitem,chem,medical" + impacttolerance="8" + description="A mildy toxic solution that slowly releases oxygen into the bloodstream when injected."> @@ -415,6 +434,7 @@ name="Flash Powder" category="Material" spritecolor="0.1,0.1,0.1,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,explosive" impacttolerance="8" price="50"> @@ -437,6 +457,7 @@ name="Chloral Hydrate" category="Material" spritecolor="1.0,1.0,1.0,0.8" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" price="20"> @@ -455,6 +476,7 @@ name="Sulphuric Acid" category="Material" spritecolor="0.5,0.0,0.0,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" price="50"> @@ -473,6 +495,7 @@ name="Uranium Powder" category="Material" spritecolor="0.2,0.35,0.06,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" price="50"> @@ -491,6 +514,7 @@ name="Velonaceps Calyx Eggs" category="Material" spritecolor="0.0,0.0,0.0,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" description="Dormant eggs of the Europan lifeform colloquially referred to as 'husk parasite'." price="2000"> @@ -512,6 +536,7 @@ name="Morbusine" category="Material" spritecolor="0.0,0.0,0.0,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" description="A highly potent neurotoxin." price="1000"> @@ -532,6 +557,7 @@ category="Material" description="A highly unstable liquid that may explode when subjected to heat or physical shock." spritecolor="1.0,1.0,1.0,1.0" + cargocontainername="Explosive Crate" Tags="smallitem,chem,medical" impacttolerance="4"> @@ -558,6 +584,7 @@ name="Sufforin" category="Material" spritecolor="1.0,0.3,0.3,1.0" + cargocontainername="Chemical Crate" Tags="smallitem,chem,medical" description="A devious poison with a delayed effect.">