From 32a763c31863c85894451f510a545256d2942d08 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 23 Feb 2021 04:23:51 -0500
Subject: [PATCH] use generateRelatedSlave()

---
 src/events/reRoyalBlood.js | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/events/reRoyalBlood.js b/src/events/reRoyalBlood.js
index 0bc22c68ece..e7d80a5453e 100644
--- a/src/events/reRoyalBlood.js
+++ b/src/events/reRoyalBlood.js
@@ -17,13 +17,13 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
 			his3, he3, him3, himself3, wife3
 		} = getPronouns(queen).appendSuffix('3');
 
-		const princess = generatePrincess(clone(slaveTemplate));
+		const princess = generatePrincess();
 		const {
 			His,
 			his, he, him, girl
 		} = getPronouns(princess);
 
-		const prince = (V.seeDicks > 0) ? generatePrince(clone(slaveTemplate)) : undefined;
+		const prince = (V.seeDicks > 0) ? generatePrince() : undefined;
 		const {
 			his2, he2, himself2,
 		} = (V.seeDicks > 0) ? getPronouns(prince).appendSuffix('2') : undefined;
@@ -572,11 +572,9 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
 			return slave;
 		}
 
-		/**
-		 * @param {App.Entity.SlaveState} slave
-		 * @returns {App.Entity.SlaveState}
-		 */
-		function generatePrincess(slave) {
+		/** @returns {App.Entity.SlaveState} */
+		function generatePrincess() {
+			const slave = generateRelatedSlave(queen, "daughter");
 			slave.career = "a princess";
 			slave.origin = "$He was a princess of a royal kingdom, till $his family was overthrown and $he was sold to you in exchange for aid.";
 			slave.prestigeDesc = "$He was the princess of an ancient kingdom.";
@@ -591,9 +589,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
 			slave.underArmHStyle = "waxed";
 			slave.hips = 0;
 			slave.butt = random(1, 2);
-			slave.dick = 0;
-			slave.foreskin = 0;
-			slave.balls = 0;
 			slave.intelligence = random(15, 100);
 			slave.intelligenceImplant = 15;
 			slave.skill.entertainment = 45;
@@ -607,11 +602,9 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
 			return slave;
 		}
 
-		/**
-		 * @param {App.Entity.SlaveState} slave
-		 * @returns {App.Entity.SlaveState}
-		 */
-		function generatePrince(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) {
@@ -622,7 +615,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
 			slave.visualAge = slave.actualAge;
 			slave.physicalAge = slave.actualAge;
 			slave.ovaryAge = slave.actualAge;
-			slave.genes = "XY";
 			if (V.realRoyalties === 1) {
 				slave.birthName = generateName(slave.nationality, slave.race, true);
 				slave.slaveName = slave.birthName;
@@ -639,15 +631,10 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
 			slave.boobs = 150;
 			slave.butt = random(0, 1);
 			slave.vagina = -1;
-			slave.clit = 0;
-			slave.labia = 0;
-			slave.ovaries = 0;
-			slave.preg = 0;
 			slave.dick = random(3, 5);
 			slave.balls = random(2, 4);
 			slave.scrotum = slave.balls;
 			slave.prostate = 1;
-			slave.pubertyXX = 0;
 			slave.pubertyAgeXY = V.potencyAge;
 			if (slave.physicalAge >= slave.pubertyAgeXY) {
 				slave.pubertyXY = 1;
-- 
GitLab