From a68ef5a6f79a65f6fd4a7615efafcf6d46db9a18 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Fri, 7 Dec 2018 01:32:51 -0500
Subject: [PATCH] More semicolons
---
devNotes/twine JS.txt | 70 +++++++++++++++++------------------
src/endWeek/saPornJS.tw | 2 +-
src/endWeek/saRest.tw | 4 +-
src/endWeek/saServant.tw | 4 +-
src/endWeek/saStayConfined.tw | 64 ++++++++++++++++----------------
5 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 955ecfd751d..f89d720a582 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -12912,7 +12912,7 @@ window.saRest = function saRest(slave) {
if (V.showVignettes == 1 && slave.assignment === Job.REST) {
var _vignette = GetVignette(slave);
- t += ` __This week__ ${_vignette.text} `
+ t += ` __This week__ ${_vignette.text} `;
if (_vignette.type == "cash") {
if (_vignette.effect > 0) {
t += `<span class='yellowgreen'>making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`;
@@ -13102,7 +13102,7 @@ window.saServant = function saServant(slave) {
if (V.showVignettes == 1 && (slave.assignment === Job.SERVANT || slave.assignment === Job.SERVER)) {
var _vignette = GetVignette(slave);
- t += ` __This week__ ${_vignette.text} `
+ t += ` __This week__ ${_vignette.text} `;
if (_vignette.type == "cash") {
if (_vignette.effect > 0) {
t += `<span class='yellowgreen'>making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`;
@@ -13186,69 +13186,69 @@ window.saServant = function saServant(slave) {
window.saStayConfined = function saStayConfined(slave) {
- var pronouns = getPronouns(slave)
- var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun
- var He = capFirstChar(he), His = capFirstChar(his)
- var V = State.variables
+ var pronouns = getPronouns(slave);
+ var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
+ var He = capFirstChar(he), His = capFirstChar(his);
+ var V = State.variables;
- var t = ""
+ var t = "";
if (slave.fetish != "mindbroken") {
if (slave.devotion < -50) {
- t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. ${He} still hates ${his} place in the world, but being forced to rely on slave life as ${his} only human contact <span class='hotpink'>grinds down ${his} resistance.</span>`
- slave.devotion += 2
+ t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. ${He} still hates ${his} place in the world, but being forced to rely on slave life as ${his} only human contact <span class='hotpink'>grinds down ${his} resistance.</span>`;
+ slave.devotion += 2;
} else if (slave.devotion <= 20) {
- t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. With nothing to do but look forward to the next time ${he}'s let out to serve, <span class='hotpink'>${he} begins to rely on servitude.</span>`
- slave.devotion += 1
+ t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. With nothing to do but look forward to the next time ${he}'s let out to serve, <span class='hotpink'>${he} begins to rely on servitude.</span>`;
+ slave.devotion += 1;
} else if (slave.devotion <= 50) {
- t += `accepts solitary confinement whenever ${he} is not being forced to do something else. Since ${he} is obedient, the mental torture neither breaks ${him} further nor causes ${him} to hate you.`
+ t += `accepts solitary confinement whenever ${he} is not being forced to do something else. Since ${he} is obedient, the mental torture neither breaks ${him} further nor causes ${him} to hate you.`;
} else {
- t += `accepts solitary confinement whenever ${he} is not being forced to do something else. ${He} spends ${his} time wondering hopelessly how ${he} has failed you, <span class='mediumorchid'>damaging ${his} devotion to you.</span>`
- slave.devotion -= 2
+ t += `accepts solitary confinement whenever ${he} is not being forced to do something else. ${He} spends ${his} time wondering hopelessly how ${he} has failed you, <span class='mediumorchid'>damaging ${his} devotion to you.</span>`;
+ slave.devotion -= 2;
}
if (slave.trust < -50) {
- t += ` ${He} is so terrified of you that this confinement does not make ${him} fear you any more.`
+ t += ` ${He} is so terrified of you that this confinement does not make ${him} fear you any more.`;
} else if (slave.trust < -20) {
- t += ` ${He} is already afraid of you, but this confinement makes ${him} <span class='gold'>fear you even more.</span>`
- slave.trust -= 2
+ t += ` ${He} is already afraid of you, but this confinement makes ${him} <span class='gold'>fear you even more.</span>`;
+ slave.trust -= 2;
} else if (slave.trust <= 20) {
- t += ` This confinement makes ${him} <span class='gold'>fear your power</span> over ${him}.`
- slave.trust -= 4
+ t += ` This confinement makes ${him} <span class='gold'>fear your power</span> over ${him}.`;
+ slave.trust -= 4;
} else {
- t += ` This confinement makes ${him} <span class='gold'>trust you less,</span> and fear you more.`
- slave.trust -= 5
+ t += ` This confinement makes ${him} <span class='gold'>trust you less,</span> and fear you more.`;
+ slave.trust -= 5;
}
if (slave.assignment == "be confined in the cellblock") {
if ((slave.hears == -1 && slave.earwear != "hearing aids") || (slave.hears == 0 && slave.earwear == "muffling ear plugs") || (slave.hears == -2)) {
- t += ` ${His} hearing impairment spares ${him} the sounds of ${his} peers getting punished, lightening the impact of ${his} imprisonment.`
+ t += ` ${His} hearing impairment spares ${him} the sounds of ${his} peers getting punished, lightening the impact of ${his} imprisonment.`;
}
}
- t += ` The stress of confinement <span class='red'>damages ${his} health.</span>`
- slave.health -= 10
+ t += ` The stress of confinement <span class='red'>damages ${his} health.</span>`;
+ slave.health -= 10;
} else {
- t += `is oblivious to ${his} confinement.`
+ t += `is oblivious to ${his} confinement.`;
}
if (slave.sentence == 0 && (slave.devotion > 20 || (slave.devotion >= -20 && slave.trust < -20) || (slave.devotion >= -50 && slave.trust < -50) || slave.fetish == "mindbroken")) {
if (slave.fetish == "mindbroken") {
- t += ` ${His} broken mind hinges entirely on other's guidance,`
+ t += ` ${His} broken mind hinges entirely on other's guidance,`;
} else {
- t += ` ${He} is now willing to <span class='hotpink'>do as ${he}'s told,</span>`
+ t += ` ${He} is now willing to <span class='hotpink'>do as ${he}'s told,</span>`;
}
- t += ` so <span class='yellow'>${his} assignment has defaulted to rest.</span>`
+ t += ` so <span class='yellow'>${his} assignment has defaulted to rest.</span>`;
if (slave.assignment == "be confined in the cellblock") {
- State.temporary.brokenSlaves++
- State.temporary.DL--
- State.temporary.dI--
+ State.temporary.brokenSlaves++;
+ State.temporary.DL--;
+ State.temporary.dI--;
}
- removeJob(slave, slave.assignment)
+ removeJob(slave, slave.assignment);
}
- return t
-}
+ return t;
+};
/*
Displays assistant images. Currently passage-based.
@@ -26466,7 +26466,7 @@ window.getHighestPorn = function(slave) {
}
return max;
-}
+};
/*:: Art JS [script]*/
diff --git a/src/endWeek/saPornJS.tw b/src/endWeek/saPornJS.tw
index 23ac9d5ad52..a8d5b27c92e 100644
--- a/src/endWeek/saPornJS.tw
+++ b/src/endWeek/saPornJS.tw
@@ -113,4 +113,4 @@ window.getHighestPorn = function(slave) {
}
return max;
-}
\ No newline at end of file
+};
diff --git a/src/endWeek/saRest.tw b/src/endWeek/saRest.tw
index dab12e8b5aa..747068ea1f9 100644
--- a/src/endWeek/saRest.tw
+++ b/src/endWeek/saRest.tw
@@ -55,7 +55,7 @@ window.saRest = function saRest(slave) {
if (V.showVignettes == 1 && slave.assignment === Job.REST) {
var _vignette = GetVignette(slave);
- t += ` __This week__ ${_vignette.text} `
+ t += ` __This week__ ${_vignette.text} `;
if (_vignette.type == "cash") {
if (_vignette.effect > 0) {
t += `<span class='yellowgreen'>making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`;
@@ -133,4 +133,4 @@ window.saRest = function saRest(slave) {
}
return t;
-}
\ No newline at end of file
+};
diff --git a/src/endWeek/saServant.tw b/src/endWeek/saServant.tw
index 5718e528e0e..4b12c87a3ff 100644
--- a/src/endWeek/saServant.tw
+++ b/src/endWeek/saServant.tw
@@ -108,7 +108,7 @@ window.saServant = function saServant(slave) {
if (V.showVignettes == 1 && (slave.assignment === Job.SERVANT || slave.assignment === Job.SERVER)) {
var _vignette = GetVignette(slave);
- t += ` __This week__ ${_vignette.text} `
+ t += ` __This week__ ${_vignette.text} `;
if (_vignette.type == "cash") {
if (_vignette.effect > 0) {
t += `<span class='yellowgreen'>making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`;
@@ -186,4 +186,4 @@ window.saServant = function saServant(slave) {
}
return t;
-};
\ No newline at end of file
+};
diff --git a/src/endWeek/saStayConfined.tw b/src/endWeek/saStayConfined.tw
index c3b6f3fbabb..717146baa73 100644
--- a/src/endWeek/saStayConfined.tw
+++ b/src/endWeek/saStayConfined.tw
@@ -2,66 +2,66 @@
window.saStayConfined = function saStayConfined(slave) {
- var pronouns = getPronouns(slave)
- var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun
- var He = capFirstChar(he), His = capFirstChar(his)
- var V = State.variables
+ var pronouns = getPronouns(slave);
+ var he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
+ var He = capFirstChar(he), His = capFirstChar(his);
+ var V = State.variables;
- var t = ""
+ var t = "";
if (slave.fetish != "mindbroken") {
if (slave.devotion < -50) {
- t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. ${He} still hates ${his} place in the world, but being forced to rely on slave life as ${his} only human contact <span class='hotpink'>grinds down ${his} resistance.</span>`
- slave.devotion += 2
+ t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. ${He} still hates ${his} place in the world, but being forced to rely on slave life as ${his} only human contact <span class='hotpink'>grinds down ${his} resistance.</span>`;
+ slave.devotion += 2;
} else if (slave.devotion <= 20) {
- t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. With nothing to do but look forward to the next time ${he}'s let out to serve, <span class='hotpink'>${he} begins to rely on servitude.</span>`
- slave.devotion += 1
+ t += `is kept in solitary confinement whenever ${he} is not being forced to do something else. With nothing to do but look forward to the next time ${he}'s let out to serve, <span class='hotpink'>${he} begins to rely on servitude.</span>`;
+ slave.devotion += 1;
} else if (slave.devotion <= 50) {
- t += `accepts solitary confinement whenever ${he} is not being forced to do something else. Since ${he} is obedient, the mental torture neither breaks ${him} further nor causes ${him} to hate you.`
+ t += `accepts solitary confinement whenever ${he} is not being forced to do something else. Since ${he} is obedient, the mental torture neither breaks ${him} further nor causes ${him} to hate you.`;
} else {
- t += `accepts solitary confinement whenever ${he} is not being forced to do something else. ${He} spends ${his} time wondering hopelessly how ${he} has failed you, <span class='mediumorchid'>damaging ${his} devotion to you.</span>`
- slave.devotion -= 2
+ t += `accepts solitary confinement whenever ${he} is not being forced to do something else. ${He} spends ${his} time wondering hopelessly how ${he} has failed you, <span class='mediumorchid'>damaging ${his} devotion to you.</span>`;
+ slave.devotion -= 2;
}
if (slave.trust < -50) {
- t += ` ${He} is so terrified of you that this confinement does not make ${him} fear you any more.`
+ t += ` ${He} is so terrified of you that this confinement does not make ${him} fear you any more.`;
} else if (slave.trust < -20) {
- t += ` ${He} is already afraid of you, but this confinement makes ${him} <span class='gold'>fear you even more.</span>`
- slave.trust -= 2
+ t += ` ${He} is already afraid of you, but this confinement makes ${him} <span class='gold'>fear you even more.</span>`;
+ slave.trust -= 2;
} else if (slave.trust <= 20) {
- t += ` This confinement makes ${him} <span class='gold'>fear your power</span> over ${him}.`
- slave.trust -= 4
+ t += ` This confinement makes ${him} <span class='gold'>fear your power</span> over ${him}.`;
+ slave.trust -= 4;
} else {
- t += ` This confinement makes ${him} <span class='gold'>trust you less,</span> and fear you more.`
- slave.trust -= 5
+ t += ` This confinement makes ${him} <span class='gold'>trust you less,</span> and fear you more.`;
+ slave.trust -= 5;
}
if (slave.assignment == "be confined in the cellblock") {
if ((slave.hears == -1 && slave.earwear != "hearing aids") || (slave.hears == 0 && slave.earwear == "muffling ear plugs") || (slave.hears == -2)) {
- t += ` ${His} hearing impairment spares ${him} the sounds of ${his} peers getting punished, lightening the impact of ${his} imprisonment.`
+ t += ` ${His} hearing impairment spares ${him} the sounds of ${his} peers getting punished, lightening the impact of ${his} imprisonment.`;
}
}
- t += ` The stress of confinement <span class='red'>damages ${his} health.</span>`
- slave.health -= 10
+ t += ` The stress of confinement <span class='red'>damages ${his} health.</span>`;
+ slave.health -= 10;
} else {
- t += `is oblivious to ${his} confinement.`
+ t += `is oblivious to ${his} confinement.`;
}
if (slave.sentence == 0 && (slave.devotion > 20 || (slave.devotion >= -20 && slave.trust < -20) || (slave.devotion >= -50 && slave.trust < -50) || slave.fetish == "mindbroken")) {
if (slave.fetish == "mindbroken") {
- t += ` ${His} broken mind hinges entirely on other's guidance,`
+ t += ` ${His} broken mind hinges entirely on other's guidance,`;
} else {
- t += ` ${He} is now willing to <span class='hotpink'>do as ${he}'s told,</span>`
+ t += ` ${He} is now willing to <span class='hotpink'>do as ${he}'s told,</span>`;
}
- t += ` so <span class='yellow'>${his} assignment has defaulted to rest.</span>`
+ t += ` so <span class='yellow'>${his} assignment has defaulted to rest.</span>`;
if (slave.assignment == "be confined in the cellblock") {
- State.temporary.brokenSlaves++
- State.temporary.DL--
- State.temporary.dI--
+ State.temporary.brokenSlaves++;
+ State.temporary.DL--;
+ State.temporary.dI--;
}
- removeJob(slave, slave.assignment)
+ removeJob(slave, slave.assignment);
}
- return t
-}
+ return t;
+};
--
GitLab