[FEATURE] Cat hover sprites on Clan screen #3101
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
*my goddamn linter holy shirt.* sorry senior devs, I am once again on my whitespace bullshit |
j-gynn
changed the title
scribblecrumb
requested changes
Dec 4, 2024
# Conflicts: # resources/credits_text.json # resources/dicts/patrols/general/border.json # resources/dicts/patrols/general/hunting.json # scripts/screens/ClanScreen.py
|
Hold off on this one for now, we've discovered a potentially-seizure inducing bug. Investigating...! |
|
Fixed the concerning strobe! |
# Conflicts: # resources/dicts/events/misc/forest.json # resources/dicts/patrols/general/border.json # resources/dicts/relationship_events/normal_interactions/comfortable/increase.json # resources/dicts/thoughts/dead/darkforest/exiled.json # scripts/events_module/generate_events.py
# Conflicts: # resources/dicts/patrols/general/border.json # resources/dicts/patrols/general/hunting.json
|
Ugh, I keep forgetting to look at this. Resolve the conflicts and I'll get it approved (totally feel free to DM me so i don't miss it again) |
# Conflicts: # resources/dicts/relationship_events/normal_interactions/dislike/decrease.json # resources/dicts/relationship_events/normal_interactions/romantic/increase.json # resources/dicts/relationship_events/normal_interactions/trust/increase.json # scripts/cat/cats.py
# Conflicts: # resources/dicts/acc_display.json # resources/lang/en/events/death/general.json # resources/lang/en/events/misc/general.json # resources/lang/en/events/relationship_events/normal_interactions/admiration/decrease.json # resources/lang/en/events/relationship_events/normal_interactions/admiration/increase.json # resources/lang/en/events/relationship_events/normal_interactions/comfortable/decrease.json # resources/lang/en/events/relationship_events/normal_interactions/comfortable/increase.json # resources/lang/en/events/relationship_events/normal_interactions/dislike/increase.json # resources/lang/en/events/relationship_events/normal_interactions/jealousy/decrease.json # resources/lang/en/events/relationship_events/normal_interactions/jealousy/increase.json # resources/lang/en/events/relationship_events/normal_interactions/platonic/decrease.json # resources/lang/en/events/relationship_events/normal_interactions/platonic/increase.json # resources/lang/en/events/relationship_events/normal_interactions/romantic/decrease.json # resources/lang/en/events/relationship_events/normal_interactions/trust/decrease.json # scripts/cat/cats.py # scripts/cat/pelts.py # scripts/game_structure/ui_elements.py # scripts/screens/ClanScreen.py
|
Removed the tool_tip feature from this PR unfortunately as it's causing so many problems. Leaving the base code for it so people could use it in future (the issue here is with overlapping rects blocking the new tooltip from displaying and I can't for the life of me figure out why. Otherwise, ready for review! |
j-gynn
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Improves the Clan screen cat sprites in several ways (more to come).
Tooltips! Now, when you hover over a cat on this screen, you'll see their name in a cute little tooltip. Just helps you identify your kitties *and* know you're clicking on Brightpaw rather than Comfreynose.Feature removed: was causing a lot of issues. Please take a crack at it if you want, almost everything you'd need is there already.Why This Is Good For ClanGen
Improvements to Clan screen good.
Proof of Testing
Changelog/Credits