Timer for deattaching items, more reliable door syncing, some new splash sounds

2016-02-13 21:25:59 +02:00
parent 9b5e78fce4
commit 9b6dd5da00
30 changed files with 252 additions and 59 deletions
@@ -9,7 +9,7 @@
  <ragdoll waveamplitude="0.0" swimspeed="1.0" walkspeed="0.3" flip="true" rotatetowardsmovement="false" headangle="-90">

    <!-- head -->
-    <limb id = "0" radius="230" height="500" type="Head" steerforce="1.0" flip="true" armorsector="0.0,180.0" armorvalue="100.0">
+    <limb id = "0" radius="230" height="500" type="Head" steerforce="1.0" flip="true" armorsector="0.0,180.0" armorvalue="100.0" impacttolerance="100">
      <sprite texture="Content/Characters/Moloch/moloch.png" sourcerect="0,0,628,1024" depth="0.02" origin ="0.4,0.5"/>
      <attack type="Hit" range="700" duration="0.2" force="400" damagetype="blunt"/>
    </limb>
@@ -25,7 +25,7 @@
    <output name="signal_out"/>
  </ConnectionPanel>

-  <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]"
+  <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" PickingTime="10.0"
            aimpos="35,-10" handle1="0,0" attachable="true" attachedbydefault="true" aimable="true">
    <requireditem name="Wrench" type="Equipped"/>
  </Holdable>
@@ -123,7 +123,7 @@

    <Body width="16" height="16"/>

-    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" 
+    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" PickingTime="5.0"
              aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>
@@ -158,7 +158,7 @@

    <Body width="16" height="16"/>

-    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" 
+    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" PickingTime="5.0"
              aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>
@@ -192,7 +192,7 @@

    <Body width="16" height="16"/>

-    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" 
+    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" PickingTime="5.0"
              aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>
@@ -226,7 +226,8 @@

    <Body width="16" height="16"/>

-    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
+    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" PickingTime="5.0"
+              aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>

@@ -258,7 +259,7 @@

    <Body width="31" height="24"/>

-    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" 
+    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" PickingTime="5.0"
              aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>
@@ -289,7 +290,7 @@

    <Body width="31" height="24"/>

-    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]"
+    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" PickingTime="5.0"
              aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>
@@ -320,7 +321,7 @@

    <Body width="16" height="16"/>

-    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" 
+    <Holdable selectkey="Action" slots="Any,RightHand,LeftHand" msg="Detach [Wrench]" PickingTime="5.0"
              aimpos="35,-10" handle1="0,0" attachable="true" aimable="true">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>
@@ -354,7 +355,7 @@

    <Body width="16" height="16"/>

-    <Holdable selectkey="Action" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true"
+    <Holdable selectkey="Action" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true" PickingTime="5.0"
              slots="Any,RightHand,LeftHand" msg="Detach [Wrench]">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>
@@ -386,7 +387,7 @@

    <Body width="16" height="16"/>

-    <Holdable selectkey="Action" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true"
+    <Holdable selectkey="Action" aimpos="35,-10" handle1="0,0" attachable="true" aimable="true" PickingTime="5.0"
        slots="Any,RightHand,LeftHand" msg="Detach [Wrench]">
      <requireditem name="Wrench" type="Equipped"/>
    </Holdable>
@@ -62,7 +62,7 @@
      <Item name="Uranium Bar" requirefullcondition="true"/>
    </Deconstruct>

-    <Sprite texture ="fuelrod.png"/>
+    <Sprite texture ="fuelrod.png" depth="0.55"/>

    <Body radius="6" height="22" density="5"/>

@@ -81,7 +81,7 @@
      <Item name="Incendium Bar" requirefullcondition="true"/>
    </Deconstruct>

-    <Sprite texture ="fuelrod.png"/>
+    <Sprite texture ="fuelrod.png" depth="0.55"/>

    <Body radius="6" height="22" density="5"/>