From 12c82ec606c245d97eb7a22561aebe4653946bb9 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 23 Feb 2021 02:31:08 -0500
Subject: [PATCH] cleanup
---
src/events/reRoyalBlood.js | 92 ++++++++++++++++++++++++--------------
1 file changed, 58 insertions(+), 34 deletions(-)
diff --git a/src/events/reRoyalBlood.js b/src/events/reRoyalBlood.js
index f6c2d0262b7..8faa066d5eb 100644
--- a/src/events/reRoyalBlood.js
+++ b/src/events/reRoyalBlood.js
@@ -65,6 +65,8 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
const text = new DocumentFragment();
App.UI.DOM.appendNewElement("p", text, `You seize a tablet and practically roll out of your bed, working furiously and using every feature of ${V.assistant.name} to the utmost. It's not easy, but you call in a number of favors and grease a handful of palms, and soon a flight of VTOLs are landing in the new arcology laden with goods. When they take off again they have the princess aboard clad in chains, and make a direct course towards your waiting penthouse.`);
App.UI.DOM.appendNewElement("p", text, `Eventually ${he} arrives in your penthouse, the perfect image of a demure yet composed princess. ${His} clearly practiced façade of poise and grace fades under scrutiny, however. ${princessArrives()}`);
+
+ // Princess
cashX(-50000, "slaveTransfer", princess);
repX(-2000, "event", princess);
text.append(App.UI.newSlaveIntro(princess));
@@ -81,8 +83,9 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
App.UI.DOM.appendNewElement("p", text, `Seizing a tablet, you quickly send a message to ${App.SF.SFC()}. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the princess aboard clad in chains and make a direct course towards your waiting penthouse.`);
App.UI.DOM.appendNewElement("p", text, `Eventually ${he} arrives in your penthouse, the perfect image of a demure yet composed princess. ${His} clearly practiced façade of poise and grace fades under scrutiny, however. ${princessArrives()}`);
V.arcologies[0].prosperity -= 15;
- repX(-18000, "event", princess);
+ // Princess
+ repX(-18000, "event", princess);
text.append(App.UI.newSlaveIntro(princess));
return text;
@@ -97,6 +100,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
App.UI.DOM.appendNewElement("p", text, `You seize a tablet and practically roll out of your bed, working vigorously and using every feature of ${V.assistant.name} to the utmost. It's not easy, but your credits pave your way to sending a flight of VTOLs laden with goods to the new arcology. They take off again with the crown prince aboard and in chains, where ${he2} rails against the uncaring metal walls of the VTOL for the breadth of ${his2} journey to your penthouse.`);
App.UI.DOM.appendNewElement("p", text, `When ${he2} arrives in your penthouse, the former prince is beside ${himself2} with rage. When ${he2} is brought to be modified in the remote surgery, ${he2} breaks free and attempts to fight ${his2} way out of your penthouse. ${His2} attempt at freedom is futile, however, and ${he2} is soon overwhelmed by your guards and dragged back to the remote surgery. It doesn't take long for the valiant prince to become a new dickgirl, though ${his2} submission to life as a slave is another question entirely.`);
+ // Prince
cashX(-35000, "slaveTransfer", prince);
text.append(App.UI.newSlaveIntro(prince));
@@ -113,6 +117,8 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
App.UI.DOM.appendNewElement("p", text, `When ${he2} arrives in your penthouse, the former prince is beside ${himself2} with rage. When ${he2} is brought to be modified in the remote surgery, ${he2} breaks free and attempts to fight ${his2} way out of your penthouse.${his2} attempt at freedom is futile, however, and ${he2} is soon overwhelmed by your guards and dragged back to the remote surgery. It doesn't take long for the valiant prince to become a new dickgirl, though ${his2} submission to life as a slave is another question entirely.`);
prince.origin = `$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was acquired by ${V.SF.Lower}.`;
V.arcologies[0].prosperity -= 15;
+
+ // Prince
repX(-18000, "event", prince);
text.append(App.UI.newSlaveIntro(prince));
@@ -127,12 +133,14 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
const text = new DocumentFragment();
App.UI.DOM.appendNewElement("p", text, `You seize a tablet and practically roll out of your bed, working furiously and using every feature of ${V.assistant.name} to the utmost. It's not easy, but you call in a number of favors and grease a handful of palms, and soon a flight of VTOLs are landing in the new arcology laden with goods. When they take off again they have the prince and princess aboard, clad in chains and bound face to face in a forced embrace, and make a direct course towards your waiting penthouse.`);
App.UI.DOM.appendNewElement("p", text, `Eventually they arrive in your penthouse, faces flushed with embarrassment of their compromising position. The former prince is beside ${himself2} with rage, but seems to be holding ${himself2} back for ${his2} little ${relativeTerm(prince, princess)}'s sake, while ${he} struggles to maintain a façade of poise and grace. ${princessArrives()} However, the prince's submission to life as a slave is another question entirely.`);
- /* princess */
+
+ // Princess
setMissingParents(princess);
cashX(-60000, "slaveTransfer", princess);
repX(-6000, "event", princess);
newSlave(princess); // skip New Slave Intro
- /* prince */
+
+ // Prince
prince.mother = princess.mother;
prince.father = princess.father;
cashX(-40000, "slaveTransfer", prince);
@@ -152,11 +160,13 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
App.UI.DOM.appendNewElement("p", text, `Eventually they arrive in your penthouse, faces flushed with embarrassment of their compromising position. The former prince is beside ${himself2} with rage, but seems to be holding ${himself2} back for ${his2} little ${relativeTerm(prince, princess)}'s sake, while ${he} struggles to maintain a façade of poise and grace. ${princessArrives()} However, the prince's submission to life as a slave is another question entirely.`);
prince.origin = `$He was the crown prince of a royal kingdom, till $his family was overthrown and $he was acquired by ${V.SF.Lower}.`;
V.arcologies[0].prosperity -= 15;
- /* princess */
+
+ // Princess
setMissingParents(princess);
repX(-10000, "event", princess);
newSlave(princess); // skip New Slave Intro
- /* prince */
+
+ // Prince
prince.mother = princess.mother;
prince.father = princess.father;
repX(-8000, "event", prince);
@@ -173,6 +183,8 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
const text = new DocumentFragment();
App.UI.DOM.appendNewElement("p", text, `You take a tablet and peruse the various court ladies on offer by the fledgling arcology. You single out a few interesting individuals for purchase that might suit your tastes, but the slapdash descriptions provided for each slave by the revolutionaries make it likely that any similarities to your aesthetic leanings will be coincidental. Once you are satisfied with your selection, you electronically transfer the credits to the new arcology and soon receive a receipt for your donation and an estimated delivery schedule.`);
App.UI.DOM.appendNewElement("p", text, `When the ladies arrive at your penthouse, they seem almost relieved at the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over.`);
+
+ // Ladies
for (let i = 0; i < 3; i++) {
const slave = generateOneCourtLady();
newSlave(slave); // skip New Slave Intro
@@ -190,6 +202,8 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
const text = new DocumentFragment();
App.UI.DOM.appendNewElement("p", text, `You take a tablet and peruse the various court ladies on offer by the fledgling arcology.You single out a few interesting individuals for acquisition that might suit your tastes, but the slapdash descriptions provided for each by ${V.SF.Lower} Intelligence make it likely that any similarities to your aesthetic leanings will be coincidental. Once you are satisfied with your selection, you electronically transfer the order to The Colonel and soon receive a mission success notice along with an estimated delivery schedule.`);
App.UI.DOM.appendNewElement("p", text, `When the ladies arrive at your penthouse, they seem almost relieved at the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over.`);
+
+ // Ladies
for (let i = 0; i < 3; i++) {
const slave = generateOneCourtLady();
repX(-3333, "event", slave);
@@ -208,12 +222,8 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
App.UI.DOM.appendNewElement("p", text, `You take a tablet and transmit a communication request to the new arcology owner. It doesn't take long for him to accept but when his video feed connects on your screen, you find yourself staring at the pained expression of the Queen ${himself3}. It becomes abundantly clear that someone is mounting ${him3} from behind as ${his3} body shakes and spasms from the intensity of their thrusts. You note that the Queen appears to be getting fucked on an extravagant, yet bloodstained, four-poster bed, likely the site of ${his3} former husband's demise. The mysterious individual unsurprisingly turns out to be the new arcology owner, revealing himself by shoving the Queen's face down against the stained bed sheets as he lowers his own face into frame. "How can I help you?"`);
App.UI.DOM.appendNewElement("p", text, `The man seems somewhat surprised that you want to purchase the Queen, given the breadth and quality of his other merchandise available, but not unduly so. Soon enough negotiations begin and a short time later an equitable price is agreed upon. Your new peer even throws in a slight discount, in exchange for allowing him to use the Queen himself for the remainder of the night.`);
App.UI.DOM.appendNewElement("p", text, `When the Queen arrives at your penthouse, ${he3} seems almost relieved and almost basks in the opulence of ${his3} new surroundings. `);
- // TODO?
- queen.actualAge = random(V.fertilityAge + 2, (V.pedo_mode === 1 ? 24 : 43));
- queen.visualAge = queen.actualAge;
- queen.physicalAge = queen.actualAge;
- queen.ovaryAge = queen.actualAge;
+ // Queen
cashX(-15000, "slaveTransfer", queen);
text.append(App.UI.newSlaveIntro(queen));
@@ -229,12 +239,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 Queen aboard and make a direct course towards your waiting penthouse.`);
App.UI.DOM.appendNewElement("p", text, `When the Queen arrives at your penthouse, ${he3} seems almost relieved and almost basks in the opulence of ${his3} new surroundings. ${queenArrives()}`);
V.arcologies[0].prosperity -= 12;
- // todo
- queen.actualAge = random(V.fertilityAge + 2, (V.pedo_mode === 1 ? 24 : 43));
- queen.visualAge = queen.actualAge;
- queen.physicalAge = queen.actualAge;
- queen.ovaryAge = queen.actualAge;
+ // Queen
repX(-12000, "event", queen);
text.append(App.UI.newSlaveIntro(queen));
@@ -249,13 +255,14 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
const text = new DocumentFragment();
App.UI.DOM.appendNewElement("p", text, `You take a tablet and transmit a communication request to the new arcology owner with your intent. Once his shock wears off, he readily accepts with little need for negotiation. Soon, a flight of VTOLs land in the new arcology laden with goods. When they take off again they have the princess and the Queen, who is resigned to ${his3} fate, clad in chains then bound face to face in a forced embrace.`);
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
- /* Queen*/
- queen.mother = 0;
- queen.father = 0;
+
+ // Queen
cashX(-100000, "slaveTransfer", queen);
newSlave(queen); // skip New Slave Intro
@@ -271,17 +278,14 @@ 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
princess.mother = queen.ID;
setMissingParents(princess);
newSlave(princess);
- r.push(` /* skip New Slave Intro */`);
repX(-10000, "event", princess);
- /* Queen*/
- queen.mother = 0;
- queen.father = 0;
+
+ // Queen
newSlave(queen);
- r.push(` /* skip New Slave Intro */`);
repX(-3000, "event", queen);
return text;
@@ -300,9 +304,10 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
newSlave(slave); // skip New Slave Intro
cashX(-100000, "slaveTransfer", slave);
}
- /* Queen*/
+
+ // Queen
setMissingParents(queen);
- newSlave(queen);// /* skip New Slave Intro
+ newSlave(queen);// skip New Slave Intro
cashX(-200000, "slaveTransfer", queen);
return text;
@@ -322,7 +327,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
newSlave(slave); // skip New Slave Intro
repX(-3000, "event", slave);
}
- /* Queen*/
+ // Queen
setMissingParents(queen);
newSlave(queen); /* skip New Slave Intro */
repX(-4000, "event", queen);
@@ -358,22 +363,27 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
}
r.push(`seems almost relieved and basks in the opulence of ${his3} new surroundings. ${queenArrives()} Lastly, the ladies seem comforted by the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over.`);
App.Events.addParagraph(text, r);
- /* princess */
+
+ // Princess
princess.mother = queen.ID;
setMissingParents(princess);
- newSlave(princess); /* skip New Slave Intro */
+ newSlave(princess); // skip New Slave Intro
cashX(-1100000, "slaveTransfer", princess);
- /* prince */
+
+ // Prince
if (V.seeDicks > 0) {
prince.mother = princess.mother;
prince.father = princess.father;
newSlave(prince); // skip New Slave Intro
cashX(-750000, "slaveTransfer", prince);
}
- /* Queen*/
+
+ // Queen
setMissingParents(queen);
newSlave(queen); /* skip New Slave Intro */
cashX(-250000, "slaveTransfer", queen);
+
+ // Ladies
for (let i = 0; i < 3; i++) {
const slave = generateOneCourtLady();
newSlave(slave); // skip New Slave Intro
@@ -418,27 +428,32 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
V.arcologies[0].prosperity = 2;
const repShares = Math.trunc(V.rep / -15);
/* this event is supposed to end in reputation at 0. In order to slice up that pie, we find shares of "everything" here and give them out later, before finally setting leftovers to 0. 3 ladies at one share each, +3 for prince, +4 for queen, +5 for princess is 15 shares.*/
+
+ // Ladies
for (let i = 0; i < 3; i++) {
const slave = generateOneCourtLady();
newSlave(slave); // skip New Slave Intro
repX(repShares, "event", slave);
}
- /* princess */
+ // Princess
princess.mother = queen.ID;
setMissingParents(princess);
newSlave(princess);// skip New Slave Intro
repX((5 * repShares), "event", princess);
- /* prince */
+
+ // Prince
if (V.seeDicks > 0) {
prince.mother = princess.mother;
prince.father = princess.father;
newSlave(prince);/* skip New Slave Intro */
repX((3 * repShares), "event", prince);
}
- /* Queen*/
+
+ // Queen
setMissingParents(queen);
newSlave(queen); /* skip New Slave Intro */
repX((4 * repShares), "event", queen);
+
repX(0 - V.rep, "event"); /* Round off any remaining rep due to the trunc on shares*/
return text;
@@ -715,6 +730,15 @@ 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");
+
+ // Taken from old option block, still needed?
+ slave.visualAge = slave.actualAge;
+ slave.physicalAge = slave.actualAge;
+ slave.ovaryAge = slave.actualAge;
+
+ // Also from old options block:
+ slave.mother = 0;
+ slave.father = 0;
return slave;
}
function generateOneCourtLady() {
--
GitLab