From 7492d1e41078048f18e50aa8ff710c6ffa31ed3d Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 29 Aug 2020 23:01:52 -0400
Subject: [PATCH] fixedNationality
---
src/npc/acquisition.tw | 9 +++------
src/npc/generate/generateNewSlaveJS.js | 3 +--
src/pregmod/seHuskSlaveDelivery.tw | 5 ++---
src/uncategorized/RESS.tw | 3 +--
src/uncategorized/REroyalblood.tw | 18 ++++++------------
src/uncategorized/reRecruit.tw | 3 +--
src/uncategorized/seCustomSlaveDelivery.tw | 6 +++---
7 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index d1e22197f4c..52fcc6c06f0 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -476,8 +476,7 @@ The previous owner seems to have left in something of a hurry.
<<case "AztecRevivalist">>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "latina">>
- <<set $fixedNationality = "Mexican">>
- <<set $activeSlave = GenerateNewSlave()>>
+ <<set $activeSlave = GenerateNewSlave(null, {nationality: "Mexican"})>>
<<set $activeSlave.accent = 0>>
<<set $activeSlave.devotion = 75, $activeSlave.trust = 75>>
<<run setHealth($activeSlave, jsRandom(-20, 20), 0, 0, 0, 0)>>
@@ -504,8 +503,7 @@ The previous owner seems to have left in something of a hurry.
<<case "EdoRevivalist">>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "asian">>
- <<set $fixedNationality = "Japanese">>
- <<set $activeSlave = GenerateNewSlave()>>
+ <<set $activeSlave = GenerateNewSlave(null, {nationality: "Japanese"})>>
<<set $activeSlave.accent = 0>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45)>>
<<run setHealth($activeSlave, jsRandom(25, 45), 0, 0, 0, 0)>>
@@ -529,8 +527,7 @@ The previous owner seems to have left in something of a hurry.
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "asian">>
- <<set $fixedNationality = "Chinese">>
- <<set $activeSlave = GenerateNewSlave()>>
+ <<set $activeSlave = GenerateNewSlave(null, {nationality: "Chinese"})>>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(25,45)>>
<<run setHealth($activeSlave, jsRandom(25, 45), 0, 0, 0, 0)>>
<<set $activeSlave.face = random(0,55)>>
diff --git a/src/npc/generate/generateNewSlaveJS.js b/src/npc/generate/generateNewSlaveJS.js
index 5f5b28b5063..1d6e3ef428e 100644
--- a/src/npc/generate/generateNewSlaveJS.js
+++ b/src/npc/generate/generateNewSlaveJS.js
@@ -44,7 +44,7 @@ globalThis.GenerateNewSlave = (function() {
x.maxAge = maxAge || V.activeSlaveOneTimeMaxAge || 999;
x.ageOverridesPedoMode = ageOverridesPedoMode || V.one_time_age_overrides_pedo_mode || 0;
x.mature = mature || 1;
- x.nationality = nationality || V.fixedNationality || 0;
+ x.nationality = nationality || 0;
x.race = race || V.fixedRace || 0;
if (x.race !== 0 && !(setup.filterRacesLowercase.includes(x.race))) {
console.log("Error, cannot find race: ", x.race);
@@ -65,7 +65,6 @@ globalThis.GenerateNewSlave = (function() {
delete V.activeSlaveOneTimeMinAge;
delete V.activeSlaveOneTimeMaxAge;
delete V.one_time_age_overrides_pedo_mode;
- delete V.fixedNationality;
delete V.fixedRace;
delete V.oneTimeDisableDisability;
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index 318855e4c14..c2079cb81bd 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -5,17 +5,16 @@
<<set $activeSlaveOneTimeMinAge = parseInt($huskSlave.age)>>
<<set $activeSlaveOneTimeMaxAge = parseInt($huskSlave.age)>>
<<set $one_time_age_overrides_pedo_mode = 1>>
-<<set $fixedNationality = $huskSlave.nationality>>
<<if $huskSlave.race != "not important">>
<<set $fixedRace = $huskSlave.race>>
<</if>>
<<if $huskSlave.sex == 2>>
- <<set $activeSlave = GenerateNewSlave("XY", {mature: 0})>>
+ <<set $activeSlave = GenerateNewSlave("XY", {mature: 0, nationality: $huskSlave.nationality})>>
<<set $activeSlave.boobs = 50>>
<<set $activeSlave.boobsImplant = 0>>
<<set $activeSlave.boobsImplantType = "none">>
<<else>>
- <<set $activeSlave = GenerateNewSlave("XX", {mature: 0})>>
+ <<set $activeSlave = GenerateNewSlave("XX", {mature: 0, nationality: $huskSlave.nationality})>>
<</if>>
<<set $activeSlave.slaveName = "Doll">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 7633fcf64f0..18e36faaa8b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -72,11 +72,10 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
- <<set $fixedNationality = "American">>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
- <<set _meanGirl = GenerateNewSlave("XX")>>
+ <<set _meanGirl = GenerateNewSlave("XX", {nationality: "American"})>>
<<set _meanGirl.origin = "You enslaved $him for abusing " + $eventSlave.slaveName + " while " + getPronouns($eventSlave).pronoun + " was serving the public.">>
<<set _meanGirl.career = "a student">>
<<set _meanGirl.markings = "none", _meanGirl.weight = -20>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 87f444edb07..4328209a088 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -394,8 +394,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<set $fixedNationality = _princess.nationality>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", {nationality: _princess.nationality})>>
<<set _origin = "$He was a member of the court in an ancient kingdom, till it was overthrown and $he was sold to you in exchange for credits.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -445,8 +444,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<set $fixedNationality = _princess.nationality>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", {nationality: _princess.nationality})>>
<<set _origin = "$He was a member of the court in an ancient kingdom, till it was overthrown and $he was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -619,8 +617,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<set $fixedNationality = _princess.nationality>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", {nationality: _princess.nationality})>>
<<set _origin = "$He was a member of the court in an ancient kingdom, till it was overthrown and $he was sold for credits.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -680,8 +677,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<set $fixedNationality = _princess.nationality>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", {nationality: _princess.nationality})>>
<<set _origin = "$He was a member of the court in an ancient kingdom, till it was overthrown and $he was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -764,8 +760,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<set $fixedNationality = _princess.nationality>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", {nationality: _princess.nationality})>>
<<set _origin = "$He was a member of the court in an ancient kingdom, till it was overthrown and $he was sold for credits.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -866,9 +861,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<for $i = 0; $i < 3; $i++>>
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
- <<set $fixedNationality = _princess.nationality>>
<<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", {nationality: _princess.nationality})>>
<<set _origin = "$He was a member of the court in an ancient kingdom, till it was overthrown and $he was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index d0a2ce1dcb1..b2930cd3b6c 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1645,8 +1645,7 @@
<<set $activeSlaveOneTimeMaxAge = 12>>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "asian">>
-<<set $fixedNationality = "Stateless">>
-<<set $activeSlave = GenerateNewSlave("XX")>>
+<<set $activeSlave = GenerateNewSlave("XX", {nationality: "Stateless"})>>
<<set $activeSlave.origin = "$He offered to sell you $his body and you graciously accepted.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-15,0)>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 0cb1f84118a..b78b56d769b 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -104,19 +104,19 @@
<</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<if $customSlave.nationality != "Nationality is unimportant">>
- <<set $fixedNationality = $customSlave.nationality>>
+ <<set _nationality = $customSlave.nationality>>
<</if>>
<<if $customSlave.race != "ethnicity is unimportant">>
<<set $fixedRace = $customSlave.race>>
<</if>>
<<if $customSlave.sex == 2>>
- <<set $activeSlave = GenerateNewSlave("XY", {mature: 0})>>
+ <<set $activeSlave = GenerateNewSlave("XY", {mature: 0, nationality: _nationality})>>
<<set $activeSlave.dick = $customSlave.dick>>
<<set $activeSlave.balls = $customSlave.balls>>
<<set $activeSlave.scrotum = $activeSlave.balls>>
<<set $activeSlave.foreskin = $activeSlave.dick>>
<<else>>
- <<set $activeSlave = GenerateNewSlave("XX", {mature: 0})>>
+ <<set $activeSlave = GenerateNewSlave("XX", {mature: 0, nationality: _nationality})>>
<<if $customSlave.virgin == 0>>
<<set $activeSlave.vagina = $customSlave.virgin>>
<</if>>
--
GitLab