Refactors Morphs into Basic Mobs (there is now a swag action for morphification) #77503

san7890 · 2023-08-10T03:59:56Z

About The Pull Request

I was bored, so did this. Probably one of the neatest refactors I've done, sorry if there's some oddities because I was experimenting with some other stuff in this so just tell me to clean them up whenever I can.

Anyways, morphs are basic mobs now. We are able to easily refactor the whole "eat items and corpses" stuff in the basic mob framework, but the whole "morph into objects and people" turned out to be a bit trickier. That was easily rectified with a datum mob cooldown action and copy-pasting the old code into that code, as well as doing some nice stuff with traits and signals to ensure the one-way communication from the action to the mob.

Old Morph AI didn't seem to be existant whatsoever, they inappropriately leveraged some old procs and I have no idea how to make it work with new AI. They DEFINITELY don't spawn outside of admin interference/ the event anymore, and will always be controlled by a player, so this shouldn't be too bad of an issue. I gave them something to seem alive just in case though, but I think adding legitimate prop-hunt AI would be such a laborious task that I am unwilling to do it in this PR.

Why It's Good For The Game

If admins want to add the ability for Ian to assume the form of the HoP, they can do that now! The datum action cooldown is quite nice for simple and basic mobs... but it is currently not compatible with carbons. That is not within scope for this PR, but I am dwelling on ways to extend it to carbon but they all sound really awfully bad.

Also morphs are smarter, and we tick another simple animal in need of refactoring off the list.

Changelog

🆑
refactor: Morphs are now basic mobs with a nice new ability to help you change forms rather than the old shift-click method, much more intuitive.
admin: With the morph rework comes a new ability you can add to mobs, "Assume Form". Feel free to add that to any simple or basic mob for le funnies as Runtime turns into a pen or something.
/:cl:

Does anyone know if there's a (sane) way to alias a cooldown action as a keypress? I can't think of a good way to retain the old shift-click functionality, because that does feel kinda nice, but I think it can be lived without. I added it. Kinda fugly but whatever.

leave some stuff for later

we can just nullcheck `form` instead in all cases

these do not spawn naturally (you'll see another commit if i'm wrong) and we can just add indepth morph ai later idk

this hybrid will have to do for now

yeah it's a kinda bummer to have to store the action on the mob for this but i think the rapid switching action was nice

AnturK · 2023-08-10T20:17:40Z

Old behaviour was very simple (just pick random thing in view when not attacking someone and switch range to 1), what's the issue with moving that to our current ai framework ?

san7890 · 2023-08-10T20:39:09Z

Old behaviour was very simple (just pick random thing in view when not attacking someone and switch range to 1), what's the issue with moving that to our current ai framework ?

i don't think we have the concept of "range" in modern ai framework? i've never come across it, and there isn't any circumstance in which morphs are mapped in or spawn without a player otherwise. if there was a circumstance where morphs spawned without player input in modern code i'd try and figure it out, but there's nothing

Jacquerel

Mostly nitpicks, few things I do not understand.

code/datums/actions/mobs/assume_form.dm

code/modules/mob/living/basic/space_fauna/morph.dm

think it was a merge conflict fuck up

…hification) (#77503) ## About The Pull Request I was bored, so did this. Probably one of the neatest refactors I've done, sorry if there's some oddities because I was experimenting with some other stuff in this so just tell me to clean them up whenever I can. Anyways, morphs are basic mobs now. We are able to easily refactor the whole "eat items and corpses" stuff in the basic mob framework, but the whole "morph into objects and people" turned out to be a bit trickier. That was easily rectified with a datum mob cooldown action and copy-pasting the old code into that code, as well as doing some nice stuff with traits and signals to ensure the one-way communication from the action to the mob. Old Morph AI didn't seem to be existant whatsoever, they inappropriately leveraged some old procs and I have no idea how to make it work with new AI. They DEFINITELY don't spawn outside of admin interference/ the event anymore, and will always be controlled by a player, so this shouldn't be too bad of an issue. I gave them something to seem alive just in case though, but I think adding legitimate prop-hunt AI would be such a laborious task that I am unwilling to do it in this PR. ## Why It's Good For The Game If admins want to add the ability for Ian to assume the form of the HoP, they can do that now! The datum action cooldown is quite nice for simple and basic mobs... but it is currently not compatible with carbons. That is not within scope for this PR, but I am dwelling on ways to extend it to carbon but they all sound really awfully bad. Also morphs are smarter, and we tick another simple animal in need of refactoring off the list. ## Changelog :cl: refactor: Morphs are now basic mobs with a nice new ability to help you change forms rather than the old shift-click method, much more intuitive. admin: With the morph rework comes a new ability you can add to mobs, "Assume Form". Feel free to add that to any simple or basic mob for le funnies as Runtime turns into a pen or something. /:cl: ~~Does anyone know if there's a (sane) way to alias a cooldown action as a keypress? I can't think of a good way to retain the old shift-click functionality, because that does feel _kinda_ nice, but I think it can be lived without.~~ I added it. Kinda fugly but whatever.

…nent (#77539) ## About The Pull Request Hey there, I've personally fallen for this stupid thing twice (in #77503 and #75627 (d357516)), so I decided to spend a few hours to crack out a unit test to ensure that I (and no one else) falls for this stupid thing again. Let me know if there's a smarter way to code something like this, but I couldn't figure out a better way to accomodate the current framework and be as agnostic to certain oddities as possible. ## Why It's Good For The Game Catches stuff like this: ```txt [2023-08-11 21:10:04.019] FAILURE #1: The mob Garden Gnome does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #2: The mob the morph does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #3: The mob the guard spiderling (946) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #4: The mob the ambush spiderling (255) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #5: The mob the scout spiderling (375) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #6: The mob the flesh spiderling (337) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #7: The mob the hunter spiderling (869) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #8: The mob the nurse spiderling (629) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #9: The mob the tangle spiderling (19) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #10: The mob the broodmother spiderling (855) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #11: The mob the viper spiderling (519) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #12: The mob the tarantula spiderling (963) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE #13: The mob the spiderling (100) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 ``` (ignore the part about gnomes and morphs, this was an earlier version of the unit test. everything else was relevant and is fixed) ## Changelog :cl: fix: Growing spiders will now retaliate against you like they were always meant to. /:cl:

…a swag action for morphification) (#7292) Original PR: tgstation/tgstation#77503 ----- ## About The Pull Request I was bored, so did this. Probably one of the neatest refactors I've done, sorry if there's some oddities because I was experimenting with some other stuff in this so just tell me to clean them up whenever I can. Anyways, morphs are basic mobs now. We are able to easily refactor the whole "eat items and corpses" stuff in the basic mob framework, but the whole "morph into objects and people" turned out to be a bit trickier. That was easily rectified with a datum mob cooldown action and copy-pasting the old code into that code, as well as doing some nice stuff with traits and signals to ensure the one-way communication from the action to the mob. Old Morph AI didn't seem to be existant whatsoever, they inappropriately leveraged some old procs and I have no idea how to make it work with new AI. They DEFINITELY don't spawn outside of admin interference/ the event anymore, and will always be controlled by a player, so this shouldn't be too bad of an issue. I gave them something to seem alive just in case though, but I think adding legitimate prop-hunt AI would be such a laborious task that I am unwilling to do it in this PR. ## Why It's Good For The Game If admins want to add the ability for Ian to assume the form of the HoP, they can do that now! The datum action cooldown is quite nice for simple and basic mobs... but it is currently not compatible with carbons. That is not within scope for this PR, but I am dwelling on ways to extend it to carbon but they all sound really awfully bad. Also morphs are smarter, and we tick another simple animal in need of refactoring off the list. ## Changelog :cl: refactor: Morphs are now basic mobs with a nice new ability to help you change forms rather than the old shift-click method, much more intuitive. admin: With the morph rework comes a new ability you can add to mobs, "Assume Form". Feel free to add that to any simple or basic mob for le funnies as Runtime turns into a pen or something. /:cl: ~~Does anyone know if there's a (sane) way to alias a cooldown action as a keypress? I can't think of a good way to retain the old shift-click functionality, because that does feel _kinda_ nice, but I think it can be lived without.~~ I added it. Kinda fugly but whatever. Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>

…hification) (tgstation#77503) I was bored, so did this. Probably one of the neatest refactors I've done, sorry if there's some oddities because I was experimenting with some other stuff in this so just tell me to clean them up whenever I can. Anyways, morphs are basic mobs now. We are able to easily refactor the whole "eat items and corpses" stuff in the basic mob framework, but the whole "morph into objects and people" turned out to be a bit trickier. That was easily rectified with a datum mob cooldown action and copy-pasting the old code into that code, as well as doing some nice stuff with traits and signals to ensure the one-way communication from the action to the mob. Old Morph AI didn't seem to be existant whatsoever, they inappropriately leveraged some old procs and I have no idea how to make it work with new AI. They DEFINITELY don't spawn outside of admin interference/ the event anymore, and will always be controlled by a player, so this shouldn't be too bad of an issue. I gave them something to seem alive just in case though, but I think adding legitimate prop-hunt AI would be such a laborious task that I am unwilling to do it in this PR. If admins want to add the ability for Ian to assume the form of the HoP, they can do that now! The datum action cooldown is quite nice for simple and basic mobs... but it is currently not compatible with carbons. That is not within scope for this PR, but I am dwelling on ways to extend it to carbon but they all sound really awfully bad. Also morphs are smarter, and we tick another simple animal in need of refactoring off the list. :cl: refactor: Morphs are now basic mobs with a nice new ability to help you change forms rather than the old shift-click method, much more intuitive. admin: With the morph rework comes a new ability you can add to mobs, "Assume Form". Feel free to add that to any simple or basic mob for le funnies as Runtime turns into a pen or something. /:cl: ~~Does anyone know if there's a (sane) way to alias a cooldown action as a keypress? I can't think of a good way to retain the old shift-click functionality, because that does feel _kinda_ nice, but I think it can be lived without.~~ I added it. Kinda fugly but whatever.

…nent (tgstation#77539) Hey there, I've personally fallen for this stupid thing twice (in tgstation#77503 and tgstation#75627 (d357516)), so I decided to spend a few hours to crack out a unit test to ensure that I (and no one else) falls for this stupid thing again. Let me know if there's a smarter way to code something like this, but I couldn't figure out a better way to accomodate the current framework and be as agnostic to certain oddities as possible. Catches stuff like this: ```txt [2023-08-11 21:10:04.019] FAILURE #1: The mob Garden Gnome does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#2: The mob the morph does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#3: The mob the guard spiderling (946) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#4: The mob the ambush spiderling (255) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#5: The mob the scout spiderling (375) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#6: The mob the flesh spiderling (337) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#7: The mob the hunter spiderling (869) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#8: The mob the nurse spiderling (629) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#9: The mob the tangle spiderling (19) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#10: The mob the broodmother spiderling (855) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#11: The mob the viper spiderling (519) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#12: The mob the tarantula spiderling (963) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 - FAILURE Monkestation#13: The mob the spiderling (100) does not have ANY instances of TRAIT_SUBTREE_REQUIRED_ELEMENT, but has a planning subtree (/datum/ai_planning_subtree/target_retaliate/to_flee) that requires it! at code/modules/unit_tests/ensure_subtree_element.dm:45 ``` (ignore the part about gnomes and morphs, this was an earlier version of the unit test. everything else was relevant and is fixed) :cl: fix: Growing spiders will now retaliate against you like they were always meant to. /:cl:

san7890 added 24 commits August 9, 2023 20:41

file switch

de4177d

let's find out what breaks (S&R)

1187d0a

var swaps

298c641

small code cleanup

85c1394

leave some stuff for later

get rid of morphed

77c3522

we can just nullcheck `form` instead in all cases

alphabetize that list

862b8e2

slightly more cleanup

ba880da

whoops

33d212e

overhauls the attacking target stuffs

d91e6d1

adds a really trim ai

01a7dc3

these do not spawn naturally (you'll see another commit if i'm wrong) and we can just add indepth morph ai later idk

AUUUGHHHH

c673085

cleanup and hopefully makes it work idk

fb71d10

back to the mob code

c7039a4

WAAARRRRRGGGGGHHHH

c432a2a

INSANE INSANE INSANE INSANE INSANE

8366796

NIGHTMARE V2 V2

359c54a

okay that was an epic failure

0b6f2cd

i'm stuck

205910d

alright it was a good attempt

1f827b7

the trait dream is dead

ff7a1cb

this hybrid will have to do for now

fixes those args whoops

bf8b4e5

it's done.

cb354ee

cleans up all the other code too

a95861b

updatepaths

27ed600

san7890 requested review from tralezab, ninjanomnom and Mothblocks as code owners August 10, 2023 03:59

tgstation-server added Administration As generous gods, we have deigned to throw the jannies a bone Tools We pretend to be a real development community Refactor Makes the code harder to read labels Aug 10, 2023

gives it the shift-click ability back

186393f

yeah it's a kinda bummer to have to store the action on the mob for this but i think the rapid switching action was nice

tgstation-server added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Aug 10, 2023

Merge remote-tracking branch 'upstream/master' into oiwehnjrfpoiqwen

87b6730

tgstation-server removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Aug 10, 2023

Jacquerel requested changes Aug 11, 2023

View reviewed changes

san7890 added 4 commits August 11, 2023 13:52

actually the "better idea" was junk

13a1d59

we really need to unit test this

461e05b

reset appearances on removal of action

f42faf4

balloon alert instead of to_chat

677143a

san7890 mentioned this pull request Aug 11, 2023

Unit Tests for AI Planning Subtrees not having required element/component #77539

Merged

fucked up the early return

1ec6038

tgstation-server added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Aug 12, 2023

Merge remote-tracking branch 'upstream/master' into oiwehnjrfpoiqwen

71089bd

tgstation-server removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Aug 12, 2023

removes dupe of goliath

ca0d727

think it was a merge conflict fuck up

Jacquerel merged commit 31f1924 into tgstation:master Aug 12, 2023
19 checks passed

github-actions bot added a commit that referenced this pull request Aug 12, 2023

Updating GBP balances for #77503

925d2fa

comfyorange added a commit that referenced this pull request Aug 12, 2023

Automatic changelog for PR #77503 [ci skip]

56f8b64

TaleStationBot mentioned this pull request Aug 12, 2023

[MIRROR] [MDB IGNORE] Refactors Morphs into Basic Mobs (there is now a swag action for morphification) TaleStation/TaleStation#7292

Merged

SkyratBot mentioned this pull request Aug 12, 2023

[MIRROR] Refactors Morphs into Basic Mobs (there is now a swag action for morphification) [MDB IGNORE] Skyrat-SS13/Skyrat-tg#23046

Merged

NaakaKo mentioned this pull request Aug 12, 2023

[MIRROR] Unit Tests for AI Planning Subtrees not having required element/component Bird-Lounge/Skyraptor-SS13#245

Merged

dwasint mentioned this pull request Aug 22, 2023

Massive ports of basic mobs from tg Monkestation/Monkestation2.0#275

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactors Morphs into Basic Mobs (there is now a swag action for morphification) #77503

Refactors Morphs into Basic Mobs (there is now a swag action for morphification) #77503

san7890 commented Aug 10, 2023 •

edited

AnturK commented Aug 10, 2023

san7890 commented Aug 10, 2023 •

edited

Jacquerel left a comment

Refactors Morphs into Basic Mobs (there is now a swag action for morphification) #77503

Refactors Morphs into Basic Mobs (there is now a swag action for morphification) #77503

Conversation

san7890 commented Aug 10, 2023 • edited

About The Pull Request

Why It's Good For The Game

Changelog

AnturK commented Aug 10, 2023

san7890 commented Aug 10, 2023 • edited

Jacquerel left a comment

Choose a reason for hiding this comment

san7890 commented Aug 10, 2023 •

edited

san7890 commented Aug 10, 2023 •

edited