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

Make vitrification event recognize faction succession #71377

Merged
merged 3 commits into from
Feb 1, 2024

Conversation

Milopetilo
Copy link
Contributor

@Milopetilo Milopetilo commented Jan 31, 2024

Summary

Bugfixes "Make vitrification event remove visual effect on succession"

Purpose of change

Fixes #71256.

Describe the solution

Add an EOC that triggers "alter_timed_events": "vitrified_farm_escape_key" on avatar change. Also changed the variables to be on the alpha talker.

Describe alternatives you've considered

Put it in the vitrified_death EOC, but it doesn't seem to work sadly.

Testing

Went in-game with changes, activated the event, died from vitrifying and from other causes, switching to an NPC correctly removed the vitrified farm and visual effects. Also checked that normal faction succession still succeeds.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON EOC: Effects On Condition Anything concerning Effects On Condition <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 31, 2024
@Milopetilo Milopetilo force-pushed the quiet-farm-followers branch from 23c69b7 to 928049d Compare January 31, 2024 02:37
@andrei8l
Copy link
Contributor

This should be have "global": true so it doesn't run for NPCs as well.

And 1s recurrence still seems excessive. IMO the best solution is to scope all the variables on the alpha talker (ex. vitri_glass_entered -> u_vitri_glass_entered). Saves that are in the middle of that encounter will have the chain broken, but I think it's a positive change overall.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 31, 2024
@Milopetilo
Copy link
Contributor Author

I changed the scope on the variables and changed the EOC to trigger on changing avatars, so there's no need anymore for a recurring EOC.

@Maleclypse Maleclypse merged commit 5008ad4 into CleverRaven:master Feb 1, 2024
23 of 25 checks passed
@Milopetilo Milopetilo deleted the quiet-farm-followers branch February 5, 2024 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) EOC: Effects On Condition Anything concerning Effects On Condition [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Vitrification Post-Death
3 participants