From 32b84444728fd49e2b8415e5e0fd9541cd834075 Mon Sep 17 00:00:00 2001 From: Freddy Date: Fri, 28 Oct 2016 20:22:03 +0200 Subject: [PATCH] Rename cvars containing armorlarge to armormega --- balance-mario.cfg | 6 +++--- balance-nexuiz25.cfg | 6 +++--- balance-overkill.cfg | 6 +++--- balance-samual.cfg | 6 +++--- balance-xdf.cfg | 6 +++--- balance-xonotic.cfg | 6 +++--- balance-xpm.cfg | 6 +++--- mutators.cfg | 4 ++-- .../common/mutators/mutator/overkill/sv_overkill.qc | 4 ++-- qcsrc/common/t_items.qc | 6 +++--- qcsrc/server/miscfunctions.qh | 12 ++++++------ 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/balance-mario.cfg b/balance-mario.cfg index 022d62eaa..4eaa88e1b 100644 --- a/balance-mario.cfg +++ b/balance-mario.cfg @@ -72,9 +72,9 @@ set g_pickup_armormedium_anyway 1 set g_pickup_armorbig 50 set g_pickup_armorbig_max 200 set g_pickup_armorbig_anyway 1 -set g_pickup_armorlarge 100 -set g_pickup_armorlarge_max 200 -set g_pickup_armorlarge_anyway 1 +set g_pickup_armormega 100 +set g_pickup_armormega_max 200 +set g_pickup_armormega_anyway 1 set g_pickup_healthsmall 5 set g_pickup_healthsmall_max 200 set g_pickup_healthsmall_anyway 1 diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg index ebce2fabe..81c115678 100644 --- a/balance-nexuiz25.cfg +++ b/balance-nexuiz25.cfg @@ -72,9 +72,9 @@ set g_pickup_armormedium_anyway 0 set g_pickup_armorbig 50 set g_pickup_armorbig_max 999 set g_pickup_armorbig_anyway 0 -set g_pickup_armorlarge 100 -set g_pickup_armorlarge_max 999 -set g_pickup_armorlarge_anyway 0 +set g_pickup_armormega 100 +set g_pickup_armormega_max 999 +set g_pickup_armormega_anyway 0 set g_pickup_healthsmall 5 set g_pickup_healthsmall_max 999 set g_pickup_healthsmall_anyway 0 diff --git a/balance-overkill.cfg b/balance-overkill.cfg index c55241962..d7b0c5237 100644 --- a/balance-overkill.cfg +++ b/balance-overkill.cfg @@ -72,9 +72,9 @@ set g_pickup_armormedium_anyway 1 set g_pickup_armorbig 50 set g_pickup_armorbig_max 100 set g_pickup_armorbig_anyway 1 -set g_pickup_armorlarge 100 -set g_pickup_armorlarge_max 100 -set g_pickup_armorlarge_anyway 1 +set g_pickup_armormega 100 +set g_pickup_armormega_max 100 +set g_pickup_armormega_anyway 1 set g_pickup_healthsmall 5 set g_pickup_healthsmall_max 200 set g_pickup_healthsmall_anyway 1 diff --git a/balance-samual.cfg b/balance-samual.cfg index 58a0f3758..a248faba2 100644 --- a/balance-samual.cfg +++ b/balance-samual.cfg @@ -72,9 +72,9 @@ set g_pickup_armormedium_anyway 1 set g_pickup_armorbig 50 set g_pickup_armorbig_max 200 set g_pickup_armorbig_anyway 1 -set g_pickup_armorlarge 100 -set g_pickup_armorlarge_max 200 -set g_pickup_armorlarge_anyway 1 +set g_pickup_armormega 100 +set g_pickup_armormega_max 200 +set g_pickup_armormega_anyway 1 set g_pickup_healthsmall 5 set g_pickup_healthsmall_max 200 set g_pickup_healthsmall_anyway 1 diff --git a/balance-xdf.cfg b/balance-xdf.cfg index ff2ec1871..2fcc44411 100644 --- a/balance-xdf.cfg +++ b/balance-xdf.cfg @@ -72,9 +72,9 @@ set g_pickup_armormedium_anyway 1 set g_pickup_armorbig 50 set g_pickup_armorbig_max 200 set g_pickup_armorbig_anyway 1 -set g_pickup_armorlarge 100 -set g_pickup_armorlarge_max 200 -set g_pickup_armorlarge_anyway 1 +set g_pickup_armormega 100 +set g_pickup_armormega_max 200 +set g_pickup_armormega_anyway 1 set g_pickup_healthsmall 5 set g_pickup_healthsmall_max 200 set g_pickup_healthsmall_anyway 1 diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg index e9fb9994d..d413cc684 100644 --- a/balance-xonotic.cfg +++ b/balance-xonotic.cfg @@ -72,9 +72,9 @@ set g_pickup_armormedium_anyway 1 set g_pickup_armorbig 50 set g_pickup_armorbig_max 200 set g_pickup_armorbig_anyway 1 -set g_pickup_armorlarge 100 -set g_pickup_armorlarge_max 200 -set g_pickup_armorlarge_anyway 1 +set g_pickup_armormega 100 +set g_pickup_armormega_max 200 +set g_pickup_armormega_anyway 1 set g_pickup_healthsmall 5 set g_pickup_healthsmall_max 200 set g_pickup_healthsmall_anyway 1 diff --git a/balance-xpm.cfg b/balance-xpm.cfg index 0c24cf206..a2c36202c 100644 --- a/balance-xpm.cfg +++ b/balance-xpm.cfg @@ -72,9 +72,9 @@ set g_pickup_armormedium_anyway 0 set g_pickup_armorbig 50 set g_pickup_armorbig_max 100 set g_pickup_armorbig_anyway 0 -set g_pickup_armorlarge 100 -set g_pickup_armorlarge_max 200 -set g_pickup_armorlarge_anyway 0 +set g_pickup_armormega 100 +set g_pickup_armormega_max 200 +set g_pickup_armormega_anyway 0 set g_pickup_healthsmall 5 set g_pickup_healthsmall_max 200 set g_pickup_healthsmall_anyway 0 diff --git a/mutators.cfg b/mutators.cfg index 2188f8007..a736f3e92 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -53,7 +53,7 @@ set g_overkill_powerups_replace 1 set g_overkill_filter_healthmega 0 set g_overkill_filter_armormedium 0 set g_overkill_filter_armorbig 0 -set g_overkill_filter_armorlarge 0 +set g_overkill_filter_armormega 0 set g_overkill_ammo_charge 0 set g_overkill_ammo_charge_notice 1 @@ -436,4 +436,4 @@ set g_walljump 0 "Enable wall jumping mutator" set g_walljump_delay 1 "Minimum delay between wall jumps" set g_walljump_force 300 "How far to bounce/jump off the wall" set g_walljump_velocity_xy_factor 1.15 "How much to slow down along horizontal axis, higher value = higher deceleration, if factor is < 1, you accelerate by wall jumping" -set g_walljump_velocity_z_factor 0.5 "Upwards velocity factor, multiplied by normal jump velocity" \ No newline at end of file +set g_walljump_velocity_z_factor 0.5 "Upwards velocity factor, multiplied by normal jump velocity" diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index d47da6c3c..cc5982840 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -11,7 +11,7 @@ float autocvar_g_overkill_ammo_charge_limit; bool autocvar_g_overkill_filter_healthmega; bool autocvar_g_overkill_filter_armormedium; bool autocvar_g_overkill_filter_armorbig; -bool autocvar_g_overkill_filter_armorlarge; +bool autocvar_g_overkill_filter_armormega; .float ok_lastwep; .float ok_item; @@ -315,7 +315,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem) // WARNING: next two statements look wrong because of inconsistency between cvar names and code // armor cvars need renaming to be consistent with their health counterparts case ITEM_ArmorLarge: return autocvar_g_overkill_filter_armorbig; - case ITEM_ArmorMega: return autocvar_g_overkill_filter_armorlarge; + case ITEM_ArmorMega: return autocvar_g_overkill_filter_armormega; } return true; diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 7424d695a..dcd6bb982 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -1351,11 +1351,11 @@ spawnfunc(item_armor_big) spawnfunc(item_armor_large) { if(!this.armorvalue) - this.armorvalue = g_pickup_armorlarge; + this.armorvalue = g_pickup_armormega; if(!this.max_armorvalue) - this.max_armorvalue = g_pickup_armorlarge_max; + this.max_armorvalue = g_pickup_armormega_max; if(!this.pickup_anyway) - this.pickup_anyway = g_pickup_armorlarge_anyway; + this.pickup_anyway = g_pickup_armormega_anyway; StartItem(this, ITEM_ArmorMega); } diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index b6ddd3c6a..d237c3038 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -182,9 +182,9 @@ float g_pickup_armormedium_anyway; float g_pickup_armorbig; float g_pickup_armorbig_max; float g_pickup_armorbig_anyway; -float g_pickup_armorlarge; -float g_pickup_armorlarge_max; -float g_pickup_armorlarge_anyway; +float g_pickup_armormega; +float g_pickup_armormega_max; +float g_pickup_armormega_anyway; float g_pickup_healthsmall; float g_pickup_healthsmall_max; float g_pickup_healthsmall_anyway; @@ -312,9 +312,9 @@ void readlevelcvars() g_pickup_armorbig = cvar("g_pickup_armorbig"); g_pickup_armorbig_max = cvar("g_pickup_armorbig_max"); g_pickup_armorbig_anyway = cvar("g_pickup_armorbig_anyway"); - g_pickup_armorlarge = cvar("g_pickup_armorlarge"); - g_pickup_armorlarge_max = cvar("g_pickup_armorlarge_max"); - g_pickup_armorlarge_anyway = cvar("g_pickup_armorlarge_anyway"); + g_pickup_armormega = cvar("g_pickup_armormega"); + g_pickup_armormega_max = cvar("g_pickup_armormega_max"); + g_pickup_armormega_anyway = cvar("g_pickup_armormega_anyway"); g_pickup_healthsmall = cvar("g_pickup_healthsmall"); g_pickup_healthsmall_max = cvar("g_pickup_healthsmall_max"); g_pickup_healthsmall_anyway = cvar("g_pickup_healthsmall_anyway"); -- 2.39.2