Fire extinguisher, burnt limbs, spectating improvements, option to disable spectating, jumpsuits for engi & mech, fireproof items, stuff

2015-11-18 20:02:45 +02:00
parent 7b6d92bb27
commit 9b08201972
36 changed files with 429 additions and 85 deletions
@@ -85,9 +85,10 @@
  <Item
    name="Orange Jumpsuit"
    pickdistance="150"
-    tags="smallitem">
+    tags="smallitem"
+    fireproof="true">

-    <Sprite texture = "engigear.png" sourcerect="0,52,50,26" depth="0.6"/>
+    <Sprite texture = "engigear.png" sourcerect="0,52,50,25" depth="0.6"/>

    <Body width="50" height="17"/>

@@ -102,8 +103,31 @@
      <sprite texture="engigear.png" limb="LeftLeg" sourcerect="33,0,20,51" origin="0.5,0.5" depth="0.15" hidelimb="true"/>      
    </Wearable>

-    <ItemContainer containableitems="smallitem" capacity="5"/>
+    <ItemContainer containable="smallitem" capacity="5"/>
  </Item>

+  <Item
+    name="Blue Jumpsuit"
+    pickdistance="150"
+    tags="smallitem"
+    fireproof="true">
+
+    <Sprite texture = "engigear.png" sourcerect="53,50,51,25" depth="0.6"/>
+
+    <Body width="50" height="17"/>
+
+    <Wearable slots="Any,Torso,Legs">
+      <sprite texture="engigear.png" limb="Torso" sourcerect="0,77,32,51" origin="0.5,0.48" depth="0.01"/>
+
+      <sprite texture="engigear.png" limb="Waist" sourcerect="81,77,30,26" origin="0.5,0.45" hidelimb="true"/>
+      <sprite texture="engigear.png" limb="RightThigh" sourcerect="53,77,27,49" origin="0.5,0.5" depth="0.10" hidelimb="true"/>
+      <sprite texture="engigear.png" limb="LeftThigh" sourcerect="53,77,27,49" origin="0.5,0.5" depth="0.14" hidelimb="true"/>
+
+      <sprite texture="engigear.png" limb="RightLeg" sourcerect="33,77,20,51" origin="0.5,0.5" depth="0.11" hidelimb="true"/>
+      <sprite texture="engigear.png" limb="LeftLeg" sourcerect="33,77,20,51" origin="0.5,0.5" depth="0.15" hidelimb="true"/>
+    </Wearable>
+
+    <ItemContainer containable="smallitem" capacity="5"/>
+  </Item>
 </Items>

@@ -45,13 +45,16 @@
  <Item
    name="Diving Suit"
    pickdistance="200"
-    price="200">
+    price="200"
+    fireproof="true">

    <Sprite texture ="DivingSuit.png" sourcerect="82,0,46,128" depth="0.55"/>

    <Body width="37" height="113" density="5"/>

    <Wearable slots="Head,Torso,Legs" armorvalue="10.0">
+      <sprite texture="DivingSuit.png" limb="Head" sourcerect="0,0,1,1" origin="0.5,0.5" hidelimb="true"/>
+
      <sprite texture="DivingSuit.png" limb="Torso" sourcerect="40,0,42,97" origin="0.5,0.55" depthlimb="Head" hidelimb="true"/>

      <sprite texture="DivingSuit.png" limb="RightHand" sourcerect="0,78,15,50" origin="0.45,0.4" hidelimb="true"/>
@@ -89,7 +92,7 @@

    <Propulsion force="80" usablein="water" particles="bubbles">
      <RequiredItems name="Battery Cell" type="Contained" msg="Battery Cell required"/>
-      <StatusEffect type="OnUse" target="Contained" targetnames="Battery Cell" Condition="-0.7"/>
+      <StatusEffect type="OnUse" target="Contained" targetnames="Battery Cell" Condition="-1.0"/>
      <sound file="scooter.ogg" type="OnUse" range="500.0" loop="true"/>      
    </Propulsion>

@@ -102,6 +102,28 @@
      </StatusEffect>
    </Holdable>
  </Item>
+  
+  <Item
+    name="Fire Extinguisher"
+    Tags="smallitem"
+    pickdistance="200"
+    price="100">
+
+    <Sprite texture ="extinguisher.png"  depth="0.5" sourcerect="0,0,34,64" origin="0.4,0.5"/>
+
+    <Body radius="10" height="45" density="5"/>
+
+    <Holdable slots="Any,BothHands" controlpose="false"
+              aimpos="40,-20" handle1="-2,30"/>
+
+    <RepairTool extinquishamount="30.0" range="300" barrelpos="21,25" particles="extinguisher" particlespeed="650.0">
+      <StatusEffect type="OnUse" target="This" Condition="-2.0"/>
+      <sound file="extinguisher.ogg" type="OnUse" range="500.0" loop="true"/>
+    </RepairTool>
+
+    <Propulsion force="-20" usablein="water" particles="bubbles"/>
+
+  </Item>

  <Item
    name="Screwdriver"
@@ -132,7 +154,6 @@
          aimpos="50,0" handle1="0,0" holdangle="30" reload="1.0">
      <Attack damage="5" stun="0.2" damagetype="Blunt" sound="Content/Items/Weapons/smack.ogg"/>
    </MeleeWeapon>
-
  </Item>

 </Items>
@@ -22,6 +22,7 @@
    <Item name="ID Card"/>
    <Item name="Wrench"/>
    <Item name="Screwdriver"/>
+    <Item name="Orange Jumpsuit" equip="true"/>
  </Job>

  <Job name="Mechanic" description="Mechanics have high construction and mechanic skills. They are skilled at using tools such as plasma cutters and welders, and are usually the only ones who can fix broken mechanical devices." minnumber="1">
@@ -33,6 +34,7 @@
    <Item name="ID Card"/>
    <Item name="Wrench"/>
    <Item name="Screwdriver"/>
+    <Item name="Blue Jumpsuit" equip="true"/>
  </Job>

  <Job name="Security Officer" description="Security officers are are responsible for keeping the submarine safe from potential attackers. The creatures inhabiting the ocean aren't the only threat they need to worry about, as several of the renegade groups opposing the Europa Coalition are known to have sent infiltrators on board the vessels." maxnumber="2">
@@ -10,7 +10,9 @@
    growtime ="0.2"
    collideswithwalls="true"
    velocitychange="0.0, -9.8">
-    <sprite texture="Content/Particles/spatter.png"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="0,0,128,128"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="128,0,128,128"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="0,128,128,128"/>
  </watersplash>

  <mist
@@ -22,7 +24,7 @@
    growtime ="0.2"
    lifetime="3"
    velocitychange="0.0, -0.05">
-    <sprite texture="Content/Particles/spatter.png"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="128,128,128,128"/>
  </mist>

  <dustcloud
@@ -33,7 +35,9 @@
    colorchange="0.0, 0.0, 0.0, -0.3"
    lifetime="3"
    velocitychange="0.0, -5.0">
-    <sprite texture="Content/Particles/spatter.png"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="0,0,128,128"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="128,0,128,128"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="0,128,128,128"/>
  </dustcloud>

  <bubbles
@@ -60,7 +64,9 @@
    deleteoncollision="true"
    rotatetodirection="true"
    velocitychange="0.0, -9.8">
-    <sprite texture="Content/Particles/blood.png"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="0,0,128,128"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="128,0,128,128"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="0,128,128,128"/>
  </blood>

  <waterblood
@@ -72,7 +78,7 @@
    lifetime="5.0"
    drawtarget="water"
    velocitychange="0.0, 0.0">
-    <sprite texture="Content/Particles/spatter.png"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="128,128,128,128"/>
  </waterblood>

  <spark
@@ -98,7 +104,7 @@
    startcolor="1.0, 1.0, 1.0" startalpha="1.0"
    colorchange="0.0, 0.0, 0.0, -2.0"
    lifetime="1.0"
-    drawtarget="both"
+    drawtarget="both"    
    velocitychange="0.0, 0.0">
    <sprite texture="Content/Particles/explosion.png" sourcerect="0,128,128,128"/>
  </shockwave>
@@ -128,10 +134,25 @@
    growtime ="0.2"
    lifetime="3"
    collideswithwalls="true"
+    collisionradius="30.0"
    velocitychange="0.0, 2.5">
-    <sprite texture="Content/Particles/spatter.png"/>
+    <sprite texture="Content/Particles/spatter.png" sourcerect="128,128,128,128"/>
  </steam>

+  <smoke
+    startsizemin="0.4,0.4" startsizemax="0.5,0.5"
+    sizechangemin="0.25,0.25" sizechangemax="0.3,0.3"
+    startrotationmin ="0.0" startrotationmax="360"
+    startcolor="0.0, 0.0, 0.0" startalpha="0.5"
+    colorchange="0.0, 0.0, 0.0, -0.25"
+    growtime ="0.2"
+    lifetime="3"
+    collideswithwalls="true"
+    collisionradius="30.0"
+    velocitychange="0.0, 2.5">
+    <sprite texture="Content/Particles/spatter.png" sourcerect="128,128,128,128"/>
+  </smoke>  
+
  <explosionfire
    startsizemin="1.0,1.0" startsizemax="1.5,1.5"
    sizechangemin="0.5,0.5" sizechangemax="0.6,0.6"
@@ -170,4 +191,19 @@
    velocitychange="0.0, 0.0">
    <sprite texture="Content/Particles/flames.png" sourcerect="0,64,128,64" origin="0.15,0.5"/>
  </plasma>
+
+  <extinguisher
+    startsizemin="1.2,1.2" startsizemax="1.5,1.5"
+    sizechangemin="1.5,1.5" sizechangemax="2.0,2.0"
+    startrotationmin ="0.0" startrotationmax="360"
+    startcolor="1.0, 1.0, 1.0" startalpha="0.5"
+    colorchange="0.0, 0.0, 0.0, -0.8"
+    collideswithwalls="true"
+    growtime ="0.3"
+    lifetime="3"
+    collisionradius="30.0"
+    restitution="0.1"
+    velocitychange="0.0, -0.5">
+    <sprite texture="Content/Particles/spatter.png" sourcerect="128,128,128,128"/>
+  </extinguisher>
 </prefabs>