Handheld sonars only consume batteries when they're on, endworms aren't "flipped" when they turn around, every limb is checked in SubmarineBody.DisplaceCharacters (instead of just reflimb)

This commit is contained in:
Regalis
2016-04-24 20:31:26 +03:00
parent d4816c3ee9
commit c08029dea8
8 changed files with 52 additions and 32 deletions
@@ -5,40 +5,40 @@
<sound file="Content/Characters/Endworm/endwormattack1.ogg" state="Attack" range="8000" />
<sound file="Content/Characters/Endworm/endwormattack2.ogg" state="Attack" range="8000" />
<ragdoll waveamplitude="100.0" wavelength="1000" speed="1.5" scale ="2.0">
<ragdoll waveamplitude="100.0" wavelength="1000" speed="1.5" scale ="2.0" flip="false" canentersubmarine="false">
<!-- head -->
<limb id = "0" width="600" height="450" type="Head" steerforce="3.0">
<limb id = "0" radius="300" type="Head" steerforce="3.0">
<sprite texture="Content/Characters/Endworm/endworm.png" sourcerect="0,478,720,546" depth="0.05"/>
</limb>
<!-- body -->
<limb id = "1" width="600" height="400" type="Torso">
<limb id = "1" radius="300" type="Torso">
<sprite texture="Content/Characters/Endworm/endworm.png" sourcerect="0,0,702,448" depth="0.01" origin="0.5,0.5"/>
</limb>
<!-- body -->
<limb id = "2" width="600" height="400" type="Torso">
<limb id = "2" radius="300" type="Torso">
<sprite texture="Content/Characters/Endworm/endworm.png" sourcerect="0,0,702,448" depth="0.02" origin="0.5,0.5"/>
</limb>
<limb id = "3" width="600" height="400" type="Torso">
<limb id = "3" radius="300" type="Torso">
<sprite texture="Content/Characters/Endworm/endworm.png" sourcerect="0,0,702,448" depth="0.03" origin="0.5,0.5"/>
</limb>
<limb id = "4" width="600" height="400" type="Tail">
<limb id = "4" radius="300" type="Tail">
<sprite texture="Content/Characters/Endworm/endworm.png" sourcerect="0,0,702,448" depth="0.04" origin="0.5,0.5"/>
</limb>
<limb id = "5" width="600" height="400" type="Tail">
<limb id = "5" radius="300" type="Tail">
<sprite texture="Content/Characters/Endworm/endworm.png" sourcerect="0,0,702,448" depth="0.05" origin="0.5,0.5"/>
</limb>
<limb id = "6" width="600" height="400" type="Tail">
<limb id = "6" radius="300" type="Tail">
<sprite texture="Content/Characters/Endworm/endworm.png" sourcerect="0,0,702,448" depth="0.06" origin="0.5,0.5"/>
</limb>
<limb id = "7" width="300" height="400" type="Tail">
<limb id = "7" radius="150" type="Tail">
<sprite texture="Content/Characters/Endworm/endworm.png" sourcerect="704,0,320,400" depth="0.07" origin="0.5,0.5"/>
</limb>
@@ -6,7 +6,7 @@
<sound file="Content/Characters/Moloch/idle1.ogg" state="None" range="3000"/>
<sound file="Content/Characters/Moloch/idle2.ogg" state="None" range="3000"/>
<ragdoll waveamplitude="0.0" swimspeed="1.0" walkspeed="0.3" flip="true" rotatetowardsmovement="false" headangle="-90">
<ragdoll waveamplitude="0.0" swimspeed="1.0" walkspeed="0.3" mirror="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" impacttolerance="100">
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Character name ="watcher" humanoid="false" health ="1000">
<ragdoll waveamplitude="0.0" swimspeed="0.5" walkspeed="0.3" flip="true" rotatetowardsmovement="false" headangle="-90">
<ragdoll waveamplitude="0.0" swimspeed="0.5" walkspeed="0.3" mirror="true" rotatetowardsmovement="false" headangle="-90">
<!-- head -->
<limb id = "0" width="350" height="320" type="Head" steerforce="1.0" flip="true" armorsector="0.0,360.0" armorvalue="100.0">
+1 -1
View File
@@ -199,6 +199,7 @@
holdangle="30" handle1="-10,0"/>
<Radar range="6000.0" powerconsumption="10" drawhudwhenequipped="true" detectsubmarinewalls="true">
<StatusEffect type="OnUse" target="Contained" Condition="-1.0" disabledeltatime="true"/>
<sound file="Content/Items/Engine/radarPing.ogg" type="OnUse" range="1000.0"/>
<GuiFrame rect="0,0,0.5,0.5" alignment="Center" color="0.0,0.0,0.0,0.6"/>
<PingCircle texture="Content/Items/Engine/pingCircle.png" origin="0.5,0.5"/>
@@ -208,7 +209,6 @@
<ItemContainer capacity="1" hideitems="true">
<Containable name="Battery Cell">
<StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true"/>
<StatusEffect type="OnContaining" target="Contained" Condition="-0.5"/>
</Containable>
</ItemContainer>
</Item>