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

Removes generic_adjective sanity check #3097

Merged
merged 1 commit into from
Jun 18, 2024

Conversation

Anticept
Copy link
Contributor

@Anticept Anticept commented Jun 10, 2024

About The Pull Request

Removed the sanity check I had put in for character adjectives during a previous fix.

It was well intentioned, but as it turns out, if someone is loading a charslot that existed before guestbook was ported or never saved with one, they wouldn't have an adjective saved in their save file, resulting in nulling the variable for generic_adjective, which causes this sanity check to fail and the selection not to show. The goal was meant to prevent a guestbook malfunction from locking up prefs as runtimes can break it, but after spending hours and hours on going over prefscode and analyzing character loading and generation, it's clear that I would have to address this at the point of charslot loading.

I just want this fixed in time for wednesday uptime. BETTER handling will come later, in a separate PR, when I am SURE that they won't break charslots, as well as some other prefs fixups. There's a lot of code in prefs that does not work or do anything, but for now, let's keep it simple. Should be ready to testmerge or full merge.

Changelog

🆑
fix: Generic adjective selection will show for everyone.
/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Jun 10, 2024
@Anticept Anticept changed the title Quick dirty fix for character adjective Removes generic_adjective sanity check Jun 12, 2024
…o cover edge cases of character saves without adjectives saved than previously thought.

oops
@FalloutFalcon
Copy link
Member

This has had plenty of test merges

@FalloutFalcon FalloutFalcon added this pull request to the merge queue Jun 18, 2024
Merged via the queue into shiptest-ss13:master with commit ecfe609 Jun 18, 2024
14 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Removed the sanity check I had put in for character adjectives during a
previous fix.

It was well intentioned, but as it turns out, if someone is loading a
charslot that existed before guestbook was ported or never saved with
one, they wouldn't have an adjective saved in their save file, resulting
in nulling the variable for generic_adjective, which causes this sanity
check to fail and the selection not to show. The goal was meant to
prevent a guestbook malfunction from locking up prefs as runtimes can
break it, but after spending hours and hours on going over prefscode and
analyzing character loading and generation, it's clear that I would have
to address this at the point of charslot loading.

I just want this fixed in time for wednesday uptime. BETTER handling
will come later, in a separate PR, when I am SURE that they won't break
charslots, as well as some other prefs fixups. There's a lot of code in
prefs that does not work or do anything, but for now, let's keep it
simple. Should be ready to testmerge or full merge.

:cl:
fix: Generic adjective selection will show for everyone.
/:cl:
@Anticept Anticept deleted the adjectives-fix branch November 2, 2024 01:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants