From 653460f362653cc206054a24ee2a247b2bb965b9 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Fri, 16 Oct 2020 23:06:22 -0400
Subject: [PATCH] port widget
---
src/npc/generate/newChildIntro.js | 8 +++++++-
src/pregmod/widgets/pregmodWidgets.tw | 10 ----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/npc/generate/newChildIntro.js b/src/npc/generate/newChildIntro.js
index 482e0963cf1..55202961133 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 28693e4366f..7c09e278c80 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>>
--
GitLab