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.

Sign up for GitHub

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

Jump to bottom

Jsonized end screen: How I learned to stop worrying and win the Cataclysm #74844

Merged
merged 17 commits into from
Jul 9, 2024
Merged

Jsonized end screen: How I learned to stop worrying and win the Cataclysm #74844

merged 17 commits into from
Jul 9, 2024

Conversation

Fris0uman
Copy link
Contributor

@Fris0uman Fris0uman commented Jun 30, 2024 •
edited
Loading

Summary

Infrastructure "Jsonized end screen"

Purpose of change

  • Jsonize end screen
  • Documentation for end_screen
  • Move existing end screen to json
  • Add a Win™ screen

Describe the solution

Add new end_screen type, put conditions and ascii_art in it, load it, add proper checks

Describe alternatives you've considered

Testing

image

  • Die > tombstone screen
  • Die with a bible in your pocket > cross screen
  • Die as a cannibla > inverted cross screen
  • Do the thing to WIN > WIN screen

Additional context

Based on work from harakka

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style json-styled JSON lint passed, label assigned by github actions labels Jun 30, 2024
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jun 30, 2024
@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. NPC / Factions NPCs, AI, Speech, Factions, Ownership [Markdown] Markdown issues and PRs labels Jul 3, 2024
@Fris0uman Fris0uman marked this pull request as ready for review July 6, 2024 15:35
@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Jul 6, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 6, 2024
@Fris0uman Fris0uman marked this pull request as draft July 6, 2024 15:52
@github-actions github-actions bot added Translation I18n [Python] Code made in Python labels Jul 6, 2024
@Fris0uman Fris0uman marked this pull request as ready for review July 6, 2024 16:45
@harakka
Copy link
Member

harakka commented Jul 6, 2024

Really cool stuff, thanks for going all the way with this. The json has pretty much all the options that I had in mind.

GuardianDll
GuardianDll reviewed Jul 6, 2024
View reviewed changes
data/json/end_screen.json Outdated Show resolved Hide resolved
data/json/end_screen.json Outdated Show resolved Hide resolved
data/json/end_screen.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 6, 2024
@Fris0uman Fris0uman marked this pull request as draft July 8, 2024 12:06
@Fris0uman Fris0uman marked this pull request as ready for review July 8, 2024 12:07
@Maleclypse Maleclypse merged commit 7f1fea9 into CleverRaven:master Jul 9, 2024
36 of 45 checks passed
@Fris0uman Fris0uman deleted the graveless_souls branch August 21, 2024 08:34
@zdlpoppa zdlpoppa mentioned this pull request Sep 30, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuardianDll GuardianDll GuardianDll left review comments

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs NPC / Factions NPCs, AI, Speech, Factions, Ownership [Python] Code made in Python Translation I18n
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Fris0uman @harakka @GuardianDll @Maleclypse