Partially ports updates to the in-game HUD interface

code/__DEFINES/ghost.dm

@@ -21,7 +21,7 @@
 /// The default ghost display selection for the main player
 #define GHOST_ACCS_DEFAULT_OPTION GHOST_ACCS_FULL
 
-/// The other players ghosts will display as a simple white ghost 
+/// The other players ghosts will display as a simple white ghost
 #define GHOST_OTHERS_SIMPLE "White ghosts"
 /// The other players ghosts will display as transparent mobs
 #define GHOST_OTHERS_DEFAULT_SPRITE "Default sprites"
@@ -31,6 +31,8 @@
 /// The default ghost display selection when viewing other players
 #define GHOST_OTHERS_DEFAULT_OPTION GHOST_OTHERS_THEIR_SETTING
 
+/// A ghosts min view range that we won't allow them to go under by.
+#define GHOST_MIN_VIEW_RANGE 7
 /// A ghosts max view range if they are a BYOND guest or regular account
 #define GHOST_MAX_VIEW_RANGE_DEFAULT 10
 /// A ghosts max view range if they are a BYOND paid member account (P2W feature)
@@ -56,3 +58,22 @@
 #define CAMERA_SEE_GHOSTS_BASIC 1
 /// Pictures taken by a camera will display ghosts and their orbits
 #define CAMERA_SEE_GHOSTS_ORBIT 2 // this doesn't do anything right now as of Jan 2022
+
+
+#define GHOST_DATA_HUDS (1<<0)
+#define GHOST_VISION (1<<1)
+#define GHOST_HEALTH (1<<2)
+#define GHOST_CHEM (1<<3)
+#define GHOST_GAS (1<<4)
+/// Represents tray view. Not a real view flag, as tray is not persistent, but used as an identifier for one.
+#define GHOST_TRAY (1<<5)
+/// Repesents darkness level setting. Not a real view flag, as darkness level cycles through values, but used as an identifier for one.
+#define GHOST_DARKNESS_LEVEL (1<<6)
+
+#define ALL_GHOST_FLAGS list( \
+	GHOST_DATA_HUDS, \
+	GHOST_VISION, \
+	GHOST_HEALTH, \
+	GHOST_CHEM, \
+	GHOST_GAS, \
+)

code/__DEFINES/hud.dm

@@ -34,20 +34,6 @@
 	Therefore, the top right corner (except during admin shenanigans) is at "15,15"
 */
 
-/proc/ui_hand_position(i) //values based on old hand ui positions (CENTER:-/+16,SOUTH:5)
-	var/x_off = i % 2 ? 0 : -1
-	var/y_off = round((i-1) / 2)
-	return"CENTER+[x_off]:16,SOUTH+[y_off]:5"
-
-/proc/ui_equip_position(mob/M)
-	var/y_off = round((M.held_items.len-1) / 2) //values based on old equip ui position (CENTER: +/-16,SOUTH+1:5)
-	return "CENTER:-16,SOUTH+[y_off+1]:5"
-
-/proc/ui_swaphand_position(mob/M, which = 1) //values based on old swaphand ui positions (CENTER: +/-16,SOUTH+1:5)
-	var/x_off = which == 1 ? -1 : 0
-	var/y_off = round((M.held_items.len-1) / 2)
-	return "CENTER+[x_off]:16,SOUTH+[y_off+1]:5"
-
 //Lower left, persistent menu
 #define ui_inventory "WEST:6,SOUTH:5"
 
@@ -67,8 +53,11 @@
 #define ui_combo "CENTER+4:24,SOUTH+1:7" //combo meter for martial arts
 
 //Lower right, persistent menu
-#define ui_drop_throw "EAST-1:28,SOUTH+1:7"
+#define ui_rest "EAST-1:28,SOUTH+1:7"
+#define ui_drop_throw "EAST-1:28,SOUTH+1:24"
+#define ui_above_throw "EAST-1:28,SOUTH+1:41"
 #define ui_above_movement "EAST-2:26,SOUTH+1:7"
+#define ui_above_movement_top "EAST-2:26, SOUTH+1:24"
 #define ui_above_intent "EAST-3:24, SOUTH+1:7"
 #define ui_movi "EAST-2:26,SOUTH:5"
 #define ui_acti "EAST-3:24,SOUTH:5"
@@ -78,7 +67,7 @@
 #define ui_crafting "EAST-4:22,SOUTH:5"
 #define ui_building "EAST-4:22,SOUTH:21"
 #define ui_language_menu "EAST-4:6,SOUTH:21"
-#define ui_navigate_menu "EAST-4:22,SOUTH:5"
+#define ui_navigate_menu "EAST-4:6,SOUTH:5"
 
 //Upper left (action buttons)
 #define ui_action_palette "WEST+0:23,NORTH-1:5"
@@ -111,6 +100,13 @@
 #define ui_living_pull "EAST-1:28,CENTER-3:15"
 #define ui_living_healthdoll "EAST-1:28,CENTER-1:15"
 
+//Humans
+#define ui_human_floor_changer "EAST-4:22,SOUTH:5"
+#define ui_human_crafting "EAST-3:24,SOUTH+1:7"
+#define ui_human_navigate "EAST-3:7,SOUTH+1:7"
+#define ui_human_language "EAST-3:7,SOUTH+1:24"
+#define ui_human_area "EAST-3:24,SOUTH+1:24"
+
 //Drones
 #define ui_drone_drop "CENTER+1:18,SOUTH:5"
 #define ui_drone_pull "CENTER+1.5:2,SOUTH:5"
@@ -132,15 +128,17 @@
 #define ui_borg_camera "CENTER+3:21,SOUTH:5"
 #define ui_borg_alerts "CENTER+4:21,SOUTH:5"
 #define ui_borg_language_menu "CENTER+4:19,SOUTH+1:6"
-#define ui_borg_navigate_menu "CENTER+4:19,SOUTH+1:6"
+#define ui_borg_navigate_menu "CENTER+4:3,SOUTH+1:6"
+#define ui_borg_floor_changer "EAST-1:28,SOUTH+1:39"
 
 //Aliens
 #define ui_alien_health "EAST,CENTER-1:15"
 #define ui_alienplasmadisplay "EAST,CENTER-2:15"
 #define ui_alien_queen_finder "EAST,CENTER-3:15"
 #define ui_alien_storage_r "CENTER+1:18,SOUTH:5"
 #define ui_alien_language_menu "EAST-4:20,SOUTH:5"
-#define ui_alien_navigate_menu "EAST-4:20,SOUTH:5"
+#define ui_alien_navigate_menu "EAST-4:4,SOUTH:5"
+#define ui_alien_floor_change "EAST-3:24, SOUTH:24"
 
 //AI
 #define ui_ai_core "BOTTOM:6,RIGHT-4"
@@ -162,6 +160,8 @@
 #define ui_ai_multicam "BOTTOM+1:6,LEFT+1"
 #define ui_ai_add_multicam "BOTTOM+1:6,LEFT"
 #define ui_ai_take_picture "BOTTOM+2:6,LEFT"
+#define ui_ai_floor_indicator "BOTTOM+5,RIGHT"
+#define ui_ai_godownup "BOTTOM+5,RIGHT-1"
 
 //pAI
 #define ui_pai_software "SOUTH:6,WEST"
@@ -179,16 +179,18 @@
 #define ui_pai_view_images "SOUTH:6,WEST+12"
 #define ui_pai_radio "SOUTH:6,WEST+13"
 #define ui_pai_language_menu "SOUTH+1:8,WEST+12:31"
-#define ui_pai_navigate_menu "SOUTH+1:8,WEST+12:31"
+#define ui_pai_navigate_menu "SOUTH+1:8,WEST+12:15"
 
 //Ghosts
 #define ui_ghost_spawners_menu "SOUTH:6,CENTER-3:24"
 #define ui_ghost_orbit "SOUTH:6,CENTER-2:24"
 #define ui_ghost_reenter_corpse "SOUTH:6,CENTER-1:24"
-#define ui_ghost_teleport "SOUTH:6,CENTER:24"
-#define ui_ghost_pai "SOUTH: 6, CENTER+1:24"
-#define ui_ghost_minigames "SOUTH: 6, CENTER+2:24"
-#define ui_ghost_language_menu "SOUTH: 22, CENTER+3:8"
+#define ui_dnr "SOUTH:6,CENTER:24"
+#define ui_ghost_teleport "SOUTH:6,CENTER+1:24"
+#define ui_ghost_settings "SOUTH: 6, CENTER+2:24"
+#define ui_ghost_minigames "SOUTH: 6, CENTER+3:24"
+#define ui_ghost_language_menu "SOUTH: 6, CENTER+4:22"
+#define ui_ghost_floor_changer "SOUTH: 6, CENTER+4:7"
 
 //Blobbernauts
 #define ui_blobbernaut_overmind_health "EAST-1:28,CENTER+0:19"

code/__HELPERS/hud.dm

@@ -0,0 +1,9 @@
+/proc/ui_hand_position(i) //values based on old hand ui positions (CENTER:-/+16,SOUTH:5)
+	var/x_off = i % 2 ? 0 : -1
+	var/y_off = round((i-1) / 2)
+	return"CENTER+[x_off]:16,SOUTH+[y_off]:5"
+
+/proc/ui_swaphand_position(mob/M, which = LEFT_HANDS) //values based on old swaphand ui positions (CENTER: +/-16,SOUTH+1:5)
+	var/x_off = (which == LEFT_HANDS) ? -1 : null
+	var/y_off = round((M.held_items.len-1) / 2)
+	return "CENTER[x_off]:16,SOUTH+[y_off+1]:5"

code/__HELPERS/view.dm

@@ -1,9 +1,10 @@
-/proc/getviewsize(view)
-	if(!view) // Just to avoid any runtimes that could otherwise cause constant disconnect loops.
-		stack_trace("Missing value for 'view' in getviewsize(), defaulting to world.view!")
-		view = world.view
+/proc/getviewsize(view = world.view)
+	SHOULD_BE_PURE(TRUE)
 
 	if(isnum(view))
+		//resetting back to 0- this is the same as just checking !view but we want to be clear the point of the check.
+		if(view == 0)
+			return list(0, 0)
 		var/totalviewrange = (view < 0 ? -1 : 1) + 2 * view
 		return list(totalviewrange, totalviewrange)
 	else

code/_onclick/hud/action_button.dm

@@ -110,32 +110,37 @@
 	last_hovored_ref = null
 	if(!can_use(usr))
 		return
+
 	var/datum/hud/our_hud = usr.hud_used
 	if(over_object == src)
 		our_hud.hide_landings()
 		return
+
 	if(istype(over_object, /atom/movable/screen/action_landing))
 		var/atom/movable/screen/action_landing/reserve = over_object
 		reserve.hit_by(src)
-		our_hud.hide_landings()
 		save_position()
+		our_hud.hide_landings()
 		return
 
-	our_hud.hide_landings()
 	if(istype(over_object, /atom/movable/screen/button_palette) || istype(over_object, /atom/movable/screen/palette_scroll))
 		our_hud.position_action(src, SCRN_OBJ_IN_PALETTE)
 		save_position()
+		our_hud.hide_landings()
 		return
+
 	if(istype(over_object, /atom/movable/screen/movable/action_button))
 		var/atom/movable/screen/movable/action_button/button = over_object
 		our_hud.position_action_relative(src, button)
 		save_position()
+		our_hud.hide_landings()
 		return
 
 	. = ..()
 
 	our_hud.position_action(src, screen_loc)
 	save_position()
+	our_hud.hide_landings()
 
 /atom/movable/screen/movable/action_button/proc/save_position()
 	var/mob/user = our_hud.mymob
@@ -290,6 +295,7 @@
 /atom/movable/screen/button_palette/proc/set_hud(datum/hud/our_hud)
 	src.our_hud = our_hud
 	refresh_owner()
+	disable_landing() // If our hud already has elements, don't force hide us
 
 /atom/movable/screen/button_palette/update_name(updates)
 	. = ..()
@@ -311,6 +317,15 @@
 
 	icon_state = "[ui_name]_palette"
 
+/atom/movable/screen/button_palette/proc/activate_landing()
+	// Reveal ourselves to the user
+	invisibility = INVISIBILITY_NONE
+
+/atom/movable/screen/button_palette/proc/disable_landing()
+	// If we have no elements in the palette, hide your ugly self please
+	if (!length(our_hud.palette_actions?.actions))
+		invisibility = INVISIBILITY_ABSTRACT
+
 /atom/movable/screen/button_palette/MouseEntered(location, control, params)
 	. = ..()
 	if(QDELETED(src))

code/_onclick/hud/ai.dm

@@ -174,6 +174,66 @@
 	var/mob/living/silicon/ai/AI = usr
 	AI.drop_new_multicam()
 
+/atom/movable/screen/ai/floor_indicator
+	icon_state = "zindicator"
+	screen_loc = ui_ai_floor_indicator
+
+/atom/movable/screen/ai/floor_indicator/Initialize(mapload, datum/hud/hud_owner)
+	. = ..()
+	if(istype(hud_owner))
+		RegisterSignal(hud_owner, COMSIG_HUD_OFFSET_CHANGED, PROC_REF(update_z))
+		update_z()
+
+/atom/movable/screen/ai/floor_indicator/proc/update_z(datum/hud/source)
+	SIGNAL_HANDLER
+	var/mob/living/silicon/ai/ai = get_mob() //if you use this for anyone else i will find you
+	if(isnull(ai))
+		return
+	var/turf/locturf = isturf(ai.loc) ? get_turf(ai.eyeobj) : get_turf(ai) //must be a var cuz error
+	var/ai_z = locturf.z
+	var/text = "Level<br/>[ai_z]"
+	if(SSmapping.level_trait(ai_z, ZTRAIT_STATION))
+		text = "Floor<br/>[ai_z - 1]"
+	else if (SSmapping.level_trait(ai_z, ZTRAIT_NOPHASE))
+		text = "ERROR"
+	maptext = MAPTEXT_TINY_UNICODE("<div align='center' valign='middle' style='position:relative; top:0px; left:0px'>[text]</div>")
+
+/atom/movable/screen/ai/go_up
+	name = "go up"
+	icon_state = "up"
+	screen_loc = ui_ai_godownup
+
+/atom/movable/screen/ai/go_up/Initialize(mapload)
+	. = ..()
+	register_context()
+
+/atom/movable/screen/ai/go_up/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	context[SCREENTIP_CONTEXT_LMB] = "Go up a floor"
+	return CONTEXTUAL_SCREENTIP_SET
+
+/atom/movable/screen/ai/go_up/Click(location,control,params)
+	var/mob/ai = get_mob() //the core
+	flick("uppressed",src)
+	if(!isturf(ai.loc) || usr != ai) //aicard and stuff
+		return
+	ai.up()
+
+/atom/movable/screen/ai/go_up/down
+	name = "go down"
+	icon_state = "down"
+
+/atom/movable/screen/ai/go_up/down/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	context[SCREENTIP_CONTEXT_LMB] = "Go down a floor"
+	return CONTEXTUAL_SCREENTIP_SET
+
+/atom/movable/screen/ai/go_up/down/Click(location,control,params)
+	var/mob/ai = get_mob() //the core
+	flick("downpressed",src)
+	if(!isturf(ai.loc) || usr != ai) //aicard and stuff
+		return
+	ai.down()
 
 /datum/hud/ai
 	ui_style = 'icons/hud/screen_ai.dmi'
@@ -188,6 +248,14 @@
 	using.screen_loc = ui_ai_language_menu
 	static_inventory += using
 
+// Z-level floor change
+	using = new /atom/movable/screen/ai/floor_indicator(null, src) //These come with their own predefined screen locs
+	static_inventory += using
+	using = new /atom/movable/screen/ai/go_up(null, src)
+	static_inventory += using
+	using = new /atom/movable/screen/ai/go_up/down(null, src)
+	static_inventory += using
+
 //AI core
 	using = new /atom/movable/screen/ai/aicore(null, src)
 	using.screen_loc = ui_ai_core

code/_onclick/hud/alien.dm

@@ -39,13 +39,13 @@
 	using = new /atom/movable/screen/swap_hand(null, src)
 	using.icon = ui_style
 	using.icon_state = "swap_1"
-	using.screen_loc = ui_swaphand_position(owner,1)
+	using.screen_loc = ui_swaphand_position(owner, 1)
 	static_inventory += using
 
 	using = new /atom/movable/screen/swap_hand(null, src)
 	using.icon = ui_style
 	using.icon_state = "swap_2"
-	using.screen_loc = ui_swaphand_position(owner,2)
+	using.screen_loc = ui_swaphand_position(owner, 2)
 	static_inventory += using
 
 	action_intent = new /atom/movable/screen/combattoggle/flashy(null, src)
@@ -59,6 +59,11 @@
 		H.leap_icon.screen_loc = ui_alien_storage_r
 		static_inventory += H.leap_icon
 
+	floor_change = new /atom/movable/screen/floor_changer(null, src)
+	floor_change.icon = ui_style
+	floor_change.screen_loc = ui_alien_floor_change
+	static_inventory += floor_change
+
 	using = new/atom/movable/screen/language_menu(null, src)
 	using.screen_loc = ui_alien_language_menu
 	static_inventory += using
@@ -72,10 +77,11 @@
 	using.screen_loc = ui_drop_throw
 	static_inventory += using
 
-	using = new /atom/movable/screen/resist(null, src)
-	using.icon = ui_style
-	using.screen_loc = ui_above_movement
-	hotkeybuttons += using
+	resist_icon = new /atom/movable/screen/resist(null, src)
+	resist_icon.icon = ui_style
+	resist_icon.screen_loc = ui_above_movement
+	resist_icon.update_appearance()
+	hotkeybuttons += resist_icon
 
 	throw_icon = new /atom/movable/screen/throw_catch(null, src)
 	throw_icon.icon = ui_style
@@ -90,10 +96,14 @@
 
 	rest_icon = new /atom/movable/screen/rest(null, src)
 	rest_icon.icon = ui_style
-	rest_icon.screen_loc = ui_above_intent
+	rest_icon.screen_loc = ui_rest
 	rest_icon.update_appearance()
 	static_inventory += rest_icon
 
+	sleep_icon = new /atom/movable/screen/sleep(null, src)
+	sleep_icon.icon = ui_style
+	sleep_icon.screen_loc = ui_above_throw
+
 //begin indicators
 
 	healths = new /atom/movable/screen/healths/alien(null, src)