From 5af750a583a6fa15d0c6ce6fc783516cb625e76c Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 2 Jul 2019 20:11:01 -0500
Subject: [PATCH] OtherSpaces
---
src/SpecialForce/NamingColonel.tw | 2 +-
src/js/DefaultRules.js | 2 +-
src/js/rulesAutosurgery.js | 2 +-
src/pregmod/eliteTakeOverResult.tw | 2 +-
src/pregmod/widgets/bodySwapReaction.tw | 6 +++---
src/uncategorized/newSlaveIntro.tw | 2 +-
src/uncategorized/storyCaption.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/SpecialForce/NamingColonel.tw b/src/SpecialForce/NamingColonel.tw
index c33d39e49a9..db23afa0777 100644
--- a/src/SpecialForce/NamingColonel.tw
+++ b/src/SpecialForce/NamingColonel.tw
@@ -87,7 +87,7 @@
<<if $SF.Colonel.Core == "shell shocked">>
someone."
<<else>>
- Two of them were the people I'd taken to bed. You can't even trust your drunken fucks anymore.
+ someone. Two of them were the people I'd taken to bed. You can't even trust your drunken fucks anymore.
<<switch $SF.Colonel.Core>>
<<case "kind">>
It's a shame, but that's the world we live in."
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index d5a060907de..a5d033cd3de 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -2316,7 +2316,7 @@ window.DefaultRules = (function() {
}
}
}
-
+
if (rule.hornColor !== undefined && (rule.hornColor !== null)) {
if (slave.horn !== "none") {
if ((slave.hornColor !== rule.hornColor)) {
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 4eb68991103..33ea38b7fe8 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -472,7 +472,7 @@ window.rulesAutosurgery = (function() {
commitProcedure(`surgery to modify ${his} ears into a pair of bovine-like ears`, s => { s.earShape = "ushi"; });
}
}
-
+
}
/**
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index 2a67fbee04a..968f004df4c 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -97,7 +97,7 @@
<<switch $SF.Colonel.Core>>
<<case "kind">>
The Colonel is shocked that you would allow her troops to do this but understands that it comes with the territory. <<if _SFHappyEverAfter == 1>>Thanks for being kind to one of my soldiers.<</if>>
- <<case "brazen""jaded""cruel">>
+ <<case "brazen" "cruel" "jaded">>
The Colonel is grateful that you let her troops let off some steam. <<if _SFHappyEverAfter == 1>>Thanks for being kind to one of my soldiers.<</if>>
<</switch>>
<</if>>
diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw
index 58c484d0154..1062e57458f 100644
--- a/src/pregmod/widgets/bodySwapReaction.tw
+++ b/src/pregmod/widgets/bodySwapReaction.tw
@@ -106,7 +106,7 @@ Now you only have to wait for $him to wake up.
/*(arms)*/
<<if $args[0].amp < 0 && $args[1].amp == 0>>
- finger; the servo motors whining softly with each movement.
+ finger, the servo motors whining softly with each movement.
<<if $args[0].hears <= -2>>
<<if $args[0].fetish == "mindbroken">>
$He vaguely reacts to the sounds coming from $his arm, though not to any meaningful extent.
@@ -120,7 +120,7 @@ Now you only have to wait for $him to wake up.
Naturally, $he hasn't noticed it yet.
<</if>>
<<elseif $args[0].amp < 0 && $args[1].amp < 0>>
- finger; the servo motors whining softly with each movement.
+ finger, the servo motors whining softly with each movement.
<<elseif $args[0].fetish == "mindbroken">>
finger as if nothing changed.
<<elseif $args[0].muscles < $args[1].muscles-5>> /*(less muscle)*/
@@ -132,7 +132,7 @@ Now you only have to wait for $him to wake up.
<</if>>
<<elseif $args[0].muscles > $args[1].muscles+5>> /*(more muscle)*/
<<if $args[0].devotion >= -20 || $args[0].fetish != "mindbroken">>
- finger; the arm @@.lime;<<if canSee($args[0])>>visibly more toned<<else>>noticeably stronger<</if>>@@ than $his old one. With a clench of $his fist, the muscles of the limb bulge slightly. $He is @@.hotpink;happy@@ that you would take into consideration such a small detail, and knows that life will be just that much easier now.
+ finger, the arm @@.lime;<<if canSee($args[0])>>visibly more toned<<else>>noticeably stronger<</if>>@@ than $his old one. With a clench of $his fist, the muscles of the limb bulge slightly. $He is @@.hotpink;happy@@ that you would take into consideration such a small detail, and knows that life will be just that much easier now.
<<set $args[0].devotion += 2>>
<<else>>
finger. Flexing, $he realizes $he is @@.lime;noticeably stronger@@ than $he was before. @@.mediumaquamarine;$He takes a moment to relish $his newfound strength.@@
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 8bdd92dc124..40eade74d9f 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1655,7 +1655,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if $activeSlave.fetish == "boobs">>
<<if $activeSlave.fetishKnown == 0>>
The slave quickly becomes aroused. Before long, an orgasm convulses $his entire body, jiggling the feminine flesh under your hand delightfully. @@.green;$He's a breast fetishist!@@
- <<set $activeSlave.fetishKnown = 1>>
+ <<set $activeSlave.fetishKnown = 1>>
<<else>>
$His breast fixation makes this teasing quite pleasurable for $him, almost as good as a handjob. Before long, an orgasm convulses $his entire body, jiggling the feminine flesh under your hand delightfully.
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 73666985b54..20f5dcdff71 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -35,7 +35,7 @@
</span>
<<else>>
<<if _Pass !== "Encyclopedia">> <br><br> <</if>>
- <<if $nextButton === "END WEEK">>
+ <<if $nextButton === "END WEEK">>
<span id="endWeekButton"><strong>
<<link [[($nextButton)|($nextLink)]]>><</link>>
</strong></span>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index bc9b9458397..9d7bed77915 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -16601,7 +16601,7 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
<<if $activeSlave.accent != 0>>
<<if $activeSlave.accent == 1>>
<<set _accent = either("a beautiful", "a distinctive", "an intriguing", "a light", "a lovely", "a mild", "a pleasant", "a rich", "a slight", "a smooth")>>
- $He speaks $language in _accent <<if $activeSlave.nationality == "a Cook Islander">>Cook Islander<<elseif $activeSlave.nationality == "a Liechtensteiner">>Liechtensteiner<<elseif $activeSlave.nationality == "a New Zealander">>New Zealander<<elseif $activeSlave.nationality == "a Solomon Islander">>Solomon Islander<<else>>$activeSlave.nationality<</if>> accent<<if $activeSlave.speechRules == "accent elimination">>, which the rules encourage $him to suppress<</if>>.
+ $He speaks $language in _accent <<print aNational($activeSlave.nationality)>> accent<<if $activeSlave.speechRules == "accent elimination">>, which the rules encourage $him to suppress<</if>>.
<<elseif $activeSlave.accent == 2>>
<<set _accent = either("a broad", "a harsh", "a heavy", "an intense", "a marked", "a noticeable", "a rough", "a significant", "a stressed", "a strong", "a thick")>>
$He speaks $language in _accent <<print aNational($activeSlave.nationality)>> accent that can be hard to understand<<if $activeSlave.speechRules == "accent elimination">>, and the rules encourage $him to make an effort to suppress it<</if>>.
--
GitLab