From 8e9e4c7aace75cd52408cc237232219b6b24a772 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 25 Mar 2024 01:34:53 -0400 Subject: [PATCH 1/4] New vroom sound --- src/f_finale.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index a45e1c18c..0d9ca4d28 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -861,36 +861,17 @@ void F_IntroTicker(void) } } + intro_curtime = introscenetime[intro_scenenum] - timetonext; + if (intro_scenenum == INTROSCENE_KREW) { if (intro_curtime == TICRATE/2) S_StartSound(NULL, sfx_kc5e); - if (timetonext == 5) + if (timetonext == 24) S_StartSound(NULL, sfx_vroom); - else if (timetonext == 24) - { - // Need to use M_Random otherwise it always uses the same sound - UINT32 rskin; - UINT8 rtaunt; - if (skippableallowed) - { - rskin = R_GetLocalRandomSkin(); - rtaunt = M_RandomKey(2); - } - else - { - rskin = R_SkinAvailableEx("eggman", false); - rtaunt = 1; - } - - sfxenum_t rsound = skins[rskin].soundsid[SKSKBST1+rtaunt]; - S_StartSound(NULL, rsound); - } } - intro_curtime = introscenetime[intro_scenenum] - timetonext; - F_WriteText(); if (animtimer > 0) From 6b9029bede0edeb684c6c4a1d2a14d4c11eeb510 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 25 Mar 2024 01:35:05 -0400 Subject: [PATCH 2/4] Replace item pickup sound --- src/info.c | 4 ++-- src/objects/gachabom-rebound.cpp | 2 +- src/sounds.c | 1 - src/sounds.h | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/info.c b/src/info.c index 9acef3e48..d87c3b209 100644 --- a/src/info.c +++ b/src/info.c @@ -13205,7 +13205,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // missilestate S_NULL, // deathstate S_NULL, // xdeathstate - sfx_itpick, // deathsound + sfx_mbs54, // deathsound 0, // speed 48*FRACUNIT, // radius 64*FRACUNIT, // height @@ -13232,7 +13232,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // missilestate S_NULL, // deathstate S_NULL, // xdeathstate - sfx_itpick, // deathsound + sfx_mbs54, // deathsound 0, // speed 48*FRACUNIT, // radius 64*FRACUNIT, // height diff --git a/src/objects/gachabom-rebound.cpp b/src/objects/gachabom-rebound.cpp index 35c2bf7e7..6a4e6762a 100644 --- a/src/objects/gachabom-rebound.cpp +++ b/src/objects/gachabom-rebound.cpp @@ -80,7 +80,7 @@ bool award_target(mobj_t* mobj) player->roundconditions.gachabom_miser = 0; //S_StartSoundAtVolume(target, sfx_grbnd3, 255/3); - S_StartSound(target, sfx_itpick); + S_StartSound(target, sfx_mbs54); return true; } diff --git a/src/sounds.c b/src/sounds.c index de2ada781..99fa946c0 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -1047,7 +1047,6 @@ sfxinfo_t S_sfx[NUMSFX] = {"ruburn", false, 48, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Rubber-burn turn ambient {"ddash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Respawn Drop Dash {"tossed", false, 192, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Item fired - {"itpick", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Pick up HUD drop {"peel", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Edited S25A for banana landing {"hogbom", false, 96, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Ballhog explosions {"zio3", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Thunder Shield use diff --git a/src/sounds.h b/src/sounds.h index 86f012c11..ff846dd6d 100644 --- a/src/sounds.h +++ b/src/sounds.h @@ -1115,7 +1115,6 @@ typedef enum sfx_ruburn, sfx_ddash, sfx_tossed, - sfx_itpick, sfx_peel, sfx_hogbom, sfx_zio3, From 9aa6831a13d20a3f5f60e85490acd5ada19fb4f4 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 25 Mar 2024 02:12:02 -0400 Subject: [PATCH 3/4] Use wipe code for SEGA screen This sucked to figure out LOL --- src/f_finale.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 0d9ca4d28..04f270de9 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -530,7 +530,6 @@ static boolean dc_ticking = false; static UINT8 dc_bluesegafade = 0; static UINT8 dc_textfade = 9; static UINT8 dc_subtextfade = 9; -static UINT8 dc_screenfade = 9; static void F_DisclaimerAdvanceState(void) { @@ -562,7 +561,6 @@ static void F_DisclaimerDrawScene(void) dc_segaframe = 1; dc_textfade = 9; dc_subtextfade = 9; - dc_screenfade = 9; dc_lasttime = intro_curtime; } @@ -679,17 +677,6 @@ static void F_DisclaimerDrawScene(void) Z_Free(newText); } - // Fade out (would love to use a wipe here, but lmao how the fuck do wipes work) - if (dc_state >= DISCLAIMER_OUT) - { - UINT32 screenalpha = 0; - - if (dc_screenfade > 0) - screenalpha = dc_screenfade << V_ALPHASHIFT; - - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31|screenalpha); - } - // ================================= STATE LOGIC if (!dc_ticking) @@ -725,15 +712,6 @@ static void F_DisclaimerDrawScene(void) dc_subtextfade--; } - // Fade out screen - if (dc_state == DISCLAIMER_OUT) - { - if (dc_screenfade > 0) - { - dc_screenfade--; - } - } - // ================================= STATE TRANSITIONS dc_tics++; @@ -758,6 +736,24 @@ static void F_DisclaimerDrawScene(void) if (dc_state == DISCLAIMER_FINAL && timetonext < TICRATE/2) F_DisclaimerAdvanceState(); + + if (dc_state == DISCLAIMER_OUT) + { + F_WipeStartScreen(); + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); + F_WipeEndScreen(); + F_RunWipe(wipe_level_toblack, wipedefs[wipe_level_toblack], false, "FADEMAP0", false, false); + + intro_scenenum++; + timetonext = introscenetime[intro_scenenum]; + animtimer = stoptimer = 0; + intro_curtime = 0; + + F_WipeStartScreen(); + F_IntroDrawScene(); + F_WipeEndScreen(); + F_RunWipe(wipe_level_toblack, wipedefs[wipe_level_toblack], false, "FADEMAP0", true, false); + } } // @@ -831,16 +827,21 @@ void F_IntroTicker(void) { dc_state = DISCLAIMER_OUT; dc_tics = 0; - timetonext = 10; } else if (doskip || timetonext <= 0) { intro_scenenum++; + INT32 destscenenum = NUMINTROSCENES-1; if (M_GameTrulyStarted() == false) + { destscenenum = INTROSCENE_DISCLAIMER; + } else if (doskip) + { destscenenum = INTROSCENE_KREW; + } + if (intro_scenenum > destscenenum) { D_StartTitle(); @@ -848,9 +849,11 @@ void F_IntroTicker(void) //wipetypepre = INT16_MAX; -- however, this breaks the title screen cacheing and I don't know why and I'm tired of fighting it. return; } + //F_NewCutscene(introtext[intro_scenenum]); timetonext = introscenetime[intro_scenenum]; animtimer = stoptimer = 0; + if ( doskip || intro_scenenum == INTROSCENE_DISCLAIMER From 6833885948fb15f6c19abce2a1af45c58a5c34cb Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 27 Mar 2024 00:40:33 -0400 Subject: [PATCH 4/4] Don't go to krew screen in goner --- src/f_finale.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/f_finale.c b/src/f_finale.c index 04f270de9..52333ec34 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -744,6 +744,12 @@ static void F_DisclaimerDrawScene(void) F_WipeEndScreen(); F_RunWipe(wipe_level_toblack, wipedefs[wipe_level_toblack], false, "FADEMAP0", false, false); + if (M_GameTrulyStarted() == false) + { + D_StartTitle(); + return; + } + intro_scenenum++; timetonext = introscenetime[intro_scenenum]; animtimer = stoptimer = 0;