Skip to content
Snippets Groups Projects

Make real dynasties more consistent

Merged Pregmodder requested to merge Pregmodder/fc-pregmod:pregmod-dev into pregmod-master
4 unresolved threads

Should fix #2865 (closed) by restricting to an expected race instead of allowing slavegen to sometimes pull one of the uncommon or rare races for a nationality. I do hope I got them all right, at least.

Edited by Pregmodder

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
3 3 <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
4 4
5 5 /*princess*/
6 <<set _slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1})>>
7 <<set _slave.career = "a princess">>
8 6 <<if $realRoyalties == 1>>
9 <<set _slave.nationality = setup.royalNationalities.random()>>
10 <<run nationalityToRace(_slave)>>
7 <<set _nationality = setup.royalNationalities.random()>>
8 <<if _nationality == "Japanese">>
9 <<set _race = "asian">>
10 <<elseif __nationality == "Luxembourgian">>
  • svornost
    svornost @svornost started a thread on the diff
  • 46 <<elseif __nationality == "Tongan">>
    47 <<set _race = "pacific islander">>
    48 <<elseif __nationality == "Swazi">>
    49 <<set _race = "black">>
    50 <<elseif __nationality == "Mosotho">>
    51 <<set _race = "black">>
    52 <<elseif __nationality == "British">>
    53 <<set _race = "white">>
    54 <<elseif __nationality == "Monégasque">>
    55 <<set _race = "white">>
    56 <<elseif __nationality == "Bhutanese">>
    57 <<set _race = "asian">>
    58 <<elseif __nationality == "Thai">>
    59 <<set _race = "asian">>
    60 <</if>>
    61 <<set _slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1, race: _race})>>
  • svornost
    svornost @svornost started a thread on the diff
  • 48 <<elseif __nationality == "Swazi">>
    49 <<set _race = "black">>
    50 <<elseif __nationality == "Mosotho">>
    51 <<set _race = "black">>
    52 <<elseif __nationality == "British">>
    53 <<set _race = "white">>
    54 <<elseif __nationality == "Monégasque">>
    55 <<set _race = "white">>
    56 <<elseif __nationality == "Bhutanese">>
    57 <<set _race = "asian">>
    58 <<elseif __nationality == "Thai">>
    59 <<set _race = "asian">>
    60 <</if>>
    61 <<set _slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1, race: _race})>>
    62 <<set _slave.nationality = _nationality>>
    63 <<run nationalityToAccent(_slave)>>
  • svornost
    svornost @svornost started a thread on the diff
  • 108 142 <<elseif _princess.nationality == "British">>
    109 143 <<set _princess.birthSurname = "Windsor">>
    110 <<set _princess.slaveSurname = "Windsor">>
    111 144 <<elseif _princess.nationality == "Monégasque">>
    112 145 <<set _princess.birthSurname = "Grimaldi">>
    113 <<set _princess.slaveSurname = "Grimaldi">>
    114 146 <<elseif _princess.nationality == "Bhutanese">>
    115 147 <<set _princess.birthSurname = "Wangchuck">>
    116 <<set _princess.slaveSurname = "Wangchuck">>
    117 148 <<elseif _princess.nationality == "Thai">>
    118 149 <<set _princess.birthSurname = "Chakri">>
    119 <<set _princess.slaveSurname = "Chakri">>
    120 150 <</if>>
    151 <<set _princess.slaveSurname = _princess.birthSurname>>
    152 <<set _princess.birthName = generateName(_princess.nationality, _princess.race, "XX")>>
    153 <<set _princess.slaveName = _princess.birthName>>
    Please register or sign in to reply
    Loading