Melee weapons (+ stun baton), improved throw animation, new damage sound effects

2015-09-07 16:31:04 +03:00
parent b77fa5df90
commit 7eae6fb026
38 changed files with 527 additions and 163 deletions
@@ -62,7 +62,7 @@
  

    <!-- head to body -->
-    <joint limb1="0" limb1anchor="0,-13" limb2="1" limb2anchor="-1,20" lowerlimit="-90" upperlimit="45"/>
+    <joint limb1="0" limb1anchor="0,-7" limb2="1" limb2anchor="-1,26" lowerlimit="-90" upperlimit="45"/>
    <joint limb1="1" limb1anchor="0,-17" limb2="12" limb2anchor="0,7" lowerlimit="-10" upperlimit="10"/>   
    
    
@@ -45,7 +45,7 @@
    price="200"
    tags="smallitem">

-    <Sprite texture ="stungrenade.png" depth="0.04"/>
+    <Sprite texture ="stungrenade.png" depth="0.5"/>

    <Body width="11" height="24" density="15" friction="0.8f"/>

@@ -55,6 +55,24 @@
      </StatusEffect>
    </Throwable>
  </Item>
+
+  <Item
+    name="Stun Baton"
+    Tags="smallitem"
+    pickdistance="150"
+    price="100">
+
+    <Sprite texture="harpoongun.png"  depth="0.5"/>
+    
+    <Body width="90" height="30" density="10"/>
+
+    <MeleeWeapon slots="Any,RightHand,LeftHand"
+              aimpos="50,0" handle1="-15,-6" holdangle="100">
+      <Attack stun="10.0" sound="Content/Items/Electricity/zap1.ogg">
+        <ParticleEmitter particle="spark" velocitymin="100" velocitymax="200" anglemin="0" anglemax="360" particleamount="10"/>
+      </Attack>
+    </MeleeWeapon>
+  </Item>
 </Items>


@@ -3,7 +3,7 @@
  <watersplash
    startsizemin="0.15,0.15" startsizemax="0.3,0.3"
    sizechangemin="0.9,0.9" sizechangemax="1.2,1.2"
-    startrotationmin ="0.0" startrotationmax="6.28"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="1.0, 1.0, 1.0" startalpha="0.8"
    colorchange="0.0, 0.0, 0.0, -0.25"
    lifetime="3"
@@ -16,7 +16,7 @@
  <mist
    startsizemin="0.4,0.4" startsizemax="0.5,0.5"
    sizechangemin="0.25,0.25" sizechangemax="0.3,0.3"
-    startrotationmin ="0.0" startrotationmax="6.28"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="1.0, 1.0, 1.0" startalpha="0.5"
    colorchange="0.0, 0.0, 0.0, -0.25"
    growtime ="0.2"
@@ -28,7 +28,7 @@
  <dustcloud
    startsizemin="0.8,0.8" startsizemax="1.0,1.0"
    sizechange="0.0,0.0"
-    startrotationmin ="0.0" startrotationmax="6.28"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="0.2, 0.2, 0.2" startalpha="0.5"
    colorchange="0.0, 0.0, 0.0, -0.3"
    lifetime="3"
@@ -39,7 +39,7 @@
  <bubbles
    startsizemin="0.4,0.4" startsizemax="0.5,0.5"
    sizechangemin="0.1,0.1" sizechangemax="0.3,0.3"
-    startrotationmin ="0.0" startrotationmax="3.14"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="1.0, 1.0, 1.0" startalpha="0.8"
    colorchange="0.0, 0.0, 0.0, -0.5"
    lifetime="3"
@@ -52,7 +52,7 @@
  <blood
    startsizemin="0.05,0.05" startsizemax="0.6,0.6"
    sizechangemin="0.3,0.2" sizechangemax="0.4,0.2"
-    startrotationmin ="0.0" startrotationmax="0.0"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="0.5, 0.0, 0.0" startalpha="1.0"
    colorchange="0.0, 0.0, 0.0, -1.0"
    lifetime="2"
@@ -66,7 +66,7 @@
  <waterblood
    startsize="0.05,0.05"
    sizechangemin="0.1,0.1" sizechangemax="0.15,0.15"
-    startrotationmin ="0.0" startrotationmax="6.28"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="0.5, 0.0, 0.0" startalpha="1.0"
    colorchange="0.0, 0.0, 0.0, -0.25"
    lifetime="5.0"
@@ -78,7 +78,7 @@
  <spark
    startsizemin="0.5,0.2" startsizemax="1.0,0.7"
    sizechangemin="-0.5,-0.5" sizechangemax="-1.0,-1.0"
-    startrotationmin ="0.0" startrotationmax="6.28"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="1.0, 1.0, 1.0" startalpha="1.0"
    colorchange="0.0, 0.0, 0.0, -0.3"
    lifetime="5.0"
@@ -93,7 +93,7 @@
  <shockwave
    startsize="0.1,0.1"
    sizechange="15.0,15.0"
-    startrotationmin ="0.0" startrotationmax="6.28"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="1.0, 1.0, 1.0" startalpha="1.0"
    colorchange="0.0, 0.0, 0.0, -2.0"
    lifetime="1.0"
@@ -105,7 +105,7 @@
  <explosionfire
    startsizemin="1.0,1.0" startsizemax="1.5,1.5"
    sizechangemin="0.5,0.5" sizechangemax="0.6,0.6"
-    startrotationmin ="0.0" startrotationmax="6.28"
+    startrotationmin ="0.0" startrotationmax="360"
    startcolor="1.0, 1.0, 1.0" startalpha="1.0"
    colorchange="-0.6, -0.6, -0.6, -0.5"
    lifetime="5.0"