diff --git a/sanityCheck.sh b/sanityCheck.sh index fdd47e13ad1c733267aba4754d671bd7c772f64d..41fd769c6080ebdeecdf579bdfe98763ac9bc1c0 100755 --- a/sanityCheck.sh +++ b/sanityCheck.sh @@ -122,11 +122,13 @@ $GREP "@@[a-z]\+;" -- 'src/*' | myprint "SelectorMissingDot" # Check for </span>. instead of .</span> $GREP -E "</span>(\.|,|;|:)\s" -- src/*.js | myprint "WrongSelectorPunctuation" # Check for missing whitespace between operators -#$GREP -E "\(.(\+|\-|\*|\/|\=)." -- src/*.js :^src/001-lib/Jquery.js,^src/js/dTree.min.js,^devTools/tweeGo/storyFormats/sugarcube-2/format.js,^src/001-lib/mousetrap.js | myprint "MissingWhitespace" +#$GREP -E "\(.(\+|\-|\*|\/|\=)." -- src/*.js :^src/001-lib/Jquery.js,^src/js/dTree.min.js,^devTools/tweeGo/storyFormats/sugarcube-2/format.js,^src/001-lib/mousetrap.js | myprint "MissingWhitespace" disabled until I can figure out how to exclude files # Check for @@ selector instead of <span> selector $GREP "@@\." -- src/*.js | myprint "WrongSelectorUsed" # Check for JSdoc inside function declaration -$GREP -e ".\=.\/\*\*" --or -e "slave\s\*\/" -- src/*.js :^src/interaction/main/mainLinks.js | myprint "WrongJSdocFormat" +$GREP -e ".\=.\/\*\*" --or -e "slave\s\*\/" -- src/*.js --exclude 'src/interaction/main/mainLinks.js' | myprint "WrongJSdocFormat" +# Check for missing whitespace at end of /**/ style comments +#$GREP "\S\*\/" -- src/* --exclude 'src/001-lib/jquery/Jquery.js' | myprint "MissingWhitespace" disabled until I can figure out to exclude files # Check that we do not have any variables that we use only once. e.g. $onlyUsedOnce # Ignore *Nationalities diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js index e083976cb1aed71705de1fa4c577ce30ca44e0c6..59ef13fde77a521845e77f95f4013de7c76d40a0 100644 --- a/src/SpecialForce/SpecialForce.js +++ b/src/SpecialForce/SpecialForce.js @@ -1,4 +1,4 @@ -// V=SugarCube.State.variables, T=SugarCube.State.temporary; +// V=SugarCube.State.variables, T=SugarCube.State.temporary; TODO: remove this line? window.Main = function () { const V = State.variables; V.SF = { diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js index b65dea195534ec1d0a1364f8e76849d021d26ae1..01250216326354439fdc895b412d95db84c7b2cb 100644 --- a/src/js/generateNewSlaveJS.js +++ b/src/js/generateNewSlaveJS.js @@ -1,3 +1,4 @@ +/* eslint-disable camelcase */ /* eslint-disable no-undef */ window.GenerateNewSlave = (function() { "use strict"; @@ -1198,7 +1199,7 @@ window.GenerateNewSlave = (function() { slave.visualAge = slave.actualAge; slave.physicalAge = slave.actualAge; slave.ovaryAge = slave.actualAge; - slave.age = slave.actualAge; /*compatibility*/ + slave.age = slave.actualAge; /* compatibility */ slave.pubertyAgeXX = V.fertilityAge; slave.pubertyAgeXY = V.potencyAge; } diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 46c5eebe450377b4f95db17f8f0ca71f815ebc80..9953d986961682378533024404c692e64102bb52 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -2256,7 +2256,7 @@ <<set $activeSlave.skill.vaginal = 0>> <<set $activeSlave.skill.oral = 0>> <<set $activeSlave.skill.anal = 0>> - <<set $activeSlaveing = 0>> + <<set $activeSlaveing = 0>> /* TODO: causing errors in sanityCheck */ <<set $activeSlave.skill.entertainment = 0>> <<set $activeSlave.skill.combat = 0>> <<set $activeSlave.pubicHStyle = "waxed">>