From b00072d7c99a3088fb96a736f7c49a4856e770dd Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 27 Sep 2009 17:32:53 +0000 Subject: [PATCH] refire2 for electro and fireball; fireball rebalanced git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7957 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/balance.cfg | 12 +++++++----- data/balance25.cfg | 4 +++- data/balanceHavoc.cfg | 12 +++++++----- data/balanceSamual.cfg | 4 +++- data/qcsrc/server/constants.qh | 2 +- data/qcsrc/server/w_electro.qc | 3 +++ data/qcsrc/server/w_fireball.qc | 3 +++ 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/data/balance.cfg b/data/balance.cfg index b369ad76d..a6483448e 100644 --- a/data/balance.cfg +++ b/data/balance.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 80b343d239a1d214d86d1ffcefef0bef +set cvar_check_balance 3ec2d034ac400bba7e93eef2c720669a // {{{ weapon replacement // NOTE: this only replaces weapons on the map @@ -308,6 +308,7 @@ set g_balance_electro_secondary_speed 900 set g_balance_electro_secondary_speed_up 200 set g_balance_electro_secondary_lifetime 1 set g_balance_electro_secondary_refire 0.3 +set g_balance_electro_secondary_refire2 0 set g_balance_electro_secondary_animtime 0.3 set g_balance_electro_secondary_ammo 1 set g_balance_electro_secondary_health 5 @@ -521,7 +522,7 @@ set g_balance_tuba_force 200 // {{{ fireball set g_balance_fireball_primary_ammo 5 set g_balance_fireball_primary_animtime 0.3 -set g_balance_fireball_primary_damage 35 +set g_balance_fireball_primary_damage 40 set g_balance_fireball_primary_damageforcescale 4 set g_balance_fireball_primary_damagetime 3 set g_balance_fireball_primary_force 100 @@ -529,8 +530,8 @@ set g_balance_fireball_primary_laserburntime 0.5 set g_balance_fireball_primary_laserdamage 30 set g_balance_fireball_primary_laseredgedamage 20 set g_balance_fireball_primary_laserradius 100 -set g_balance_fireball_primary_lifetime 7 -set g_balance_fireball_primary_refire 1 +set g_balance_fireball_primary_lifetime 4.5 +set g_balance_fireball_primary_refire 1.5 set g_balance_fireball_primary_speed 700 set g_balance_fireball_primary_speed_up 100 set g_balance_fireball_secondary_ammo 15 @@ -549,6 +550,7 @@ set g_balance_fireball_secondary_laseredgedamage 20 set g_balance_fireball_secondary_laserradius 200 set g_balance_fireball_secondary_lifetime 15 set g_balance_fireball_secondary_radius 200 -set g_balance_fireball_secondary_refire 2 +set g_balance_fireball_secondary_refire 3 +set g_balance_fireball_secondary_refire2 6 set g_balance_fireball_secondary_speed 650 // }}} diff --git a/data/balance25.cfg b/data/balance25.cfg index bc56ead81..abc8fa853 100644 --- a/data/balance25.cfg +++ b/data/balance25.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 80b343d239a1d214d86d1ffcefef0bef +set cvar_check_balance 3ec2d034ac400bba7e93eef2c720669a // {{{ weapon replacement // NOTE: this only replaces weapons on the map @@ -308,6 +308,7 @@ set g_balance_electro_secondary_speed 900 set g_balance_electro_secondary_speed_up 200 set g_balance_electro_secondary_lifetime 5 set g_balance_electro_secondary_refire 0.3 +set g_balance_electro_secondary_refire2 0 set g_balance_electro_secondary_animtime 0.3 set g_balance_electro_secondary_ammo 2 set g_balance_electro_secondary_health 5 @@ -550,5 +551,6 @@ set g_balance_fireball_secondary_laserradius 256 set g_balance_fireball_secondary_lifetime 15 set g_balance_fireball_secondary_radius 200 set g_balance_fireball_secondary_refire 2 +set g_balance_fireball_secondary_refire2 0 set g_balance_fireball_secondary_speed 650 // }}} diff --git a/data/balanceHavoc.cfg b/data/balanceHavoc.cfg index 805e9a3ad..ad0883092 100644 --- a/data/balanceHavoc.cfg +++ b/data/balanceHavoc.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 80b343d239a1d214d86d1ffcefef0bef +set cvar_check_balance 3ec2d034ac400bba7e93eef2c720669a // {{{ weapon replacement // NOTE: this only replaces weapons on the map @@ -308,6 +308,7 @@ set g_balance_electro_secondary_speed 900 set g_balance_electro_secondary_speed_up 200 set g_balance_electro_secondary_lifetime 1 set g_balance_electro_secondary_refire 0.3 +set g_balance_electro_secondary_refire2 0 set g_balance_electro_secondary_animtime 0.3 set g_balance_electro_secondary_ammo 1 set g_balance_electro_secondary_health 5 @@ -521,7 +522,7 @@ set g_balance_tuba_force 200 // {{{ fireball set g_balance_fireball_primary_ammo 5 set g_balance_fireball_primary_animtime 0.3 -set g_balance_fireball_primary_damage 35 +set g_balance_fireball_primary_damage 40 set g_balance_fireball_primary_damageforcescale 4 set g_balance_fireball_primary_damagetime 3 set g_balance_fireball_primary_force 100 @@ -529,8 +530,8 @@ set g_balance_fireball_primary_laserburntime 0.5 set g_balance_fireball_primary_laserdamage 30 set g_balance_fireball_primary_laseredgedamage 20 set g_balance_fireball_primary_laserradius 100 -set g_balance_fireball_primary_lifetime 7 -set g_balance_fireball_primary_refire 1 +set g_balance_fireball_primary_lifetime 4.5 +set g_balance_fireball_primary_refire 1.5 set g_balance_fireball_primary_speed 700 set g_balance_fireball_primary_speed_up 100 set g_balance_fireball_secondary_ammo 15 @@ -549,6 +550,7 @@ set g_balance_fireball_secondary_laseredgedamage 20 set g_balance_fireball_secondary_laserradius 200 set g_balance_fireball_secondary_lifetime 15 set g_balance_fireball_secondary_radius 200 -set g_balance_fireball_secondary_refire 2 +set g_balance_fireball_secondary_refire 3 +set g_balance_fireball_secondary_refire2 6 set g_balance_fireball_secondary_speed 650 // }}} diff --git a/data/balanceSamual.cfg b/data/balanceSamual.cfg index 6d56f7083..26a54372b 100644 --- a/data/balanceSamual.cfg +++ b/data/balanceSamual.cfg @@ -3,7 +3,7 @@ // // And... don't forget to edit the other balance*.cfg too. -set cvar_check_balance 80b343d239a1d214d86d1ffcefef0bef +set cvar_check_balance 3ec2d034ac400bba7e93eef2c720669a // {{{ weapon replacement // NOTE: this only replaces weapons on the map @@ -308,6 +308,7 @@ set g_balance_electro_secondary_speed 900 set g_balance_electro_secondary_speed_up 200 set g_balance_electro_secondary_lifetime 2.5 set g_balance_electro_secondary_refire 0.75 +set g_balance_electro_secondary_refire2 0 set g_balance_electro_secondary_animtime 0.2 set g_balance_electro_secondary_ammo 2 set g_balance_electro_secondary_health 5 @@ -550,5 +551,6 @@ set g_balance_fireball_secondary_laserradius 256 set g_balance_fireball_secondary_lifetime 15 set g_balance_fireball_secondary_radius 200 set g_balance_fireball_secondary_refire 2 +set g_balance_fireball_secondary_refire2 0 set g_balance_fireball_secondary_speed 650 // }}} diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index 2e2773531..15198b630 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -1,5 +1,5 @@ string CVAR_CHECK_DEFAULT = "4bb48bd2d43bd891aa49d542abb24bf8"; -string CVAR_CHECK_BALANCE = "80b343d239a1d214d86d1ffcefef0bef"; +string CVAR_CHECK_BALANCE = "3ec2d034ac400bba7e93eef2c720669a"; float FALSE = 0; float TRUE = 1; diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index 6b74fdc96..2d24bca75 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -1,4 +1,5 @@ .float electro_count; +.float electro_secondarytime; void W_Plasma_Explode_Combo (void); @@ -241,11 +242,13 @@ float w_electro(float req) weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_primary_animtime"), w_ready); } if (self.BUTTON_ATCK2) + if (time >= self.electro_secondarytime) if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire"))) { W_Electro_Attack2(); self.electro_count = cvar("g_balance_electro_secondary_count"); weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_electro_secondary_animtime"), w_electro_checkattack); + self.electro_secondarytime = time + cvar("g_balance_electro_secondary_refire2"); } } else if (req == WR_PRECACHE) diff --git a/data/qcsrc/server/w_fireball.qc b/data/qcsrc/server/w_fireball.qc index bda26b5ac..de989b5be 100644 --- a/data/qcsrc/server/w_fireball.qc +++ b/data/qcsrc/server/w_fireball.qc @@ -1,5 +1,6 @@ .float bot_secondary_fireballmooth; // whatever a mooth is .vector fireball_impactvec; +.float fireball_secondarytime; void W_Fireball_Explode (void) { @@ -323,9 +324,11 @@ float w_fireball(float req) weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_fireball_primary_animtime"), w_ready); } if (self.BUTTON_ATCK2) + if (time >= self.fireball_secondarytime) if (weapon_prepareattack(1, cvar("g_balance_fireball_secondary_refire"))) { W_Fireball_Attack2_Frame0(); + self.fireball_secondarytime = time + cvar("g_balance_fireball_secondary_refire2"); } } else if (req == WR_PRECACHE) -- 2.39.2