From 8275f617a7c543fd1984eb3587cb63373ff219ce Mon Sep 17 00:00:00 2001 From: Izuru Yakumo Date: Sun, 20 Jul 2025 22:38:05 -0300 Subject: [PATCH] Regenerating armor --- code/game/g_active.c | 5 +++++ code/game/g_local.h | 3 +++ code/game/g_main.c | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/code/game/g_active.c b/code/game/g_active.c index d7c2311..b981fcf 100644 --- a/code/game/g_active.c +++ b/code/game/g_active.c @@ -470,6 +470,11 @@ void ClientTimerActions( gentity_t *ent, int msec ) { } } + // New in Illusion Arena r33 + // Regenerating armor + if ( client->ps.stats[STAT_ARMOR] < client->ps.stats[STAT_MAX_HEALTH] ) { + client->ps.stats[STAT_ARMOR]+=g_regen_armor.integer; + } // count down armor when over max if ( client->ps.stats[STAT_ARMOR] > client->ps.stats[STAT_MAX_HEALTH] ) { client->ps.stats[STAT_ARMOR]--; diff --git a/code/game/g_local.h b/code/game/g_local.h index 1cbc986..a4f5ac7 100644 --- a/code/game/g_local.h +++ b/code/game/g_local.h @@ -1082,6 +1082,9 @@ extern vmCvar_t g_vampire; extern vmCvar_t g_vampireMaxHealth; //new in elimination Beta3 extern vmCvar_t g_regen; +// New in Illusion Arena r33 +// Regenerating armor +extern vmCvar_t g_regen_armor; //Free for all gametype extern int g_ffa_gt; //0 = TEAM GAME, 1 = FFA, 2 = TEAM GAME without bases diff --git a/code/game/g_main.c b/code/game/g_main.c index 50ad52f..3f84ae2 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -137,6 +137,9 @@ vmCvar_t g_vampire; vmCvar_t g_vampireMaxHealth; // Regen vmCvar_t g_regen; +// New in Illusion Arena r33 +// Regenerating armor +vmCvar_t g_regen_armor; int g_ffa_gt; // Are this a FFA gametype even if gametype is high? vmCvar_t g_lms_lives; vmCvar_t g_lms_mode; @@ -355,6 +358,9 @@ static cvarTable_t gameCvarTable[] = { { &g_instantgib, "g_instantgib", "0", CVAR_SERVERINFO | CVAR_LATCH, 0, qfalse }, { &g_vampire, "g_vampire", "0.0", CVAR_NORESTART, 0, qtrue }, { &g_regen, "g_regen", "0", CVAR_NORESTART, 0, qtrue }, + // New in Illusion Arena r33 + // Regenerating armor + { &g_regen_armor, "g_regen_armor", "0", CVAR_NORESTART, 0, qtrue }, { &g_vampireMaxHealth, "g_vampire_max_health", "500", CVAR_NORESTART, 0, qtrue }, { &g_lms_lives, "g_lms_lives", "1", CVAR_NORESTART, 0, qtrue }, { &g_lms_mode, "g_lms_mode", "0", CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_NORESTART, 0, qtrue },