diff --git a/src/npc/generate/newChildIntro.js b/src/npc/generate/newChildIntro.js index 482e0963cf15d7e5ed409a35926b5d2a2f008cb5..5520296113309aa5eced6d60e2294ec0595f54b4 100644 --- a/src/npc/generate/newChildIntro.js +++ b/src/npc/generate/newChildIntro.js @@ -74,8 +74,14 @@ App.UI.newChildIntro = function(slave, slave2, familyStatus = true) { App.UI.DOM.link( `Have your PA assign ${him} a random name`, () => { + slave.birthName = generateName(slave.nationality, slave.race, slave.genes === "XY"); + if (slave.genes === "XY" && !V.allowMaleSlaveNames && isMaleName(slave.birthName, slave.nationality, slave.race)) { + /* grab a female name for the slave name instead */ + slave.slaveName = generateName(slave.nationality, slave.race, false); + } else { + slave.slaveName = slave.birthName; + } jQuery("#naming").empty().append( - `<<NewChildName slave>>`, `${V.assistant.name} registers the new ${girl} as "${slave.slaveName}" in your registry.` ); const slaveName = document.createElement("span"); diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index 28693e4366fe7096a109a0a75f727789430c0983..7c09e278c80940e8852cf15e01908939648d6a24 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -208,16 +208,6 @@ <<unset _currentSlaveNames, _maxTries, _continentNationality>> <</widget>> -<<widget "NewChildName">> -<<set $args[0].birthName = generateName($args[0].nationality, $args[0].race, $args[0].genes === "XY")>> -<<if $args[0].genes === "XY" && !$allowMaleSlaveNames && isMaleName($args[0].birthName, $args[0].nationality, $args[0].race)>> - /* grab a female name for the slave name instead */ - <<set $args[0].slaveName = generateName($args[0].nationality, $args[0].race, false)>> -<<else>> - <<set $args[0].slaveName = $args[0].birthName>> -<</if>> -<</widget>> - <<widget "AgePCEffects">> <<switch $PC.actualAge>> <<case 3>>