diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 5b4c6d41a6308e372d9b691c64f06f5040e940db..616717cbfb9b05706d06d52da664b018029000ac 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 fd847619047832e2250b70cda5451d88c2f0b212..c8b619c4b280c4b2311ffa1cf1cc930d341db988 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 1b520f2ab5ac3b6c02f21b1f79f4752d62f63f8f..e672c692d1614bfc45942fc525edbe03e89c5706 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 0cebdfeca1455edfd7197e25e5c2b7abd8c68389..18694ad202c0925e7c8c8ed8290edce709955021 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 95c8903516ac7bfe1b9db8eb9fc4f3ab908df5de..30a4c243edaebdc86fa87025354ac37aa5c8a6d6 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 00d19cda1b2af9d2bf8edffaaa58d0a7af5dbbd0..0000000000000000000000000000000000000000 --- 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>>