supersayu
475042a212
Fixes #646, #579, #863 Completely redoes the click code. Moves all click related code into code/_onclick for reference. Also moves hud datum code and all the screen object code I could find into code/_onclick/hud, as it is related. Item attack(), attackby(), afterattack(), and attack_self() have been moved into item_attack.dm for consistency. Completely removes dummy objects and adds atom.Adjacent(user). This proc checks for border items and anything marked with throwpass for determining whether or not you can reach a given square. A turf helper, ClickCross(), was added to facilitate this. Removes the monolithic Atom.Click() proc in favor of an overridable click handler attached to mobs. Click code no longer uses the : path operator as a consequence, and mob/lastDblClick has been moved to Client/next_click. A few end arounds were necessary (screen objects, buildmode, and spells), but this has been handled by repurposing Atom.Click(); if you have special click code, insert it in the object's Click() function and return 1 to prevent normal processing. This update adds support for attack_ghost(); the previous "new" click handler had support for it but was never finished. I have taken the liberty of letting ghosts click portals, the gateway, and the teleporter to jump to the intended target square, and kept the previous default action of examine()ing every damn thing you click. It is to be suggested that you could do more with this proc when ghost interactions are enabled. This update also adds support for double clicking. It is currently only used for ghosts and AIs, because the original (first) click still registers normally. For both of these, double clicking a square will jump you to it, and double clicking a mob will follow it. In the case of ghosts, double clicking bots and the singularity will also set you following it; if you double click your own corpse, you will re-enter it; this also works if your body is in a closet, sleeper, DNA scanner, etc. Default mobs ignore double clicks as normal. -- NOTE -- There are two flags which were previously unused or misused by click code: USEDELAY and NODELAY. Ostensibly, USEDELAY would double the normal 1sec delay, and NODELAY would remove it. Using either of these flags as intended would significantly affect the timing of the game. In particular, USEDELAY is currently applied to guns and about everything else that acts at range. I am adding USEDELAY as a half-second increase for now, but I have not put a significant amount of thought into it. I considered lowering the normal 1sec delay to .8sec to balance it, but the consequences of that on combat involve more calculations than I care to make. NODELAY seems to never have been used, and I did not implement it, but I could do so trivially.
166 lines
4.8 KiB
Plaintext
166 lines
4.8 KiB
Plaintext
/datum/hud/proc/monkey_hud(ui_style = 'icons/mob/screen_midnight.dmi')
|
|
adding = list()
|
|
other = list()
|
|
|
|
var/obj/screen/using
|
|
var/obj/screen/inventory/inv_box
|
|
|
|
using = new /obj/screen()
|
|
using.name = "act_intent"
|
|
using.icon_state = mymob.a_intent
|
|
using.screen_loc = ui_acti
|
|
using.layer = 20
|
|
adding += using
|
|
action_intent = using
|
|
|
|
using = new /obj/screen()
|
|
using.name = "mov_intent"
|
|
using.icon = ui_style
|
|
using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
|
|
using.screen_loc = ui_movi
|
|
using.layer = 20
|
|
adding += using
|
|
move_intent = using
|
|
|
|
using = new /obj/screen()
|
|
using.name = "drop"
|
|
using.icon = ui_style
|
|
using.icon_state = "act_drop"
|
|
using.screen_loc = ui_drop_throw
|
|
using.layer = 19
|
|
adding += using
|
|
|
|
inv_box = new /obj/screen/inventory()
|
|
inv_box.name = "r_hand"
|
|
inv_box.icon = ui_style
|
|
inv_box.icon_state = "hand_r_inactive"
|
|
if(mymob && !mymob.hand) //This being 0 or null means the right hand is in use
|
|
inv_box.icon_state = "hand_r_active"
|
|
inv_box.screen_loc = ui_rhand
|
|
inv_box.slot_id = slot_r_hand
|
|
inv_box.layer = 19
|
|
r_hand_hud_object = inv_box
|
|
adding += inv_box
|
|
|
|
inv_box = new /obj/screen/inventory()
|
|
inv_box.name = "l_hand"
|
|
inv_box.icon = ui_style
|
|
inv_box.icon_state = "hand_l_inactive"
|
|
if(mymob && mymob.hand) //This being 1 means the left hand is in use
|
|
inv_box.icon_state = "hand_l_active"
|
|
inv_box.screen_loc = ui_lhand
|
|
inv_box.slot_id = slot_l_hand
|
|
inv_box.layer = 19
|
|
l_hand_hud_object = inv_box
|
|
adding += inv_box
|
|
|
|
using = new /obj/screen()
|
|
using.name = "hand"
|
|
using.icon = ui_style
|
|
using.icon_state = "swap_1_m" //extra wide!
|
|
using.screen_loc = ui_swaphand1
|
|
using.layer = 19
|
|
adding += using
|
|
|
|
using = new /obj/screen()
|
|
using.name = "hand"
|
|
using.icon = ui_style
|
|
using.icon_state = "swap_2"
|
|
using.screen_loc = ui_swaphand2
|
|
using.layer = 19
|
|
adding += using
|
|
|
|
inv_box = new /obj/screen/inventory()
|
|
inv_box.name = "mask"
|
|
inv_box.icon = ui_style
|
|
inv_box.icon_state = "mask"
|
|
inv_box.screen_loc = ui_monkey_mask
|
|
inv_box.slot_id = slot_wear_mask
|
|
inv_box.layer = 19
|
|
adding += inv_box
|
|
|
|
inv_box = new /obj/screen/inventory()
|
|
inv_box.name = "back"
|
|
inv_box.icon = ui_style
|
|
inv_box.icon_state = "back"
|
|
inv_box.screen_loc = ui_back
|
|
inv_box.slot_id = slot_back
|
|
inv_box.layer = 19
|
|
adding += inv_box
|
|
|
|
mymob.throw_icon = new /obj/screen()
|
|
mymob.throw_icon.icon = ui_style
|
|
mymob.throw_icon.icon_state = "act_throw_off"
|
|
mymob.throw_icon.name = "throw/catch"
|
|
mymob.throw_icon.screen_loc = ui_drop_throw
|
|
|
|
mymob.oxygen = new /obj/screen()
|
|
mymob.oxygen.icon_state = "oxy0"
|
|
mymob.oxygen.name = "oxygen"
|
|
mymob.oxygen.screen_loc = ui_oxygen
|
|
|
|
mymob.pressure = new /obj/screen()
|
|
mymob.pressure.icon_state = "pressure0"
|
|
mymob.pressure.name = "pressure"
|
|
mymob.pressure.screen_loc = ui_pressure
|
|
|
|
mymob.toxin = new /obj/screen()
|
|
mymob.toxin.icon_state = "tox0"
|
|
mymob.toxin.name = "toxin"
|
|
mymob.toxin.screen_loc = ui_toxin
|
|
|
|
mymob.internals = new /obj/screen()
|
|
mymob.internals.icon_state = "internal0"
|
|
mymob.internals.name = "internal"
|
|
mymob.internals.screen_loc = ui_internal
|
|
|
|
mymob.fire = new /obj/screen()
|
|
mymob.fire.icon_state = "fire0"
|
|
mymob.fire.name = "fire"
|
|
mymob.fire.screen_loc = ui_fire
|
|
|
|
mymob.bodytemp = new /obj/screen()
|
|
mymob.bodytemp.icon_state = "temp1"
|
|
mymob.bodytemp.name = "body temperature"
|
|
mymob.bodytemp.screen_loc = ui_temp
|
|
|
|
mymob.healths = new /obj/screen()
|
|
mymob.healths.icon_state = "health0"
|
|
mymob.healths.name = "health"
|
|
mymob.healths.screen_loc = ui_health
|
|
|
|
mymob.pullin = new /obj/screen()
|
|
mymob.pullin.icon = ui_style
|
|
mymob.pullin.icon_state = "pull0"
|
|
mymob.pullin.name = "pull"
|
|
mymob.pullin.screen_loc = ui_pull_resist
|
|
|
|
lingchemdisplay = new /obj/screen()
|
|
lingchemdisplay.name = "chemical storage"
|
|
lingchemdisplay.icon_state = "power_display"
|
|
lingchemdisplay.screen_loc = ui_lingchemdisplay
|
|
lingchemdisplay.layer = 20
|
|
lingchemdisplay.invisibility = 101
|
|
|
|
mymob.blind = new /obj/screen()
|
|
mymob.blind.icon = 'icons/mob/screen_full.dmi'
|
|
mymob.blind.icon_state = "blackimageoverlay"
|
|
mymob.blind.name = " "
|
|
mymob.blind.screen_loc = "1,1"
|
|
mymob.blind.layer = 0
|
|
|
|
mymob.flash = new /obj/screen()
|
|
mymob.flash.icon = ui_style
|
|
mymob.flash.icon_state = "blank"
|
|
mymob.flash.name = "flash"
|
|
mymob.flash.screen_loc = "1,1 to 15,15"
|
|
mymob.flash.layer = 17
|
|
|
|
mymob.zone_sel = new /obj/screen/zone_sel()
|
|
mymob.zone_sel.icon = ui_style
|
|
mymob.zone_sel.update_icon()
|
|
|
|
mymob.client.screen = null
|
|
|
|
mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.pressure, mymob.toxin, mymob.bodytemp, mymob.internals, mymob.fire, mymob.healths, mymob.pullin, mymob.blind, mymob.flash) //, mymob.hands, mymob.rest, mymob.sleep, mymob.mach )
|
|
mymob.client.screen += adding + other |