Networking bugfixes, underwater scooter, fixed limbs going through walls when flipping the ragdoll

2015-11-13 00:52:42 +02:00
parent 9c2aec4c8e
commit 24ed95cd68
26 changed files with 301 additions and 119 deletions
@@ -40,7 +40,6 @@
      <Containable name="Oxygen Tank"/>
      <Containable name="Welding Fuel Tank"/>
    </ItemContainer>  
-
  </Item>

  <Item
@@ -73,6 +72,30 @@
    <ItemContainer capacity="1" hideitems="true">
      <Containable name="Oxygen Tank"/>
    </ItemContainer>
+  </Item>

+
+  <Item
+    name="Underwater Scooter"
+    Tags="smallitem"
+    pickdistance="200"
+    price="50">
+
+    <Sprite texture ="DivingSuit.png" depth="0.5" sourcerect="29,109,45,19"/>
+
+    <Body radius="10" height="20" density="5"/>
+
+    <Holdable slots="Any,LeftHand,RightHand" aimpos="100,0" handle1="-12,4"/>
+
+    <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"/>
+      <sound file="scooter.ogg" type="OnUse" range="500.0" loop="true"/>      
+    </Propulsion>
+
+
+    <ItemContainer capacity="1" hideitems="true">
+      <Containable name="Battery Cell"/>
+    </ItemContainer>
  </Item>
 </Items>
@@ -12,7 +12,7 @@
    <Body width="39" height="18" density="5"/>

    <!-- the character will hold the item 50 pixels in front of him, with his hands at the handle1 and handle2 positions -->
-    <Holdable slots="Any,BothHands"
+    <Holdable slots="Any,BothHands" controlpose="true"
              aimpos="50,0" handle1="-17,0" handle2="8,0"/>

    <RepairTool structurefixamount="5.0" limbfixamount="-0.5" range="100" barrelpos="19,8" particles="weld">
@@ -56,7 +56,7 @@

    <Body width="39" height="18" density="5"/>

-    <Holdable slots="Any,BothHands" 
+    <Holdable slots="Any,BothHands" controlpose="true"
              aimpos="50,0" handle1="-12,4"/>

    <RepairTool structurefixamount="-2.0" limbfixamount="-0.5" range="100" barrelpos="19,8" particles="plasma">
@@ -26,7 +26,8 @@

    <Body width="90" height="30" density="10"/>

-    <Holdable slots="Any,BothHands" holdpos="35,-10" aimpos="35,-10" handle1="-15,-6" handle2="26,7"/>
+    <Holdable slots="Any,BothHands" controlpose="true"
+              holdpos="35,-10" aimpos="35,-10" handle1="-15,-6" handle2="26,7"/>
    
    <RangedWeapon barrelpos="49,10">
      <Sound file="harpoon1.ogg" type="OnUse"/>