From 9f8b8b57f42e31a69850d2c367ca14f9f578c73a Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 2 Aug 2020 12:52:23 -0400
Subject: [PATCH] camel case fix
---
src/pregmod/FCTV/FCTV.css | 6 +++---
src/pregmod/FCTV/FCTV.js | 36 ++++++++++++++++-----------------
src/pregmod/FCTV/FCTVBC.js | 2 +-
src/pregmod/FCTV/FCTVshows.js | 6 +++---
src/pregmod/FCTV/seFCTVwatch.tw | 4 ++--
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/pregmod/FCTV/FCTV.css b/src/pregmod/FCTV/FCTV.css
index 536ab210dea..aceb2cbe3ca 100644
--- a/src/pregmod/FCTV/FCTV.css
+++ b/src/pregmod/FCTV/FCTV.css
@@ -2,7 +2,7 @@
display: float;
}
-.FCTVremote {
+.FctvRemote {
text-align: center;
justify-items: center;
display: grid;
@@ -10,12 +10,12 @@
width:min-content;
padding-right:20px;
}
-.FCTVremote-numbers {
+.FctvRemote-numbers {
display: grid;
grid-gap: 3px;
grid-template-columns: repeat(3, min-content);
justify-items:center;
}
-.FCTVremote-button {
+.FctvRemote-button {
margin-top: 10px;
}
\ No newline at end of file
diff --git a/src/pregmod/FCTV/FCTV.js b/src/pregmod/FCTV/FCTV.js
index ce7c9aaad29..bf5e60289ee 100644
--- a/src/pregmod/FCTV/FCTV.js
+++ b/src/pregmod/FCTV/FCTV.js
@@ -44,7 +44,7 @@ globalThis.FCTV = (function() {
}
}
- function showChannel(i = 1, { usedRemote = 0, seeAll = 0 } = {}) {
+ function showChannel(i = 1, {usedRemote = 0, seeAll = 0} = {}) {
let x = {
canSelect: 1,
text: `A notification is shown: `
@@ -180,10 +180,10 @@ globalThis.FCTV = (function() {
}
})();
-globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
- return watch({ usedRemote: usedRemote, seeAll: seeAll });
+globalThis.FctvDisplay = function({usedRemote = 0, seeAll = 0} = {}) {
+ return watch({usedRemote: usedRemote, seeAll: seeAll});
- function watch({ usedRemote = 0, seeAll = 0 } = {}) {
+ function watch({usedRemote = 0, seeAll = 0} = {}) {
let p;
let div;
let span;
@@ -207,7 +207,7 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
App.UI.DOM.link(
"Use your remote",
() => {
- watch({ usedRemote: 1, seeAll: seeAll });
+ watch({usedRemote: 1, seeAll: seeAll});
}
)
);
@@ -251,7 +251,7 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
if (V.FCTV.channel.selected >= -1) {
div = document.createElement("div");
- if (V.FCTV.channel.selected !== -1) { //TODO: remove with new randomizer
+ if (V.FCTV.channel.selected !== -1) { // TODO: remove with new randomizer
if (usedRemote) {
div.append(`You select `);
} else {
@@ -274,7 +274,7 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
}
p = displayRemote(p);
- return jQuery("#FCTVwatch").empty().append(p);
+ return jQuery("#FctvWatch").empty().append(p);
function displayRemote(node) {
const p = document.createElement("p");
@@ -288,19 +288,19 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
function createRemote() {
p = document.createElement("p");
- p.classList.add("FCTVremote");
+ p.classList.add("FctvRemote");
let div;
const buttons = [];
for (const i of _possibleChannels) {
- if (FCTV.showChannel(i, { usedRemote: usedRemote, seeAll: seeAll }).canSelect > 0) {
+ if (FCTV.showChannel(i, {usedRemote: usedRemote, seeAll: seeAll}).canSelect > 0) {
if (V.FCTV.channel.selected !== i) {
buttons.push(
App.UI.DOM.link(
i,
() => {
V.FCTV.channel.selected = i;
- watch({ usedRemote: 1, seeAll: seeAll });
+ watch({usedRemote: 1, seeAll: seeAll});
}
)
);
@@ -313,7 +313,7 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
i,
() => {
V.FCTV.channel.selected = i;
- watch({ usedRemote: 1, seeAll: seeAll });
+ watch({usedRemote: 1, seeAll: seeAll});
}
)
);
@@ -331,7 +331,7 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
}
div = document.createElement("div");
- div.classList.add("FCTVremote-numbers", /* "FCTVremote-button" */);
+ div.classList.add("FctvRemote-numbers", /* "FctvRemote-button" */);
for (const button of buttons) {
div.append(button);
}
@@ -342,10 +342,10 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
App.UI.DOM.link(
`Random`,
() => {
- watch({ usedRemote: 0, seeAll: seeAll });
+ watch({usedRemote: 0, seeAll: seeAll});
}
),
- ["FCTVremote-button"]
+ ["FctvRemote-button"]
);
if (V.cheatMode > 0 || V.debugMode > 0) {
App.UI.DOM.appendNewElement(
@@ -359,10 +359,10 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
} else {
seeAll = 1;
}
- watch({ usedRemote: usedRemote, seeAll: seeAll });
+ watch({usedRemote: usedRemote, seeAll: seeAll});
}
),
- ["FCTVremote-button"]
+ ["FctvRemote-button"]
);
}
return p;
@@ -375,12 +375,12 @@ globalThis.FCTVdisplay = function({ usedRemote = 0, seeAll = 0 } = {}) {
const viewedCount = V.FCTV.channel[num(sel, true)];
const availableEp = channel.episode.length;
let epToShow;
- if (availableEp > viewedCount) { // If we watched ep 0 last time, our viewcount will be 1. Now we can use 1 as our new ep, etc.
+ if (availableEp > viewedCount) { // If we watched ep 0 last time, our view count will be 1. Now we can use 1 as our new ep, etc.
epToShow = viewedCount;
} else if (channel.loop === true) {
// How many times have we been through this series. Lets say we watched 10 episodes, but there are only 3 uniques [0,1,2].
const watchedEntireSeason = Math.trunc(viewedCount / availableEp); // we went through 3 times fully
- epToShow = viewedCount - (watchedEntireSeason * availableEp); // 10 - 3 seasons (9) is 1. So our last epiode was the first, 0 in the array. And 1 is the next ep!
+ epToShow = viewedCount - (watchedEntireSeason * availableEp); // 10 - 3 seasons (9) is 1. So our last episode was the first, 0 in the array. And 1 is the next ep!
} else { // We have seen all the episodes, return a random one
epToShow = jsRandom(0, availableEp-1);
}
diff --git a/src/pregmod/FCTV/FCTVBC.js b/src/pregmod/FCTV/FCTVBC.js
index 820799a07fe..0b2380644c4 100644
--- a/src/pregmod/FCTV/FCTVBC.js
+++ b/src/pregmod/FCTV/FCTVBC.js
@@ -26,7 +26,7 @@ App.Update.FCTV = function() {
V.FCTV.pcViewership.count = convert(V.FCTVcount, V.FCTV.pcViewership.count) || 0;
V.FCTV.pcViewership.frequency = convert(V.FCTVrate, V.FCTV.pcViewership.frequency) || 4;
- V.FCTV.remote = convert(V.FCTVremote, V.FCTV.remote) || 0;
+ V.FCTV.remote = convert(V.FctvRemote, V.FCTV.remote) || 0;
if (V.FCTVreceiver && !V.FCTV.weekEnabled) {
V.FCTV.weekEnabled = V.receiverAvailable > 1 ? V.receiverAvailable : 0;
diff --git a/src/pregmod/FCTV/FCTVshows.js b/src/pregmod/FCTV/FCTVshows.js
index 5fdaf20369c..5e84da5eebd 100644
--- a/src/pregmod/FCTV/FCTVshows.js
+++ b/src/pregmod/FCTV/FCTVshows.js
@@ -633,7 +633,7 @@ App.Data.FCTV.shows = {
if (MSL >= 1) {
r.push(`</p><p>You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has`);
if (MSL >= 1 && S.Concubine !== 0) {
- r.push(`<span class="pink">${S.Concubine.slaveName}</span> eager for some attention from ${getPronouns(S.Concubine).posessive} own arcology owner. Of course, the same could be said for the other eager slaves living in your bedroom, and the situation quickly devolves into a lust-filled`);
+ r.push(`<span class="pink">${S.Concubine.slaveName}</span> eager for some attention from ${getPronouns(S.Concubine).possessive} own arcology owner. Of course, the same could be said for the other eager slaves living in your bedroom, and the situation quickly devolves into a lust-filled`);
if (MSL > 1) {
r.push(`orgy.`);
} else {
@@ -806,7 +806,7 @@ App.Data.FCTV.shows = {
text: function(slave) {
const r = [];
const {girl, his, He, he, him} = getPronouns(slave);
- r.push(`<p>Next up, we havea special slave named ${slave.slaveName} who has quite the gift, <span class="pink">superfetation!</span> ${He} can become pregnant while pregnant! Isn't that amazing? ${He} may have a few miles on ${him}, having just completed a double pregnancy, but with a trait like that, ${he}'s more than worth ${his} price if you like your ${girl}s to constantly have a bun in the oven."</p>`);
+ r.push(`<p>Next up, we have a special slave named ${slave.slaveName} who has quite the gift, <span class="pink">superfetation!</span> ${He} can become pregnant while pregnant! Isn't that amazing? ${He} may have a few miles on ${him}, having just completed a double pregnancy, but with a trait like that, ${he}'s more than worth ${his} price if you like your ${girl}s to constantly have a bun in the oven."</p>`);
return r.join(" ");
}
},
@@ -1848,7 +1848,7 @@ App.Data.FCTV.shows = {
get text() {
const r = [];
if (V.usedRemote) {
- r.push(`another interesting thumbail which turns out to be in`);
+ r.push(`another interesting thumbnail which turns out to be in`);
} else {
r.push(`skipping straight to`);
}
diff --git a/src/pregmod/FCTV/seFCTVwatch.tw b/src/pregmod/FCTV/seFCTVwatch.tw
index 7fdb44b47b1..8523162a859 100644
--- a/src/pregmod/FCTV/seFCTVwatch.tw
+++ b/src/pregmod/FCTV/seFCTVwatch.tw
@@ -2,7 +2,7 @@
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "FCTV">>
-<p id="FCTVwatch"></p>
+<p id="FctvWatch"></p>
<script>
- FCTVdisplay();
+ FctvDisplay();
</script>
--
GitLab