mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-11 08:06:33 +01:00
SmArtKar
8eed335b94
## About The Pull Request Completely removes individual inventory UI handling from mob and HUD code and moves it to slot datums. ``/datum/inventory_slot`` now is responsible for displaying items on the player UI and does so through vis_contests as opposed to screen_loc - which ensures that wide items will display properly rather than be offset to the right. Centralized, slot_id based handling allows us to significantly simplify inventory and HUD code (see how many lines were removed) as you no longer need to individually track all items for both the HUD owner and the observer, and makes it easier for us to fully datumize inventory handling in the future. Also fixes a bug where observers would see players' storage UI and have the items linger on-screen after its closed. ## Why It's Good For The Game Makes working with inventories and HUDs easier, fixes visual issues with wide items, I need this for human rendering refactors. ## Changelog 🆑 refactor: Refactors inventory UI to be completely datum and vis_contents-based fix: Observers should no longer see doubled up inventory UIs /🆑 --------- Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
178 lines
6.1 KiB
Plaintext
178 lines
6.1 KiB
Plaintext
/// Datum tracker for storage UI
|
|
/datum/storage_interface
|
|
/// UI elements for this theme
|
|
var/atom/movable/screen/close/closer
|
|
var/atom/movable/screen/storage/cell/cells
|
|
var/atom/movable/screen/storage/corner/corner_top_left
|
|
var/atom/movable/screen/storage/corner/top_right/corner_top_right
|
|
var/atom/movable/screen/storage/corner/bottom_left/corner_bottom_left
|
|
var/atom/movable/screen/storage/corner/bottom_right/corner_bottom_right
|
|
var/atom/movable/screen/storage/rowjoin/rowjoin_left
|
|
var/atom/movable/screen/storage/rowjoin/right/rowjoin_right
|
|
|
|
/// Storage that owns us
|
|
var/datum/storage/parent_storage
|
|
|
|
/datum/storage_interface/New(ui_style, datum/storage/parent_storage, mob/user)
|
|
..()
|
|
src.parent_storage = parent_storage
|
|
var/datum/hud/owner_hud = user.hud_used
|
|
closer = new(null, owner_hud, parent_storage)
|
|
cells = new(null, owner_hud, parent_storage)
|
|
corner_top_left = new(null, owner_hud, parent_storage)
|
|
corner_top_right = new(null, owner_hud, parent_storage)
|
|
corner_bottom_left = new(null, owner_hud, parent_storage)
|
|
corner_bottom_right = new(null, owner_hud, parent_storage)
|
|
rowjoin_left = new(null, owner_hud, parent_storage)
|
|
rowjoin_right = new(null, owner_hud, parent_storage)
|
|
for (var/atom/movable/screen/ui_elem as anything in list_ui_elements(initializing = TRUE))
|
|
ui_elem.icon = ui_style
|
|
|
|
/// Returns all UI elements under this theme
|
|
/datum/storage_interface/proc/list_ui_elements(initializing = FALSE)
|
|
return list(cells, corner_top_left, corner_top_right, corner_bottom_left, corner_bottom_right, rowjoin_left, rowjoin_right, closer)
|
|
|
|
/datum/storage_interface/Destroy(force)
|
|
QDEL_NULL(closer)
|
|
QDEL_NULL(cells)
|
|
QDEL_NULL(corner_top_left)
|
|
QDEL_NULL(corner_top_right)
|
|
QDEL_NULL(corner_bottom_left)
|
|
QDEL_NULL(corner_bottom_right)
|
|
QDEL_NULL(rowjoin_left)
|
|
QDEL_NULL(rowjoin_right)
|
|
parent_storage = null
|
|
return ..()
|
|
|
|
/// Updates position of all UI elements
|
|
/datum/storage_interface/proc/update_position(
|
|
screen_start_x,
|
|
screen_pixel_x,
|
|
screen_start_y,
|
|
screen_pixel_y,
|
|
columns,
|
|
rows,
|
|
mob/user_looking,
|
|
atom/real_location,
|
|
list/datum/numbered_display/numbered_contents,
|
|
)
|
|
var/number_of_hands = user_looking.held_items.len
|
|
while(number_of_hands > user_looking.default_hand_amount)
|
|
number_of_hands /= user_looking.default_hand_amount
|
|
screen_start_y++
|
|
var/start_pixel_x = screen_start_x * 32 + screen_pixel_x
|
|
var/start_pixel_y = screen_start_y * 32 + screen_pixel_y
|
|
var/end_pixel_x = start_pixel_x + (columns - 1) * 32
|
|
var/end_pixel_y = start_pixel_y + (rows - 1) * 32
|
|
|
|
cells.screen_loc = spanning_screen_loc(start_pixel_x, start_pixel_y, end_pixel_x, end_pixel_y)
|
|
var/left_edge_loc = spanning_screen_loc(min(start_pixel_x + 32, end_pixel_x), start_pixel_y, end_pixel_x, end_pixel_y)
|
|
var/right_edge_loc = spanning_screen_loc(start_pixel_x, start_pixel_y, max(start_pixel_x, end_pixel_x - 32), end_pixel_y)
|
|
corner_top_left.screen_loc = left_edge_loc
|
|
corner_bottom_left.screen_loc = left_edge_loc
|
|
corner_top_right.screen_loc = right_edge_loc
|
|
corner_bottom_right.screen_loc = right_edge_loc
|
|
|
|
var/row_left_loc = spanning_screen_loc(start_pixel_x, start_pixel_y + 27, start_pixel_x, start_pixel_y + 27 + max(0, rows - 2) * 32)
|
|
rowjoin_left.screen_loc = row_left_loc
|
|
rowjoin_left.alpha = (rows > 1) * 255
|
|
|
|
var/row_right_loc = spanning_screen_loc(end_pixel_x, start_pixel_y + 27, end_pixel_x, start_pixel_y + 27 + max(0, rows - 2) * 32)
|
|
rowjoin_right.screen_loc = row_right_loc
|
|
rowjoin_right.alpha = (rows > 1) * 255
|
|
|
|
closer.screen_loc = "[screen_start_x + columns]:[screen_pixel_x - 5],[screen_start_y]:[screen_pixel_y]"
|
|
|
|
add_items(arglist(args))
|
|
|
|
/datum/storage_interface/proc/add_items(
|
|
screen_start_x,
|
|
screen_pixel_x,
|
|
screen_start_y,
|
|
screen_pixel_y,
|
|
columns,
|
|
rows,
|
|
mob/user_looking,
|
|
atom/real_location,
|
|
list/datum/numbered_display/numbered_contents,
|
|
)
|
|
|
|
var/current_x = screen_start_x
|
|
var/current_y = screen_start_y
|
|
var/turf/our_turf = get_turf(real_location)
|
|
|
|
var/list/obj/storage_contents = list()
|
|
if (islist(numbered_contents))
|
|
for(var/content_type in numbered_contents)
|
|
var/datum/numbered_display/numberdisplay = numbered_contents[content_type]
|
|
storage_contents[numberdisplay.sample_object] = MAPTEXT("<font color='white'>[(numberdisplay.number > 1)? "[numberdisplay.number]" : ""]</font>")
|
|
else
|
|
for(var/obj/item as anything in real_location)
|
|
storage_contents[item] = ""
|
|
|
|
for(var/obj/item as anything in storage_contents)
|
|
item.mouse_opacity = MOUSE_OPACITY_OPAQUE
|
|
item.screen_loc = "[current_x]:[screen_pixel_x + item.base_pixel_x],[current_y]:[screen_pixel_y + item.base_pixel_y]"
|
|
if(parent_storage.numerical_stacking)
|
|
item.maptext = storage_contents[item]
|
|
SET_PLANE(item, ABOVE_HUD_PLANE, our_turf)
|
|
current_x++
|
|
if(current_x - screen_start_x < columns)
|
|
continue
|
|
current_x = screen_start_x
|
|
|
|
current_y++
|
|
if(current_y - screen_start_y >= rows)
|
|
break
|
|
|
|
///Silicon subtype of storage interface used by their model storage.
|
|
/datum/storage_interface/silicon
|
|
var/obj/item/robot_model/robot_model
|
|
|
|
/datum/storage_interface/silicon/New(ui_style, datum/storage/parent_storage, mob/user)
|
|
. = ..()
|
|
robot_model = parent_storage.real_location
|
|
|
|
/datum/storage_interface/silicon/add_items(
|
|
screen_start_x,
|
|
screen_pixel_x,
|
|
screen_start_y,
|
|
screen_pixel_y,
|
|
columns,
|
|
rows,
|
|
mob/user_looking,
|
|
atom/real_location,
|
|
list/datum/numbered_display/numbered_contents,
|
|
)
|
|
var/list/usable_modules = robot_model.get_usable_modules()
|
|
|
|
var/current_x = screen_start_x
|
|
var/current_y = screen_start_y
|
|
var/turf/our_turf = get_turf(real_location)
|
|
|
|
for(var/i in 1 to length(usable_modules))
|
|
var/atom/movable/item = usable_modules[i]
|
|
if(item in robot_model.robot.held_items)
|
|
current_x++
|
|
if(current_x - screen_start_x < columns)
|
|
continue
|
|
current_x = screen_start_x
|
|
|
|
current_y++
|
|
if(current_y - screen_start_y >= rows)
|
|
break
|
|
//Module is currently active
|
|
continue
|
|
|
|
item.mouse_opacity = MOUSE_OPACITY_OPAQUE
|
|
SET_PLANE(item, ABOVE_HUD_PLANE, our_turf)
|
|
item.screen_loc = "[current_x]:[screen_pixel_x],[current_y]:[screen_pixel_y]"
|
|
|
|
current_x++
|
|
if(current_x - screen_start_x < columns)
|
|
continue
|
|
current_x = screen_start_x
|
|
current_y++
|
|
if(current_y - screen_start_y >= rows)
|
|
break
|