Removes legacy yogtoggles, mood is enabled by default. (yogstation13#…

…19591)

* Moves yog's legacy toggles to non legacy, mood enabled by default

* Update quirks.dm

code/__DEFINES/{yogs_defines}/preferences.dm

@@ -3,11 +3,3 @@
 
 #define DONOR_BYOND_SLOTS 2
 #define DONOR_YOGS_SLOTS 3
-
-//YOGS pref.yogstoggles enum's
-// !!! DO NOT ADD ANY NEW ONES HERE !!!
-// Use `/datum/preference/toggle` instead.
-#define QUIET_ROUND				(1<<0) //Donor features, quiet round; in /~yogs_defines/, as god intended
-#define PREF_MOOD				(1<<1) //Toggles the use of the Mood feature. Defaults to off, thank god.
-
-#define YOGTOGGLES_DEFAULT 0

code/controllers/subsystem/economy.dm

@@ -168,27 +168,20 @@ SUBSYSTEM_DEF(economy)
 		D.adjust_money(500)
 
 /datum/controller/subsystem/economy/proc/secmedsrv_payout()
-	for(var/mob/m in GLOB.mob_list)
-		if(isnewplayer(m))
+	for(var/mob/living/carbon/human/human_player in GLOB.player_list)
+		if(human_player.stat == DEAD)
 			continue
-		if(m.mind)
-			if(isbrain(m) || iscameramob(m))
-				continue
-			if(ishuman(m))
-				var/mob/living/carbon/human/H = m
-				if(H.stat != DEAD)
-					var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
-					var/medical_cash = (H.health / H.maxHealth) * alive_humans_bounty
-					if(mood)
-						var/datum/bank_account/D = get_dep_account(ACCOUNT_SRV)
-						if(D)
-							var/mood_dosh = (mood.mood_level / 9) * mood_bounty
-							D.adjust_money(mood_dosh)
-						medical_cash *= (mood.sanity / 100)
-
-					var/datum/bank_account/D = get_dep_account(ACCOUNT_MED)
-					if(D)
-						D.adjust_money(medical_cash)
+		var/datum/component/mood/mood = human_player.GetComponent(/datum/component/mood)
+		var/medical_cash = (human_player.health / human_player.maxHealth) * alive_humans_bounty
+		if(mood)
+			var/datum/bank_account/D = get_dep_account(ACCOUNT_SRV)
+			if(D)
+				var/mood_dosh = (mood.mood_level / 9) * mood_bounty
+				D.adjust_money(mood_dosh)
+			medical_cash *= (mood.sanity / 100)
+		var/datum/bank_account/D = get_dep_account(ACCOUNT_MED)
+		if(D)
+			D.adjust_money(medical_cash)
 		CHECK_TICK
 
 	var/service_passive_income = (rand(1, 6) * 400) //min 400, max 2400

code/controllers/subsystem/job.dm

@@ -187,7 +187,7 @@ SUBSYSTEM_DEF(job)
 			JobDebug("FOC incompatible with antagonist role, Player: [player]")
 			continue
 		// yogs start - Donor features, quiet round
-		if(((job.title in GLOB.command_positions) || (job.title in GLOB.nonhuman_positions)) && (player.client.prefs.yogtoggles & QUIET_ROUND))
+		if(((job.title in GLOB.command_positions) || (job.title in GLOB.nonhuman_positions)) && (player.client.prefs.read_preference(/datum/preference/toggle/quiet_mode)))
 			JobDebug("FOC quiet check failed, Player: [player]")
 			continue
 		// yogs end

code/controllers/subsystem/processing/quirks.dm

@@ -74,7 +74,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 		prefs = client.prefs
 
 	// If moods are globally enabled, or this guy does indeed have his mood pref set to Enabled
-	var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (prefs.yogtoggles & PREF_MOOD))
+	var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (prefs.read_preference(/datum/preference/toggle/mood_enabled)))
 
 	for (var/quirk_name in quirks)
 		var/datum/quirk/quirk = SSquirks.quirks[quirk_name]

code/datums/mind.dm

@@ -115,7 +115,7 @@
 	var/mood_was_enabled = FALSE//Yogs -- Mood Preferences
 	if(current)	// remove ourself from our old body's mind variable
 		// Yogs start -- Mood preferences
-		if(current.client && current.client.prefs.yogtoggles & PREF_MOOD)
+		if(current.client && current.client.prefs.read_preference(/datum/preference/toggle/mood_enabled))
 			mood_was_enabled = TRUE
 		else if(ishuman(current) && CONFIG_GET(flag/disable_human_mood))
 			var/mob/living/carbon/human/H = current

code/game/gamemodes/game_mode.dm

@@ -419,7 +419,7 @@
 	// Ultimate randomizing code right here
 	for(var/mob/dead/new_player/player in GLOB.player_list)
 		if(player.client && player.ready == PLAYER_READY_TO_PLAY && player.check_preferences())
-			if(player.client.prefs.yogtoggles & QUIET_ROUND)
+			if(player.client.prefs.read_preference(/datum/preference/toggle/quiet_mode))
 				player.mind.quiet_round = TRUE
 			else
 				players += player

code/modules/client/client_procs.dm

@@ -301,9 +301,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 	if (prefs.unlock_content & DONOR_YOGS)
 		src.add_donator_verbs()
 	else
-		if(prefs.yogtoggles & QUIET_ROUND)
-			prefs.yogtoggles &= ~QUIET_ROUND
-			prefs.save_preferences()
+		if(prefs.read_preference(/datum/preference/toggle/quiet_mode))
+			prefs.write_preference(/datum/preference/toggle/quiet_mode, FALSE)
 
 	. = ..()	//calls mob.Login()
 

code/modules/client/preferences.dm

@@ -30,7 +30,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/db_flags
 	var/chat_toggles = TOGGLES_DEFAULT_CHAT
 	var/extra_toggles = TOGGLES_DEFAULT_EXTRA
-	var/yogtoggles = YOGTOGGLES_DEFAULT
 	var/ghost_form = "ghost"
 
 	var/list/player_alt_titles = list()
@@ -80,6 +79,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	/// If set to TRUE, will update character_profiles on the next ui_data tick.
 	var/tainted_character_profiles = FALSE
 
+
+	///removed, kept here for migration in 'legacy_mood_migration.dm'
+	///DO NOT USE THIS!
+	var/yogtoggles
+
 /datum/preferences/Destroy(force, ...)
 	QDEL_NULL(character_preview_view)
 	QDEL_LIST(middleware)

code/modules/client/preferences/donor.dm

@@ -180,3 +180,9 @@
 	data[CHOICED_PREFERENCE_DISPLAY_NAMES] = display_names
 
 	return data
+
+/datum/preference/toggle/quiet_mode
+	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
+	savefile_key = "quiet_mode"
+	savefile_identifier = PREFERENCE_PLAYER
+	default_value = FALSE

code/modules/client/preferences/middleware/legacy_toggles.dm

@@ -50,11 +50,6 @@
 		"ghost_ckey" = GHOST_CKEY,
 	)
 
-	var/static/list/legacy_yog_toggles = list(
-		"quiet_mode" = QUIET_ROUND,
-		"pref_mood" = PREF_MOOD,
-	)
-
 /datum/preference_middleware/legacy_toggles/get_character_preferences(mob/user)
 	if (preferences.current_window != PREFERENCE_TAB_GAME_PREFERENCES)
 		return list()
@@ -95,7 +90,6 @@
 
 	var/list/new_game_preferences = list()
 	var/is_admin = is_admin(user.client)
-	var/is_donor = is_donator(user.client)
 
 	for (var/toggle_name in legacy_toggles)
 		if (!is_admin && (toggle_name in admin_only_legacy_toggles))
@@ -120,12 +114,6 @@
 			continue
 
 		new_game_preferences[toggle_name] = (preferences.chat_toggles & legacy_chat_toggles[toggle_name]) != 0
-
-	for (var/toggle_name in legacy_yog_toggles)
-		if (!is_donor && (toggle_name in donor_only_yog_toggles))
-			continue
-
-		new_game_preferences[toggle_name] = (preferences.yogtoggles & legacy_yog_toggles[toggle_name]) != 0
 
 	return list(
 		PREFERENCE_CATEGORY_GAME_PREFERENCES = new_game_preferences,
@@ -157,14 +145,5 @@
 			preferences.chat_toggles &= ~legacy_chat_flag
 
 		return TRUE
-
-	var/legacy_yog_flag = legacy_yog_toggles[preference]
-	if (!isnull(legacy_yog_flag))
-		if (value)
-			preferences.yogtoggles |= legacy_yog_flag
-		else
-			preferences.yogtoggles &= ~legacy_yog_flag
-
-		return TRUE
 
 	return FALSE

code/modules/client/preferences/middleware/quirks.dm

@@ -17,8 +17,7 @@
 	data["locked_quirks"] = get_locked_quirks()
 
 	// If moods are globally enabled, or this guy does indeed have his mood pref set to Enabled
-	var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (user.client?.prefs.yogtoggles & PREF_MOOD))
-	data["mood_enabled"] = ismoody
+	data["mood_enabled"] = (!CONFIG_GET(flag/disable_human_mood) || (user.client?.prefs.read_preference(/datum/preference/toggle/mood_enabled)))
 
 	return data
 
@@ -31,8 +30,7 @@
 		data["locked_quirks"] = get_locked_quirks()
 
 	// If moods are globally enabled, or this guy does indeed have his mood pref set to Enabled
-	var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (user.client?.prefs.yogtoggles & PREF_MOOD))
-	data["mood_enabled"] = ismoody
+	data["mood_enabled"] = (!CONFIG_GET(flag/disable_human_mood) || (user.client?.prefs.read_preference(/datum/preference/toggle/mood_enabled)))
 
 	return data
 

code/modules/client/preferences/migrations/legacy_mood_migration.dm

@@ -0,0 +1,3 @@
+/datum/preferences/proc/migrate_yog_legacy_toggles(savefile/savefile)
+	write_preference(GLOB.preference_entries[/datum/preference/toggle/quiet_mode], yogtoggles & 1<<0)
+	write_preference(GLOB.preference_entries[/datum/preference/toggle/mood_enabled], yogtoggles & 1<<1)

code/modules/client/preferences/mood_enabling.dm

@@ -0,0 +1,5 @@
+/datum/preference/toggle/mood_enabled
+	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
+	savefile_key = "pref_mood"
+	savefile_identifier = PREFERENCE_PLAYER
+

code/modules/client/preferences_savefile.dm

@@ -1,11 +1,11 @@
 //This is the lowest supported version, anything below this is completely obsolete and the entire savefile will be wiped.
-#define SAVEFILE_VERSION_MIN	30
+#define SAVEFILE_VERSION_MIN 30
 
 //This is the current version, anything below this will attempt to update (if it's not obsolete)
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	42
+#define SAVEFILE_VERSION_MAX 43
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -64,6 +64,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		key_bindings["action_3"] = GLOB.default_hotkeys["action_3"]
 		key_bindings["action_4"] = GLOB.default_hotkeys["action_4"]
 
+	if(current_version > 42)
+		migrate_yog_legacy_toggles(S)
+
 
 
 /datum/preferences/proc/update_character(current_version, savefile/S)
@@ -158,7 +161,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	READ_FILE(S["toggles"], toggles)
 	READ_FILE(S["chat_toggles"], chat_toggles)
 	READ_FILE(S["extra_toggles"], extra_toggles)
-	READ_FILE(S["yogtoggles"], yogtoggles)
 
 	READ_FILE(S["ignoring"], ignoring)
 
@@ -216,7 +218,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["toggles"], toggles)
 	WRITE_FILE(S["chat_toggles"], chat_toggles)
 	WRITE_FILE(S["extra_toggles"], extra_toggles)
-	WRITE_FILE(S["yogtoggles"], yogtoggles)
 
 	WRITE_FILE(S["ignoring"], ignoring)
 

code/modules/mob/dead/new_player/new_player.dm

@@ -373,7 +373,7 @@
 	SSjob.AssignRole(src, rank, 1)
 
 	var/mob/living/character = create_character(TRUE)	//creates the human and transfers vars and mind
-	character.mind.quiet_round = character.client.prefs.yogtoggles & QUIET_ROUND // yogs - Donor Features
+	character.mind.quiet_round = character.client.prefs.read_preference(/datum/preference/toggle/quiet_mode) // yogs - Donor Features
 	var/equip = SSjob.EquipRank(character, rank, TRUE)
 	if(isliving(equip))	//Borgs get borged in the equip, so we need to make sure we handle the new mob.
 		character = equip

yogstation.dme

@@ -2038,6 +2038,7 @@
 #include "code\modules\client\preferences\items.dm"
 #include "code\modules\client\preferences\jobless_role.dm"
 #include "code\modules\client\preferences\mood.dm"
+#include "code\modules\client\preferences\mood_enabling.dm"
 #include "code\modules\client\preferences\names.dm"
 #include "code\modules\client\preferences\ooc.dm"
 #include "code\modules\client\preferences\parallax.dm"
@@ -2053,7 +2054,6 @@
 #include "code\modules\client\preferences\skin_tone.dm"
 #include "code\modules\client\preferences\species.dm"
 #include "code\modules\client\preferences\tgui.dm"
-#include "code\modules\client\preferences\tgui_prefs_migration.dm"
 #include "code\modules\client\preferences\tooltips.dm"
 #include "code\modules\client\preferences\ui_style.dm"
 #include "code\modules\client\preferences\uplink_location.dm"
@@ -2069,6 +2069,8 @@
 #include "code\modules\client\preferences\middleware\random.dm"
 #include "code\modules\client\preferences\middleware\skillcapes.dm"
 #include "code\modules\client\preferences\middleware\species.dm"
+#include "code\modules\client\preferences\migrations\legacy_mood_migration.dm"
+#include "code\modules\client\preferences\migrations\tgui_prefs_migration.dm"
 #include "code\modules\client\preferences\species_features\basic.dm"
 #include "code\modules\client\preferences\species_features\ethereal.dm"
 #include "code\modules\client\preferences\species_features\felinid.dm"

yogstation/code/controllers/subsystem/processing/quirks.dm

@@ -1,8 +1,8 @@
 /datum/controller/subsystem/processing/quirks/proc/checkquirks(mob/living/user,client/cli) // Returns true when the player isn't trying to fuckin scum the mood pref stuff to exploit
 	var/mob/living/carbon/human/U = user
-	U.mood_enabled = cli.prefs.yogtoggles & PREF_MOOD // Marks whether this player had moods enabled in preferences at the time of spawning (helps prevent exploitation)
+	U.mood_enabled = cli.prefs.read_preference(/datum/preference/toggle/mood_enabled) // Marks whether this player had moods enabled in preferences at the time of spawning (helps prevent exploitation)
 
-	var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (cli.prefs.yogtoggles & PREF_MOOD)) // If moods are globally enabled, or this guy does indeed have his mood pref set to Enabled
+	var/ismoody = (!CONFIG_GET(flag/disable_human_mood) || (cli.prefs.read_preference(/datum/preference/toggle/mood_enabled))) // If moods are globally enabled, or this guy does indeed have his mood pref set to Enabled
 
 	var/points = 0;
 	var/good_quirks = 0;