From 1fdb7fd6399d6af80b15a22ce62b3cc94fb67348 Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Tue, 2 Mar 2021 09:49:49 +0800 Subject: [PATCH] cleanup --- code/controllers/subsystem/blackbox.dm | 32 ++++++++------------------ 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index 84f63cf47d..5d236045fd 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -5,10 +5,10 @@ SUBSYSTEM_DEF(blackbox) runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME init_order = INIT_ORDER_BLACKBOX - var/list/feedback = list() //list of datum/feedback_variable + var/list/feedback = list() //list of datum/feedback_variable var/list/first_death = list() //the first death of this round, assoc. vars keep track of different things var/triggertime = 0 - var/sealed = FALSE //time to stop tracking stats? + var/sealed = FALSE //time to stop tracking stats? var/list/versions = list("antagonists" = 3, "admin_secrets_fun_used" = 2, "explosion" = 2, @@ -28,12 +28,12 @@ SUBSYSTEM_DEF(blackbox) //poll population /datum/controller/subsystem/blackbox/fire() - set waitfor = FALSE //for population query + set waitfor = FALSE //for population query CheckPlayerCount() if(CONFIG_GET(flag/use_exp_tracking)) - if((triggertime < 0) || (world.time > (triggertime +3000))) //subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check + if((triggertime < 0) || (world.time > (triggertime +3000))) //subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check update_exp(10,FALSE) /datum/controller/subsystem/blackbox/proc/CheckPlayerCount() @@ -171,13 +171,13 @@ feedback data can be recorded in 5 formats: used for simple single-string records i.e. the current map further calls to the same key will append saved data unless the overwrite argument is true or it already exists when encoded calls made with overwrite will lack square brackets - calls: SSblackbox.record_feedback("text", "example", 1, "sample text") + calls: SSblackbox.record_feedback("text", "example", 1, "sample text") SSblackbox.record_feedback("text", "example", 1, "other text") json: {"data":["sample text","other text"]} "amount" used to record simple counts of data i.e. the number of ahelps received further calls to the same key will add or subtract (if increment argument is a negative) from the saved amount - calls: SSblackbox.record_feedback("amount", "example", 8) + calls: SSblackbox.record_feedback("amount", "example", 8) SSblackbox.record_feedback("amount", "example", 2) json: {"data":10} "tally" @@ -185,7 +185,7 @@ feedback data can be recorded in 5 formats: further calls to the same key will: add or subtract from the saved value of the data key if it already exists append the key and it's value if it doesn't exist - calls: SSblackbox.record_feedback("tally", "example", 1, "sample data") + calls: SSblackbox.record_feedback("tally", "example", 1, "sample data") SSblackbox.record_feedback("tally", "example", 4, "sample data") SSblackbox.record_feedback("tally", "example", 2, "other data") json: {"data":{"sample data":5,"other data":2}} @@ -197,19 +197,19 @@ feedback data can be recorded in 5 formats: further calls to the same key will: add or subtract from the saved value of the data key if it already exists in the same multi-dimensional position append the key and it's value if it doesn't exist - calls: SSblackbox.record_feedback("nested tally", "example", 1, list("fruit", "orange", "apricot")) + calls: SSblackbox.record_feedback("nested tally", "example", 1, list("fruit", "orange", "apricot")) SSblackbox.record_feedback("nested tally", "example", 2, list("fruit", "orange", "orange")) SSblackbox.record_feedback("nested tally", "example", 3, list("fruit", "orange", "apricot")) SSblackbox.record_feedback("nested tally", "example", 10, list("fruit", "red", "apple")) SSblackbox.record_feedback("nested tally", "example", 1, list("vegetable", "orange", "carrot")) json: {"data":{"fruit":{"orange":{"apricot":4,"orange":2},"red":{"apple":10}},"vegetable":{"orange":{"carrot":1}}}} tracking values associated with a number can't merge with a nesting value, trying to do so will append the list - call: SSblackbox.record_feedback("nested tally", "example", 3, list("fruit", "orange")) + call: SSblackbox.record_feedback("nested tally", "example", 3, list("fruit", "orange")) json: {"data":{"fruit":{"orange":{"apricot":4,"orange":2},"red":{"apple":10},"orange":3},"vegetable":{"orange":{"carrot":1}}}} "associative" used to record text that's associated with a value i.e. coordinates further calls to the same key will append a new list to existing data - calls: SSblackbox.record_feedback("associative", "example", 1, list("text" = "example", "path" = /obj/item, "number" = 4)) + calls: SSblackbox.record_feedback("associative", "example", 1, list("text" = "example", "path" = /obj/item, "number" = 4)) SSblackbox.record_feedback("associative", "example", 1, list("number" = 7, "text" = "example", "other text" = "sample")) json: {"data":{"1":{"text":"example","path":"/obj/item","number":"4"},"2":{"number":"7","text":"example","other text":"sample"}}} @@ -284,18 +284,6 @@ Versioning /datum/feedback_variable/New(new_key, new_key_type) key = new_key key_type = new_key_type -/* -/datum/controller/subsystem/blackbox/proc/LogAhelp(ticket, action, message, recipient, sender) - if(!SSdbcore.Connect()) - return - - var/datum/db_query/query_log_ahelp = SSdbcore.NewQuery({" - INSERT INTO [format_table_name("ticket")] (ticket, action, message, recipient, sender, server_ip, server_port, round_id, timestamp) - VALUES (:ticket, :action, :message, :recipient, :sender, INET_ATON(:server_ip), :server_port, :round_id, :time) - "}, list("ticket" = ticket, "action" = action, "message" = message, "recipient" = recipient, "sender" = sender, "server_ip" = world.internet_address || "0", "server_port" = world.port, "round_id" = GLOB.round_id, "time" = SQLtime())) - query_log_ahelp.Execute() - qdel(query_log_ahelp) -*/ /datum/controller/subsystem/blackbox/proc/LogAhelp(ticket, action, message, recipient, sender) if(!SSdbcore.Connect())