Xeno strains refactor #5542

SabreML · 2024-01-24T20:57:09Z

About the pull request

Refactors xeno strains by taking out the old /datum/xeno_mutator//datum/mutator_set system and replacing it with a new datum/xeno_strain, since as far as I'm aware mutators haven't been touched in almost 5 years.

As a side note, the DMI changes are from me deleting the icon states of the unused 'Tremor' Burrower strain, since I figured it fit within the bounds of the PR. (The strain's sprites are identical to that of the base caste.)

Explain why it's good for the game

The new datum should be a lot more streamlined than the old system, and require much less boilerplate when making a new strain. Ideally this could even replace /datum/behavior_delagate with signal handlers in the future, although a few more refactors would be required before that's possible.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
refactor: Refactored xeno strains.
add: Added a keybind setting to open the 'Purchase Strain' window. (Also renamed the macro)
/:cl:

oh boy here we go

I removed the `tacklestrength_*` part since it wasn't being used at all

Trapper first pass Eggsac first pass Charger first pass Steel Crest first pass Drone strains first pass Resin Whisperer first pass Vampire first pass Praetorian strains first pass Ravager strains first pass Acider first pass Watcher strain (almost forgot this existed lol)

The 'Tremor' burrower sprites look the same as the regular burrower, so I've just removed the icon update part.

It makes more sense there really

There's a lot of removed `mutation_type` checks in here, but as far as I can tell there's no way for other strains to access the ability in those cases.

I don't like using `istype()`, but I think one's needed here. (woo final error fixed!!)

Mainly just so that `update_icons()` can be called after it.

I still need to test this though

SabreML · 2024-01-25T17:10:45Z

The UI label can be removed now. It was just from me putting this in a jsx file: bd43b18.

Birdtalon · 2024-01-31T23:12:07Z

I will try to get through this soon.

cm13-github · 2024-02-01T13:39:39Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

cm13-github · 2024-02-01T16:34:46Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

nauticall · 2024-02-05T13:04:38Z

please add ingame screenshots of your sprites to the PR description, thanks 🙏

Birdtalon · 2024-02-05T14:55:13Z

please add ingame screenshots of your sprites to the PR description, thanks 🙏

@nauticall just FYI this PR only deletes unused Tremor burrower sprites.

cm13-github · 2024-02-05T17:56:32Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Renamed the variable to be a bit more descriptive, and replaced the defines with their strings.

I'm SURE this was working before, but obviously it broke at some point

Megaddd · 2024-02-13T14:26:01Z

@SabreML this PR breaks/removes the purchase strains hotkey currently

SabreML · 2024-02-13T15:46:07Z

@SabreML this PR breaks/removes the purchase strains hotkey currently

Shoot, thanks for letting me know!

SabreML · 2024-02-13T16:23:34Z

@Megaddd It looks like the issue was from me changing the verb's name from 'Purchase Strains' to 'Purchase Strain' (since it's a bit more accurate), which means that the command to activate it also changed to Purchase-Strain.

I've just added an "official" keybind setting for it, so I'd suggest either swapping over to that or editing your macro to use the non-plural command.

Birdtalon

Looking good, testing issues have been resolved.

# About the pull request Adds a unit test for xeno strains. I could have included this in #5542, but I thought it would be better in its own PR in order to keep the checks and everything separate. The removed sprites for the Trapper, Charger, Gardener, and Watcher strains are (as far as I'm able to tell) completely identical to that of the base caste, and are only there in order to make the old system work properly. Currently, this includes the following tests: - Checking that the `caste_type` variable on each `/mob/living/carbon/xenomorph` subtype has a corresponding entry in `GLOB.xeno_datum_list`. (Not really strain related but I figured no harm in including it) - Checking that each `/datum/xeno_strain` subtype has its own `name` and `description`. - Making sure that each strain's `actions_to_add` and `actions_to_remove` lists are added and removed from the xeno properly. (Taking into account any which are re-added.) - Making sure that the strain's `behavior_delegate_type` is successfully added to the xeno. - If the strain doesn't have an `icon_state_prefix`, going through the xeno's `icon` file and double checking that there aren't strain sprites in there (That is, sprites beginning with the strain's name). If there are any, then `icon_state_prefix` should probably be set to use them. - If the strain *does* have an `icon_state_prefix`, making sure that the xeno's sprite actually got changed to the strain version. # Explain why it's good for the game More unit tests! (woo) # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: code: Added a unit test for xeno strains. /:cl:

# About the pull request Fixes #5765. This was caused by me in #5542 deleting a couple of lines from `/mob/living/carbon/xenomorph/proc/recalculate_tackle()`, when I should have only removed the `mutators`/`hive.mutators` part. ![image](https://github.com/cmss13-devs/cmss13/assets/57483089/b54a3e03-03cd-49a3-a093-ab0765059a7b) # Explain why it's good for the game Whoops # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> `tacklestrength_min` and `tacklestrength_max` are being applied correctly: ![image](https://github.com/cmss13-devs/cmss13/assets/57483089/8404ddf3-17e0-42a5-a3cf-91a85beb1e50) </details> # Changelog :cl: fix: Fixed Xenomorphs not having their caste's tackle duration values applied to them. /:cl:

SabreML added 11 commits January 24, 2024 16:32

Initial Framework

a7b4328

oh boy here we go

Stuff

64eec09

I removed the `tacklestrength_*` part since it wasn't being used at all

Unused burrower strain

2e55627

The 'Tremor' burrower sprites look the same as the regular burrower, so I've just removed the icon update part.

More stuff

5eb36e9

available_strains to caste

e75a626

It makes more sense there really

Second pass (squashed commits)

f6d142c

There's a lot of removed `mutation_type` checks in here, but as far as I can tell there's no way for other strains to access the ability in those cases.

xeno_strain streamlining

874d730

eg

d566cfe

I don't like using `istype()`, but I think one's needed here. (woo final error fixed!!)

Splitting off apply_strain()

f4a153a

Mainly just so that `update_icons()` can be called after it.

Initial fixes from testing

8ffee8e

github-actions bot added Sprites Remove the soul from the game. UI deletes nanoui/html Refactor Make the code harder to read labels Jan 24, 2024

SabreML added 2 commits January 24, 2024 21:02

todo removal to appease the CI

bd43b18

I still need to test this though

More testing

4f283bb

SabreML marked this pull request as ready for review January 25, 2024 16:48

SabreML requested a review from fira as a code owner January 25, 2024 16:48

mullenpaul removed the UI deletes nanoui/html label Jan 27, 2024

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 1, 2024

Merge remote-tracking branch 'upstream/master' into xeno-strain

7ae3299

cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 1, 2024

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 5, 2024

SabreML added 2 commits February 11, 2024 18:04

Strain sprites fix

3a9289b

Renamed the variable to be a bit more descriptive, and replaced the defines with their strings.

And this

ca7be6f

I'm SURE this was working before, but obviously it broke at some point

cm13-github added a commit that referenced this pull request Feb 12, 2024

TGS Test Merge (#5542)

f26486b

ekcja1 mentioned this pull request Feb 12, 2024

Long eyesight #5707

Closed

3 tasks

Releasethesea mentioned this pull request Feb 13, 2024

hellhound pack status not working #5710

Open

3 tasks

cm13-github added a commit that referenced this pull request Feb 13, 2024

TGS Test Merge (#5542)

b4722eb

cm13-github added a commit that referenced this pull request Feb 13, 2024

TGS Test Merge (#5542)

4bff4d7

Crimsonerva mentioned this pull request Feb 13, 2024

Infinite Phone Production #5711

Open

3 tasks

Purchase strain keybinding

e849f60

FighterOfKeyboard mentioned this pull request Feb 13, 2024

Text not showing properly #5714

Closed

3 tasks

eMiiXi mentioned this pull request Feb 13, 2024

Head surgery glitch, armor being detected as helmet restriction. #5715

Open

3 tasks

cm13-github added a commit that referenced this pull request Feb 14, 2024

TGS Test Merge (#5542)

2d751ea

cm13-github added a commit that referenced this pull request Feb 14, 2024

TGS Test Merge (#5542)

31b05e6

cm13-github added a commit that referenced this pull request Feb 14, 2024

TGS Test Merge (#5542)

19fa880

cm13-github added a commit that referenced this pull request Feb 14, 2024

TGS Test Merge (#5542)

93e1272

cm13-github added a commit that referenced this pull request Feb 14, 2024

TGS Test Merge (#5542)

5d0af14

cm13-github added a commit that referenced this pull request Feb 15, 2024

TGS Test Merge (#5542)

ccbc802

cm13-github added a commit that referenced this pull request Feb 15, 2024

TGS Test Merge (#5542)

58aa713

Birdtalon approved these changes Feb 15, 2024

View reviewed changes

Birdtalon added this pull request to the merge queue Feb 15, 2024

Merged via the queue into cmss13-devs:master with commit d998245 Feb 15, 2024
26 checks passed

cm13-github added a commit that referenced this pull request Feb 15, 2024

Automatic changelog for PR #5542 [ci skip]

048d80e

SabreML mentioned this pull request Feb 15, 2024

Xeno strains unit test #5725

Merged

SabreML mentioned this pull request Feb 21, 2024

Fixes xeno tacklestrength #5773

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Xeno strains refactor #5542

Xeno strains refactor #5542

SabreML commented Jan 24, 2024 •

edited

Loading

SabreML commented Jan 25, 2024

Birdtalon commented Jan 31, 2024

cm13-github commented Feb 1, 2024

cm13-github commented Feb 1, 2024

nauticall commented Feb 5, 2024

Birdtalon commented Feb 5, 2024

cm13-github commented Feb 5, 2024

Megaddd commented Feb 13, 2024

SabreML commented Feb 13, 2024

SabreML commented Feb 13, 2024

Birdtalon left a comment

Xeno strains refactor #5542

Xeno strains refactor #5542

Conversation

SabreML commented Jan 24, 2024 • edited Loading

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

SabreML commented Jan 25, 2024

Birdtalon commented Jan 31, 2024

cm13-github commented Feb 1, 2024

cm13-github commented Feb 1, 2024

nauticall commented Feb 5, 2024

Birdtalon commented Feb 5, 2024

cm13-github commented Feb 5, 2024

Megaddd commented Feb 13, 2024

SabreML commented Feb 13, 2024

SabreML commented Feb 13, 2024

Birdtalon left a comment

Choose a reason for hiding this comment

SabreML commented Jan 24, 2024 •

edited

Loading