mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 11:34:19 +01:00
Rework / refactor of how the Give verb works. Give now has a re-bindable hotkey for it (#18646)
* give verb rework ; adds a hotkey for give * moxian review * Adds new alert sprite shown to item giver * Converts offering item trait to a status effect to facilitate the new alert * Update screen_alert.dmi * Add a `/datum/proc/signal_qdel()` helper To cut down on copy and paste. Fixed alert flash icon not having transparency. * lewcc review * farie review and other fixes For some reason my alert flash sprite no longer had an empty frame at the end so it would reach the end of the animation and be a solid yellow outline instead of invisible. Touched screen_alert.dmi to fix that. * reverts the addition of the give hud icon, restores give verb I realized that making a new hud icon button would require multiple hud icons for each hud theme (the red one, green one, white one, etc.). I'm not prepared to do that much work right now. * Update code/modules/mob/living/carbon/give.dm Co-authored-by: Farie82 <farie82@users.noreply.github.com> Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
SteelSlayer
@@ -1,52 +1,189 @@
|
||||
/mob/living/carbon/verb/give(mob/living/carbon/target in oview(1))
|
||||
/**
|
||||
* Toggles the [/datum/click_intercept/give] on or off for the src mob.
|
||||
*/
|
||||
/mob/living/carbon/verb/toggle_give()
|
||||
set name = "Give Item"
|
||||
set category = "IC"
|
||||
set name = "Give"
|
||||
|
||||
if(!iscarbon(target)) //something is bypassing the give arguments, no clue what, adding a sanity check JIC
|
||||
to_chat(usr, "<span class='danger'>Wait a second... \the [target] HAS NO HANDS! AHH!</span>")//cheesy messages ftw
|
||||
if(has_status_effect(STATUS_EFFECT_OFFERING_ITEM))
|
||||
to_chat(src, "<span class='warning'>You're already offering an item to someone!</span>")
|
||||
return
|
||||
|
||||
if(target.incapacitated() || usr.incapacitated() || target.client == null)
|
||||
if(istype(client.click_intercept, /datum/click_intercept/give))
|
||||
QDEL_NULL(client.click_intercept)
|
||||
return
|
||||
|
||||
var/obj/item/I = get_active_hand()
|
||||
|
||||
if(!I)
|
||||
to_chat(usr, "<span class='warning'> You don't have anything in your hand to give to [target.name]</span>")
|
||||
to_chat(src, "<span class='warning'>You don't have anything in your hand to give!</span>")
|
||||
return
|
||||
if((I.flags & NODROP) || (I.flags & ABSTRACT))
|
||||
to_chat(usr, "<span class='notice'>That's not exactly something you can give.</span>")
|
||||
if(I.flags & NODROP)
|
||||
to_chat(src, "<span class='warning'>[I] is stuck to your hand, you can't give it away!</span>")
|
||||
return
|
||||
if(target.r_hand == null || target.l_hand == null)
|
||||
var/ans = alert(target,"[usr] wants to give you \a [I]?",,"Yes","No")
|
||||
if(!I || !target)
|
||||
return
|
||||
switch(ans)
|
||||
if("Yes")
|
||||
if(target.incapacitated() || usr.incapacitated())
|
||||
return
|
||||
if(!Adjacent(target))
|
||||
to_chat(usr, "<span class='warning'> You need to stay in reaching distance while giving an object.</span>")
|
||||
to_chat(target, "<span class='warning'> [usr.name] moved too far away.</span>")
|
||||
return
|
||||
if((I.flags & NODROP) || (I.flags & ABSTRACT))
|
||||
to_chat(usr, "<span class='warning'>[I] stays stuck to your hand when you try to give it!</span>")
|
||||
to_chat(target, "<span class='warning'>[I] stays stuck to [usr.name]'s hand when you try to take it!</span>")
|
||||
return
|
||||
if(I != get_active_hand())
|
||||
to_chat(usr, "<span class='warning'> You need to keep the item in your active hand.</span>")
|
||||
to_chat(target, "<span class='warning'> [usr.name] seem to have given up on giving [I] to you.</span>")
|
||||
return
|
||||
if(target.r_hand != null && target.l_hand != null)
|
||||
to_chat(target, "<span class='warning'> Your hands are full.</span>")
|
||||
to_chat(usr, "<span class='warning'> Their hands are full.</span>")
|
||||
return
|
||||
usr.unEquip(I)
|
||||
target.put_in_hands(I)
|
||||
I.add_fingerprint(target)
|
||||
target.visible_message("<span class='notice'> [usr.name] handed [I] to [target.name].</span>")
|
||||
I.on_give(usr, target)
|
||||
if("No")
|
||||
target.visible_message("<span class='warning'> [usr.name] tried to hand [I] to [target.name] but [target.name] didn't want it.</span>")
|
||||
else
|
||||
to_chat(usr, "<span class='warning'> [target.name]'s hands are full.</span>")
|
||||
if(I.flags & ABSTRACT)
|
||||
to_chat(src, "<span class='warning'>That's not exactly something you can give.</span>")
|
||||
return
|
||||
|
||||
new /datum/click_intercept/give(client)
|
||||
|
||||
/**
|
||||
* # Offering Item status effect
|
||||
*
|
||||
* Status effect given to mobs after they've offered an item to another player using the Give Item action ([/datum/click_intercept/give]).
|
||||
*/
|
||||
/datum/status_effect/offering_item
|
||||
id = "offering item"
|
||||
duration = 10 SECONDS
|
||||
alert_type = /obj/screen/alert/status_effect/offering_item
|
||||
|
||||
/datum/status_effect/offering_item/on_creation(mob/living/new_owner, receiver_UID, item_UID)
|
||||
. = ..()
|
||||
var/obj/screen/alert/status_effect/offering_item/offer = linked_alert
|
||||
offer.item_UID = item_UID
|
||||
offer.receiver_UID = receiver_UID
|
||||
|
||||
|
||||
/obj/screen/alert/status_effect/offering_item
|
||||
name = "Offering Item"
|
||||
desc = "You're currently offering an item someone. Make sure to keep the item in your hand so they can accept it! Click to stop offering your item."
|
||||
icon_state = "offering_item"
|
||||
/// UID of the mob who's being offered the item.
|
||||
var/receiver_UID
|
||||
/// UID of the item being given.
|
||||
var/item_UID
|
||||
|
||||
/obj/screen/alert/status_effect/offering_item/Click(location, control, params)
|
||||
var/mob/living/carbon/receiver = locateUID(receiver_UID)
|
||||
var/mob/living/carbon/giver = attached_effect.owner
|
||||
var/obj/item/I = locateUID(item_UID)
|
||||
to_chat(giver, "<span class='info'>You decide against giving [I] to [receiver].</span>")
|
||||
to_chat(receiver, "<span class='warning'>[giver] seems to have given up on giving you [I].</span>")
|
||||
receiver.clear_alert("take item [item_UID]") // This cancels *everything* related to the giving/item offering.
|
||||
|
||||
|
||||
/**
|
||||
* # Give click intercept
|
||||
*
|
||||
* While a mob has this intercept, left clicking on a carbon mob will attempt to offer their currently held item to that mob.
|
||||
*/
|
||||
/datum/click_intercept/give
|
||||
/// If the intercept user has succesfully offered the item to another player.
|
||||
var/item_offered = FALSE
|
||||
|
||||
/datum/click_intercept/give/New(client/C)
|
||||
..()
|
||||
holder.mouse_pointer_icon = 'icons/mouse_icons/give_item.dmi'
|
||||
to_chat(holder, "<span class='info'>You can now left click on someone to give them your held item.</span>")
|
||||
RegisterSignal(holder.mob.get_active_hand(), list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), /datum/proc/signal_qdel)
|
||||
RegisterSignal(holder.mob, list(SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), COMSIG_CARBON_SWAP_HANDS), /datum/proc/signal_qdel)
|
||||
|
||||
|
||||
/datum/click_intercept/give/Destroy(force = FALSE, ...)
|
||||
holder.mouse_pointer_icon = initial(holder.mouse_pointer_icon)
|
||||
if(!item_offered)
|
||||
to_chat(holder.mob, "<span class='info'>You're no longer trying to give someone your held item.</span>")
|
||||
return ..()
|
||||
|
||||
|
||||
/datum/click_intercept/give/InterceptClickOn(mob/user, params, atom/object)
|
||||
if(user == object || !iscarbon(object))
|
||||
return
|
||||
var/mob/living/carbon/receiver = object
|
||||
if(receiver.stat != CONSCIOUS)
|
||||
to_chat(user, "<span class='warning'>[receiver] can't accept any items because they're not conscious!</span>")
|
||||
return
|
||||
var/obj/item/I = user.get_active_hand()
|
||||
if(!user.Adjacent(receiver))
|
||||
to_chat(user, "<span class='warning'>You need to be closer to [receiver] to offer them [I].</span>")
|
||||
return
|
||||
if(!receiver.client)
|
||||
to_chat(user, "<span class='warning'>You offer [I] to [receiver], but they don't seem to respond...</span>")
|
||||
return
|
||||
// We use UID() here so that the receiver can have more then one give request at one time.
|
||||
// Otherwise, throwing a new "take item" alert would override any current one also named "take item".
|
||||
receiver.throw_alert("take item [I.UID()]", /obj/screen/alert/take_item, alert_args = list(user, receiver, I))
|
||||
item_offered = TRUE // TRUE so we don't give them the default chat message in Destroy.
|
||||
to_chat(user, "<span class='info'>You offer [I] to [receiver].</span>")
|
||||
qdel(src)
|
||||
|
||||
|
||||
/**
|
||||
* # Take Item alert
|
||||
*
|
||||
* Alert which appears for a user when another player is attempting to offer them an item.
|
||||
* The user can click the alert to accept, or simply do nothing to not take the item.
|
||||
*/
|
||||
/obj/screen/alert/take_item
|
||||
name = "Take Item"
|
||||
desc = "someone wants to hand you an item!"
|
||||
icon_state = "template"
|
||||
timeout = 10 SECONDS
|
||||
/// UID of the mob offering the receiver an item.
|
||||
var/giver_UID
|
||||
/// UID of the mob who has this alert.
|
||||
var/receiver_UID
|
||||
/// UID of the item being given.
|
||||
var/item_UID
|
||||
|
||||
|
||||
/obj/screen/alert/take_item/Initialize(mapload, mob/living/giver, mob/living/receiver, obj/item/I)
|
||||
. = ..()
|
||||
desc = "[giver] wants to hand you \a [I]. Click here to accept it!"
|
||||
giver_UID = giver.UID()
|
||||
receiver_UID = receiver.UID()
|
||||
item_UID = I.UID()
|
||||
giver.apply_status_effect(STATUS_EFFECT_OFFERING_ITEM, receiver_UID, item_UID)
|
||||
add_overlay(icon(I.icon, I.icon_state, SOUTH))
|
||||
add_overlay("alert_flash")
|
||||
RegisterSignal(I, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/cancel_give)
|
||||
RegisterSignal(giver, list(SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), COMSIG_CARBON_SWAP_HANDS), .proc/cancel_give)
|
||||
// If either of these atoms are deleted, we need to cancel everything. Also saves having to do null checks before interacting with these atoms.
|
||||
RegisterSignal(I, COMSIG_PARENT_QDELETING, /datum/proc/signal_qdel)
|
||||
RegisterSignal(giver, COMSIG_PARENT_QDELETING, /datum/proc/signal_qdel)
|
||||
|
||||
|
||||
/obj/screen/alert/take_item/Destroy()
|
||||
var/mob/living/giver = locateUID(giver_UID)
|
||||
giver.remove_status_effect(STATUS_EFFECT_OFFERING_ITEM)
|
||||
return ..()
|
||||
|
||||
|
||||
/obj/screen/alert/take_item/proc/cancel_give()
|
||||
SIGNAL_HANDLER
|
||||
var/mob/living/giver = locateUID(giver_UID)
|
||||
to_chat(giver, "<span class='warning'>You need to keep the item in your active hand if you want to hand it to someone!</span>")
|
||||
to_chat(locateUID(receiver_UID), "<span class='warning'>[giver] seems to have given up on giving you [locateUID(item_UID)].</span>")
|
||||
qdel(src)
|
||||
|
||||
|
||||
/obj/screen/alert/take_item/Click(location, control, params)
|
||||
var/mob/living/receiver = locateUID(receiver_UID)
|
||||
if(receiver.stat != CONSCIOUS)
|
||||
return
|
||||
var/obj/item/I = locateUID(item_UID)
|
||||
if(HAS_TRAIT(receiver, TRAIT_HANDS_BLOCKED) || receiver.r_hand && receiver.l_hand)
|
||||
to_chat(receiver, "<span class='warning'>You need to have your hands free to accept [I]!</span>")
|
||||
return
|
||||
var/mob/living/giver = locateUID(giver_UID)
|
||||
if(!giver.Adjacent(receiver))
|
||||
to_chat(receiver, "<span class='warning'>You need to stay in reaching distance of [giver] to take [I]!</span>")
|
||||
return
|
||||
if(I.flags & NODROP)
|
||||
to_chat(giver, "<span class='warning'>[I] stays stuck to your hand when [receiver] tries to take it!</span>")
|
||||
to_chat(receiver, "<span class='warning'>[I] stays stuck to [giver]'s hand when you try to take it!</span>")
|
||||
return
|
||||
giver.unEquip(I)
|
||||
receiver.put_in_hands(I)
|
||||
I.add_fingerprint(receiver)
|
||||
I.on_give(giver, receiver)
|
||||
receiver.visible_message("<span class='notice'>[giver] handed [I] to [receiver].</span>")
|
||||
receiver.clear_alert("give item [item_UID]")
|
||||
|
||||
|
||||
/obj/screen/alert/take_item/do_timeout(mob/M, category)
|
||||
var/mob/living/giver = locateUID(giver_UID)
|
||||
var/mob/living/receiver = locateUID(receiver_UID)
|
||||
// Make sure we're still nearby. We don't want to show a message if the giver not near us.
|
||||
if(giver in view(3, receiver))
|
||||
var/obj/item/I = locateUID(item_UID)
|
||||
to_chat(giver, "<span class='warning'>You tried to hand [I] to [receiver], but they didn't want it.</span>")
|
||||
to_chat(receiver, "<span class='warning'>[giver] seems to have given up on giving you [I].</span>")
|
||||
..()
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
mobspellremove(src)
|
||||
QDEL_LIST(viruses)
|
||||
QDEL_LIST(actions)
|
||||
for(var/alert in alerts)
|
||||
clear_alert(alert)
|
||||
ghostize()
|
||||
QDEL_LIST_ASSOC_VAL(tkgrabbed_objects)
|
||||
for(var/I in tkgrabbed_objects)
|
||||
|
||||
Reference in New Issue
Block a user