Skip to content

Commit 587dcf6

Browse files
authored
Transform code cleanup (#1163)
* make it work * ghommie stuff * macro these numbers
1 parent c87fb7b commit 587dcf6

File tree

30 files changed

+237
-153
lines changed

30 files changed

+237
-153
lines changed

_maps/RandomRuins/SpaceRuins/bigderelict1.dmm

+3-3
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@
630630
health = 25;
631631
maxHealth = 25;
632632
name = "hatchling";
633-
resize = 0.85
633+
634634
},
635635
/turf/open/floor/iron,
636636
/area/ruin/space/has_grav/derelictoutpost)
@@ -646,7 +646,7 @@
646646
health = 25;
647647
maxHealth = 25;
648648
name = "hatchling";
649-
resize = 0.85
649+
650650
},
651651
/turf/open/floor/iron,
652652
/area/ruin/space/has_grav/derelictoutpost)
@@ -1489,7 +1489,7 @@
14891489
health = 25;
14901490
maxHealth = 25;
14911491
name = "hatchling";
1492-
resize = 0.85
1492+
14931493
},
14941494
/turf/open/misc/asteroid,
14951495
/area/ruin/space/has_grav/derelictoutpost)

code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
/// Called on the organ when it is removed from someone (mob/living/carbon/old_owner)
1010
#define COMSIG_ORGAN_REMOVED "comsig_organ_removed"
1111

12-
///from base of mob/update_transform()
13-
#define COMSIG_LIVING_POST_UPDATE_TRANSFORM "living_post_update_transform"
12+
///from base of mob/living/update_transform()
13+
#define COMSIG_MOB_POST_UPDATE_TRANSFORM "mob_post_update_transform"
1414

1515
///from /obj/structure/door/crush(): (mob/living/crushed, /obj/machinery/door/crushing_door)
1616
#define COMSIG_LIVING_DOORCRUSHED "living_doorcrush"

code/__DEFINES/dcs/signals/signals_movetype.dm

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
// /datum/element/movetype_handler signals
2-
/// Called when the floating anim has to be temporarily stopped and restarted later: (timer)
3-
#define COMSIG_PAUSE_FLOATING_ANIM "pause_floating_anim"
42
/// From base of datum/element/movetype_handler/on_movement_type_trait_gain: (flag, old_movement_type)
53
#define COMSIG_MOVETYPE_FLAG_ENABLED "movetype_flag_enabled"
64
/// From base of datum/element/movetype_handler/on_movement_type_trait_loss: (flag, old_movement_type)

code/__DEFINES/mobs.dm

+4
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,10 @@
771771
/// The default mob sprite size (used for shrinking or enlarging the mob sprite to regular size)
772772
#define RESIZE_DEFAULT_SIZE 1
773773

774+
//Lying angles, which way your head points
775+
#define LYING_ANGLE_EAST 90
776+
#define LYING_ANGLE_WEST 270
777+
774778
/// Get the client from the var
775779
#define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (istype(I, /client) ? I : (istype(I, /datum/mind) ? I:current?:client : null)))
776780

code/__DEFINES/traits.dm

+3
Original file line numberDiff line numberDiff line change
@@ -1010,3 +1010,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
10101010

10111011
#define TRAIT_FLOCKPHASE "TRAIT_FLOCKPHASE"
10121012
#define TRAIT_FLOCK_THING "TRAIT_FLOCK_THING"
1013+
1014+
/// Trait from mob/living/update_transform()
1015+
#define UPDATE_TRANSFORM_TRAIT "update_transform"

code/datums/components/clickbox.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
if(dead_state && isliving(parent))
4040
var/mob/living/living_parent = parent
4141
src.dead_state = dead_state
42-
RegisterSignal(living_parent, COMSIG_LIVING_POST_UPDATE_TRANSFORM, PROC_REF(on_modify_or_update_transform))
42+
RegisterSignal(living_parent, COMSIG_MOB_POST_UPDATE_TRANSFORM, PROC_REF(on_modify_or_update_transform))
4343
RegisterSignal(living_parent, COMSIG_LIVING_DEATH, PROC_REF(on_death))
4444
RegisterSignal(living_parent, COMSIG_LIVING_REVIVE, PROC_REF(on_revive))
4545
if(living_parent.stat == DEAD)
@@ -48,7 +48,7 @@
4848

4949
/datum/component/clickbox/UnregisterFromParent()
5050
var/atom/movable/mov_parent = parent
51-
UnregisterSignal(mov_parent, list(COMSIG_ATOM_VV_MODIFY_TRANSFORM, COMSIG_LIVING_POST_UPDATE_TRANSFORM, COMSIG_LIVING_DEATH, COMSIG_LIVING_REVIVE))
51+
UnregisterSignal(mov_parent, list(COMSIG_ATOM_VV_MODIFY_TRANSFORM, COMSIG_MOB_POST_UPDATE_TRANSFORM, COMSIG_LIVING_DEATH, COMSIG_LIVING_REVIVE))
5252
mov_parent.underlays -= clickbox_undelay
5353

5454
/// Removes the old underlay and adds a new one if conditions are met. The underlay is scaled up/down if necessary

code/datums/elements/movetype_handler.dm

+2-25
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
element_flags = ELEMENT_DETACH
1313

1414
var/list/attached_atoms = list()
15-
var/list/paused_floating_anim_atoms = list()
1615

1716
/datum/element/movetype_handler/Attach(datum/target)
1817
. = ..()
@@ -26,7 +25,6 @@
2625
RegisterSignal(movable_target, GLOB.movement_type_removetrait_signals, PROC_REF(on_movement_type_trait_loss))
2726
RegisterSignal(movable_target, SIGNAL_ADDTRAIT(TRAIT_NO_FLOATING_ANIM), PROC_REF(on_no_floating_anim_trait_gain))
2827
RegisterSignal(movable_target, SIGNAL_REMOVETRAIT(TRAIT_NO_FLOATING_ANIM), PROC_REF(on_no_floating_anim_trait_loss))
29-
RegisterSignal(movable_target, COMSIG_PAUSE_FLOATING_ANIM, PROC_REF(pause_floating_anim))
3028
attached_atoms[movable_target] = TRUE
3129

3230
if(movable_target.movement_type & (FLOATING|FLYING) && !HAS_TRAIT(movable_target, TRAIT_NO_FLOATING_ANIM))
@@ -36,14 +34,12 @@
3634
var/list/signals_to_remove = list(
3735
SIGNAL_ADDTRAIT(TRAIT_NO_FLOATING_ANIM),
3836
SIGNAL_REMOVETRAIT(TRAIT_NO_FLOATING_ANIM),
39-
COMSIG_PAUSE_FLOATING_ANIM
4037
)
4138
signals_to_remove += GLOB.movement_type_addtrait_signals
4239
signals_to_remove += GLOB.movement_type_removetrait_signals
4340
UnregisterSignal(source, signals_to_remove)
4441

4542
attached_atoms -= source
46-
paused_floating_anim_atoms -= source
4743
stop_floating(source)
4844
return ..()
4945

@@ -55,7 +51,7 @@
5551
return
5652
var/old_state = source.movement_type
5753
source.movement_type |= flag
58-
if(!(old_state & (FLOATING|FLYING)) && (source.movement_type & (FLOATING|FLYING)) && !paused_floating_anim_atoms[source] && !HAS_TRAIT(source, TRAIT_NO_FLOATING_ANIM))
54+
if(!(old_state & (FLOATING|FLYING)) && (source.movement_type & (FLOATING|FLYING)) && !HAS_TRAIT(source, TRAIT_NO_FLOATING_ANIM))
5955
DO_FLOATING_ANIM(source)
6056
SEND_SIGNAL(source, COMSIG_MOVETYPE_FLAG_ENABLED, flag, old_state)
6157

@@ -80,28 +76,9 @@
8076
/// Called when the TRAIT_NO_FLOATING_ANIM trait is removed from the mob. Restarts the bobbing animation.
8177
/datum/element/movetype_handler/proc/on_no_floating_anim_trait_loss(atom/movable/source, trait)
8278
SIGNAL_HANDLER
83-
if(source.movement_type & (FLOATING|FLYING) && !paused_floating_anim_atoms[source])
79+
if(source.movement_type & (FLOATING|FLYING))
8480
DO_FLOATING_ANIM(source)
8581

86-
///Pauses the floating animation for the duration of the timer... plus [tickrate - (world.time + timer) % tickrate] to be precise.
87-
/datum/element/movetype_handler/proc/pause_floating_anim(atom/movable/source, timer)
88-
SIGNAL_HANDLER
89-
if(paused_floating_anim_atoms[source] < world.time + timer)
90-
stop_floating(source)
91-
if(!length(paused_floating_anim_atoms))
92-
START_PROCESSING(SSdcs, src) //1 second tickrate.
93-
paused_floating_anim_atoms[source] = world.time + timer
94-
95-
/datum/element/movetype_handler/process()
96-
for(var/_paused in paused_floating_anim_atoms)
97-
var/atom/movable/paused = _paused
98-
if(paused_floating_anim_atoms[paused] < world.time)
99-
if(paused.movement_type & (FLOATING|FLYING) && !HAS_TRAIT(paused, TRAIT_NO_FLOATING_ANIM))
100-
DO_FLOATING_ANIM(paused)
101-
paused_floating_anim_atoms -= paused
102-
if(!length(paused_floating_anim_atoms))
103-
STOP_PROCESSING(SSdcs, src)
104-
10582
/// Stops the above. Also not a comsig proc.
10683
/datum/element/movetype_handler/proc/stop_floating(atom/movable/target)
10784
var/final_pixel_y = target.base_pixel_y

code/datums/mutations/body.dm

+2-4
Original file line numberDiff line numberDiff line change
@@ -333,16 +333,14 @@
333333
if(..())
334334
return
335335
ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
336-
owner.resize = 1.25
337-
owner.update_transform()
336+
owner.update_transform(1.25)
338337
owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink.."))
339338

340339
/datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner)
341340
if(..())
342341
return
343342
REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
344-
owner.resize = 0.8
345-
owner.update_transform()
343+
owner.update_transform(0.8)
346344
owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow.."))
347345

348346
/datum/mutation/human/spasms

0 commit comments

Comments
 (0)