From 0229c3fad0b50051e9459f930531de96b0917609 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 28 Jul 2018 02:04:14 -0400
Subject: [PATCH] JSify nationalityToRace
---
devNotes/twine JS.txt | 4 ++++
src/SecExp/secExpSmilingMan.tw | 2 +-
src/js/slaveGenerationJS.tw | 4 ++++
src/uncategorized/generateXXSlave.tw | 2 +-
src/uncategorized/generateXYSlave.tw | 2 +-
src/utility/slaveGenerationWidgets.tw | 5 -----
6 files changed, 11 insertions(+), 8 deletions(-)
delete mode 100644 src/utility/slaveGenerationWidgets.tw
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 5b4c6d41a63..616717cbfb9 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -23341,6 +23341,10 @@ window.generateAge = function generateAge(slave) {
slave.pubertyAgeXY = V.potencyAge;
};
+window.nationalityToRace = function nationalityToRace(slave) {
+ slave.race = hashChoice(setup.raceSelector[slave.nationality] || setup.raceSelector[""]);
+};
+
window.nationalityToName = function nationalityToName(slave) {
const V = State.variables;
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index fd847619047..c8b619c4b28 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -324,7 +324,7 @@
<<set $activeSlave.intelligenceImplant = 1>>
<<run nationalityToName($activeSlave)>>
<<run nationalityToAccent($activeSlave)>>
- <<NationalityToRace $activeSlave>>
+ <<run nationalityToRace($activeSlave)>>
<<set $activeSlave.slaveSurname = "Yamadera">>
<<set $activeSlave.birthSurname = "Yamadera">>
<<set $activeSlave.skin = "pale">>
diff --git a/src/js/slaveGenerationJS.tw b/src/js/slaveGenerationJS.tw
index 1b520f2ab5a..e672c692d16 100644
--- a/src/js/slaveGenerationJS.tw
+++ b/src/js/slaveGenerationJS.tw
@@ -44,6 +44,10 @@ window.generateAge = function generateAge(slave) {
slave.pubertyAgeXY = V.potencyAge;
};
+window.nationalityToRace = function nationalityToRace(slave) {
+ slave.race = hashChoice(setup.raceSelector[slave.nationality] || setup.raceSelector[""]);
+};
+
window.nationalityToName = function nationalityToName(slave) {
const V = State.variables;
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 0cebdfeca14..18694ad202c 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -101,7 +101,7 @@
<<set $activeSlave.nationality = $fixedNationality>>
<<set $fixedNationality = 0>>
<</if>>
- <<NationalityToRace $activeSlave>>
+ <<run nationalityToRace($activeSlave)>>
/* Corporate slavegen with race selection */
<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
<<if $captureUpgradeRace == "mixed race">>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 95c8903516a..30a4c243eda 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -107,7 +107,7 @@
<<set $activeSlave.nationality = $fixedNationality>>
<<set $fixedNationality = 0>>
<</if>>
- <<NationalityToRace $activeSlave>>
+ <<run nationalityToRace($activeSlave)>>
/* Corporate slavegen with race selection */
<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
<<if $captureUpgradeRace == "mixed race">>
diff --git a/src/utility/slaveGenerationWidgets.tw b/src/utility/slaveGenerationWidgets.tw
deleted file mode 100644
index 00d19cda1b2..00000000000
--- a/src/utility/slaveGenerationWidgets.tw
+++ /dev/null
@@ -1,5 +0,0 @@
-:: slave generation widgets [nobr widget]
-
-<<widget "NationalityToRace">>
-<<set $args[0].race = hashChoice(setup.raceSelector[$args[0].nationality] || setup.raceSelector[""])>>
-<</widget>>
--
GitLab