From f0225e43129dd2c7959aac7165d4c682ed256046 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sun, 3 Dec 2017 01:10:26 +0200
Subject: [PATCH] Chemicals and explosives can be thrown. Nitroglycerin & flash
 powder explode on impact, no effect on other items yet (implement applying
 status effects when the item hits someone?)

---
 .../Content/Items/Medical/medical.xml         | 146 ++++++++----------
 .../Content/Items/Weapons/explosives.xml      |  23 ++-
 .../Content/Items/Weapons/weapons.xml         |   6 +-
 3 files changed, 77 insertions(+), 98 deletions(-)
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
index 6da2cc456..229e9bce8 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
@@ -3,8 +3,7 @@
   <Item
     name="Medical Syringe"
     category="Equipment"
-    Tags="smallitem,medical"
-    
+    Tags="smallitem,medical"    
     price="50"
     canuseonself="true"
     description="Injection is often a much more effective method of administering drugs than taking them orally.">
@@ -31,8 +30,7 @@
   <Item
     name="Bandage"
     category="Equipment"
-    Tags="smallitem,medical"
-    
+    Tags="smallitem,medical"    
     canuseonself="true"
     price="20"
     description="Treated with a hemostatic agent that quickly seals most minor wounds.">
@@ -53,23 +51,21 @@
   <Item
     name="Iron Powder"
     category="Material"
-    Tags="smallitem,chem"
-    
+    Tags="smallitem,chem"    
     price="5">
 
     <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6" color="0.2,0.2,0.2,1.0"/>
 
     <Body width="8" height="16" density="40"/>
 
-    <Holdable slots="Any,RightHand,LeftHand"/>
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10"/>
   </Item>
 
   <Item
      name="Stabilozine"
      category="Material"
      spritecolor="1.0,1.0,0.7,1.0"
-     Tags="smallitem,chem,medical"
-     
+     Tags="smallitem,chem,medical"     
      description="A mild stimulant which is used as an incredient in the manufacture of various medicines."
      price="10">
 
@@ -82,19 +78,18 @@
       <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
     </ItemComponent>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="0.3" Oxygen="0.3" duration="10">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
      name="Erythrozine"
      category="Material"
      spritecolor="0.5,0.5,1.0,1.0"
-     Tags="smallitem,chem,medical"
-     
+     Tags="smallitem,chem,medical"     
      canuseonself="true"
      description="Most commonly used for treating oxygen deprivation."
      price="50">
@@ -103,19 +98,18 @@
 
     <Body width="8" height="16" density="20"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-0.3" Oxygen="2.0" duration="10">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
     name="Fibrinozine"
     category="Material"
     spritecolor="0.6,0.4,0.2,1.0"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     canuseonself="true"
     description="A hemostatic agent that slows down bleeding."
     price="50">
@@ -128,12 +122,12 @@
       <StatusEffect type="OnUse" target="Character" Bleeding="-0.1" duration="10.0"/>
       <StatusEffect type="OnUse" target="This" Condition="-25.0" disabledeltatime="true"/>
     </ItemComponent>
-    
-    <Holdable slots="Any,RightHand,LeftHand">
+
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Bleeding="-0.2" duration="5.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
@@ -155,11 +149,11 @@
       <StatusEffect type="OnUse" target="Character, This" Health="-0.5" duration="10"/>      
     </ItemComponent>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="3.0" duration="5.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
@@ -175,30 +169,29 @@
 
     <Body width="8" height="16" density="20"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="1.0" Oxygen="2.0" Bleeding="-0.05" duration="60.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
   
   <Item
     name="Chlorine"
     category="Material"
     spritecolor="1.0,1.0,1.0,0.6"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     price="20">
 
     <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
 
     <Body width="8" height="17" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-0.1" duration="20.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
@@ -206,8 +199,7 @@
     category="Material"
     spritecolor="0.0,0.9,0.1,1.0"
     Tags="smallitem,chem,medical"
-    canuseonself="true"
-    
+    canuseonself="true"    
     price="20">
 
     <ItemComponent>
@@ -218,50 +210,48 @@
     <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
 
     <Body width="8" height="7" density="10"/>
-    
-    <Holdable slots="Any,RightHand,LeftHand">
+
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" SpeedMultiplier="0.8" setvalue="true" duration="20.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
     name="Aluminium"
     category="Material"
     spritecolor="0.7,0.7,0.7,1.0"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     price="20">
 
     <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
 
     <Body width="8" height="16" density="10"/>
-    
-    <Holdable slots="Any,RightHand,LeftHand">
+
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
     name="Potassium"
     category="Material"
     spritecolor="0.8,0.8,0.8,1.0"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     price="20">
 
     <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
 
     <Body width="8" height="16" density="10"/>
-    
-    <Holdable slots="Any,RightHand,LeftHand">
+
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
@@ -269,20 +259,21 @@
     category="Material"
     spritecolor="0.1,0.1,0.1,1.0"
     Tags="smallitem,chem,explosive"
-    
+    impacttolerance="8"
     price="50">
 
     <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
 
     <Body width="8" height="16" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
+      <StatusEffect type="OnImpact" target="This" Condition="0.0" setvalue="true"/>
       <StatusEffect type="OnFire" target="this" condition="-50"/> 
       <StatusEffect type="OnBroken" target="This" Condition="-100.0">
         <Sound file="Content/Items/Reactor/explosion.ogg"/>
         <Explosion range="500" damage="5" stun="3" force="0.1"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
   
   
@@ -290,84 +281,79 @@
     name="Chloral Hydrate"
     category="Material"
     spritecolor="1.0,1.0,1.0,0.8"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     price="20">
 
     <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
 
     <Body width="8" height="17" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-5.0" Stun="10" disabledeltatime="true">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
     name="Phosphorus"
     category="Material"
     spritecolor="0.5,0.0,0.0,1.0"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     price="20">
 
     <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
 
     <Body width="8" height="16" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-5.0" disabledeltatime="true">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
   
   <Item
     name="Sulphuric Acid"
     category="Material"
     spritecolor="0.5,0.0,0.0,1.0"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     price="50">
 
     <Sprite texture ="med.png" sourcerect="15,15,8,17" depth="0.6"/>
 
     <Body width="8" height="17" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-1.0" duration="60.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
   
   <Item
     name="Uranium Powder"
     category="Material"
     spritecolor="0.2,0.35,0.06,1.0"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     price="50">
 
     <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
 
     <Body width="8" height="16" density="25"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-5.0" duration="60.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
    name="Hyperzine"
    category="Material"
    spritecolor="0.8,0.3,0.8,1.0"
-   Tags="smallitem,chem,medical"
-   
+   Tags="smallitem,chem,medical"   
    description="A potent muscle stimulant."
    price="50">
 
@@ -375,19 +361,18 @@
 
     <Body width="8" height="16" density="15"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" SpeedMultiplier="1.5" setvalue="true" duration="60.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
    name="Morbusine"
    category="Material"
    spritecolor="0.0,0.0,0.0,1.0"
-   Tags="smallitem,chem,medical"
-   
+   Tags="smallitem,chem,medical"   
    description="A highly potent neurotoxin."
    price="200">
 
@@ -395,19 +380,18 @@
 
     <Body width="8" height="16" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-10.0" duration="60.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
    name="Velonaceps Calyx Eggs"
    category="Material"
    spritecolor="0.0,0.0,0.0,1.0"
-   Tags="smallitem,chem,medical"
-   
+   Tags="smallitem,chem,medical"   
    description="Dormant eggs of the Europan lifeform colloquially referred to as 'husk parasite'."
    price="200">
 
@@ -415,19 +399,18 @@
 
     <Body width="8" height="16" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" HuskInfectionState="0.01">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
    name="Calyxanide"
    category="Material"
    spritecolor="0.0,0.0,0.0,1.0"
-   Tags="smallitem,chem,medical"
-   
+   Tags="smallitem,chem,medical"   
    description="An antiparasitic drug used in the treatment of husk parasite infections."
    price="300">
 
@@ -435,19 +418,18 @@
 
     <Body width="8" height="16" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" HuskInfectionState="0.0" setvalue="true">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 
   <Item
      name="Liquid Oxygenite"
      category="Material"
      spritecolor="0.6,0.8,1.0,1.0"
-     Tags="smallitem,chem,medical"
-     
+     Tags="smallitem,chem,medical"     
      canuseonself="true"
      description="A mildy toxic solution that slowly releases oxygen into the bloodstream when injected.">
 
@@ -455,11 +437,11 @@
 
     <Body width="8" height="16" density="20"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnUse" target="Character" Health="-0.1" Oxygen="10.0" duration="60">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 </Items>
 
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml
index 26f91f0a5..24444fb0d 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml
@@ -10,12 +10,12 @@
     <Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/>
     <Body width="24" height="8"/>
 
-    <Pickable slots="Any">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnBroken" target="This" Condition="-100.0">
         <sound file="Content/Items/Reactor/explosion.ogg" range="3000"/>
         <Explosion range="500.0" structuredamage="250" damage="200" stun="5" force="20.0" severlimbsprobability="0.5" decal="explosion" decalsize="0.5"/>
       </StatusEffect>
-    </Pickable>
+    </Throwable>
   </Item>
 
   <Item
@@ -28,13 +28,13 @@
     <Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/>
     <Body width="24" height="8"/>
 
-    <Pickable slots="Any">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnFire" target="This" Condition="-50.0"/>
       <StatusEffect type="OnBroken" target="This" Condition="-100.0">
         <sound file="Content/Items/Reactor/explosion.ogg" range="3000"/>
         <Explosion range="600.0" structuredamage="150" damage="300" stun="5" force="20.0" severlimbsprobability="0.6" decal="explosion" decalsize="0.5"/>
       </StatusEffect>
-    </Pickable>
+    </Throwable>
   </Item>
 
   <Item
@@ -47,14 +47,14 @@
     <Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/>
     <Body width="24" height="8"/>
 
-    <Pickable slots="Any">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="Always" target="This" Condition="-0.35"/>
       <StatusEffect type="OnFire" target="This" Condition="-50.0"/>
       <StatusEffect type="OnBroken" target="This" Condition="-100.0">
         <sound file="Content/Items/Reactor/explosion.ogg" range="3000"/>
         <Explosion range="600.0" structuredamage="150" damage="300" stun="5" force="20.0" severlimbsprobability="0.6" decal="explosion" decalsize="0.5"/>
       </StatusEffect>
-    </Pickable>
+    </Throwable>
   </Item>
 
   <Item
@@ -68,14 +68,14 @@
     <Sprite texture="weapons.png" depth="0.8" sourcerect="0,97,24,8"/>
     <Body width="24" height="8"/>
 
-    <Pickable slots="Any">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnFire" target="This" Condition="-50.0"/>
       <StatusEffect type="OnBroken" target="This" Condition="-100.0">
         <sound file="Content/Items/Reactor/explosion.ogg" range="2000"/>
         <Explosion range="500.0" structuredamage="50" damage="300" stun="5" force="20.0" severlimbsprobability="0.6"/>
         <Fire size="500"/>
       </StatusEffect>
-    </Pickable>
+    </Throwable>
   </Item>
 
   <Item
@@ -110,15 +110,14 @@
     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"
-    Tags="smallitem,chem,medical"
-    
+    Tags="smallitem,chem,medical"    
     impacttolerance="4">
 
     <Sprite texture ="Content/Items/Medical/med.png" sourcerect="24,16,8,16" depth="0.6"/>
 
     <Body width="25" height="5" density="10"/>
 
-    <Holdable slots="Any,RightHand,LeftHand">
+    <Throwable slots="Any,RightHand,LeftHand" throwforce="4.0" aimpos="35,-10">
       <StatusEffect type="OnImpact" target="This" Condition="0.0" setvalue="true"/>
       <StatusEffect type="OnFire" target="This" Condition="-50.0"/>
       
@@ -130,6 +129,6 @@
       <StatusEffect type="OnUse" target="This" Condition="-100.0">
         <RequiredItem name="Medical Syringe" type="Container"/>
       </StatusEffect>
-    </Holdable>
+    </Throwable>
   </Item>
 </Items>
\ No newline at end of file
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
index 2f6b71c45..7f0ac541a 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
@@ -107,8 +107,7 @@
 
   <Item
     name="Stun Grenade"
-    category="Equipment"
-    
+    category="Equipment"    
     price="200"
     tags="smallitem,weapon">
 
@@ -126,8 +125,7 @@
 
   <Item
     name="Incendium Grenade"
-    category="Equipment"
-    
+    category="Equipment"    
     tags="smallitem,weapon">
 
     <Sprite texture="weapons.png" sourcerect="98,0,11,24" depth="0.55"/>
