Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports the removal of proc_holders from tg after 2 years of it not being done #11527

Merged
merged 125 commits into from
Feb 1, 2025

Conversation

Szyszkrzyneczka
Copy link
Contributor

@Szyszkrzyneczka Szyszkrzyneczka commented Sep 19, 2024

Please see https://github.com/orgs/BeeStation/projects/23 for a status on testing.

About The Pull Request

(mainly)Ports:

From testmerge:

Also:

Mousepointer fix copy pasted from

This is now a ports proc_holder removal, action button refactor and antimagic refactor

Why It's Good For The Game

Mostly for the refactor of spell code making it easier and possible to make crazy spells and also to make this codebase more closer to modernity
Also this doesn't affect the players

Testing Photographs and Procedure

Once this actually works I will put some screenshots here. Until then please direct my attention towards bits and bops of code that I might've borked up while porting this. Until then this will be a draft.

There is still a ton of work before this can even be considered for merging

Random ass actions (red ones are unavailable because i got no wizard robe)

action1

Action palette thing (very cool)

action2

Cooldown test

action3

Action palette test

action4

Screenshots&Videos

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

Changelog

🆑
code: Removes proc_holders in favour of using /datum/action and expanding on it some more
refactor: refactors how spell code works making it badass and stuff
tweak: Many spells changed to conform with the new code order, included is telepathy that now works by providing the user with a list of targets instead of clicking on one
tweak: Spell cooldowns are very likely to be slightly different (Actually readable) Old cooldown code is an unreadable mess
/:cl:

Second commit will remove all the errors
In the meantime pretty please tell me if you people want anything else to go with this pr
Copy link

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

@github-actions github-actions bot added Merge Conflict Administration Tools TGUI-Changes Contains changes to TGUI. Make sure its up to date with TGUI 4.0 labels Sep 19, 2024
@Szyszkrzyneczka Szyszkrzyneczka marked this pull request as draft September 19, 2024 19:33
code/__DEFINES/span.dm Outdated Show resolved Hide resolved
new paradigm, closing the gates of hell
time to port clockcult from yoggers
@PowerfulBacon
Copy link
Member

Might be worth looking at #11628 which wraps cooldown action into the base of action, and merges the cooldown timers of all 3 together. This could make porting easier since it alleviates the pain caused by faffing around with bee cooldowns fighting with TG cooldowns.

@PowerfulBacon
Copy link
Member

Oh actually just get this done and I'll update that later. As long as this keeps the button click feedback and cooldown icon, I can modify it later.

Now only thing left is bug fixing and merge conflict

Current bugs to fix
Clockwork slab empowerment (spells like kindle etc)
Icons not being correct
why are you guys so fast
@Szyszkrzyneczka
Copy link
Contributor Author

There might be many bugs etc as this is far too big for me to catch
I'll undraft this but please keep in mind some things might not work is merged currently
Ranging from missing sprites to code just not working properly
also the CI stuff I will take care of it

@Szyszkrzyneczka Szyszkrzyneczka marked this pull request as ready for review October 6, 2024 11:10
What the fuck is a proc helper reference!!!!
Only thing left is to clean up maps
@weedspagon-real
Copy link

weedspagon-real commented Jan 18, 2025

somethin about this is preventing me from using necro chaplain's bind soul...no moar holy skeleton :(

image

@Tsar-Salat
Copy link
Contributor

Can confirm from VV inround that there was nothing apparent that should be blocking the player from using the spell. The button was just not usable and gave no error message.

@PowerfulBacon
Copy link
Member

PowerfulBacon commented Jan 19, 2025

somethin about this is preventing me from using necro chaplain's bind soul...no moar holy skeleton :(

image

You have a null rod chainsaw arm, which I believe prevents the use of magic. I'll verify and add a message in chat

@PowerfulBacon
Copy link
Member

PowerfulBacon commented Jan 19, 2025

image

I have tested it and an appropriate error message is presented in chat. I've fixed a bug with the background not appearing correctly.

@PowerfulBacon
Copy link
Member

Oh, this PR actually introduced the flag meaning the spell required no anti magic. I'll remove that.

@PowerfulBacon
Copy link
Member

Apparently has a bug with xenoarch icons. Will merge once thats looked into, but I'm coming off for now.

Copy link

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

Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Been testmerged a few times and all outstanding issues that I knew of were resolved. Any merge skews would be picked up by the fact that most action procs were renamed to follow DM formatting standards

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Feb 1, 2025
Merged via the queue into BeeStation:master with commit 8bc591d Feb 1, 2025
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: No status
6 participants