From 8baf3cd28e189c178305e21eea510d250910df28 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 17 Jan 2024 21:47:22 -0800 Subject: [PATCH] Battle: number of monitors that can spawn scales with lobby size - Duel: 1 - Small: 3 - Medium: 5 - Large: 8 --- src/k_battle.c | 6 +++++- src/k_battle.h | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/k_battle.c b/src/k_battle.c index dce59c87c..544490ee7 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -540,7 +540,11 @@ void K_RunPaperItemSpawners(void) //CONS_Printf("leveltime = %d ", leveltime); - if (spotAvailable > 0 && monitorsSpawned < BATTLE_MONITOR_SPAWN_LIMIT) + // Duel = 2 + 1 = 3 / 2 = 1 + // Small = 5 + 1 = 6 / 2 = 3 + // Medium = 10 + 1 = 11 / 2 = 5 + // Large = 16 + 1 = 17 / 2 = 8 + if (spotAvailable > 0 && monitorsSpawned < (mapheaderinfo[gamemap - 1]->playerLimit + 1) / 2) { const UINT8 r = spotMap[P_RandomKey(PR_ITEM_ROULETTE, spotAvailable)]; diff --git a/src/k_battle.h b/src/k_battle.h index 645821920..623553b63 100644 --- a/src/k_battle.h +++ b/src/k_battle.h @@ -13,8 +13,6 @@ extern "C" { #define BATTLE_POWERUP_TIME (30*TICRATE) #define BATTLE_UFO_TIME (20*TICRATE) -#define BATTLE_MONITOR_SPAWN_LIMIT (3) - extern struct battleovertime { UINT16 enabled; ///< Has this been initalized yet?