diff --git a/src/events/reRoyalBlood.js b/src/events/reRoyalBlood.js
index c273e0356fa3e0ce73a5b5a37f5d6bd87e6aed78..c312a4f7c4fdf691e8ad659b59b9252d82b8fce7 100644
--- a/src/events/reRoyalBlood.js
+++ b/src/events/reRoyalBlood.js
@@ -8,11 +8,10 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
execute(el) {
V.nextButton = "Continue";
V.nextLink = "RIE Eligibility Check";
- const slaveTemplate = generateTemplate();
- const queen = generateQueen(clone(slaveTemplate)); // Queen first to get an ID for her children to relate to.
+ const queen = generateQueen(); // Queen first to get an ID for her children to relate to.
const {
- His2, He3,
+ He3,
his3, he3, him3, himself3, wife3
} = getPronouns(queen).appendSuffix('3');
@@ -24,8 +23,9 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
const prince = (V.seeDicks > 0) ? generatePrince() : undefined;
const {
- his2, he2, himself2,
- } = (V.seeDicks > 0) ? getPronouns(prince).appendSuffix('2') : undefined;
+ His2,
+ his2, he2, himself2
+ } = getPronouns(prince || {pronoun: 1}).appendSuffix('2');
const {HeA, heA} = getPronouns(assistant.pronouns().main).appendSuffix("A");
@@ -37,21 +37,17 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
r.push(`${HeA} informs you that there is a time sensitive enslavement opportunity for you to peruse, and that ${heA} has calculated the potential rewards are worthy of your consideration even in the middle of the night.`);
}
App.Events.addParagraph(el, r);
- r = [];
- r.push(App.UI.DOM.makeElement("div", `A convenient video feed is brought up, displaying a quick visual summary of the opportunity at hand.`));
- r.push(App.UI.DOM.makeElement("div", `It seems a bastion of the old world has fallen, a royal family of ancient blood and reputation has been overthrown by a local populist leader and his fellow revolutionaries. Furthermore, the leader of the revolution has designs to transform the outmoded monarchy into an arcology of his own, and has transmitted a request for aid to his new peers in the Free Cities.`));
+ App.Events.addParagraph(el, [`A convenient video feed is brought up, displaying a quick visual summary of the opportunity at hand.`]);
- r.push(App.UI.DOM.makeElement("div", `Of course, nothing in the Free Cities is free and international aid is no exception. This new arcology owner is no fool, however, and has outlined a number of rewards to be delivered to his most generous benefactors.`));
+ App.Events.addParagraph(el, [`It seems a bastion of the old world has fallen, a royal family of ancient blood and reputation has been overthrown by a local populist leader and his fellow revolutionaries. Furthermore, the leader of the revolution has designs to transform the outmoded monarchy into an arcology of his own, and has transmitted a request for aid to his new peers in the Free Cities.`]);
- r.push(App.UI.DOM.makeElement("div", `Though the King himself is dead, murdered in his bed by bloodthirsty revolutionaries, the rest of his family and the majority of his court have been captured and enslaved by their former subjects. The new arcology owner, having decided that a large injection of credits or a shipment of goods is superior to deflowering a royal pussy or asshole, has directed his followers to slake their lust and vengeance on the King's ${wife3} and court rather than his children, though they too are past the age of majority.`));
+ App.Events.addParagraph(el, [`Of course, nothing in the Free Cities is free and international aid is no exception. This new arcology owner is no fool, however, and has outlined a number of rewards to be delivered to his most generous benefactors.`]);
- App.Events.addParagraph(el, r);
- r = [];
+ App.Events.addParagraph(el, [`Though the King himself is dead, murdered in his bed by bloodthirsty revolutionaries, the rest of his family and the majority of his court have been captured and enslaved by their former subjects. The new arcology owner, having decided that a large injection of credits or a shipment of goods is superior to deflowering a royal pussy or asshole, has directed his followers to slake their lust and vengeance on the King's ${wife3} and court rather than his children, though they too are past the age of majority.`]);
- r.push(`Time is short, but you are well placed to acquire some choice slaves. With an adequate donation${(V.SF.Toggle && V.SF.Active >= 1) ? `, or the use of ${V.SF.Lower}` : ``}, of course.`);
+ App.Events.addParagraph(el, [`Time is short, but you are well placed to acquire some choice slaves. With an adequate donation${(V.SF.Toggle && V.SF.Active >= 1) ? `, or the use of ${V.SF.Lower}` : ``}, of course.`]);
- App.Events.addParagraph(el, r);
App.Events.addResponses(
el,
[
@@ -455,7 +451,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
let race;
if (V.realRoyalties === 1) {
- const nationality = App.Data.royalNationalities.random();
+ const nationality = App.Data.misc.royalNationalities.random();
switch (nationality) {
case "Japanese":
case "Cambodian":
@@ -501,10 +497,10 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
break;
}
slave = GenerateNewSlave("XX", {
- minAge: 16, maxAge: 19, disableDisability: 1, nationality: nationality, race: race
+ minAge: V.fertilityAge + V.minimumSlaveAge + 1, maxAge: (V.pedo_mode === 1 ? 24 : 43), disableDisability: 1, nationality: nationality, race: race
});
} else {
- slave = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, disableDisability: 1});
+ slave = GenerateNewSlave("XX", {minAge: V.fertilityAge + V.minimumSlaveAge + 1, maxAge: (V.pedo_mode === 1 ? 24 : 43), disableDisability: 1});
}
if (V.realRoyalties === 1) {
if (slave.nationality === "Japanese") {
@@ -580,9 +576,8 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.devotion = random(-80, -60);
slave.trust = random(-50, -60);
slave.face = random(25, 100);
- slave.boobs = either(100, 200, 300);
+ slave.boobs = Math.min(slave.boobs, 400);
slave.vagina = 0;
- slave.ovaries = 1;
slave.preg = -1;
slave.pubicHStyle = "waxed";
slave.underArmHStyle = "waxed";
@@ -595,51 +590,19 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.skill.oral = 0;
setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0);
slave.behavioralFlaw = either("arrogant", "bitchy");
- slave.mother = queen.ID;
- setMissingParents(slave);
return slave;
}
/** @returns {App.Entity.SlaveState} */
function generatePrince() {
- const slave = generateRelatedSlave(queen, "son");
- slave.ID = generateSlaveID();
- slave.birthWeek += Math.floor(Math.random() * 52);
- if (slave.birthWeek >= 52) {
- slave.birthWeek -= 52;
- slave.actualAge++;
- }
- slave.actualAge = slave.actualAge + 1;
- slave.visualAge = slave.actualAge;
- slave.physicalAge = slave.actualAge;
- slave.ovaryAge = slave.actualAge;
- if (V.realRoyalties === 1) {
- slave.birthName = generateName(slave.nationality, slave.race, true);
- slave.slaveName = slave.birthName;
- } else {
- nationalityToName(slave);
- }
- slave.birthSurname = slaveTemplate.birthSurname;
- slave.slaveSurname = slaveTemplate.birthSurname;
+ const slave = generateRelatedSlave(princess, "older brother");
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.prestigeDesc = "$He was the crown prince of an ancient kingdom.";
slave.devotion = random(-80, -60);
slave.trust = random(-50, -60);
- slave.boobs = 150;
slave.butt = random(0, 1);
- slave.vagina = -1;
- slave.dick = random(3, 5);
- slave.balls = random(2, 4);
- slave.scrotum = slave.balls;
- slave.prostate = 1;
- slave.pubertyAgeXY = V.potencyAge;
- if (slave.physicalAge >= slave.pubertyAgeXY) {
- slave.pubertyXY = 1;
- } else {
- slave.pubertyXY = 0;
- }
slave.muscles = 50;
slave.intelligence = random(15, 100);
slave.intelligenceImplant = 15;
@@ -650,31 +613,15 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.skill.combat = 1;
setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0);
slave.behavioralFlaw = either("arrogant", "bitchy");
- slave.mother = queen.ID;
- setMissingParents(slave);
return slave;
}
/**
- * @param {App.Entity.SlaveState} slave
* @returns {App.Entity.SlaveState}
*/
- function generateQueen(slave) {
- slave.ID = generateSlaveID();
- slave.actualAge = random(V.fertilityAge + slave.actualAge, (V.pedo_mode === 1 ? 24 : 43));
- slave.visualAge = slave.actualAge;
- slave.physicalAge = slave.actualAge;
- slave.ovaryAge = slave.actualAge;
- slave.genes = "XX";
- if (V.realRoyalties === 1) {
- slave.birthName = generateName(slave.nationality, slave.race, false);
- slave.slaveName = slave.birthName;
- } else {
- nationalityToName(slave);
- }
- slave.birthSurname = slaveTemplate.birthSurname;
- slave.slaveSurname = slaveTemplate.birthSurname;
+ function generateQueen() {
+ const slave = generateTemplate();
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.prestigeDesc = "$He was the Queen of an ancient kingdom.";
@@ -684,12 +631,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.trust = random(-20, -30);
slave.boobs = random(3, 10) * 100;
slave.vagina = 2;
- slave.dick = 0;
- slave.foreskin = 0;
- slave.balls = 0;
- slave.scrotum = 0;
- slave.prostate = 0;
- slave.ovaries = 1;
if (V.seePreg !== 0) {
slave.preg = 7;
slave.pregType = 1;
@@ -698,6 +639,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
SetBellySize(slave);
}
slave.pubicHStyle = "waxed";
+ slave.underArmHStyle = "waxed";
slave.shoulders = random(-1, 1);
slave.hips = 1;
slave.butt = random(2, 4);
@@ -705,11 +647,8 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.intelligenceImplant = 30;
slave.skill.entertainment = 45;
slave.counter.birthsTotal = 2;
- slave.pubertyXX = 1;
- slave.pubertyXY = 0;
setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0);
slave.behavioralFlaw = either("arrogant", "bitchy");
- setMissingParents(slave);
return slave;
}
@@ -726,11 +665,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.devotion = random(10, 20);
slave.trust = random(-20, -30);
slave.boobs = random(3, 10) * 100;
- slave.vagina = 1;
- slave.dick = 0;
- slave.foreskin = 0;
- slave.balls = 0;
- slave.ovaries = 1;
+ slave.vagina = Math.min(slave.vagina, 1);
slave.pubicHStyle = "waxed";
slave.underArmHStyle = "waxed";
slave.shoulders = random(-1, 1);
@@ -747,6 +682,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.behavioralFlaw = either("arrogant", "bitchy");
return slave;
}
+
function queenArrives() {
return `Yet, it seems likely that ${his3} relief has more to do with saving ${him3} from a lifetime of gang rape at the mercy of ${his3} former subjects, than it does the familiar luxury. ${He3} submits to biometric scanning obediently and without ${(V.seePreg !== 0) ? `fuss, during which you discover to ${his3} surprise that ${he3} is pregnant. Since ${he3} hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice ${he3} cradles ${his3} ever so slightly rounded stomach protectively nonetheless.` : `fuss.`}`;
}