From 26bf6a4795009d9ff6377aea60870665efda11f0 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sun, 2 Nov 2025 23:01:41 -0500 Subject: [PATCH] reorganize the new cvars --- src/d_netcmd.c | 11 +++++++++++ src/d_netcmd.h | 9 +++++++++ src/k_kart.c | 26 +++++++++----------------- src/k_kart.h | 9 --------- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 50127fff1..1e71405c3 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -605,6 +605,17 @@ consvar_t cv_kartinvindistmul = CVAR_INIT ("kartinvindistmul", "0.54", CV_NETVAR consvar_t cv_kartinvin_maxtime = CVAR_INIT ("kartinvin_maxtime", "35.0", CV_NETVAR|CV_CHEAT|CV_FLOAT|CV_GUARD, CV_Unsigned, NULL); consvar_t cv_kartinvin_midtime = CVAR_INIT ("kartinvin_midtime", "23.333", CV_NETVAR|CV_CHEAT|CV_FLOAT|CV_GUARD, CV_Unsigned, NULL); +// opinionated stuff for testing balance tweaks on the shields +consvar_t cv_kartbubble_defense_canidle = CVAR_INIT ("kartbubble_defense_canidle", "On", CV_NETVAR, CV_OnOff, NULL); +static CV_PossibleValue_t bubble_defense_damagerate_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}}; +consvar_t cv_kartbubble_defense_damagerate = CVAR_INIT ("kartbubble_defense_damagerate", "1.0", CV_NETVAR|CV_FLOAT, bubble_defense_damagerate_cons_t, NULL); +consvar_t cv_kartbubble_boost_allow = CVAR_INIT ("kartbubble_boost_allow", "On", CV_NETVAR, CV_OnOff, NULL); +consvar_t cv_kartflame_fastfuel = CVAR_INIT ("kartflame_fastfuel", "Off", CV_NETVAR, CV_OnOff, NULL); +consvar_t cv_kartflame_offroadburn = CVAR_INIT ("kartflame_offroadburn", "Off", CV_NETVAR, CV_OnOff, NULL); + +static CV_PossibleValue_t kartairsquish_cons_t[] = {{1, "Squish"}, {2, "Flip-over"}, {0, "None"}, {0, NULL}}; +consvar_t cv_kartairsquish = CVAR_INIT ("kartairsquish", "None", CV_NETVAR, kartairsquish_cons_t, NULL); + static CV_PossibleValue_t kartdebugitem_cons_t[] = { #define FOREACH( name, n ) { n, #name } diff --git a/src/d_netcmd.h b/src/d_netcmd.h index cf4dff00e..f3ba44f3d 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -206,6 +206,15 @@ extern consvar_t cv_kartinvindistmul; extern consvar_t cv_kartinvin_maxtime; extern consvar_t cv_kartinvin_midtime; +// opinionated stuff for testing +extern consvar_t cv_kartbubble_defense_canidle; +extern consvar_t cv_kartbubble_defense_damagerate; +extern consvar_t cv_kartbubble_boost_allow; +extern consvar_t cv_kartflame_fastfuel; +extern consvar_t cv_kartflame_offroadburn; + +extern consvar_t cv_kartairsquish; + extern consvar_t cv_kartairdrop; extern consvar_t cv_kartitemlitter; diff --git a/src/k_kart.c b/src/k_kart.c index 74ce295bb..ff345891a 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -82,15 +82,6 @@ consvar_t cv_driftsparkpulse = CVAR_INIT ("driftsparkpulse", "1.4", CV_SAVE|CV_F consvar_t cv_saltyhop = CVAR_INIT ("hardcodehop", "Off", CV_SAVE, CV_OnOff, NULL); consvar_t cv_karthitemdialog = CVAR_INIT ("karthitemdialog", "On", CV_SAVE, CV_OnOff, NULL); -// opinionated stuff for testing -consvar_t cv_kartbubble_defense_canidle = CVAR_INIT ("kartbubble_defense_canidle", "On", CV_NETVAR, CV_OnOff, NULL); -static CV_PossibleValue_t bubble_defense_damagerate_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}}; -consvar_t cv_kartbubble_defense_damagerate = CVAR_INIT ("kartbubble_defense_damagerate", "1.0", CV_NETVAR|CV_FLOAT, bubble_defense_damagerate_cons_t, NULL); -consvar_t cv_kartbubble_boost_allow = CVAR_INIT ("kartbubble_boost_allow", "On", CV_NETVAR, CV_OnOff, NULL); -consvar_t cv_kartflame_fastfuel = CVAR_INIT ("kartflame_fastfuel", "Off", CV_NETVAR, CV_OnOff, NULL); - -static CV_PossibleValue_t kartairsquish_cons_t[] = {{1, "Squish"}, {2, "Flip-over"}, {0, "None"}, {0, NULL}}; -consvar_t cv_kartairsquish = CVAR_INIT ("kartairsquish", "None", CV_NETVAR, kartairsquish_cons_t, NULL); // SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H: // gamespeed is cc (0 for easy, 1 for normal, 2 for hard) @@ -313,14 +304,6 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartdebugcolorize); CV_RegisterVar(&cv_kartdebugdirector); - // experimental stuff - CV_RegisterVar(&cv_kartbubble_defense_canidle); - CV_RegisterVar(&cv_kartbubble_defense_damagerate); - CV_RegisterVar(&cv_kartbubble_boost_allow); - CV_RegisterVar(&cv_kartflame_fastfuel); - - CV_RegisterVar(&cv_kartairsquish); - // HUD cvars K_RegisterKartHUDStuff(); @@ -433,6 +416,15 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_kartinvin_maxtime); CV_RegisterVar(&cv_kartinvin_midtime); + // experimental stuff + CV_RegisterVar(&cv_kartbubble_defense_canidle); + CV_RegisterVar(&cv_kartbubble_defense_damagerate); + CV_RegisterVar(&cv_kartbubble_boost_allow); + CV_RegisterVar(&cv_kartflame_fastfuel); + CV_RegisterVar(&cv_kartflame_offroadburn); + + CV_RegisterVar(&cv_kartairsquish); + CV_RegisterVar(&cv_kartoddsdist); CV_RegisterVar(&cv_kartlegacyoddsdist); CV_RegisterVar(&cv_kartspbdist); diff --git a/src/k_kart.h b/src/k_kart.h index 6f335ae3e..d4ce1c505 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -20,15 +20,6 @@ extern consvar_t cv_kartchainingsound; extern consvar_t cv_kartdriftsounds; extern consvar_t cv_kartdriftefx; -extern consvar_t cv_kartairsquish; - -// opinionated stuff for testing -extern consvar_t cv_kartbubble_defense_canidle; -extern consvar_t cv_kartbubble_defense_damagerate; -extern consvar_t cv_kartbubble_boost_allow; - -extern consvar_t cv_kartflame_fastfuel; - #define KART_FULLTURN 800 /*