Merge branch 'master' of https://github.com/Regalis11/Barotrauma

Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs

Barotrauma/BarotraumaShared/Content/Characters/Carrier/carrier.xml

@@ -61,7 +61,7 @@
     <joint limb1="0" limb1anchor="64,-264" limb2="2" limb2anchor="0,-100" lowerlimit="180" upperlimit="210" canbesevered="true"/>
 
     <joint limb1="0" limb1anchor="-100,100" limb2="3" limb2anchor="38,0" lowerlimit="-50" upperlimit="5" canbesevered="true"/>
-    <joint limb1="0" limb1anchor="140,268" limb2="4" limb2anchor="0,0" lowerlimit="87" upperlimit="93"/>
+    <joint limb1="0" limb1anchor="140,268" limb2="4" limb2anchor="0,0" lowerlimit="87" upperlimit="93" canbesevered="false"/>
 
   </ragdoll>
 

Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml

@@ -41,7 +41,7 @@
 
     <Wearable limbtype="Head" slots="Any,Face">
       <sprite texture="DivingMask.png" limb="Head" sourcerect="1,1,37,38"/>
-      <StatusEffect type="OnWearing" target="Character" ObstructVision="true" setvalue="true" disabledeltatime="true"/>
+      <StatusEffect type="OnWearing" target="Character" HideFace="true" ObstructVision="true" setvalue="true" disabledeltatime="true"/>
       <StatusEffect type="OnWearing" target="Contained,Character" OxygenAvailable="1000.0" Condition="-0.5">
         <RequiredItem type="Contained" name="Oxygen Tank"/>
       </StatusEffect>
@@ -92,7 +92,7 @@
       <sprite texture="DivingSuit.png" limb="RightFoot" sourcerect="30,100,20,25" origin="0.5,0.5" depth="0.13" inheritlimbdepth="false" hidelimb="true"/>
       <sprite texture="DivingSuit.png" limb="LeftFoot" sourcerect="30,100,20,25" origin="0.5,0.5" depth="0.13" inheritlimbdepth="false" hidelimb="true"/>
 
-      <StatusEffect type="OnWearing" target="Character" ObstructVision="true" PressureProtection="100.0" SpeedMultiplier="0.6" LowPassMultiplier="0.2" setvalue="true" disabledeltatime="true"/>
+      <StatusEffect type="OnWearing" target="Character" HideFace="true" ObstructVision="true" PressureProtection="100.0" SpeedMultiplier="0.6" LowPassMultiplier="0.2" setvalue="true" disabledeltatime="true"/>
       <StatusEffect type="OnWearing" target="Contained,Character"  OxygenAvailable="1000.0" Condition="-0.5">
         <RequiredItem type="Contained" name="Oxygen Tank"/>
       </StatusEffect>

Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml

@@ -6,11 +6,13 @@
 
     <Sprite texture ="door.png" sourcerect="1,0,48,208" depth="0.01" origin="0.5,0.5"/>
 
-    <Door canbeselected="true">
+    <Door canbeselected="true" selectkey="Action" msg="Force Open [Crowbar]" PickingTime="10.0">
+      <requireditem name="Crowbar" type="Equipped"/>
       <Sprite texture ="door.png" sourcerect="80,0,19,208" depth="0.05" origin="0.5,0.0"/>
       <WeldedSprite texture ="door.png" sourcerect="99,0,32,188" depth="0.0" origin="0.5,0.5"/>
       <BrokenSprite texture ="door.png" sourcerect="133,0,58,208" depth="0.051" origin="0.5,0.0" scale="true"/>
       <sound file="door.ogg" type="OnUse" range="500.0"/>
+      <sound file="Content/Items/Tools/Crowbar.ogg" type="OnPicked" range="2000.0"/>
     </Door>
 
     <AiTarget sightrange="500.0"/>
@@ -35,11 +37,13 @@
 
     <Sprite texture="door.png" sourcerect="1,0,48,208" depth="0.01" origin="0.5,0.5"/>
 
-    <Door window="0,-32,10,75" canbeselected="true">
+    <Door window="0,-32,10,75" canbeselected="true" selectkey="Action" msg="Force Open [Crowbar]" PickingTime="10.0">
+      <requireditem name="Crowbar" type="Equipped"/>
       <Sprite texture="door.png" sourcerect="56,0,19,208" depth="0.05" origin="0.5,0.0"/>
       <WeldedSprite texture="door.png" sourcerect="9,0,32,188" depth="0.0" origin="0.5,0.5"/>
       <BrokenSprite texture="door.png" sourcerect="192,0,40,208" depth="0.051" origin="0.5,0.0" scale="true"/>
       <sound file="door.ogg" type="OnUse" range="500.0"/>
+      <sound file="Content/Items/Tools/Crowbar.ogg" type="OnPicked" range="2000.0"/>
     </Door>
 
     <AiTarget sightrange="500.0"/>
@@ -64,11 +68,13 @@
 
     <Sprite texture="hatch.png" sourcerect="0,0,128,46" depth="0.01" origin="0.5,0.5"/>
 
-    <Door canbeselected="true" horizontal="true">
+    <Door canbeselected="true" horizontal="true" selectkey="Action" msg="Force Open [Crowbar]" PickingTime="10.0">
+      <requireditem name="Crowbar" type="Equipped"/>
       <Sprite texture="hatch.png" sourcerect="128,0,128,19" depth="0.05" origin="0.0,0.5"/>
       <WeldedSprite texture="hatch.png" sourcerect="0,56,108,33" depth="0.0" origin="0.5,0.5"/>
       <BrokenSprite texture="hatch.png" sourcerect="128,21,128,58" depth="0.051" origin="0.0,0.5" scale="true"/>
       <sound file="door.ogg" type="OnUse" range="500.0"/>
+      <sound file="Content/Items/Tools/Crowbar.ogg" type="OnPicked" range="2000.0"/>
     </Door>
 
     <AiTarget sightrange="500.0"/>

Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml

@@ -14,13 +14,16 @@
       <RequiredItems name="Battery Cell" type="Contained"/>      
     </WifiComponent>
 
-      <ItemContainer capacity="1" hideitems="true">
-        <Containable name="Battery Cell"/>
-        <Containable name="Fulgurium Battery Cell"/>
-      </ItemContainer>
+    <ItemContainer capacity="1" hideitems="true">
+      <Containable name="Battery Cell">
+        <StatusEffect type="OnContaining" target="Contained" Condition="-0.05"/>
+      </Containable>
+      <Containable name="Fulgurium Battery Cell">
+        <StatusEffect type="OnContaining" target="Contained" Condition="-0.05"/>
+      </Containable>
+    </ItemContainer>
     
     <Wearable limbtype="Head" slots="Any,Face">
-      <StatusEffect type="OnWearing" target="Contained" Condition="-0.1"/>
       <sprite texture="headset.png" limb="Head" origin="0.5,0.5"/>
     </Wearable>
   </Item>
@@ -38,6 +41,7 @@
 
     <Wearable limbtype="Head" slots="Any,Face">
       <sprite texture="clownmask.png" limb="Head" origin="0.5,0.5"/>
+      <StatusEffect type="OnWearing" target="Character" HideFace="true"/>
     </Wearable>
   </Item>
 

Barotrauma/BarotraumaShared/Content/Items/Reactor/reactor.xml

@@ -68,7 +68,7 @@
 
     <Body radius="6" height="22" density="5"/>
 
-    <Holdable handle1="0,0" slots="RightHand,Any"/>
+    <Holdable handle1="0,0" slots="Any,RightHand,LeftHand"/>
   </Item>
 
   <Item
@@ -86,7 +86,7 @@
 
     <Body radius="6" height="22" density="5"/>
 
-    <Holdable handle1="0,0" slots="RightHand,Any"/>
+    <Holdable handle1="0,0" slots="Any,RightHand,LeftHand"/>
   </Item>
   
 

Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml

@@ -116,7 +116,7 @@
 
     <Body width="12" height="33" density="5"/>
 
-    <Holdable slots="RightHand,Any" holdpos="30,-15" handle1="0,5" handle2="0,-5">
+    <Holdable slots="Any,RightHand,LeftHand" holdpos="30,-15" handle1="0,5" handle2="0,-5">
       <StatusEffect type="OnFire" target="This" Condition="-100.0" disabledeltatime="true">
         <sound file="Content/Items/Reactor/explosion.ogg"/>
         <Explosion range="250.0" structuredamage="15" damage="25" stun="5" force="3.0"/>
@@ -175,7 +175,7 @@
     
     price="10">
 
-    <Sprite  texture ="tools.png" sourcerect="0,50,26,7" depth="0.55"/>
+    <Sprite texture ="tools.png" sourcerect="0,50,26,7" depth="0.55"/>
 
     <Body width="30" height="7" density="50"/>
 
@@ -185,6 +185,23 @@
     </MeleeWeapon>
   </Item>
 
+  <Item
+    name="Crowbar"
+    category="Equipment"
+    Tags="smallitem"
+    
+    price="15">
+
+    <Sprite texture ="tools.png" sourcerect="0,65,64,12" depth="0.55"/>
+
+    <Body width="60" height="10" density="50"/>
+
+    <MeleeWeapon slots="RightHand+LeftHand,Any"
+          controlpose="true" aimpos="50,0" handle1="-5,0" handle2="-3,5" holdangle="30" reload="1.7">
+      <Attack damage="20" stun="0.6" damagetype="Blunt" sound="Content/Items/Weapons/smack.ogg"/>
+    </MeleeWeapon>
+  </Item>
+
   <Item
     name="Handheld Sonar"
     category="Equipment"
@@ -218,8 +235,7 @@
   <Item
     name="Flashlight"
     category="Equipment"
-    Tags="smallitem"
-    
+    Tags="smallitem"    
     price="10">
 
     <Deconstruct time="15">
@@ -231,12 +247,11 @@
 
     <Body width="27" height="10" density="15"/>
 
-    <Holdable slots="Any,RightHand,LeftHand" aimpos="100,0" handle1="0,0">
+    <Holdable slots="Any,RightHand,LeftHand,Face" holdpos="30,-15" aimpos="100,0" handle1="-13,0" handle2="-13,0">
       <StatusEffect type="OnActive" target="Contained" Condition="-0.2"/>
     </Holdable>
 
     <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.1" range="800" powerconsumption="10" IsOn="true">
-
       <LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="2.0,1.0"/>
     </LightComponent>
     

Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml

@@ -109,7 +109,7 @@
     name="Revolver"
     category="Equipment"    
     price="700"
-    tags="weapon">
+    tags="smallitem,weapon">
 
     <Deconstruct time="10">
       <Item name="Steel Bar"/>

Barotrauma/BarotraumaShared/Content/Items/idcard.xml

@@ -10,8 +10,5 @@
 
 	<Body width="16" height="16" density="20"/>
 
-	<Pickable/>
-</Item>
-	
-
-
+	<Pickable slots="Card,Any"/>
+</Item>

Barotrauma/BarotraumaShared/Content/Jobs.xml

@@ -8,7 +8,7 @@
       <Skill name="Medical" level="10,30"/>
     </Skills>
     <Items>
-      <Item name="ID Card"/>
+      <Item name="ID Card" equip="true"/>
       <Item name="Captain's Cap" equip="true"/>
       <Item name="Captain's Jacket" equip="true"/>
       <Item name="Captain's Trousers" equip="true"/>
@@ -30,7 +30,7 @@
       <Skill name="Medical" level="10,20"/>
     </Skills>
     <Items>
-      <Item name="ID Card"/>
+      <Item name="ID Card" equip="true"/>
       <Item name="Wrench"/>
       <Item name="Screwdriver"/>
       <Item name="Orange Jumpsuit" equip="true"/>
@@ -48,7 +48,8 @@
       <Skill name="Medical" level="10,20"/>
     </Skills>
     <Items>
-      <Item name="ID Card"/>
+      <Item name="ID Card" equip="true"/>
+      <Item name="Crowbar"/>
       <Item name="Wrench"/>
       <Item name="Screwdriver"/>
       <Item name="Blue Jumpsuit" equip="true"/>
@@ -66,7 +67,7 @@
       <Skill name="Electrical Engineering" level="10,20"/>
     </Skills>
     <Items>
-      <Item name="ID Card"/>
+      <Item name="ID Card" equip="true"/>
       <Item name="Stun Baton"/>
       <Item name="Battery Cell"/>
       <Item name="Handcuffs"/>
@@ -86,7 +87,7 @@
       <Skill name="Medical" level="60,70"/>
     </Skills>
     <Items>
-      <Item name="ID Card"/>
+      <Item name="ID Card" equip="true"/>
       <Item name="Doctor's Coat" equip="true"/>
       <Item name="Doctor's Trousers" equip="true"/>
       <Item name="Health Scanner HUD"/>
@@ -105,7 +106,7 @@
       <Skill name="Medical" level="10,20"/>
     </Skills>
     <Items>
-      <Item name="ID Card"/>
+      <Item name="ID Card" equip="true"/>
       <Item name="Wrench"/>
       <Item name="Screwdriver"/>
       <Item name="Headset" equip="true">

Barotrauma/BarotraumaShared/Content/Sounds/sounds.xml

@@ -16,8 +16,8 @@
   <damagesound file="Content/Sounds/Damage/GlassImpact3.ogg" damagerange="10.0,20.0" damagesoundtype="StructureBlunt" requiredtag="glass"/>
 
   <damagesound file="Content/Sounds/Damage/GlassBreak1.ogg" damagerange="20.0,50.0" damagesoundtype="StructureBlunt" requiredtag="glass"/>
-  <damagesound file="Content/Sounds/Damage/GlassBreak1.ogg" damagerange="25.0,80.0" damagesoundtype="StructureBlunt" requiredtag="glass"/>
-  <damagesound file="Content/Sounds/Damage/GlassBreak1.ogg" damagerange="50.0,100.0" damagesoundtype="StructureBlunt" requiredtag="glass"/>
+  <damagesound file="Content/Sounds/Damage/GlassBreak2.ogg" damagerange="25.0,80.0" damagesoundtype="StructureBlunt" requiredtag="glass"/>
+  <damagesound file="Content/Sounds/Damage/GlassBreak3.ogg" damagerange="50.0,100.0" damagesoundtype="StructureBlunt" requiredtag="glass"/>
 
   <damagesound file="Content/Sounds/Damage/StructureCrunch1.ogg" damagerange="0.0,40.0" damagesoundtype="StructureSlash"/>
   <damagesound file="Content/Sounds/Damage/StructureCrunch2.ogg" damagerange="5.0,70.0" damagesoundtype="StructureSlash"/>