Submerging refactor #15894
Submerging refactor #15894
Conversation
tgstation-server
added
Sprites
|
looks really cool thou |
What would be a practical way to make it work as an element, considering it would be required for normal turfs that have applicable atoms on them (i.e. floor with tallgrass), but that atom could move or be deleted. I guess we could just recheck the height/depth turf procs and exclude qdeleted things before removing the element or something. Let me mess around. |
|
Ok I channeled some powers and created a element and component combo that I am actually happy with. |
TiviPlus
added
the
Test Merge Candidate
|
need to fix a big, untm'd. |
Lumipharon
added
Do Not Merge
Lumipharon
removed
the
Do Not Merge
|
ok this should be good to merge now |
github-actions
bot
added
the
Merge Conflict
tgstation-server
removed
the
Merge Conflict
| . = ..() | ||
| if(!isturf(target)) | ||
| return ELEMENT_INCOMPATIBLE | ||
| //override true as we don't look up if the turf already has the element |
There was a problem hiding this comment.
Is this the right way to handle things WRT trying to add an already present element? I'm not super familiar with them.
| @@ -132,6 +133,8 @@ | |||
| /// inherited from riding vehicles | |||
| #define VEHICLE_TRAIT "vehicle" | |||
|
|
|||
| #define TRAIT_SUBMERGED "trait_submerged" | |||
There was a problem hiding this comment.
Having TRAIT_SUBMERGED and SUBMERGED_TRAIT seems kinda
There was a problem hiding this comment.
Its kinda wew, but its following the naming convention so eh.
| var/atom/movable/owner = parent | ||
| RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(move_submerge_element)) | ||
| for(var/atom/movable/AM AS in owner.loc) //we remove the submerge and reapply after owner is connect | ||
| AM.set_submerge_level(null, owner.loc, duration = 0.1) |
There was a problem hiding this comment.
Why is it important to clear them first?
There was a problem hiding this comment.
Otherwise it will permanently screw up offsets for anything submerged on the tile. Pretty much a lot of this code is to avoid an atom level var, really.
| ///List of all filter removal timers. Glob to avoid an AM level var | ||
| GLOBAL_LIST_EMPTY(submerge_filter_timer_list) | ||
|
|
||
| ///Sets the submerged level of an AM based on its turf |
There was a problem hiding this comment.
Submerge level isn't an actual thing AMs have, right? It looks like this is just setting up a filter/animate.
| @@ -12,3 +12,6 @@ | |||
| remove_movespeed_modifier(MOVESPEED_ID_BULKY_DRAGGING) | |||
| return | |||
| add_movespeed_modifier(MOVESPEED_ID_BULKY_DRAGGING, TRUE, 0, NONE, TRUE, .) | |||
|
|
|||
| /mob/living/set_submerge_level(turf/new_loc, turf/old_loc, submerge_icon = 'icons/turf/alpha_64.dmi', submerge_icon_state = "liquid_alpha", duration = cached_multiplicative_slowdown + next_move_slowdown) | |||
There was a problem hiding this comment.
Having what's basically assignment logic in the proc declaration is weird but I guess it works?
There was a problem hiding this comment.
I already have the check in the base proc, so didn't see any value in requiring more copy paste checks for every version of the proc.
About The Pull Request
Probably TM first in case something borks.
Refactors submersion code, making it generic instead of specific to liquid turfs.
Tall grass and fire now partially submerges mobs, and this can easily be extended to other stuff where appropriate.
Hunter in grass, human in grass, human in grass AND water, human just in water.
Items are partially obscured by liquid turfs (but not by contents like tallgrass, for gameplay reasons)
Vehicles also are also obscured now.
Also fixes #15865
Also while I was doing it made tallgrass also have a footstep override like catwalks etc.
Removed an init signal which was only used for one thing because Entered wasn't called and simply... called Entered. This will likely fix a whole bunch of extremely minor bugs when spawning things in. I can't see any issues this could cause, but let me know if there is something.
Why It's Good For The Game
Better code, more applicable to other stuff, look good.
Changelog
🆑
add: Tall grass and fire now partially obscured you similar to water
add: Items now sink in water, partially obscuring them
add: Vehicles canbe submerged like mobs
fix: fixed throws messing up pixel_y offset over bodies of water
refactor: refactored submersion code
/:cl: