Skip to content

Conversation

@SomeTroglodyte
Copy link
Collaborator

Related: #14420, #12834

  • Tutorial is RulesetObject and therefore they belong in Ruleset. This moves their storage.
  • The current json is special-cased as global, while our builtin rulesets get the same status as mods regarding tutorials: This means any entries that are only meaningful for Vanilla or G&K-based games should be moved to the respective Vanilla / G&K Tutorials.json. I've moved Religion- and Espionage-related ones, but there may be more - ones not useful for typical base ruleset mods, or some may benefit from divergent wording for vanilla vs G&K.
  • Moving the Beliefs/Religions special entries back to json (as empty template in the latter case, but one could now add flavor text in json...) proved more effort than I expected - I still pushed it, might be better long-term. The trivial way hits minor quirks like duplicate entries, mutability or special colors set elsewhere.
  • Fixes the regression in 12834 - see comment over there

@SomeTroglodyte
Copy link
Collaborator Author

All right, "Tutorial "Religions" contains no text" - yes that's intentional mister unit test: Will think about later.

},
{
"name": "Religions",
// The available Religions will be appended to any civilopediaText defined here by code
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's what BNW says on Religions.

Image

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also a few entries about Relgion under "Game Concepts"

Screenshot from 2025-12-26 00-44-00

Copy link
Collaborator Author

@SomeTroglodyte SomeTroglodyte Dec 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I arrived at "simply feeding that page something" being the best solution for the unit test. I had thought emphasizing that neither symbol nor name have actual gameplay value. A quote might be nice, but I'd go with Pascal's "wager" one rather than copying anything, even if I think C4 or C3 did quote that...

More concept info should IMO stay in "concept" tutorials, and might be out of scope here. How all this reads in the end, and how it is accessible/findable, and whether a few more links or illustrations might help, I'll leave for someone else1.

Edit: How about...
image

image

Oooooohhhh - forgot to test TFW runs. TFW changes are exactly as expected.

Footnotes

  1. Slartibartfast!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, cleaned up the edges a bit over at SomeTroglodyte#11 .

KeyboardBinding.PediaTutorials,
"OtherIcons/ExclamationMark",
{ _, tutorialController, _ -> tutorialController.getCivilopediaTutorials() }
{ ruleset, _ -> ruleset.getCivilopediaTutorials() }
Copy link
Collaborator

@RobLoach RobLoach Dec 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the Religion one calls the local getCivilopediaReligionEntries(), I think it would be fine to make getCivilopediaTutorials() local as well. As in call it with the same signature as the other method: getCivilopediaTutorials(ruleset)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But then to be really consistent there would be yet another one that's outsourced but could conceivably be local too, wasn't there?

@yairm210
Copy link
Owner

yairm210 commented Jan 1, 2026

I'm really not convinced that religion and espionage are not relevant for other rulesets, this actually seem to be general game mechanics and not particular to only G&K

@github-actions
Copy link

github-actions bot commented Jan 4, 2026

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link

github-actions bot commented Jan 4, 2026

Conflicts have been resolved.

@SomeTroglodyte
Copy link
Collaborator Author

Since the tutorial category thing made a merge unpleasant, plus that "general game mechanics and not particular to only G&K" argument, I've reduced1 this to the purely technical aspects. Vanilla- or G&K- specific tutorials would work, but are not used here. The screenies showing heads and quotes decorations are no longer relevant. They can come later - Rob has better PNG's anyway.

Footnotes

  1. af78bd3, 69ee613, bb9a785 and f3ae750 are gone... Oh and I forgot to commit a merge fix. All done via rename, new branch from master, cherry-pick and force-push, so the listing here on the PR page is a bit verbose, but the commits tab only shows the relevant ones.

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