From 68d52a7e86c2afb52db5a36a7b179d85ceabaea0 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 11 Mar 2021 17:47:17 +0100 Subject: [PATCH] Revert "Saya Bean shouldn't squeak." This reverts commit d1e47cb6d3d60bc770cb6779c726af2ba5d9aa81. --- language.version | 4 ++-- zscript/items/swwm_collectibles_gesture.zsc | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/language.version b/language.version index 5ca5d583b..925db64d2 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r345 \cu(Thu 11 Mar 17:20:10 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r345 \cu(2021-03-11 17:20:10)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r343 \cu(Thu 11 Mar 16:29:19 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r343 \cu(2021-03-11 16:29:19)\c-"; diff --git a/zscript/items/swwm_collectibles_gesture.zsc b/zscript/items/swwm_collectibles_gesture.zsc index ffdc88e44..103fd83c3 100644 --- a/zscript/items/swwm_collectibles_gesture.zsc +++ b/zscript/items/swwm_collectibles_gesture.zsc @@ -81,7 +81,11 @@ Class FrispyCornGesture : SWWMItemGesture } Class SayaBeanGesture : SWWMItemGesture { - action void A_Squish() + action void A_Squish1() + { + A_StartSound("squeak",CHAN_ITEMEXTRA,CHANF_OVERLAP); + } + action void A_Squish2() { let realbean = SayaBean(FindInventory("SayaBean")); if ( realbean && !realbean.callout && !Random[Gesture](0,3) ) @@ -105,8 +109,8 @@ Class SayaBeanGesture : SWWMItemGesture XZW1 CDEFGH 3; XZW1 IJ 4; XZW1 KL 3; - XZW1 M 2; - XZW1 N 2 A_Squish(); + XZW1 M 2 A_Squish1(); + XZW1 N 2 A_Squish2(); XZW1 O 3; XZW1 PQRS 4; XZW1 T 4 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);