[nexuiz-commits] r7958 - in branches/nexuiz-2.0: . data data/qcsrc/common data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Sep 27 13:35:57 EDT 2009
Author: div0
Date: 2009-09-27 13:35:57 -0400 (Sun, 27 Sep 2009)
New Revision: 7958
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/balance.cfg
branches/nexuiz-2.0/data/balance25.cfg
branches/nexuiz-2.0/data/balanceHavoc.cfg
branches/nexuiz-2.0/data/balanceSamual.cfg
branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc
branches/nexuiz-2.0/data/qcsrc/server/constants.qh
branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc
branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc
Log:
r7951 | blub0 | 2009-09-27 15:32:30 +0200 (Sun, 27 Sep 2009) | 1 line
don't let the rpn try to set a cvar when there's no name for it - prevent 'bad string' QC crash
r7952 | blub0 | 2009-09-27 15:44:08 +0200 (Sun, 27 Sep 2009) | 1 line
added an error message when def/defs get an empty cvar name
r7953 | blub0 | 2009-09-27 15:46:15 +0200 (Sun, 27 Sep 2009) | 1 line
forgive me, I suck, but then again, I cannot test it atm
r7954 | lordhavoc | 2009-09-27 19:07:24 +0200 (Sun, 27 Sep 2009) | 2 lines
disable the weaponreplaces I use when playing
r7955 | lordhavoc | 2009-09-27 19:11:35 +0200 (Sun, 27 Sep 2009) | 2 lines
diff reduction (fireball matching base)
r7956 | div0 | 2009-09-27 19:17:32 +0200 (Sun, 27 Sep 2009) | 2 lines
cheap check first, then expensive check (no behaviour change)
r7957 | div0 | 2009-09-27 19:32:53 +0200 (Sun, 27 Sep 2009) | 3 lines
refire2 for electro and fireball;
fireball rebalanced
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/.patchsets 2009-09-27 17:35:57 UTC (rev 7958)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948
+revisions_applied = 1-7945,7948-7948,7951-7957
Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/balance.cfg 2009-09-27 17:35:57 UTC (rev 7958)
@@ -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_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 @@
// {{{ 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_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_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
// }}}
Modified: branches/nexuiz-2.0/data/balance25.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance25.cfg 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/balance25.cfg 2009-09-27 17:35:57 UTC (rev 7958)
@@ -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_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_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
// }}}
Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-09-27 17:35:57 UTC (rev 7958)
@@ -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
@@ -19,13 +19,13 @@
set g_weaponreplace_nex ""
set g_weaponreplace_hagar ""
set g_weaponreplace_rocketlauncher ""
-set g_weaponreplace_porto "crylink"
+set g_weaponreplace_porto ""
set g_weaponreplace_minstanex ""
-set g_weaponreplace_hook "electro"
-set g_weaponreplace_hlac "crylink"
-set g_weaponreplace_campingrifle "electro"
+set g_weaponreplace_hook ""
+set g_weaponreplace_hlac ""
+set g_weaponreplace_campingrifle ""
set g_weaponreplace_tuba ""
-set g_weaponreplace_fireball "rocketlauncher"
+set g_weaponreplace_fireball ""
// }}}
// {{{ starting gear
@@ -308,6 +308,7 @@
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,23 +522,23 @@
// {{{ fireball
set g_balance_fireball_primary_ammo 5
set g_balance_fireball_primary_animtime 0.3
-set g_balance_fireball_primary_damage 50
+set g_balance_fireball_primary_damage 40
set g_balance_fireball_primary_damageforcescale 4
-set g_balance_fireball_primary_damagetime 5
+set g_balance_fireball_primary_damagetime 3
set g_balance_fireball_primary_force 100
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 128
-set g_balance_fireball_primary_lifetime 7
-set g_balance_fireball_primary_refire 1
+set g_balance_fireball_primary_laserradius 100
+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
set g_balance_fireball_secondary_animtime 0.15
set g_balance_fireball_secondary_bfgdamage 100
set g_balance_fireball_secondary_bfgforce 500
-set g_balance_fireball_secondary_bfgradius 750
+set g_balance_fireball_secondary_bfgradius 600
set g_balance_fireball_secondary_damage 150
set g_balance_fireball_secondary_damageforcescale 4
set g_balance_fireball_secondary_edgedamage 0
@@ -546,9 +547,10 @@
set g_balance_fireball_secondary_laserburntime 0.5
set g_balance_fireball_secondary_laserdamage 30
set g_balance_fireball_secondary_laseredgedamage 20
-set g_balance_fireball_secondary_laserradius 256
+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
// }}}
Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg 2009-09-27 17:35:57 UTC (rev 7958)
@@ -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_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_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
// }}}
Modified: branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/qcsrc/common/gamecommand.qc 2009-09-27 17:35:57 UTC (rev 7958)
@@ -374,13 +374,22 @@
} else if(rpncmd == "def" || rpncmd == "=") {
s = rpn_pop();
s2 = rpn_pop();
+
+ if(s2 != "")
+ {
#ifdef MENUQC
- registercvar(s2, "", 0);
+ registercvar(s2, "", 0);
#else
- registercvar(s2, "");
+ registercvar(s2, "");
#endif
- if(!rpn_error) // don't change cvars if a stack error had happened!
- cvar_set(s2, s);
+ if(!rpn_error) // don't change cvars if a stack error had happened!
+ cvar_set(s2, s);
+ }
+ else
+ {
+ print("rpn: empty cvar name for 'def'\n");
+ rpn_error = TRUE;
+ }
} else if(rpncmd == "defs" || rpncmd == "@") {
s = "";
i = rpn_popf();
@@ -391,13 +400,21 @@
--i;
}
s2 = rpn_pop();
+ if(s2 != "")
+ {
#ifdef MENUQC
- registercvar(s2, "", 0);
+ registercvar(s2, "", 0);
#else
- registercvar(s2, "");
+ registercvar(s2, "");
#endif
- if(!rpn_error) // don't change cvars if a stack error had happened!
- cvar_set(s2, s);
+ if(!rpn_error) // don't change cvars if a stack error had happened!
+ cvar_set(s2, s);
+ }
+ else
+ {
+ print("rpn: empty cvar name for 'defs'\n");
+ rpn_error = TRUE;
+ }
} else if(rpncmd == "load") {
rpn_set(cvar_string(rpn_get()));
} else if(rpncmd == "exch") {
Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-09-27 17:35:57 UTC (rev 7958)
@@ -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;
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc 2009-09-27 17:35:57 UTC (rev 7958)
@@ -150,16 +150,16 @@
else
{
self.campingrifle_accumulator = bound(time - cvar("g_balance_campingrifle_bursttime"), self.campingrifle_accumulator, time);
+ if (self.BUTTON_ATCK)
if (time >= self.campingrifle_accumulator + cvar("g_balance_campingrifle_primary_burstcost"))
- if (self.BUTTON_ATCK)
if (weapon_prepareattack(0, cvar("g_balance_campingrifle_primary_refire")))
{
W_CampingRifle_Attack();
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_campingrifle_primary_animtime"), W_CampingRifle_CheckReloadAndReady);
self.campingrifle_accumulator += cvar("g_balance_campingrifle_primary_burstcost");
}
+ if (self.BUTTON_ATCK2)
if (time >= self.campingrifle_accumulator + cvar("g_balance_campingrifle_secondary_burstcost"))
- if (self.BUTTON_ATCK2)
if (weapon_prepareattack(1, cvar("g_balance_campingrifle_secondary_refire")))
{
W_CampingRifle_Attack2();
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc 2009-09-27 17:35:57 UTC (rev 7958)
@@ -1,4 +1,5 @@
.float electro_count;
+.float electro_secondarytime;
void W_Plasma_Explode_Combo (void);
@@ -241,11 +242,13 @@
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)
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc 2009-09-27 17:32:53 UTC (rev 7957)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc 2009-09-27 17:35:57 UTC (rev 7958)
@@ -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 @@
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)
More information about the nexuiz-commits
mailing list