From 8a07d33978a4f6dc6c45c35b443d6f30e9388c04 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 23 Feb 2021 04:04:18 -0500
Subject: [PATCH] dedupe slave values
---
src/events/reRoyalBlood.js | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/events/reRoyalBlood.js b/src/events/reRoyalBlood.js
index f5b8282716c..95f41bf6e60 100644
--- a/src/events/reRoyalBlood.js
+++ b/src/events/reRoyalBlood.js
@@ -563,6 +563,12 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
}
slave.slaveSurname = slave.birthSurname;
}
+ slave.anus = 0;
+ slave.weight = 0;
+ slave.prestige = 2;
+ slave.skill.whoring = 0;
+ slave.canRecruit = 0;
+
return slave;
}
@@ -573,7 +579,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
function generatePrincess(slave) {
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.prestige = 2;
slave.prestigeDesc = "$He was the princess of an ancient kingdom.";
slave.devotion = random(-80, -60);
slave.trust = random(-50, -60);
@@ -589,15 +594,11 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.dick = 0;
slave.foreskin = 0;
slave.balls = 0;
- slave.anus = 0;
- slave.weight = 0;
slave.intelligence = random(15, 100);
slave.intelligenceImplant = 15;
slave.skill.entertainment = 45;
slave.skill.anal = 0;
slave.skill.oral = 0;
- slave.skill.whoring = 0;
- slave.canRecruit = 0;
setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0);
slave.behavioralFlaw = either("arrogant", "bitchy");
slave.mother = queen.ID;
@@ -632,7 +633,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.slaveSurname = slaveTemplate.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;
slave.prestigeDesc = "$He was the crown prince of an ancient kingdom.";
slave.devotion = random(-80, -60);
slave.trust = random(-50, -60);
@@ -654,8 +654,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
} else {
slave.pubertyXY = 0;
}
- slave.anus = 0;
- slave.weight = 0;
slave.muscles = 50;
slave.intelligence = random(15, 100);
slave.intelligenceImplant = 15;
@@ -663,9 +661,7 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.faceImplant = 15;
slave.skill.anal = 0;
slave.skill.oral = 0;
- slave.skill.whoring = 0;
slave.skill.combat = 1;
- slave.canRecruit = 0;
setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0);
slave.behavioralFlaw = either("arrogant", "bitchy");
slave.mother = queen.ID;
@@ -695,7 +691,6 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.slaveSurname = slaveTemplate.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;
slave.prestigeDesc = "$He was the Queen of an ancient kingdom.";
slave.face = random(25, 100);
slave.faceImplant = 0;
@@ -720,16 +715,12 @@ App.Events.RERoyalBlood = class RERoyalBlood extends App.Events.BaseEvent {
slave.shoulders = random(-1, 1);
slave.hips = 1;
slave.butt = random(2, 4);
- slave.anus = 0;
- slave.weight = 0;
slave.intelligence = random(15, 100);
slave.intelligenceImplant = 30;
slave.skill.entertainment = 45;
- slave.skill.whoring = 0;
slave.counter.birthsTotal = 2;
slave.pubertyXX = 1;
slave.pubertyXY = 0;
- slave.canRecruit = 0;
setHealth(slave, jsRandom(30, 60), 0, 0, 0, 0);
slave.behavioralFlaw = either("arrogant", "bitchy");
--
GitLab