added (t)mayhem starting items cvars and now using them instead of lms

diff --git a/balance-mario.cfg b/balance-mario.cfg
index ea4c4dbb600ff07ff440f8e4a84b708999e33af6..b0013721342a305bdbfb59645677de7ffdb66bc5 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -33,6 +33,22 @@ set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 200
+set g_mayhem_start_armor 200
+set g_mayhem_start_ammo_shells 60
+set g_mayhem_start_ammo_nails 320
+set g_mayhem_start_ammo_rockets 160
+set g_mayhem_start_ammo_cells 180
+set g_mayhem_start_ammo_plasma 180
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 200
+set g_tmayhem_start_armor 200
+set g_tmayhem_start_ammo_shells 60
+set g_tmayhem_start_ammo_nails 320
+set g_tmayhem_start_ammo_rockets 160
+set g_tmayhem_start_ammo_cells 180
+set g_tmayhem_start_ammo_plasma 180
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 60

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index b3d856c054bb6493295fdd3f088c2c5819aa8926..0765371bb41cf973d8c003adee5bffa097c043eb 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -33,6 +33,22 @@ set g_lms_start_ammo_rockets 50
 set g_lms_start_ammo_cells 50
 set g_lms_start_ammo_plasma 50
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 250
+set g_mayhem_start_armor 100
+set g_mayhem_start_ammo_shells 50
+set g_mayhem_start_ammo_nails 150
+set g_mayhem_start_ammo_rockets 50
+set g_mayhem_start_ammo_cells 50
+set g_mayhem_start_ammo_plasma 50
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 250
+set g_tmayhem_start_armor 100
+set g_tmayhem_start_ammo_shells 50
+set g_tmayhem_start_ammo_nails 150
+set g_tmayhem_start_ammo_rockets 50
+set g_tmayhem_start_ammo_cells 50
+set g_tmayhem_start_ammo_plasma 50
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 15

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index 7aea6f87f41d7d8db4ee79e8c022955d57af6baf..72b3ceb73893cba9f5f90d60ba31c97d153e734a 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -33,6 +33,22 @@ set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 200
+set g_mayhem_start_armor 100
+set g_mayhem_start_ammo_shells 60
+set g_mayhem_start_ammo_nails 320
+set g_mayhem_start_ammo_rockets 160
+set g_mayhem_start_ammo_cells 180
+set g_mayhem_start_ammo_plasma 180
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 200
+set g_tmayhem_start_armor 100
+set g_tmayhem_start_ammo_shells 60
+set g_tmayhem_start_ammo_nails 320
+set g_tmayhem_start_ammo_rockets 160
+set g_tmayhem_start_ammo_cells 180
+set g_tmayhem_start_ammo_plasma 180
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 60

diff --git a/balance-samual.cfg b/balance-samual.cfg
index c177f30ff2502411b4da4886370fba5347f714f9..3ed9ecae9491947547856a6a281cf22f6392ecf0 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -33,6 +33,22 @@ set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 200
+set g_mayhem_start_armor 200
+set g_mayhem_start_ammo_shells 60
+set g_mayhem_start_ammo_nails 320
+set g_mayhem_start_ammo_rockets 160
+set g_mayhem_start_ammo_cells 180
+set g_mayhem_start_ammo_plasma 180
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 200
+set g_tmayhem_start_armor 200
+set g_tmayhem_start_ammo_shells 60
+set g_tmayhem_start_ammo_nails 320
+set g_tmayhem_start_ammo_rockets 160
+set g_tmayhem_start_ammo_cells 180
+set g_tmayhem_start_ammo_plasma 180
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 60

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 5ba025a88ba04c0c00718a83888c8ec267206a57..8180e4faf86f6da22d430be2f54723ad29eb47a7 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -33,6 +33,22 @@ set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 200
+set g_mayhem_start_armor 200
+set g_mayhem_start_ammo_shells 60
+set g_mayhem_start_ammo_nails 320
+set g_mayhem_start_ammo_rockets 160
+set g_mayhem_start_ammo_cells 180
+set g_mayhem_start_ammo_plasma 180
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 200
+set g_tmayhem_start_armor 200
+set g_tmayhem_start_ammo_shells 60
+set g_tmayhem_start_ammo_nails 320
+set g_tmayhem_start_ammo_rockets 160
+set g_tmayhem_start_ammo_cells 180
+set g_tmayhem_start_ammo_plasma 180
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 60

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index 8c36402ab5c49cce391eff869608b88b316ab132..650876da68acf314db72965adfa8bfdf0256a729 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -33,6 +33,22 @@ set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 200
+set g_mayhem_start_armor 200
+set g_mayhem_start_ammo_shells 60
+set g_mayhem_start_ammo_nails 320
+set g_mayhem_start_ammo_rockets 160
+set g_mayhem_start_ammo_cells 180
+set g_mayhem_start_ammo_plasma 180
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 200
+set g_tmayhem_start_armor 200
+set g_tmayhem_start_ammo_shells 60
+set g_tmayhem_start_ammo_nails 320
+set g_tmayhem_start_ammo_rockets 160
+set g_tmayhem_start_ammo_cells 180
+set g_tmayhem_start_ammo_plasma 180
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 60

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 46e04a9504d5a55160dc20ce3e60f025e357a565..0e002e522a9d49dce966117fea1b0a7cc523c0c5 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -33,6 +33,22 @@ set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 200
+set g_mayhem_start_armor 200
+set g_mayhem_start_ammo_shells 60
+set g_mayhem_start_ammo_nails 320
+set g_mayhem_start_ammo_rockets 160
+set g_mayhem_start_ammo_cells 180
+set g_mayhem_start_ammo_plasma 180
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 200
+set g_tmayhem_start_armor 200
+set g_tmayhem_start_ammo_shells 60
+set g_tmayhem_start_ammo_nails 320
+set g_tmayhem_start_ammo_rockets 160
+set g_tmayhem_start_ammo_cells 180
+set g_tmayhem_start_ammo_plasma 180
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 60

diff --git a/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc b/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
index 93b6d6346189009613cbdd62402410105ba34625..98bee53160e83279394d0d7312fa66c09fe81492 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
+++ b/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
@@ -13,14 +13,14 @@ MUTATOR_HOOKFUNCTION(mayhem, Scores_CountFragsRemaining)
 MUTATOR_HOOKFUNCTION(mayhem, 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_mayhem_start_health");
+       start_armorvalue   = warmup_start_armorvalue   = cvar("g_mayhem_start_armor");
+       start_ammo_shells  = warmup_start_ammo_shells  = cvar("g_mayhem_start_ammo_shells");
+       start_ammo_nails   = warmup_start_ammo_nails   = cvar("g_mayhem_start_ammo_nails");
+       start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_mayhem_start_ammo_rockets");
+       start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_mayhem_start_ammo_cells");
+       start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_mayhem_start_ammo_plasma");
+       start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_mayhem_start_ammo_fuel");
 }
 
 MUTATOR_HOOKFUNCTION(mayhem, PlayerRegen)

diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc
index 0d5baf05d41acd470bb1ce57c0000fd3d2e34b7c..285e399020bf6e9cd0c5f36e0d16f23f721ea711 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc
+++ b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc
@@ -65,14 +65,14 @@ MUTATOR_HOOKFUNCTION(tmayhem, Scores_CountFragsRemaining)
 MUTATOR_HOOKFUNCTION(tmayhem, 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_tmayhem_start_health");
+       start_armorvalue   = warmup_start_armorvalue   = cvar("g_tmayhem_start_armor");
+       start_ammo_shells  = warmup_start_ammo_shells  = cvar("g_tmayhem_start_ammo_shells");
+       start_ammo_nails   = warmup_start_ammo_nails   = cvar("g_tmayhem_start_ammo_nails");
+       start_ammo_rockets = warmup_start_ammo_rockets = cvar("g_tmayhem_start_ammo_rockets");
+       start_ammo_cells   = warmup_start_ammo_cells   = cvar("g_tmayhem_start_ammo_cells");
+       start_ammo_plasma  = warmup_start_ammo_plasma  = cvar("g_tmayhem_start_ammo_plasma");
+       start_ammo_fuel    = warmup_start_ammo_fuel    = cvar("g_tmayhem_start_ammo_fuel");
 }
 
 MUTATOR_HOOKFUNCTION(tmayhem, PlayerRegen)