cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Removes the ANIMATION_PARALLEL flag from floating and fixes another issue with the refactor. (#2630)

Browse Source 
* Removes the ANIMATION_PARALLEL flag from floating and fixes another issue with the refactor. (#55930)

Co-authored-by: Rohesie <rohesie@ gmail.com>

* Removes the ANIMATION_PARALLEL flag from floating and fixes another issue with the refactor.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@ gmail.com>
This commit is contained in:
SkyratBot
2021-01-11 00:42:33 +01:00
committed by GitHub
co-authored by Rohesie Ghom
parent d4fe3d2a96
commit c9c27d506d
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/movetype_handler.dm
+14 -15
View File
@@ -1,8 +1,12 @@
#define DO_FLOATING_ANIM(target) \
animate(target, pixel_y = 2, time = 1 SECONDS, loop = -1, flags = ANIMATION_RELATIVE);\
animate(pixel_y = -2, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
/**
* An element that enables and disables movetype bitflags as movetype traits are added and removed.
* An element that enables and disables movetype bitflags whenever the relative traits are added or removed.
* It also handles the +2/-2 pixel y anim loop typical of mobs possessing the FLYING or FLOATING movetypes.
* This element is necessary for the TRAIT_MOVE_ traits to work correctly. So make sure to include it when
* manipulating those traits on non-living movables.
* This element is necessary for the TRAIT_MOVE_ traits to work correctly, so make sure to attach this element
* before adding them to non-living movables.
*/
/datum/element/movetype_handler
element_flags = ELEMENT_DETACH
@@ -26,7 +30,7 @@
attached_atoms[movable_target] = TRUE
if(movable_target.movement_type & (FLOATING|FLYING) && !HAS_TRAIT(movable_target, TRAIT_NO_FLOATING_ANIM))
float(movable_target)
DO_FLOATING_ANIM(movable_target)
/datum/element/movetype_handler/Detach(datum/source)
UnregisterSignal(source, list(
@@ -48,7 +52,7 @@
if(source.movement_type & flag)
return
if(!(source.movement_type & (FLOATING|FLYING)) && (trait == TRAIT_MOVE_FLYING || trait == TRAIT_MOVE_FLOATING) && !paused_floating_anim_atoms[source] && !HAS_TRAIT(source, TRAIT_NO_FLOATING_ANIM))
float(source)
DO_FLOATING_ANIM(source)
source.movement_type |= flag
SEND_SIGNAL(source, COMSIG_MOVETYPE_FLAG_ENABLED, flag)
@@ -72,7 +76,7 @@
/datum/element/movetype_handler/proc/on_no_floating_anim_trait_loss(atom/movable/source, trait)
SIGNAL_HANDLER
if(source.movement_type & (FLOATING|FLYING) && !paused_floating_anim_atoms[source])
float(source)
DO_FLOATING_ANIM(source)
///Pauses the floating animation for the duration of the timer... plus [tickrate - (world.time + timer) % tickrate] to be precise.
/datum/element/movetype_handler/proc/pause_floating_anim(atom/movable/source, timer)
@@ -86,20 +90,13 @@
/datum/element/movetype_handler/process()
for(var/_paused in paused_floating_anim_atoms)
var/atom/movable/paused = _paused
if(!paused)
paused_floating_anim_atoms -= paused
else if(paused_floating_anim_atoms[paused] < world.time)
if(paused_floating_anim_atoms[paused] < world.time)
if(paused.movement_type & (FLOATING|FLYING) && !HAS_TRAIT(paused, TRAIT_NO_FLOATING_ANIM))
float(paused)
DO_FLOATING_ANIM(paused)
paused_floating_anim_atoms -= paused
if(!length(paused_floating_anim_atoms))
STOP_PROCESSING(SSdcs, src)
///Floats the movable up and down. Not a comsig proc.
/datum/element/movetype_handler/proc/float(atom/movable/target)
animate(target, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL)
animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE)
/// Stops the above. Also not a comsig proc.
/datum/element/movetype_handler/proc/stop_floating(atom/movable/target)
var/final_pixel_y = target.base_pixel_y
@@ -107,3 +104,5 @@
var/mob/living/living_target = target
final_pixel_y += living_target.body_position_pixel_y_offset
animate(target, pixel_y = final_pixel_y, time = 1 SECONDS)
#undef DO_FLOATING_ANIM