[MIRROR] Fixes stat gathering (#1025)
* Fixes stat gathering * Delete blackbox.dm.rej * Update blackbox.dm
This commit is contained in:
CitadelStationBot
committed by
Poojawa
Poojawa
parent
883c5e034d
commit
c8e9e34d2b
@@ -1,242 +1,246 @@
|
|||||||
SUBSYSTEM_DEF(blackbox)
|
SUBSYSTEM_DEF(blackbox)
|
||||||
name = "Blackbox"
|
name = "Blackbox"
|
||||||
wait = 6000
|
wait = 6000
|
||||||
flags = SS_NO_TICK_CHECK
|
flags = SS_NO_TICK_CHECK
|
||||||
|
|
||||||
var/list/msg_common = list()
|
var/list/msg_common = list()
|
||||||
var/list/msg_science = list()
|
var/list/msg_science = list()
|
||||||
var/list/msg_command = list()
|
var/list/msg_command = list()
|
||||||
var/list/msg_medical = list()
|
var/list/msg_medical = list()
|
||||||
var/list/msg_engineering = list()
|
var/list/msg_engineering = list()
|
||||||
var/list/msg_security = list()
|
var/list/msg_security = list()
|
||||||
var/list/msg_deathsquad = list()
|
var/list/msg_deathsquad = list()
|
||||||
var/list/msg_syndicate = list()
|
var/list/msg_syndicate = list()
|
||||||
var/list/msg_service = list()
|
var/list/msg_service = list()
|
||||||
var/list/msg_cargo = list()
|
var/list/msg_cargo = list()
|
||||||
var/list/msg_other = list()
|
var/list/msg_other = list()
|
||||||
|
|
||||||
var/list/feedback = list() //list of datum/feedback_variable
|
var/list/feedback = list() //list of datum/feedback_variable
|
||||||
|
|
||||||
//poll population
|
//poll population
|
||||||
/datum/controller/subsystem/blackbox/fire()
|
/datum/controller/subsystem/blackbox/fire()
|
||||||
if(!SSdbcore.Connect())
|
if(!SSdbcore.Connect())
|
||||||
return
|
return
|
||||||
var/playercount = 0
|
var/playercount = 0
|
||||||
for(var/mob/M in GLOB.player_list)
|
for(var/mob/M in GLOB.player_list)
|
||||||
if(M.client)
|
if(M.client)
|
||||||
playercount += 1
|
playercount += 1
|
||||||
var/admincount = GLOB.admins.len
|
var/admincount = GLOB.admins.len
|
||||||
var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
||||||
query_record_playercount.Execute()
|
query_record_playercount.Execute()
|
||||||
|
|
||||||
/datum/controller/subsystem/blackbox/Recover()
|
/datum/controller/subsystem/blackbox/Recover()
|
||||||
msg_common = SSblackbox.msg_common
|
msg_common = SSblackbox.msg_common
|
||||||
msg_science = SSblackbox.msg_science
|
msg_science = SSblackbox.msg_science
|
||||||
msg_command = SSblackbox.msg_command
|
msg_command = SSblackbox.msg_command
|
||||||
msg_medical = SSblackbox.msg_medical
|
msg_medical = SSblackbox.msg_medical
|
||||||
msg_engineering = SSblackbox.msg_engineering
|
msg_engineering = SSblackbox.msg_engineering
|
||||||
msg_security = SSblackbox.msg_security
|
msg_security = SSblackbox.msg_security
|
||||||
msg_deathsquad = SSblackbox.msg_deathsquad
|
msg_deathsquad = SSblackbox.msg_deathsquad
|
||||||
msg_syndicate = SSblackbox.msg_syndicate
|
msg_syndicate = SSblackbox.msg_syndicate
|
||||||
msg_service = SSblackbox.msg_service
|
msg_service = SSblackbox.msg_service
|
||||||
msg_cargo = SSblackbox.msg_cargo
|
msg_cargo = SSblackbox.msg_cargo
|
||||||
msg_other = SSblackbox.msg_other
|
msg_other = SSblackbox.msg_other
|
||||||
|
|
||||||
feedback = SSblackbox.feedback
|
|
||||||
|
feedback = SSblackbox.feedback
|
||||||
//no touchie
|
|
||||||
/datum/controller/subsystem/blackbox/can_vv_get(var_name)
|
//no touchie
|
||||||
if(var_name == "feedback")
|
/datum/controller/subsystem/blackbox/can_vv_get(var_name)
|
||||||
return FALSE
|
if(var_name == "feedback")
|
||||||
return ..()
|
return FALSE
|
||||||
|
return ..()
|
||||||
/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value)
|
|
||||||
return FALSE
|
/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value)
|
||||||
|
return FALSE
|
||||||
/datum/controller/subsystem/blackbox/Shutdown()
|
|
||||||
var/pda_msg_amt = 0
|
/datum/controller/subsystem/blackbox/Shutdown()
|
||||||
var/rc_msg_amt = 0
|
var/pda_msg_amt = 0
|
||||||
|
var/rc_msg_amt = 0
|
||||||
for (var/obj/machinery/message_server/MS in GLOB.message_servers)
|
|
||||||
if (MS.pda_msgs.len > pda_msg_amt)
|
for (var/obj/machinery/message_server/MS in GLOB.message_servers)
|
||||||
pda_msg_amt = MS.pda_msgs.len
|
if (MS.pda_msgs.len > pda_msg_amt)
|
||||||
if (MS.rc_msgs.len > rc_msg_amt)
|
pda_msg_amt = MS.pda_msgs.len
|
||||||
rc_msg_amt = MS.rc_msgs.len
|
if (MS.rc_msgs.len > rc_msg_amt)
|
||||||
|
rc_msg_amt = MS.rc_msgs.len
|
||||||
set_details("radio_usage","")
|
|
||||||
|
set_details("radio_usage","")
|
||||||
add_details("radio_usage","COM-[msg_common.len]")
|
|
||||||
add_details("radio_usage","SCI-[msg_science.len]")
|
add_details("radio_usage","COM-[msg_common.len]")
|
||||||
add_details("radio_usage","HEA-[msg_command.len]")
|
add_details("radio_usage","SCI-[msg_science.len]")
|
||||||
add_details("radio_usage","MED-[msg_medical.len]")
|
add_details("radio_usage","HEA-[msg_command.len]")
|
||||||
add_details("radio_usage","ENG-[msg_engineering.len]")
|
add_details("radio_usage","MED-[msg_medical.len]")
|
||||||
add_details("radio_usage","SEC-[msg_security.len]")
|
add_details("radio_usage","ENG-[msg_engineering.len]")
|
||||||
add_details("radio_usage","DTH-[msg_deathsquad.len]")
|
add_details("radio_usage","SEC-[msg_security.len]")
|
||||||
add_details("radio_usage","SYN-[msg_syndicate.len]")
|
add_details("radio_usage","DTH-[msg_deathsquad.len]")
|
||||||
add_details("radio_usage","SRV-[msg_service.len]")
|
add_details("radio_usage","SYN-[msg_syndicate.len]")
|
||||||
add_details("radio_usage","CAR-[msg_cargo.len]")
|
add_details("radio_usage","SRV-[msg_service.len]")
|
||||||
add_details("radio_usage","OTH-[msg_other.len]")
|
add_details("radio_usage","CAR-[msg_cargo.len]")
|
||||||
add_details("radio_usage","PDA-[pda_msg_amt]")
|
add_details("radio_usage","OTH-[msg_other.len]")
|
||||||
add_details("radio_usage","RC-[rc_msg_amt]")
|
add_details("radio_usage","PDA-[pda_msg_amt]")
|
||||||
|
add_details("radio_usage","RC-[rc_msg_amt]")
|
||||||
set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set.
|
|
||||||
|
set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set.
|
||||||
if (!SSdbcore.Connect())
|
|
||||||
return
|
if (!SSdbcore.Connect())
|
||||||
|
return
|
||||||
var/list/sqlrowlist = list()
|
|
||||||
|
var/sqlrowlist = ""
|
||||||
for (var/datum/feedback_variable/FV in feedback)
|
|
||||||
sqlrowlist += list("time" = "Now()", "round_id" = GLOB.round_id, "var_name" = "'[sanitizeSQL(FV.get_variable())]'", "var_value" = FV.get_value(), "details" = "'[sanitizeSQL(FV.get_details())]'")
|
for (var/datum/feedback_variable/FV in feedback)
|
||||||
|
if (sqlrowlist != "")
|
||||||
if (!length(sqlrowlist))
|
sqlrowlist += ", " //a comma (,) at the start of the first row to insert will trigger a SQL error
|
||||||
return
|
|
||||||
|
sqlrowlist += list(list("time" = "Now()", "round_id" = GLOB.round_id, "var_name" = "'[sanitizeSQL(FV.get_variable())]'", "var_value" = FV.get_value(), "details" = "'[sanitizeSQL(FV.get_details())]'"))
|
||||||
SSdbcore.MassInsert(format_table_name("feedback"), sqlrowlist, ignore_errors = TRUE, delayed = TRUE)
|
|
||||||
|
if (sqlrowlist == "")
|
||||||
|
return
|
||||||
/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq)
|
|
||||||
switch(freq)
|
var/datum/DBQuery/query_feedback_save = SSdbcore.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist)
|
||||||
if(1459)
|
query_feedback_save.Execute()
|
||||||
msg_common += blackbox_msg
|
|
||||||
if(1351)
|
/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq)
|
||||||
msg_science += blackbox_msg
|
switch(freq)
|
||||||
if(1353)
|
if(1459)
|
||||||
msg_command += blackbox_msg
|
msg_common += blackbox_msg
|
||||||
if(1355)
|
if(1351)
|
||||||
msg_medical += blackbox_msg
|
msg_science += blackbox_msg
|
||||||
if(1357)
|
if(1353)
|
||||||
msg_engineering += blackbox_msg
|
msg_command += blackbox_msg
|
||||||
if(1359)
|
if(1355)
|
||||||
msg_security += blackbox_msg
|
msg_medical += blackbox_msg
|
||||||
if(1441)
|
if(1357)
|
||||||
msg_deathsquad += blackbox_msg
|
msg_engineering += blackbox_msg
|
||||||
if(1213)
|
if(1359)
|
||||||
msg_syndicate += blackbox_msg
|
msg_security += blackbox_msg
|
||||||
if(1349)
|
if(1441)
|
||||||
msg_service += blackbox_msg
|
msg_deathsquad += blackbox_msg
|
||||||
if(1347)
|
if(1213)
|
||||||
msg_cargo += blackbox_msg
|
msg_syndicate += blackbox_msg
|
||||||
else
|
if(1349)
|
||||||
msg_other += blackbox_msg
|
msg_service += blackbox_msg
|
||||||
|
if(1347)
|
||||||
/datum/controller/subsystem/blackbox/proc/find_feedback_datum(variable)
|
msg_cargo += blackbox_msg
|
||||||
for(var/datum/feedback_variable/FV in feedback)
|
else
|
||||||
if(FV.get_variable() == variable)
|
msg_other += blackbox_msg
|
||||||
return FV
|
|
||||||
|
/datum/controller/subsystem/blackbox/proc/find_feedback_datum(variable)
|
||||||
var/datum/feedback_variable/FV = new(variable)
|
for(var/datum/feedback_variable/FV in feedback)
|
||||||
feedback += FV
|
if(FV.get_variable() == variable)
|
||||||
return FV
|
return FV
|
||||||
|
|
||||||
/datum/controller/subsystem/blackbox/proc/set_val(variable, value)
|
var/datum/feedback_variable/FV = new(variable)
|
||||||
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
feedback += FV
|
||||||
FV.set_value(value)
|
return FV
|
||||||
|
|
||||||
/datum/controller/subsystem/blackbox/proc/inc(variable, value)
|
/datum/controller/subsystem/blackbox/proc/set_val(variable, value)
|
||||||
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||||
FV.inc(value)
|
FV.set_value(value)
|
||||||
|
|
||||||
/datum/controller/subsystem/blackbox/proc/dec(variable,value)
|
/datum/controller/subsystem/blackbox/proc/inc(variable, value)
|
||||||
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||||
FV.dec(value)
|
FV.inc(value)
|
||||||
|
|
||||||
/datum/controller/subsystem/blackbox/proc/set_details(variable,details)
|
/datum/controller/subsystem/blackbox/proc/dec(variable,value)
|
||||||
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||||
FV.set_details(details)
|
FV.dec(value)
|
||||||
|
|
||||||
/datum/controller/subsystem/blackbox/proc/add_details(variable,details)
|
/datum/controller/subsystem/blackbox/proc/set_details(variable,details)
|
||||||
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||||
FV.add_details(details)
|
FV.set_details(details)
|
||||||
|
|
||||||
/datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L)
|
/datum/controller/subsystem/blackbox/proc/add_details(variable,details)
|
||||||
if(!SSdbcore.Connect())
|
var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||||
return
|
FV.add_details(details)
|
||||||
if(!L || !L.key || !L.mind)
|
|
||||||
return
|
/datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L)
|
||||||
var/turf/T = get_turf(L)
|
if(!SSdbcore.Connect())
|
||||||
var/area/placeofdeath = get_area(T.loc)
|
return
|
||||||
var/sqlname = sanitizeSQL(L.real_name)
|
if(!L || !L.key || !L.mind)
|
||||||
var/sqlkey = sanitizeSQL(L.ckey)
|
return
|
||||||
var/sqljob = sanitizeSQL(L.mind.assigned_role)
|
var/turf/T = get_turf(L)
|
||||||
var/sqlspecial = sanitizeSQL(L.mind.special_role)
|
var/area/placeofdeath = get_area(T.loc)
|
||||||
var/sqlpod = sanitizeSQL(placeofdeath.name)
|
var/sqlname = sanitizeSQL(L.real_name)
|
||||||
var/laname
|
var/sqlkey = sanitizeSQL(L.ckey)
|
||||||
var/lakey
|
var/sqljob = sanitizeSQL(L.mind.assigned_role)
|
||||||
if(L.lastattacker && ismob(L.lastattacker))
|
var/sqlspecial = sanitizeSQL(L.mind.special_role)
|
||||||
var/mob/LA = L.lastattacker
|
var/sqlpod = sanitizeSQL(placeofdeath.name)
|
||||||
laname = sanitizeSQL(LA.real_name)
|
var/laname
|
||||||
lakey = sanitizeSQL(LA.key)
|
var/lakey
|
||||||
var/sqlgender = sanitizeSQL(L.gender)
|
if(L.lastattacker && ismob(L.lastattacker))
|
||||||
var/sqlbrute = sanitizeSQL(L.getBruteLoss())
|
var/mob/LA = L.lastattacker
|
||||||
var/sqlfire = sanitizeSQL(L.getFireLoss())
|
laname = sanitizeSQL(LA.real_name)
|
||||||
var/sqlbrain = sanitizeSQL(L.getBrainLoss())
|
lakey = sanitizeSQL(LA.key)
|
||||||
var/sqloxy = sanitizeSQL(L.getOxyLoss())
|
var/sqlgender = sanitizeSQL(L.gender)
|
||||||
var/sqltox = sanitizeSQL(L.getStaminaLoss())
|
var/sqlbrute = sanitizeSQL(L.getBruteLoss())
|
||||||
var/sqlclone = sanitizeSQL(L.getStaminaLoss())
|
var/sqlfire = sanitizeSQL(L.getFireLoss())
|
||||||
var/sqlstamina = sanitizeSQL(L.getStaminaLoss())
|
var/sqlbrain = sanitizeSQL(L.getBrainLoss())
|
||||||
var/coord = sanitizeSQL("[L.x], [L.y], [L.z]")
|
var/sqloxy = sanitizeSQL(L.getOxyLoss())
|
||||||
var/map = sanitizeSQL(SSmapping.config.map_name)
|
var/sqltox = sanitizeSQL(L.getStaminaLoss())
|
||||||
var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
var/sqlclone = sanitizeSQL(L.getStaminaLoss())
|
||||||
query_report_death.Execute()
|
var/sqlstamina = sanitizeSQL(L.getStaminaLoss())
|
||||||
|
var/coord = sanitizeSQL("[L.x], [L.y], [L.z]")
|
||||||
|
var/map = sanitizeSQL(SSmapping.config.map_name)
|
||||||
//feedback variable datum, for storing all kinds of data
|
var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
||||||
/datum/feedback_variable
|
query_report_death.Execute()
|
||||||
var/variable
|
|
||||||
var/value
|
|
||||||
var/details
|
//feedback variable datum, for storing all kinds of data
|
||||||
|
/datum/feedback_variable
|
||||||
/datum/feedback_variable/New(param_variable, param_value = 0)
|
var/variable
|
||||||
variable = param_variable
|
var/value
|
||||||
value = param_value
|
var/details
|
||||||
|
|
||||||
/datum/feedback_variable/proc/inc(num = 1)
|
/datum/feedback_variable/New(param_variable, param_value = 0)
|
||||||
if (isnum(value))
|
variable = param_variable
|
||||||
value += num
|
value = param_value
|
||||||
else
|
|
||||||
value = text2num(value)
|
/datum/feedback_variable/proc/inc(num = 1)
|
||||||
if (isnum(value))
|
if (isnum(value))
|
||||||
value += num
|
value += num
|
||||||
else
|
else
|
||||||
value = num
|
value = text2num(value)
|
||||||
|
if (isnum(value))
|
||||||
/datum/feedback_variable/proc/dec(num = 1)
|
value += num
|
||||||
if (isnum(value))
|
else
|
||||||
value -= num
|
value = num
|
||||||
else
|
|
||||||
value = text2num(value)
|
/datum/feedback_variable/proc/dec(num = 1)
|
||||||
if (isnum(value))
|
if (isnum(value))
|
||||||
value -= num
|
value -= num
|
||||||
else
|
else
|
||||||
value = -num
|
value = text2num(value)
|
||||||
|
if (isnum(value))
|
||||||
/datum/feedback_variable/proc/set_value(num)
|
value -= num
|
||||||
if (isnum(num))
|
else
|
||||||
value = num
|
value = -num
|
||||||
|
|
||||||
/datum/feedback_variable/proc/get_value()
|
/datum/feedback_variable/proc/set_value(num)
|
||||||
if (!isnum(value))
|
if (isnum(num))
|
||||||
return 0
|
value = num
|
||||||
return value
|
|
||||||
|
/datum/feedback_variable/proc/get_value()
|
||||||
/datum/feedback_variable/proc/get_variable()
|
if (!isnum(value))
|
||||||
return variable
|
return 0
|
||||||
|
return value
|
||||||
/datum/feedback_variable/proc/set_details(text)
|
|
||||||
if (istext(text))
|
/datum/feedback_variable/proc/get_variable()
|
||||||
details = text
|
return variable
|
||||||
|
|
||||||
/datum/feedback_variable/proc/add_details(text)
|
/datum/feedback_variable/proc/set_details(text)
|
||||||
if (istext(text))
|
if (istext(text))
|
||||||
text = replacetext(text, " ", "_")
|
details = text
|
||||||
if (!details)
|
|
||||||
details = text
|
/datum/feedback_variable/proc/add_details(text)
|
||||||
else
|
if (istext(text))
|
||||||
details += " [text]"
|
text = replacetext(text, " ", "_")
|
||||||
|
if (!details)
|
||||||
/datum/feedback_variable/proc/get_details()
|
details = text
|
||||||
return details
|
else
|
||||||
|
details += " [text]"
|
||||||
/datum/feedback_variable/proc/get_parsed()
|
|
||||||
return list(variable,value,details)
|
/datum/feedback_variable/proc/get_details()
|
||||||
|
return details
|
||||||
|
|
||||||
|
/datum/feedback_variable/proc/get_parsed()
|
||||||
|
return list(variable,value,details)
|
||||||
Reference in New Issue
Block a user