[nexuiz-commits] r8097 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Oct 11 08:06:35 EDT 2009
Author: div0
Date: 2009-10-11 08:06:34 -0400 (Sun, 11 Oct 2009)
New Revision: 8097
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/balanceNexrun.cfg
branches/nexuiz-2.0/data/balanceSamual.cfg
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
branches/nexuiz-2.0/data/qcsrc/server/constants.qh
branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
Log:
r8079 | fruitiex | 2009-10-09 15:18:30 +0200 (Fri, 09 Oct 2009) | 2 lines
fading scoreboard (warning: experimental! please test)
r8080 | fruitiex | 2009-10-09 15:40:25 +0200 (Fri, 09 Oct 2009) | 2 lines
cvar fade out/in speeds of scoreboard
r8081 | fruitiex | 2009-10-09 15:41:19 +0200 (Fri, 09 Oct 2009) | 2 lines
cvar hashes *sigh*
r8082 | samual | 2009-10-09 20:47:32 +0200 (Fri, 09 Oct 2009) | 1 line
New frag message information system which allows extra details to be displayed such as the players handicap, their health, etc. This feature was inspired by Spidflisk by Dresk. Note: CVAR hashes need redone, now.
r8083 | fruitiex | 2009-10-09 20:48:47 +0200 (Fri, 09 Oct 2009) | 2 lines
nexrun balance changes
r8084 | fruitiex | 2009-10-09 21:36:24 +0200 (Fri, 09 Oct 2009) | 2 lines
add missing cvars
r8085 | samual | 2009-10-09 22:49:34 +0200 (Fri, 09 Oct 2009) | 1 line
Change typefrag fragmessage to be on by default + small fixes
r8086 | samual | 2009-10-09 22:54:09 +0200 (Fri, 09 Oct 2009) | 1 line
Typo
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/.patchsets 2009-10-11 12:06:34 UTC (rev 8097)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7945,7948-7948,7951-7990,7993-8077
+revisions_applied = 1-7945,7948-7948,7951-7990,7993-8086
Modified: branches/nexuiz-2.0/data/balance.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance.cfg 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/balance.cfg 2009-10-11 12:06:34 UTC (rev 8097)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/balance25.cfg
===================================================================
--- branches/nexuiz-2.0/data/balance25.cfg 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/balance25.cfg 2009-10-11 12:06:34 UTC (rev 8097)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/balanceHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/balanceHavoc.cfg 2009-10-11 12:06:34 UTC (rev 8097)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/balanceNexrun.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceNexrun.cfg 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/balanceNexrun.cfg 2009-10-11 12:06:34 UTC (rev 8097)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
@@ -26,7 +26,7 @@
set g_weaponreplace_campingrifle ""
set g_weaponreplace_tuba ""
set g_weaponreplace_fireball 0 // Don't kill me div0, just for now until I figure out a good balance for it.
-set sv_q3acompat_machineshotgunswap 1 "shorthand for swapping uzi and shotgun (for Q3A map compatibility)"
+set sv_q3acompat_machineshotgunswap 1
// }}}
// {{{ starting gear
@@ -49,7 +49,7 @@
set g_balance_health_start 100
set g_balance_armor_start 0
set g_start_ammo_shells 0
-set g_start_ammo_nails 90
+set g_start_ammo_nails 80
set g_start_ammo_rockets 0
set g_start_ammo_cells 0
set g_start_ammo_fuel 0
@@ -63,7 +63,7 @@
set g_lms_start_health 200
set g_lms_start_armor 100
set g_lms_start_ammo_shells 50
-set g_lms_start_ammo_nails 150
+set g_lms_start_ammo_nails 160
set g_lms_start_ammo_rockets 50
set g_lms_start_ammo_cells 50
set g_lms_start_ammo_fuel 0
@@ -85,7 +85,7 @@
set g_pickup_shells 30
set g_pickup_shells_max 120
set g_pickup_nails 80
-set g_pickup_nails_max 400
+set g_pickup_nails_max 360
set g_pickup_rockets 30
set g_pickup_rockets_max 120
set g_pickup_cells 50
@@ -93,25 +93,25 @@
set g_pickup_fuel 25
set g_pickup_fuel_jetpack 50
set g_pickup_fuel_max 999
-set g_pickup_armorsmall 10
+set g_pickup_armorsmall 5
set g_pickup_armorsmall_max 100
-set g_pickup_armormedium 25
+set g_pickup_armormedium 20
set g_pickup_armormedium_max 100
set g_pickup_armorbig 50
set g_pickup_armorbig_max 100
set g_pickup_armorlarge 100
set g_pickup_armorlarge_max 200
-set g_pickup_healthsmall 10
+set g_pickup_healthsmall 5
set g_pickup_healthsmall_max 100
-set g_pickup_healthmedium 25
+set g_pickup_healthmedium 20
set g_pickup_healthmedium_max 100
set g_pickup_healthlarge 50
set g_pickup_healthlarge_max 100
set g_pickup_healthmega 100
set g_pickup_healthmega_max 200
set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-set g_pickup_respawntime_long 30
+set g_pickup_respawntime_medium 25
+set g_pickup_respawntime_long 35
set g_pickup_respawntime_powerup 120
set g_pickup_respawntime_weapon 15
set g_pickup_respawntime_ammo 15
@@ -129,7 +129,7 @@
set g_balance_pause_health_regen 5
set g_balance_pause_health_regen_spawn 0
set g_balance_health_rot 0
-set g_balance_health_rotlinear 2
+set g_balance_health_rotlinear 5
set g_balance_pause_health_rot 3
set g_balance_pause_health_rot_spawn 1
set g_balance_health_regenstable 100
@@ -163,11 +163,11 @@
set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
set g_weaponratefactor 1 "weapon fire rate multiplier"
set g_weapondamagefactor 1 "weapon damage multiplier"
-set g_weaponforcefactor 0.65 "weapon force multiplier"
+set g_weaponforcefactor 1 "weapon force multiplier"
set g_balance_firetransfer_time 0.9
set g_balance_firetransfer_damage 0.8
-set g_throughfloor_damage 0.3
-set g_throughfloor_force 1
+set g_throughfloor_damage 0.5
+set g_throughfloor_force 0.7
set g_projectiles_newton_style 0
// possible values:
// 0: absolute velocity projectiles (like Quake)
@@ -215,11 +215,11 @@
// {{{ weapon properties
// {{{ laser
-set g_balance_laser_primary_damage 40
+set g_balance_laser_primary_damage 10
set g_balance_laser_primary_edgedamage 10
-set g_balance_laser_primary_force 100
-set g_balance_laser_primary_radius 1
-set g_balance_laser_primary_speed 1500
+set g_balance_laser_primary_force 50
+set g_balance_laser_primary_radius 50
+set g_balance_laser_primary_speed 3000
set g_balance_laser_primary_refire 0
set g_balance_laser_primary_animtime 0.1
set g_balance_laser_primary_lifetime 0.066
@@ -236,20 +236,20 @@
set g_balance_laser_secondary_shotangle -90
// }}}
// {{{ shotgun
-set g_balance_shotgun_primary_bullets 6
+set g_balance_shotgun_primary_bullets 15
set g_balance_shotgun_primary_damage 10
set g_balance_shotgun_primary_force 0
-set g_balance_shotgun_primary_spread 0.06
-set g_balance_shotgun_primary_refire 0.5
-set g_balance_shotgun_primary_animtime 0.2
+set g_balance_shotgun_primary_spread 0.2
+set g_balance_shotgun_primary_refire 1
+set g_balance_shotgun_primary_animtime 1
set g_balance_shotgun_primary_ammo 1
set g_balance_shotgun_primary_speed 12000
set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
-set g_balance_shotgun_secondary_bullets 6
-set g_balance_shotgun_secondary_damage 10
+set g_balance_shotgun_secondary_bullets 15
+set g_balance_shotgun_secondary_damage 4
set g_balance_shotgun_secondary_force 0
-set g_balance_shotgun_secondary_spread 0.1
-set g_balance_shotgun_secondary_refire 1.35
+set g_balance_shotgun_secondary_spread 0.4
+set g_balance_shotgun_secondary_refire 1.5
set g_balance_shotgun_secondary_animtime 0.2
set g_balance_shotgun_secondary_ammo 1
set g_balance_shotgun_secondary_speed 12000
@@ -261,10 +261,10 @@
set g_balance_uzi_first_spread 0.015
set g_balance_uzi_first_refire 0.15
set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 4
+set g_balance_uzi_sustained_damage 6
set g_balance_uzi_sustained_force 0
set g_balance_uzi_sustained_spread 0.05
-set g_balance_uzi_sustained_refire 0.075
+set g_balance_uzi_sustained_refire 0.1
set g_balance_uzi_sustained_ammo 1
set g_balance_uzi_speed 18000
set g_balance_uzi_bulletconstant 115 // 13.1qu
@@ -272,23 +272,23 @@
// {{{ mortar
set g_balance_grenadelauncher_primary_damage 50
set g_balance_grenadelauncher_primary_edgedamage 38
-set g_balance_grenadelauncher_primary_force 400
+set g_balance_grenadelauncher_primary_force 300
set g_balance_grenadelauncher_primary_radius 140
set g_balance_grenadelauncher_primary_speed 2200
set g_balance_grenadelauncher_primary_speed_up 220
set g_balance_grenadelauncher_primary_lifetime 30
set g_balance_grenadelauncher_primary_refire 0.8
-set g_balance_grenadelauncher_primary_animtime 0.3
+set g_balance_grenadelauncher_primary_animtime 0.8
set g_balance_grenadelauncher_primary_ammo 2
set g_balance_grenadelauncher_secondary_damage 60
set g_balance_grenadelauncher_secondary_edgedamage 38
-set g_balance_grenadelauncher_secondary_force 400
+set g_balance_grenadelauncher_secondary_force 300
set g_balance_grenadelauncher_secondary_radius 140
set g_balance_grenadelauncher_secondary_speed 1000
set g_balance_grenadelauncher_secondary_speed_up 150
set g_balance_grenadelauncher_secondary_lifetime 1
set g_balance_grenadelauncher_secondary_refire 0.7
-set g_balance_grenadelauncher_secondary_animtime 0.3
+set g_balance_grenadelauncher_secondary_animtime 0.8
set g_balance_grenadelauncher_secondary_ammo 2
set g_balance_grenadelauncher_secondary_health 70
set g_balance_grenadelauncher_secondary_damageforcescale 4
@@ -296,7 +296,7 @@
// {{{ electro
set g_balance_electro_primary_damage 65
set g_balance_electro_primary_edgedamage 0
-set g_balance_electro_primary_force 200
+set g_balance_electro_primary_force 125
set g_balance_electro_primary_radius 150
set g_balance_electro_primary_comboradius 0
set g_balance_electro_primary_speed 2000
@@ -307,13 +307,13 @@
set g_balance_electro_secondary_damage 50
set g_balance_electro_secondary_spread 0.05
set g_balance_electro_secondary_edgedamage 0
-set g_balance_electro_secondary_force 200
+set g_balance_electro_secondary_force 100
set g_balance_electro_secondary_radius 150
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.2
-set g_balance_electro_secondary_refire2 1
+set g_balance_electro_secondary_refire2 2
set g_balance_electro_secondary_animtime 0.2
set g_balance_electro_secondary_ammo 2
set g_balance_electro_secondary_health 5
@@ -321,7 +321,7 @@
set g_balance_electro_secondary_count 3
set g_balance_electro_combo_damage 50
set g_balance_electro_combo_edgedamage 0
-set g_balance_electro_combo_force 200
+set g_balance_electro_combo_force 100
set g_balance_electro_combo_radius 250
set g_balance_electro_combo_comboradius 0
set g_balance_electro_combo_speed 2000
@@ -368,8 +368,8 @@
// {{{ nex
set g_balance_nex_damage 80
set g_balance_nex_force 200
-set g_balance_nex_refire 1
-set g_balance_nex_animtime 1
+set g_balance_nex_refire 1.5
+set g_balance_nex_animtime 1.5
set g_balance_nex_ammo 5
set g_balance_nex_damagefalloff_mindist 1000
set g_balance_nex_damagefalloff_maxdist 3000
@@ -405,14 +405,14 @@
// {{{ rocketlauncher
set g_balance_rocketlauncher_damage 80
set g_balance_rocketlauncher_edgedamage 40
-set g_balance_rocketlauncher_force 600
+set g_balance_rocketlauncher_force 400
set g_balance_rocketlauncher_radius 90
set g_balance_rocketlauncher_speed 1100
set g_balance_rocketlauncher_speedaccel 0
-set g_balance_rocketlauncher_speedstart 1600
+set g_balance_rocketlauncher_speedstart 1100
set g_balance_rocketlauncher_lifetime 30
-set g_balance_rocketlauncher_refire 1
-set g_balance_rocketlauncher_animtime 1
+set g_balance_rocketlauncher_refire 1.2
+set g_balance_rocketlauncher_animtime 1.2
set g_balance_rocketlauncher_ammo 3
set g_balance_rocketlauncher_health 40
set g_balance_rocketlauncher_damageforcescale 4
@@ -463,7 +463,7 @@
set g_balance_hlac_primary_damage 18
set g_balance_hlac_primary_edgedamage 0
-set g_balance_hlac_primary_force 50
+set g_balance_hlac_primary_force 30
set g_balance_hlac_primary_radius 70
set g_balance_hlac_primary_speed 20000
set g_balance_hlac_primary_lifetime 5
@@ -477,7 +477,7 @@
set g_balance_hlac_secondary_damage 11
set g_balance_hlac_secondary_edgedamage 10
-set g_balance_hlac_secondary_force 100
+set g_balance_hlac_secondary_force 60
set g_balance_hlac_secondary_radius 70
set g_balance_hlac_secondary_speed 20000
set g_balance_hlac_secondary_lifetime 5
Modified: branches/nexuiz-2.0/data/balanceSamual.cfg
===================================================================
--- branches/nexuiz-2.0/data/balanceSamual.cfg 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/balanceSamual.cfg 2009-10-11 12:06:34 UTC (rev 8097)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit the other balance*.cfg too.
-set cvar_check_balance 7f0cddd65617fa39bd3efb7942dceea9
+set cvar_check_balance 1e423b95c67bac7998289473abe8feb1
// {{{ weapon replacement
// NOTE: this only replaces weapons on the map
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-10-11 12:06:34 UTC (rev 8097)
@@ -26,7 +26,7 @@
seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
// default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 5d48426c72cdfbf78480870c75601f89
+set cvar_check_default 37cc3aae4b042acd9cf2b71135034bcf
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -306,6 +306,11 @@
set sv_qcweaponanimation 0
set g_telefrags 1
+// fragmessage: This allows extra information to be displayed with the frag centerprints.
+set sv_fragmessage_information_ping 0 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)"
+set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)"
+set sv_fragmessage_information_stats 0 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)"
+set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display"
// use default physics
set sv_friction_on_land 0
@@ -1253,6 +1258,8 @@
seta sbar_scoreboard_alpha_fg 1 "scoreboard foreground alpha"
seta sbar_scoreboard_alpha_name 0.9 "alpha of player text in scoreboard list other than self"
seta sbar_scoreboard_alpha_name_self 1 "alpha of player text in scoreboard list of self"
+seta sbar_scoreboard_fadeinspeed 10 "speed at which scoreboard fades in, higher is faster (0 = instant)"
+seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher is faster (0 = instant)"
seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"
seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"
Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-10-11 12:06:34 UTC (rev 8097)
@@ -1091,10 +1091,58 @@
return pos;
}
+float Sbar_WouldDrawScoreboard() {
+ if (sb_showscores)
+ return 1;
+ else if (intermission == 1)
+ return 1;
+ else if (intermission == 2)
+ return 1;
+ else if (getstati(STAT_HEALTH) <= 0 && cvar("cl_deathscoreboard"))
+ return 1;
+ else if(sb_showscores_force)
+ return 1;
+ return 0;
+}
+
float lastpingstime;
float scoreboard_bottom;
+float sbar_scoreboard_fade_alpha;
+float sbar_woulddrawscoreboard_prev;
+float sbar_woulddrawscoreboard_change; // "time" at which Sbar_WouldDrawScoreboard() changed
void Sbar_DrawScoreboard()
{
+ float sbar_woulddrawscoreboard;
+ sbar_woulddrawscoreboard = Sbar_WouldDrawScoreboard();
+ if(sbar_woulddrawscoreboard != sbar_woulddrawscoreboard_prev) {
+ sbar_woulddrawscoreboard_change = time;
+ sbar_woulddrawscoreboard_prev = sbar_woulddrawscoreboard;
+ }
+
+ float scoreboard_fadeinspeed = cvar("sbar_scoreboard_fadeinspeed");
+ float scoreboard_fadeoutspeed = cvar("sbar_scoreboard_fadeoutspeed");
+ if(sbar_woulddrawscoreboard) {
+ if (scoreboard_fadeinspeed)
+ sbar_scoreboard_fade_alpha = bound (0, (time - sbar_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1);
+ else
+ sbar_scoreboard_fade_alpha = 1;
+ }
+ else
+ if (scoreboard_fadeoutspeed)
+ sbar_scoreboard_fade_alpha = bound (0, (1/scoreboard_fadeoutspeed - (time - sbar_woulddrawscoreboard_change)) * scoreboard_fadeoutspeed, 1);
+ else
+ sbar_scoreboard_fade_alpha = 0;
+
+ if not(sbar_scoreboard_fade_alpha)
+ return;
+ sbar_scoreboard_alpha_bg = cvar("sbar_scoreboard_alpha_bg") * sbar_scoreboard_fade_alpha;
+ sbar_scoreboard_alpha_fg = cvar("sbar_scoreboard_alpha_fg") * sbar_scoreboard_fade_alpha;
+ sbar_scoreboard_highlight = cvar("sbar_scoreboard_highlight");
+ sbar_scoreboard_highlight_alpha = cvar("sbar_scoreboard_highlight_alpha") * sbar_scoreboard_fade_alpha;
+ sbar_scoreboard_highlight_alpha_self = cvar("sbar_scoreboard_highlight_alpha_self") * sbar_scoreboard_fade_alpha;
+ sbar_scoreboard_alpha_name = cvar("sbar_scoreboard_alpha_name") * sbar_scoreboard_fade_alpha;
+ sbar_scoreboard_alpha_name_self = cvar("sbar_scoreboard_alpha_name_self") * sbar_scoreboard_fade_alpha;
+
vector rgb, pos, tmp;
entity pl, tm;
@@ -1620,20 +1668,6 @@
Sbar_DrawXNum(topright - '36 0 0' - '3 0 0' + '0 2 0', seconds, -2, 0, 18, timer_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
}
-float Sbar_WouldDrawScoreboard() {
- if (sb_showscores)
- return 1;
- else if (intermission == 1)
- return 1;
- else if (intermission == 2)
- return 1;
- else if (getstati(STAT_HEALTH) <= 0 && cvar("cl_deathscoreboard"))
- return 1;
- else if(sb_showscores_force)
- return 1;
- return 0;
-}
-
void CSQC_Strength_Timer() {
vector pos;
vector bottom;
@@ -2040,6 +2074,9 @@
drawstring(position + '0 9 0' * sbar_fontsize_y, "Damage wasted:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
}
+float sbar_accuracystats_fade_alpha;
+float sbar_woulddrawscoreboard_prev;
+float sbar_woulddrawscoreboard_change; // "time" at which Sbar_WouldDrawScoreboard() changed
void Sbar_DrawAccuracyStats()
{
float i, count_hitscan, count_splash, row; // count is the number of 'colums'
@@ -2255,7 +2292,6 @@
void Sbar_Draw (void)
{
// vectors for top right, bottom right, bottom and bottom left corners
-
vector topright;
vector bottom;
vector bottomright;
@@ -2280,13 +2316,6 @@
sbar_alpha_bg = cvar("sbar_alpha_bg") * (1 - cvar("_menu_alpha"));
sbar_border_thickness = bound(0, cvar("sbar_border_thickness"), 5);
sbar_color_bg_team = cvar("sbar_color_bg_team");
- sbar_scoreboard_alpha_bg = cvar("sbar_scoreboard_alpha_bg");
- sbar_scoreboard_alpha_fg = cvar("sbar_scoreboard_alpha_fg");
- sbar_scoreboard_highlight = cvar("sbar_scoreboard_highlight");
- sbar_scoreboard_highlight_alpha = cvar("sbar_scoreboard_highlight_alpha");
- sbar_scoreboard_highlight_alpha_self = cvar("sbar_scoreboard_highlight_alpha_self");
- sbar_scoreboard_alpha_name = cvar("sbar_scoreboard_alpha_name");
- sbar_scoreboard_alpha_name_self = cvar("sbar_scoreboard_alpha_name_self");
float i;
float weapon_stats;
@@ -2458,20 +2487,19 @@
}
Sbar_UpdatePlayerTeams();
-
if (intermission == 2) // map voting screen
{
- if(sb_showscores) {
- Sbar_DrawScoreboard();
- Sbar_Score();
- Sbar_Timer();
- }
- else if(sb_showaccuracy) {
+ if(sb_showaccuracy) {
Sbar_DrawAccuracyStats();
Sbar_Score();
Sbar_Timer();
}
- else
+ else if(sb_showscores) {
+ Sbar_DrawScoreboard();
+ Sbar_Score();
+ Sbar_Timer();
+ }
+ else
Sbar_FinaleOverlay();
Sbar_Reset();
@@ -2489,11 +2517,10 @@
}
else
{
- if (sb_showscores)
+ if(sb_showaccuracy)
+ Sbar_DrawAccuracyStats();
+ else
Sbar_DrawScoreboard();
- else if(sb_showaccuracy)
- Sbar_DrawAccuracyStats();
-
float armor, health;
armor = getstati(STAT_ARMOR);
health = getstati(STAT_HEALTH);
Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-10-11 12:06:34 UTC (rev 8097)
@@ -1,5 +1,5 @@
-string CVAR_CHECK_DEFAULT = "5d48426c72cdfbf78480870c75601f89";
-string CVAR_CHECK_BALANCE = "7f0cddd65617fa39bd3efb7942dceea9";
+string CVAR_CHECK_DEFAULT = "37cc3aae4b042acd9cf2b71135034bcf";
+string CVAR_CHECK_BALANCE = "1e423b95c67bac7998289473abe8feb1";
float FALSE = 0;
float TRUE = 1;
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2009-10-11 12:06:34 UTC (rev 8097)
@@ -369,13 +369,17 @@
victim_message = "^1First victim\n"; // or First casualty
}
}
-
if(sv_gentle > 0) {
- centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s));
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 scored against you ^7"));
+ centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You scored against ^7", s, GetAdvancedDeathReports(targ)));
+ centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, a,"^1 scored against you ^7", GetAdvancedDeathReports(attacker)));
} else {
- centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You fragged ^7", s));
- centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were fragged by ^7", a));
+ if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {
+ centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You ^1typefragged ^7", s, GetAdvancedDeathReports(targ)));
+ centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were typefragged by ^7", a, GetAdvancedDeathReports(attacker)));
+ } else {
+ centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, blood_message, "^4You fragged ^7", s, GetAdvancedDeathReports(targ)));
+ centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, victim_message, "^1You were fragged by ^7", a, GetAdvancedDeathReports(attacker)));
+ }
attacker.taunt_soundtime = time + 1;
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-10-11 11:38:09 UTC (rev 8096)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-10-11 12:06:34 UTC (rev 8097)
@@ -111,6 +111,48 @@
float logfile_open;
float logfile;
+string GetAdvancedDeathReports(entity enPlayer) // Extra fragmessage information
+{
+ local float nPlayerHealth = rint(enPlayer.health);
+ local float nPlayerArmor = rint(enPlayer.armorvalue);
+ local float nPlayerHandicap = enPlayer.cvar_cl_handicap;
+ local float nPlayerPing = rint(enPlayer.ping);
+ local string strPlayerPingColor;
+ local string strMessage;
+ if(nPlayerPing >= 150)
+ strPlayerPingColor = "^1";
+ else
+ strPlayerPingColor = "^2";
+
+ if((cvar("sv_fragmessage_information_stats")) && (enPlayer.health >= 1))
+ strMessage = strcat(strMessage, "\n^7(Health ^1", ftos(nPlayerHealth), "^7 / Armor ^2", ftos(nPlayerArmor), "^7)");
+
+ if(cvar("sv_fragmessage_information_ping")) {
+ if(clienttype(enPlayer) == CLIENTTYPE_BOT) // Bots have no ping
+ strMessage = strcat(strMessage, "\n^7(^2Bot");
+ else
+ strMessage = strcat(strMessage, "\n^7(Ping ", strPlayerPingColor, ftos(nPlayerPing), "ms");
+ if(cvar("sv_fragmessage_information_handicap"))
+ if(cvar("sv_fragmessage_information_handicap") == 2)
+ if(nPlayerHandicap <= 1)
+ strMessage = strcat(strMessage, "^7 / Handicap ^2Off^7)");
+ else
+ strMessage = strcat(strMessage, "^7 / Handicap ^2", ftos(nPlayerHandicap), "^7)");
+ else if not(nPlayerHandicap <= 1)
+ strMessage = strcat(strMessage, "^7 / Handicap ^2", ftos(nPlayerHandicap), "^7)");
+ else
+ strMessage = strcat(strMessage, "^7)");
+ } else if(cvar("sv_fragmessage_information_handicap")) {
+ if(cvar("sv_fragmessage_information_handicap") == 2)
+ if(nPlayerHandicap <= 1)
+ strMessage = strcat(strMessage, "\n^7(Handicap ^2Off^7)");
+ else
+ strMessage = strcat(strMessage, "\n^7(Handicap ^2", ftos(nPlayerHandicap), "^7)");
+ else if(nPlayerHandicap > 1)
+ strMessage = strcat(strMessage, "\n^7(Handicap ^2", ftos(nPlayerHandicap), "^7)");
+ }
+ return strMessage;
+}
void bcenterprint(string s)
{
// TODO replace by MSG_ALL (would show it to spectators too, though)?
More information about the nexuiz-commits
mailing list