mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-09 07:46:20 +00:00
b5d6d59e5d
## About The Pull Request 1. The Energy Katana, when clicking on a mob, no longer refuses to teleport. It will instead teleport you adjacent to the mob (to the tile closest to your origin) and immediately perform an attack. 2. Energy Katana is now a bit more consistent about what you can and cannot teleport to, now abiding by the same rules as the heirophant staff - you can teleport onto tables, but you can't teleport into dense objects by clicking on the tile instead of the object. 3. The Energy Katana now has `NEEDS_PERMIT` flag, like the Energy Sword, meaning Beepsky will consider it a threat (but it won't hunt down Ninjas over it) Also added pass_flags_self bitfield and updated pass_flags bitfield. ## Why It's Good For The Game I ran around with it for like 3 seconds and found it a little clunky. So I just cleaned it up a bit to make it 1. easier to use 2. cooler to use The permit thing was just making it consistent with other melee weapons ## Changelog 🆑 Melbert qol: Energy Katana is now a bit more consistent about what you can and cannot teleport to, now abiding by the same rules as the heirophant staff. IE, you can now teleport onto tables. add: Energy Katana now has a "teleport attack" - if you click on a mob, you will teleport adjacent to them and immediately perform an attack! add: Energy Katana is now considered a threatening weapon by secbots. Ninjas will be unaffected, but if you loot one off a dead ninja and don't have a weapons permit, it might chase after you. /🆑
89 lines
3.0 KiB
Plaintext
89 lines
3.0 KiB
Plaintext
/// Actions that you can use to dash (teleport) to places in view.
|
|
/datum/action/innate/dash
|
|
name = "Dash"
|
|
desc = "Teleport to the targeted location."
|
|
button_icon = 'icons/mob/actions/actions_items.dmi'
|
|
button_icon_state = "jetboot"
|
|
/// How many dash charges do we have?
|
|
var/current_charges = 1
|
|
/// How many dash charges can we hold?
|
|
var/max_charges = 1
|
|
/// How long does it take to get a dash charge back?
|
|
var/charge_rate = 25 SECONDS
|
|
/// What sound do we play on dash?
|
|
var/dash_sound = 'sound/effects/magic/blink.ogg'
|
|
/// What sound do we play on recharge?
|
|
var/recharge_sound = 'sound/effects/magic/charge.ogg'
|
|
/// What effect does our beam use?
|
|
var/beam_effect = "blur"
|
|
/// How long does our beam last?
|
|
var/beam_length = 2 SECONDS
|
|
/// What effect should we play when we phase in (at the teleport target turf)
|
|
var/phasein = /obj/effect/temp_visual/dir_setting/ninja/phase
|
|
/// What effect should we play when we phase out (at the source turf)
|
|
var/phaseout = /obj/effect/temp_visual/dir_setting/ninja/phase/out
|
|
|
|
/datum/action/innate/dash/IsAvailable(feedback = FALSE)
|
|
. = ..()
|
|
if (!.)
|
|
return FALSE
|
|
if (current_charges <= 0)
|
|
if (feedback)
|
|
owner.balloon_alert(owner, "no charges!")
|
|
return FALSE
|
|
return TRUE
|
|
|
|
/datum/action/innate/dash/Activate()
|
|
var/obj/item/dashing_item = target
|
|
if(!istype(dashing_item))
|
|
return
|
|
|
|
dashing_item.attack_self(owner) //Used to toggle dash behavior in the dashing item
|
|
|
|
/// Teleports user to target using do_teleport. Returns TRUE if teleport successful, FALSE otherwise.
|
|
/datum/action/innate/dash/proc/teleport(mob/user, atom/target)
|
|
if(!IsAvailable(feedback = TRUE))
|
|
return FALSE
|
|
|
|
var/turf/current_turf = get_turf(user)
|
|
var/turf/target_turf = get_turf(target)
|
|
if(!(target in view(user.client.view, user)))
|
|
user.balloon_alert(user, "out of view!")
|
|
return FALSE
|
|
if(target_turf.is_blocked_turf_ignore_climbable())
|
|
user.balloon_alert(user, "destination blocked!")
|
|
return FALSE
|
|
if(!do_teleport(user, target_turf, no_effects = TRUE))
|
|
user.balloon_alert(user, "dash blocked!")
|
|
return FALSE
|
|
|
|
// Note: It's possible do_teleport, for whatever reason,
|
|
// caused our owner to be unassigned by this point.
|
|
// (Such as dropping our item after landing.)
|
|
|
|
var/obj/spot_one = new phaseout(current_turf, user.dir)
|
|
var/obj/spot_two = new phasein(target_turf, user.dir)
|
|
spot_one.Beam(spot_two, beam_effect, time = beam_length)
|
|
playsound(target_turf, dash_sound, 25, TRUE)
|
|
current_charges--
|
|
addtimer(CALLBACK(src, PROC_REF(charge)), charge_rate)
|
|
owner?.update_mob_action_buttons()
|
|
|
|
return TRUE
|
|
|
|
/// Callback for [/proc/teleport] to increment our charges after use.
|
|
/datum/action/innate/dash/proc/charge()
|
|
current_charges = clamp(current_charges + 1, 0, max_charges)
|
|
|
|
var/obj/item/dashing_item = target
|
|
if(!istype(dashing_item))
|
|
return
|
|
|
|
if(recharge_sound)
|
|
playsound(dashing_item, recharge_sound, 50, TRUE)
|
|
|
|
if(!owner)
|
|
return
|
|
owner.update_mob_action_buttons()
|
|
dashing_item.balloon_alert(owner, "[current_charges]/[max_charges] dash charges")
|