From dddb63ef85a3e81c80424318f1863bd22ec3e541 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 18 Mar 2012 17:10:11 +0200 Subject: [PATCH] Megahealth is not a powerup. Always enable it --- data/defaultVT.cfg | 3 +-- data/qcsrc/server/t_items.qc | 6 ------ docs/TODO.txt | 4 +++- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index c3827e2c..bb9f02a8 100644 --- a/data/defaultVT.cfg +++ b/data/defaultVT.cfg @@ -431,7 +431,6 @@ set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved t set g_pinata 0 "if set to 1 you will not only drop your current weapon when you are killed, but you will drop all weapons that you possessed" set g_weapon_stay 0 "if set to 1 or 2, weapons stay after they were picked up (1: weapons you don't have yet give you ammo of their type and they can not be dropped, 2: weapons don't give ammo, but instead players start with one pickup-load of ammo by default, 3: weapons give ammo, weapons only stay as ammo-less ghosts)" set g_weapon_throwable 1 "if set to 1, weapons can be dropped" -set g_powerup_superhealth 1 "if set to 0 the mega health powerup will not spawn on the map" set g_powerup_strength 1 "if set to 0 the strength powerup will not spawn on the map" set g_powerup_shield 1 "if set to 0 the shield (invincibility) powerup will not spawn on the map" set g_balance_powerup_timer 1 "if set to 0 the powerups dont wear off" @@ -619,7 +618,7 @@ seta g_arena 0 "Arena: many one-on-one rounds are played to find the winner" set g_arena_maxspawned 2 "maximum number of players to spawn at once (the rest is spectating, waiting for their turn)" set g_arena_roundbased 1 "if disabled, the next player will spawn as soon as someone dies" set g_arena_warmup 5 "time, newly spawned players have to prepare themselves in round based matches" -set g_arena_powerups 0 "enables powerups (superhealth, strength and shield), which are removed by default" +set g_arena_powerups 0 "enables powerups (strength and shield), which are removed by default" // ca seta g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round." diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index 0c02da26..d936ddb7 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -1095,12 +1095,6 @@ void spawnfunc_item_health_large (void) { } void spawnfunc_item_health_mega (void) { - if(!cvar("g_powerup_superhealth")) - return; - - if((g_arena || g_ca) && !cvar("g_arena_powerups")) - return; - if(!self.max_health) self.max_health = g_pickup_healthmega_max; if(!self.health) diff --git a/docs/TODO.txt b/docs/TODO.txt index 79528ec8..bfe98ac6 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -170,4 +170,6 @@ - 0.8: Why am I not seeing frags and death in the scoreboard in Team Deathmatch? -- 0.8: If we eat a team mate, then a consumable item, then the tea mate gets out, autodigest won't start digesting the consumable item \ No newline at end of file +- 0.8: If we eat a team mate, then a consumable item, then the tea mate gets out, autodigest won't start digesting the consumable item + +- 0.8: Add warmup stage to the menu \ No newline at end of file -- 2.39.2