From: Freddy Date: Sat, 5 Nov 2016 22:22:59 +0000 (+0100) Subject: Rename cvars containing healthlarge to healthbig X-Git-Tag: xonotic-v0.8.2~387^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a489044494c42e3e44f39a3425c580f0f6c51f6a;p=xonotic%2Fxonotic-data.pk3dir.git Rename cvars containing healthlarge to healthbig --- diff --git a/balance-mario.cfg b/balance-mario.cfg index 4eaa88e1b..d290be012 100644 --- a/balance-mario.cfg +++ b/balance-mario.cfg @@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1 set g_pickup_healthmedium 25 set g_pickup_healthmedium_max 200 set g_pickup_healthmedium_anyway 1 -set g_pickup_healthlarge 50 -set g_pickup_healthlarge_max 200 -set g_pickup_healthlarge_anyway 1 +set g_pickup_healthbig 50 +set g_pickup_healthbig_max 200 +set g_pickup_healthbig_anyway 1 set g_pickup_healthmega 100 set g_pickup_healthmega_max 200 set g_pickup_healthmega_anyway 1 diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg index 81c115678..39405f399 100644 --- a/balance-nexuiz25.cfg +++ b/balance-nexuiz25.cfg @@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 0 set g_pickup_healthmedium 25 set g_pickup_healthmedium_max 999 set g_pickup_healthmedium_anyway 0 -set g_pickup_healthlarge 50 -set g_pickup_healthlarge_max 999 -set g_pickup_healthlarge_anyway 0 +set g_pickup_healthbig 50 +set g_pickup_healthbig_max 999 +set g_pickup_healthbig_anyway 0 set g_pickup_healthmega 100 set g_pickup_healthmega_max 999 set g_pickup_healthmega_anyway 0 diff --git a/balance-overkill.cfg b/balance-overkill.cfg index d7b0c5237..da17e0afe 100644 --- a/balance-overkill.cfg +++ b/balance-overkill.cfg @@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1 set g_pickup_healthmedium 25 set g_pickup_healthmedium_max 200 set g_pickup_healthmedium_anyway 1 -set g_pickup_healthlarge 50 -set g_pickup_healthlarge_max 200 -set g_pickup_healthlarge_anyway 1 +set g_pickup_healthbig 50 +set g_pickup_healthbig_max 200 +set g_pickup_healthbig_anyway 1 set g_pickup_healthmega 100 set g_pickup_healthmega_max 200 set g_pickup_healthmega_anyway 0 diff --git a/balance-samual.cfg b/balance-samual.cfg index a248faba2..ad7192227 100644 --- a/balance-samual.cfg +++ b/balance-samual.cfg @@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1 set g_pickup_healthmedium 25 set g_pickup_healthmedium_max 200 set g_pickup_healthmedium_anyway 1 -set g_pickup_healthlarge 50 -set g_pickup_healthlarge_max 200 -set g_pickup_healthlarge_anyway 1 +set g_pickup_healthbig 50 +set g_pickup_healthbig_max 200 +set g_pickup_healthbig_anyway 1 set g_pickup_healthmega 100 set g_pickup_healthmega_max 200 set g_pickup_healthmega_anyway 1 diff --git a/balance-xdf.cfg b/balance-xdf.cfg index 2fcc44411..79344fda9 100644 --- a/balance-xdf.cfg +++ b/balance-xdf.cfg @@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1 set g_pickup_healthmedium 25 set g_pickup_healthmedium_max 200 set g_pickup_healthmedium_anyway 1 -set g_pickup_healthlarge 50 -set g_pickup_healthlarge_max 200 -set g_pickup_healthlarge_anyway 1 +set g_pickup_healthbig 50 +set g_pickup_healthbig_max 200 +set g_pickup_healthbig_anyway 1 set g_pickup_healthmega 100 set g_pickup_healthmega_max 200 set g_pickup_healthmega_anyway 1 diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg index d413cc684..f317d2e6b 100644 --- a/balance-xonotic.cfg +++ b/balance-xonotic.cfg @@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 1 set g_pickup_healthmedium 25 set g_pickup_healthmedium_max 200 set g_pickup_healthmedium_anyway 1 -set g_pickup_healthlarge 50 -set g_pickup_healthlarge_max 200 -set g_pickup_healthlarge_anyway 1 +set g_pickup_healthbig 50 +set g_pickup_healthbig_max 200 +set g_pickup_healthbig_anyway 1 set g_pickup_healthmega 100 set g_pickup_healthmega_max 200 set g_pickup_healthmega_anyway 1 diff --git a/balance-xpm.cfg b/balance-xpm.cfg index a2c36202c..f5ec29240 100644 --- a/balance-xpm.cfg +++ b/balance-xpm.cfg @@ -81,9 +81,9 @@ set g_pickup_healthsmall_anyway 0 set g_pickup_healthmedium 25 set g_pickup_healthmedium_max 100 set g_pickup_healthmedium_anyway 0 -set g_pickup_healthlarge 50 -set g_pickup_healthlarge_max 100 -set g_pickup_healthlarge_anyway 0 +set g_pickup_healthbig 50 +set g_pickup_healthbig_max 100 +set g_pickup_healthbig_anyway 0 set g_pickup_healthmega 100 set g_pickup_healthmega_max 200 set g_pickup_healthmega_anyway 0 diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index a0e9d638b..24ac65358 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -1384,11 +1384,11 @@ spawnfunc(item_health_medium) spawnfunc(item_health_large) { if(!this.max_health) - this.max_health = g_pickup_healthlarge_max; + this.max_health = g_pickup_healthbig_max; if(!this.health) - this.health = g_pickup_healthlarge; + this.health = g_pickup_healthbig; if(!this.pickup_anyway) - this.pickup_anyway = g_pickup_healthlarge_anyway; + this.pickup_anyway = g_pickup_healthbig_anyway; StartItem(this, ITEM_HealthLarge); } diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index d237c3038..eb0f3a910 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -191,9 +191,9 @@ float g_pickup_healthsmall_anyway; float g_pickup_healthmedium; float g_pickup_healthmedium_max; float g_pickup_healthmedium_anyway; -float g_pickup_healthlarge; -float g_pickup_healthlarge_max; -float g_pickup_healthlarge_anyway; +float g_pickup_healthbig; +float g_pickup_healthbig_max; +float g_pickup_healthbig_anyway; float g_pickup_healthmega; float g_pickup_healthmega_max; float g_pickup_healthmega_anyway; @@ -321,9 +321,9 @@ void readlevelcvars() g_pickup_healthmedium = cvar("g_pickup_healthmedium"); g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max"); g_pickup_healthmedium_anyway = cvar("g_pickup_healthmedium_anyway"); - g_pickup_healthlarge = cvar("g_pickup_healthlarge"); - g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max"); - g_pickup_healthlarge_anyway = cvar("g_pickup_healthlarge_anyway"); + g_pickup_healthbig = cvar("g_pickup_healthbig"); + g_pickup_healthbig_max = cvar("g_pickup_healthbig_max"); + g_pickup_healthbig_anyway = cvar("g_pickup_healthbig_anyway"); g_pickup_healthmega = cvar("g_pickup_healthmega"); g_pickup_healthmega_max = cvar("g_pickup_healthmega_max"); g_pickup_healthmega_anyway = cvar("g_pickup_healthmega_anyway");