diff --git a/devNotes/twine CSS b/devNotes/twine CSS index 441e5eb416c3b1c1ea56acdec8cd068c75e032a9..c4958e7d1280c5ea63369c3f73d8675b425fb6a1 100644 --- a/devNotes/twine CSS +++ b/devNotes/twine CSS @@ -629,8 +629,8 @@ body.lightTheme .optionMacroSelected { /* Last line shouldn't grow */ #passage-wardrobe-use .optionValue::after { - flex-grow: 1000000000; - content: ''; + flex-grow: 1000000000; + content: ''; } diff --git a/devTools/check.py b/devTools/check.py index d1f009e00df4c127c09efdd79730c9801ce0dde2..07cee14ca24984aae9b1ae177b7a2253d85d8299 100755 --- a/devTools/check.py +++ b/devTools/check.py @@ -71,6 +71,6 @@ try: tagfound = [] except UnicodeDecodeError as e: myprint(e) - print(" Hint: In linux, you can get more details about unicode errors by running:") + print(" Hint: In Linux, you can get more details about Unicode errors by running:") print(" isutf8", fileinput.filename()) print(" :Note it might be caused by ", filename) diff --git a/devTools/javaSanityCheck/src/element/BracketElement.java b/devTools/javaSanityCheck/src/element/BracketElement.java index b9848941653e6cb3715e60ac7342a1d087e0ebba..89b0a67ef6a1e031fd4ae0e29808c9d11b8ce33e 100644 --- a/devTools/javaSanityCheck/src/element/BracketElement.java +++ b/devTools/javaSanityCheck/src/element/BracketElement.java @@ -6,23 +6,23 @@ import org.arkerthan.sanityCheck.SyntaxError; * @author Arkerthan */ public class BracketElement extends Element { - //int state = 0; + //int state = 0; - public BracketElement(int line, int pos) { - super(line, pos); - } + public BracketElement(int line, int pos) { + super(line, pos); + } - @Override - public int handleChar(char c) throws SyntaxError { - if (c == ')') { - return 2; - } else { - return 0; - } - } + @Override + public int handleChar(char c) throws SyntaxError { + if (c == ')') { + return 2; + } else { + return 0; + } + } - @Override - public String getShortDescription() { - return getPositionAsString() + " (???"; - } + @Override + public String getShortDescription() { + return getPositionAsString() + " (???"; + } } diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt index fabe9f727c8c985d3639b5176b95d59e88b1715d..fd738724ae3fe01aadbdc3fb6d073cca9e350d8f 100644 --- a/player variables documentation - Pregmod.txt +++ b/player variables documentation - Pregmod.txt @@ -68,7 +68,7 @@ Do you know you are pregnant (currently unused due to lack of menstrual cycle) 0 - no 1 - yes -fertKnown: +fertKnown: Menstrual cycle known variable. To be used for fert cycle discover and things like pregnancy without a first period diff --git a/sanityCheck.sh b/sanityCheck.sh index e1f9d84c281d02b4474ceb9338a132cc70692ae7..64f908ff52c0ec800f1c0c68ecdbc4c0cb9ec1e2 100755 --- a/sanityCheck.sh +++ b/sanityCheck.sh @@ -116,7 +116,7 @@ $GREP 'elseif $ ' -- 'src/*' | myprint "missing ; before statement" $GREP "[^]a-zA-Z0-9 \")}'+-\*\`] *>>" -- 'src/*' | myprint "StrangeCharacterAtEndOfCommand" # Check for a . inside a <<>> $GREP "<<[a-zA-Z]\([^\"'>]\|[^\"'>]>[^\"'>]\)*[a-zA-Z][.][^a-zA-Z]" | myprint "StrangeCharacterAfterDot" -# Check for @@. instead of .@@ +# Check for @@. instead of .@@ $GREP -E "@@(\.|,|;|:)\s" -- src/*.tw | myprint "WrongSelectorPunctuation" $GREP "@@[a-z]\+;" -- 'src/*' | myprint "SelectorMissingDot" diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 3d7aa55b0e077d5ba2fa79ff22549f56d61c92cc..6cb3faa5285febddecd0c19a173d4477104c9566 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -1881,7 +1881,7 @@ readyOva: Number of ready to be impregnated ova (override normal cases), default - 0. For delayed impregnations with multiples. Used onetime on next call of the SetPregType widget. After SetPregType use it to override .pregType, it set back to 0 automatically. -fertKnown: +fertKnown: Menstrual cycle known variable. To be used for fert cycle discover and things like pregnancy without a first period diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js index ed48735bad97416fc1b9e717b0f9cd04fecf638a..8345f314899cd5ff53543a1d8e0fb7e2c4231498 100644 --- a/src/SpecialForce/SpecialForce.js +++ b/src/SpecialForce/SpecialForce.js @@ -724,7 +724,7 @@ window.UnitText = function(input) { switch(input) { case 'firebase': if (S.Firebase >= 0) { const text0 = `<br>''Firebase:''`; - if (S.Firebase >= 1) appear = `has had some organization put into it.`; barracks = `The majority of weapons, armor, and ammunition have been separated from the soldiers' cots into their own armory.`; garage = `A section near the outer wall of the arcology has been converted to a garage with an adjoining vehicle maintenance bay`; drone = `.`; if (V.terrain === "oceanic") garage += ` for inter-arcology travel`; + if (S.Firebase >= 1) appear = `has had some organization put into it.`; barracks = `The majority of weapons, armor, and ammunition have been separated from the soldiers' cots into their own armory.`; garage = `A section near the outer wall of the arcology has been converted to a garage with an adjoining vehicle maintenance bay`; drone = `.`; if (V.terrain === "oceanic") garage += ` for inter-arcology travel`; if (S.Firebase >= 2) barracks = `A barracks has been constructed near the armory, allowing soldiers a quieter place to sleep and store their personal spoils.`; drone = `; as well as a facility for the storage, maintenance, and deployment of armed combat drones.`; if (S.Firebase >= 3) appear = `has become more permanent.`; barracks = `A command center has been constructed near the barracks and armory, allowing for additional support personnel.`; if (S.Firebase >= 4) hangar = `Hangar space for storing and repairing aircraft has been converted from unused space on the other side of the garage.`; diff --git a/src/gui/css/wardrobeUse.css b/src/gui/css/wardrobeUse.css index 3ac2e643af9ecbf4f2a364a08730c0fb0351cfde..5473c4a0862a4c3d2d65d54bc3cc36ab81dc23b6 100644 --- a/src/gui/css/wardrobeUse.css +++ b/src/gui/css/wardrobeUse.css @@ -19,6 +19,6 @@ /* Last line shouldn't grow */ #passage-wardrobe-use .optionValue::after { - flex-grow: 1000000000; - content: ''; + flex-grow: 1000000000; + content: ''; } diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js index bbfe369e411dae61084a5dd8c70f3723014a4cf7..6812e51f7ab6c9c7d4cd950f4cc19eadb9e962ee 100644 --- a/src/interaction/main/mainLinks.js +++ b/src/interaction/main/mainLinks.js @@ -149,7 +149,7 @@ App.UI.View.MainLinks = function() { r += 'are'; } else { r += 'is'; - } + } r += ' ready to be implanted.</span>'; } } diff --git a/src/interaction/main/useGuard.js b/src/interaction/main/useGuard.js index 163dc22b62c767ae656f9cfd4903c35ec96d88c3..c5eba9ec0b08a3dc81309fad3bc45479cb8fd2f7 100644 --- a/src/interaction/main/useGuard.js +++ b/src/interaction/main/useGuard.js @@ -14,7 +14,7 @@ App.Interact.UseGuard = function(slave) { let He = capFirstChar(he); let His = capFirstChar(his); /* eslint-enable */ - + r = `${slave.slaveName} is standing behind your left shoulder, guarding your person. `; switch (slave.clothes) { case "attractive lingerie": diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index 22696073c0033b4bc8a0688621cd5437f00f1c88..3e5e8b1448ded1cc369b79c17a23da020a4ff3d8 100644 --- a/src/js/SlaveState.js +++ b/src/js/SlaveState.js @@ -1613,7 +1613,8 @@ App.Entity.SlaveState = class SlaveState { */ this.clothes = "no clothing"; /** - * may accept strings, use at own risk "none" + * may accept strings, use at own risk + * * "none" * * "ancient Egyptian" * * "cruel retirement counter" * * "uncomfortable leather" @@ -2321,7 +2322,7 @@ App.Entity.SlaveState = class SlaveState { static makeSkeleton() { return { porn: { - fame: { } + fame: { } }, skill: { }, }; diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index eb1058eff1ac6ea21211d065c7377be04251644b..4a471bb83ddd71e203d96ac43060ef984b7eabae 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -1,7 +1,7 @@ App.Desc.eyes = /** - * @param {App.Entity.SlaveState} slave - * @return {string} Slave's eyes + * @param {App.Entity.SlaveState} slave + * @return {string} Slave's eyes */ function (slave) { "use strict"; @@ -649,7 +649,7 @@ function (slave) { } App.Desc.brand = -/** +/** * @param {App.Entity.SlaveState} slave * @returns {string} Slave's brand */ diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index e16f4a4ff9cd0b162959febfe05720ee6175a1c7..8118682263bfde2dcf919590ba81280cdc4df63f 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -1966,7 +1966,7 @@ window.SlaveSummaryUncached = (function() { r += `<span class="pink">NBP</span>`; } if (slave.anus === 0) { - r += ` <span class="lime">AV</span>`; + r += ` <span class="lime">AV</span>`; } r += `<span class="pink">`; if ((slave.vagina > 3) && (slave.anus > 3)) { diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index 874da2f5020545c23cc2a58b9def08af8a5325ed..a91108f02c53f07ff5b68d524bf5c6e8a877af3b 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -746,7 +746,7 @@ __You are customizing this slave:__ <<option "very fair" "Very Fair">> <<option "fair" "Fair">> <<option "light" "Light">> - <<option "light olive" "Light Olive">> + <<option "light olive" "Light Olive">> <<option "tan" "Tan">> <<option "olive" "Olive">> <<option "bronze" "Bronze">> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 2aeb27d1a3f6b959810d2fdc30d5ef4a12222bc2..b91bf4463ddd290d051804f7d86ed2909653a5c0 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -14238,7 +14238,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <</if>> thighs quivering a little from supporting $his body in its perch atop the machine, and from the fullness of $his anus. <<= AnalVCheck(3)>> - $He knows this is going to be challenging, and is breathing deeply, doing $his best to stay relaxed. You cannot resist slapping your <<if $PC.dick == 1>>big cock lightly<<else>>lubricated strap-on<</if>> against $his cheek, producing a groan of apprehension. + $He knows this is going to be challenging, and is breathing deeply, doing $his best to stay relaxed. You cannot resist slapping your <<if $PC.dick == 1>>big cock lightly<<else>>lubricated strap-on<</if>> against $his cheek, producing a groan of apprehension. <br><br> You push $him gently backward, letting $him get accustomed to the new angle.<<if $activeSlave.boobs > 2000>> $His monstrous tits spread to either side of $his <<if $activeSlave.belly >= 5000>>_belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<<else>>now upright torso<</if>>, and you take a moment to play with them as $he prepares $himself.<</if>> <<if canDoVaginal($activeSlave)>> diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index 3dfe357eb9594c13d9e593c51a9492c84c28844d..b2ceef8760c28fc4760f0f9531eb81e1951e97e0 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -417,7 +417,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>> <</if>> <<if $corpDivArcade > 0>> - <br>Sex Arcade: The division is exploiting @@.green;$corpDivArcadeSlaves slaves.@@ <<if _corpDivArcadeProc > 0>>During operations <<if _corpDivArcadeProc > 1>>@@.red;_corpDivArcadeProc slaves@@<<else>>@@.green;one slave@@<</if>> wore out.<</if>> + <br>Sex Arcade: The division is exploiting @@.green;$corpDivArcadeSlaves slaves.@@ <<if _corpDivArcadeProc > 0>>During operations <<if _corpDivArcadeProc > 1>>@@.red;_corpDivArcadeProc slaves@@<<else>>@@.green;one slave@@<</if>> wore out.<</if>> It earned @@.yellowgreen;<<print cashFormat(_corpDivArcadeRev)>>@@ in revenue. <<if $corpDivArcadeFromMarket == 1 && _corpDivArcadeSlavesRoom > 0>> It replenished its slave stock and bought <<print _corpDivArcadeSlavesRoom>> fresh slaves from the market. @@ -450,7 +450,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>> <</if>> <<if $corpDivWhore > 0>> - <br>Escort Service: The division is whoring out @@.green;$corpDivWhoreSlaves slaves.@@ <<if _corpDivWhoreProc > 0>>During operations <<if _corpDivWhoreProc > 1>>@@.red;_corpDivWhoreProc slaves@@<<else>>@@.green;one slave@@<</if>> lost their appeal.<</if>> + <br>Escort Service: The division is whoring out @@.green;$corpDivWhoreSlaves slaves.@@ <<if _corpDivWhoreProc > 0>>During operations <<if _corpDivWhoreProc > 1>>@@.red;_corpDivWhoreProc slaves@@<<else>>@@.green;one slave@@<</if>> lost their appeal.<</if>> It earned @@.yellowgreen;<<print cashFormat(_corpDivWhoreRev)>>@@ in revenue. <<if $corpDivWhoreFromMarket == 1 && $corpDivTrainSurgerySwitch > 0 && _corpDivWhoreSlavesRoom > 0>> It replenished its slave stock and bought <<print _corpDivWhoreSlavesRoom>> trained whores from the market.