[nexuiz-commits] r7969 - in branches/nexuiz-2.0: . data data/qcsrc/server data/qcsrc/server/bot misc/tools
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Sep 28 06:36:47 EDT 2009
Author: div0
Date: 2009-09-28 06:36:46 -0400 (Mon, 28 Sep 2009)
New Revision: 7969
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/balance.cfg
branches/nexuiz-2.0/data/balanceHavoc.cfg
branches/nexuiz-2.0/data/balanceSamual.cfg
branches/nexuiz-2.0/data/qcsrc/server/bot/bot.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
branches/nexuiz-2.0/data/qcsrc/server/defs.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
branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc
branches/nexuiz-2.0/data/qcsrc/server/w_minstanex.qc
branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc
branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
branches/nexuiz-2.0/misc/tools/makebuild.sh
Log:
r7959 | div0 | 2009-09-27 19:49:17 +0200 (Sun, 27 Sep 2009) | 2 lines
a reset facility for weapon properties... should help keep code clean
r7960 | div0 | 2009-09-27 19:52:23 +0200 (Sun, 27 Sep 2009) | 2 lines
also reset all attack_finished vars on spawn
r7961 | lordhavoc | 2009-09-27 19:52:32 +0200 (Sun, 27 Sep 2009) | 2 lines
make hlac secondary less overkill
r7962 | div0 | 2009-09-27 19:53:24 +0200 (Sun, 27 Sep 2009) | 2 lines
taken over HLAC changes
r7963 | div0 | 2009-09-27 21:25:29 +0200 (Sun, 27 Sep 2009) | 2 lines
remove the bot_cmd_current when a bot disconnects (fixes a tiny leak)
r7964 | samual | 2009-09-27 21:44:31 +0200 (Sun, 27 Sep 2009) | 1 line
balanceSamual.cfg: Rebalance: Change electro to use g_balance_electro_secondary_refire2 1 to allow three shot bursts to be better.
r7965 | div0 | 2009-09-28 11:06:44 +0200 (Mon, 28 Sep 2009) | 2 lines
minor cleanup (no change in behaviour) ;)
r7966 | div0 | 2009-09-28 11:07:32 +0200 (Mon, 28 Sep 2009) | 2 lines
balance adjustments according to the stats
r7967 | div0 | 2009-09-28 12:24:00 +0200 (Mon, 28 Sep 2009) | 2 lines
use jpeg7 for Linux builds, statically
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/.patchsets 2009-09-28 10:36:46 UTC (rev 7969)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7957
+revisions_applied = 1-7945,7948-7948,7951-7967
Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/balance.cfg 2009-09-28 10:36:46 UTC (rev 7969)
@@ -251,15 +251,15 @@
set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
// }}}
// {{{ uzi
-set g_balance_uzi_first_damage 25
+set g_balance_uzi_first_damage 12
set g_balance_uzi_first_force 0
set g_balance_uzi_first_spread 0.015
-set g_balance_uzi_first_refire 0.2
+set g_balance_uzi_first_refire 0.15
set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 7
+set g_balance_uzi_sustained_damage 6
set g_balance_uzi_sustained_force 0
-set g_balance_uzi_sustained_spread 0.07
-set g_balance_uzi_sustained_refire 0.05
+set g_balance_uzi_sustained_spread 0.05
+set g_balance_uzi_sustained_refire 0.075
set g_balance_uzi_sustained_ammo 1
set g_balance_uzi_speed 18000
set g_balance_uzi_bulletconstant 115 // 13.1qu
@@ -322,12 +322,12 @@
set g_balance_electro_combo_speed 2000
// }}}
// {{{ crylink
-set g_balance_crylink_primary_damage 25
+set g_balance_crylink_primary_damage 17
set g_balance_crylink_primary_edgedamage 0
set g_balance_crylink_primary_force -30
set g_balance_crylink_primary_radius 80
set g_balance_crylink_primary_speed 7000
-set g_balance_crylink_primary_spread 0.03
+set g_balance_crylink_primary_spread 0.02
set g_balance_crylink_primary_shots 4
set g_balance_crylink_primary_bounces 1
set g_balance_crylink_primary_refire 0.8
@@ -342,12 +342,12 @@
set g_balance_crylink_primary_other_lifetime 0.1 // range: 700 full, fades to 2450
set g_balance_crylink_primary_other_fadetime 0.25
-set g_balance_crylink_secondary_damage 25
+set g_balance_crylink_secondary_damage 17
set g_balance_crylink_secondary_edgedamage 0
set g_balance_crylink_secondary_force -30
set g_balance_crylink_secondary_radius 80
set g_balance_crylink_secondary_speed 7000
-set g_balance_crylink_secondary_spread 0.08
+set g_balance_crylink_secondary_spread 0.05
set g_balance_crylink_secondary_shots 5
set g_balance_crylink_secondary_bounces 1
set g_balance_crylink_secondary_refire 1
@@ -366,10 +366,10 @@
set g_balance_nex_refire 0.7
set g_balance_nex_animtime 0.3
set g_balance_nex_ammo 5
-set g_balance_nex_damagefalloff_mindist 0
-set g_balance_nex_damagefalloff_maxdist 0
-set g_balance_nex_damagefalloff_halflife 0
-set g_balance_nex_damagefalloff_forcehalflife 0
+set g_balance_nex_damagefalloff_mindist 500
+set g_balance_nex_damagefalloff_maxdist 1500
+set g_balance_nex_damagefalloff_halflife 3000
+set g_balance_nex_damagefalloff_forcehalflife 3000
// }}}
// {{{ minstanex
set g_balance_minstanex_refire 1
@@ -384,7 +384,7 @@
set g_balance_hagar_primary_spread 0.1
set g_balance_hagar_primary_speed 2000
set g_balance_hagar_primary_lifetime 30
-set g_balance_hagar_primary_refire 0.1
+set g_balance_hagar_primary_refire 0.15
set g_balance_hagar_primary_ammo 1
set g_balance_hagar_secondary_damage 30
set g_balance_hagar_secondary_edgedamage 0
@@ -393,7 +393,7 @@
set g_balance_hagar_secondary_spread 0.1
set g_balance_hagar_secondary_speed 2000
set g_balance_hagar_secondary_lifetime 30
-set g_balance_hagar_secondary_refire 0.1
+set g_balance_hagar_secondary_refire 0.15
set g_balance_hagar_secondary_ammo 1
// }}}
// {{{ rocketlauncher
@@ -466,19 +466,19 @@
set g_balance_hlac_primary_animtime 0.3
set g_balance_hlac_primary_ammo 2
-set g_balance_hlac_secondary_spread 0.1
+set g_balance_hlac_secondary_spread 0.05
set g_balance_hlac_secondary_spread_crouchmod 1
-set g_balance_hlac_secondary_damage 33
+set g_balance_hlac_secondary_damage 20
set g_balance_hlac_secondary_edgedamage 10
-set g_balance_hlac_secondary_force 250
+set g_balance_hlac_secondary_force 100
set g_balance_hlac_secondary_radius 70
set g_balance_hlac_secondary_speed 20000
set g_balance_hlac_secondary_lifetime 5
set g_balance_hlac_secondary_refire 1.5
set g_balance_hlac_secondary_animtime 0.3
-set g_balance_hlac_secondary_ammo 10
+set g_balance_hlac_secondary_ammo 6
set g_balance_hlac_secondary_shots 5
// }}}
// {{{ campingrifle
@@ -498,7 +498,7 @@
set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
set g_balance_campingrifle_secondary_damage 15
-set g_balance_campingrifle_secondary_headshotaddeddamage 25
+set g_balance_campingrifle_secondary_headshotaddeddamage 20
set g_balance_campingrifle_secondary_spread 0.02
set g_balance_campingrifle_secondary_force 1
set g_balance_campingrifle_secondary_speed 20000
Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-09-28 10:36:46 UTC (rev 7969)
@@ -466,19 +466,19 @@
set g_balance_hlac_primary_animtime 0.3
set g_balance_hlac_primary_ammo 2
-set g_balance_hlac_secondary_spread 0.1
+set g_balance_hlac_secondary_spread 0.05
set g_balance_hlac_secondary_spread_crouchmod 1
-set g_balance_hlac_secondary_damage 33
+set g_balance_hlac_secondary_damage 20
set g_balance_hlac_secondary_edgedamage 10
-set g_balance_hlac_secondary_force 250
+set g_balance_hlac_secondary_force 100
set g_balance_hlac_secondary_radius 70
set g_balance_hlac_secondary_speed 20000
set g_balance_hlac_secondary_lifetime 5
set g_balance_hlac_secondary_refire 1.5
set g_balance_hlac_secondary_animtime 0.3
-set g_balance_hlac_secondary_ammo 10
+set g_balance_hlac_secondary_ammo 6
set g_balance_hlac_secondary_shots 5
// }}}
// {{{ campingrifle
Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg 2009-09-28 10:36:46 UTC (rev 7969)
@@ -307,8 +307,8 @@
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_refire 0.2
+set g_balance_electro_secondary_refire2 1
set g_balance_electro_secondary_animtime 0.2
set g_balance_electro_secondary_ammo 2
set g_balance_electro_secondary_health 5
Modified: branches/nexuiz-2.0/data/qcsrc/server/bot/bot.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bot/bot.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/bot/bot.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -321,6 +321,7 @@
self.netname_freeme = string_null;
self.playermodel_freeme = string_null;
self.playerskin_freeme = string_null;
+ remove(self.bot_cmd_current);
}
void bot_clientconnect()
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -792,6 +792,7 @@
if(self.classname == "player") {
entity spot, oldself;
+ float j;
if(self.team < 0)
JoinBestTeam(self, FALSE, TRUE);
@@ -806,7 +807,6 @@
}
RemoveGrapplingHook(self); // Wazat's Grappling Hook
- self.campingrifle_bulletcounter = cvar("g_balance_campingrifle_magazinecapacity");
self.classname = "player";
self.wasplayer = TRUE;
@@ -981,13 +981,16 @@
target_voicescript_clear(self);
+ // reset fields the weapons may use
+ for (j = WEP_FIRST; j <= WEP_LAST; ++j)
+ weapon_action(j, WR_RESETPLAYER);
+
oldself = self;
self = spot;
activator = oldself;
SUB_UseTargets();
activator = world;
self = oldself;
-
} else if(self.classname == "observer") {
PutObserverInServer ();
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -430,7 +430,7 @@
void PlayerDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
{
- local float take, save, waves, sdelay, dh, da;
+ local float take, save, waves, sdelay, dh, da, j;
vector v;
float valid_damage_for_weaponstats;
@@ -735,6 +735,13 @@
// remove corpse
PlayerCorpseDamage (inflictor, attacker, 100.0, deathtype, hitloc, force);
}
+
+ // reset fields the weapons may use just in case
+ for (j = WEP_FIRST; j <= WEP_LAST; ++j)
+ {
+ weapon_action(j, WR_RESETPLAYER);
+ ATTACK_FINISHED_FOR(self, j) = 0;
+ }
}
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2009-09-28 10:36:46 UTC (rev 7969)
@@ -234,6 +234,7 @@
float WR_SUICIDEMESSAGE = 7; // sets w_deathtypestring or leaves it alone (and may inspect w_deathtype for details)
float WR_KILLMESSAGE = 8; // sets w_deathtypestring or leaves it alone
float WR_RELOAD = 9; // does not need to do anything
+float WR_RESETPLAYER = 10; // does not need to do anything
void weapon_defaultspawnfunc(float wpn);
@@ -392,10 +393,11 @@
.float attack_finished_for[WEP_COUNT];
.float attack_finished_single;
#ifdef INDEPENDENT_ATTACK_FINISHED
-#define ATTACK_FINISHED(ent) ((ent).(attack_finished_for[(ent).weapon]))
+#define ATTACK_FINISHED_FOR(ent,w) ((ent).(attack_finished_for[(w) - WEP_FIRST]))
#else
-#define ATTACK_FINISHED(ent) ((ent).attack_finished_single)
+#define ATTACK_FINISHED_FOR(ent,w) ((ent).attack_finished_single)
#endif
+#define ATTACK_FINISHED(ent) ATTACK_FINISHED_FOR(ent,(ent).weapon)
// assault game mode: Which team is attacking in this round?
float assault_attacker_team;
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -226,5 +226,11 @@
{
W_CampingRifle_Reload();
}
+ else if (req == WR_RESETPLAYER)
+ {
+ self.campingrifle_accumulator = time - cvar("g_balance_campingrifle_bursttime");
+ self.campingrifle_bulletcounter = cvar("g_balance_campingrifle_magazinecapacity");
+ W_CampingRifle_CheckMaxBullets();
+ }
return TRUE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -294,5 +294,9 @@
w_deathtypestring = "was blasted by #'s blue beam";
}
}
+ else if (req == WR_RESETPLAYER)
+ {
+ self.electro_secondarytime = time;
+ }
return TRUE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_fireball.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -382,5 +382,9 @@
w_deathtypestring = "fatefully ignored #'s firemine";
}
}
+ else if (req == WR_RESETPLAYER)
+ {
+ self.fireball_secondarytime = time;
+ }
return TRUE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -239,5 +239,9 @@
w_deathtypestring = "did the impossible";
else if (req == WR_KILLMESSAGE)
w_deathtypestring = "has run into #'s gravity bomb";
+ else if (req == WR_RESETPLAYER)
+ {
+ self.hook_refire = time;
+ }
return TRUE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_minstanex.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_minstanex.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_minstanex.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -224,5 +224,9 @@
w_deathtypestring = "did the impossible";
else if (req == WR_KILLMESSAGE)
w_deathtypestring = "has been vaporized by";
+ else if (req == WR_RESETPLAYER)
+ {
+ self.minstanex_lasthit = 0;
+ }
return TRUE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -269,5 +269,9 @@
w_deathtypestring = "did the impossible";
else if (req == WR_KILLMESSAGE)
w_deathtypestring = "felt # doing the impossible to him";
+ else if (req == WR_RESETPLAYER)
+ {
+ self.porto_current = world;
+ }
return TRUE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc 2009-09-28 10:36:46 UTC (rev 7969)
@@ -551,5 +551,9 @@
else
w_deathtypestring = "ate #'s rocket";
}
+ else if (req == WR_RESETPLAYER)
+ {
+ self.rl_release = 0;
+ }
return TRUE;
};
Modified: branches/nexuiz-2.0/misc/tools/makebuild.sh
===================================================================
--- branches/nexuiz-2.0/misc/tools/makebuild.sh 2009-09-28 10:35:37 UTC (rev 7968)
+++ branches/nexuiz-2.0/misc/tools/makebuild.sh 2009-09-28 10:36:46 UTC (rev 7969)
@@ -112,9 +112,9 @@
{
buildon nexmacbuild nexuiz-osx fteqcc-osx /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' strip
# buildon nexmacbuild nexuiz-osx fteqcc-osx /tmp/Darkplaces.build 'CC="gcc -g -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' strip
- buildon eos.thruhere.net nexuiz-linux-686 fteqcc-linux-686 /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-i386/lib' strip
- buildon alientrap.org nexuiz-linux-x86_64 fteqcc-linux-x86_64 /tmp/Darkplaces.build 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-x86_64/lib' strip
- buildon alientrap.org nexuiz fteqcc.exe /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="/chroot/debian-etch/usr/bin/i586-mingw32msvc-gcc -g -DSUPPORTDIRECTX -I/home/divverent/dxheaders" WINDRES=/chroot/debian-etch/usr/bin/i586-mingw32msvc-windres SDL_CONFIG=/home/divverent/sdl-win32/SDL-1.2.13/bin/sdl-config' /chroot/debian-etch/usr/bin/i586-mingw32msvc-strip
+ buildon eos.thruhere.net nexuiz-linux-686 fteqcc-linux-686 /tmp/Darkplaces.build 'CC="gcc -g" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg7.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip
+ buildon alientrap.org nexuiz-linux-x86_64 fteqcc-linux-x86_64 /tmp/Darkplaces.build 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=/home/divverent/modplug-x86_64/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg7.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' strip
+ buildon alientrap.org nexuiz fteqcc.exe /tmp/Darkplaces.build 'DP_MAKE_TARGET=mingw CC="/chroot/debian-etch/usr/bin/i586-mingw32msvc-gcc -g -DSUPPORTDIRECTX -I$HOME/dxheaders" WINDRES=/chroot/debian-etch/usr/bin/i586-mingw32msvc-windres SDL_CONFIG=$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config' /chroot/debian-etch/usr/bin/i586-mingw32msvc-strip
mv "$tmpdir/nexuiz-osx-agl" "$tmpdir/Nexuiz.app/Contents/MacOS/nexuiz-osx-agl-bin"
mv "$tmpdir/nexuiz-osx-sdl" "$tmpdir/Nexuiz-SDL.app/Contents/MacOS/nexuiz-osx-sdl-bin"
}
More information about the nexuiz-commits
mailing list