8000 Better calc individual juice fix (Issue #711) by Gloompashcy · Pull Request #737 · Steamodded/smods · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Better calc individual juice fix (Issue #711) #737

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

Merged
merged 3 commits into from
Jun 22, 2025

Conversation

Gloompashcy
Copy link
Contributor
@Gloompashcy Gloompashcy commented Jun 3, 2025

Slight change to the SMODS.calculate_effect function to make some cards stop juicing wrong

Additional Info:

  • I didn't modify api's or I've made a PR to the wiki repo.
  • I didn't modify api's or I've updated lsp definitions.
  • I didn't make new lovely files or all new lovely files have appropriate priority.

@Gloompashcy Gloompashcy requested a review from Aurelius7309 as a code owner June 3, 2025 07:25
@Gloompashcy Gloompashcy closed this Jun 3, 2025
@Gloompashcy Gloompashcy deleted the wee_joker_juice_fix branch June 3, 2025 07:44
@english5040
Copy link
Collaborator

hey! thank you for making a PR!
for context: I made the original issue, thinking it's definitely Steamodded's fault. I'm generally suspicious of this animation bug, it might have a deeper cause- it might be that steamodded's better calc features just don't correctly assign card to some bog-standard jokers.

in short: fixing just Wee might be missing the root cause. I really appreciate the work though, finding what made wee wrong in the first place is really good.

@english5040
Copy link
Collaborator

(just noticed your PR got closed. Github PRs require you to keep the branch not deleted, sorry)

@Gloompashcy
Copy link
Contributor Author
Gloompashcy commented Jun 3, 2025

Yeah, I realized that almost all the cards that upgrade after a card is scored have this same issue, pretty sure it's because better calc always juices the card in play if a scored_card value isn't in the return table. I'll probably reopen with an fix for all of them

@Gloompashcy Gloompashcy restored the wee_joker_juice_fix branch June 3, 2025 07:56
@Gloompashcy Gloompashcy reopened this Jun 3, 2025
@Gloompashcy
Copy link
Contributor Author

Reopened with fixes for Lucky Cat and 8-Ball as well

@Gloompashcy Gloompashcy changed the title Wee joker juice fix (Issue #711) Better calc individual juice fix (Issue #711) Jun 3, 2025
@Gloompashcy Gloompashcy marked this pull request as draft June 3, 2025 08:18
@Gloompashcy
Copy link
Contributor Author

Temp fix for now, looking into a fix for the deeper issue

@Eremel
Copy link
Collaborator
Eremel commented Jun 3, 2025

I'm not able to test right now, but I'm pretty sure that moving effect.focus to the start of the or chain in this line would solve the problem without having to patch vanilla jokers. If you could test that for me, I'd appreciate that.

@Gloompashcy
Copy link
Contributor Author
Gloompashcy commented Jun 3, 2025

That does fix this issue, but it also causes jokers like hiker to have scoring animations on the joker rather than the card

@Gloompashcy
Copy link
Contributor Author

May have found a working solution, testing now

@Gloompashcy Gloompashcy marked this pull request as ready for review June 3, 2025 08:58
@Gloompashcy
Copy link
Contributor Author

Seems to be working, but it is possible that an anim could break if it relies on two different cards juicing from effect and extra

@Eremel
Copy link
Collaborator
Eremel commented Jun 3, 2025

Yeah looks like this would definitely break any jokers that are using the extra table to add messages to different things. I'll have a proper look after work later on and see what we can figure out.

@Gloompashcy Gloompashcy marked this pull request as draft June 3, 2025 09:17
@Gloompashcy Gloompashcy marked this pull request as ready for review June 4, 2025 23:50
@Gloompashcy
Copy link
Contributor Author

This is probably the most reasonable solution I've found currently. Since card_eval_status_text will juice the card, I've changed the scored_card:juice_up in SMODS.calculate_effect so that it only happens when the message card is not the same as scored_card

@Gloompashcy
Copy link
Contributor Author

This fixes the problem with wee, lucky cat and 8 ball, and hopefully shouldn't have an impact on uses of the extra table

@Gloompashcy Gloompashcy closed this Jun 8, 2025
@Gloompashcy Gloompashcy force-pushed the wee_joker_juice_fix branch from d8ce273 to f1c8c26 Compare June 8, 2025 02:25
@Gloompashcy Gloompashcy reopened this Jun 8, 2025
@Eremel Eremel merged commit 942c678 into Steamodded:main Jun 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0