diff --git a/src/002-config/fc-js-init.js b/src/002-config/fc-js-init.js index db6fa2d707a9b7db2146d4b5cd9f65e8c04a336b..b239c2b821ecbe06bb17f56495f8a3baca73accf 100644 --- a/src/002-config/fc-js-init.js +++ b/src/002-config/fc-js-init.js @@ -16,7 +16,7 @@ App.UI.View = {}; App.Utils = {}; App.Interact = {}; App.Desc = {}; -App.ExtendedFamily = {}; +App.ExtendedFamily = {}; // only occurance of "ExtendedFamily" in whole project App.Facilities = { Brothel: {}, Club: {}, diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js index c37052e138b0cac7ee5820dcf390a34918e25fb8..66fa8dce51a01b3a5adda1a9c7185434e188f2ee 100644 --- a/src/SpecialForce/SpecialForce.js +++ b/src/SpecialForce/SpecialForce.js @@ -2152,7 +2152,7 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100, text = `\n`) return text; } else if (input === 'BadOutcome') { V.arcologies[0].prosperity -= 50; - cashX(-V.Cash * 0.25, "specialForces"); + cashX(-V.cash * 0.25, "specialForces"); let r = ``, BadOutcome = ''; if (V.rep > 17500) { @@ -2649,7 +2649,7 @@ App.SF.AAR = function(endWeekCall = 1) { App.SF.Count = function() { const V = State.variables, T = State.temporary, - C = Math.clamp, + C = Math.clamp, // sure that's correct? S = V.SF.Squad, E = V.economy; T.FU = 10; diff --git a/src/debugging/debugJS.js b/src/debugging/debugJS.js index c189e30b7cc3358f688d374889a9d0b8ab7b9003..6b8110b7a06ef57f3de857ed2fea157d267d6e4c 100644 --- a/src/debugging/debugJS.js +++ b/src/debugging/debugJS.js @@ -87,6 +87,7 @@ window.findNaN = function findNan() { return result; }; +/* no-usedOnce*/ /** * Dumps game save as a readable JSON to the browser for saving in a file */ diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js index 73357920f34c832bbda147ca77bc40254d865498..980f38f9dace908b136302026c1718a37b4ff5a4 100644 --- a/src/endWeek/saChoosesOwnClothes.js +++ b/src/endWeek/saChoosesOwnClothes.js @@ -623,7 +623,7 @@ window.saChoosesOwnClothes = (function() { wardrobeFS.push({text: `and coats ${his} assets in body oil to give them some extra shine.`, clothes: "body oil"}); } } - if (V.arcologies[0].FSAssetExpansioninst > 0) { + if (V.arcologies[0].FSAssetExpansionist > 0) { wardrobeFS.push({text: `and decides to dress up like a young man's wet dream.`, clothes: "a succubus outfit"}); wardrobeFS.push({text: `and decides to wear a skimpy bikini to make ${his} assets look even larger.`, clothes: "a string bikini"}); wardrobeFS.push({text: `and decides to throw together a slutty outfit that highlight ${his} assets.`, clothes: "a slutty outfit"}); diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index 75b64a10d38478124b500ff956e14d2a06ef4423..ecf0c783761c982c5fd8bc753429df825b902e98 100644 --- a/src/endWeek/saWorkTheFarm.js +++ b/src/endWeek/saWorkTheFarm.js @@ -109,7 +109,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) { // Open FS Subsection if (arcology.FSSupremacist !== "unset") { - if (slave.race === arcology.FFSupremacistRace) { + if (slave.race === arcology.FSSupremacistRace) { t += `Society <span class="red">disapproves</span> of your allowing a member of the elite race to be degraded in such a fashion, and thus ${he} didn't earn as much. `; } } diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index fabe80df7a936194dce5a37e6dad0b5491ba46af..3ed9afcd0f5467b48e73c95b87e6dc3bc0812e45 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -230,7 +230,7 @@ You should have received a copy of the GNU General Public License along with thi <<set $cash = 0>> <<set $cashLastWeek = 0>> <<run cashX(10000, "personalBusiness")>> - <<set $normalizedEvents = 0>> + /*<<set $normalizedEvents = 0>>*/ /* commented out everywhere */ <<set $autosave = 1>> <<set $useFSNames = 1>> <<set $seeDetails = 1>> diff --git a/src/js/accordianJS.js b/src/js/accordianJS.js index f65b7d736a4efbe0f5d739b5043cea6e39cc8cb9..9c6ae8a420ec9c37c99f796c9eb80070228a642d 100644 --- a/src/js/accordianJS.js +++ b/src/js/accordianJS.js @@ -1,4 +1,5 @@ /* Accordion 000-250-006 */ +/* no-usedOnce */ /* * We're making changes to the DOM, so we need to make them *after* everything has been generated diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js index 905d4f8bd54f621d037ba1ce660a413c28180391..26a682ce96611eec7462f565ab278dd58245d238 100644 --- a/src/js/slaveStatsChecker.js +++ b/src/js/slaveStatsChecker.js @@ -607,11 +607,11 @@ window.tooBigBelly = function (slave) { window.tooBigBalls = function (slave) { if (!slave) { return null; - } else if (slave.balls >= 30 + (slave.muscles * .3) && slave.physicalAge <= 3) { + } else if (slave.balls >= 30 + (slave.muscles * 0.3) && slave.physicalAge <= 3) { return true; - } else if (slave.balls >= 60 + (slave.muscles * .5) && slave.physicalAge <= 12) { + } else if (slave.balls >= 60 + (slave.muscles * 0.5) && slave.physicalAge <= 12) { return true; - } else if (slave.balls >= 90 + (slave.muscles * .7)) { + } else if (slave.balls >= 90 + (slave.muscles * 0.7)) { return true; } return false; @@ -624,11 +624,11 @@ window.tooBigBalls = function (slave) { window.tooBigDick = function (slave) { if (!slave) { return null; - } else if (slave.dick >= 20 + (slave.muscles * .1) && slave.physicalAge <= 3 && slave.dick !== 0) { + } else if (slave.dick >= 20 + (slave.muscles * 0.1) && slave.physicalAge <= 3 && slave.dick !== 0) { return true; - } else if (slave.dick >= 45 + (slave.muscles * .3) && slave.physicalAge <= 12) { + } else if (slave.dick >= 45 + (slave.muscles * 0.3) && slave.physicalAge <= 12) { return true; - } else if (slave.dick >= 68 + (slave.muscles * .4)) { + } else if (slave.dick >= 68 + (slave.muscles * 0.4)) { return true; } return false; diff --git a/src/js/vignettes.js b/src/js/vignettes.js index 6d838de1586d3deff3439e9a76711be29482a0c6..734f7747dc6a1429b0779c3c27428739bf940eba 100644 --- a/src/js/vignettes.js +++ b/src/js/vignettes.js @@ -1533,7 +1533,7 @@ window.GetVignette = function GetVignette(slave) { effect: 1, }); } - if (V.arcologies[0].FSEgyptianRevivalistRevivalist !== "unset") { + if (V.arcologies[0].FSEgyptianRevivalist !== "unset") { vignettes.push({ text: `a street preacher arguing that your new religion was the natural theological evolution of Egyptian mythology attracted a large crowd near ${him},`, type: "cash", diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js index 8449634dbeb4bea2fb66a102f8ea4cf16919b235..3a0d06b51e201013dd78152d884de67b7f1a5746 100644 --- a/src/js/walkPastJS.js +++ b/src/js/walkPastJS.js @@ -85,7 +85,7 @@ window.loverSlave = function(activeSlave) { t += `${name} and ${partnerName} are `; if (!isSlaveAvailable(_partnerSlave)) { - if (_partnerSlave.assignment === "work in the dairy" && V.DairyRestraintsSetting >= 2) { + if (_partnerSlave.assignment === "work in the dairy" && V.dairyRestraintsSetting >= 2) { t += `trying their best to maintain their relationship with ${partnerName} being part of ${V.dairyName}.`; } else if (_partnerSlave.assignment === "be your agent") { t += `catching up with each other over a video call. Running an arcology in your stead comes with its perks.`; diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw index ddf25fa552051b9d046fa86c053be43220f92524..f4835c104b6b821875c905d01e50fb03048b81d2 100644 --- a/src/pregmod/seFCTVshows.tw +++ b/src/pregmod/seFCTVshows.tw @@ -468,7 +468,7 @@ <<set $activeSlave.prostate = 2>> <<set $activeSlave.skill.oral = random(30,60)>> <<set $activeSlave.skill.anal = random(20,50)>> - <<set $activeSlave.skill.whorng = random(0,25)>> + <<set $activeSlave.skill.whoring = random(0,25)>> <<set $activeSlave.devotion = random(50,80)>> <<set $activeSlave.trust = random(50,80)>> <<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">> diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw index c5991b8793d6c6ac11a46c58f920f4e70796dc74..1d64749edf310c386ec39eb9561b67e5b2278d61 100644 --- a/src/uncategorized/neighborsFSAdoption.tw +++ b/src/uncategorized/neighborsFSAdoption.tw @@ -415,7 +415,7 @@ societal development. <<if $familyTesting == 1>> <<set _lover = $slaves.find(function(s) { return s.ID == $leaders[$j].relationshipTarget && areRelated(s, $leaders[$j]) && s.assignment == "live with your agent"; })>> <<else>> - <<set _lover = $slaves.find(function(s) { return s.ID == $leaders[$j].relationshipTarget && s.ID == $leaders[$j].relationTaget && s.assignment == "live with your agent"; })>> + <<set _lover = $slaves.find(function(s) { return s.ID == $leaders[$j].relationshipTarget && s.ID == $leaders[$j].relationTarget && s.assignment == "live with your agent"; })>> <</if>> <<if ($leaders[$j].behavioralQuirk == "sinful" || $leaders[$j].sexualQuirk == "perverted") && def _lover>> Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Incest Festishism,@@ to share the love and joy $he holds with $his relativeTerm($leaders[$j], _lover). @@ -1030,7 +1030,7 @@ societal development. <<set $arcologies[$i].FSAssetExpansionist = 5>><<set _adopted = 1>> <</if>> <<case 13>> - <<if ($arcologies[$i].FSPastoralist == "unset") && ($arcologies[$i].FScummunism == "unset")>> + <<if ($arcologies[$i].FSPastoralist == "unset") && ($arcologies[$i].FSCummunism == "unset")>> $desc addicted to breast milk straight from the nipple, leading the arcology to @@.yellow;adopt Pastoralism.@@ <<set $arcologies[$i].FSPastoralist = 5>><<set _adopted = 1>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index d0bea50f717f07043e8258f5535ac7df91c25e62..40ef8419650d82b510fba127e2507db12e9f88b3 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -8151,9 +8151,9 @@ <</if>> /* pregmod */ -<<if ($slaves[$i].scarheal == 5)>> +<<if ($slaves[$i].scarheal == 5)>> /* scarheal is wrong */ $slaves[$i].slaveName's wound has @@.green;healed@@ leaving a big scar. It is still @@.red;quite ugly@@ but doesn't hurt anymore. - <<set $slaves[$i].scars -= 1>> + <<set $slaves[$i].scars -= 1>> /* -1 doesn't exist according to slave documentation */ <</if>> /* LANGUAGE */ diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw index 64ff05776a9ab0986ad8aa6dff53bae68a421b47..1df728afd760d4930324c9912271957c341e4afe 100644 --- a/src/uncategorized/saRelationships.tw +++ b/src/uncategorized/saRelationships.tw @@ -1146,7 +1146,7 @@ <<run repX($FSSingleSlaveRep * ($arcologies[0].FSChattelReligionist / $FSLockinLevel), "SlaveRelationships", _SlaveI)>> <</if>> <</switch>> - <<if _SlaveI.relationShip > 0>> /* catch should $he change her relationship status */ + <<if _SlaveI.relationship > 0>> /* catch should $he change her relationship status */ <<if _SlaveI.devotion <= 95>> <<if _SlaveI.devotion != _SlaveJ.devotion>> _SlaveI.slaveName absorbs <<if _SlaveI.relationship == 1>>a touch of $his friend<<elseif _SlaveI.relationship == 2>>a little of $his best friend<<elseif _SlaveI.relationship == 3>>some of $his close friend<<elseif _SlaveI.relationship == 4>>a lot of $his lover<<else>>much of $his wife<</if>>'s diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw index 14c04dcfeb7ccc3e061773a446798e5534acc50c..2e1df9d95e1e687ec679504c207bc8479bbb34ce 100644 --- a/src/uncategorized/slaveShelter.tw +++ b/src/uncategorized/slaveShelter.tw @@ -214,7 +214,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is <<if $shelterSlave.vagina > -1>> <<set $shelterSlave.vagina = random(1,4)>> <<set $shelterSlave.skill.vaginal = random(10,25)>> - <<set $shelterSlave.vaginalTat = either("degradation", "rude words", 0)>> + <<set $shelterSlave.vaginaTat = either("degradation", "rude words", 0)>> <</if>> <<if $shelterSlave.dick > 1>> <<set $shelterSlave.dickTat = either("degradation", "rude words", 0)>> diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw index 38b87be0742ce96977a9fd5cfbd687b918ff1a81..0612cff00566b1dc9ff589efa15c4695bfd35e21 100644 --- a/src/uncategorized/slaveStats.tw +++ b/src/uncategorized/slaveStats.tw @@ -189,7 +189,7 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden <br>broodmotherOnHold: $activeSlave.broodmotherOnHold <br>broodmotherCountDown: $activeSlave.broodmotherCountDown <br>labor: $activeSlave.labor -<br>births: $activeSlave.counter.birth +<br>births: $activeSlave.counter.births <br>laborCount: $activeSlave.counter.laborCount <br>cSec: $activeSlave.cSec <br>bellyAccessory: $activeSlave.bellyAccessory