From a1164afda5cd1ca4ce7e1009e37dc5c63de8d81e Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 19 Apr 2022 19:52:23 +0200 Subject: [PATCH] First two steps of fuel regen don't click, for easier feedback. --- language.version | 4 ++-- sndinfo.txt | 1 + sounds/demolitionist/demofuelregenstep.ogg | Bin 0 -> 8122 bytes zscript/swwm_player.zsc | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 sounds/demolitionist/demofuelregenstep.ogg diff --git a/language.version b/language.version index 8cdc6ccef..831f5f115 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r39 \cu(Tue 19 Apr 18:40:23 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r39 \cu(2022-04-19 18:40:23)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r40 \cu(Tue 19 Apr 19:52:23 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r40 \cu(2022-04-19 19:52:23)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index b801696ad..8c4bc43b4 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -818,6 +818,7 @@ demolitionist/knockout sounds/demolitionist/demoknockout.ogg demolitionist/dashregen sounds/demolitionist/demodashregen.ogg demolitionist/fuelregen sounds/demolitionist/demofuelregen.ogg demolitionist/fuelrgend sounds/demolitionist/demofuelregenend.ogg +demolitionist/fuelrgstp sounds/demolitionist/demofuelregenstep.ogg $playersound demolitionist neutral *grunt DSEMPTY $playeralias demolitionist neutral *pain100 demolitionist/lopain diff --git a/sounds/demolitionist/demofuelregenstep.ogg b/sounds/demolitionist/demofuelregenstep.ogg new file mode 100644 index 0000000000000000000000000000000000000000..645d0609d0e185b323722ed2e2f75d454df70669 GIT binary patch literal 8122 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 NCHEcsYU+2G5ddB=JHr3~ literal 0 HcmV?d00001 diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index ce0696178..417cc3267 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -1192,12 +1192,12 @@ Class Demolitionist : PlayerPawn if ( (oldfuel < (default.dashfuel/24)) && (dashfuel >= default.dashfuel/24) ) { fuelcooldown = 20; - A_StartSound("demolitionist/fuelrgend",CHAN_BODY,CHANF_OVERLAP,.6,4.,.8); + A_StartSound("demolitionist/fuelrgstp",CHAN_BODY,CHANF_OVERLAP,.6,4.,.6); } else if ( (oldfuel < (default.dashfuel/12)) && (dashfuel >= default.dashfuel/12) ) { fuelcooldown = 10; - A_StartSound("demolitionist/fuelrgend",CHAN_BODY,CHANF_OVERLAP,.6,4.,.9); + A_StartSound("demolitionist/fuelrgstp",CHAN_BODY,CHANF_OVERLAP,.6,4.,.7); } if ( (oldfuel < dashfuel) && (dashfuel == default.dashfuel) ) {