From b89cf36c6d4aba16af453f61130ad66d5a553854 Mon Sep 17 00:00:00 2001 From: yamamama Date: Thu, 11 Dec 2025 12:00:55 -0500 Subject: [PATCH] Invincibility: 'Legacy' -> 'Classic' Per internal talks --- src/d_netcmd.c | 4 ++-- src/d_netcmd.h | 4 ++-- src/k_kart.c | 8 ++++---- src/k_kart.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 9780aba04..5239b4a6e 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -483,8 +483,8 @@ consvar_t cv_kartstacking_panel_separate = CVAR_INIT ("vanillaboost_panel_separa consvar_t cv_kartstacking_panel_maxgrade = CVAR_INIT ("vanillaboost_panel_maxgrade", "2", CV_NETVAR|CV_CHEAT|CV_GUARD, CV_Natural, NULL); -consvar_t cv_kartstacking_invincibility_legacyspeedboost = CVAR_INIT ("vanillaboost_invincibility_legacyspeedboost", "0.375", CV_NETVAR|CV_CHEAT|CV_FLOAT|CV_GUARD, CV_Unsigned, NULL); -consvar_t cv_kartstacking_invincibility_legacyaccelboost = CVAR_INIT ("vanillaboost_invincibility_legacyaccelboost", "3.0", CV_NETVAR|CV_CHEAT|CV_FLOAT|CV_GUARD, CV_Unsigned, NULL); +consvar_t cv_kartstacking_invincibility_classicspeedboost = CVAR_INIT ("vanillaboost_invincibility_classicspeedboost", "0.375", CV_NETVAR|CV_CHEAT|CV_FLOAT|CV_GUARD, CV_Unsigned, NULL); +consvar_t cv_kartstacking_invincibility_classicaccelboost = CVAR_INIT ("vanillaboost_invincibility_classicaccelboost", "3.0", CV_NETVAR|CV_CHEAT|CV_FLOAT|CV_GUARD, CV_Unsigned, NULL); consvar_t cv_kartstacking_invincibility_alternatespeedboost = CVAR_INIT ("vanillaboost_invincibility_alternatespeedboost", "0.68", CV_NETVAR|CV_CHEAT|CV_FLOAT|CV_GUARD, CV_Unsigned, NULL); consvar_t cv_kartstacking_invincibility_alternateaccelboost = CVAR_INIT ("vanillaboost_invincibility_alternateaccelboost", "3.0", CV_NETVAR|CV_CHEAT|CV_FLOAT|CV_GUARD, CV_Unsigned, NULL); consvar_t cv_kartstacking_invincibility_stackable = CVAR_INIT ("vanillaboost_invincibility_stackable", "On", CV_NETVAR|CV_GUARD, CV_OnOff, NULL); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index ec39c83ce..491351a99 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -117,8 +117,8 @@ extern consvar_t cv_kartstacking_panel_separate; extern consvar_t cv_kartstacking_panel_maxgrade; -extern consvar_t cv_kartstacking_invincibility_legacyspeedboost; -extern consvar_t cv_kartstacking_invincibility_legacyaccelboost; +extern consvar_t cv_kartstacking_invincibility_classicspeedboost; +extern consvar_t cv_kartstacking_invincibility_classicaccelboost; extern consvar_t cv_kartstacking_invincibility_alternatespeedboost; extern consvar_t cv_kartstacking_invincibility_alternateaccelboost; extern consvar_t cv_kartstacking_invincibility_stackable; diff --git a/src/k_kart.c b/src/k_kart.c index 356e3eb04..9bee8a17d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -306,8 +306,8 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartstacking_panel_separate); CV_RegisterVar(&cv_kartstacking_panel_maxgrade); - CV_RegisterVar(&cv_kartstacking_invincibility_legacyspeedboost); - CV_RegisterVar(&cv_kartstacking_invincibility_legacyaccelboost); + CV_RegisterVar(&cv_kartstacking_invincibility_classicspeedboost); + CV_RegisterVar(&cv_kartstacking_invincibility_classicaccelboost); CV_RegisterVar(&cv_kartstacking_invincibility_alternatespeedboost); CV_RegisterVar(&cv_kartstacking_invincibility_alternateaccelboost); CV_RegisterVar(&cv_kartstacking_invincibility_stackable); @@ -2525,7 +2525,7 @@ UINT16 K_GetInvincibilityTime(player_t *player) fixed_t K_GetInvincibilitySpeed(UINT16 time) { if (!K_IsKartItemAlternate(KITEM_INVINCIBILITY)) - return INVINSPEEDBOOSTLGC; + return INVINSPEEDBOOSTCLS; fixed_t t = min(FRACUNIT, K_InvincibilityGradient(time)); return Easing_OutCubic(t, 0, INVINSPEEDBOOSTALT); @@ -2534,7 +2534,7 @@ fixed_t K_GetInvincibilitySpeed(UINT16 time) fixed_t K_GetInvincibilityAccel(UINT16 time) { if (!K_IsKartItemAlternate(KITEM_INVINCIBILITY)) - return INVINACCELBOOSTLGC; + return INVINACCELBOOSTCLS; fixed_t t = min(FRACUNIT, K_InvincibilityGradient(time)); return Easing_OutCubic(t, 0, INVINACCELBOOSTALT); diff --git a/src/k_kart.h b/src/k_kart.h index c085c5429..9017f4a8f 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -110,8 +110,8 @@ extern vector3_t clusterpoint, clusterdtf; #define SEPARATEPANELS CV_Get(&cv_kartstacking_panel_separate) #define MAXPANELSTACK CV_Get(&cv_kartstacking_panel_maxgrade) -#define INVINSPEEDBOOSTLGC CV_Get(&cv_kartstacking_invincibility_legacyspeedboost) -#define INVINACCELBOOSTLGC CV_Get(&cv_kartstacking_invincibility_legacyaccelboost) +#define INVINSPEEDBOOSTCLS CV_Get(&cv_kartstacking_invincibility_classicspeedboost) +#define INVINACCELBOOSTCLS CV_Get(&cv_kartstacking_invincibility_classicaccelboost) #define INVINSPEEDBOOSTALT CV_Get(&cv_kartstacking_invincibility_alternatespeedboost) #define INVINACCELBOOSTALT CV_Get(&cv_kartstacking_invincibility_alternateaccelboost) #define INVINSTACKABLE CV_Get(&cv_kartstacking_invincibility_stackable)