mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-11 10:11:09 +00:00
## About The Pull Request Fixes #78721 This PR does a handful of things behind the scenes to increase the consistency of shapechange health tracking. First of all we adjust the order of operations taken when you restore the original body. The implementation as-was would remove the status effect midway through and null a bunch of variables we tried to continue using. This would result in several runtimes and code failing to run, with the upshot that untransforming upon death would leave the caster completely alive, with the corpse of its transformed shape at its feet. Oops. Additionally while testing this I realised that transferring the damagew as also kind of fucked. We wouldn't bother to do it at _all_ if you died, which is a shame, so I made it simply heal you instead of reviving you so we can always do it. Then as noted in the linked issue, we were applying all transferred damage to a single limb, which could exceed the health of the limb and remove damage. Now we spread it around the body. Finally, applying damage to a human using the "force" flag would often actually apply less damage to their _health_ than expected. This is because arms and legs contribute only 75% of their damage taken to a mob's overall health. Now instead of reading `health` we read `total damage` which ignores the limb damage modifier. The end result of this is that if you transform into a corgi, take 50% of your health, and transform back then you will have 50% of your health as a human. Previously the result would be that you'd have ~63%, then transforming into a corgi would leave you with ~63% of a corgi's health, then transforming back into a human would leave you at about 71%... and so on and so forth. Now it doesn't do that. ## Changelog 🆑 fix: Dying when using (most) shapeshift spells will now kill you rather than having you pop out of the corpse of your previous form. fix: Damage will now be accurately carried between forms rather than being slightly reduced upon each transformation. /🆑
190 lines
5.1 KiB
Plaintext
190 lines
5.1 KiB
Plaintext
/// Keeps the parent within the distance of its owner as naturally as possible,
|
|
/// but teleporting if necessary.
|
|
/datum/component/leash
|
|
/// The owner of the leash. If this is qdeleted, the leash is as well.
|
|
var/atom/movable/owner
|
|
|
|
/// The maximum distance you can move from your owner
|
|
var/distance
|
|
|
|
/// The object type to create on the old turf when forcibly teleporting out
|
|
var/force_teleport_out_effect
|
|
|
|
/// The object type to create on the new turf when forcibly teleporting out
|
|
var/force_teleport_in_effect
|
|
|
|
VAR_PRIVATE
|
|
// Pathfinding can yield, so only move us closer if this is the best one
|
|
current_path_tick = 0
|
|
last_completed_path_tick = 0
|
|
|
|
performing_path_move = FALSE
|
|
|
|
/datum/component/leash/Initialize(
|
|
atom/movable/owner,
|
|
distance = 3,
|
|
force_teleport_out_effect,
|
|
force_teleport_in_effect,
|
|
)
|
|
. = ..()
|
|
|
|
if (!ismovable(parent))
|
|
stack_trace("Parent must be a movable")
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
if (!ismovable(owner))
|
|
stack_trace("[owner] (owner) is not a movable")
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
if (!isnum(distance))
|
|
stack_trace("[distance] (distance) must be a number")
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
if (!isnull(force_teleport_out_effect) && !ispath(force_teleport_out_effect))
|
|
stack_trace("force_teleport_out_effect must be null or a path, not [force_teleport_out_effect]")
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
if (!isnull(force_teleport_in_effect) && !ispath(force_teleport_in_effect))
|
|
stack_trace("force_teleport_in_effect must be null or a path, not [force_teleport_in_effect]")
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
src.owner = owner
|
|
src.distance = distance
|
|
src.force_teleport_out_effect = force_teleport_out_effect
|
|
src.force_teleport_in_effect = force_teleport_in_effect
|
|
|
|
RegisterSignal(owner, COMSIG_QDELETING, PROC_REF(on_owner_qdel))
|
|
|
|
var/static/list/container_connections = list(
|
|
COMSIG_MOVABLE_MOVED = PROC_REF(on_owner_moved),
|
|
)
|
|
|
|
AddComponent(/datum/component/connect_containers, owner, container_connections)
|
|
RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_owner_moved))
|
|
RegisterSignal(parent, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(on_parent_pre_move))
|
|
|
|
check_distance()
|
|
|
|
/datum/component/leash/Destroy()
|
|
owner = null
|
|
return ..()
|
|
|
|
/datum/component/leash/proc/set_distance(distance)
|
|
ASSERT(isnum(distance))
|
|
src.distance = distance
|
|
check_distance()
|
|
|
|
/datum/component/leash/proc/on_owner_qdel()
|
|
SIGNAL_HANDLER
|
|
PRIVATE_PROC(TRUE)
|
|
|
|
qdel(src)
|
|
|
|
/datum/component/leash/proc/on_owner_moved(atom/movable/source)
|
|
SIGNAL_HANDLER
|
|
PRIVATE_PROC(TRUE)
|
|
|
|
check_distance()
|
|
|
|
/datum/component/leash/proc/on_parent_pre_move(atom/movable/source, atom/new_location)
|
|
SIGNAL_HANDLER
|
|
PRIVATE_PROC(TRUE)
|
|
|
|
if (performing_path_move)
|
|
return NONE
|
|
|
|
var/turf/new_location_turf = get_turf(new_location)
|
|
if (get_dist(new_location_turf, owner) <= distance)
|
|
return NONE
|
|
|
|
if (ismob(source))
|
|
source.balloon_alert(source, "too far!")
|
|
|
|
return COMPONENT_MOVABLE_BLOCK_PRE_MOVE
|
|
|
|
/datum/component/leash/proc/check_distance()
|
|
set waitfor = FALSE
|
|
PRIVATE_PROC(TRUE)
|
|
|
|
if (get_dist(parent, owner) <= distance)
|
|
return
|
|
|
|
var/atom/movable/atom_parent = parent
|
|
if (isnull(owner.loc))
|
|
atom_parent.moveToNullspace() // If our parent is in nullspace I guess we gotta go there too
|
|
return
|
|
if (isnull(atom_parent.loc))
|
|
force_teleport_back("in nullspace") // If we're in nullspace, get outta there
|
|
return
|
|
|
|
SEND_SIGNAL(parent, COMSIG_LEASH_PATH_STARTED)
|
|
|
|
current_path_tick += 1
|
|
var/our_path_tick = current_path_tick
|
|
|
|
var/list/path = get_path_to(parent, owner, mintargetdist = distance)
|
|
|
|
if (last_completed_path_tick > our_path_tick)
|
|
return
|
|
|
|
last_completed_path_tick = our_path_tick
|
|
|
|
commit_path(path)
|
|
|
|
/datum/component/leash/proc/commit_path(list/turf/path)
|
|
SHOULD_NOT_SLEEP(TRUE)
|
|
PRIVATE_PROC(TRUE)
|
|
|
|
performing_path_move = TRUE
|
|
|
|
var/atom/movable/movable_parent = parent
|
|
|
|
for (var/turf/to_move as anything in path)
|
|
// Could be an older path, don't make us teleport back
|
|
if (!to_move.Adjacent(parent))
|
|
continue
|
|
|
|
if (!movable_parent.Move(to_move))
|
|
force_teleport_back("bad path step")
|
|
performing_path_move = FALSE
|
|
return
|
|
|
|
if (get_dist(parent, owner) > distance)
|
|
force_teleport_back("incomplete path")
|
|
|
|
performing_path_move = FALSE
|
|
SEND_SIGNAL(parent, COMSIG_LEASH_PATH_COMPLETE)
|
|
|
|
/datum/component/leash/proc/force_teleport_back(reason)
|
|
PRIVATE_PROC(TRUE)
|
|
|
|
var/atom/movable/movable_parent = parent
|
|
|
|
SSblackbox.record_feedback("tally", "leash_force_teleport_back", 1, reason)
|
|
|
|
if (force_teleport_out_effect)
|
|
new force_teleport_out_effect(movable_parent.loc)
|
|
|
|
movable_parent.forceMove(get_turf(owner))
|
|
|
|
if (force_teleport_in_effect)
|
|
new force_teleport_in_effect(movable_parent.loc)
|
|
|
|
if (ismob(movable_parent))
|
|
movable_parent.balloon_alert(movable_parent, "moved out of range!")
|
|
|
|
SEND_SIGNAL(parent, COMSIG_LEASH_FORCE_TELEPORT)
|
|
|
|
/// A debug spawner that will create a corgi leashed to a bike horn, plus a beam
|
|
/obj/effect/spawner/debug_leash
|
|
|
|
/obj/effect/spawner/debug_leash/Initialize(mapload)
|
|
. = ..()
|
|
|
|
var/obj/item/bikehorn/bike_horn = new(loc)
|
|
var/mob/living/basic/pet/dog/corgi/corgi = new(loc)
|
|
|
|
corgi.AddComponent(/datum/component/leash, bike_horn)
|
|
|
|
corgi.Beam(bike_horn)
|