From 6ad1952e4ad1cb19f353d9b2bbbf0bf2feb5b323 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 15 May 2021 12:54:20 +0200 Subject: [PATCH] Tweak Hellblazer hold-fire behavior, added a sound cue. Small melee tweaks. --- language.version | 4 ++-- sndinfo.txt | 1 + sounds/hellblazer/blaze_hold.ogg | Bin 0 -> 6138 bytes sounds/hellblazer/blaze_shift.ogg | Bin 6316 -> 6196 bytes sounds/hellblazer/blaze_spin.ogg | Bin 6699 -> 6733 bytes zscript/utility/swwm_utility.zsc | 4 ++-- zscript/weapons/swwm_baseweapon_melee.zsc | 10 ++++---- zscript/weapons/swwm_blazeit.zsc | 24 ++++++++++++++++---- zscript/weapons/swwm_cbt.zsc | 2 +- zscript/weapons/swwm_danmaku.zsc | 2 +- zscript/weapons/swwm_deathlydeathcannon.zsc | 2 +- zscript/weapons/swwm_jackhammer.zsc | 2 +- zscript/weapons/swwm_sparkyboi.zsc | 2 +- zscript/weapons/swwm_thiccboolet.zsc | 4 ++-- 14 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 sounds/hellblazer/blaze_hold.ogg diff --git a/language.version b/language.version index 5ea039719..fe1c98461 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r482 \cu(Sat 15 May 12:53:55 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r482 \cu(2021-05-15 12:53:55)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r484 \cu(Sat 15 May 12:55:06 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r484 \cu(2021-05-15 12:55:06)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index 4e0f83b52..2608c3c2e 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -729,6 +729,7 @@ $limit hellblazer/hitw 32 hellblazer/bounce sounds/hellblazer/blaze_bounce.ogg hellblazer/fly sounds/hellblazer/blaze_fly.ogg hellblazer/preload sounds/hellblazer/blaze_preload.ogg +hellblazer/hold sounds/hellblazer/blaze_hold.ogg hellblazer/lock sounds/hellblazer/blaze_lock.ogg hellblazer/clear sounds/hellblazer/blaze_clear.ogg diff --git a/sounds/hellblazer/blaze_hold.ogg b/sounds/hellblazer/blaze_hold.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ef41a9a9448c5e7c41c5ad2273aafb05d5bdf554 GIT binary patch literal 6138 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 literal 0 HcmV?d00001 diff --git a/sounds/hellblazer/blaze_shift.ogg b/sounds/hellblazer/blaze_shift.ogg index ac7204066e2a31ba29da5782b2deaa1024d0a26c..a6cfd20a980e6eba65c107e3174a8dc7b6b70d4e 100644 GIT binary patch delta 2602 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 diff --git a/sounds/hellblazer/blaze_spin.ogg b/sounds/hellblazer/blaze_spin.ogg index c10a2d8ceffed256f4497b798451d528c109cb0d..27f809e16079cd4833127322382dedfd886541c9 100644 GIT binary patch delta 3050 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 delta 3017 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 10)) ) + { + invoker.preloadcnt = 0; + return A_JumpByAmmoType("PreFire_1","PreFire_2","PreFire_3","PreFire_4","Ready_G"); + } if ( invoker.preloadcnt >= 10 ) { invoker.preloadcnt = 0; @@ -781,9 +784,12 @@ Class Hellblazer : SWWMWeapon } if ( player.cmd.buttons&BT_ALTATTACK ) { - if ( (player.cmd.buttons&BT_ATTACK) || (invoker.clipcount < 2) ) - return A_JumpByAmmoType("PreAltFire_1","PreAltFire_2","PreAltFire_3","PreAltFire_4","Ready_G"); invoker.preloadcnt++; + if ( (player.cmd.buttons&BT_ATTACK) || ((invoker.clipcount < 2) || (invoker.preloadcnt >= 10)) ) + { + invoker.preloadcnt = 0; + return A_JumpByAmmoType("PreAltFire_1","PreAltFire_2","PreAltFire_3","PreAltFire_4","Ready_G"); + } if ( invoker.preloadcnt >= 10 ) { invoker.preloadcnt = 0; @@ -927,6 +933,7 @@ Class Hellblazer : SWWMWeapon XZW2 A 0 { invoker.seekcnt = 0; + A_StartSound("hellblazer/hold",CHAN_WEAPON,CHANF_OVERLAP); } XZW2 A 1 { @@ -948,6 +955,7 @@ Class Hellblazer : SWWMWeapon XZW6 V 0 { invoker.seekcnt = 0; + A_StartSound("hellblazer/hold",CHAN_WEAPON,CHANF_OVERLAP); } XZW6 V 1 { @@ -969,6 +977,7 @@ Class Hellblazer : SWWMWeapon XZWB T 0 { invoker.seekcnt = 0; + A_StartSound("hellblazer/hold",CHAN_WEAPON,CHANF_OVERLAP); } XZWB T 1 { @@ -990,6 +999,7 @@ Class Hellblazer : SWWMWeapon XZWG R 0 { invoker.seekcnt = 0; + A_StartSound("hellblazer/hold",CHAN_WEAPON,CHANF_OVERLAP); } XZWG R 1 { @@ -1011,6 +1021,7 @@ Class Hellblazer : SWWMWeapon XZW2 A 0 { invoker.seekcnt = 0; + A_StartSound("hellblazer/hold",CHAN_WEAPON,CHANF_OVERLAP); } XZW2 A 1 { @@ -1032,6 +1043,7 @@ Class Hellblazer : SWWMWeapon XZW6 V 0 { invoker.seekcnt = 0; + A_StartSound("hellblazer/hold",CHAN_WEAPON,CHANF_OVERLAP); } XZW6 V 1 { @@ -1053,6 +1065,7 @@ Class Hellblazer : SWWMWeapon XZWB T 0 { invoker.seekcnt = 0; + A_StartSound("hellblazer/hold",CHAN_WEAPON,CHANF_OVERLAP); } XZWB T 1 { @@ -1074,6 +1087,7 @@ Class Hellblazer : SWWMWeapon XZWG R 0 { invoker.seekcnt = 0; + A_StartSound("hellblazer/hold",CHAN_WEAPON,CHANF_OVERLAP); } XZWG R 1 { @@ -1343,7 +1357,7 @@ Class Hellblazer : SWWMWeapon XZWQ KLM 2; XZWQ N 2 A_Parry(9); XZWQ OP 1; - XZWQ Q 1 A_Melee(75,"demolitionist/whitl",1.05,1.2); + XZWQ Q 1 A_Melee(75,"demolitionist/whitl",1.05,1.2,1.2); XZWQ RSTUV 2; XZWQ W 2 A_StartSound("hellblazer/meleeend",CHAN_WEAPON,CHANF_OVERLAP); XZWQ XYZ 2; diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc index 08aed4af2..3ebe8fbd7 100644 --- a/zscript/weapons/swwm_cbt.zsc +++ b/zscript/weapons/swwm_cbt.zsc @@ -1242,7 +1242,7 @@ Class Wallbuster : SWWMWeapon XZW9 GHI 2; XZW9 J 2 A_Parry(9); XZW9 KLM 1; - XZW9 N 1 A_Melee(70,"demolitionist/whitl",1.2,1.4); + XZW9 N 1 A_Melee(70,"demolitionist/whitl",1.2,1.4,1.3); XZW9 OPQRS 2; XZW9 T 2 A_StartSound("wallbuster/meleeend",CHAN_WEAPON,CHANF_OVERLAP); XZW9 UVW 2; diff --git a/zscript/weapons/swwm_danmaku.zsc b/zscript/weapons/swwm_danmaku.zsc index 3835f56b9..35a4f27af 100644 --- a/zscript/weapons/swwm_danmaku.zsc +++ b/zscript/weapons/swwm_danmaku.zsc @@ -481,7 +481,7 @@ Class Eviscerator : SWWMWeapon XZW9 AB 1; XZW9 C 1 A_Parry(9); XZW9 D 1; - XZW9 E 2 A_Melee(60,"demolitionist/whitm",1.1,1.2); + XZW9 E 2 A_Melee(60,"demolitionist/whitm",1.1,1.2,1.2); XZW9 FGH 2; XZW9 I 2 A_StartSound("eviscerator/meleeend",CHAN_WEAPON,CHANF_OVERLAP); XZW9 JKL 2; diff --git a/zscript/weapons/swwm_deathlydeathcannon.zsc b/zscript/weapons/swwm_deathlydeathcannon.zsc index d248da00a..3b4d502e0 100644 --- a/zscript/weapons/swwm_deathlydeathcannon.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon.zsc @@ -515,7 +515,7 @@ Class Ynykron : SWWMWeapon XZW9 AB 2; XZW9 C 1 A_Parry(9); XZW9 DE 1; - XZW9 F 1 A_Melee(100,"demolitionist/whitl",1.5,1.6); + XZW9 F 1 A_Melee(100,"demolitionist/whitl",1.5,1.6,1.7); XZW9 GHIJK 1; XZW9 LMNO 2; XZW9 P 2 A_StartSound("ynykron/meleeend",CHAN_WEAPON,CHANF_OVERLAP); diff --git a/zscript/weapons/swwm_jackhammer.zsc b/zscript/weapons/swwm_jackhammer.zsc index 92cd35222..944f18580 100644 --- a/zscript/weapons/swwm_jackhammer.zsc +++ b/zscript/weapons/swwm_jackhammer.zsc @@ -351,7 +351,7 @@ Class PusherWeapon : SWWMWeapon XZW5 ABC 2; XZW5 D 1 A_Parry(9); XZW5 EFGH 1; - XZW5 I 0 A_Melee(70,"demolitionist/whitl",1.1,1.2); + XZW5 I 0 A_Melee(70,"demolitionist/whitl",1.1,1.2,1.2); XZW5 IJ 2; XZW5 K 2 { invoker.PlayUpSound(self); } XZW5 LM 2; diff --git a/zscript/weapons/swwm_sparkyboi.zsc b/zscript/weapons/swwm_sparkyboi.zsc index 5bf4912d8..161200b6e 100644 --- a/zscript/weapons/swwm_sparkyboi.zsc +++ b/zscript/weapons/swwm_sparkyboi.zsc @@ -540,7 +540,7 @@ Class Sparkster : SWWMWeapon XZW4 EFG 2; XZW4 H 1 A_Parry(9); XZW4 IJ 1; - XZW4 K 2 A_Melee(60,"demolitionist/whitm",1.,1.1); + XZW4 K 2 A_Melee(60,"demolitionist/whitm",1.,1.1,1.1); XZW4 LMNOPQ 2; XZW4 R 2 A_StartSound("biospark/meleeend",CHAN_WEAPON,CHANF_OVERLAP); XZW4 STUVWX 2; diff --git a/zscript/weapons/swwm_thiccboolet.zsc b/zscript/weapons/swwm_thiccboolet.zsc index c30671d1e..4f1c600f0 100644 --- a/zscript/weapons/swwm_thiccboolet.zsc +++ b/zscript/weapons/swwm_thiccboolet.zsc @@ -1421,7 +1421,7 @@ Class SilverBullet : SWWMWeapon XZW6 IJK 3; XZW6 L 1 A_Parry(9); XZW6 MN 1; - XZW6 O 1 A_Melee(90,"demolitionist/whitl",1.6,2.); + XZW6 O 1 A_Melee(90,"demolitionist/whitl",1.6,2.,2.); XZW6 PQ 1; XZW6 RST 2; XZW6 U 3 A_StartSound("silverbullet/meleeend",CHAN_WEAPON,CHANF_OVERLAP); @@ -1438,7 +1438,7 @@ Class SilverBullet : SWWMWeapon XZWC IJK 3; XZWC L 1 A_Parry(9); XZWC MN 1; - XZWC O 1 A_Melee(90,"demolitionist/whitl",1.6,2.); + XZWC O 1 A_Melee(90,"demolitionist/whitl",1.6,2.,2.); XZWC PQ 1; XZWC RST 2; XZWC U 3 A_StartSound("silverbullet/meleeend",CHAN_WEAPON,CHANF_OVERLAP);