try renaming charge_pool to chargepool to make the cvar name a bit shorter

diff --git a/balance25.cfg b/balance25.cfg
index 32ec280..3806e8b 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -461,10 +461,10 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 0
 set g_balance_nex_secondary 0
 set g_balance_nex_secondary_charge 0
 set g_balance_nex_secondary_charge_rate 0.1
 set g_balance_nex_secondary 0
 set g_balance_nex_secondary_charge 0
 set g_balance_nex_secondary_charge_rate 0.1

-set g_balance_nex_secondary_charge_pool 0
-set g_balance_nex_secondary_charge_pool_regen 0.15
-set g_balance_nex_secondary_charge_pool_pause_regen 1
-set g_balance_nex_secondary_charge_pool_pause_health_regen 1
+set g_balance_nex_secondary_chargepool 0
+set g_balance_nex_secondary_chargepool_regen 0.15
+set g_balance_nex_secondary_chargepool_pause_regen 1
+set g_balance_nex_secondary_chargepool_pause_health_regen 1

 set g_balance_nex_secondary_damage 100
 set g_balance_nex_secondary_force 600
 set g_balance_nex_secondary_refire 1.5
 set g_balance_nex_secondary_damage 100
 set g_balance_nex_secondary_force 600
 set g_balance_nex_secondary_refire 1.5

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 4e213f2..37a589f 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -461,10 +461,10 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 9999999
 set g_balance_nex_secondary 0
 set g_balance_nex_secondary_charge 0
 set g_balance_nex_secondary_charge_rate 0.1
 set g_balance_nex_secondary 0
 set g_balance_nex_secondary_charge 0
 set g_balance_nex_secondary_charge_rate 0.1

-set g_balance_nex_secondary_charge_pool 0
-set g_balance_nex_secondary_charge_pool_regen 0.15
-set g_balance_nex_secondary_charge_pool_pause_regen 1
-set g_balance_nex_secondary_charge_pool_pause_health_regen 1
+set g_balance_nex_secondary_chargepool 0
+set g_balance_nex_secondary_chargepool_regen 0.15
+set g_balance_nex_secondary_chargepool_pause_regen 1
+set g_balance_nex_secondary_chargepool_pause_health_regen 1

 set g_balance_nex_secondary_damage 80
 set g_balance_nex_secondary_force -500
 set g_balance_nex_secondary_refire 1.25
 set g_balance_nex_secondary_damage 80
 set g_balance_nex_secondary_force -500
 set g_balance_nex_secondary_refire 1.25

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 65a728c..d7e64bb 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -461,10 +461,10 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 1500
 set g_balance_nex_secondary 0
 set g_balance_nex_secondary_charge 0
 set g_balance_nex_secondary_charge_rate 0.1
 set g_balance_nex_secondary 0
 set g_balance_nex_secondary_charge 0
 set g_balance_nex_secondary_charge_rate 0.1

-set g_balance_nex_secondary_charge_pool 0
-set g_balance_nex_secondary_charge_pool_regen 0.15
-set g_balance_nex_secondary_charge_pool_pause_regen 1
-set g_balance_nex_secondary_charge_pool_pause_health_regen 1
+set g_balance_nex_secondary_chargepool 0
+set g_balance_nex_secondary_chargepool_regen 0.15
+set g_balance_nex_secondary_chargepool_pause_regen 1
+set g_balance_nex_secondary_chargepool_pause_health_regen 1

 set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0
 set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 94bd626..def0f54 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -465,10 +465,10 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 0
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
 set g_balance_nex_secondary_charge_rate 0.4
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
 set g_balance_nex_secondary_charge_rate 0.4

-set g_balance_nex_secondary_charge_pool 1
-set g_balance_nex_secondary_charge_pool_regen 0.15
-set g_balance_nex_secondary_charge_pool_pause_regen 1
-set g_balance_nex_secondary_charge_pool_pause_health_regen 1
+set g_balance_nex_secondary_chargepool 1
+set g_balance_nex_secondary_chargepool_regen 0.15
+set g_balance_nex_secondary_chargepool_pause_regen 1
+set g_balance_nex_secondary_chargepool_pause_health_regen 1

 set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0
 set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 8efcb20..f8745d2 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -482,10 +482,10 @@ set g_balance_nex_primary_damagefalloff_forcehalflife 0
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
 set g_balance_nex_secondary_charge_rate 0.55
 set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
 set g_balance_nex_secondary_charge_rate 0.55

-set g_balance_nex_secondary_charge_pool 0
-set g_balance_nex_secondary_charge_pool_regen 0.15
-set g_balance_nex_secondary_charge_pool_pause_regen 1
-set g_balance_nex_secondary_charge_pool_pause_health_regen 1
+set g_balance_nex_secondary_chargepool 0
+set g_balance_nex_secondary_chargepool_regen 0.15
+set g_balance_nex_secondary_chargepool_pause_regen 1
+set g_balance_nex_secondary_chargepool_pause_health_regen 1

 set g_balance_nex_secondary_damage 100
 set g_balance_nex_secondary_force 600
 set g_balance_nex_secondary_refire 1.5
 set g_balance_nex_secondary_damage 100
 set g_balance_nex_secondary_force 600
 set g_balance_nex_secondary_refire 1.5

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index f0bcba6..3f8cd6c 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -350,7 +350,7 @@ vector freeze_pmove_org, freeze_input_angles;
 entity nightvision_noise, nightvision_noise2;
 
 float pickup_crosshair_time, pickup_crosshair_size;
 entity nightvision_noise, nightvision_noise2;
 
 float pickup_crosshair_time, pickup_crosshair_size;

-float use_nex_charge_pool;
+float use_nex_chargepool;

 
 float myhealth, myhealth_prev;
 float myhealth_flash;
 
 float myhealth, myhealth_prev;
 float myhealth_flash;


@@ -933,9 +933,9 @@ void CSQC_UpdateView(float w, float h)
 
                        wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
 
 
                        wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
 

-                       float nex_charge, nex_charge_pool;
+                       float nex_charge, nex_chargepool;

                        nex_charge = getstatf(STAT_NEX_CHARGE);
                        nex_charge = getstatf(STAT_NEX_CHARGE);

-                       nex_charge_pool = getstatf(STAT_NEX_CHARGEPOOL);
+                       nex_chargepool = getstatf(STAT_NEX_CHARGEPOOL);

 
                        if(nex_charge_movingavg == 0) // this should only happen if we have just loaded up the game
                                nex_charge_movingavg = nex_charge;
 
                        if(nex_charge_movingavg == 0) // this should only happen if we have just loaded up the game
                                nex_charge_movingavg = nex_charge;


@@ -951,13 +951,13 @@ void CSQC_UpdateView(float w, float h)
                        }
                        else if (activeweapon == WEP_NEX && nex_charge) // ring around crosshair representing velocity-dependent damage for the nex
                        {
                        }
                        else if (activeweapon == WEP_NEX && nex_charge) // ring around crosshair representing velocity-dependent damage for the nex
                        {

-                               if(nex_charge_pool || use_nex_charge_pool)
+                               if(nex_chargepool || use_nex_chargepool)

                                {
                                {

-                                       use_nex_charge_pool = 1;
+                                       use_nex_chargepool = 1;

 
                                        a = cvar("crosshair_ring_nex_inner_alpha");
                                        rgb = eX * cvar("crosshair_ring_nex_inner_color_red") + eY * cvar("crosshair_ring_nex_inner_color_green") + eZ * cvar("crosshair_ring_nex_inner_color_blue");
 
                                        a = cvar("crosshair_ring_nex_inner_alpha");
                                        rgb = eX * cvar("crosshair_ring_nex_inner_color_red") + eY * cvar("crosshair_ring_nex_inner_color_green") + eZ * cvar("crosshair_ring_nex_inner_color_blue");

-                                       DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring_inner.tga", nex_charge_pool, rgb, wcross_alpha * a, DRAWFLAG_ADDITIVE);
+                                       DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring_inner.tga", nex_chargepool, rgb, wcross_alpha * a, DRAWFLAG_ADDITIVE);

                                }
                                else
                                {
                                }
                                else
                                {

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 0183f2d..a13f4af 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -900,8 +900,8 @@ void PutClientInServer (void)
                self.dmg = 2;
                if(cvar("g_balance_nex_charge"))
                {
                self.dmg = 2;
                if(cvar("g_balance_nex_charge"))
                {

-                       if(cvar("g_balance_nex_secondary_charge_pool"))
-                               self.nex_charge_pool_ammo = 1;
+                       if(cvar("g_balance_nex_secondary_chargepool"))
+                               self.nex_chargepool_ammo = 1;

                        self.nex_charge = cvar("g_balance_nex_charge_start");
                }
 
                        self.nex_charge = cvar("g_balance_nex_charge_start");
                }
 

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 381543f..dec2988 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -647,7 +647,7 @@ string deathmessage;
 
 .float nex_charge;
 .float nex_charge_rottime;
 
 .float nex_charge;
 .float nex_charge_rottime;

-.float nex_charge_pool_ammo;
+.float nex_chargepool_ammo;

 
 float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended)
 
 
 float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended)
 

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 27d7a69..b898e14 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -799,7 +799,7 @@ void spawnfunc_worldspawn (void)
        addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
 
        addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
        addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
 
        addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);

-       addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_charge_pool_ammo);
+       addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_chargepool_ammo);

 
        if(g_ca || g_freezetag)
        {
 
        if(g_ca || g_freezetag)
        {

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 6e32108..3ff9880 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -80,7 +80,7 @@ void W_Nex_Attack (float issecondary)
 
 void spawnfunc_weapon_nex (void); // defined in t_items.qc
 
 
 void spawnfunc_weapon_nex (void); // defined in t_items.qc
 

-.float nex_charge_pool_pauseregen_finished;
+.float nex_chargepool_pauseregen_finished;

 float w_nex(float req)
 {
        float dt;
 float w_nex(float req)
 {
        float dt;


@@ -111,12 +111,12 @@ float w_nex(float req)
             self.exteriorweaponentity.glowmod = self.weaponentity.weaponentity.glowmod;
         }
 
             self.exteriorweaponentity.glowmod = self.weaponentity.weaponentity.glowmod;
         }
 

-               if(cvar("g_balance_nex_secondary_charge_pool"))
-               if(self.nex_charge_pool_ammo < 1)
+               if(cvar("g_balance_nex_secondary_chargepool"))
+               if(self.nex_chargepool_ammo < 1)

                {
                {

-                       if(self.nex_charge_pool_pauseregen_finished < time)
-                               self.nex_charge_pool_ammo = min(1, self.nex_charge_pool_ammo + cvar("g_balance_nex_secondary_charge_pool_regen") * frametime / W_TICSPERFRAME);
-                       self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_nex_secondary_charge_pool_pause_health_regen"));
+                       if(self.nex_chargepool_pauseregen_finished < time)
+                               self.nex_chargepool_ammo = min(1, self.nex_chargepool_ammo + cvar("g_balance_nex_secondary_chargepool_regen") * frametime / W_TICSPERFRAME);
+                       self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_nex_secondary_chargepool_pause_health_regen"));

                }
 
                if (self.BUTTON_ATCK)
                }
 
                if (self.BUTTON_ATCK)


@@ -134,16 +134,16 @@ float w_nex(float req)
                                self.nex_charge_rottime = time + cvar("g_balance_nex_charge_rot_pause");
                                dt = frametime / W_TICSPERFRAME;
 
                                self.nex_charge_rottime = time + cvar("g_balance_nex_charge_rot_pause");
                                dt = frametime / W_TICSPERFRAME;
 

-                               if(cvar("g_balance_nex_secondary_charge_pool"))
+                               if(cvar("g_balance_nex_secondary_chargepool"))

                                {
                                        if(cvar("g_balance_nex_secondary_ammo"))
                                        {
                                                // always deplete if secondary is held
                                {
                                        if(cvar("g_balance_nex_secondary_ammo"))
                                        {
                                                // always deplete if secondary is held

-                                               self.nex_charge_pool_ammo = max(0, self.nex_charge_pool_ammo - cvar("g_balance_nex_secondary_ammo") * dt);
+                                               self.nex_chargepool_ammo = max(0, self.nex_chargepool_ammo - cvar("g_balance_nex_secondary_ammo") * dt);

 
                                                dt = min(dt, (1 - self.nex_charge) / cvar("g_balance_nex_secondary_charge_rate"));
 
                                                dt = min(dt, (1 - self.nex_charge) / cvar("g_balance_nex_secondary_charge_rate"));

-                                               self.nex_charge_pool_pauseregen_finished = time + cvar("g_balance_nex_secondary_charge_pool_pause_regen");
-                                               dt = min(dt, self.nex_charge_pool_ammo);
+                                               self.nex_chargepool_pauseregen_finished = time + cvar("g_balance_nex_secondary_chargepool_pause_regen");
+                                               dt = min(dt, self.nex_chargepool_ammo);

                                                dt = max(0, dt);
 
                                                self.nex_charge += dt * cvar("g_balance_nex_secondary_charge_rate");
                                                dt = max(0, dt);
 
                                                self.nex_charge += dt * cvar("g_balance_nex_secondary_charge_rate");