Resolve "CA uses LMS start values" and same for FT

diff --git a/balance-mario.cfg b/balance-mario.cfg
index ea4c4dbb600ff07ff440f8e4a84b708999e33af6..3ed931eb64f6b5cdbf12ccc171bbe9674a0b2acd 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index b3d856c054bb6493295fdd3f088c2c5819aa8926..b89f7caa5b3190af25d79059dd0c3cb923781e06 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 250
+set g_ca_start_armor 100
+set g_ca_start_ammo_shells 50
+set g_ca_start_ammo_nails 150
+set g_ca_start_ammo_rockets 50
+set g_ca_start_ammo_cells 50
+set g_ca_start_ammo_plasma 50
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 150
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 50
+set g_ft_start_ammo_nails 150
+set g_ft_start_ammo_rockets 50
+set g_ft_start_ammo_cells 50
+set g_ft_start_ammo_plasma 50
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 250
 set g_lms_start_armor 100
 set g_lms_start_ammo_shells 50

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index 7aea6f87f41d7d8db4ee79e8c022955d57af6baf..e3231dd0c3499b8634b479cb75d32d1edb169010 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 100
 set g_lms_start_ammo_shells 60

diff --git a/balance-samual.cfg b/balance-samual.cfg
index c177f30ff2502411b4da4886370fba5347f714f9..3481e191a179d9c1513f4826a8d7d50bb21069a2 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 5ba025a88ba04c0c00718a83888c8ec267206a57..bb4c0252b3ba67f41ba01b1e62f5001d8fb7ef77 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index 8c36402ab5c49cce391eff869608b88b316ab132..823b42a748dafc9c9424146982f99bc310d4c491 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 46e04a9504d5a55160dc20ce3e60f025e357a565..8173e38d37cbe69aedade753e9c2ca24de8a8cb4 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
index bb23f51c8087833caa2e6511a46476ae4b8137c9..053987942d3937ce7cbf8e66e93c87b71bda9f84 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
@@ -337,14 +337,14 @@ MUTATOR_HOOKFUNCTION(ca, GiveFragsForKill, CBC_ORDER_FIRST)
 MUTATOR_HOOKFUNCTION(ca, SetStartItems)
 {
        start_items       &= ~(IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS);
-       start_health       = warmup_start_health       = cvar("g_lms_start_health");
-       start_armorvalue   = warmup_start_armorvalue   = cvar("g_lms_start_armor");
-       start_ammo_shells  = warmup_start_ammo_shells  = cvar("g_lms_start_ammo_shells");
-       start_ammo_nails   = warmup_start_ammo_nails   = cvar("g_lms_start_ammo_nails");
-       start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_lms_start_ammo_rockets");
-       start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_lms_start_ammo_cells");
-       start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_lms_start_ammo_plasma");
-       start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_lms_start_ammo_fuel");
+       start_health       = warmup_start_health       = cvar("g_ca_start_health");
+       start_armorvalue   = warmup_start_armorvalue   = cvar("g_ca_start_armor");
+       start_ammo_shells  = warmup_start_ammo_shells  = cvar("g_ca_start_ammo_shells");
+       start_ammo_nails   = warmup_start_ammo_nails   = cvar("g_ca_start_ammo_nails");
+       start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_ca_start_ammo_rockets");
+       start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_ca_start_ammo_cells");
+       start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_ca_start_ammo_plasma");
+       start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_ca_start_ammo_fuel");
 }
 
 MUTATOR_HOOKFUNCTION(ca, Damage_Calculate)

diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
index ea00927abd908ae3856092f51b8d81d4ab80301b..5a056e44b6e738afcfcf9be7f2d88f7f9ca0814c 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
+++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
@@ -620,14 +620,14 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
 MUTATOR_HOOKFUNCTION(ft, SetStartItems)
 {
        start_items &= ~(IT_UNLIMITED_AMMO | IT_UNLIMITED_SUPERWEAPONS);
-       //start_health       = warmup_start_health       = cvar("g_lms_start_health");
-       //start_armorvalue   = warmup_start_armorvalue   = cvar("g_lms_start_armor");
-       start_ammo_shells  = warmup_start_ammo_shells  = cvar("g_lms_start_ammo_shells");
-       start_ammo_nails   = warmup_start_ammo_nails   = cvar("g_lms_start_ammo_nails");
-       start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_lms_start_ammo_rockets");
-       start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_lms_start_ammo_cells");
-       start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_lms_start_ammo_plasma");
-       start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_lms_start_ammo_fuel");
+       start_health       = warmup_start_health       = cvar("g_ft_start_health");
+       start_armorvalue   = warmup_start_armorvalue   = cvar("g_ft_start_armor");
+       start_ammo_shells  = warmup_start_ammo_shells  = cvar("g_ft_start_ammo_shells");
+       start_ammo_nails   = warmup_start_ammo_nails   = cvar("g_ft_start_ammo_nails");
+       start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_ft_start_ammo_rockets");
+       start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_ft_start_ammo_cells");
+       start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_ft_start_ammo_plasma");
+       start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_ft_start_ammo_fuel");
 }
 
 MUTATOR_HOOKFUNCTION(ft, HavocBot_ChooseRole)