Skip to content
Snippets Groups Projects

reRoyalBlood tweaks

Merged Anu requested to merge Anu/fc-pregmod:anu-fix into pregmod-master
1 unresolved thread

Implements minor changes proposed in #5549. Does not implement a new option to recruit all three royals without their courtiers, and I also noticed a new set of minor problems while working on this, so I think I'll keep that issue open and update it.

Merge Checklist
  • I have read CONTRIBUTING.md
    • and
      • my code editor has
        • ESLint support enabled
        • TypeScript support enabled
        • some form of spell checker
          • We suggest using a spell checker compatible with cSpell if possible
      • my changes compile successfully and seem to work properly
      • I am using the simple compiler (simple-compiler.[bat or sh])
      • I am using the normal compiler (compile.[bat or sh])
      • this is my first merge request
      • the changes in this merge request comply with the coding style defined in CONTRIBUTING.md
Changes made
  • Moves some traits from generateQueen() and generatePrince() into a later function, so they aren't inherited inappropriately by the prince and princess.
  • Manually sets prince and princess's puberty to 0 if they are generated below their pubertyAge. I'm not certain whether this was actually a problem for the prince, but the princess was definitely prone to precocious puberty.
  • Names the nationality of the royal family in the main text of the event, slipped into "Though the King is dead" as the least intrusive place.

Things left to do

  • code review (this is done by one or more people other than you)
  • final tests
  • let Pregmodder know that this is ready for merging

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
    • Author Contributor

      The new problems I mentioned, all of a similar theme, that I'll also be appending to #5549:

      • If we're keeping the king nameless, while I'd personally prefer he be named, he really ought to be "late" rather than "former", as previously brought up. This is already the case, my brain just malfunctioned. At any rate, an actual name for the King would be nice, and would solve half of my last issue.
      • If you choose to recruit only the prince and princess, their parents will be listed as "The late king" and "X and Y's mother", which is a little asymmetrical. Again, if we're keeping the king nameless, maybe rename the queen to "the former queen" and add her to the missing slaves list instead of just deleting her?
      • The nameless king also needs some special-case treatment to avoid certain textual oddities. For instance, the prince and princess are described as having been "fathered by your former slave The late king's virile dick", which is both factually and grammatically wrong - he was never your slave, and "The" shouldn't be capitalized.
      • generateRelatedSlave() doesn't reroll natural height in a way that effectively accounts for the greater average height of males, so the prince always winds up with a natural height very close to the queen and princess. Would be nice to fix the underlying function, but failing that, I can always drop a reroll into finalTweaks().
      Edited by Anu
    • Even just "the late king" has issues because it doesn't say which king or king of what. The event can happen more than once.

      I would not be opposed to just going back to unknown father just for simplicity.

      Edited by Pregmodder
    • Author Contributor

      I'm fine with any solution that preserves shared fatherhood between the prince and princess and the queen's pregnancy. Should we call DerangedLoner and Frankly George in on this?

    • Couldn't hurt. Might lead to a better solution too.

    • Author Contributor

      @DerangedLoner @franklygeorge Any input on the remaining issues with the reRoyalBlood king?

    • Please register or sign in to reply
  • Pregmodder mentioned in commit faf1d353

    mentioned in commit faf1d353

  • merged

  • Frankly George mentioned in issue #5549

    mentioned in issue #5549

Please register or sign in to reply
Loading