Skip to content

Commit

Permalink
del: SSblackbox system Removal (#6388)
Browse files Browse the repository at this point in the history
* del: SSblackbox system Removal

* LINTER?? HELLO? Removes blackbox sys define

* Update dbconfig.txt

* Update misc.dm

* Update dbconfig.txt
BeebBeebBoob authored Jan 25, 2025
1 parent 18e8bbe commit 314166e
Showing 119 changed files with 29 additions and 1,293 deletions.
205 changes: 0 additions & 205 deletions .github/USING_FEEDBACK_DATA.md

This file was deleted.

46 changes: 0 additions & 46 deletions SQL/paradise_schema.sql
Original file line number Diff line number Diff line change
@@ -112,33 +112,6 @@ CREATE TABLE `customuseritems` (
) ENGINE=MyISAM AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `death`
--

DROP TABLE IF EXISTS `death`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `death` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`pod` text NOT NULL COMMENT 'Place of death',
`coord` text NOT NULL COMMENT 'X, Y, Z POD',
`tod` datetime NOT NULL COMMENT 'Time of death',
`job` text NOT NULL,
`special` text NOT NULL,
`name` text NOT NULL,
`byondkey` text NOT NULL,
`laname` text NOT NULL COMMENT 'Last attacker name',
`lakey` text NOT NULL COMMENT 'Last attacker key',
`gender` text NOT NULL,
`bruteloss` int(11) NOT NULL,
`brainloss` int(11) NOT NULL,
`fireloss` int(11) NOT NULL,
`oxyloss` int(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `donators`
--
@@ -233,25 +206,6 @@ CREATE TABLE `ban` (
) ENGINE=InnoDB AUTO_INCREMENT=58903 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `feedback`
--

DROP TABLE IF EXISTS `feedback`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `feedback` (
`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`datetime` datetime NOT NULL,
`round_id` int(8) NOT NULL,
`key_name` varchar(32) NOT NULL,
`key_type` enum('text', 'amount', 'tally', 'nested tally', 'associative') NOT NULL,
`version` tinyint(3) UNSIGNED NOT NULL,
`json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Table structure for table `player`
--
7 changes: 7 additions & 0 deletions SQL/updates/34-35.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Removes unneeded tables used for SSblackbox in favor of logging.

# Drop feedback table
DROP TABLE `feedback`;

# Drop death table
DROP TABLE `death`;
2 changes: 1 addition & 1 deletion code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
@@ -363,7 +363,7 @@
#define EXPLOSION_BLOCK_PROC -1

// The SQL version required by this version of the code
#define SQL_VERSION 34
#define SQL_VERSION 35

// Vending machine stuff
#define CAT_NORMAL 1
7 changes: 3 additions & 4 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
@@ -67,10 +67,9 @@
// Subsystems shutdown in the reverse of the order they initialize in
// The numbers just define the ordering, they are meaningless otherwise.
#define INIT_ORDER_TITLE 100 // This **MUST** load first or people will se blank lobby screens
#define INIT_ORDER_SPEECH_CONTROLLER 19
#define INIT_ORDER_GARBAGE 18
#define INIT_ORDER_DBCORE 17
#define INIT_ORDER_BLACKBOX 16
#define INIT_ORDER_SPEECH_CONTROLLER 18
#define INIT_ORDER_GARBAGE 17
#define INIT_ORDER_DBCORE 16
#define INIT_ORDER_CLEANUP 15
#define INIT_ORDER_INPUT 14
#define INIT_ORDER_SOUNDS 13
2 changes: 0 additions & 2 deletions code/controllers/master.dm
Original file line number Diff line number Diff line change
@@ -329,8 +329,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/time = rustg_time_milliseconds(SS_INIT_TIMER_KEY)
var/seconds = round(time / 1000, 0.01)

// Always update the blackbox tally regardless.
SSblackbox.record_feedback("tally", "subsystem_initialize", time, subsystem.name)

// Gave invalid return value.
if(result && !(result in valid_results))
9 changes: 0 additions & 9 deletions code/controllers/subsystem/chat.dm
Original file line number Diff line number Diff line change
@@ -96,12 +96,3 @@ SUBSYSTEM_DEF(chat)

payload.resends += 1
send_payload_to_client(client, client_history[sequence])
SSblackbox.record_feedback(
"nested tally",
"chat_resend_byond_version",
1,
list(
"[client.byond_version]",
"[client.byond_build]",
),
)
1 change: 0 additions & 1 deletion code/controllers/subsystem/dbcore.dm
Original file line number Diff line number Diff line change
@@ -581,7 +581,6 @@ SUBSYSTEM_DEF(dbcore)

log_admin("[key_name(usr)] is attempting to re-establish the DB Connection")
message_admins("[key_name_admin(usr)] is attempting to re-establish the DB Connection")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Force Reconnect DB") //If you are copy-pasting this, ensure the 4th parameter is unique to the new proc!

SSdbcore.failed_connections = 0 // Reset this
if(!SSdbcore.Connect())
48 changes: 0 additions & 48 deletions code/controllers/subsystem/jobs.dm
Original file line number Diff line number Diff line change
@@ -315,8 +315,6 @@ SUBSYSTEM_DEF(jobs)
//Shuffle players and jobs
unassigned = shuffle(unassigned)

HandleFeedbackGathering()

if(new_malf) // code to assign malf AI before civs.
Debug("DO, Running AI Check")
FillMalfAIPosition()
@@ -588,52 +586,6 @@ SUBSYSTEM_DEF(jobs)
J.spawn_positions = J.positions_lowpop
J.total_positions = J.positions_lowpop

/datum/controller/subsystem/jobs/proc/HandleFeedbackGathering()
for(var/datum/job/job in occupations)

var/high = 0 //high
var/medium = 0 //medium
var/low = 0 //low
var/never = 0 //never
var/banned = 0 //banned
var/young = 0 //account too young
var/charyoung = 0 //character too young
var/disabled = 0 //has disability rendering them ineligible
for(var/mob/new_player/player in GLOB.player_list)
if(!(player.ready && player.mind && !player.mind.assigned_role))
continue //This player is not ready
if(jobban_isbanned(player, job.title))
banned++
continue
if(!job.player_old_enough(player.client))
young++
continue
if(job.available_in_playtime(player.client))
young++
continue
if(job.barred_by_disability(player.client))
disabled++
continue
if(!job.character_old_enough(player.client))
charyoung++
continue
if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
high++
else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
medium++
else if(player.client.prefs.GetJobDepartment(job, 3) & job.flag)
low++
else never++ //not selected

SSblackbox.record_feedback("nested tally", "job_preferences", high, list("[job.title]", "high"))
SSblackbox.record_feedback("nested tally", "job_preferences", medium, list("[job.title]", "medium"))
SSblackbox.record_feedback("nested tally", "job_preferences", low, list("[job.title]", "low"))
SSblackbox.record_feedback("nested tally", "job_preferences", never, list("[job.title]", "never"))
SSblackbox.record_feedback("nested tally", "job_preferences", banned, list("[job.title]", "banned"))
SSblackbox.record_feedback("nested tally", "job_preferences", young, list("[job.title]", "young"))
SSblackbox.record_feedback("nested tally", "job_preferences", disabled, list("[job.title]", "disabled"))
SSblackbox.record_feedback("nested tally", "job_preferences", charyoung, list("[job.title]", "charyoung"))


/datum/controller/subsystem/jobs/proc/CreateMoneyAccount(mob/living/H, rank, datum/job/job)
var/money_amount = rand(job.min_start_money, job.max_start_money)
Loading

0 comments on commit 314166e

Please sign in to comment.