GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

!12326

reRoyalBlood tweaks

Review changes
Download
Patches
Plain diff

Merged reRoyalBlood tweaks

Anu/fc-pregmod:anu-fix into pregmod-master

Overview 5
Commits 3
Pipelines 0
Changes 1

1 unresolved thread

Merged Anu requested to merge Anu/fc-pregmod:anu-fix into pregmod-master 1 month ago

Overview 5
Commits 3
Pipelines 0
Changes 1

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

0 Assignees

0 Reviewers

Request review from

Loading

Labels

0

None

0

None

Select labels

Manage project labels

Milestone

None

Time tracking

No estimate or time spent

0

0 Participants

Compare

pregmod-master (base)

and

latest version

84366ab4

3 commits, 1 month ago

Compare changes

Side-by-side
Inline

Show whitespace changes

Show one file at a time

Files

1

Search (e.g. *.vue) (Ctrl+P)

Loading