GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 14:25:38 +03:00
Code Issues Projects Releases Wiki Activity

Merged CSX versions

Browse Source
This commit is contained in:
David Anderson 2004-10-04 07:30:39 +00:00
parent 18b75cb07c
commit e3a2a2bc17
2 changed files with 117 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
plugins/cstrike/miscstats.sma
View File

@ -66,12 +66,10 @@ public FirstBloodSound
new g_streakKills[33][2] new g_streakKills[33][2]
new g_multiKills[33][2] new g_multiKills[33][2]
new g_Planter
new g_Defuser
new g_C4Timer new g_C4Timer
new g_Defusing new g_Defusing
new g_Planter
new Float:g_LastOmg new Float:g_LastOmg
new Float:g_LastPlan
new g_LastAnnounce new g_LastAnnounce
new g_roundCount new g_roundCount
new Float:g_doubleKill new Float:g_doubleKill
@ -80,13 +78,13 @@ new g_friend[33]
new g_firstBlood new g_firstBlood
new g_MultiKillMsg[7][] = { new g_MultiKillMsg[7][] = {
"Multi-Kill! %s^n%L %d kills (%d hs)", "Multi-Kill! %s^n%L %d %L (%d %L)",
"Ultra-Kill!!! %s^n%L %d kills (%d hs)", "Ultra-Kill!!! %s^n%L %d %L (%d %L)",
"%s IS ON A KILLING SPREE!!!^n%L %d kills (%d hs)", "%s IS ON A KILLING SPREE!!!^n%L %d %L (%d %L)",
"RAMPAGE!!! %s^n%L %d kills (%d hs)" , "RAMPAGE!!! %s^n%L %d %L (%d hs)" ,
"%s IS UNSTOPPABLE!!!^n%L %d kills (%d hs)", "%s IS UNSTOPPABLE!!!^n%L %d %L (%d %L)",
"%s IS A MONSTER!^n%L %d kills (%d hs)", "%s IS A MONSTER!^n%L %d %L (%d %L)",
"%s IS GODLIKE!!!!^n%L %d kills (%d hs)" "%s IS GODLIKE!!!!^n%L %d %L (%d %L)"
} }
new g_Sounds[7][] = { new g_Sounds[7][] = {
"multikill", "multikill",
@ -140,15 +138,16 @@ new g_HeadShots[7][] = {
"HS_MSG_7" "HS_MSG_7"
} }
new g_teamsNames[2][] = { new g_teamsNames[4][] = {
"TERRORIST", "TERRORIST",
"CT" "CT",
"TERRORISTS",
"CTS"
} }
public plugin_init() { public plugin_init() {
register_plugin("CS Misc. Stats",AMXX_VERSION_STR,"AMXX Dev Team") register_plugin("CS Misc. Stats",AMXX_VERSION_STR,"AMXX Dev Team")
register_dictionary("miscstats.txt") register_dictionary("miscstats.txt")
register_event("DeathMsg","eDeathMsg","a")
register_event("TextMsg","eRestart","a","2&#Game_C","2&#Game_w") register_event("TextMsg","eRestart","a","2&#Game_C","2&#Game_w")
register_event("SendAudio", "eEndRound", "a", "2&%!MRAD_terwin","2&%!MRAD_ctwin","2&%!MRAD_rounddraw") register_event("SendAudio", "eEndRound", "a", "2&%!MRAD_terwin","2&%!MRAD_ctwin","2&%!MRAD_rounddraw")
register_event("RoundTime", "eNewRound", "bc") register_event("RoundTime", "eNewRound", "bc")
@ -159,11 +158,6 @@ public plugin_init() {
get_mapname(mapname,31) get_mapname(mapname,31)
if (equali(mapname,"de_",3)||equali(mapname,"csde_",5)) { if (equali(mapname,"de_",3)||equali(mapname,"csde_",5)) {
register_event("StatusIcon", "eGotBomb", "be", "1=1", "1=2", "2=c4") register_event("StatusIcon", "eGotBomb", "be", "1=1", "1=2", "2=c4")
register_event("SendAudio", "eBombPlanted", "a", "2&%!MRAD_BOMBPL")
register_event("SendAudio", "eBombDef", "a", "2&%!MRAD_BOMBDEF")
register_event("TextMsg", "eBombFail", "a", "2&#Target_B")
register_event("BarTime", "eBombDefG", "be", "1=10", "1=5","1=3")
register_event("BarTime", "eBombDefL", "be", "1=0")
register_event("TextMsg", "eBombPickUp", "bc", "2&#Got_bomb") register_event("TextMsg", "eBombPickUp", "bc", "2&#Got_bomb")
register_event("TextMsg", "eBombDrop", "bc", "2&#Game_bomb_d") register_event("TextMsg", "eBombDrop", "bc", "2&#Game_bomb_d")
} }
@ -209,25 +203,23 @@ public plugin_cfg() {
public client_putinserver(id) public client_putinserver(id)
g_multiKills[id] = g_streakKills[ id ] = { 0 , 0 } g_multiKills[id] = g_streakKills[ id ] = { 0 , 0 }
public eDeathMsg() { public client_death(killer,victim,wpnindex,hitplace,TK) {
new killerId = read_data(1)
if ( killerId == 0 ) return new headshot = ( hitplace == HIT_HEAD ) ? 1:0
new victimId = read_data(2)
new bool:enemykill = (get_user_team(killerId) != get_user_team(victimId))
new headshot = read_data(3)
if ( g_firstBlood ) { if ( g_firstBlood ) {
g_firstBlood = 0 g_firstBlood = 0
if ( FirstBloodSound ) client_cmd(0,"spk misc/firstblood") if ( FirstBloodSound ) client_cmd(0,"spk misc/firstblood")
} }
if ( (KillingStreak || KillingStreakSound) && enemykill ) { if ( (KillingStreak || KillingStreakSound) && !TK ) {
g_streakKills[ killerId ][ 0 ]++ g_streakKills[ killer ][ 0 ]++
g_streakKills[ killerId ][ 1 ] = 0 g_streakKills[ killer ][ 1 ] = 0
g_streakKills[ victimId ][ 1 ]++ g_streakKills[ victim ][ 1 ]++
g_streakKills[ victimId ][ 0 ] = 0 g_streakKills[ victim ][ 0 ] = 0
new a = g_streakKills[ killerId ][ 0 ] - 3 new a = g_streakKills[ killer ][ 0 ] - 3
if ( (a > -1) && !( a % 2 ) ) { if ( (a > -1) && !( a % 2 ) ) {
new name[32] new name[32]
get_user_name( killerId , name , 31 ) get_user_name( killer , name , 31 )
if ( (a >>= 1) > 6 ) a = 6 if ( (a >>= 1) > 6 ) a = 6
if ( KillingStreak ){ if ( KillingStreak ){
set_hudmessage(0, 100, 255, 0.05, 0.55, 2, 0.02, 6.0, 0.01, 0.1, 3) set_hudmessage(0, 100, 255, 0.05, 0.55, 2, 0.02, 6.0, 0.01, 0.1, 3)
@ -237,28 +229,30 @@ public eDeathMsg() {
} }
} }
if ( MultiKill || MultiKillSound ) { if ( MultiKill || MultiKillSound ) {
if (killerId && enemykill ) { if (killer && !TK ) {
g_multiKills[killerId][0]++ g_multiKills[killer][0]++
g_multiKills[killerId][1] += headshot g_multiKills[killer][1] += headshot
new param[2] new param[2]
param[0] = killerId param[0] = killer
param[1] = g_multiKills[killerId][0] param[1] = g_multiKills[killer][0]
set_task( 4.0 + float( param[1] ) ,"checkKills",0,param,2) set_task( 4.0 + float( param[1] ) ,"checkKills",0,param,2)
} }
} }
if ( EnemyRemaining ) { if ( EnemyRemaining ) {
new ppl[32], pplnum new ppl[32], pplnum
new team = get_user_team( victimId ) - 1 new team = get_user_team( victim ) - 1
get_players(ppl,pplnum,"e", g_teamsNames[1 - team] ) get_players(ppl,pplnum,"e", g_teamsNames[1 - team] )
if (pplnum) { if (pplnum) {
new eppl[32], epplnum new eppl[32], epplnum
get_players(eppl,epplnum,"ae",g_teamsNames[team]) get_players(eppl,epplnum,"ae",g_teamsNames[team])
if (epplnum) { if (epplnum) {
new message[128] new message[128],team_name[32]
format(message,127,"%d %s%s Remaining...",epplnum,g_teamsNames[team],(epplnum==1)?"":"S" )
set_hudmessage(255,255,255,0.02,0.85,2, 0.05, 0.1, 0.02, 3.0, 3) set_hudmessage(255,255,255,0.02,0.85,2, 0.05, 0.1, 0.02, 3.0, 3)
for(new a=0; a<pplnum; ++a) show_hudmessage(ppl[a],message) for(new a=0; a<pplnum; ++a){
//client_print(ppl[a],print_chat,message) format(team_name,31,"%L",ppl[a],(epplnum==1)?g_teamsNames[team]:g_teamsNames[team+2])
format(message,127,"%L",ppl[a],"REMAINING",epplnum,team_name)
show_hudmessage(ppl[a],message)
}
} }
} }
} }
@ -297,62 +291,63 @@ public eDeathMsg() {
} }
} }
} }
new arg[4]
read_data( 4 , arg , 3 ) if ( wpnindex == 29 && ( KnifeKill || KnifeKillSound ) ) {
if ( equal( arg, "kni" ) && ( KnifeKill || KnifeKillSound ) ) {
if ( KnifeKill ) { if ( KnifeKill ) {
new killer[32], victim[32] new killer_name[32],victim_name[32]
get_user_name(killerId,killer,31) get_user_name(killer,killer_name,31)
get_user_name(victimId,victim,31) get_user_name(victim,victim_name,31)
set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, 1)
show_hudmessage(0,"%L",LANG_PLAYER,g_KinfeMsg[ random_num(0,3) ],killer,victim) show_hudmessage(0,"%L",LANG_PLAYER,g_KinfeMsg[ random_num(0,3) ],killer_name,victim_name)
} }
if ( KnifeKillSound ) client_cmd(0,"spk misc/humiliation") if ( KnifeKillSound ) client_cmd(0,"spk misc/humiliation")
} }
else if ( equal( arg, "gre" ) && (GrenadeKill || GrenadeSuicide) ) {
new killer[32], victim[32] if ( wpnindex == 4 && (GrenadeKill || GrenadeSuicide) ) {
get_user_name(killerId,killer,32) new killer_name[32],victim_name[32]
get_user_name(victimId,victim,32) get_user_name(killer,killer_name,32)
get_user_name(victim,victim_name,32)
set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, 1)
if ( killerId != victimId ) { if ( killer != victim ) {
if ( GrenadeKill ) show_hudmessage(0,"%L",LANG_PLAYER,g_HeMessages[ random_num(0,3)],killer,victim) if ( GrenadeKill ) show_hudmessage(0,"%L",LANG_PLAYER,g_HeMessages[ random_num(0,3)],killer_name,victim_name)
} }
else if ( GrenadeSuicide ) show_hudmessage(0,"%L",LANG_PLAYER,g_SHeMessages[ random_num(0,3) ],victim) else if ( GrenadeSuicide ) show_hudmessage(0,"%L",LANG_PLAYER,g_SHeMessages[ random_num(0,3) ],victim_name)
} }
if ( headshot && (HeadShotKill || HeadShotKillSound) ) { if ( headshot && (HeadShotKill || HeadShotKillSound) ) {
if ( HeadShotKill ) { if ( HeadShotKill ) {
new killer[32], victim[32], weapon[32], message[128], players[32], pnum new killer_name[32], victim_name[32], weapon_name[32], message[128], players[32], pnum
get_user_name(killerId,killer,31) get_weaponname(wpnindex,weapon_name,31)
get_user_name(victimId,victim,31) get_user_name(killer,killer_name,31)
read_data( 4 , weapon , 31 ) get_user_name(victim,victim_name,31)
get_players(players,pnum,"c") get_players(players,pnum,"c")
for (new i=0;i<pnum;i++) { for (new i=0;i<pnum;i++) {
format( message, 127, "%L",players[i],g_HeadShots[ random_num(0,6) ] ) format( message, 127, "%L",players[i],g_HeadShots[ random_num(0,6) ] )
replace( message, 127 , "$vn", victim ) replace( message, 127 , "$vn", victim_name )
replace( message, 127 , "$wn", weapon ) replace( message, 127 , "$wn", weapon_name )
replace( message, 127 , "$kn", killer ) replace( message, 127 , "$kn", killer_name )
set_hudmessage(100, 100, 255, -1.0, 0.29, 0, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(100, 100, 255, -1.0, 0.29, 0, 6.0, 6.0, 0.5, 0.15, 1)
show_hudmessage(players[i],message ) show_hudmessage(players[i],message )
} }
} }
if ( HeadShotKillSound ) { if ( HeadShotKillSound ) {
client_cmd(killerId,"spk misc/headshot") client_cmd(killer,"spk misc/headshot")
client_cmd(victimId,"spk misc/headshot") client_cmd(victim,"spk misc/headshot")
} }
} }
if ( DoubleKill || DoubleKillSound ) { if ( DoubleKill || DoubleKillSound ) {
new Float:nowtime = get_gametime() new Float:nowtime = get_gametime()
if ( g_doubleKill == nowtime && g_doubleKillId == killerId ) { if ( g_doubleKill == nowtime && g_doubleKillId == killer ) {
if ( DoubleKill ) { if ( DoubleKill ) {
new name[32] new name[32]
get_user_name( killerId , name , 31 ) get_user_name( killer , name , 31 )
set_hudmessage(255, 0, 255, -1.0, 0.35, 0, 6.0, 6.0, 0.5, 0.15, 3) set_hudmessage(255, 0, 255, -1.0, 0.35, 0, 6.0, 6.0, 0.5, 0.15, 3)
show_hudmessage(0,"%L",LANG_PLAYER,"DOUBLE_KILL",name ) show_hudmessage(0,"%L",LANG_PLAYER,"DOUBLE_KILL",name )
} }
if ( DoubleKillSound ) client_cmd(0,"spk misc/doublekill") if ( DoubleKillSound ) client_cmd(0,"spk misc/doublekill")
} }
g_doubleKill = nowtime g_doubleKill = nowtime
g_doubleKillId = killerId g_doubleKillId = killer
} }
} }
@ -421,9 +416,7 @@ public eRestart() {
public eEndRound() { public eEndRound() {
g_C4Timer = -2 g_C4Timer = -2
g_LastPlan = 0.0
g_LastOmg = 0.0 g_LastOmg = 0.0
g_LastPlan = 0.0
remove_task(8038) remove_task(8038)
g_LastAnnounce = 0 g_LastAnnounce = 0
} }
@ -439,7 +432,7 @@ public checkKills(param[]) {
get_user_name(id,name,31) get_user_name(id,name,31)
set_hudmessage(255, 0, 100, 0.05, 0.65, 2, 0.02, 6.0, 0.01, 0.1, 2) set_hudmessage(255, 0, 100, 0.05, 0.65, 2, 0.02, 6.0, 0.01, 0.1, 2)
if ( a > 6 ) a = 6 if ( a > 6 ) a = 6
show_hudmessage(0,g_MultiKillMsg[a],name,LANG_PLAYER,"WITH",g_multiKills[id][0],g_multiKills[id][1]) show_hudmessage(0,g_MultiKillMsg[a],name,LANG_PLAYER,"WITH",g_multiKills[id][0],LANG_PLAYER,"KILLS",g_multiKills[id][1],LANG_PLAYER,"HS")
} }
if ( MultiKillSound ) client_cmd(0,"spk misc/%s",g_Sounds[a]) if ( MultiKillSound ) client_cmd(0,"spk misc/%s",g_Sounds[a])
} }
@ -461,42 +454,20 @@ announceEvent( id, message[] ) {
show_hudmessage(0,"%L",LANG_PLAYER,message,name) show_hudmessage(0,"%L",LANG_PLAYER,message,name)
} }
public eBombPickUp(id)
if (BombPickUp) announceEvent(id , "PICKED_BOMB")
public eBombDrop()
if (BombDrop) announceEvent(g_Planter , "DROPPED_BOMB")
public eGotBomb(id) { public eGotBomb(id) {
g_Planter = id g_Planter = id
g_Defuser = g_Defusing = 0
if ( BombReached && read_data(1)==2 && g_LastOmg<get_gametime()) { if ( BombReached && read_data(1)==2 && g_LastOmg<get_gametime()) {
g_LastOmg = get_gametime() + 15.0 g_LastOmg = get_gametime() + 15.0
announceEvent(g_Planter, "REACHED_TARGET" ) announceEvent(g_Planter, "REACHED_TARGET" )
} }
} }
public eBombDefG(id) {
if (read_data(1) == 3) {
if ( BombPlanting && g_LastPlan<get_gametime() ) {
g_LastPlan = get_gametime() + 15.0
announceEvent(g_Planter, "PLANT_BOMB" )
}
}
else {
g_Defuser = g_Defusing = id
if ( BombDefusing && g_LastPlan<get_gametime()) {
g_LastPlan = get_gametime() + 15.0
announceEvent(g_Defusing, "DEFUSING_BOMB" )
}
}
}
public eBombDefL(id)
g_Defusing = 0
public eBombPlanted()
if ( g_C4Timer != -2 ) {
if (BombPlanted) announceEvent(g_Planter, "SET_UP_BOMB" )
g_C4Timer = get_cvar_num("mp_c4timer")
set_task(1.0,"bombTimer",8038,"",0,"b")
g_LastPlan = 0.0
}
public bombTimer() { public bombTimer() {
if (--g_C4Timer > 0) { if (--g_C4Timer > 0) {
if (BombCountVoice) { if (BombCountVoice) {
@ -516,14 +487,29 @@ public bombTimer() {
else remove_task(8038) else remove_task(8038)
} }
public eBombDef() public bomb_planted(planter){
if (BombDefused) announceEvent(g_Defuser, "DEFUSED_BOMB" ) g_Defusing = 0
if (BombPlanted) announceEvent(planter, "SET_UP_BOMB" )
g_C4Timer = get_cvar_num("mp_c4timer")
set_task(1.0,"bombTimer",8038,"",0,"b")
public eBombFail() }
if (BombFailed && g_Defuser ) announceEvent(g_Defuser , "FAILED_DEFU" )
public eBombPickUp(id) public bomb_planting(planter)
if (BombPickUp) announceEvent(id , "PICKED_BOMB") if (BombPlanting) announceEvent(planter, "PLANT_BOMB" )
public eBombDrop() public bomb_defusing(defuser){
if (BombDrop) announceEvent(g_Planter , "DROPPED_BOMB") if (BombDefusing) announceEvent(defuser, "DEFUSING_BOMB" )
g_Defusing = defuser
}
public bomb_defused(defuser)
if (BombDefused) announceEvent(defuser, "DEFUSED_BOMB" )
public bomb_explode(planter,defuser)
if (BombFailed && defuser) announceEvent(defuser , "FAILED_DEFU" )
public plugin_modules()
{
require_module("csx")
}

129
plugins/cstrike/statsx.sma
View File

@ -36,16 +36,13 @@
#include <amxmodx> #include <amxmodx>
#include <amxmisc> #include <amxmisc>
#include <csstats> #include <csx>
//-------------------------------- //--------------------------------
// Uncomment to activate log debug messages. // Uncomment to activate log debug messages.
//#define STATSX_DEBUG //#define STATSX_DEBUG
// Comment to activate new DeathMsg process (if fixed).
#define STATSX_OLD_DEATHMSG
// HUD statistics duration in seconds (minimum 1.0 seconds). // HUD statistics duration in seconds (minimum 1.0 seconds).
#define HUD_DURATION_CVAR "amx_statsx_duration" #define HUD_DURATION_CVAR "amx_statsx_duration"
#define HUD_DURATION "12.0" #define HUD_DURATION "12.0"
@ -91,7 +88,7 @@ public SayTop15 = 0 // displays first 15 players
public SayStatsAll = 0 // displays all players stats and rank public SayStatsAll = 0 // displays all players stats and rank
public SayMiscFunc = 0 // displays timeleft, thetime, currentmap, ff public SayMiscFunc = 0 // displays timeleft, thetime, currentmap, ff
public ShowStats = 0 // set client HUD-stats switched off by default public ShowStats = 1 // set client HUD-stats switched off by default
public ShowDistHS = 0 // show distance and HS in attackers and public ShowDistHS = 0 // show distance and HS in attackers and
// victims HUD lists // victims HUD lists
public ShowFullStats = 0 // show full HUD stats (more than 78 chars) public ShowFullStats = 0 // show full HUD stats (more than 78 chars)
@ -197,13 +194,6 @@ public plugin_init() {
register_event( "ResetHUD", "eventResetHud", "be" ) register_event( "ResetHUD", "eventResetHud", "be" )
register_event( "RoundTime", "eventStartRound", "bc" ) register_event( "RoundTime", "eventStartRound", "bc" )
#if defined STATSX_OLD_DEATHMSG
register_event( "DeathMsg", "eventDeathMsg", "a" )
register_event( "Damage", "eventDamage", "b", "2!0", "3=0", "4!0" )
#else
register_event( "CS_DeathMsg", "eventCSDeathMsg", "a" )
#endif
register_event( "SendAudio", "eventEndRound", "a", register_event( "SendAudio", "eventEndRound", "a",
"2=%!MRAD_terwin", "2=%!MRAD_ctwin", "2=%!MRAD_rounddraw" ) "2=%!MRAD_terwin", "2=%!MRAD_ctwin", "2=%!MRAD_rounddraw" )
register_event( "TeamScore", "eventTeamScore", "a" ) register_event( "TeamScore", "eventTeamScore", "a" )
@ -261,7 +251,6 @@ public plugin_cfg() {
server_cmd( addStast, "Show Total Stats", "ShowTotalStats" ) server_cmd( addStast, "Show Total Stats", "ShowTotalStats" )
server_cmd( addStast, "Show Best Score", "ShowBestScore" ) server_cmd( addStast, "Show Best Score", "ShowBestScore" )
server_cmd( addStast, "Show Most Disruptive", "ShowMostDisruptive" ) server_cmd( addStast, "Show Most Disruptive", "ShowMostDisruptive" )
server_cmd( addStast, "Show HUD Stats", "ShowFullStats" )
server_cmd( addStast, "HUD-stats default", "ShowStats" ) server_cmd( addStast, "HUD-stats default", "ShowStats" )
server_cmd( addStast, "Dist&HS in HUD lists", "ShowDistHS" ) server_cmd( addStast, "Dist&HS in HUD lists", "ShowDistHS" )
@ -809,12 +798,12 @@ format_stats( id, sBuffer[MAX_BUFFER_LENGTH+1] ) {
iLen += format( sBuffer[iLen], MAX_BUFFER_LENGTH - iLen, iLen += format( sBuffer[iLen], MAX_BUFFER_LENGTH - iLen,
"%-12.12s %6s %6s %6s %6s %6s %4s^n", "%-12.12s %6s %6s %6s %6s %6s %4s^n",
lWeapon, lKills, lDeaths, lHits, lShots, lDamage, lAcc ) lWeapon, lKills, lDeaths, lHits, lShots, lDamage, lAcc )
for ( iWeapon = 1; iWeapon < 31 && MAX_BUFFER_LENGTH - iLen > 0 ; iWeapon++ ) { for ( iWeapon = 1; iWeapon < xmod_get_maxweapons() && MAX_BUFFER_LENGTH - iLen > 0 ; iWeapon++ ) {
if ( get_user_wstats( id, iWeapon, izStats, izBody ) ) { if ( get_user_wstats( id, iWeapon, izStats, izBody ) ) {
get_weaponname( iWeapon, t_sWpn, MAX_WEAPON_LENGTH ) get_weaponname( iWeapon, t_sWpn, MAX_WEAPON_LENGTH )
iLen += format( sBuffer[iLen], MAX_BUFFER_LENGTH - iLen, iLen += format( sBuffer[iLen], MAX_BUFFER_LENGTH - iLen,
"%-12.12s %6d %6d %6d %6d %6d %3.0f%%^n", "%-12.12s %6d %6d %6d %6d %6d %3.0f%%^n",
t_sWpn[7], izStats[STATS_KILLS], izStats[STATS_DEATHS], t_sWpn, izStats[STATS_KILLS], izStats[STATS_DEATHS],
izStats[STATS_HITS], izStats[STATS_SHOTS], izStats[STATS_HITS], izStats[STATS_SHOTS],
izStats[STATS_DAMAGE], accuracy( izStats ) ) izStats[STATS_DAMAGE], accuracy( izStats ) )
} }
@ -1019,7 +1008,7 @@ public cmdReport( id ) {
if ( iClip >= 0 ) { if ( iClip >= 0 ) {
format( g_sBuffer, MAX_BUFFER_LENGTH, format( g_sBuffer, MAX_BUFFER_LENGTH,
"%s: %s, %L: %d/%d, %L: %d, %L: %d", "%s: %s, %L: %d/%d, %L: %d, %L: %d",
lWeapon, t_sWpn[7], LANG_SERVER, "AMMO", iClip, iAmmo, lWeapon, t_sWpn, LANG_SERVER, "AMMO", iClip, iAmmo,
LANG_SERVER, "HEALTH", iHealth, LANG_SERVER, "ARMOR", iArmor ) LANG_SERVER, "HEALTH", iHealth, LANG_SERVER, "ARMOR", iArmor )
} }
else else
@ -1296,115 +1285,37 @@ public delay_resethud( args[] ) {
return PLUGIN_CONTINUE return PLUGIN_CONTINUE
} }
#if defined STATSX_OLD_DEATHMSG
// Save killer info on death. // Save killer info on death.
public eventDeathMsg() { public client_death(killer,victim,wpnindex,hitplace,TK) {
new iKiller = read_data( 1 )
new iVictim = read_data( 2 )
// Bail out if no killer. // Bail out if no killer.
if ( !iKiller ) return PLUGIN_CONTINUE if ( !killer ) return PLUGIN_CONTINUE
if ( iKiller != iVictim ) { if ( killer != victim ) {
new iaVOrigin[3], iaKOrigin[3] new iaVOrigin[3], iaKOrigin[3]
new iDistance new iDistance
get_user_origin( iVictim, iaVOrigin ) get_user_origin( victim, iaVOrigin )
get_user_origin( iKiller, iaKOrigin ) get_user_origin( killer, iaKOrigin )
g_izKilled[iVictim][KILLED_KILLER_ID] = iKiller g_izKilled[victim][KILLED_KILLER_ID] = killer
g_izKilled[iVictim][KILLED_KILLER_HEALTH] = get_user_health( iKiller ) g_izKilled[victim][KILLED_KILLER_HEALTH] = get_user_health( killer )
g_izKilled[iVictim][KILLED_KILLER_ARMOUR] = get_user_armor( iKiller ) g_izKilled[victim][KILLED_KILLER_ARMOUR] = get_user_armor( killer )
g_izKilled[iVictim][KILLED_KILLER_STATSFIX] = 0 g_izKilled[victim][KILLED_KILLER_STATSFIX] = 0
iDistance = get_distance( iaVOrigin, iaKOrigin ) iDistance = get_distance( iaVOrigin, iaKOrigin )
g_izUserAttackerDistance[iVictim] = iDistance g_izUserAttackerDistance[victim] = iDistance
g_izUserVictimDistance[iKiller][iVictim] = iDistance g_izUserVictimDistance[killer][victim] = iDistance
} }
g_izKilled[iVictim][KILLED_TEAM] = get_user_team( iVictim ) g_izKilled[victim][KILLED_TEAM] = get_user_team( victim )
new args[1] g_izKilled[victim][KILLED_KILLER_STATSFIX] = 1
args[0] = iVictim
set_task( 0.25, "delay_damage", 100 + iVictim, args, 1 )
return PLUGIN_CONTINUE
}
public delay_damage( args[] ) {
new id = args[0]
// Display stats to killed player if player
// has not already been processed.
if ( !g_izKilled[id][KILLED_KILLER_STATSFIX] ) {
g_izKilled[id][KILLED_KILLER_STATSFIX] = 1
// Display round end stats to all players if
// round end has already been triggered.
if ( g_iRoundEndTriggered )
endround_stats()
// Display kill stats for the player if round
// end stats was not processed.
if ( !g_iRoundEndProcessed )
kill_stats( id )
}
}
// Trigger death stats processing.
public eventDamage( id ) {
// Bail out if player not killed or if player
// player has already been processed.
if ( !g_izKilled[id][KILLED_KILLER_ID] || g_izKilled[id][KILLED_KILLER_STATSFIX] )
return PLUGIN_CONTINUE
// Remove task if not alreay done and process.
remove_task( 100 + id )
// Process player deaths.
new izData[1]
izData[0] = id
delay_damage( izData )
return PLUGIN_CONTINUE
}
#endif // if defined STATSX_OLD_DEATHMSG
#if !defined STATSX_OLD_DEATHMSG
// Save killer info on death.
public eventCSDeathMsg() {
new iKiller = read_data( 1 )
new iVictim = read_data( 2 )
// Bail out if no killer.
if ( !iKiller ) return PLUGIN_CONTINUE
if ( iKiller != iVictim ) {
new iaVOrigin[3], iaKOrigin[3]
new iDistance
get_user_origin( iVictim, iaVOrigin )
get_user_origin( iKiller, iaKOrigin )
g_izKilled[iVictim][KILLED_KILLER_ID] = iKiller
g_izKilled[iVictim][KILLED_KILLER_HEALTH] = get_user_health( iKiller )
g_izKilled[iVictim][KILLED_KILLER_ARMOUR] = get_user_armor( iKiller )
g_izKilled[iVictim][KILLED_KILLER_STATSFIX] = 0
iDistance = get_distance( iaVOrigin, iaKOrigin )
g_izUserAttackerDistance[iVictim] = iDistance
g_izUserVictimDistance[iKiller][iVictim] = iDistance
}
g_izKilled[iVictim][KILLED_TEAM] = get_user_team( iVictim )
g_izKilled[iVictim][KILLED_KILLER_STATSFIX] = 1
// Display kill stats for the player if round // Display kill stats for the player if round
// end stats was not processed. // end stats was not processed.
if ( !g_iRoundEndProcessed ) if ( !g_iRoundEndProcessed )
kill_stats( iVictim ) kill_stats( victim )
return PLUGIN_CONTINUE return PLUGIN_CONTINUE
} }
#endif
// Display hudmessage stats on death. // Display hudmessage stats on death.
// This will also update all round and game stats. // This will also update all round and game stats.
// Must be called at least once per round. // Must be called at least once per round.
@ -1646,5 +1557,5 @@ public client_connect( id ) {
public plugin_modules() public plugin_modules()
{ {
require_module("csstats") require_module("csx")
} }