From 869116bcedaaa6922c7f74434ba260b954fdcca6 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 8 Dec 2018 16:49:07 -0600
Subject: [PATCH] OtherTypos
---
devNotes/AnatomyOfAFreeCitiesEvent.txt | 2 +-
devNotes/Deepmurk_Vector_Art_Changelog.txt | 6 +++---
devNotes/twine JS.txt | 4 ++--
player variables documentation - Pregmod.txt | 6 +++---
src/art/artJS.tw | 8 ++++----
src/art/artWidgets.tw | 8 ++++----
src/art/vector/Arm.tw | 6 +++---
src/art/vector/Body_Clothing_Control.tw | 2 +-
src/art/vector/Boob.tw | 4 ++--
src/art/vector/Boob_Addons.tw | 4 ++--
src/art/vector/Head.tw | 2 +-
src/art/vector/Leg.tw | 6 +++---
src/art/vector/Penis.tw | 2 +-
src/art/vector/Pubic_Hair.tw | 2 +-
.../vector_revamp/vectorRevampedArtControlJS.tw | 16 ++++++++--------
src/gui/svgFilters.tw | 2 +-
src/js/rulesAssistantOptions.tw | 2 +-
src/js/slaveCostJS.tw | 4 ++--
src/uncategorized/BackwardsCompatibility.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
src/utility/miscWidgets.tw | 2 +-
21 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/devNotes/AnatomyOfAFreeCitiesEvent.txt b/devNotes/AnatomyOfAFreeCitiesEvent.txt
index 8346f7583bc..d9ca7a00539 100644
--- a/devNotes/AnatomyOfAFreeCitiesEvent.txt
+++ b/devNotes/AnatomyOfAFreeCitiesEvent.txt
@@ -84,7 +84,7 @@ Choices should also be hidden when they run against the game rules, like for exa
$dairyNameCaps is equipped to feed and clean slaves normally. [[Upgrade the milking machines with intubators|Dairy][$cash -= _Tmult1, $dairyFeedersUpgrade = 1]] //Costs ¤_Tmult1 and will increase upkeep costs//
<</if>>
- In order to enable the industrial feeder option both any of the see extreme content options has be enabled and the restraint's have to be already set to industrial.
+ In order to enable the industrial feeder option both any of the see extreme content options has be enabled and the restraint's have to be already set to industrial.
Remember that "do nothing" is almost always a choice (it's called "Continue" and can be found on the left side of the screen) so your events don't need this as an extra choice.
diff --git a/devNotes/Deepmurk_Vector_Art_Changelog.txt b/devNotes/Deepmurk_Vector_Art_Changelog.txt
index dd0fb7fa755..696a467ff01 100644
--- a/devNotes/Deepmurk_Vector_Art_Changelog.txt
+++ b/devNotes/Deepmurk_Vector_Art_Changelog.txt
@@ -36,7 +36,7 @@ known issues
pending requests/suggestions
-------------
-loli/shota bodies
-
+
pending outfit requests
-------------
-opaque stockings with ribbons
@@ -49,9 +49,9 @@ planned additions
-rework all AI avatars
-dick piercings (stalled due to planned code change)
-more outfits, see current queue ( https://gitgud.io/deepmurk/fc-pregmod/issues/1 )
-
+
---------------------------------------------------------------------------------------------------------------------------------------------
-
+
v1.7 (12/22/2018)
-------------
-added muscle definition (heavy)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 61f7b744f4d..48e3f4b3c3d 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -38513,8 +38513,8 @@ window.Beauty = (function() {
window.FResult = (function() {
"use strict";
- // we can't initialise our global variables on load, because SugarCube.State isn't initialised
- // instead, declare them and initialise on run time
+ // we can't initialize our global variables on load, because SugarCube.State isn't initialized
+ // instead, declare them and initialize on run time
let V, result, incest_bonus;
function FResult(slave) {
V = State.variables;
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index ea047b2f143..cede3d845f6 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -47,8 +47,8 @@ How far along the your pregnancy is (pregMood kicks in at 24+ weeks)
0 not pregnant
1 - 42 pregnant
43+ giving birth
-
-pregType:
+
+pregType:
How many fetuses you are carrying
1 - 8
@@ -126,7 +126,7 @@ breast size
1 - F-cup
2 - G-cup
3 - H-cup
-
+
degeneracy:
How strong/are there rumors about you doing unsavory things with your slaves
diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index 0004c24a95c..f166e480a22 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -72,7 +72,7 @@ window.ArtControlRendered = function ArtControlRendered(slave, sizePlacement) {
return r;
};
-/*
+/*
This takes a textual hair color description and tries to guess the appropriate HTML compliant color code.
color should be a color name, but can also be a string describing hair color.
@@ -81,8 +81,8 @@ eyes can be nearly anything, it only indicates that the function is being used f
This code's working is described to the user in the Encyclopedia, chapter "Lore", section "Dyes".
*/
window.extractColor = function (color, eyes) {
- /*
- these are color names known and used in FreeCities
+ /*
+ these are color names known and used in FreeCities
attributed color names are at the front of the array
*/
var FCname2HTMLarray = [
@@ -135,7 +135,7 @@ window.extractColor = function (color, eyes) {
if (HTMLstandardColors.includes(color) || color.match(/^#([0-9a-f]{3}){1,2}$/) !== null) {
colorCode = color; /* is a HTML color name or value, use it directly */
} else {
- /*
+ /*
is not even a HTML color name. color probably is a description.
look for anything resembling a valid color name within the description.
*/
diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw
index 3ad9a260e74..9d6b3128908 100644
--- a/src/art/artWidgets.tw
+++ b/src/art/artWidgets.tw
@@ -39,13 +39,13 @@ $args[2]: icon UI Display for vector art, 1 for on.
/* prepare HTML color codes for slave display */
/* note: latex clothing is mostly emulated by rubber color for skin (and shoes) */
/* TODO: consistently use American "color" instead of "colour" for all identifiers */
-<<include Art_Vector_Set_Color_Outfit_>>
-<<include Art_Vector_Set_Color_Skin_>>
+<<include Art_Vector_Set_Color_Outfit_>>
+<<include Art_Vector_Set_Color_Skin_>>
<<include Art_Vector_Set_Color_Hair_>>
<<include Art_Vector_Set_Color_Shoe_>>
<</silently>>
<<include Art_Vector_Generate_Stylesheet_>>
-/*
+/*
each passage adds one layer of vector art
vector art added later is drawn over previously added art
(what is listed on the bottom in the code appears on the top of the image)
@@ -515,7 +515,7 @@ vector art added later is drawn over previously added art
<</if>>
<<elseif $imageChoice == 3>> /* VECTOR ART REVAMP*/
- <<include Art_Vector_Revamped_Control_>>
+ <<include Art_Vector_Revamped_Control_>>
<<else>> /* RENDERED IMAGES BY SHOKUSHU */
<<= ArtControlRendered($args[0], $args[1])>>
diff --git a/src/art/vector/Arm.tw b/src/art/vector/Arm.tw
index e83f5036476..442f7f39d08 100644
--- a/src/art/vector/Arm.tw
+++ b/src/art/vector/Arm.tw
@@ -100,7 +100,7 @@
<</if>>
<<if _artSlave.amp == -3 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
-/* Reverting beauty limbs to regular SVG */
+/* Reverting beauty limbs to regular SVG */
<<set _art = "Art_Vector_Arm_Right_ProstheticBeauty_"+_rightArmType >>
<<include _art>>
<<set _art = "Art_Vector_Arm_Left_ProstheticBeauty_"+_leftArmType >>
@@ -147,13 +147,13 @@
<<set _leftArmArt = "Art_Vector_Arm_Outfit_" + clothing2artSuffix(_artSlave.clothes) + "_Left_" + _leftArmType>>
<<include _rightArmArt>>
<<include _leftArmArt>>
-
+
<<case "a slutty schutzstaffel uniform">>
<<set _rightArmArt = "Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_" + _rightArmType>>
<<set _leftArmArt = "Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_" + _leftArmType>>
<<include _rightArmArt>>
<<include _leftArmArt>>
-
+
<<case "a niqab and abaya" "a burqa">>
<<set _rightArmArt = "Art_Vector_Arm_Outfit_HijabAndAbaya_Right_" + _rightArmType>>
<<set _leftArmArt = "Art_Vector_Arm_Outfit_HijabAndAbaya_Left_" + _leftArmType>>
diff --git a/src/art/vector/Body_Clothing_Control.tw b/src/art/vector/Body_Clothing_Control.tw
index 362a797926d..d01188ea54b 100644
--- a/src/art/vector/Body_Clothing_Control.tw
+++ b/src/art/vector/Body_Clothing_Control.tw
@@ -5,7 +5,7 @@
<<if _artSlave.eyeColor != "">>
<<if _artSlave.eyeColor.split(" ").length > 1>>
<<set _eyeLens = _artSlave.eyeColor.split(" ")[0]>>
-
+
<<if _eyeLens == "demonic">>
<<set _eyeBallColor = _eyeColor>>
<<elseif _eyeLens == "devilish">>
diff --git a/src/art/vector/Boob.tw b/src/art/vector/Boob.tw
index c44a02e4e84..248f098558a 100644
--- a/src/art/vector/Boob.tw
+++ b/src/art/vector/Boob.tw
@@ -5,7 +5,7 @@
/* BEWARE: _art_boob_transform is also read by Art_Vector_Boob_Addons_ */
-/*
+/*
Prepare SVG transform matrix for continuous boob scaling.
This transform affects boobs, areolae and piercings.
The parameters were fit by points (300,1.0) and (15000,2.5).
@@ -29,7 +29,7 @@ _art_transform will affect the display.
<<set _art_boob_transform = "matrix(" + _art_scale_factor +",0,0," + _art_scale_factor + "," + _art_translation_x + "," + _art_translation_y + ")">>
<<set _art_transform = _art_boob_transform>>
-<<if _artSlave.boobs < 300 >>
+<<if _artSlave.boobs < 300 >>
/* BEWARE: this threshold may be used in other art-related code, too */
/* boobs too small - draw areolae directly onto torso */
<<else>>
diff --git a/src/art/vector/Boob_Addons.tw b/src/art/vector/Boob_Addons.tw
index fe103c3c37c..feaf1a12246 100644
--- a/src/art/vector/Boob_Addons.tw
+++ b/src/art/vector/Boob_Addons.tw
@@ -15,9 +15,9 @@
<<case "a slutty schutzstaffel uniform" >>
<<set _clothes = "a schutzstaffel uniform">> /* slutty schutzstaffel uniform uses schutzstaffel uniform art */
<<case "a niqab and abaya" "a burqa">>
- <<set _clothes = "a hijab and abaya" >>
+ <<set _clothes = "a hijab and abaya" >>
<<case "a hijab and blouse">>
- <<set _clothes = "a hijab and blouse" >>
+ <<set _clothes = "a hijab and blouse" >>
<</switch>>
<<switch _clothes >> /* select available clothes */
<<case "a ball gown" "a bunny outfit" "a cheerleader outfit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a leotard" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "an apron" "a nice maid outfit" "a nice nurse outfit" "a penitent nuns habit" "a red army uniform" "a scalemail bikini" "a schoolgirl outfit" "a schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a string bikini" "a toga" "attractive lingerie" "attractive lingerie for a pregnant woman" "battledress" "chains" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "harem gauze" "nice business attire" "shibari ropes" "slutty business attire" "slutty jewelry" "spats and a tank top" "stretch pants and a crop-top" "uncomfortable straps" "Western clothing" "a long qipao" "battlearmor" "a biyelgee costume" "lederhosen" "a dirndl" "a mounty outfit" "a klan robe" "a hijab and blouse" "panties and pasties" "a burkini" "a bra" "a slutty klan robe" "a striped bra" "striped underwear" "a button-up shirt" "a button-up shirt and panties" "a sports bra" "sport shorts and a t-shirt" "sport shorts and a sports bra" "a t-shirt" "a t-shirt and thong" "a t-shirt and panties" "leather pants and a tube top" "leather pants and pasties" "a tube top" "a tube top and thong" "a tank-top" "a tank-top and panties" "a t-shirt and jeans" "an oversized t-shirt" "an oversized t-shirt and boyshorts" "a sweater" "a sweater and cutoffs" "a sweater and panties" "a one-piece swimsuit" "a police uniform" "a hanbok" "a gothic lolita dress" "kitty lingerie">>
diff --git a/src/art/vector/Head.tw b/src/art/vector/Head.tw
index 8ac6d48bb27..7c3e9e151d9 100644
--- a/src/art/vector/Head.tw
+++ b/src/art/vector/Head.tw
@@ -978,7 +978,7 @@
<<include Art_Vector_Eyebrow_TypeE_Bushy>>
<</if>>
<</if>>
- <</if>>
+ <</if>>
<<if _artSlave.race == "indo-aryan">>
<<if _artSlave.faceShape == "normal">>
<<include Art_Vector_Eyes_TypeE>>
diff --git a/src/art/vector/Leg.tw b/src/art/vector/Leg.tw
index badc81bc7b7..13e62b92494 100644
--- a/src/art/vector/Leg.tw
+++ b/src/art/vector/Leg.tw
@@ -16,7 +16,7 @@
<<elseif _artSlave.weight > 0 && _artSlave.weight < 161>>
<<set _legSize = "Normal">>
<<elseif _artSlave.weight >= 161>>
- <<set _legSize = "Wide">>
+ <<set _legSize = "Wide">>
<</if>>
<<elseif _artSlave.hips == -1>>
<<if _artSlave.weight <= -11>>
@@ -96,8 +96,8 @@
<</if>>
<</if>>
<</if>>
-
-
+
+
/* Selection of matching SVG based on amputee level */
<<if _artSlave.amp == -1 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
diff --git a/src/art/vector/Penis.tw b/src/art/vector/Penis.tw
index 4578fcb61e3..e40d6193128 100644
--- a/src/art/vector/Penis.tw
+++ b/src/art/vector/Penis.tw
@@ -102,6 +102,6 @@
<</if>>
<</if>>
<</if>>
-
+
/* unset the variable for the next display */
<<unset _art_have_boobs >>
diff --git a/src/art/vector/Pubic_Hair.tw b/src/art/vector/Pubic_Hair.tw
index a0861da1d30..b51accee90f 100644
--- a/src/art/vector/Pubic_Hair.tw
+++ b/src/art/vector/Pubic_Hair.tw
@@ -54,7 +54,7 @@
<<include Art_Vector_Pubic_Hair_Very_Bushy >>
<</if>>
<<elseif _artSlave.pubicHStyle =="waxed">>
- <<include Art_Vector_Pubic_Hair_None >>
+ <<include Art_Vector_Pubic_Hair_None >>
<</if>>
<</if>>
diff --git a/src/art/vector_revamp/vectorRevampedArtControlJS.tw b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
index 7eaee403ad8..510830cc0b8 100644
--- a/src/art/vector_revamp/vectorRevampedArtControlJS.tw
+++ b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
@@ -388,7 +388,7 @@ class ClothingControl {
}
}
- get niceMaid() {
+ get niceMaid() {
return {
bodySettings: {
showPubic: false,
@@ -407,7 +407,7 @@ class ClothingControl {
}
}
- get sluttyMaid() {
+ get sluttyMaid() {
return {
bodySettings: {
showBellyPiercings: false
@@ -523,7 +523,7 @@ class ClothingControl {
legsSkin: {fill: defaultOutfitColor },
feetSkin: {fill: defaultOutfitColor },
torso: {fill: defaultOutfitColor },
- buttSkin: {fill: defaultOutfitColor },
+ buttSkin: {fill: defaultOutfitColor },
boob: { fill: defaultOutfitColor },
areola: { fill: defaultOutfitColor },
bellySkin: { fill: defaultOutfitColor },
@@ -545,7 +545,7 @@ class ClothingControl {
showPussyPiercings: false,
showPenisPiercings: false,
showBellyPiercings: false,
- showNipplesPiercings: false,
+ showNipplesPiercings: false,
showNipples: false
},
styleSettings: {
@@ -724,7 +724,7 @@ class RevampedArtControl {
else if (this.artSlave.trust >= -20) {
if (this.artSlave.devotion <= 20) {
leftArmType = "Low";
- }
+ }
else
{
leftArmType = "Mid";
@@ -1180,9 +1180,9 @@ class RevampedArtControl {
if (this.artSlave.dickPiercing == 1)
result.push("Art_Vector_Revamp_Penis_" + penisSize + "_Piercing");
else if (this.artSlave.dickPiercing == 2)
- result.push("Art_Vector_Revamp_Penis_" + penisSize + "_Piercing_Heavy");
+ result.push("Art_Vector_Revamp_Penis_" + penisSize + "_Piercing_Heavy");
}
- else
+ else
{
result.push("Art_Vector_Revamp_Flaccid_" + penisSize);
@@ -1701,7 +1701,7 @@ class RevampedArtControl {
Array.prototype.push.apply(layers, this.collarLayer);
Array.prototype.push.apply(layers, this.headLayer);
Array.prototype.push.apply(layers, this.eyesLayer);
- Array.prototype.push.apply(layers, this.mouthLayer);
+ Array.prototype.push.apply(layers, this.mouthLayer);
Array.prototype.push.apply(layers, this.headAddonLayer);
Array.prototype.push.apply(layers, this.hairForeLayer);
diff --git a/src/gui/svgFilters.tw b/src/gui/svgFilters.tw
index 5cdb22c7c4c..c6700a29224 100644
--- a/src/gui/svgFilters.tw
+++ b/src/gui/svgFilters.tw
@@ -50,7 +50,7 @@
<filter id="skin-dyed-blue" color-interpolation-filters="sRGB">
<feColorMatrix type="matrix" values="0.3 0 0 0 0 0 0.5 0 0 0 0.4 0.2 0.25 0 0.1 0 0 0 1 0"/>
</filter>
-
+
<filter id="hair-ashen" color-interpolation-filters="sRGB">
<feColorMatrix type="matrix" values="0.7 0 0 0 0.1 0 0.7 0 0 0.1 0 0 0.7 0 0.1 0 0 0 1 0"/>
</filter>
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 152e52521ae..280ade70858 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -179,7 +179,7 @@ window.rulesAssistantOptions = (function() {
if (textinput) {
value = document.createElement("input");
value.setAttribute("type", "text");
- value.classList.add("rajs-value"); //
+ value.classList.add("rajs-value"); //
// call the variable binding when the input field is no longer being edited, and when the enter key is pressed
value.onblur = () => {this.inputEdited(); };
value.onkeypress = (e) => { if (returnP(e)) this.inputEdited(); };
diff --git a/src/js/slaveCostJS.tw b/src/js/slaveCostJS.tw
index 259209ecda5..35cb11580fd 100644
--- a/src/js/slaveCostJS.tw
+++ b/src/js/slaveCostJS.tw
@@ -1257,8 +1257,8 @@ window.Beauty = (function() {
window.FResult = (function() {
"use strict";
- // we can't initialise our global variables on load, because SugarCube.State isn't initialised
- // instead, declare them and initialise on run time
+ // we can't initialize our global variables on load, because SugarCube.State isn't initialized
+ // instead, declare them and initialize on run time
let V, result, incest_bonus;
function FResult(slave) {
V = State.variables;
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 4b908f7733c..986c0315c51 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1114,7 +1114,7 @@
/*SFVAR*/
<<if ndef $SF>>
<<if $securityForceEventSeen < 1>> <<set $securityForceActive = -1>> <<else>> <<set $securityForceActive = 2>> <</if>>
-
+
<<set $SF = {Toggle:$SFMODToggle, Active:$securityForceActive}>>
<<unset $SFMODToggle, $securityForceActive, $securityForceCreate, $securityForceEventSeen>>
<<if ndef $securityForceName>><<set $securityForceName = "the special force">><</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 00a1403b40a..84d95c16610 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5320,7 +5320,7 @@
<</if>>
<<else>>
<<if $slaves[$i].balls > 2>>
- $His balls have been relocated to $his abdomen, and while they still work there, it's not where they're designed to be. Routine scans show that @@.orange;they've atrophied,@@ <<if $slaves[$i].balls > 3>>and will probably continue to do so until they stabilise at a below-average size<<else>>but are not likely to get any smaller<</if>>.
+ $His balls have been relocated to $his abdomen, and while they still work there, it's not where they're designed to be. Routine scans show that @@.orange;they've atrophied,@@ <<if $slaves[$i].balls > 3>>and will probably continue to do so until they stabilize at a below-average size<<else>>but are not likely to get any smaller<</if>>.
<<set $slaves[$i].balls -= 1>>
<</if>>
<</if>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index a6bd23cf0ad..4c1216d4604 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -690,7 +690,7 @@
<<widget "Sh">>$ShEnunciate<</widget>>
<<widget "x">>$xEnunciate<</widget>>
-/*
+/*
If $args[0] is defined, it is assumed the primary slave is speaking about secondary slave. Else, the secondary slave is speaking about primary slave.
This means that <<he>> will print _heLisp or $he, and <<he 2>> will print _he2Lisp or _he2.
Pronouns must be set for both slaves, and <<setSpokenLocalPronouns primarySlave secondarySlave>> must be previously called.
--
GitLab