From 50689f89a40e5e7a2732a0c5fb38c787b69f7d28 Mon Sep 17 00:00:00 2001
From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Date: Thu, 31 Mar 2022 13:40:20 -0700
Subject: [PATCH] Action button refactor/rework: Enhanced Dragging (#65180)
About The Pull Request
I noticed a lot of strange and un-intuitive behavior in action buttons, and got stung by the bloat bug. Damn it hug #58027
I'll do my best to explain what I've changed and why, might get a bit long.
If you want a better idea, read the commits. Most of em are pretty solid, if long.
Whelp. Here we go.
How do action buttons currently work
All action buttons are draggable, to any place on the screen. They're held in an actions list on the player's mob.
Their location in this list determines their position on the top of the screen. If one is dragged away from the top, its position in the list is "saved". This looks really bad.
If two buttons are dragged over each other, their positions swap. (inside the actions list too)
If a button is shift clicked, it is brought back to the position it started at.
If the action collapse button that you likely just mentally edit out is alt clicked, it resets the position of all action buttons on the screen.
If an action is ctrl clicked, it is "locked". This prevents any future position changes, and also enables a saving feature. With this saving feature, locked button positions persist between rounds. So your first o2 canister will always start where you saved it, etc.
Actions and buttons are a one to one link. While there is functionality to share action buttons between two players, this means showing the same object to both. So one player can move a button on another's screen. Horrendous.
This also makes code that modifies properties of the screen object itself very clunky.
Why is this bad
A: None knew pretty much any of this information. It is actually documented, just in a horribly formatted screen tip on the collapse button, you know the one we all mentally delete from the hud.
B: None of this is intuitive. Dragging buttons makes the hud look much worse, and you get no feedback that you even can drag them. Depressing
C: We use actions to make new options clear to the player. This means players can have a lot of action buttons on the hud. This gets cluttery
D: The collapse button is useless. It lets you clear your screen if someone like me fucks up and gives you 2000 actions, but outside of that it just hides all information from you. You never want to see none of your action buttons, just a filtered list of them.
E: On a technical level, they're quite messy, and not fully functionally complete. This is depressing.
What I've done
Assuming the above to be true, how do we fix them?
Well first I'm going to go over everything I changed, including links to major commits. I'll then describe the finished product, and why I made the decisions I did.
Oh and I've moved some of the more niche or technical discussion to dropdowns. Hopefully this makes finding the major functional changes easier
Adds helper procs for turning screen_loc strings into more manageable arrays. This doesn't fully support all of the screen_loc spec, but it's enough for what I'm doing. (f54865f)
Uses these helper procs to improve existing code (6273b93)
Fixes an issue with tooltip code itself. If you tried to hold down a mouse button while dragging onto a tooltip enabled object, it would silently fail. The js made assumptions about the order args came in, which broke when buttons were held down (e0e42f6)
Adds a signal linked to /client/Click(). Surprised we didn't have this before honestly (c491a4a)
Makes /client/MouseDrag() return parent. If we don't do this, any overrides of MouseDrag will never actually be called (2190b2a)
Refactors how action buttons work under the hood (53ccce2)
Basically, rather then generating one button per action, we generate one button per viewer
Starts to change button behavior, more cleanup
Changes the mouse cursor when an action button is dragged. Hopefully
this makes moving things feel less like an accident, and makes you doing
it more clear
Removes the moved and locked vars. This will be more relevant later, but
for now:
Moved exists as a sort of budget "We've been dragged" variable. We can
handle this more cleanly, and the movable type doesn't care about it
Locked is a very old variable that is also not something that the
movable type "owns". It's more an action button thing that's been moved
down.
It exists so an action can be locked in place, and in that locking, be
treated as a "saved location"
(21e20fc)
Because I've nuked move, we don't need to directly set our button's
position. We can use the default_button_position var instead. This is
quite handy.
Please ignore position_action, I will explain that later
(83e265e)
Removes the buttons locked pref
It was another obscure part of action buttons, basically do buttons
start "locked" or not. See previous discussion of locked
(b58b1bd)
Major rework starts here
Alright. Sorry for this, this is where me not commiting regularly starts
to suck. I'll do my best though.
Rather then figuring out an action button's position via a combination
of the moved and ordered vars, we use a separate location var to store
one of a few defines. This makes life later much easier.
Adds tooltip support for dragging action buttons. The way the tooltip
just froze in place when dragging really bugged me, and lead to some
nasty visual artifacts.
This is a bit messy because the drag procs are horrible, but it's
workable
Dropping a button on another button will no longer swap their positions
Behavior instead depends on the target button.
If it's a part of a group (A concept I will explain later) the dragged
button is simply inserted before it in the group's list.
If it's floating on the general hud, we instead position the dragged
button to its right. There's extra logic here to ensure buttons will
never overflow the screen, but I'll get into that later.
Alright. That's most of the refactoring. Time for the larger behavior
changes.
Adds a button palette. This is a separate dropdown that renders
underneath buttons.
image
The idea is to allow for a conceptual separation between "important"
buttons and the ones that end up cluttering the screen.
You can click on the dropdown to open it, then any later clicks that
don't involve actions in some way will autoclose it.
My goal is to come up with an alternative for the action button that
just acted as a way to hide all buttons on screen. Not convinced it saw
much use.
As a side effect of removing that, I've moved its tooltip stuff to the
palette. I've properly formatted it, so hopefully it's easier to read
then the jumble that we used to have.
(You can alt click the palette button to reset all button positions)
Oh and the palette can scroll, since as you'll see later it has a
limited size.
image
Moving on from that, I've added what amounts to action landing buttons.
These allow buttons to rejoin groups, or be positioned at the end of a
line of buttons.
image
They've got a 32x32 hitbox, and only show up when dragging. Hopefully
this makes the system more clear just by dragging an action.
Oh and I've changed how button position updating works. The old system
of calling update_action_buttons on mob every time an action button
changes position is gone, mostly because I've setup more robust
grouping. Will discuss when I get to huds
(0d1e93f)
Adds the backbone behind action button position changes (94133bd)
Moves hud defines to the global folder, safer this way (7260117)
Adds color changing to the palette button, giving some heads up for buttons being inserted into the palette automatically
image
image
Ensures a landing button is always shown, even if it needs to break the
max row rule
Makes palettes auto contract if they have no buttons inside them
Prevents palettes from being opened if they have no buttons inside them
(f9417f3)
How it looks
2022-02-26.02-30-10.mp4
Why It's Good For The Game
Players have more control over the clutter on their screen.
Buttons are available, but not in the way,
Since any player move of a button saves it, any lack of clarity in the way buttons work will be forced out by buttons not just resetting when a new game starts.
We don't overlap any existing screen elements, unless the upper button list gets really long.
The code is much less crummy (I think, may have made it worse it's hard for me to judge my own work)
If it ends up not being as usable as I'd like, I'll rip out the existing changes and just implement the qol and backend stuff. I think it's worth doing though.
Changelog
cl
add: Expanded heavily on action buttons
add: Adds an action button dropdown that sits just under the normal list in the top left. You can drag new buttons onto it to insert them. Click on it to show its contents, do what you want to do, then click again anywhere to contract it. Alt click it to reset all button positions
add: Action buttons will now remember their position between rounds. So if you really like your flashlight right next to your player for some reason, we support that now
add: When you start to drag an action button, docking ports will appear in places that it can be inserted into. (Outside of just floating somewhere on your screen of course)
del: Removed action button locking, and the associated preference. I'm reasonably sure literally none uses this, but if you do hit me up
qol: Dragging an action button will now give you an outline of its size around your cursor
fix: You can no longer cause the screen to expand by putting an action button on the edge of widescreen, and then resizing to standard.
refactor: Refactors action and button code significantly. lots of little things.
/cl
---
.../signals_atom/signals_atom_mouse.dm | 6 +-
code/__DEFINES/hud.dm | 199 +++++++
code/__HELPERS/screen_objs.dm | 91 ++++
code/__HELPERS/view.dm | 9 +
code/_onclick/drag_drop.dm | 16 +-
code/_onclick/hud/_defines.dm | 180 -------
code/_onclick/hud/action_button.dm | 508 ++++++++++++------
code/_onclick/hud/hud.dm | 341 +++++++++++-
code/_onclick/hud/movable_screen_objects.dm | 37 +-
code/_onclick/hud/screentip.dm | 2 +-
code/controllers/subsystem/augury.dm | 6 +-
code/datums/action.dm | 260 ++++-----
code/datums/brain_damage/imaginary_friend.dm | 2 +-
code/datums/components/admin_popup.dm | 2 +-
code/datums/components/riding/riding_mob.dm | 4 +-
code/datums/mind.dm | 2 +-
code/datums/view.dm | 10 +-
code/game/objects/items.dm | 2 +-
code/game/objects/items/granters.dm | 4 +-
.../objects/structures/deployable_turret.dm | 2 +-
.../SDQL2/SDQL_spells/spell_edit_menu.dm | 4 +-
.../changeling/cellular_emporium.dm | 1 -
.../changeling/powers/fakedeath.dm | 4 +-
code/modules/antagonists/cult/blood_magic.dm | 45 +-
code/modules/antagonists/cult/cult_items.dm | 3 +-
.../heretic/heretic_living_heart.dm | 2 +-
.../revenant/revenant_abilities.dm | 2 +-
.../traitor/equipment/Malf_Modules.dm | 22 +-
.../traitor/equipment/module_picker.dm | 2 +-
code/modules/client/client_defines.dm | 13 +-
code/modules/client/client_procs.dm | 4 +-
.../client/preferences/buttons_locked.dm | 5 -
code/modules/clothing/chameleon.dm | 18 +-
.../carbon/alien/humanoid/alien_powers.dm | 4 +-
.../carbon/human/species_types/golems.dm | 4 +-
.../carbon/human/species_types/jellypeople.dm | 10 +-
code/modules/mob/living/living.dm | 2 +-
.../mob/living/silicon/robot/robot_model.dm | 6 +-
.../mob/living/simple_animal/constructs.dm | 15 +-
.../simple_animal/hostile/giant_spider.dm | 6 +-
.../hostile/mining_mobs/elites/elite.dm | 14 +-
code/modules/mod/mod_actions.dm | 10 +-
code/modules/power/singularity/emitter.dm | 4 +-
.../projectiles/guns/energy/beam_rifle.dm | 8 +-
code/modules/projectiles/projectile.dm | 8 +-
code/modules/spells/spell.dm | 12 +-
code/modules/spells/spell_types/aimed.dm | 2 +-
.../spells/spell_types/pointed/pointed.dm | 2 +-
.../spells/spell_types/touch_attacks.dm | 2 +-
code/modules/surgery/dental_implant.dm | 3 +-
code/modules/tooltip/tooltip.dm | 4 +-
code/modules/tooltip/tooltip.html | 30 +-
code/modules/vehicles/mecha/combat/durand.dm | 2 +-
code/modules/vehicles/mecha/combat/gygax.dm | 2 +-
.../modules/vehicles/mecha/combat/marauder.dm | 2 +-
code/modules/vehicles/mecha/combat/phazon.dm | 4 +-
.../vehicles/mecha/combat/savannah_ivanov.dm | 10 +-
code/modules/vehicles/mecha/mecha_actions.dm | 6 +-
code/modules/vehicles/mecha/working/clarke.dm | 4 +-
.../wiremod/shell/brain_computer_interface.dm | 19 +-
icons/effects/mouse_pointers/screen_drag.dmi | Bin 0 -> 326 bytes
icons/hud/64x16_actions.dmi | Bin 0 -> 3404 bytes
icons/hud/actions.dmi | Bin 9016 -> 8753 bytes
icons/hud/screen_ai.dmi | Bin 2543 -> 6429 bytes
icons/hud/screen_alien.dmi | Bin 19547 -> 20520 bytes
icons/hud/screen_clockwork.dmi | Bin 18064 -> 18821 bytes
icons/hud/screen_cyborg.dmi | Bin 25712 -> 27032 bytes
icons/hud/screen_gen.dmi | Bin 109613 -> 110937 bytes
icons/hud/screen_glass.dmi | Bin 14147 -> 14899 bytes
icons/hud/screen_midnight.dmi | Bin 28341 -> 29147 bytes
icons/hud/screen_operative.dmi | Bin 30909 -> 31838 bytes
icons/hud/screen_pai.dmi | Bin 2209 -> 2531 bytes
icons/hud/screen_plasmafire.dmi | Bin 29797 -> 30583 bytes
icons/hud/screen_retro.dmi | Bin 12833 -> 13728 bytes
icons/hud/screen_slimecore.dmi | Bin 28294 -> 29064 bytes
tgstation.dme | 3 +-
76 files changed, 1310 insertions(+), 696 deletions(-)
create mode 100644 code/__HELPERS/screen_objs.dm
delete mode 100644 code/_onclick/hud/_defines.dm
delete mode 100644 code/modules/client/preferences/buttons_locked.dm
create mode 100644 icons/effects/mouse_pointers/screen_drag.dmi
create mode 100644 icons/hud/64x16_actions.dmi
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm
index 261c13c6673..2f8ebc83665 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_mouse.dm
@@ -1,8 +1,10 @@
-// Atom mouse signals. Format:
+// mouse signals. Format:
// When the signal is called: (signal arguments)
// All signals send the source datum of the signal as the first argument
-///from base of atom/Click(): (location, control, params, mob/user)
+///from base of client/Click(): (atom/target, atom/location, control, params, mob/user)
+#define COMSIG_CLIENT_CLICK "atom_client_click"
+///from base of atom/Click(): (atom/location, control, params, mob/user)
#define COMSIG_CLICK "atom_click"
///from base of atom/ShiftClick(): (/mob)
#define COMSIG_CLICK_SHIFT "shift_click"
diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm
index 60b7c308be4..200c152630b 100644
--- a/code/__DEFINES/hud.dm
+++ b/code/__DEFINES/hud.dm
@@ -14,3 +14,202 @@
#define APPEARANCE_UI_IGNORE_ALPHA (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE)
/// Used for HUD objects
#define APPEARANCE_UI (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|PIXEL_SCALE)
+
+/*
+ These defines specificy screen locations. For more information, see the byond documentation on the screen_loc var.
+
+ The short version:
+
+ Everything is encoded as strings because apparently that's how Byond rolls.
+
+ "1,1" is the bottom left square of the user's screen. This aligns perfectly with the turf grid.
+ "1:2,3:4" is the square (1,3) with pixel offsets (+2, +4); slightly right and slightly above the turf grid.
+ Pixel offsets are used so you don't perfectly hide the turf under them, that would be crappy.
+
+ In addition, the keywords NORTH, SOUTH, EAST, WEST and CENTER can be used to represent their respective
+ screen borders. NORTH-1, for example, is the row just below the upper edge. Useful if you want your
+ UI to scale with screen size.
+
+ The size of the user's screen is defined by client.view (indirectly by world.view), in our case "15x15".
+ 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"
+
+//Middle left indicators
+#define ui_lingchemdisplay "WEST,CENTER-1:15"
+#define ui_lingstingdisplay "WEST:6,CENTER-3:11"
+
+//Lower center, persistent menu
+#define ui_sstore1 "CENTER-5:10,SOUTH:5"
+#define ui_id "CENTER-4:12,SOUTH:5"
+#define ui_belt "CENTER-3:14,SOUTH:5"
+#define ui_back "CENTER-2:14,SOUTH:5"
+#define ui_storage1 "CENTER+1:18,SOUTH:5"
+#define ui_storage2 "CENTER+2:20,SOUTH:5"
+#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_above_movement "EAST-2:26,SOUTH+1:7"
+#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"
+#define ui_combat_toggle "EAST-3:24,SOUTH:5"
+#define ui_zonesel "EAST-1:28,SOUTH:5"
+#define ui_acti_alt "EAST-1:28,SOUTH:5" //alternative intent switcher for when the interface is hidden (F12)
+#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_skill_menu "EAST-4:22,SOUTH:5"
+
+//Upper-middle right (alerts)
+#define ui_alert1 "EAST-1:28,CENTER+5:27"
+#define ui_alert2 "EAST-1:28,CENTER+4:25"
+#define ui_alert3 "EAST-1:28,CENTER+3:23"
+#define ui_alert4 "EAST-1:28,CENTER+2:21"
+#define ui_alert5 "EAST-1:28,CENTER+1:19"
+
+//Upper left (action buttons)
+#define ui_action_palette "WEST+0:23,NORTH-1:5"
+#define ui_action_palette_offset(north_offset) ("WEST+0:23,NORTH-[1+north_offset]:5")
+
+#define ui_palette_scroll "WEST+1:8,NORTH-6:28"
+#define ui_palette_scroll_offset(north_offset) ("WEST+1:8,NORTH-[6+north_offset]:28")
+
+//Middle right (status indicators)
+#define ui_healthdoll "EAST-1:28,CENTER-2:13"
+#define ui_health "EAST-1:28,CENTER-1:15"
+#define ui_internal "EAST-1:28,CENTER+1:17"
+#define ui_mood "EAST-1:28,CENTER:17"
+#define ui_spacesuit "EAST-1:28,CENTER-4:10"
+#define ui_stamina "EAST-1:28,CENTER-3:10"
+
+//Pop-up inventory
+#define ui_shoes "WEST+1:8,SOUTH:5"
+#define ui_iclothing "WEST:6,SOUTH+1:7"
+#define ui_oclothing "WEST+1:8,SOUTH+1:7"
+#define ui_gloves "WEST+2:10,SOUTH+1:7"
+#define ui_glasses "WEST:6,SOUTH+3:11"
+#define ui_mask "WEST+1:8,SOUTH+2:9"
+#define ui_ears "WEST+2:10,SOUTH+2:9"
+#define ui_neck "WEST:6,SOUTH+2:9"
+#define ui_head "WEST+1:8,SOUTH+3:11"
+
+//Generic living
+#define ui_living_pull "EAST-1:28,CENTER-3:15"
+#define ui_living_healthdoll "EAST-1:28,CENTER-1:15"
+
+//Monkeys
+#define ui_monkey_head "CENTER-5:13,SOUTH:5"
+#define ui_monkey_mask "CENTER-4:14,SOUTH:5"
+#define ui_monkey_neck "CENTER-3:15,SOUTH:5"
+#define ui_monkey_back "CENTER-2:16,SOUTH:5"
+
+//Drones
+#define ui_drone_drop "CENTER+1:18,SOUTH:5"
+#define ui_drone_pull "CENTER+2:2,SOUTH:5"
+#define ui_drone_storage "CENTER-2:14,SOUTH:5"
+#define ui_drone_head "CENTER-3:14,SOUTH:5"
+
+//Cyborgs
+#define ui_borg_health "EAST-1:28,CENTER-1:15"
+#define ui_borg_pull "EAST-2:26,SOUTH+1:7"
+#define ui_borg_radio "EAST-1:28,SOUTH+1:7"
+#define ui_borg_intents "EAST-2:26,SOUTH:5"
+#define ui_borg_lamp "CENTER-3:16, SOUTH:5"
+#define ui_borg_tablet "CENTER-4:16, SOUTH:5"
+#define ui_inv1 "CENTER-2:16,SOUTH:5"
+#define ui_inv2 "CENTER-1 :16,SOUTH:5"
+#define ui_inv3 "CENTER :16,SOUTH:5"
+#define ui_borg_module "CENTER+1:16,SOUTH:5"
+#define ui_borg_store "CENTER+2:16,SOUTH:5"
+#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"
+
+//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"
+
+//AI
+#define ui_ai_core "SOUTH:6,WEST"
+#define ui_ai_camera_list "SOUTH:6,WEST+1"
+#define ui_ai_track_with_camera "SOUTH:6,WEST+2"
+#define ui_ai_camera_light "SOUTH:6,WEST+3"
+#define ui_ai_crew_monitor "SOUTH:6,WEST+4"
+#define ui_ai_crew_manifest "SOUTH:6,WEST+5"
+#define ui_ai_alerts "SOUTH:6,WEST+6"
+#define ui_ai_announcement "SOUTH:6,WEST+7"
+#define ui_ai_shuttle "SOUTH:6,WEST+8"
+#define ui_ai_state_laws "SOUTH:6,WEST+9"
+#define ui_ai_pda_send "SOUTH:6,WEST+10"
+#define ui_ai_pda_log "SOUTH:6,WEST+11"
+#define ui_ai_take_picture "SOUTH:6,WEST+12"
+#define ui_ai_view_images "SOUTH:6,WEST+13"
+#define ui_ai_sensor "SOUTH:6,WEST+14"
+#define ui_ai_multicam "SOUTH+1:6,WEST+13"
+#define ui_ai_add_multicam "SOUTH+1:6,WEST+14"
+#define ui_ai_language_menu "SOUTH+1:8,WEST+11:30"
+
+//pAI
+#define ui_pai_software "SOUTH:6,WEST"
+#define ui_pai_shell "SOUTH:6,WEST+1"
+#define ui_pai_chassis "SOUTH:6,WEST+2"
+#define ui_pai_rest "SOUTH:6,WEST+3"
+#define ui_pai_light "SOUTH:6,WEST+4"
+#define ui_pai_newscaster "SOUTH:6,WEST+5"
+#define ui_pai_host_monitor "SOUTH:6,WEST+6"
+#define ui_pai_crew_manifest "SOUTH:6,WEST+7"
+#define ui_pai_state_laws "SOUTH:6,WEST+8"
+#define ui_pai_pda_send "SOUTH:6,WEST+9"
+#define ui_pai_pda_log "SOUTH:6,WEST+10"
+#define ui_pai_internal_gps "SOUTH:6,WEST+11"
+#define ui_pai_take_picture "SOUTH:6,WEST+12"
+#define ui_pai_view_images "SOUTH:6,WEST+13"
+#define ui_pai_radio "SOUTH:6,WEST+14"
+#define ui_pai_language_menu "SOUTH+1:8,WEST+13:31"
+
+//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"
+
+//Blobbernauts
+#define ui_blobbernaut_overmind_health "EAST-1:28,CENTER+0:19"
+
+//Families
+#define ui_wanted_lvl "NORTH,11"
+
+// Defines relating to action button positions
+
+/// Whatever the base action datum thinks is best
+#define SCRN_OBJ_DEFAULT "default"
+/// Floating somewhere on the hud, not in any predefined place
+#define SCRN_OBJ_FLOATING "floating"
+/// In the list of buttons stored at the top of the screen
+#define SCRN_OBJ_IN_LIST "list"
+/// In the collapseable palette
+#define SCRN_OBJ_IN_PALETTE "palette"
diff --git a/code/__HELPERS/screen_objs.dm b/code/__HELPERS/screen_objs.dm
new file mode 100644
index 00000000000..aa86b6d5795
--- /dev/null
+++ b/code/__HELPERS/screen_objs.dm
@@ -0,0 +1,91 @@
+/// Takes a screen loc string in the format
+/// "+-left-offset:+-pixel,+-bottom-offset:+-pixel"
+/// Where the :pixel is optional, and returns
+/// A list in the format (x_offset, y_offset)
+/// We require context to get info out of screen locs that contain relative info, so NORTH, SOUTH, etc
+/proc/screen_loc_to_offset(screen_loc, view)
+ if(!screen_loc)
+ return list(64, 64)
+ var/list/view_size = view_to_pixels(view)
+ var/x = 0
+ var/y = 0
+ // Time to parse for directional relative offsets
+ if(findtext(screen_loc, "EAST")) // If you're starting from the east, we start from the east too
+ x += view_size[1]
+ if(findtext(screen_loc, "WEST")) // HHHHHHHHHHHHHHHHHHHHHH WEST is technically a 1 tile offset from the start. Shoot me please
+ x += world.icon_size
+ if(findtext(screen_loc, "NORTH"))
+ y += view_size[2]
+ if(findtext(screen_loc, "SOUTH"))
+ y += world.icon_size
+ // Cut out everything we just parsed
+ screen_loc = cut_relative_direction(screen_loc)
+
+ var/list/x_and_y = splittext(screen_loc, ",")
+ var/list/x_pack = splittext(x_and_y[1], ":")
+ var/list/y_pack = splittext(x_and_y[2], ":")
+ x += text2num(x_pack[1]) * world.icon_size
+ y += text2num(y_pack[1]) * world.icon_size
+
+ if(length(x_pack) > 1)
+ x += text2num(x_pack[2])
+ if(length(y_pack) > 1)
+ y += text2num(y_pack[2])
+ return list(x, y)
+
+/// Takes a list in the form (x_offset, y_offset)
+/// And converts it to a screen loc string
+/// Accepts an optional view string/size to force the screen_loc around, so it can't go out of scope
+/proc/offset_to_screen_loc(x_offset, y_offset, view = null)
+ if(view)
+ var/list/view_bounds = view_to_pixels(view)
+ x_offset = clamp(x_offset, world.icon_size, view_bounds[1])
+ y_offset = clamp(y_offset, world.icon_size, view_bounds[2])
+
+ // Round with no argument is floor, so we get the non pixel offset here
+ var/x = round(x_offset / world.icon_size)
+ var/pixel_x = x_offset % world.icon_size
+ var/y = round(y_offset / world.icon_size)
+ var/pixel_y = y_offset % world.icon_size
+
+ var/list/generated_loc = list()
+ generated_loc += "[x]"
+ if(pixel_x)
+ generated_loc += ":[pixel_x]"
+ generated_loc += ",[y]"
+ if(pixel_y)
+ generated_loc += ":[pixel_y]"
+ return jointext(generated_loc, "")
+
+/**
+ * Returns a valid location to place a screen object without overflowing the viewport
+ *
+ * * target: The target location as a purely number based screen_loc string "+-left-offset:+-pixel,+-bottom-offset:+-pixel"
+ * * target_offset: The amount we want to offset the target location by. We explictly don't care about direction here, we will try all 4
+ * * view: The view variable of the client we're doing this for. We use this to get the size of the screen
+ *
+ * Returns a screen loc representing the valid location
+**/
+/proc/get_valid_screen_location(target_loc, target_offset, view)
+ var/list/offsets = screen_loc_to_offset(target_loc)
+ var/base_x = offsets[1]
+ var/base_y = offsets[2]
+
+ var/list/view_size = view_to_pixels(view)
+
+ // Bias to the right, down, left, and then finally up
+ if(base_x + target_offset < view_size[1])
+ return offset_to_screen_loc(base_x + target_offset, base_y, view)
+ if(base_y - target_offset > world.icon_size)
+ return offset_to_screen_loc(base_x, base_y - target_offset, view)
+ if(base_x - target_offset > world.icon_size)
+ return offset_to_screen_loc(base_x - target_offset, base_y, view)
+ if(base_y + target_offset < view_size[2])
+ return offset_to_screen_loc(base_x, base_y + target_offset, view)
+ stack_trace("You passed in a scren location {[target_loc]} and offset {[target_offset]} that can't be fit in the viewport Width {[view_size[1]]}, Height {[view_size[2]]}. what did you do lad")
+ return null // The fuck did you do lad
+
+/// Takes a screen_loc string and cut out any directions like NORTH or SOUTH
+/proc/cut_relative_direction(fragment)
+ var/static/regex/regex = regex(@"([A-Z])\w+", "g")
+ return regex.Replace(fragment, "")
diff --git a/code/__HELPERS/view.dm b/code/__HELPERS/view.dm
index 4a4587e1550..6a4210bc535 100644
--- a/code/__HELPERS/view.dm
+++ b/code/__HELPERS/view.dm
@@ -6,6 +6,15 @@
var/list/viewrangelist = splittext(view,"x")
return list(text2num(viewrangelist[1]), text2num(viewrangelist[2]))
+/// Takes a string or num view, and converts it to pixel width/height in a list(pixel_width, pixel_height)
+/proc/view_to_pixels(view)
+ if(!view)
+ return list(0, 0)
+ var/list/view_info = getviewsize(view)
+ view_info[1] *= world.icon_size
+ view_info[2] *= world.icon_size
+ return view_info
+
/proc/in_view_range(mob/user, atom/A)
var/list/view_range = getviewsize(user.client.view)
var/turf/source = get_turf(user)
diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm
index d8000fb81c8..d0d280dc194 100644
--- a/code/_onclick/drag_drop.dm
+++ b/code/_onclick/drag_drop.dm
@@ -92,26 +92,26 @@
if (LAZYACCESS(modifiers, MIDDLE_CLICK))
if (src_object && src_location != over_location)
middragtime = world.time
- middragatom = src_object
+ middle_drag_atom_ref = WEAKREF(src_object)
else
middragtime = 0
- middragatom = null
+ middle_drag_atom_ref = null
mouseParams = params
- mouseLocation = over_location
- mouseObject = over_object
+ mouse_location_ref = WEAKREF(over_location)
+ mouse_object_ref = WEAKREF(over_object)
if(selected_target[1] && over_object?.IsAutoclickable())
selected_target[1] = over_object
selected_target[2] = params
if(active_mousedown_item)
active_mousedown_item.onMouseDrag(src_object, over_object, src_location, over_location, params, mob)
SEND_SIGNAL(src, COMSIG_CLIENT_MOUSEDRAG, src_object, over_object, src_location, over_location, src_control, over_control, params)
-
+ return ..()
/obj/item/proc/onMouseDrag(src_object, over_object, src_location, over_location, params, mob)
return
-/client/MouseDrop(src_object, over_object, src_location, over_location, src_control, over_control, params)
- if (middragatom == src_object)
+/client/MouseDrop(atom/src_object, atom/over_object, atom/src_location, atom/over_location, src_control, over_control, params)
+ if (IS_WEAKREF_OF(src_object, middle_drag_atom_ref))
middragtime = 0
- middragatom = null
+ middle_drag_atom_ref = null
..()
diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
deleted file mode 100644
index 9f6cf589ed5..00000000000
--- a/code/_onclick/hud/_defines.dm
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- These defines specificy screen locations. For more information, see the byond documentation on the screen_loc var.
-
- The short version:
-
- Everything is encoded as strings because apparently that's how Byond rolls.
-
- "1,1" is the bottom left square of the user's screen. This aligns perfectly with the turf grid.
- "1:2,3:4" is the square (1,3) with pixel offsets (+2, +4); slightly right and slightly above the turf grid.
- Pixel offsets are used so you don't perfectly hide the turf under them, that would be crappy.
-
- In addition, the keywords NORTH, SOUTH, EAST, WEST and CENTER can be used to represent their respective
- screen borders. NORTH-1, for example, is the row just below the upper edge. Useful if you want your
- UI to scale with screen size.
-
- The size of the user's screen is defined by client.view (indirectly by world.view), in our case "15x15".
- 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))
- 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"
-
-//Middle left indicators
-#define ui_lingchemdisplay "WEST,CENTER-1:15"
-#define ui_lingstingdisplay "WEST:6,CENTER-3:11"
-
-//Lower center, persistent menu
-#define ui_sstore1 "CENTER-5:10,SOUTH:5"
-#define ui_id "CENTER-4:12,SOUTH:5"
-#define ui_belt "CENTER-3:14,SOUTH:5"
-#define ui_back "CENTER-2:14,SOUTH:5"
-#define ui_storage1 "CENTER+1:18,SOUTH:5"
-#define ui_storage2 "CENTER+2:20,SOUTH:5"
-#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_above_movement "EAST-2:26,SOUTH+1:7"
-#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"
-#define ui_combat_toggle "EAST-3:24,SOUTH:5"
-#define ui_zonesel "EAST-1:28,SOUTH:5"
-#define ui_acti_alt "EAST-1:28,SOUTH:5" //alternative intent switcher for when the interface is hidden (F12)
-#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_skill_menu "EAST-4:22,SOUTH:5"
-
-//Upper-middle right (alerts)
-#define ui_alert1 "EAST-1:28,CENTER+5:27"
-#define ui_alert2 "EAST-1:28,CENTER+4:25"
-#define ui_alert3 "EAST-1:28,CENTER+3:23"
-#define ui_alert4 "EAST-1:28,CENTER+2:21"
-#define ui_alert5 "EAST-1:28,CENTER+1:19"
-
-//Middle right (status indicators)
-#define ui_healthdoll "EAST-1:28,CENTER-2:13"
-#define ui_health "EAST-1:28,CENTER-1:15"
-#define ui_internal "EAST-1:28,CENTER+1:17"
-#define ui_mood "EAST-1:28,CENTER:17"
-#define ui_spacesuit "EAST-1:28,CENTER-4:10"
-#define ui_stamina "EAST-1:28,CENTER-3:10"
-
-//Pop-up inventory
-#define ui_shoes "WEST+1:8,SOUTH:5"
-#define ui_iclothing "WEST:6,SOUTH+1:7"
-#define ui_oclothing "WEST+1:8,SOUTH+1:7"
-#define ui_gloves "WEST+2:10,SOUTH+1:7"
-#define ui_glasses "WEST:6,SOUTH+3:11"
-#define ui_mask "WEST+1:8,SOUTH+2:9"
-#define ui_ears "WEST+2:10,SOUTH+2:9"
-#define ui_neck "WEST:6,SOUTH+2:9"
-#define ui_head "WEST+1:8,SOUTH+3:11"
-
-//Generic living
-#define ui_living_pull "EAST-1:28,CENTER-3:15"
-#define ui_living_healthdoll "EAST-1:28,CENTER-1:15"
-
-//Monkeys
-#define ui_monkey_head "CENTER-5:13,SOUTH:5"
-#define ui_monkey_mask "CENTER-4:14,SOUTH:5"
-#define ui_monkey_neck "CENTER-3:15,SOUTH:5"
-#define ui_monkey_back "CENTER-2:16,SOUTH:5"
-
-//Drones
-#define ui_drone_drop "CENTER+1:18,SOUTH:5"
-#define ui_drone_pull "CENTER+2:2,SOUTH:5"
-#define ui_drone_storage "CENTER-2:14,SOUTH:5"
-#define ui_drone_head "CENTER-3:14,SOUTH:5"
-
-//Cyborgs
-#define ui_borg_health "EAST-1:28,CENTER-1:15"
-#define ui_borg_pull "EAST-2:26,SOUTH+1:7"
-#define ui_borg_radio "EAST-1:28,SOUTH+1:7"
-#define ui_borg_intents "EAST-2:26,SOUTH:5"
-#define ui_borg_lamp "CENTER-3:16, SOUTH:5"
-#define ui_borg_tablet "CENTER-4:16, SOUTH:5"
-#define ui_inv1 "CENTER-2:16,SOUTH:5"
-#define ui_inv2 "CENTER-1 :16,SOUTH:5"
-#define ui_inv3 "CENTER :16,SOUTH:5"
-#define ui_borg_module "CENTER+1:16,SOUTH:5"
-#define ui_borg_store "CENTER+2:16,SOUTH:5"
-#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"
-
-//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"
-
-//AI
-#define ui_ai_core "SOUTH:6,WEST"
-#define ui_ai_camera_list "SOUTH:6,WEST+1"
-#define ui_ai_track_with_camera "SOUTH:6,WEST+2"
-#define ui_ai_camera_light "SOUTH:6,WEST+3"
-#define ui_ai_crew_monitor "SOUTH:6,WEST+4"
-#define ui_ai_crew_manifest "SOUTH:6,WEST+5"
-#define ui_ai_alerts "SOUTH:6,WEST+6"
-#define ui_ai_announcement "SOUTH:6,WEST+7"
-#define ui_ai_shuttle "SOUTH:6,WEST+8"
-#define ui_ai_state_laws "SOUTH:6,WEST+9"
-#define ui_ai_pda_send "SOUTH:6,WEST+10"
-#define ui_ai_pda_log "SOUTH:6,WEST+11"
-#define ui_ai_take_picture "SOUTH:6,WEST+12"
-#define ui_ai_view_images "SOUTH:6,WEST+13"
-#define ui_ai_sensor "SOUTH:6,WEST+14"
-#define ui_ai_multicam "SOUTH+1:6,WEST+13"
-#define ui_ai_add_multicam "SOUTH+1:6,WEST+14"
-#define ui_ai_language_menu "SOUTH+1:8,WEST+11:30"
-
-//pAI
-#define ui_pai_software "SOUTH:6,WEST"
-#define ui_pai_shell "SOUTH:6,WEST+1"
-#define ui_pai_chassis "SOUTH:6,WEST+2"
-#define ui_pai_rest "SOUTH:6,WEST+3"
-#define ui_pai_light "SOUTH:6,WEST+4"
-#define ui_pai_newscaster "SOUTH:6,WEST+5"
-#define ui_pai_host_monitor "SOUTH:6,WEST+6"
-#define ui_pai_crew_manifest "SOUTH:6,WEST+7"
-#define ui_pai_state_laws "SOUTH:6,WEST+8"
-#define ui_pai_pda_send "SOUTH:6,WEST+9"
-#define ui_pai_pda_log "SOUTH:6,WEST+10"
-#define ui_pai_internal_gps "SOUTH:6,WEST+11"
-#define ui_pai_take_picture "SOUTH:6,WEST+12"
-#define ui_pai_view_images "SOUTH:6,WEST+13"
-#define ui_pai_radio "SOUTH:6,WEST+14"
-#define ui_pai_language_menu "SOUTH+1:8,WEST+13:31"
-
-//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"
-
-//Blobbernauts
-#define ui_blobbernaut_overmind_health "EAST-1:28,CENTER+0:19"
-
-//Families
-#define ui_wanted_lvl "NORTH,11"
diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
index ffd1a480b12..29b10891574 100644
--- a/code/_onclick/hud/action_button.dm
+++ b/code/_onclick/hud/action_button.dm
@@ -2,22 +2,36 @@
/atom/movable/screen/movable/action_button
var/datum/action/linked_action
+ var/datum/hud/our_hud
var/actiontooltipstyle = ""
screen_loc = null
var/button_icon_state
var/appearance_cache
+ /// Where we are currently placed on the hud. SCRN_OBJ_DEFAULT asks the linked action what it thinks
+ var/location = SCRN_OBJ_DEFAULT
+ /// A unique bitflag, combined with the name of our linked action this lets us persistently remember any user changes to our position
var/id
- var/ordered = TRUE //If the button gets placed into the default bar
+ /// A weakref of the last thing we hovered over
+ /// God I hate how dragging works
+ var/datum/weakref/last_hovored_ref
+
+/atom/movable/screen/movable/action_button/Destroy()
+ if(our_hud)
+ var/mob/viewer = our_hud.mymob
+ our_hud.hide_action(src)
+ viewer?.client?.screen -= src
+ linked_action.viewers -= our_hud
+ viewer.update_action_buttons()
+ our_hud = null
+ linked_action = null
+ return ..()
/atom/movable/screen/movable/action_button/proc/can_use(mob/user)
if(linked_action)
- if(linked_action.owner == user)
+ if(linked_action.viewers[user.hud_used])
return TRUE
- for(var/datum/weakref/reference as anything in linked_action.sharers)
- if(IS_WEAKREF_OF(user, reference))
- return TRUE
return FALSE
else if (isobserver(user))
var/mob/dead/observer/O = user
@@ -25,41 +39,14 @@
else
return TRUE
-/atom/movable/screen/movable/action_button/MouseDrop(over_object)
- if(!can_use(usr))
- return
- if((istype(over_object, /atom/movable/screen/movable/action_button) && !istype(over_object, /atom/movable/screen/movable/action_button/hide_toggle)))
- if(locked)
- to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first."))
- return
- var/atom/movable/screen/movable/action_button/B = over_object
- var/list/actions = usr.actions
- actions.Swap(actions.Find(src.linked_action), actions.Find(B.linked_action))
- moved = FALSE
- ordered = TRUE
- B.moved = FALSE
- B.ordered = TRUE
- usr.update_action_buttons()
- else
- return ..()
-
/atom/movable/screen/movable/action_button/Click(location,control,params)
if (!can_use(usr))
return FALSE
var/list/modifiers = params2list(params)
if(LAZYACCESS(modifiers, SHIFT_CLICK))
- if(locked)
- to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first."))
- return TRUE
- moved = 0
- usr.update_action_buttons() //redraw buttons that are no longer considered "moved"
- return TRUE
- if(LAZYACCESS(modifiers, CTRL_CLICK))
- locked = !locked
- to_chat(usr, span_notice("Action button \"[name]\" [locked ? "" : "un"]locked."))
- if(id && usr.client) //try to (un)remember position
- usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = locked ? moved : null
+ var/datum/hud/our_hud = usr.hud_used
+ our_hud.position_action(src, SCRN_OBJ_DEFAULT)
return TRUE
if(usr.next_click > world.time)
return
@@ -70,127 +57,105 @@
linked_action.Trigger(trigger_flags = trigger_flags)
return TRUE
-//Hide/Show Action Buttons ... Button
-/atom/movable/screen/movable/action_button/hide_toggle
- name = "Hide Buttons"
- desc = "Shift-click any button to reset its position, and Control-click it to lock it in place. Alt-click this button to reset all buttons to their default positions."
- icon = 'icons/hud/actions.dmi'
- icon_state = "bg_default"
- var/hidden = FALSE
- var/hide_icon = 'icons/hud/actions.dmi'
- var/hide_state = "hide"
- var/show_state = "show"
- var/mutable_appearance/hide_appearance
- var/mutable_appearance/show_appearance
-
-/atom/movable/screen/movable/action_button/hide_toggle/Initialize(mapload)
+// Entered and Exited won't fire while you're dragging something, because you're still "holding" it
+// Very much byond logic, but I want nice behavior, so we fake it with drag
+/atom/movable/screen/movable/action_button/MouseDrag(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
- var/static/list/icon_cache = list()
-
- var/cache_key = "[hide_icon][hide_state]"
- hide_appearance = icon_cache[cache_key]
- if(!hide_appearance)
- hide_appearance = icon_cache[cache_key] = mutable_appearance(hide_icon, hide_state)
-
- cache_key = "[hide_icon][show_state]"
- show_appearance = icon_cache[cache_key]
- if(!show_appearance)
- show_appearance = icon_cache[cache_key] = mutable_appearance(hide_icon, show_state)
-
-
-/atom/movable/screen/movable/action_button/hide_toggle/Click(location,control,params)
- if (!can_use(usr))
+ if(!can_use(usr))
return
+ if(IS_WEAKREF_OF(over_object, last_hovored_ref))
+ return
+ var/atom/old_object
+ if(last_hovored_ref)
+ old_object = last_hovored_ref?.resolve()
+ else // If there's no current ref, we assume it was us. We also treat this as our "first go" location
+ old_object = src
+ var/datum/hud/our_hud = usr.hud_used
+ our_hud?.generate_landings(src)
- var/list/modifiers = params2list(params)
- if(LAZYACCESS(modifiers, SHIFT_CLICK))
- if(locked)
- to_chat(usr, span_warning("Action button \"[name]\" is locked, unlock it first."))
- return TRUE
- moved = FALSE
- usr.update_action_buttons(TRUE)
- return TRUE
- if(LAZYACCESS(modifiers, CTRL_CLICK))
- locked = !locked
- to_chat(usr, span_notice("Action button \"[name]\" [locked ? "" : "un"]locked."))
- if(id && usr.client) //try to (un)remember position
- usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = locked ? moved : null
- return TRUE
- if(LAZYACCESS(modifiers, ALT_CLICK))
- var/buttons_locked = usr.client.prefs.read_preference(/datum/preference/toggle/buttons_locked)
- for(var/V in usr.actions)
- var/datum/action/A = V
- var/atom/movable/screen/movable/action_button/B = A.button
- B.moved = FALSE
- if(B.id && usr.client)
- usr.client.prefs.action_buttons_screen_locs["[B.name]_[B.id]"] = null
- B.locked = buttons_locked
- locked = buttons_locked
- moved = FALSE
- if(id && usr.client)
- usr.client.prefs.action_buttons_screen_locs["[name]_[id]"] = null
- usr.update_action_buttons(TRUE)
- to_chat(usr, span_notice("Action button positions have been reset."))
- return TRUE
- usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden
+ if(old_object)
+ old_object.MouseExited(over_location, over_control, params)
- hidden = usr.hud_used.action_buttons_hidden
- if(hidden)
- name = "Show Buttons"
- else
- name = "Hide Buttons"
- update_appearance()
- usr.update_action_buttons()
+ last_hovored_ref = WEAKREF(over_object)
+ over_object.MouseEntered(over_location, over_control, params)
-/atom/movable/screen/movable/action_button/hide_toggle/AltClick(mob/user)
- for(var/V in user.actions)
- var/datum/action/A = V
- var/atom/movable/screen/movable/action_button/B = A.button
- B.moved = FALSE
- if(moved)
- moved = FALSE
- user.update_action_buttons(TRUE)
- to_chat(user, span_notice("Action button positions have been reset."))
-
-
-/atom/movable/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud)
- var/settings = owner_hud.get_action_buttons_icons()
- icon = settings["bg_icon"]
- icon_state = settings["bg_state"]
- hide_icon = settings["toggle_icon"]
- hide_state = settings["toggle_hide"]
- show_state = settings["toggle_show"]
- update_appearance()
-
-/atom/movable/screen/movable/action_button/hide_toggle/update_overlays()
- . = ..()
- . += hidden ? show_appearance : hide_appearance
-
-/atom/movable/screen/movable/action_button/MouseEntered(location,control,params)
+/atom/movable/screen/movable/action_button/MouseEntered(location, control, params)
. = ..()
if(!QDELETED(src))
- openToolTip(usr,src,params,title = name,content = desc,theme = actiontooltipstyle)
+ openToolTip(usr, src, params, title = name, content = desc, theme = actiontooltipstyle)
-
-/atom/movable/screen/movable/action_button/MouseExited()
+/atom/movable/screen/movable/action_button/MouseExited(location, control, params)
closeToolTip(usr)
+ return ..()
+
+/atom/movable/screen/movable/action_button/MouseDrop(over_object)
+ 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()
+ 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()
+ 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()
+ return
+ . = ..()
+ our_hud.position_action(src, screen_loc)
+ save_position()
+
+/atom/movable/screen/movable/action_button/proc/save_position()
+ var/mob/user = our_hud.mymob
+ if(!user?.client)
+ return
+ var/position_info = ""
+ switch(location)
+ if(SCRN_OBJ_FLOATING)
+ position_info = screen_loc
+ if(SCRN_OBJ_IN_LIST)
+ position_info = SCRN_OBJ_IN_LIST
+ if(SCRN_OBJ_IN_PALETTE)
+ position_info = SCRN_OBJ_IN_PALETTE
+
+ user.client.prefs.action_buttons_screen_locs["[name]_[id]"] = position_info
+
+/atom/movable/screen/movable/action_button/proc/load_position()
+ var/mob/user = our_hud.mymob
+ if(!user)
+ return
+ var/position_info = user.client?.prefs?.action_buttons_screen_locs["[name]_[id]"] || SCRN_OBJ_DEFAULT
+ user.hud_used.position_action(src, position_info)
+
+/atom/movable/screen/movable/action_button/proc/dump_save()
+ var/mob/user = our_hud.mymob
+ if(!user?.client)
+ return
+ user.client.prefs.action_buttons_screen_locs -= "[name]_[id]"
/datum/hud/proc/get_action_buttons_icons()
. = list()
.["bg_icon"] = ui_style
.["bg_state"] = "template"
- //TODO : Make these fit theme
- .["toggle_icon"] = 'icons/hud/actions.dmi'
- .["toggle_hide"] = "hide"
- .["toggle_show"] = "show"
-
//see human and alien hud for specific implementations.
/mob/proc/update_action_buttons_icon(status_only = FALSE)
for(var/X in actions)
var/datum/action/A = X
- A.UpdateButtonIcon(status_only)
+ A.UpdateButtons(status_only)
//This is the proc used to update all the action buttons.
/mob/proc/update_action_buttons(reload_screen)
@@ -200,58 +165,243 @@
if(hud_used.hud_shown != HUD_STYLE_STANDARD)
return
- var/button_number = 0
+ for(var/datum/action/action as anything in actions)
+ var/atom/movable/screen/movable/action_button/button = action.viewers[hud_used]
+ action.UpdateButtons()
+ if(reload_screen)
+ client.screen += button
- if(hud_used.action_buttons_hidden)
- for(var/datum/action/A in actions)
- A.button.screen_loc = null
- if(reload_screen)
- client.screen += A.button
- else
- for(var/datum/action/A in actions)
- A.UpdateButtonIcon()
- var/atom/movable/screen/movable/action_button/B = A.button
- if(B.ordered)
- button_number++
- if(B.moved)
- B.screen_loc = B.moved
- else
- B.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number)
- if(reload_screen)
- client.screen += B
-
- if(!button_number)
- hud_used.hide_actions_toggle.screen_loc = null
- return
-
- if(!hud_used.hide_actions_toggle.moved)
- hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number+1)
- else
- hud_used.hide_actions_toggle.screen_loc = hud_used.hide_actions_toggle.moved
if(reload_screen)
- client.screen += hud_used.hide_actions_toggle
+ hud_used.update_our_owner()
+ // This holds the logic for the palette buttons
+ hud_used.palette_actions.refresh_actions()
+/atom/movable/screen/button_palette
+ desc = "Drag buttons to move them
Shift-click any button to reset it
Alt-click this to reset all buttons"
+ icon = 'icons/hud/64x16_actions.dmi'
+ icon_state = "screen_gen_palette"
+ screen_loc = ui_action_palette
+ var/datum/hud/our_hud
+ var/expanded = FALSE
+ /// Id of any currently running timers that set our color matrix
+ var/color_timer_id
+/atom/movable/screen/button_palette/Destroy()
+ if(our_hud)
+ our_hud.mymob?.client?.screen -= src
+ our_hud.toggle_palette = null
+ our_hud = null
+ return ..()
-#define AB_MAX_COLUMNS 10
+/atom/movable/screen/button_palette/Initialize(mapload)
+ . = ..()
+ update_appearance()
-/datum/hud/proc/ButtonNumberToScreenCoords(number) // TODO : Make this zero-indexed for readabilty
- var/row = round((number - 1)/AB_MAX_COLUMNS)
- var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1
+/atom/movable/screen/button_palette/proc/set_hud(datum/hud/our_hud)
+ src.our_hud = our_hud
+ refresh_owner()
- var/coord_col = "+[col-1]"
- var/coord_col_offset = 4 + 2 * col
+/atom/movable/screen/button_palette/update_name(updates)
+ . = ..()
+ if(expanded)
+ name = "Hide Buttons"
+ else
+ name = "Show Buttons"
- var/coord_row = "[row ? -row : "+0"]"
+/atom/movable/screen/button_palette/proc/refresh_owner()
+ var/mob/viewer = our_hud.mymob
+ if(viewer.client)
+ viewer.client.screen |= src
- return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:-6"
+ var/list/settings = our_hud.get_action_buttons_icons()
+ var/ui_icon = "[settings["bg_icon"]]"
+ var/list/ui_segments = splittext(ui_icon, ".")
+ var/list/ui_paths = splittext(ui_segments[1], "/")
+ var/ui_name = ui_paths[length(ui_paths)]
-/datum/hud/proc/SetButtonCoords(atom/movable/screen/button,number)
- var/row = round((number-1)/AB_MAX_COLUMNS)
- var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1
- var/x_offset = 32*(col-1) + 4 + 2*col
- var/y_offset = -32*(row+1) + 26
+ icon_state = "[ui_name]_palette"
- var/matrix/M = matrix()
- M.Translate(x_offset,y_offset)
- button.transform = M
+/atom/movable/screen/button_palette/MouseEntered(location, control, params)
+ . = ..()
+ if(QDELETED(src))
+ return
+ show_tooltip(params)
+
+/atom/movable/screen/button_palette/MouseExited()
+ closeToolTip(usr)
+ return ..()
+
+/atom/movable/screen/button_palette/proc/show_tooltip(params)
+ openToolTip(usr, src, params, title = name, content = desc)
+
+GLOBAL_LIST_INIT(palette_added_matrix, list(0.4,0.5,0.2,0, 0,1.4,0,0, 0,0.4,0.6,0, 0,0,0,1, 0,0,0,0))
+GLOBAL_LIST_INIT(palette_removed_matrix, list(1.4,0,0,0, 0.7,0.4,0,0, 0.4,0,0.6,0, 0,0,0,1, 0,0,0,0))
+
+/atom/movable/screen/button_palette/proc/play_item_added()
+ color_for_now(GLOB.palette_added_matrix)
+
+/atom/movable/screen/button_palette/proc/play_item_removed()
+ color_for_now(GLOB.palette_removed_matrix)
+
+/atom/movable/screen/button_palette/proc/color_for_now(list/color)
+ if(color_timer_id)
+ return
+ add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY) //We unfortunately cannot animate matrix colors. Curse you lummy it would be ~~non~~trivial to interpolate between the two valuessssssssss
+ color_timer_id = addtimer(CALLBACK(src, .proc/remove_color, color), 2 SECONDS)
+
+/atom/movable/screen/button_palette/proc/remove_color(list/to_remove)
+ color_timer_id = null
+ remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, to_remove)
+
+/atom/movable/screen/button_palette/proc/can_use(mob/user)
+ if (isobserver(user))
+ var/mob/dead/observer/O = user
+ return !O.observetarget
+ return TRUE
+
+/atom/movable/screen/button_palette/Click(location, control, params)
+ if(!can_use(usr))
+ return
+
+ var/list/modifiers = params2list(params)
+
+ if(LAZYACCESS(modifiers, ALT_CLICK))
+ for(var/datum/action/action as anything in usr.actions) // Reset action positions to default
+ for(var/datum/hud/hud as anything in action.viewers)
+ var/atom/movable/screen/movable/action_button/button = action.viewers[hud]
+ hud.position_action(button, SCRN_OBJ_DEFAULT)
+ to_chat(usr, span_notice("Action button positions have been reset."))
+ return TRUE
+
+ set_expanded(!expanded)
+
+/atom/movable/screen/button_palette/proc/clicked_while_open(datum/source, atom/target, atom/location, control, params, mob/user)
+ if(istype(target, /atom/movable/screen/movable/action_button) || istype(target, /atom/movable/screen/palette_scroll) || target == src) // If you're clicking on an action button, or us, you can live
+ return
+ set_expanded(FALSE)
+ if(source)
+ UnregisterSignal(source, COMSIG_CLIENT_CLICK)
+
+/atom/movable/screen/button_palette/proc/set_expanded(new_expanded)
+ var/datum/action_group/our_group = our_hud.palette_actions
+ if(!length(our_group.actions)) //Looks dumb, trust me lad
+ new_expanded = FALSE
+ if(expanded == new_expanded)
+ return
+
+ expanded = new_expanded
+ our_group.refresh_actions()
+ update_appearance()
+
+ if(!usr.client)
+ return
+
+ if(expanded)
+ RegisterSignal(usr.client, COMSIG_CLIENT_CLICK, .proc/clicked_while_open)
+ else
+ UnregisterSignal(usr.client, COMSIG_CLIENT_CLICK)
+
+ closeToolTip(usr) //Our tooltips are now invalid, can't seem to update them in one frame, so here, just close them
+
+/atom/movable/screen/palette_scroll
+ icon = 'icons/hud/screen_gen.dmi'
+ screen_loc = ui_palette_scroll
+ /// How should we move the palette's actions?
+ /// Positive scrolls down the list, negative scrolls back
+ var/scroll_direction = 0
+ var/datum/hud/our_hud
+
+/atom/movable/screen/palette_scroll/proc/can_use(mob/user)
+ if (isobserver(user))
+ var/mob/dead/observer/O = user
+ return !O.observetarget
+ return TRUE
+
+/atom/movable/screen/palette_scroll/proc/set_hud(datum/hud/our_hud)
+ src.our_hud = our_hud
+ refresh_owner()
+
+/atom/movable/screen/palette_scroll/proc/refresh_owner()
+ var/mob/viewer = our_hud.mymob
+ if(viewer.client)
+ viewer.client.screen |= src
+
+ var/list/settings = our_hud.get_action_buttons_icons()
+ icon = settings["bg_icon"]
+
+/atom/movable/screen/palette_scroll/Click(location, control, params)
+ if(!can_use(usr))
+ return
+ our_hud.palette_actions.scroll(scroll_direction)
+
+/atom/movable/screen/palette_scroll/MouseEntered(location, control, params)
+ . = ..()
+ if(QDELETED(src))
+ return
+ openToolTip(usr, src, params, title = name, content = desc)
+
+/atom/movable/screen/palette_scroll/MouseExited()
+ closeToolTip(usr)
+ return ..()
+
+/atom/movable/screen/palette_scroll/down
+ name = "Scroll Down"
+ desc = "Click on this to scroll the actions above down"
+ icon_state = "scroll_down"
+ scroll_direction = 1
+
+/atom/movable/screen/palette_scroll/down/Destroy()
+ if(our_hud)
+ our_hud.mymob?.client?.screen -= src
+ our_hud.palette_down = null
+ our_hud = null
+ return ..()
+
+/atom/movable/screen/palette_scroll/up
+ name = "Scroll Up"
+ desc = "Click on this to scroll the actions above up"
+ icon_state = "scroll_up"
+ scroll_direction = -1
+
+/atom/movable/screen/palette_scroll/up/Destroy()
+ if(our_hud)
+ our_hud.mymob?.client?.screen -= src
+ our_hud.palette_up = null
+ our_hud = null
+ return ..()
+
+/// Exists so you have a place to put your buttons when you move them around
+/atom/movable/screen/action_landing
+ name = "Button Space"
+ desc = "Drag and drop a button into this spot
to add it to the group"
+ icon = 'icons/hud/screen_gen.dmi'
+ icon_state = "reserved"
+ // We want our whole 32x32 space to be clickable, so dropping's forgiving
+ mouse_opacity = MOUSE_OPACITY_OPAQUE
+ var/datum/action_group/owner
+
+/atom/movable/screen/action_landing/Destroy()
+ if(owner)
+ owner.landing = null
+ owner?.owner?.mymob?.client?.screen -= src
+ owner.refresh_actions()
+ owner = null
+ return ..()
+
+/atom/movable/screen/action_landing/proc/set_owner(datum/action_group/owner)
+ src.owner = owner
+ refresh_owner()
+
+/atom/movable/screen/action_landing/proc/refresh_owner()
+ var/datum/hud/our_hud = owner.owner
+ var/mob/viewer = our_hud.mymob
+ if(viewer.client)
+ viewer.client.screen |= src
+
+ var/list/settings = our_hud.get_action_buttons_icons()
+ icon = settings["bg_icon"]
+
+/// Reacts to having a button dropped on it
+/atom/movable/screen/action_landing/proc/hit_by(atom/movable/screen/movable/action_button/button)
+ var/datum/hud/our_hud = owner.owner
+ our_hud.position_action(button, owner.location)
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index a3422dcf8f9..a8d7a136199 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -70,8 +70,13 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
/// game (MouseEntered).
var/screentip_color
- var/atom/movable/screen/movable/action_button/hide_toggle/hide_actions_toggle
- var/action_buttons_hidden = FALSE
+ var/atom/movable/screen/button_palette/toggle_palette
+ var/atom/movable/screen/palette_scroll/down/palette_down
+ var/atom/movable/screen/palette_scroll/up/palette_up
+
+ var/datum/action_group/palette/palette_actions
+ var/datum/action_group/listed/listed_actions
+ var/list/floating_actions
var/atom/movable/screen/healths
var/atom/movable/screen/stamina
@@ -89,10 +94,12 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
// will fall back to the default if any of these are null
ui_style = ui_style2icon(owner.client?.prefs?.read_preference(/datum/preference/choiced/ui_style))
- hide_actions_toggle = new
- hide_actions_toggle.InitialiseIcon(src)
- if(mymob.client?.prefs)
- hide_actions_toggle.locked = mymob.client.prefs.read_preference(/datum/preference/toggle/buttons_locked)
+ toggle_palette = new()
+ toggle_palette.set_hud(src)
+ palette_down = new()
+ palette_down.set_hud(src)
+ palette_up = new()
+ palette_up.set_hud(src)
hand_slots = list()
@@ -117,7 +124,13 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
if(mymob.hud_used == src)
mymob.hud_used = null
- QDEL_NULL(hide_actions_toggle)
+ QDEL_NULL(toggle_palette)
+ QDEL_NULL(palette_down)
+ QDEL_NULL(palette_up)
+ QDEL_NULL(palette_actions)
+ QDEL_NULL(listed_actions)
+ QDEL_LIST(floating_actions)
+
QDEL_NULL(module_store_icon)
QDEL_LIST(static_inventory)
@@ -156,10 +169,14 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
/mob/proc/create_mob_hud()
if(!client || hud_used)
return
- hud_used = new hud_type(src)
+ set_hud_used(new hud_type(src))
update_sight()
SEND_SIGNAL(src, COMSIG_MOB_HUD_CREATED)
+/mob/proc/set_hud_used(datum/hud/new_hud)
+ hud_used = new_hud
+ new_hud.build_action_groups()
+
//Version denotes which style should be displayed. blank or 0 means "next version"
/datum/hud/proc/show_hud(version = 0, mob/viewmob)
if(!ismob(mymob))
@@ -168,6 +185,8 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
if(!screenmob.client)
return FALSE
+ // This code is the absolute fucking worst, I want it to go die in a fire
+ // Seriously, why
screenmob.client.screen = list()
screenmob.client.apply_clickcatcher()
@@ -189,7 +208,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
if(infodisplay.len)
screenmob.client.screen += infodisplay
- screenmob.client.screen += hide_actions_toggle
+ screenmob.client.screen += toggle_palette
if(action_intent)
action_intent.screen_loc = initial(action_intent.screen_loc) //Restore intent selection to the original position
@@ -280,7 +299,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
ui_style = new_ui_style
build_hand_slots()
- hide_actions_toggle.InitialiseIcon(src)
//Triggered when F12 is pressed (Unless someone changed something in the DMF)
/mob/verb/button_pressed_F12()
@@ -328,3 +346,306 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
/datum/hud/proc/update_locked_slots()
return
+
+/datum/hud/proc/position_action(atom/movable/screen/movable/action_button/button, position)
+ if(button.location != SCRN_OBJ_DEFAULT)
+ hide_action(button)
+ switch(position)
+ if(SCRN_OBJ_DEFAULT) // Reset to the default
+ button.dump_save() // Nuke any existing saves
+ position_action(button, button.linked_action.default_button_position)
+ return
+ if(SCRN_OBJ_IN_LIST)
+ listed_actions.insert_action(button)
+ if(SCRN_OBJ_IN_PALETTE)
+ palette_actions.insert_action(button)
+ else // If we don't have it as a define, this is a screen_loc, and we should be floating
+ floating_actions += button
+ button.screen_loc = position
+ position = SCRN_OBJ_FLOATING
+
+ button.location = position
+
+/datum/hud/proc/position_action_relative(atom/movable/screen/movable/action_button/button, atom/movable/screen/movable/action_button/relative_to)
+ if(button.location != SCRN_OBJ_DEFAULT)
+ hide_action(button)
+ switch(relative_to.location)
+ if(SCRN_OBJ_IN_LIST)
+ listed_actions.insert_action(button, listed_actions.index_of(relative_to))
+ if(SCRN_OBJ_IN_PALETTE)
+ palette_actions.insert_action(button, palette_actions.index_of(relative_to))
+ if(SCRN_OBJ_FLOATING) // If we don't have it as a define, this is a screen_loc, and we should be floating
+ floating_actions += button
+ var/client/our_client = mymob.client
+ if(!our_client)
+ position_action(button, button.linked_action.default_button_position)
+ return
+ button.screen_loc = get_valid_screen_location(relative_to.screen_loc, world.icon_size, our_client.view_size.getView()) // Asks for a location adjacent to our button that won't overflow the map
+
+ button.location = relative_to.location
+
+/// Removes the passed in action from its current position on the screen
+/datum/hud/proc/hide_action(atom/movable/screen/movable/action_button/button)
+ switch(button.location)
+ if(SCRN_OBJ_DEFAULT) // Invalid
+ CRASH("We just tried to hide an action buttion that somehow has the default position as its location, you done fucked up")
+ if(SCRN_OBJ_FLOATING)
+ floating_actions -= button
+ if(SCRN_OBJ_IN_LIST)
+ listed_actions.remove_action(button)
+ if(SCRN_OBJ_IN_PALETTE)
+ palette_actions.remove_action(button)
+ button.screen_loc = null
+
+/// Generates visual landings for all groups that the button is not a memeber of
+/datum/hud/proc/generate_landings(atom/movable/screen/movable/action_button/button)
+ listed_actions.generate_landing()
+ palette_actions.generate_landing()
+
+/// Clears all currently visible landings
+/datum/hud/proc/hide_landings()
+ listed_actions.clear_landing()
+ palette_actions.clear_landing()
+
+// Updates any existing "owned" visuals, ensures they continue to be visible
+/datum/hud/proc/update_our_owner()
+ toggle_palette.refresh_owner()
+ palette_down.refresh_owner()
+ palette_up.refresh_owner()
+ listed_actions.update_landing()
+ palette_actions.update_landing()
+
+/// Ensures all of our buttons are properly within the bounds of our client's view, moves them if they're not
+/datum/hud/proc/view_audit_buttons()
+ var/our_view = mymob?.client?.view
+ if(!our_view)
+ return
+ listed_actions.check_against_view()
+ palette_actions.check_against_view()
+ for(var/atom/movable/screen/movable/action_button/floating_button as anything in floating_actions)
+ var/list/current_offsets = screen_loc_to_offset(floating_button.screen_loc)
+ // We set the view arg here, so the output will be properly hemm'd in by our new view
+ floating_button.screen_loc = offset_to_screen_loc(current_offsets[1], current_offsets[2], view = our_view)
+
+/// Generates and fills new action groups with our mob's current actions
+/datum/hud/proc/build_action_groups()
+ listed_actions = new(src)
+ palette_actions = new(src)
+ floating_actions = list()
+ for(var/datum/action/action as anything in mymob.actions)
+ var/atom/movable/screen/movable/action_button/button = action.viewers[src]
+ if(!button)
+ action.ShowTo(mymob)
+ button = action.viewers[src]
+ position_action(button, button.location)
+
+/datum/action_group
+ /// The hud we're owned by
+ var/datum/hud/owner
+ /// The actions we're managing
+ var/list/atom/movable/screen/movable/action_button/actions
+ /// The initial vertical offset of our action buttons
+ var/north_offset = 0
+ /// The pixel vertical offset of our action buttons
+ var/pixel_north_offset = 0
+ /// Max amount of buttons we can have per row
+ /// Indexes at 1
+ var/column_max = 0
+ /// How far "ahead" of the first row we start. Lets us "scroll" our rows
+ /// Indexes at 1
+ var/row_offset = 0
+ /// How many rows of actions we can have at max before we just stop hiding
+ /// Indexes at 1
+ var/max_rows = INFINITY
+ /// The screen location we go by
+ var/location
+ /// Our landing screen object
+ var/atom/movable/screen/action_landing/landing
+
+/datum/action_group/New(datum/hud/owner)
+ ..()
+ actions = list()
+ src.owner = owner
+
+/datum/action_group/Destroy()
+ owner = null
+ QDEL_NULL(landing)
+ QDEL_LIST(actions)
+ return ..()
+
+/datum/action_group/proc/insert_action(atom/movable/screen/action, index)
+ if(action in actions)
+ if(actions[index] == action)
+ return
+ actions -= action // Don't dupe, come on
+ if(!index)
+ index = length(actions) + 1
+ index = min(length(actions) + 1, index)
+ actions.Insert(index, action)
+ refresh_actions()
+
+/datum/action_group/proc/remove_action(atom/movable/screen/action)
+ actions -= action
+ refresh_actions()
+
+/datum/action_group/proc/refresh_actions()
+
+ // We don't use size() here because landings are not canon
+ var/total_rows = ROUND_UP(length(actions) / column_max)
+ total_rows -= max_rows // Lets get the amount of rows we're off from our max
+ row_offset = clamp(row_offset, 0, total_rows) // You're not allowed to offset so far that we have a row of blank space
+
+ var/button_number = 0
+ for(var/atom/movable/screen/button as anything in actions)
+ var/postion = ButtonNumberToScreenCoords(button_number )
+ button.screen_loc = postion
+ button_number++
+
+ if(landing)
+ var/postion = ButtonNumberToScreenCoords(button_number, landing = TRUE) // Need a good way to count buttons off screen, but allow this to display in the right place if it's being placed with no concern for dropdown
+ landing.screen_loc = postion
+ button_number++
+
+/// Accepts a number represeting our position in the group, indexes at 0 to make the math nicer
+/datum/action_group/proc/ButtonNumberToScreenCoords(number, landing = FALSE)
+ var/row = round(number / column_max)
+ row -= row_offset // If you're less then 0, you don't get to render, this lets us "scroll" rows ya feel?
+ if(row < 0)
+ return null
+
+ // Could use >= here, but I think it's worth noting that the two start at different places, since row is based on number here
+ if(row > max_rows - 1)
+ if(!landing) // If you're not a landing, go away please. thx
+ return null
+ // We always want to render landings, even if their action button can't be displayed.
+ // So we set a row equal to the max amount of rows + 1. Willing to overrun that max slightly to properly display the landing spot
+ row = max_rows // Remembering that max_rows indexes at 1, and row indexes at 0
+
+ // We're going to need to set our column to match the first item in the last row, so let's set number properly now
+ number = row * column_max
+
+ var/visual_row = row + north_offset
+ var/coord_row = visual_row ? "-[visual_row]" : "+0"
+
+ var/visual_column = number % column_max
+ var/coord_col = "+[visual_column]"
+ var/coord_col_offset = 4 + 2 * (visual_column + 1)
+ return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:-[pixel_north_offset]"
+
+/datum/action_group/proc/check_against_view()
+ var/owner_view = owner?.mymob?.client?.view
+ if(!owner_view)
+ return
+ // Unlikey as it is, we may have been changed. Want to start from our target position and fail down
+ column_max = initial(column_max)
+ // Convert our viewer's view var into a workable offset
+ var/list/view_size = view_to_pixels(owner_view)
+
+ // We're primarially concerned about width here, if someone makes us 1x2000 I wish them a swift and watery death
+ var/furthest_screen_loc = ButtonNumberToScreenCoords(column_max - 1)
+ var/list/offsets = screen_loc_to_offset(furthest_screen_loc, owner_view)
+ if(offsets[1] > world.icon_size && offsets[1] < view_size[1] && offsets[2] > world.icon_size && offsets[2] < view_size[2]) // We're all good
+ return
+
+ for(column_max in column_max - 1 to 1 step -1) // Yes I could do this by unwrapping ButtonNumberToScreenCoords, but I don't feel like it
+ var/tested_screen_loc = ButtonNumberToScreenCoords(column_max)
+ offsets = screen_loc_to_offset(tested_screen_loc, owner_view)
+ // We've found a valid max length, pack it in
+ if(offsets[1] > world.icon_size && offsets[1] < view_size[1] && offsets[2] > world.icon_size && offsets[2] < view_size[2])
+ break
+ // Use our newly resized column max
+ refresh_actions()
+
+/// Returns the amount of objects we're storing at the moment
+/datum/action_group/proc/size()
+ var/amount = length(actions)
+ if(landing)
+ amount += 1
+ return amount
+
+/datum/action_group/proc/index_of(atom/movable/screen/get_location)
+ return actions.Find(get_location)
+
+/// Generates a landing object that can be dropped on to join this group
+/datum/action_group/proc/generate_landing()
+ if(landing)
+ return
+ landing = new()
+ landing.set_owner(src)
+ refresh_actions()
+
+/// Clears any landing objects we may currently have
+/datum/action_group/proc/clear_landing()
+ QDEL_NULL(landing)
+
+/datum/action_group/proc/update_landing()
+ if(!landing)
+ return
+ landing.refresh_owner()
+
+/datum/action_group/proc/scroll(amount)
+ row_offset += amount
+ refresh_actions()
+
+/datum/action_group/palette
+ north_offset = 2
+ column_max = 3
+ max_rows = 3
+ location = SCRN_OBJ_IN_PALETTE
+
+/datum/action_group/palette/insert_action(atom/movable/screen/action, index)
+ . = ..()
+ var/atom/movable/screen/button_palette/palette = owner.toggle_palette
+ palette.play_item_added()
+
+/datum/action_group/palette/remove_action(atom/movable/screen/action)
+ . = ..()
+ var/atom/movable/screen/button_palette/palette = owner.toggle_palette
+ palette.play_item_removed()
+ if(!length(actions))
+ palette.set_expanded(FALSE)
+
+/datum/action_group/palette/refresh_actions()
+ var/atom/movable/screen/button_palette/palette = owner.toggle_palette
+ var/atom/movable/screen/palette_scroll/scroll_down = owner.palette_down
+ var/atom/movable/screen/palette_scroll/scroll_up = owner.palette_up
+
+ var/actions_above = round((owner.listed_actions.size() - 1) / owner.listed_actions.column_max)
+ north_offset = initial(north_offset) + actions_above
+
+ palette.screen_loc = ui_action_palette_offset(actions_above)
+ var/action_count = length(owner?.mymob?.actions)
+ var/our_row_count = round((length(actions) - 1) / column_max)
+ if(!action_count)
+ palette.screen_loc = null
+
+ if(palette.expanded && action_count && our_row_count >= max_rows)
+ scroll_down.screen_loc = ui_palette_scroll_offset(actions_above)
+ scroll_up.screen_loc = ui_palette_scroll_offset(actions_above)
+ else
+ scroll_down.screen_loc = null
+ scroll_up.screen_loc = null
+
+ return ..()
+
+/datum/action_group/palette/ButtonNumberToScreenCoords(number, landing)
+ var/atom/movable/screen/button_palette/palette = owner.toggle_palette
+ if(palette.expanded)
+ return ..()
+
+ if(!landing)
+ return null
+
+ // We only render the landing in this case, so we force it to be the second item displayed (Second rather then first since it looks nicer)
+ // Remember the number var indexes at 0
+ return ..(1 + (row_offset * column_max), landing)
+
+
+/datum/action_group/listed
+ pixel_north_offset = 6
+ column_max = 10
+ location = SCRN_OBJ_IN_LIST
+
+/datum/action_group/listed/refresh_actions()
+ . = ..()
+ owner.palette_actions.refresh_actions() // We effect them, so we gotta refresh em
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index c3372d338f3..b1f40f76294 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -9,9 +9,8 @@
//Not tied to the grid, places it's center where the cursor is
/atom/movable/screen/movable
+ mouse_drag_pointer = 'icons/effects/mouse_pointers/screen_drag.dmi'
var/snap2grid = FALSE
- var/moved = FALSE
- var/locked = FALSE
var/x_off = -16
var/y_off = -16
@@ -21,35 +20,29 @@
/atom/movable/screen/movable/snap
snap2grid = TRUE
-
/atom/movable/screen/movable/MouseDrop(over_object, src_location, over_location, src_control, over_control, params)
- if(locked) //no! I am locked! begone!
+ var/position = mouse_params_to_position(params)
+ if(!position)
return
+
+ screen_loc = position
+
+/// Takes mouse parmas as input, returns a string representing the appropriate mouse position
+/atom/movable/screen/movable/proc/mouse_params_to_position(params)
var/list/modifiers = params2list(params)
//No screen-loc information? abort.
if(!LAZYACCESS(modifiers, SCREEN_LOC))
return
-
- //Split screen-loc up into X+Pixel_X and Y+Pixel_Y
- var/list/screen_loc_params = splittext(LAZYACCESS(modifiers, SCREEN_LOC), ",")
-
- //Split X+Pixel_X up into list(X, Pixel_X)
- var/list/screen_loc_X = splittext(screen_loc_params[1],":")
-
- //Split Y+Pixel_Y up into list(Y, Pixel_Y)
- var/list/screen_loc_Y = splittext(screen_loc_params[2],":")
-
+ var/client/our_client = usr.client
+ var/list/offset = screen_loc_to_offset(LAZYACCESS(modifiers, SCREEN_LOC))
if(snap2grid) //Discard Pixel Values
- screen_loc = "[screen_loc_X[1]],[screen_loc_Y[1]]"
-
+ offset[1] = FLOOR(offset[1], world.icon_size) // drops any pixel offset
+ offset[2] = FLOOR(offset[2], world.icon_size) // drops any pixel offset
else //Normalise Pixel Values (So the object drops at the center of the mouse, not 16 pixels off)
- var/pix_X = text2num(screen_loc_X[2]) + x_off
- var/pix_Y = text2num(screen_loc_Y[2]) + y_off
- screen_loc = "[screen_loc_X[1]]:[pix_X],[screen_loc_Y[1]]:[pix_Y]"
-
- moved = screen_loc
-
+ offset[1] += x_off
+ offset[2] += y_off
+ return offset_to_screen_loc(offset[1], offset[2], our_client?.view)
//Debug procs
/client/proc/test_movable_UI()
diff --git a/code/_onclick/hud/screentip.dm b/code/_onclick/hud/screentip.dm
index 36159ec0086..198e70326ab 100644
--- a/code/_onclick/hud/screentip.dm
+++ b/code/_onclick/hud/screentip.dm
@@ -16,6 +16,6 @@
SIGNAL_HANDLER
if(!hud || !hud.mymob.client.view_size) //Might not have been initialized by now
return
- maptext_width = getviewsize(hud.mymob.client.view_size.getView())[1] * world.icon_size
+ maptext_width = view_to_pixels(hud.mymob.client.view_size.getView())[1]
diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm
index 922e65e0e74..cb8f62df461 100644
--- a/code/controllers/subsystem/augury.dm
+++ b/code/controllers/subsystem/augury.dm
@@ -72,15 +72,15 @@ SUBSYSTEM_DEF(augury)
SSaugury.watchers += owner
to_chat(owner, span_notice("You are now auto-following debris."))
active = TRUE
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/innate/augury/Deactivate()
SSaugury.watchers -= owner
to_chat(owner, span_notice("You are no longer auto-following debris."))
active = FALSE
- UpdateButtonIcon()
+ UpdateButtons()
-/datum/action/innate/augury/UpdateButtonIcon(status_only = FALSE, force)
+/datum/action/innate/augury/UpdateButton(atom/movable/screen/movable/action_button/button, status_only = FALSE, force)
..()
if(active)
button.icon_state = "template_active"
diff --git a/code/datums/action.dm b/code/datums/action.dm
index cb55f77cdbf..92f3d1c50c4 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -4,9 +4,10 @@
var/datum/target
var/check_flags = NONE
var/processing = FALSE
- var/atom/movable/screen/movable/action_button/button = null
var/buttontooltipstyle = ""
var/transparent_when_unavailable = TRUE
+ /// Where any buttons we create should be by default. Accepts screen_loc and location defines
+ var/default_button_position = SCRN_OBJ_IN_LIST
var/button_icon = 'icons/mob/actions/backgrounds.dmi' //This is the file for the BACKGROUND icon
var/background_icon_state = ACTION_BUTTON_DEFAULT_BACKGROUND //And this is the state for the background icon
@@ -14,17 +15,11 @@
var/icon_icon = 'icons/hud/actions.dmi' //This is the file for the ACTION icon
var/button_icon_state = "default" //And this is the state for the action icon
var/mob/owner
- ///All mobs that are sharing our action button.
- var/list/sharers = list()
+ ///List of all mobs that are viewing our action button -> A unique movable for them to view.
+ var/list/viewers = list()
/datum/action/New(Target)
link_to(Target)
- button = new
- button.linked_action = src
- button.name = name
- button.actiontooltipstyle = buttontooltipstyle
- if(desc)
- button.desc = desc
/datum/action/proc/link_to(Target)
target = Target
@@ -35,41 +30,21 @@
if(owner)
Remove(owner)
target = null
- QDEL_NULL(button)
+ QDEL_LIST_ASSOC_VAL(viewers) // Qdel the buttons in the viewers list **NOT THE HUDS**
return ..()
/datum/action/proc/Grant(mob/M)
- if(M)
- if(owner)
- if(owner == M)
- return
- Remove(owner)
- owner = M
- RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/clear_ref, override = TRUE)
-
- //button id generation
- var/counter = 0
- var/bitfield = 0
- for(var/datum/action/A in M.actions)
- if(A.name == name && A.button.id)
- counter += 1
- bitfield |= A.button.id
- bitfield = ~bitfield
- var/bitflag = 1
- for(var/i in 1 to (counter + 1))
- if(bitfield & bitflag)
- button.id = bitflag
- break
- bitflag *= 2
-
- LAZYADD(M.actions, src)
- if(M.client)
- M.client.screen += button
- button.locked = M.client.prefs.read_preference(/datum/preference/toggle/buttons_locked) || button.id ? M.client.prefs.action_buttons_screen_locs["[name]_[button.id]"] : FALSE //even if it's not defaultly locked we should remember we locked it before
- button.moved = button.id ? M.client.prefs.action_buttons_screen_locs["[name]_[button.id]"] : FALSE
- M.update_action_buttons()
- else
+ if(!M)
Remove(owner)
+ return
+ if(owner)
+ if(owner == M)
+ return
+ Remove(owner)
+ owner = M
+ RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/clear_ref, override = TRUE)
+
+ GiveAction(M)
/datum/action/proc/clear_ref(datum/ref)
SIGNAL_HANDLER
@@ -79,26 +54,18 @@
qdel(src)
/datum/action/proc/Remove(mob/M)
- for(var/datum/weakref/reference as anything in sharers)
- var/mob/freeloader = reference.resolve()
- if(!freeloader)
+ for(var/datum/hud/hud in viewers)
+ if(!hud.mymob)
continue
- Unshare(freeloader)
- sharers = null
- if(M)
- if(M.client)
- M.client.screen -= button
- LAZYREMOVE(M.actions, src)
- M.update_action_buttons()
+ HideFrom(hud.mymob)
+ LAZYREMOVE(M.actions, src) // We aren't always properly inserted into the viewers list, gotta make sure that action's cleared
+ viewers = list()
+
if(owner)
UnregisterSignal(owner, COMSIG_PARENT_QDELETING)
if(target == owner)
RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/clear_ref)
owner = null
- if(button)
- button.moved = FALSE //so the button appears in its normal position when given to another owner.
- button.locked = FALSE
- button.id = null
/datum/action/proc/Trigger(trigger_flags)
if(!IsAvailable())
@@ -123,31 +90,36 @@
return FALSE
return TRUE
+/datum/action/proc/UpdateButtons(status_only, force)
+ for(var/datum/hud/hud in viewers)
+ var/atom/movable/screen/movable/button = viewers[hud]
+ UpdateButton(button, status_only, force)
-/datum/action/proc/UpdateButtonIcon(status_only = FALSE, force = FALSE)
- if(button)
- if(!status_only)
- button.name = name
- button.desc = desc
- if(owner?.hud_used && background_icon_state == ACTION_BUTTON_DEFAULT_BACKGROUND)
- var/list/settings = owner.hud_used.get_action_buttons_icons()
- if(button.icon != settings["bg_icon"])
- button.icon = settings["bg_icon"]
- if(button.icon_state != settings["bg_state"])
- button.icon_state = settings["bg_state"]
- else
- if(button.icon != button_icon)
- button.icon = button_icon
- if(button.icon_state != background_icon_state)
- button.icon_state = background_icon_state
-
- ApplyIcon(button, force)
-
- if(!IsAvailable())
- button.color = transparent_when_unavailable ? rgb(128,0,0,128) : rgb(128,0,0)
+/datum/action/proc/UpdateButton(atom/movable/screen/movable/action_button/button, status_only = FALSE, force = FALSE)
+ if(!button)
+ return
+ if(!status_only)
+ button.name = name
+ button.desc = desc
+ if(owner?.hud_used && background_icon_state == ACTION_BUTTON_DEFAULT_BACKGROUND)
+ var/list/settings = owner.hud_used.get_action_buttons_icons()
+ if(button.icon != settings["bg_icon"])
+ button.icon = settings["bg_icon"]
+ if(button.icon_state != settings["bg_state"])
+ button.icon_state = settings["bg_state"]
else
- button.color = rgb(255,255,255,255)
- return TRUE
+ if(button.icon != button_icon)
+ button.icon = button_icon
+ if(button.icon_state != background_icon_state)
+ button.icon_state = background_icon_state
+
+ ApplyIcon(button, force)
+
+ if(!IsAvailable())
+ button.color = transparent_when_unavailable ? rgb(128,0,0,128) : rgb(128,0,0)
+ else
+ button.color = rgb(255,255,255,255)
+ return TRUE
/datum/action/proc/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force = FALSE)
if(icon_icon && button_icon_state && ((current_button.button_icon_state != button_icon_state) || force))
@@ -157,28 +129,67 @@
/datum/action/proc/OnUpdatedIcon()
SIGNAL_HANDLER
- UpdateButtonIcon()
+ UpdateButtons()
-//Adds our action button to the screen of another player
-/datum/action/proc/Share(mob/freeloader)
- if(!freeloader.client)
+//Give our action button to the player
+/datum/action/proc/GiveAction(mob/viewer)
+ var/datum/hud/our_hud = viewer.hud_used
+ if(viewers[our_hud]) // Already have a copy of us? go away
return
- sharers += WEAKREF(freeloader)
- freeloader.client.screen += button
- freeloader.actions += src
- freeloader.update_action_buttons()
-//Removes our action button from the screen of another player
-/datum/action/proc/Unshare(mob/freeloader)
- if(!freeloader.client)
+ LAZYOR(viewer.actions, src) // Move this in
+ ShowTo(viewer)
+
+//Adds our action button to the screen of a player
+/datum/action/proc/ShowTo(mob/viewer)
+ var/datum/hud/our_hud = viewer.hud_used
+ if(!our_hud || viewers[our_hud]) // There's no point in this if you have no hud in the first place
return
- for(var/freeloader_reference in sharers)
- if(IS_WEAKREF_OF(freeloader, freeloader_reference))
- sharers -= freeloader_reference
- break
- freeloader.client.screen -= button
- freeloader.actions -= src
- freeloader.update_action_buttons()
+
+ var/atom/movable/screen/movable/action_button/button = CreateButton()
+ SetId(button, viewer)
+
+ button.our_hud = our_hud
+ viewers[our_hud] = button
+ if(viewer.client)
+ viewer.client.screen += button
+
+ button.load_position(viewer)
+ viewer.update_action_buttons()
+
+//Removes our action button from the screen of a player
+/datum/action/proc/HideFrom(mob/viewer)
+ var/datum/hud/our_hud = viewer.hud_used
+ var/atom/movable/screen/movable/action_button/button = viewers[our_hud]
+ LAZYREMOVE(viewer.actions, src)
+ if(button)
+ qdel(button)
+
+/datum/action/proc/CreateButton()
+ var/atom/movable/screen/movable/action_button/button = new()
+ button.linked_action = src
+ button.name = name
+ button.actiontooltipstyle = buttontooltipstyle
+ if(desc)
+ button.desc = desc
+ return button
+
+/datum/action/proc/SetId(atom/movable/screen/movable/action_button/our_button, mob/owner)
+ //button id generation
+ var/bitfield = 0
+ for(var/datum/action/action in owner.actions)
+ if(action == src) // This could be us, which is dumb
+ continue
+ var/atom/movable/screen/movable/action_button/button = action.viewers[owner.hud_used]
+ if(action.name == name && button.id)
+ bitfield |= button.id
+
+ bitfield = ~bitfield // Flip our possible ids, so we can check if we've found a unique one
+ for(var/i in 0 to 23) // We get 24 possible bitflags in dm
+ var/bitflag = 1 << i // Shift us over one
+ if(bitfield & bitflag)
+ our_button.id = bitflag
+ return
//Presets for item actions
/datum/action/item_action
@@ -272,12 +283,14 @@
/datum/action/item_action/set_internals
name = "Set Internals"
-/datum/action/item_action/set_internals/UpdateButtonIcon(status_only = FALSE, force)
- if(..()) //button available
- if(iscarbon(owner))
- var/mob/living/carbon/C = owner
- if(target == C.internal)
- button.icon_state = "template_active"
+/datum/action/item_action/set_internals/UpdateButton(atom/movable/screen/movable/action_button/button, status_only = FALSE, force)
+ if(!..()) // no button available
+ return
+ if(!iscarbon(owner))
+ return
+ var/mob/living/carbon/C = owner
+ if(target == C.internal)
+ button.icon_state = "template_active"
/datum/action/item_action/pick_color
name = "Choose A Color"
@@ -331,7 +344,7 @@
SIGNAL_HANDLER
button_icon_state = "thermal_[suit.thermal_on ? "on" : "off"]"
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/item_action/vortex_recall
name = "Vortex Recall"
@@ -385,7 +398,6 @@
..()
var/obj/item/item_target = target
name = "Toggle [item_target.name]"
- button.name = name
/datum/action/item_action/halt
name = "HALT!"
@@ -411,7 +423,6 @@
..()
var/obj/item/item_target = target
name = "Adjust [item_target.name]"
- button.name = name
/datum/action/item_action/switch_hud
name = "Switch HUD"
@@ -497,13 +508,11 @@
..()
var/obj/item/organ/organ_target = target
name = "Toggle [organ_target.name]"
- button.name = name
/datum/action/item_action/organ_action/use/New(Target)
..()
var/obj/item/organ/organ_target = target
name = "Use [organ_target.name]"
- button.name = name
/datum/action/item_action/cult_dagger
name = "Draw Blood Rune"
@@ -512,15 +521,13 @@
button_icon_state = "draw"
buttontooltipstyle = "cult"
background_icon_state = "bg_demon"
+ default_button_position = "6:157,4:-2"
/datum/action/item_action/cult_dagger/Grant(mob/M)
if(!IS_CULTIST(M))
Remove(owner)
return
-
- . = ..()
- button.screen_loc = "6:157,4:-2"
- button.moved = "6:157,4:-2"
+ return ..()
/datum/action/item_action/cult_dagger/Trigger(trigger_flags)
for(var/obj/item/held_item as anything in owner.held_items) // In case we were already holding a dagger
@@ -615,7 +622,6 @@
icon_icon = S.action_icon
button_icon_state = S.action_icon_state
background_icon_state = S.action_background_icon_state
- button.name = name
/datum/action/spell_action/Destroy()
var/obj/effect/proc_holder/S = target
@@ -693,13 +699,14 @@
// Shares cooldowns with other cooldown abilities of the same value, not active if null
var/shared_cooldown
-/datum/action/cooldown/New(Target)
- ..()
+/datum/action/cooldown/CreateButton()
+ var/atom/movable/screen/movable/action_button/button = ..()
button.maptext = ""
button.maptext_x = 8
button.maptext_y = 0
button.maptext_width = 24
button.maptext_height = 12
+ return button
/datum/action/cooldown/IsAvailable()
return ..() && (next_use_time <= world.time)
@@ -721,7 +728,7 @@
next_use_time = world.time + override_cooldown_time
else
next_use_time = world.time + cooldown_time
- UpdateButtonIcon()
+ UpdateButtons()
START_PROCESSING(SSfastprocess, src)
/datum/action/cooldown/Trigger(trigger_flags, atom/target)
@@ -739,7 +746,7 @@
else
owner.click_intercept = src
for(var/datum/action/cooldown/ability in owner.actions)
- ability.UpdateButtonIcon()
+ ability.UpdateButtons()
return TRUE
return PreActivate(owner)
@@ -764,12 +771,13 @@
/datum/action/cooldown/proc/Activate(atom/target)
return
-/datum/action/cooldown/UpdateButtonIcon(status_only = FALSE, force = FALSE)
+/datum/action/cooldown/UpdateButton(atom/movable/screen/movable/action_button/button, status_only = FALSE, force = FALSE)
. = ..()
+ if(!button)
+ return
var/time_left = max(next_use_time - world.time, 0)
- if(button)
- if(text_cooldown)
- button.maptext = MAPTEXT("[round(time_left/10, 0.1)]")
+ if(text_cooldown)
+ button.maptext = MAPTEXT("[round(time_left/10, 0.1)]")
if(!owner || time_left == 0)
button.maptext = ""
if(IsAvailable() && owner.click_intercept == src)
@@ -779,28 +787,28 @@
var/time_left = max(next_use_time - world.time, 0)
if(!owner || time_left == 0)
STOP_PROCESSING(SSfastprocess, src)
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/cooldown/Grant(mob/M)
..()
- if(owner)
- UpdateButtonIcon()
- if(next_use_time > world.time)
- START_PROCESSING(SSfastprocess, src)
+ if(!owner)
+ return
+ UpdateButtons()
+ if(next_use_time > world.time)
+ START_PROCESSING(SSfastprocess, src)
///Like a cooldown action, but with an associated proc holder.
/datum/action/cooldown/spell_like
/datum/action/cooldown/spell_like/New(Target)
..()
- var/obj/effect/proc_holder/our_proc_holder = target
+ var/obj/effect/proc_holder/our_proc_holder = Target
our_proc_holder.action = src
name = our_proc_holder.name
desc = our_proc_holder.desc
icon_icon = our_proc_holder.action_icon
button_icon_state = our_proc_holder.action_icon_state
background_icon_state = our_proc_holder.action_background_icon_state
- button.name = name
/datum/action/cooldown/spell_like/Activate(atom/activate_target)
if(!target)
diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm
index a5c7710b067..7b5d6760ec8 100644
--- a/code/datums/brain_damage/imaginary_friend.dm
+++ b/code/datums/brain_damage/imaginary_friend.dm
@@ -275,7 +275,7 @@
name = "Hide"
desc = "Hide yourself from your owner's sight."
button_icon_state = "hide"
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/innate/imaginary_hide/Activate()
var/mob/camera/imaginary_friend/I = owner
diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm
index 0fff57863e3..c552c596c80 100644
--- a/code/datums/components/admin_popup.dm
+++ b/code/datums/components/admin_popup.dm
@@ -49,7 +49,7 @@
admin_popup = new
var/client/parent_client = parent
- admin_popup.maptext_width = getviewsize(parent_client.view_size.getView())[1] * world.icon_size
+ admin_popup.maptext_width = view_to_pixels(parent_client.view_size.getView())[1]
parent_client.screen += admin_popup
/datum/component/admin_popup/proc/delete_self()
diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm
index 9de207a6423..85d144ea857 100644
--- a/code/datums/components/riding/riding_mob.dm
+++ b/code/datums/components/riding/riding_mob.dm
@@ -141,7 +141,7 @@
var/obj/effect/proc_holder/proc_holder = ability
if(!proc_holder.action)
return
- proc_holder.action.Share(rider)
+ proc_holder.action.GiveAction(rider)
/// Takes away the riding parent's abilities from the rider
/datum/component/riding/creature/proc/remove_abilities(mob/living/rider)
@@ -156,7 +156,7 @@
return
if(rider == proc_holder.ranged_ability_user)
proc_holder.remove_ranged_ability()
- proc_holder.action.Unshare(rider)
+ proc_holder.action.HideFrom(rider)
/datum/component/riding/creature/riding_can_z_move(atom/movable/movable_parent, direction, turf/start, turf/destination, z_move_flags, mob/living/rider)
if(!(z_move_flags & ZMOVE_CAN_FLY_CHECKS))
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index ccebfa54b86..ecc0fa17a4d 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -830,7 +830,7 @@
if(istype(S, type))
continue
S.charge_counter = delay
- S.updateButtonIcon()
+ S.updateButtons()
INVOKE_ASYNC(S, /obj/effect/proc_holder/spell.proc/start_recharge)
/datum/mind/proc/get_ghost(even_if_they_cant_reenter, ghosts_with_clients)
diff --git a/code/datums/view.dm b/code/datums/view.dm
index dffbc90a4f2..e8b6c1cfe82 100644
--- a/code/datums/view.dm
+++ b/code/datums/view.dm
@@ -33,11 +33,13 @@
default = string
apply()
-/datum/view_data/proc/safeApplyFormat()
+/datum/view_data/proc/afterViewChange()
if(isZooming())
assertFormat()
- return
- resetFormat()
+ else
+ resetFormat()
+ var/datum/hud/our_hud = chief?.mob?.hud_used
+ our_hud.view_audit_buttons() // Make sure our hud's buttons are in our new size
/datum/view_data/proc/assertFormat()//T-Pose
winset(chief, "mapwindow.map", "zoom=0")
@@ -99,7 +101,7 @@
/datum/view_data/proc/apply()
chief?.change_view(getView())
- safeApplyFormat()
+ afterViewChange()
/datum/view_data/proc/supress()
is_suppressed = TRUE
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 46df27b23e0..d330ceb0180 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1225,7 +1225,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
*/
/obj/item/proc/update_action_buttons(status_only = FALSE, force = FALSE)
for(var/datum/action/current_action as anything in actions)
- current_action.UpdateButtonIcon(status_only, force)
+ current_action.UpdateButtons(status_only, force)
// Update icons if this is being carried by a mob
/obj/item/wash(clean_types)
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index a9b9b78015d..e6d4293a25d 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -105,13 +105,13 @@
to_chat(owner, span_notice("You will now fold origami planes."))
button_icon_state = "origami_on"
active = TRUE
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/innate/origami/Deactivate()
to_chat(owner, span_notice("You will no longer fold origami planes."))
button_icon_state = "origami_off"
active = FALSE
- UpdateButtonIcon()
+ UpdateButtons()
///SPELLS///
diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm
index 92fdc82f23d..4a265d882be 100644
--- a/code/game/objects/structures/deployable_turret.dm
+++ b/code/game/objects/structures/deployable_turret.dm
@@ -114,7 +114,7 @@
var/client/controlling_client = controller.client
if(controlling_client)
var/modifiers = params2list(controlling_client.mouseParams)
- var/atom/target_atom = controlling_client.mouseObject
+ var/atom/target_atom = controlling_client.mouse_object_ref?.resolve()
var/turf/target_turf = get_turf(target_atom)
if(istype(target_turf)) //They're hovering over something in the map.
direction_track(controller, target_turf)
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_spells/spell_edit_menu.dm b/code/modules/admin/verbs/SDQL2/SDQL_spells/spell_edit_menu.dm
index 3bffae75958..7c74c38ca70 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_spells/spell_edit_menu.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_spells/spell_edit_menu.dm
@@ -404,7 +404,7 @@ GLOBAL_LIST_INIT_TYPED(sdql_spells, /obj/effect/proc_holder/spell, list())
if("confirm")
if(target_spell)
reassign_vars(target_spell)
- target_spell.action.UpdateButtonIcon()
+ target_spell.action.UpdateButtons()
log_admin("[key_name(user)] edited the SDQL spell \"[target_spell]\" owned by [key_name(target_mob)].")
else
var/new_spell = give_spell()
@@ -895,7 +895,7 @@ GLOBAL_LIST_INIT_TYPED(sdql_spells, /obj/effect/proc_holder/spell, list())
var/obj/effect/proc_holder/spell/new_spell = new path(null, target_mob, user.ckey)
GLOB.sdql_spells += new_spell
reassign_vars(new_spell)
- new_spell.action.UpdateButtonIcon()
+ new_spell.action.UpdateButtons()
if(target_mob.mind)
target_mob.mind.AddSpell(new_spell)
else
diff --git a/code/modules/antagonists/changeling/cellular_emporium.dm b/code/modules/antagonists/changeling/cellular_emporium.dm
index 0e1e86baa8f..84aae218a10 100644
--- a/code/modules/antagonists/changeling/cellular_emporium.dm
+++ b/code/modules/antagonists/changeling/cellular_emporium.dm
@@ -95,7 +95,6 @@
/datum/action/innate/cellular_emporium/New(our_target)
. = ..()
- button.name = name
if(istype(our_target, /datum/cellular_emporium))
cellular_emporium = our_target
else
diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm
index 32c29c05105..835e13cfb36 100644
--- a/code/modules/antagonists/changeling/powers/fakedeath.dm
+++ b/code/modules/antagonists/changeling/powers/fakedeath.dm
@@ -18,7 +18,7 @@
name = "Reviving Stasis"
desc = "We fall into a stasis, allowing us to regenerate and trick our enemies."
button_icon_state = "fake_death"
- UpdateButtonIcon()
+ UpdateButtons()
chemical_cost = 15
to_chat(user, span_notice("We have revived ourselves."))
else
@@ -58,7 +58,7 @@
name = "Revive"
desc = "We arise once more."
button_icon_state = "revive"
- UpdateButtonIcon()
+ UpdateButtons()
chemical_cost = 0
revive_ready = TRUE
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index df9db661adb..d08db4802ea 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -2,15 +2,10 @@
name = "Prepare Blood Magic"
button_icon_state = "carve"
desc = "Prepare blood magic by carving runes into your flesh. This is easier with an empowering rune."
+ default_button_position = DEFAULT_BLOODSPELLS
var/list/spells = list()
var/channeling = FALSE
-/datum/action/innate/cult/blood_magic/Grant()
- ..()
- button.screen_loc = DEFAULT_BLOODSPELLS
- button.moved = DEFAULT_BLOODSPELLS
- button.ordered = FALSE
-
/datum/action/innate/cult/blood_magic/Remove()
for(var/X in spells)
qdel(X)
@@ -22,15 +17,21 @@
return ..()
/datum/action/innate/cult/blood_magic/proc/Positioning()
- var/list/screen_loc_split = splittext(button.screen_loc,",")
- var/list/screen_loc_X = splittext(screen_loc_split[1],":")
- var/list/screen_loc_Y = splittext(screen_loc_split[2],":")
- var/pix_X = text2num(screen_loc_X[2])
- for(var/datum/action/innate/cult/blood_spell/B in spells)
- if(B.button.locked)
- var/order = pix_X+spells.Find(B)*31
- B.button.screen_loc = "[screen_loc_X[1]]:[order],[screen_loc_Y[1]]:[screen_loc_Y[2]]"
- B.button.moved = B.button.screen_loc
+ for(var/datum/hud/hud as anything in viewers)
+ var/our_view = hud.mymob?.client?.view || "15x15"
+ var/atom/movable/screen/movable/action_button/button = viewers[hud]
+ var/position = screen_loc_to_offset(button.screen_loc)
+ var/spells_iterated = 0
+ for(var/datum/action/innate/cult/blood_spell/blood_spell in spells)
+ spells_iterated += 1
+ if(blood_spell.positioned)
+ continue
+ var/atom/movable/screen/movable/action_button/moving_button = blood_spell.viewers[hud]
+ if(!moving_button)
+ continue
+ var/our_x = position[1] + spells_iterated * world.icon_size // Offset any new buttons into our list
+ hud.position_action(moving_button, offset_to_screen_loc(our_x, position[2], our_view))
+ blood_spell.positioned = TRUE
/datum/action/innate/cult/blood_magic/Activate()
var/rune = FALSE
@@ -97,6 +98,8 @@
var/base_desc //To allow for updating tooltips
var/invocation
var/health_cost = 0
+ /// Have we already been positioned into our starting location?
+ var/positioned = FALSE
/datum/action/innate/cult/blood_spell/Grant(mob/living/owner, datum/action/innate/cult/blood_magic/BM)
if(health_cost)
@@ -104,9 +107,7 @@
base_desc = desc
desc += "
Has [charges] use\s remaining."
all_magic = BM
- ..()
- button.locked = TRUE
- button.ordered = FALSE
+ return ..()
/datum/action/innate/cult/blood_spell/Remove()
if(all_magic)
@@ -275,7 +276,7 @@
attached_action.charges--
attached_action.desc = attached_action.base_desc
attached_action.desc += "
Has [attached_action.charges] use\s remaining."
- attached_action.UpdateButtonIcon()
+ attached_action.UpdateButtons()
if(attached_action.charges <= 0)
remove_ranged_ability(span_cult("You have exhausted the spell's power!"))
qdel(src)
@@ -331,7 +332,7 @@
qdel(src)
desc = base_desc
desc += "
Has [charges] use\s remaining."
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/innate/cult/blood_spell/manipulation
name = "Blood Rites"
@@ -380,7 +381,7 @@
source.charges = uses
source.desc = source.base_desc
source.desc += "
Has [uses] use\s remaining."
- source.UpdateButtonIcon()
+ source.UpdateButtons()
return ..()
/obj/item/melee/blood_magic/attack_self(mob/living/user)
@@ -409,7 +410,7 @@
else if(source)
source.desc = source.base_desc
source.desc += "
Has [uses] use\s remaining."
- source.UpdateButtonIcon()
+ source.UpdateButtons()
//Stun
/obj/item/melee/blood_magic/stun
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 3d54936f0fd..c4f7758c0c6 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -805,14 +805,13 @@ Striking a noncultist, however, will tear their flesh."}
desc = "Call the bloody halberd back to your hand!"
background_icon_state = "bg_demon"
button_icon_state = "bloodspear"
+ default_button_position = "6:157,4:-2"
var/obj/item/melee/cultblade/halberd/halberd
var/cooldown = 0
/datum/action/innate/cult/halberd/Grant(mob/user, obj/blood_halberd)
. = ..()
halberd = blood_halberd
- button.screen_loc = "6:157,4:-2"
- button.moved = "6:157,4:-2"
/datum/action/innate/cult/halberd/Activate()
if(owner == halberd.loc || cooldown > world.time)
diff --git a/code/modules/antagonists/heretic/heretic_living_heart.dm b/code/modules/antagonists/heretic/heretic_living_heart.dm
index a619e242376..8609a0d96de 100644
--- a/code/modules/antagonists/heretic/heretic_living_heart.dm
+++ b/code/modules/antagonists/heretic/heretic_living_heart.dm
@@ -43,7 +43,7 @@
organ_parent.icon = 'icons/obj/eldritch.dmi'
organ_parent.icon_state = "living_heart"
- action.UpdateButtonIcon()
+ action.UpdateButtons()
/datum/component/living_heart/Destroy(force, silent)
QDEL_NULL(action)
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index 8250450a4d4..0cdf7ef5ff1 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -189,7 +189,7 @@
user.reveal(reveal)
user.stun(stun)
if(action)
- action.UpdateButtonIcon()
+ action.UpdateButtons()
return TRUE
//Overload Light: Breaks a light that's online and sends out lightning bolts to all nearby people.
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index 29bc273c602..cb331aac9e8 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -430,7 +430,6 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
/datum/action/innate/ai/ranged/override_machine/New()
..()
desc = "[desc] It has [uses] use\s remaining."
- button.desc = desc
/datum/action/innate/ai/ranged/override_machine/proc/animate_machine(obj/machinery/M)
if(M && !QDELETED(M))
@@ -458,7 +457,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
attached_action.adjust_uses(-1)
if(attached_action?.uses)
attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining."
- attached_action.UpdateButtonIcon()
+ attached_action.UpdateButtons()
target.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [target]!"))
addtimer(CALLBACK(attached_action, /datum/action/innate/ai/ranged/override_machine.proc/animate_machine, target), 50) //kabeep!
remove_ranged_ability(span_danger("Sending override signal..."))
@@ -508,7 +507,6 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
/datum/action/innate/ai/ranged/overload_machine/New()
..()
desc = "[desc] It has [uses] use\s remaining."
- button.desc = desc
/datum/action/innate/ai/ranged/overload_machine/proc/detonate_machine(obj/machinery/M)
if(M && !QDELETED(M))
@@ -541,7 +539,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
attached_action.adjust_uses(-1)
if(attached_action?.uses)
attached_action.desc = "[initial(attached_action.desc)] It has [attached_action.uses] use\s remaining."
- attached_action.UpdateButtonIcon()
+ attached_action.UpdateButtons()
target.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [target]!"))
addtimer(CALLBACK(attached_action, /datum/action/innate/ai/ranged/overload_machine.proc/detonate_machine, target), 50) //kaboom!
remove_ranged_ability(span_danger("Overcharging machine..."))
@@ -566,7 +564,6 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
/datum/action/innate/ai/blackout/New()
..()
desc = "[desc] It has [uses] use\s remaining."
- button.desc = desc
/datum/action/innate/ai/blackout/Activate()
for(var/obj/machinery/power/apc/apc in GLOB.apcs_list)
@@ -577,9 +574,10 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
to_chat(owner, span_notice("Overcurrent applied to the powernet."))
owner.playsound_local(owner, SFX_SPARKS, 50, 0)
adjust_uses(-1)
- if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe
- desc = "[initial(desc)] It has [uses] use\s remaining."
- UpdateButtonIcon()
+ if(QDELETED(src) || uses) //Not sure if not having src here would cause a runtime, so it's here to be safe
+ return
+ desc = "[initial(desc)] It has [uses] use\s remaining."
+ UpdateButtons()
/// HIGH IMPACT HONKING
/datum/ai_module/destructive/megahonk
@@ -785,7 +783,6 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
/datum/action/innate/ai/reactivate_cameras/New()
..()
desc = "[desc] It has [uses] use\s remaining."
- button.desc = desc
/datum/action/innate/ai/reactivate_cameras/Activate()
var/fixed_cameras = 0
@@ -801,9 +798,10 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
to_chat(owner, span_notice("Diagnostic complete! Cameras reactivated: [fixed_cameras]. Reactivations remaining: [uses]."))
owner.playsound_local(owner, 'sound/items/wirecutter.ogg', 50, 0)
adjust_uses(0, TRUE) //Checks the uses remaining
- if(src && uses) //Not sure if not having src here would cause a runtime, so it's here to be safe
- desc = "[initial(desc)] It has [uses] use\s remaining."
- UpdateButtonIcon()
+ if(QDELETED(src) || !uses) //Not sure if not having src here would cause a runtime, so it's here to be safe
+ return
+ desc = "[initial(desc)] It has [uses] use\s remaining."
+ UpdateButtons()
/// Upgrade Camera Network: EMP-proofs all cameras, in addition to giving them X-ray vision.
/datum/ai_module/upgrade/upgrade_cameras
diff --git a/code/modules/antagonists/traitor/equipment/module_picker.dm b/code/modules/antagonists/traitor/equipment/module_picker.dm
index c11ace042d3..001f4434652 100644
--- a/code/modules/antagonists/traitor/equipment/module_picker.dm
+++ b/code/modules/antagonists/traitor/equipment/module_picker.dm
@@ -120,6 +120,6 @@
else //Adding uses to an existing module
action.uses += initial(action.uses)
action.desc = "[initial(action.desc)] It has [action.uses] use\s remaining."
- action.UpdateButtonIcon()
+ action.UpdateButtons()
processing_time -= AM.cost
SSblackbox.record_feedback("nested tally", "malfunction_modules_bought", 1, list("[initial(AM.name)]", "[AM.cost]"))
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index fe324b6d665..2d32aa99586 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -166,14 +166,15 @@
var/obj/item/active_mousedown_item = null
///Used in MouseDrag to preserve the original mouse click parameters
var/mouseParams = ""
- ///Used in MouseDrag to preserve the last mouse-entered location.
- var/mouseLocation = null
- ///Used in MouseDrag to preserve the last mouse-entered object.
- var/mouseObject = null
+ ///Used in MouseDrag to preserve the last mouse-entered location. Weakref
+ var/datum/weakref/mouse_location_ref = null
+ ///Used in MouseDrag to preserve the last mouse-entered object. Weakref
+ var/datum/weakref/mouse_object_ref
//Middle-mouse-button click dragtime control for aimbot exploit detection.
var/middragtime = 0
- //Middle-mouse-button clicked object control for aimbot exploit detection.
- var/atom/middragatom
+ //Middle-mouse-button clicked object control for aimbot exploit detection. Weakref
+ var/datum/weakref/middle_drag_atom_ref
+
/// Messages currently seen by this client
var/list/seen_messages
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index d3628060cdc..99d6db75ea2 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -879,7 +879,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(dragged && !LAZYACCESS(modifiers, dragged)) //I don't know what's going on here, but I don't trust it
return
- if (object && object == middragatom && LAZYACCESS(modifiers, LEFT_CLICK))
+ if (object && IS_WEAKREF_OF(object, middle_drag_atom_ref) && LAZYACCESS(modifiers, LEFT_CLICK))
ab = max(0, 5 SECONDS-(world.time-middragtime)*0.1)
var/mcl = CONFIG_GET(number/minute_click_limit)
@@ -928,6 +928,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
else
winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED]")
+ SEND_SIGNAL(src, COMSIG_CLIENT_CLICK, object, location, control, params, usr)
+
..()
/client/proc/add_verbs_from_config()
diff --git a/code/modules/client/preferences/buttons_locked.dm b/code/modules/client/preferences/buttons_locked.dm
deleted file mode 100644
index b4f54ff10f8..00000000000
--- a/code/modules/client/preferences/buttons_locked.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/datum/preference/toggle/buttons_locked
- category = PREFERENCE_CATEGORY_GAME_PREFERENCES
- savefile_key = "buttons_locked"
- savefile_identifier = PREFERENCE_PLAYER
- default_value = FALSE
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 838a5304d11..a4224e8bf79 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -164,8 +164,8 @@
..()
/datum/action/item_action/chameleon/change/proc/initialize_disguises()
- if(button)
- button.name = "Change [chameleon_name] Appearance"
+ name = "Change [chameleon_name] Appearance"
+ UpdateButtons()
chameleon_blacklist |= typecacheof(target.type)
for(var/V in typesof(chameleon_type))
@@ -210,7 +210,7 @@
update_item(picked_item)
var/obj/item/thing = target
thing.update_slot_icon()
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item)
var/atom/atom_target = target
@@ -326,8 +326,8 @@
agent_card.update_icon()
/datum/action/item_action/chameleon/change/id_trim/initialize_disguises()
- if(button)
- button.name = "Change [chameleon_name] Appearance"
+ name = "Change [chameleon_name] Appearance"
+ UpdateButtons()
chameleon_blacklist |= typecacheof(target.type)
for(var/trim_path in typesof(chameleon_type))
@@ -525,9 +525,9 @@
ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
chameleon_action.random_look()
var/datum/action/item_action/chameleon/drone/togglehatmask/togglehatmask_action = new(src)
- togglehatmask_action.UpdateButtonIcon()
+ togglehatmask_action.UpdateButtons()
var/datum/action/item_action/chameleon/drone/randomise/randomise_action = new(src)
- randomise_action.UpdateButtonIcon()
+ randomise_action.UpdateButtons()
/obj/item/clothing/mask/chameleon
name = "gas mask"
@@ -580,9 +580,9 @@
ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
chameleon_action.random_look()
var/datum/action/item_action/chameleon/drone/togglehatmask/togglehatmask_action = new(src)
- togglehatmask_action.UpdateButtonIcon()
+ togglehatmask_action.UpdateButtons()
var/datum/action/item_action/chameleon/drone/randomise/randomise_action = new(src)
- randomise_action.UpdateButtonIcon()
+ randomise_action.UpdateButtons()
/obj/item/clothing/mask/chameleon/drone/attack_self(mob/user)
to_chat(user, span_notice("[src] does not have a voice changer."))
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index 5b484f3522a..4592dec8e1f 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -210,7 +210,7 @@ Doesn't work on other aliens/AI.*/
/obj/effect/proc_holder/alien/neurotoxin/update_icon()
action.button_icon_state = "alien_neurotoxin_[active]"
- action.UpdateButtonIcon()
+ action.UpdateButtons()
return ..()
/obj/effect/proc_holder/alien/neurotoxin/InterceptClickOn(mob/living/caller, params, atom/target)
@@ -332,7 +332,7 @@ Doesn't work on other aliens/AI.*/
for(var/X in abilities)
var/obj/effect/proc_holder/alien/APH = X
if(APH.has_action)
- APH.action.UpdateButtonIcon()
+ APH.action.UpdateButtons()
return TRUE
/mob/living/carbon/alien/adjustPlasma(amount)
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 0716b39bcb2..0f4d4629cb5 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -569,9 +569,9 @@
spark_system.start()
do_teleport(H, get_turf(H), 12, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
last_teleport = world.time
- UpdateButtonIcon() //action icon looks unavailable
+ UpdateButtons() //action icon looks unavailable
//action icon looks available again
- addtimer(CALLBACK(src, .proc/UpdateButtonIcon), cooldown + 5)
+ addtimer(CALLBACK(src, .proc/UpdateButtons), cooldown + 5)
//honk
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index b62f969d1e7..1988641a375 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -60,7 +60,7 @@
Cannibalize_Body(H)
if(regenerate_limbs)
- regenerate_limbs.UpdateButtonIcon()
+ regenerate_limbs.UpdateButtons()
/datum/species/jelly/proc/Cannibalize_Body(mob/living/carbon/human/H)
var/list/limbs_to_consume = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) - H.get_missing_limbs()
@@ -466,9 +466,9 @@
/datum/species/jelly/luminescent/proc/update_slime_actions()
integrate_extract.update_name()
- integrate_extract.UpdateButtonIcon()
- extract_minor.UpdateButtonIcon()
- extract_major.UpdateButtonIcon()
+ integrate_extract.UpdateButtons()
+ extract_minor.UpdateButtons()
+ extract_major.UpdateButtons()
/datum/species/jelly/luminescent/proc/update_glow(mob/living/carbon/C, intensity)
if(intensity)
@@ -507,7 +507,7 @@
name = "Eject Extract"
desc = "Eject your current slime extract."
-/datum/action/innate/integrate_extract/UpdateButtonIcon(status_only, force)
+/datum/action/innate/integrate_extract/UpdateButtons(status_only, force)
var/datum/species/jelly/luminescent/species = target
if(!species || !species.current_extract)
button_icon_state = "slimeconsume"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 8e5578c80b2..234e4eb8c02 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -750,7 +750,7 @@
if(mind)
for(var/S in mind.spell_list)
var/obj/effect/proc_holder/spell/spell = S
- spell.updateButtonIcon()
+ spell.updateButtons()
if(excess_healing)
INVOKE_ASYNC(src, .proc/emote, "gasp")
log_combat(src, src, "revived")
diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
index 493ec9ef5c2..77605191fa5 100644
--- a/code/modules/mob/living/silicon/robot/robot_model.dm
+++ b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -484,7 +484,7 @@
if(!wash_audio.is_active())
wash_audio.start()
clean()
- UpdateButtonIcon()
+ UpdateButtons()
/// Start the process of disabling the buffer. Plays some effects, waits a bit, then finishes
/datum/action/toggle_buffer/proc/deactivate_wash()
@@ -514,7 +514,7 @@
var/mob/living/silicon/robot/robot_owner = owner
buffer_on = FALSE
robot_owner.remove_movespeed_modifier(/datum/movespeed_modifier/auto_wash)
- UpdateButtonIcon()
+ UpdateButtons()
/// Should we keep trying to activate our buffer, or did you fuck it up somehow
/datum/action/toggle_buffer/proc/allow_buffer_activate()
@@ -551,7 +551,7 @@
// We use more water doing this then mopping
reagents.remove_any(2) //reaction() doesn't use up the reagents
-/datum/action/toggle_buffer/UpdateButtonIcon(status_only = FALSE, force = FALSE)
+/datum/action/toggle_buffer/UpdateButtons(status_only = FALSE, force = FALSE)
if(buffer_on)
name = "De-Activate Auto-Wash"
button_icon_state = "deactivate_wash"
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 46762c1759e..7db0ef33636 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -54,21 +54,18 @@
ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
var/spellnum = 1
for(var/spell in construct_spells)
- var/the_spell = new spell(null)
- AddSpell(the_spell)
- var/obj/effect/proc_holder/spell/S = mob_spell_list[spellnum]
var/pos = 2+spellnum*31
if(construct_spells.len >= 4)
pos -= 31*(construct_spells.len - 4)
- S.action.button.screen_loc = "6:[pos],4:-2"
- S.action.button.moved = "6:[pos],4:-2"
+ var/obj/effect/proc_holder/spell/the_spell = new spell(null)
+ the_spell?.action.default_button_position ="6:[pos],4:-2"
+ AddSpell(the_spell)
spellnum++
if(runetype)
- our_rune = new runetype(src)
- our_rune.Grant(src)
var/pos = 2+spellnum*31
- our_rune.button.screen_loc = "6:[pos],4:-2"
- our_rune.button.moved = "6:[pos],4:-2"
+ our_rune = new runetype(src)
+ our_rune.default_button_position = "6:[pos],4:-2" // Set the default position to this random position
+ our_rune.Grant(src)
if(icon_state)
add_overlay("glow_[icon_state]_[theme]")
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 883148c4b20..facffb201ce 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -337,7 +337,7 @@
if(ishuman(living_target) && (living_target.stat != DEAD || !consumed_mobs[living_target.tag])) //if they're not dead, you can consume them anyway
consumed_mobs[living_target.tag] = TRUE
fed++
- lay_eggs_enriched.UpdateButtonIcon(TRUE)
+ lay_eggs_enriched.UpdateButtons(TRUE)
visible_message(span_danger("[src] sticks a proboscis into [living_target] and sucks a viscous substance out."),span_notice("You suck the nutriment out of [living_target], feeding you enough to lay a cluster of eggs."))
living_target.death() //you just ate them, they're dead.
else
@@ -403,7 +403,7 @@
/obj/effect/proc_holder/wrap/update_icon()
action.button_icon_state = "wrap_[active]"
- action.UpdateButtonIcon()
+ action.UpdateButtons()
return ..()
/obj/effect/proc_holder/wrap/Click()
@@ -486,7 +486,7 @@
new_eggs.faction = spider.faction
if(enriched)
spider.fed--
- UpdateButtonIcon(TRUE)
+ UpdateButtons(TRUE)
spider.is_busy = FALSE
spider.stop_automated_movement = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index c8f26feeb26..b29de2f72bc 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -77,24 +77,32 @@ While using this makes the system rely on OnFire, it still gives options for tim
///The internal attack ID for the elite's OpenFire() proc to use
var/chosen_attack_num = 0
-/datum/action/innate/elite_attack/New()
- ..()
+/datum/action/innate/elite_attack/CreateButton()
+ var/atom/movable/screen/movable/action_button/button = ..()
button.maptext = ""
button.maptext_x = 8
button.maptext_y = 0
button.maptext_width = 24
button.maptext_height = 12
+ return button
/datum/action/innate/elite_attack/process()
if(owner == null)
STOP_PROCESSING(SSfastprocess, src)
qdel(src)
return
+ UpdateButtons()
+
+/datum/action/innate/elite_attack/UpdateButton(atom/movable/screen/movable/action_button/button, status_only = FALSE, force = FALSE)
+ . = ..()
+ if(!.)
+ return
+ if(status_only)
+ return
var/mob/living/simple_animal/hostile/asteroid/elite/elite_owner = owner
var/timeleft = max(elite_owner.ranged_cooldown - world.time, 0)
if(timeleft == 0)
button.maptext = ""
- UpdateButtonIcon()
else
button.maptext = "[round(timeleft/10, 0.1)]"
diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm
index c49f43d85d7..b8634f35640 100644
--- a/code/modules/mod/mod_actions.dm
+++ b/code/modules/mod/mod_actions.dm
@@ -72,7 +72,7 @@
button_icon_state = "activate-ready"
if(!ai_action)
background_icon_state = "bg_tech"
- UpdateButtonIcon()
+ UpdateButtons()
addtimer(CALLBACK(src, .proc/reset_ready), 3 SECONDS)
return
var/obj/item/mod/control/mod = target
@@ -85,7 +85,7 @@
button_icon_state = initial(button_icon_state)
if(!ai_action)
background_icon_state = initial(background_icon_state)
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/item_action/mod/activate/ai
ai_action = TRUE
@@ -180,14 +180,14 @@
/datum/action/item_action/mod/pinned_module/proc/on_module_activate(datum/source)
SIGNAL_HANDLER
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/item_action/mod/pinned_module/proc/on_module_deactivate(datum/source)
SIGNAL_HANDLER
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/item_action/mod/pinned_module/proc/on_module_use(datum/source)
SIGNAL_HANDLER
- UpdateButtonIcon()
+ UpdateButtons()
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 0a71c1e4f6b..39152ac9c83 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -458,7 +458,7 @@
for(var/obj/item/item in buckled_mob.held_items)
if(istype(item, /obj/item/turret_control))
qdel(item)
- UpdateButtonIcon()
+ UpdateButtons()
return
playsound(proto_emitter,'sound/mecha/mechmove01.ogg', 50, TRUE)
name = "Switch to Automatic Firing"
@@ -475,7 +475,7 @@
else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
var/obj/item/turret_control/turret_control = new /obj/item/turret_control()
buckled_mob.put_in_hands(turret_control)
- UpdateButtonIcon()
+ UpdateButtons()
/obj/item/turret_control
diff --git a/code/modules/projectiles/guns/energy/beam_rifle.dm b/code/modules/projectiles/guns/energy/beam_rifle.dm
index 1942417a1f2..01a2e87700d 100644
--- a/code/modules/projectiles/guns/energy/beam_rifle.dm
+++ b/code/modules/projectiles/guns/energy/beam_rifle.dm
@@ -196,7 +196,9 @@
else
P.color = rgb(0, 255, 0)
var/turf/curloc = get_turf(src)
- var/turf/targloc = get_turf(current_user.client.mouseObject)
+
+ var/atom/target_atom = current_user.client.mouse_object_ref?.resolve()
+ var/turf/targloc = get_turf(target_atom)
if(!istype(targloc))
if(!istype(curloc))
return
@@ -293,7 +295,9 @@
process_aim()
if(aiming_time_left <= aiming_time_fire_threshold && check_user())
sync_ammo()
- afterattack(M.client.mouseObject, M, FALSE, M.client.mouseParams, passthrough = TRUE)
+ var/atom/target = M.client.mouse_object_ref?.resolve()
+ if(target)
+ afterattack(target, M, FALSE, M.client.mouseParams, passthrough = TRUE)
stop_aiming()
QDEL_LIST(current_tracers)
return ..()
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 0a5600c6f88..7042f2a4423 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -949,12 +949,10 @@
var/ty = (text2num(screen_loc_Y[1]) - 1) * world.icon_size + text2num(screen_loc_Y[2])
//Calculate the "resolution" of screen based on client's view and world's icon size. This will work if the user can view more tiles than average.
- var/list/screenview = getviewsize(user.client.view)
- var/screenviewX = screenview[1] * world.icon_size
- var/screenviewY = screenview[2] * world.icon_size
+ var/list/screenview = view_to_pixels(user.client.view)
- var/ox = round(screenviewX/2) - user.client.pixel_x //"origin" x
- var/oy = round(screenviewY/2) - user.client.pixel_y //"origin" y
+ var/ox = round(screenview[1] / 2) - user.client.pixel_x //"origin" x
+ var/oy = round(screenview[2] / 2) - user.client.pixel_y //"origin" y
angle = ATAN2(tx - oy, ty - ox)
return list(angle, p_x, p_y)
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index de944eb4ca6..5501eb73d2c 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -231,7 +231,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if("holdervar")
adjust_var(user, holder_var_type, holder_var_amount)
if(action)
- action.UpdateButtonIcon()
+ action.UpdateButtons()
return TRUE
/obj/effect/proc_holder/spell/proc/charge_check(mob/user, silent = FALSE)
@@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if(recharging && charge_type == "recharge" && (charge_counter < charge_max))
charge_counter += delta_time * 10
if(charge_counter >= charge_max)
- action.UpdateButtonIcon()
+ action.UpdateButtons()
charge_counter = charge_max
recharging = FALSE
@@ -321,7 +321,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
cast(targets,user=user)
after_cast(targets)
if(action)
- action.UpdateButtonIcon()
+ action.UpdateButtons()
/obj/effect/proc_holder/spell/proc/before_cast(list/targets)
if(overlay)
@@ -382,7 +382,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if("holdervar")
adjust_var(user, holder_var_type, -holder_var_amount)
if(action)
- action.UpdateButtonIcon()
+ action.UpdateButtons()
/obj/effect/proc_holder/spell/proc/adjust_var(mob/living/target = usr, type, amount) //handles the adjustment of the var when the spell is used. has some hardcoded types
if (!istype(target))
@@ -507,8 +507,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
perform(targets,user=user)
-/obj/effect/proc_holder/spell/proc/updateButtonIcon(status_only, force)
- action.UpdateButtonIcon(status_only, force)
+/obj/effect/proc_holder/spell/proc/updateButtons(status_only, force)
+ action.UpdateButtons(status_only, force)
/obj/effect/proc_holder/spell/proc/can_be_cast_by(mob/caster)
if((human_req || clothes_req) && !ishuman(caster))
diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm
index 8e35be95735..c8432f4bb1d 100644
--- a/code/modules/spells/spell_types/aimed.dm
+++ b/code/modules/spells/spell_types/aimed.dm
@@ -46,7 +46,7 @@
. = ..()
action.button_icon_state = "[base_icon_state][active]"
- action.UpdateButtonIcon()
+ action.UpdateButtons()
/obj/effect/proc_holder/spell/aimed/InterceptClickOn(mob/living/caller, params, atom/target)
if(..())
diff --git a/code/modules/spells/spell_types/pointed/pointed.dm b/code/modules/spells/spell_types/pointed/pointed.dm
index bf5d818f2ce..94676ba64ac 100644
--- a/code/modules/spells/spell_types/pointed/pointed.dm
+++ b/code/modules/spells/spell_types/pointed/pointed.dm
@@ -62,7 +62,7 @@
. = ..()
action.button_icon_state = "[action_icon_state][active ? 1 : null]"
- action.UpdateButtonIcon()
+ action.UpdateButtons()
/obj/effect/proc_holder/spell/pointed/InterceptClickOn(mob/living/caller, params, atom/target)
if(..())
diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm
index d492d0d792b..6267706074f 100644
--- a/code/modules/spells/spell_types/touch_attacks.dm
+++ b/code/modules/spells/spell_types/touch_attacks.dm
@@ -25,7 +25,7 @@
//Start recharging.
attached_hand = null
recharging = TRUE
- action.UpdateButtonIcon()
+ action.UpdateButtons()
/obj/effect/proc_holder/spell/targeted/touch/cast(list/targets,mob/user = usr)
if(!QDELETED(attached_hand))
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
index 1fef114b341..ece7c70b8ed 100644
--- a/code/modules/surgery/dental_implant.dm
+++ b/code/modules/surgery/dental_implant.dm
@@ -23,7 +23,8 @@
user.transferItemToLoc(tool, target, TRUE)
var/datum/action/item_action/hands_free/activate_pill/pill_action = new(tool)
- pill_action.button.name = "Activate [tool.name]"
+ pill_action.name = "Activate [tool.name]"
+ pill_action.UpdateButtons()
pill_action.target = tool
pill_action.Grant(target) //The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index 11ab9bb803b..83bbe5f2995 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -87,13 +87,13 @@ Notes:
/datum/tooltip/proc/hide()
+ queueHide = showing ? TRUE : FALSE
+
if (queueHide)
addtimer(CALLBACK(src, .proc/do_hide), 1)
else
do_hide()
- queueHide = showing ? TRUE : FALSE
-
return TRUE
/datum/tooltip/proc/do_hide()
diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html
index b4d858da51b..5be29994cf1 100644
--- a/code/modules/tooltip/tooltip.html
+++ b/code/modules/tooltip/tooltip.html
@@ -130,21 +130,29 @@
//alert(realIconSize + ' | ' +tooltip.tileSize + ' | ' + resizeRatio); //DEBUG
- //Parse out the tile and cursor locations from params (e.g. "icon-x=32;icon-y=29;screen-loc=3:10,15:29")
+ const parameters = new Object();
+
+ //Parse out the contents of params (e.g. "icon-x=32;icon-y=29;screen-loc=3:10,15:29")
+ //It is worth noting that params is not always ordered in the same way. We therefore need to write the code
+ //To load their values in independantly of their order
var paramsA = tooltip.params.cursor.split(';');
- if (paramsA.length < 3) {return false;} //Sometimes screen-loc is never sent ahaha fuck you byond
+ for (var i = 0; i < paramsA.length; i++) {
+ var entry = paramsA[i];
+ var nameAndValue = entry.split("=");
+ parameters[nameAndValue[0]] = nameAndValue[1];
+ }
+
+ //Sometimes screen-loc is never sent ahaha fuck you byond
+ if (!parameters["icon-x"] || !parameters["icon-y"] || !parameters["screen-loc"]) {
+ return false;
+ }
//icon-x
- var iconX = paramsA[0];
- iconX = iconX.split('=');
- iconX = parseInt(iconX[1]);
+ var iconX = parseInt(parameters["icon-x"]);
//icon-y
- var iconY = paramsA[1];
- iconY = iconY.split('=');
- iconY = parseInt(iconY[1]);
+ var iconY = parseInt(parameters["icon-y"]);
//screen-loc
- var screenLoc = paramsA[2];
- screenLoc = screenLoc.split('=');
- screenLoc = screenLoc[1].split(',');
+ var screenLoc = parameters["screen-loc"];
+ screenLoc = screenLoc.split(',');
if (screenLoc.length < 2) {return false;}
var left = screenLoc[0];
var top = screenLoc[1];
diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm
index 862f4fcdb8c..fc8f624e320 100644
--- a/code/modules/vehicles/mecha/combat/durand.dm
+++ b/code/modules/vehicles/mecha/combat/durand.dm
@@ -212,7 +212,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
for(var/occupant in chassis.occupants)
var/datum/action/button = chassis.occupant_actions[occupant][/datum/action/vehicle/sealed/mecha/mech_defense_mode]
button.button_icon_state = "mech_defense_mode_[chassis.defense_mode ? "on" : "off"]"
- button.UpdateButtonIcon()
+ button.UpdateButtons()
set_light_on(chassis.defense_mode)
diff --git a/code/modules/vehicles/mecha/combat/gygax.dm b/code/modules/vehicles/mecha/combat/gygax.dm
index 43824350ee0..5f23d21b82f 100644
--- a/code/modules/vehicles/mecha/combat/gygax.dm
+++ b/code/modules/vehicles/mecha/combat/gygax.dm
@@ -44,7 +44,7 @@
chassis.movedelay = initial(chassis.movedelay)
chassis.step_energy_drain = chassis.normal_step_energy_drain
chassis.balloon_alert(owner, "you disable the overload")
- UpdateButtonIcon()
+ UpdateButtons()
/obj/vehicle/sealed/mecha/combat/gygax/dark
desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications."
diff --git a/code/modules/vehicles/mecha/combat/marauder.dm b/code/modules/vehicles/mecha/combat/marauder.dm
index b0cfd022e0c..9e67af31838 100644
--- a/code/modules/vehicles/mecha/combat/marauder.dm
+++ b/code/modules/vehicles/mecha/combat/marauder.dm
@@ -69,7 +69,7 @@
SEND_SOUND(owner, sound('sound/mecha/imag_enh.ogg', volume=50))
else
owner.client.view_size.resetToDefault()
- UpdateButtonIcon()
+ UpdateButtons()
/obj/vehicle/sealed/mecha/combat/marauder/seraph
desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel."
diff --git a/code/modules/vehicles/mecha/combat/phazon.dm b/code/modules/vehicles/mecha/combat/phazon.dm
index 16dc0ce3555..643caf402b0 100644
--- a/code/modules/vehicles/mecha/combat/phazon.dm
+++ b/code/modules/vehicles/mecha/combat/phazon.dm
@@ -44,7 +44,7 @@
chassis.damtype = new_damtype
button_icon_state = "mech_damtype_[new_damtype]"
playsound(chassis, 'sound/mecha/mechmove01.ogg', 50, TRUE)
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/vehicle/sealed/mecha/mech_toggle_phasing
name = "Toggle Phasing"
@@ -56,4 +56,4 @@
chassis.phasing = chassis.phasing ? "" : "phasing"
button_icon_state = "mech_phasing_[chassis.phasing ? "on" : "off"]"
chassis.balloon_alert(owner, "[chassis.phasing ? "enabled" : "disabled"] phasing")
- UpdateButtonIcon()
+ UpdateButtons()
diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index c50314d7a60..3b28c661952 100644
--- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -117,8 +117,8 @@
return
S_TIMER_COOLDOWN_START(chassis, COOLDOWN_MECHA_SKYFALL, skyfall_cooldown_time)
button_icon_state = "mech_savannah_cooldown"
- UpdateButtonIcon()
- addtimer(CALLBACK(src, /datum/action/vehicle/sealed/mecha/skyfall.proc/reset_button_icon), skyfall_cooldown_time)
+ UpdateButtons()
+ addtimer(CALLBACK(src, .proc/reset_button_icon), skyfall_cooldown_time)
for(var/mob/living/shaken in range(7, chassis))
shake_camera(shaken, 3, 3)
@@ -219,7 +219,7 @@
*/
/datum/action/vehicle/sealed/mecha/skyfall/proc/reset_button_icon()
button_icon_state = "mech_savannah"
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/vehicle/sealed/mecha/ivanov_strike
name = "Ivanov Strike"
@@ -254,7 +254,7 @@
*/
/datum/action/vehicle/sealed/mecha/ivanov_strike/proc/reset_button_icon()
button_icon_state = "mech_ivanov"
- UpdateButtonIcon()
+ UpdateButtons()
/**
* ## start_missile_targeting
@@ -322,7 +322,7 @@
"explosionSize" = list(0,0,1,2)
))
button_icon_state = "mech_ivanov_cooldown"
- UpdateButtonIcon()
+ UpdateButtons()
addtimer(CALLBACK(src, /datum/action/vehicle/sealed/mecha/ivanov_strike.proc/reset_button_icon), strike_cooldown_time)
//misc effects
diff --git a/code/modules/vehicles/mecha/mecha_actions.dm b/code/modules/vehicles/mecha/mecha_actions.dm
index 266a84a51f9..5cbd0c8c57a 100644
--- a/code/modules/vehicles/mecha/mecha_actions.dm
+++ b/code/modules/vehicles/mecha/mecha_actions.dm
@@ -38,7 +38,7 @@
button_icon_state = "mech_internals_[chassis.use_internal_tank ? "on" : "off"]"
chassis.balloon_alert(owner, "taking air from [chassis.use_internal_tank ? "internal airtank" : "environment"]")
chassis.log_message("Now taking air from [chassis.use_internal_tank?"internal airtank":"environment"].", LOG_MECHA)
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/vehicle/sealed/mecha/mech_toggle_lights
name = "Toggle Lights"
@@ -60,7 +60,7 @@
chassis.balloon_alert(owner, "toggled lights [chassis.mecha_flags & LIGHTS_ON ? "on":"off"]")
playsound(chassis,'sound/machines/clockcult/brass_skewer.ogg', 40, TRUE)
chassis.log_message("Toggled lights [(chassis.mecha_flags & LIGHTS_ON)?"on":"off"].", LOG_MECHA)
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/vehicle/sealed/mecha/mech_view_stats
name = "View Stats"
@@ -104,7 +104,7 @@
for(var/occupant in occupants)
var/datum/action/action = LAZYACCESSASSOC(occupant_actions, occupant, /datum/action/vehicle/sealed/mecha/strafe)
- action?.UpdateButtonIcon()
+ action?.UpdateButtons()
///swap seats, for two person mecha
/datum/action/vehicle/sealed/mecha/swap_seat
diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm
index 49454ce7402..7f55038ab17 100644
--- a/code/modules/vehicles/mecha/working/clarke.dm
+++ b/code/modules/vehicles/mecha/working/clarke.dm
@@ -86,10 +86,10 @@
return
var/mob/living/living_owner = owner
button_icon_state = "mech_search_ruins_cooldown"
- UpdateButtonIcon()
+ UpdateButtons()
COOLDOWN_START(src, search_cooldown, SEARCH_COOLDOWN)
addtimer(VARSET_CALLBACK(src, button_icon_state, "mech_search_ruins"), SEARCH_COOLDOWN)
- addtimer(CALLBACK(src, .proc/UpdateButtonIcon), SEARCH_COOLDOWN)
+ addtimer(CALLBACK(src, .proc/UpdateButtons), SEARCH_COOLDOWN)
var/obj/pinpointed_ruin
for(var/obj/effect/landmark/ruin/ruin_landmark as anything in GLOB.ruin_landmarks)
if(ruin_landmark.z != chassis.z)
diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm
index e0244f5b017..2990ebe568e 100644
--- a/code/modules/wiremod/shell/brain_computer_interface.dm
+++ b/code/modules/wiremod/shell/brain_computer_interface.dm
@@ -226,12 +226,16 @@
src.circuit_component = circuit_component
- button.maptext_x = 2
- button.maptext_y = 0
- update_maptext()
+ UpdateButtons()
START_PROCESSING(SSobj, src)
+/datum/action/innate/bci_charge_action/CreateButton()
+ var/atom/movable/screen/movable/action_button/button = ..()
+ button.maptext_x = 2
+ button.maptext_y = 0
+ return button
+
/datum/action/innate/bci_charge_action/Destroy()
circuit_component.charge_action = null
circuit_component = null
@@ -250,9 +254,14 @@
to_chat(owner, span_info("You can recharge it by using a cyborg recharging station."))
/datum/action/innate/bci_charge_action/process(delta_time)
- update_maptext()
+ UpdateButtons()
-/datum/action/innate/bci_charge_action/proc/update_maptext()
+/datum/action/innate/bci_charge_action/UpdateButton(atom/movable/screen/movable/action_button/button, status_only = FALSE, force = FALSE)
+ . = ..()
+ if(!.)
+ return
+ if(status_only)
+ return
var/obj/item/stock_parts/cell/cell = circuit_component.parent.cell
button.maptext = cell ? MAPTEXT("[cell.percent()]%") : ""
diff --git a/icons/effects/mouse_pointers/screen_drag.dmi b/icons/effects/mouse_pointers/screen_drag.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..48e4fce85f7a47f6dbf35267945d64b0cf05a50c
GIT binary patch
literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=nN=YXB`&GO$wiq3C7Jno3=9=>
zRF4~SH7H21UAXyQM1Gfh6ZaN#
Y>3t^de`FVdQ&MBb@0DpvZ?EnA(
literal 0
HcmV?d00001
diff --git a/icons/hud/64x16_actions.dmi b/icons/hud/64x16_actions.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..ae81ace4d55a2c26a5c12fcfd6dcac28ee029db8
GIT binary patch
literal 3404
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
UWbCdm^m_!%jn5jD5}j}V9|Ff!mjD0&
literal 0
HcmV?d00001
diff --git a/icons/hud/actions.dmi b/icons/hud/actions.dmi
index 6e2421041106527cb1661e665377d04134f33011..f402659424723212062951d189a1bff7a8cb3434 100644
GIT binary patch
literal 8753
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
AO8@`>
literal 9016
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
FV1mRYv{wKC
diff --git a/icons/hud/screen_alien.dmi b/icons/hud/screen_alien.dmi
index 307c41075efb0393592910d9c1cddca02cbff33a..88791da700ba2efcf9e7377b335dc8d4c3cb6f09 100644
GIT binary patch
literal 20520
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