mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-27 17:41:50 +00:00
## About The Pull Request - Afterattack is a very simple proc now: All it does is this, and all it's used for is for having a convenient place to put effects an item does after a successful attack (IE, the attack was not blocked)  - An overwhelming majority of afterattack implementations have been moved to `interact_with_atom` or the new `ranged_interact_with_atom` I have manually tested many of the refactored procs but there was 200+ so it's kinda hard ## Why It's Good For The Game Afterattack is one of the worst parts of the attack chain, as it simultaneously serves as a way of doing random interactions NOT AT ALL related to attacks (despite the name) while ALSO serving as the defacto way to do a ranged interaction with an item This means careless coders (most of them) may throw stuff in afterattack without realizing how wide reaching it is, which causes bugs. By making two well defined, separate procs for handing adjacent vs ranged interactions, it becomes WAY WAY WAY more easy to develop for. If you want to do something when you click on something else and you're adjacent, use `interact_with_atom` If you want to do something when you click on something else and you're not adjacent, use 'ranged_interact_with_atom` This does result in some instances of boilerplate as shown here:  But I think it's acceptable, feel free to oppose if you don't I'm sure we can think of another solution ~~Additionally it makes it easier to implement swing combat. That's a bonus I guess~~ ## Changelog 🆑 Melbert refactor: Over 200 item interactions have been refactored to use a newer, easier-to-use system. Report any oddities with using items on other objects you may see (such as surgery, reagent containers like cups and spray bottles, or construction devices), especially using something at range (such as guns or chisels) refactor: Item-On-Modsuit interactions have changed slightly. While on combat mode, you will attempt to "use" the item on the suit instead of inserting it into the suit's storage. This means being on combat mode while the suit's panel is open will block you from inserting items entirely via click (but other methods such as hotkey, clicking on the storage boxes, and mousedrop will still work). refactor: The detective's scanner will now be inserted into storage items if clicked normally, and will scan the storage item if on combat mode /🆑
217 lines
6.6 KiB
Plaintext
217 lines
6.6 KiB
Plaintext
/*
|
|
Cyborg ClickOn()
|
|
|
|
Cyborgs have no range restriction on attack_robot(), because it is basically an AI click.
|
|
However, they do have a range restriction on item use, so they cannot do without the
|
|
adjacency code.
|
|
*/
|
|
|
|
/mob/living/silicon/robot/ClickOn(atom/A, params)
|
|
if(world.time <= next_click)
|
|
return
|
|
next_click = world.time + 1
|
|
|
|
if(check_click_intercept(params,A))
|
|
return
|
|
|
|
if(stat || (lockcharge) || IsParalyzed() || IsStun())
|
|
return
|
|
|
|
var/list/modifiers = params2list(params)
|
|
if(LAZYACCESS(modifiers, SHIFT_CLICK))
|
|
if(LAZYACCESS(modifiers, CTRL_CLICK))
|
|
CtrlShiftClickOn(A)
|
|
return
|
|
if(LAZYACCESS(modifiers, MIDDLE_CLICK))
|
|
ShiftMiddleClickOn(A)
|
|
return
|
|
ShiftClickOn(A)
|
|
return
|
|
if(LAZYACCESS(modifiers, MIDDLE_CLICK))
|
|
MiddleClickOn(A, params)
|
|
return
|
|
if(LAZYACCESS(modifiers, ALT_CLICK)) // alt and alt-gr (rightalt)
|
|
A.borg_click_alt(src)
|
|
return
|
|
if(LAZYACCESS(modifiers, CTRL_CLICK))
|
|
CtrlClickOn(A)
|
|
return
|
|
if(LAZYACCESS(modifiers, RIGHT_CLICK) && !module_active)
|
|
var/secondary_result = A.attack_robot_secondary(src, modifiers)
|
|
if(secondary_result == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || secondary_result == SECONDARY_ATTACK_CONTINUE_CHAIN)
|
|
return
|
|
else if (secondary_result != SECONDARY_ATTACK_CALL_NORMAL)
|
|
CRASH("attack_robot_secondary did not return a SECONDARY_ATTACK_* define.")
|
|
|
|
if(next_move >= world.time)
|
|
return
|
|
|
|
face_atom(A) // change direction to face what you clicked on
|
|
|
|
var/obj/item/W = get_active_held_item()
|
|
|
|
if(!W && get_dist(src,A) <= interaction_range)
|
|
A.attack_robot(src)
|
|
return
|
|
|
|
if(W)
|
|
if(incapacitated())
|
|
return
|
|
|
|
//while buckled, you can still connect to and control things like doors, but you can't use your modules
|
|
if(buckled)
|
|
to_chat(src, span_warning("You can't use modules while buckled to [buckled]!"))
|
|
return
|
|
|
|
//if your "hands" are blocked you shouldn't be able to use modules
|
|
if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
|
|
return
|
|
|
|
if(W == A)
|
|
W.attack_self(src)
|
|
return
|
|
|
|
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
|
|
if(A == loc || (A in loc) || (A in contents))
|
|
W.melee_attack_chain(src, A, params)
|
|
return
|
|
|
|
if(!isturf(loc))
|
|
return
|
|
|
|
// cyborg rightclick code, allowing borgos to use weapons at range
|
|
if(CanReach(A,W))
|
|
W.melee_attack_chain(src, A, params)
|
|
return
|
|
else if(isturf(A) || isturf(A.loc))
|
|
A.base_ranged_item_interaction(src, W, modifiers)
|
|
|
|
//Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks
|
|
// for non-doors/apcs
|
|
/mob/living/silicon/robot/CtrlShiftClickOn(atom/target)
|
|
target.BorgCtrlShiftClick(src)
|
|
|
|
/mob/living/silicon/robot/ShiftClickOn(atom/target)
|
|
target.BorgShiftClick(src)
|
|
|
|
/mob/living/silicon/robot/CtrlClickOn(atom/target)
|
|
target.BorgCtrlClick(src)
|
|
|
|
|
|
/atom/proc/BorgCtrlShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
|
|
CtrlShiftClick(user)
|
|
|
|
/obj/machinery/door/airlock/BorgCtrlShiftClick(mob/living/silicon/robot/user) // Sets/Unsets Emergency Access Override Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlShiftClick(user)
|
|
else
|
|
..()
|
|
|
|
/atom/proc/BorgShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
|
|
ShiftClick(user)
|
|
|
|
/obj/machinery/door/airlock/BorgShiftClick(mob/living/silicon/robot/user) // Opens and closes doors! Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AIShiftClick(user)
|
|
else
|
|
..()
|
|
|
|
|
|
/atom/proc/BorgCtrlClick(mob/living/silicon/robot/user) //forward to human click if not overridden
|
|
CtrlClick(user)
|
|
|
|
/obj/machinery/door/airlock/BorgCtrlClick(mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlClick(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/power/apc/BorgCtrlClick(mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlClick(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/power/apc/BorgCtrlShiftClick(mob/living/silicon/robot/user)
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlShiftClick(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/power/apc/BorgShiftClick(mob/living/silicon/robot/user)
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AIShiftClick(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/power/apc/borg_click_alt(mob/living/silicon/robot/user)
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
ai_click_alt(user)
|
|
else
|
|
..()
|
|
|
|
|
|
/obj/machinery/power/apc/attack_robot_secondary(mob/living/silicon/user, list/modifiers)
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
return attack_ai_secondary(user, modifiers)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/turretid/BorgCtrlClick(mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlClick(user)
|
|
else
|
|
..()
|
|
|
|
/atom/proc/borg_click_alt(mob/living/silicon/robot/user)
|
|
user.base_click_alt(src)
|
|
return
|
|
|
|
/obj/machinery/door/airlock/borg_click_alt(mob/living/silicon/robot/user) // Eletrifies doors. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
ai_click_alt(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/turretid/borg_click_alt(mob/living/silicon/robot/user) //turret lethal on/off. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
ai_click_alt(user)
|
|
else
|
|
..()
|
|
|
|
/*
|
|
As with AI, these are not used in click code,
|
|
because the code for robots is specific, not generic.
|
|
|
|
If you would like to add advanced features to robot
|
|
clicks, you can do so here, but you will have to
|
|
change attack_robot() above to the proper function
|
|
*/
|
|
/mob/living/silicon/robot/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
|
|
if(!can_unarmed_attack())
|
|
return
|
|
A.attack_robot(src)
|
|
|
|
/mob/living/silicon/robot/RangedAttack(atom/A)
|
|
A.attack_robot(src)
|
|
|
|
/atom/proc/attack_robot(mob/user)
|
|
if (SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ROBOT, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return
|
|
|
|
attack_ai(user)
|
|
return
|
|
|
|
/**
|
|
* What happens when the cyborg without active module holds right-click on an item. Returns a SECONDARY_ATTACK_* value.
|
|
*
|
|
* Arguments:
|
|
* * user The mob holding the right click
|
|
* * modifiers The list of the custom click modifiers
|
|
*/
|
|
/atom/proc/attack_robot_secondary(mob/user, list/modifiers)
|
|
if (SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ROBOT_SECONDARY, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return
|
|
|
|
return attack_ai_secondary(user, modifiers)
|