From 5988fe442d58dd58e9ff08f0a3e6d568cfe6e4ad Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 14 May 2020 16:28:18 -0400
Subject: [PATCH] complete
---
src/npc/startingGirls/startingGirls.js | 34 ++++++++++++++++----------
src/npc/startingGirls/startingGirls.tw | 5 ++--
2 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js
index 29b43a86991..fa81259cd06 100644
--- a/src/npc/startingGirls/startingGirls.js
+++ b/src/npc/startingGirls/startingGirls.js
@@ -221,50 +221,58 @@ App.StartingGirls.career = function(slave) {
if (V.AgePenalty === 1) {
if (slave.actualAge < 16) {
- text = "veryYoungCareers: ";
+ text = "Very young careers: ";
pullDown = render(setup.veryYoungCareers);
} else if (slave.actualAge <= 24) {
- text = "youngCareers: ";
+ text = "Young careers: ";
pullDown = render(setup.youngCareers);
} else if (slave.intelligenceImplant >= 15) {
- text = "educatedCareers: ";
+ text = "Educated careers: ";
pullDown = render(setup.educatedCareers);
} else {
- text = "uneducatedCareers: ";
+ text = "Uneducated careers: ";
pullDown = render(setup.uneducatedCareers);
}
} else {
if (slave.actualAge < 16) {
- text = "veryYoungCareers: ";
+ text = "Very young careers: ";
pullDown = render(setup.veryYoungCareers);
} else if (slave.intelligenceImplant >= 15) {
- text = "educatedCareers: ";
+ text = "Educated careers: ";
pullDown = render(setup.educatedCareers);
} else if (slave.actualAge <= 24) {
- text = "youngCareers: ";
+ text = "Young careers: ";
pullDown = render(setup.youngCareers);
} else {
- text = "uneducatedCareers: ";
+ text = "Uneducated careers: ";
pullDown = render(setup.uneducatedCareers);
}
}
- pullDown.ID = "pullDown";
function render(options) {
let select = document.createElement("SELECT");
select.classList.add("rajs-list");
-
for(let i = 0; i < options.length; i++) {
let opt = options[i];
let el = document.createElement("option");
el.textContent = capFirstChar(opt);
el.value = opt;
+ if (slave.career === opt) {
+ el.selected = true;
+ }
select.appendChild(el);
}
select.onchange = () => {
- let x = document.getElementById("pullDown");
- console.log(x);
- slave.career = x.value;
+ slave.career = select.options[select.selectedIndex].value;
+ jQuery("#careerTextbox").empty().append(
+ App.UI.DOM.makeTextBox(
+ slave.career,
+ v => {
+ slave.career = v;
+ },
+ false,
+ )
+ );
};
return select;
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index cd273ebb0b4..694be50ea3b 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -1061,10 +1061,9 @@
| ''Slave name:'' <<textbox "$activeSlave.slaveName" $activeSlave.slaveName "Starting Girls">>
<br>''Birth surname:'' <<textbox "$activeSlave.birthSurname" $activeSlave.birthSurname "Starting Girls">>
| ''Slave surname:'' <<textbox "$activeSlave.slaveSurname" $activeSlave.slaveSurname "Starting Girls">>
- <br>''Career:'' <<textbox "$activeSlave.career" $activeSlave.career "Starting Girls">>
- <div id="careers"></span>
+ <br>''Career:'' <span id="careerTextbox"><<textbox "$activeSlave.career" $activeSlave.career "Starting Girls">></span>
+ <span id="careers"></span>
<script>jQuery('#careers').empty().append(App.StartingGirls.career(V.activeSlave));</script>
-
<br>''Hair color:'' <<textbox "$activeSlave.origHColor" $activeSlave.origHColor "Starting Girls">> //This will also set eyebrow, pubic, and underarm hair color.//
<br>''Hair Style:'' <<textbox "$activeSlave.hStyle" $activeSlave.hStyle "Starting Girls">>
<br>''Hair Length:'' <<textbox "$activeSlave.hLength" $activeSlave.hLength "Starting Girls">>
--
GitLab