From: drjaska Date: Tue, 20 Apr 2021 18:19:38 +0000 (+0300) Subject: added (t)mayhem starting items cvars and now using them instead of lms X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=790a9620f8e3ae7f0869a2846e9766190a82267b;p=xonotic%2Fxonotic-data.pk3dir.git added (t)mayhem starting items cvars and now using them instead of lms --- diff --git a/balance-mario.cfg b/balance-mario.cfg index ea4c4dbb6..b00137213 100644 --- 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 b3d856c05..0765371bb 100644 --- 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 7aea6f87f..72b3ceb73 100644 --- 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 c177f30ff..3ed9ecae9 100644 --- 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 5ba025a88..8180e4faf 100644 --- 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 8c36402ab..650876da6 100644 --- 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 46e04a950..0e002e522 100644 --- 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 93b6d6346..98bee5316 100644 --- 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 0d5baf05d..285e39902 100644 --- 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)