diff --git a/src/events/reRoyalBlood.js b/src/events/reRoyalBlood.js index 8faa066d5eb0e4a15edb55f91fe5884a0dc9d833..02b3e4121c486914d2afc8d7b457dc59196fb642 100644 --- a/src/events/reRoyalBlood.js +++ b/src/events/reRoyalBlood.js @@ -7,6 +7,12 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { let race; const slaveTemplate = generateTemplate(); + const queen = generateQueen(clone(slaveTemplate)); // Queen first to get an ID for her children to relate to. + const { + His2, He3, + his3, he3, him3, himself3, wife3 + } = getPronouns(queen).appendSuffix('3'); + const princess = generatePrincess(clone(slaveTemplate)); const { His, @@ -18,12 +24,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { his2, he2, himself2, } = getPronouns(prince).appendSuffix('2'); - const queen = generateQueen(clone(slaveTemplate)); - const { - His2, He3, - his3, he3, him3, himself3, wife3 - } = getPronouns(queen).appendSuffix('3'); - const {HeA, heA} = getPronouns(assistant.pronouns().main).appendSuffix("A"); let r = []; @@ -141,8 +141,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { newSlave(princess); // skip New Slave Intro // Prince - prince.mother = princess.mother; - prince.father = princess.father; cashX(-40000, "slaveTransfer", prince); repX(-4000, "event", prince); newSlave(prince); // skip New Slave Intro @@ -167,8 +165,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { newSlave(princess); // skip New Slave Intro // Prince - prince.mother = princess.mother; - prince.father = princess.father; repX(-8000, "event", prince); newSlave(prince); // skip New Slave Intro @@ -257,7 +253,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { App.UI.DOM.appendNewElement("p", text, `Eventually they both arrive in your penthouse. The princess is flushed with embarrassment in ${his} compromising position, struggling to maintain a façade of poise and grace. ${princessArrives()} The Queen, on the other hand, seems almost relieved and basks in the opulence of ${his3} new surroundings. ${queenArrives()}`); // Princess - princess.mother = queen.ID; setMissingParents(princess); cashX(-400000, "slaveTransfer", princess); newSlave(princess); // skip New Slave Intro @@ -278,8 +273,8 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { App.UI.DOM.appendNewElement("p", text, `Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the princess and Queen aboard, making a direct course towards your waiting penthouse.`); App.UI.DOM.appendNewElement("p", text, `Eventually they both arrive in your penthouse. The princess is flushed with embarrassment in ${his} compromising position, struggling to maintain a façade of poise and grace. ${princessArrives()} The Queen, on the other hand, seems almost relieved and basks in the opulence of ${his3} new surroundings. ${queenArrives()}`); V.arcologies[0].prosperity -= 13; + // Princess - princess.mother = queen.ID; setMissingParents(princess); newSlave(princess); repX(-10000, "event", princess); @@ -365,15 +360,12 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { App.Events.addParagraph(text, r); // Princess - princess.mother = queen.ID; setMissingParents(princess); newSlave(princess); // skip New Slave Intro cashX(-1100000, "slaveTransfer", princess); // Prince if (V.seeDicks > 0) { - prince.mother = princess.mother; - prince.father = princess.father; newSlave(prince); // skip New Slave Intro cashX(-750000, "slaveTransfer", prince); } @@ -436,15 +428,12 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { repX(repShares, "event", slave); } // Princess - princess.mother = queen.ID; setMissingParents(princess); newSlave(princess);// skip New Slave Intro repX((5 * repShares), "event", princess); // Prince if (V.seeDicks > 0) { - prince.mother = princess.mother; - prince.father = princess.father; newSlave(prince);/* skip New Slave Intro */ repX((3 * repShares), "event", prince); } @@ -614,6 +603,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { slave.canRecruit = 0; setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0); slave.behavioralFlaw = either("arrogant", "bitchy"); + slave.mother = queen.ID; return slave; } function generatePrince(slave) { @@ -634,8 +624,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { } else { nationalityToName(slave); } - slave.birthSurname = princess.birthSurname; - slave.slaveSurname = princess.birthSurname; slave.career = "a prince"; slave.origin = "$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was sold to you in exchange for aid."; slave.prestige = 2; @@ -674,6 +662,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { slave.canRecruit = 0; setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0); slave.behavioralFlaw = either("arrogant", "bitchy"); + slave.mother = queen.ID; return slave; } function generateQueen(slave) { @@ -689,8 +678,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent { } else { nationalityToName(slave); } - slave.birthSurname = princess.birthSurname; - slave.slaveSurname = princess.birthSurname; slave.career = "a Queen"; slave.origin = "$He was the Queen of a royal kingdom, till $his husband was overthrown and $he was sold to you in exchange for credits."; slave.prestige = 2;