TGS Test merge #13435

Author: Yogbot-13

code/__DEFINES/{yogs_defines}/preferences.dm

@@ -1,12 +1,13 @@
 #define DONOR_CHARACTER_SLOTS 6
 
 
-#define CHAT_LOOC	(1<<10)
-
+#define CHAT_LOOC	(1<<11)
+#define GHOST_CKEY	(1<<12)
+#define CHAT_TYPING_INDICATOR (1<<13)
 #undef TOGGLES_DEFAULT_CHAT
-#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_LOOC)
+#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_LOOC|GHOST_CKEY|CHAT_TYPING_INDICATOR)
+
 
-#define GHOST_CKEY	(1<<11)
 
 
 //YOGS pref.yogstoggles enum's

code/modules/client/preferences_savefile.dm

@@ -5,7 +5,7 @@
 //	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	35
+#define SAVEFILE_VERSION_MAX	36
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -49,6 +49,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			be_special += "Ragin Mages"
 	if (current_version < 35)
 		toggles |= SOUND_ALT
+	if (current_version < 36)
+		chat_toggles |= CHAT_TYPING_INDICATOR
 	return
 
 /datum/preferences/proc/update_character(current_version, savefile/S)

code/modules/mob/living/carbon/life.dm

@@ -18,6 +18,10 @@
 		if (QDELETED(src))
 			return
 
+		// yogs start -- typing indicators, look in yogstation specific folder for proc
+		handle_typing_indicator()
+		//yogs end
+
 		if(.) //not dead
 			handle_blood()
 

icons/mob/talk.dmi

@@ -1,2 +1,3 @@
 GLOBAL_VAR_INIT(looc_allowed, TRUE)
-GLOBAL_VAR_INIT(dlooc_allowed, FALSE)
+GLOBAL_VAR_INIT(dlooc_allowed, FALSE)
+GLOBAL_VAR_INIT(typing_indicators,TRUE)

yogstation/code/_globalvars/configuration.dm

@@ -16,3 +16,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, ghost_ckey)()
 	usr.client.prefs.chat_toggles ^= GHOST_CKEY
 	usr.client.prefs.save_preferences()
 	to_chat(usr, "Your ckey is [(usr.client.prefs.chat_toggles & GHOST_CKEY) ? "no longer" : "now"] visible in deadchat.")
+
+TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, typing_indicators)()
+	set name = "Show/Hide typing indicators"
+	set category = "Preferences"
+	set desc = "Toggle typing indicators"
+	usr.client.prefs.chat_toggles ^= CHAT_TYPING_INDICATOR
+	usr.client.prefs.save_preferences()
+	to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_TYPING_INDICATOR) ? "now" : "no longer"] see typing indicators.")

yogstation/code/modules/client/preferences_toggles.dm

@@ -1,3 +1,76 @@
+#define TYPING_INDICATOR_RANGE 7
+
 /mob/proc/get_say()
+	create_typing_indicator()
+	window_typing = TRUE
 	var/msg = input(src, null, "say \"text\"") as text|null
-	say_verb(msg)
+	window_typing = FALSE
+	remove_typing_indicator()
+	say_verb(msg)
+
+/mob
+	var/image/typing_overlay
+	var/list/speech_bubble_recipients
+	var/last_typed
+	var/last_typed_time
+	var/window_typing = FALSE
+	var/bar_typing = FALSE
+
+/mob/proc/handle_typing_indicator()
+	INVOKE_ASYNC(src,.proc/typing_indicator_process)
+
+/mob/proc/typing_indicator_process()
+	if(!GLOB.typing_indicators)
+		return
+	if(client)
+		var/temp = winget(client, "input", "text")
+		if(temp != last_typed)
+			last_typed = temp
+			last_typed_time = world.time
+		if(world.time > last_typed_time + 10 SECONDS)
+			bar_typing = FALSE
+			remove_typing_indicator()
+			return
+		if(length(temp) > 5 && findtext(temp, "Say \"", 1, 7))
+			create_typing_indicator()
+			bar_typing = TRUE
+		else if(length(temp) > 3 && findtext(temp, "Me ", 1, 5))
+			//set_typing_indicator(1)
+		else
+			bar_typing = FALSE
+			remove_typing_indicator()
+			
+
+/mob/proc/create_typing_indicator()
+	if(typing_overlay) 
+		return
+	if(stat)
+		return
+	var/list/listening = get_hearers_in_view(TYPING_INDICATOR_RANGE, src)
+	speech_bubble_recipients = list()
+	for(var/mob/M in listening)
+		if(M.client && M.client.prefs.chat_toggles & CHAT_TYPING_INDICATOR)
+			speech_bubble_recipients.Add(M.client)
+	var/bubble = "default"
+	if(isliving(src))
+		var/mob/living/L = src
+		bubble = L.bubble_icon
+	typing_overlay = image('yogstation/icons/mob/talk.dmi', src, "[bubble]_talking", FLY_LAYER)
+	typing_overlay.appearance_flags = APPEARANCE_UI
+	typing_overlay.invisibility = invisibility
+	typing_overlay.alpha = alpha
+	for(var/client/C in speech_bubble_recipients)
+		C.images += typing_overlay
+
+
+/mob/proc/remove_typing_indicator()
+	if(!typing_overlay) 
+		return
+	if(window_typing || bar_typing)
+		return
+	for(var/client/C in speech_bubble_recipients)
+		C.images -= typing_overlay
+	typing_overlay = null
+	speech_bubble_recipients = list()
+
+#undef TYPING_INDICATOR_RANGE