From 36b57e9b1e9d62c9fd80a326f210921d085e5455 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 2 Aug 2020 08:00:10 -0400
Subject: [PATCH] fix and css
---
src/gui/css/mainStyleSheet.css | 1 +
src/pregmod/FCTV/FCTV.js | 9 +++++++--
src/pregmod/FCTV/FCTVshows.js | 15 ++++-----------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index ea810776e55..2c05d8d89b2 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -223,6 +223,7 @@ span.zeroButton > a:hover { text-decoration: none; }
.teal, .teal a { color: teal }
.yellow, .yellow a, .noteworthy, .noteworthy a, .devotion.ambivalent, .devotion.ambivalent a, .trust.fearful, .trust.fearful a { color: yellow }
.yellowgreen, .yellowgreen a, .cash.inc, .cash.inc a, .cash, .cash a { color: yellowgreen }
+.white a { color: white }
/*! <<checkvars>> macro for SugarCube 2.x */
#ui-dialog-body.checkvars{padding:1em}#ui-dialog-body.checkvars h1{font-size:1em;margin-top:0}#ui-dialog-body.checkvars table{border-collapse:collapse;border-spacing:0}#ui-dialog-body.checkvars thead tr{border-bottom:2px solid #444}#ui-dialog-body.checkvars tr:not(:first-child){border-top:1px solid #444}#ui-dialog-body.checkvars td,#ui-dialog-body.checkvars th{padding:.25em 1em}#ui-dialog-body.checkvars td:first-child,#ui-dialog-body.checkvars th:first-child{padding-left:.5em;border-right:1px solid #444}#ui-dialog-body.checkvars td:last-child,#ui-dialog-body.checkvars th:last-child{padding-right:.5em}#ui-dialog-body.checkvars th:first-child{text-align:center}#ui-dialog-body.checkvars td:first-child{font-weight:700;text-align:right}#ui-dialog-body.checkvars td{font-family:monospace,monospace;vertical-align:top;white-space:pre-wrap}#ui-dialog-body.checkvars .scroll-pad{margin:0;padding:0}
diff --git a/src/pregmod/FCTV/FCTV.js b/src/pregmod/FCTV/FCTV.js
index 80dbaacdae3..fdc480247aa 100644
--- a/src/pregmod/FCTV/FCTV.js
+++ b/src/pregmod/FCTV/FCTV.js
@@ -250,17 +250,22 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
if (V.FCTV.channel.selected >= -1) {
div = document.createElement("div");
- if (V.FCTV.channel.selected !== -1) {
+ if (V.FCTV.channel.selected !== -1) { //TODO: remove with new randomizer
if (usedRemote) {
div.append(`You select `);
} else {
div.append(`It looks like the random function chose `);
}
App.UI.DOM.appendNewElement("span", div, `channel number: ${V.FCTV.channel.selected}`, "bold");
+
+ // A little glue to get unique data based stuff to stick.
if (V.FCTV.channel.selected === 16) {
div.append(`. `);
} else {
div.append(`, `);
+ if (V.FCTV.channel.selected === 11 && usedRemote) {
+ div.append(`for some foolish reason`);
+ }
}
}
div.append(displayShow());
@@ -300,7 +305,7 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
);
} else {
span = document.createElement("span");
- span.classList.add("yellow");
+ span.classList.add("white");
span.style.fontWeight = "bold";
span.append(
App.UI.DOM.link(
diff --git a/src/pregmod/FCTV/FCTVshows.js b/src/pregmod/FCTV/FCTVshows.js
index b7fab459aaf..5fdaf20369c 100644
--- a/src/pregmod/FCTV/FCTVshows.js
+++ b/src/pregmod/FCTV/FCTVshows.js
@@ -1480,18 +1480,11 @@ App.Data.FCTV.shows = {
},
get text() {
const r = [];
- if (S.Concubine !== 0 && canTalk(S.Concubine)) {
- const {his} = getPronouns(S.Concubine);
- const {title: Master} = getEnunciation(S.Concubine);
- }
+ const {his} = S.Concubine ? getPronouns(S.Concubine) : {};
+ const {title: Master} = canTalk(S.Concubine) ? getEnunciation(S.Concubine) : {};
- if (V.usedRemote) {
- r.push(`for some foolish`);
- }
if (FCTV.channelCount(1, 'gt')) {
- r.push(`reason, once again,`);
- } else {
- r.push(`reason`);
+ r.push(`, once again,`);
}
r.push(`which is currently showing an infomercial attempting to sell a product named "sag-B-gone" that claims to be able to prevent breasts from naturally sagging under their own weight.`);
r.push(`<p>`);
@@ -1594,7 +1587,7 @@ App.Data.FCTV.shows = {
jQuery("#called").empty().append('Your order should arrive by next week. If the advertisement is to be believed, all you need to do is rub the cream into your breasts several times a day and it will ward off sagging.');
}
));
- r.push(`<i> This will cost ${cashFormat(Math.trunc(50 * V.upgradeMultiplierTrade))}</i></div>`);
+ r.push(`<i>This will cost ${cashFormat(Math.trunc(50 * V.upgradeMultiplierTrade))}</i></div>`);
}
return r.join(" ");
--
GitLab