From e36649941d1b8402b31bfcaa5049c6e1041a0cf6 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 12 Feb 2020 23:28:34 -0500
Subject: [PATCH] more
---
src/js/useSlave.JS | 28 ++++++++++++++++------------
src/uncategorized/slaveInteract.tw | 8 ++++----
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/js/useSlave.JS b/src/js/useSlave.JS
index 7437203397e..410adb42e66 100644
--- a/src/js/useSlave.JS
+++ b/src/js/useSlave.JS
@@ -360,11 +360,14 @@ window.useSlaveDisplay = function(slave) {
}
generateRow(sexOptions);
- // TODO: show only if object is not empty;
- el.appendChild(document.createTextNode(` Fill ${his} mouth with: `));
- generateRow(fillFaceOptions);
- el.appendChild(document.createTextNode(` Fill ${his} ass with: `));
- generateRow(fillAssOptions);
+ if (!jQuery.isEmptyObject(fillFaceOptions)) {
+ el.appendChild(document.createTextNode(` Fill ${his} mouth with: `));
+ generateRow(fillFaceOptions);
+ }
+ if (!jQuery.isEmptyObject(fillAssOptions)) {
+ el.appendChild(document.createTextNode(` Fill ${his} ass with: `));
+ generateRow(fillAssOptions);
+ }
function generateRow(sexArray) {
for (let i = 0; i < sexArray.length; i++) {
@@ -425,6 +428,7 @@ window.useSlaveDisplay = function(slave) {
// Refresh spans as needed:
SlaveInteractImpreg(slave);
SlaveInteractFertility(slave);
+ useSlaveDisplay(slave);
if (sexOption.scene) {
return App.UI.replace('#miniscene', `<<include "${sexOption.scene}">>`);
@@ -445,7 +449,7 @@ window.SlaveInteractImpreg = function(slave) {
he, him, his, hers, himself, boy, He, His
} = getPronouns(slave);
const separator = document.createTextNode(` | `);
- let bloating = document.createElement('span');
+ let bloating = document.createElement('div');
if (slave.inflation > 0) {
let intro = document.createElement('span');
intro.textContent = "Required Bloating";
@@ -465,7 +469,7 @@ window.SlaveInteractImpreg = function(slave) {
requirement.textContent = `${He} is required to keep 2 liters of ${slave.inflationType} in ${him} at all times`;
}
bloating.append(requirement);
- bloating.append(".");
+ bloating.append(". ");
if (slave.inflationMethod === 3) {
let link = App.UI.DOM.link(
@@ -563,7 +567,7 @@ window.SlaveInteractFertility = function(slave) {
} else {
fertility.textContent = `${slave.preg} weeks pregnant`;
}
- fertility.textContent += ".";
+ fertility.textContent += ". ";
if (slave.preg > 0 && V.pregnancyMonitoringUpgrade === 1) {
let link = App.UI.DOM.link(
`Inspect pregnancy`,
@@ -702,13 +706,13 @@ window.SlaveInteractFertility = function(slave) {
control.append(": ");
if (slave.pregControl === "labor suppressors") {
- control.append("Labor is suppressed.");
+ control.append("Labor is suppressed. ");
} else if (slave.pregControl === "slow gestation") {
- control.append("Slowed gestation speed.");
+ control.append("Slowed gestation speed. ");
} else if (slave.pregControl === "speed up") {
- control.append("Faster gestation speed, staffed clinic recommended.");
+ control.append("Faster gestation speed, staffed clinic recommended. ");
} else {
- control.append("Normal gestation and birth.");
+ control.append("Normal gestation and birth. ");
}
fertilityblock.append(control);
control = document.createElement('div');
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 37be88ef217..47686558ddf 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -75,8 +75,7 @@
/* pregmod start */
<<if $familyTesting == 1>>
- <br><br>
- <span id="family">
+ <p id="family">
<div id="familyTree"></div>
<span id="familyTreeLink">
<<link "Pull up the file on $his family tree.">>
@@ -85,17 +84,18 @@
<</replace>>
<</link>>
</span>
- </span>
+ </p>
<</if>>
+<p>
<<if $universalRulesImpregnation == "HG" && $seePreg != 0>>
- <br><br>
<<if $activeSlave.HGExclude == 0>>
Will be bred by the Head Girl when fertile. <<link "Exempt $him" "Slave Interact">><<set $activeSlave.HGExclude = 1>><</link>>
<<else>>
Will not be bred by the Head Girl when fertile. <<link "Include $him" "Slave Interact">><<set $activeSlave.HGExclude = 0>><</link>>
<</if>>
<</if>>
+</p>
/* pregmod end */
<br><br>
--
GitLab