From: Dr. Jaska Date: Sat, 15 May 2021 14:14:41 +0000 (+0000) Subject: Resolve "CA uses LMS start values" and same for FT X-Git-Tag: xonotic-v0.8.5~413^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6d58b7efea9593429eb9114cff197143f8ced52;p=xonotic%2Fxonotic-data.pk3dir.git Resolve "CA uses LMS start values" and same for FT --- diff --git a/balance-mario.cfg b/balance-mario.cfg index ea4c4dbb6..3ed931eb6 100644 --- 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 b3d856c05..b89f7caa5 100644 --- 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 7aea6f87f..e3231dd0c 100644 --- 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 c177f30ff..3481e191a 100644 --- 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 5ba025a88..bb4c0252b 100644 --- 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 8c36402ab..823b42a74 100644 --- 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 46e04a950..8173e38d3 100644 --- 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 bb23f51c8..053987942 100644 --- 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 ea00927ab..5a056e44b 100644 --- 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)