diff --git a/language.version b/language.version index 98d20f6e6..b79ae0cf0 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r309 \cu(Wed 24 Feb 00:50:07 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r309 \cu(2021-02-24 00:50:07)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r310 \cu(Wed 24 Feb 01:00:35 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r310 \cu(2021-02-24 01:00:35)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index ce4a556c1..be55d0331 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -1052,6 +1052,11 @@ chancebox/explode2 sounds/items/lootexpl2.ogg chancebox/explode3 sounds/items/lootexpl3.ogg $random chancebox/explode { chancebox/explode1 chancebox/explode2 chancebox/explode3 } +newkeen/hit sounds/keenhit.ogg +newkeen/die sounds/keendie.ogg +newkeen/fall sounds/keenfall.ogg +newkeen/bounce sounds/keenbounce.ogg + menu/activate sounds/hmenu/hmenu1.ogg menu/backup sounds/hmenu/hmenu2.ogg menu/prompt sounds/hmenu/hmenu1.ogg diff --git a/sounds/keenbounce.ogg b/sounds/keenbounce.ogg new file mode 100644 index 000000000..bea4fb64d Binary files /dev/null and b/sounds/keenbounce.ogg differ diff --git a/sounds/keendie.ogg b/sounds/keendie.ogg new file mode 100644 index 000000000..3151bdf0b Binary files /dev/null and b/sounds/keendie.ogg differ diff --git a/sounds/keenfall.ogg b/sounds/keenfall.ogg new file mode 100644 index 000000000..81c712c3c Binary files /dev/null and b/sounds/keenfall.ogg differ diff --git a/sounds/keenhit.ogg b/sounds/keenhit.ogg new file mode 100644 index 000000000..e3e05cdc4 Binary files /dev/null and b/sounds/keenhit.ogg differ diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index db7633149..6ea0c2521 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -96,8 +96,6 @@ Class SWWMHangingKeen : Actor +DONTFALL; +NOBLOOD; +DONTTHRUST; - PainSound "keen/pain"; - DeathSound "keen/death"; } States { @@ -105,16 +103,16 @@ Class SWWMHangingKeen : Actor KEE2 A -1; Stop; Death: - KEE2 A 6; + KEE2 A 6 A_StartSound("newkeen/hit"); KEE2 B 6 A_DropKeen(); - KEE2 C 6 A_Scream(); + KEE2 C 6; KEE2 DE 6; KEE2 F 30; KEE2 F -1 A_KeenDie(); Stop; Pain: - KEE2 G 4; - KEE2 G 8 A_Pain(); + KEE2 G 4 A_StartSound("newkeen/hit"); + KEE2 G 8; Goto Spawn; } } @@ -130,15 +128,28 @@ Class SWWMDroppedKeen : Actor States { Spawn: + KEE3 A 0 NoDelay + { + A_StartSound("newkeen/fall",volume:.5); + A_StartSound("newkeen/die",CHAN_VOICE); + } KEE3 A 1 A_JumpIf(pos.z<=floorz,1); Wait; - KEE3 B 1 { vel.z = 4; } + KEE3 B 1 + { + A_StartSound("newkeen/bounce"); + vel.z = 4; + } KEE3 B 1 A_JumpIf(pos.z<=floorz,1); Wait; - KEE3 B 1 { vel.z = 2; } + KEE3 B 1 + { + A_StartSound("newkeen/bounce",volume:.8); + vel.z = 2; + } KEE3 B 1 A_JumpIf(pos.z<=floorz,1); Wait; - KEE3 B 12; + KEE3 B 12 A_StartSound("newkeen/bounce",volume:.6); TNT1 A 1 { Spawn("TeleportFog",pos,ALLOW_REPLACE); } Stop; }