From 5ff3973ebbb6472444ad632bbb3f6fb54dcfd192 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 23 Mar 2025 18:15:06 +0100 Subject: [PATCH] add player blendeffects to menu + change when they apply most of them now apply during sneakerboost sparkles may also get add blendmode when you go really fast with them (like the speedlines) --- src/g_game.h | 2 ++ src/k_kart.c | 17 ++++++++--------- src/m_menu.c | 22 +++++++++++++--------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/g_game.h b/src/g_game.h index 9b32e9578..bd53343c9 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -183,6 +183,8 @@ extern consvar_t cv_sloperolldist; extern consvar_t cv_sparkroll; extern consvar_t cv_spinoutroll; +extern consvar_t cv_playerblendeffects; + extern consvar_t cv_cechotoggle; #ifndef NONET diff --git a/src/k_kart.c b/src/k_kart.c index 5ff9eb654..ecc53cf1b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -159,7 +159,7 @@ CV_PossibleValue_t speedo_cons_t[NUMSPEEDOSTUFF]; consvar_t cv_newspeedometer = {"newspeedometer", "Default", CV_SAVE, speedo_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_battlespeedo = {"battlespeedo", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // toggle for showing the speedometer in battlemode -consvar_t cv_blendeffects = {"testblendeffects", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_playerblendeffects = {"playerblendeffects", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // funn-E streeetch static CV_PossibleValue_t stretchfactor_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}}; @@ -283,6 +283,7 @@ consvar_t cv_smallnametags = {"kartnametagsmall", "Off", CV_SAVE, nametagsize_co consvar_t cv_nametagscore = {"kartnametagscore", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_shownametagspectator = {"kartshownametagspectator", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; +static boolean K_SpeedLinesShouldBlend(player_t *player); // SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H: // gamespeed is cc (0 for easy, 1 for normal, 2 for hard) @@ -813,8 +814,6 @@ boolean K_UseColorHud(void) return (cv_colorizedhud.value && clr_hud); } -extern consvar_t cv_blendeffects; - //} //{ SRB2kart Net Variables @@ -945,7 +944,7 @@ void K_RegisterClientKartStuff(void) CV_RegisterVar(&cv_stagetitle); - CV_RegisterVar(&cv_blendeffects); + CV_RegisterVar(&cv_playerblendeffects); // Colourized HUD CV_RegisterVar(&cv_colorizedhud); @@ -1747,7 +1746,7 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid) else fx->eflags &= ~MFE_VERTICALFLIP; - if (cv_blendeffects.value) + if (cv_playerblendeffects.value) fx->blendmode = AST_ADD; P_SetScale(fx, mobj1->scale); @@ -3395,7 +3394,7 @@ skipground: // idk im sleepy P_SetMobjState(spark, S_DRIFTSPARK_A1); } - if (cv_blendeffects.value) + if (cv_playerblendeffects.value && player->kartstuff[k_sneakertimer]) spark->blendmode = AST_ADD; K_MatchGenericExtraFlags(spark, player->mo); @@ -3734,7 +3733,7 @@ void K_SpawnBoostTrail(player_t *player) { flame->colorized = true; flame->color = player->skincolor; - if (cv_blendeffects.value) + if (cv_playerblendeffects.value && player->kartstuff[k_sneakertimer]) flame->blendmode = AST_ADD; } @@ -3798,7 +3797,7 @@ void K_SpawnSparkleTrail(mobj_t *mo) sparkle->color = mo->color; - if (mo->player && cv_blendeffects.value) + if (cv_playerblendeffects.value && mo->player && K_SpeedLinesShouldBlend(mo->player)) sparkle->blendmode = AST_ADD; } @@ -5588,7 +5587,7 @@ static boolean K_SpeedLinesShouldBlend(player_t *player) { fixed_t percentspeed = 0; - if (!cv_blendeffects.value) + if (!cv_playerblendeffects.value) return false; if (!player->mo) diff --git a/src/m_menu.c b/src/m_menu.c index e96d922de..1c59aad1a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2247,20 +2247,22 @@ static menuitem_t OP_SaturnMenu[] = {IT_STRING | IT_CVAR, NULL, "Colourized Speedlines", &cv_coloredspeedlines, 30}, {IT_STRING | IT_CVAR, NULL, "Colourized Sneakertrails", &cv_coloredsneakertrail, 35}, - {IT_STRING | IT_CVAR, NULL, "Bananadrag Jitter", &cv_bananajitter, 45}, + {IT_STRING | IT_CVAR, NULL, "Player Blendeffects", &cv_playerblendeffects, 45}, - {IT_STRING | IT_CVAR, NULL, "Midair Driftsparks", &cv_airsparks, 55}, + {IT_STRING | IT_CVAR, NULL, "Bananadrag Jitter", &cv_bananajitter, 55}, - {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 65}, - {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 75}, + {IT_STRING | IT_CVAR, NULL, "Midair Driftsparks", &cv_airsparks, 65}, - {IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 80}, + {IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 75}, + {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 85}, - {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 90}, + {IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 90}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 100}, - {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 105}, - {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 115}, // uwu + {IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 100}, + + {IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 110}, + {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 115}, + {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 125}, // uwu }; static const char* OP_SaturnTooltips[] = @@ -2270,6 +2272,7 @@ static const char* OP_SaturnTooltips[] = "How much speen do you want?", "Colourize the speedlines in your skincolor if you go fast enough!", "Colourize the sneaker flame trails in your skincolor!", + "Enables blending effects for certain player effects when boosting.", "Makes bananas and other items jump and jitter\nwhen dragged behind.", "Keep your driftsparks going while in air.", "Show Localskin Menus.", @@ -2288,6 +2291,7 @@ enum sm_skinselspeed, sm_colorlines, sm_colorflames, + sm_blendeffects, sm_bananjumpy, sm_airsparks, sm_showlocalskin,