diff --git a/compile b/compile index d44d129ab69d49563aebeec6f894f4e42b013f7a..c9bb6c0cd576c3111a246d3985f774f3c7670586 100755 --- a/compile +++ b/compile @@ -66,3 +66,6 @@ fi #Make the output prettier, replacing \t with a tab and \n with a newline sed -i -e '/^.*<div id="store-area".*$/s/\\t/\t/g' -e '/^.*<div id="store-area".*$/s/\\n/\n/g' bin/FC_pregmod_tmp.html \ && mv bin/FC_pregmod_tmp.html bin/FC_pregmod.html + +echo "bin/FC_pregmod.html compilation finished." + diff --git a/compile-git b/compile-git index 92331b4916db9a0906e43e383916518ab689f2e5..43304f9a1090397b866dd284c853f9b6a80502ad 100755 --- a/compile-git +++ b/compile-git @@ -41,4 +41,4 @@ $TWEEGO_EXE -o "bin/FC_pregmod_${HASH}_tmp.html" src/ sed -i -e '/^<div id="store-area".*$/s/\\t/\t/g' -e '/^<div id="store-area".*$/s/\\n/\n/g' "bin/FC_pregmod_${HASH}_tmp.html" \ && mv "bin/FC_pregmod_${HASH}_tmp.html" "bin/FC_pregmod_${HASH}.html" -echo "FC_pregmod_$HASH.html compilation finished." +echo "bin/FC_pregmod_$HASH.html compilation finished." diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw index e1aaa7b15af009ee9869d00b0b82262811cd2770..b687b53da20f5270e3a0a6b563c6f9a7c5aa9338 100644 --- a/src/SpecialForce/Upgrades.tw +++ b/src/SpecialForce/Upgrades.tw @@ -1,5 +1,5 @@ :: Upgrades [nobr] - <br><br> <<if $SF.Size !== _max>> Total upgrade progress: <<print progress($SF.Size,_max)>> $SF.Size/_max(<<print ($SF.Size/_max).toFixed(2)>>%) <<if $SF.Size < 30>><br>//<<print (30-$SF.Size )>> more upgrades is needed untill the next tier unlocks.//<</if>> + <br><br> <<if $SF.Size !== _max>> Total upgrade progress: <<print progress($SF.Size,_max)>> $SF.Size/_max(<<print ($SF.Size/_max).toFixed(2)>>%) <<if $SF.Size < 30>><br>//<<print (30-$SF.Size )>> more upgrades is needed until the next tier unlocks.//<</if>> <<else>>There are no more upgrades available.<</if>> <<if $SF.Upgrade > 0 && ($SF.Size !== _max)>> <<set _cost = Math.ceil(Math.abs($cash*.05*(1.25+($SF.Size/1000))))>> diff --git a/src/facilities/farmyard/futureAnimals.tw b/src/facilities/farmyard/futureAnimals.tw index dac46ad0138ac862ffc280ee6fd008d5174e2373..aa19e9d14c7a7552bc445e36ba69a88273361601 100644 --- a/src/facilities/farmyard/futureAnimals.tw +++ b/src/facilities/farmyard/futureAnimals.tw @@ -1,6 +1,6 @@ /* Putting them here because commenting them out was breaking for some reason */ -<<if $animalsBought.germanShepherds == 0>> + <<if $animalsBought.germanShepherds == 0>> <<link "Purchase German Shepherds" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.germanShepherds = 1, $animalsBought.canines += 1, $canines.push("German Shepherds")>><</link>> <br> <<elseif $animalsBought.germanShepherds == 1>> @@ -108,7 +108,6 @@ <</if>> <br> <</if>> -<</if>> @@ -237,7 +236,6 @@ <br> <</if>> <</if>> -<</if>> @@ -367,4 +365,4 @@ //Set as active feline// <</if>> <br> - <</if>> \ No newline at end of file + <</if>> diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw index 78449006c71ef6d6c5753beb58d866e9c3b713cb..c69071588e1d848fc05799662b5dc08b7dacc03c 100644 --- a/src/facilities/nursery/childSummary.tw +++ b/src/facilities/nursery/childSummary.tw @@ -95,10 +95,6 @@ <<switch _Pass>> <<case "Main">> - <<if $useSlaveSummaryTabs == 1>> - <<if $childAssignmentTab == "overview">> - <</if>> - <<if (_Child.choosesOwnClothes == 1) && (_Child.clothes == "choosing her own clothes")>> <<set _oldDevotion = _Child.devotion>> <<set _chosenClothes = saChoosesOwnClothes(_Child)>> diff --git a/src/interaction/cyberConfig.tw b/src/interaction/cyberConfig.tw index 3c327fc67cc1dcab062c4f93feb7db5b38940b80..eacceaf73b8e5ed7146bd85b92e3be3fa92335d1 100644 --- a/src/interaction/cyberConfig.tw +++ b/src/interaction/cyberConfig.tw @@ -157,7 +157,7 @@ <<if $stockpile.sexPTail > 0>>| [[Attach Pleasure Tail|cyberConfig][$temp = 8, $activeSlave.tail = "sex", $activeSlave.tailColor = "pink", $stockpile.sexPTail -= 1]]<</if>> <</if>> <<else>> - $He does not have a neural tail interface installed so you can not attach a tail. + $He does not have a neural tail interface installed so you cannot attach a tail. <</if>> <<if $activeSlave.tail == "mod">><br> $He currently has a modular tail, styled to look like diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw index b952e9b8177fddd9132b3e0ed8fe885a045eb3f5..2fbf44cfbdda9715a8bfd4320a02313d3ab6cbe1 100644 --- a/src/uncategorized/costsWidgets.tw +++ b/src/uncategorized/costsWidgets.tw @@ -414,7 +414,7 @@ You bought $him for: @@.red;<<print cashFormat($args[0].slaveCost)>>@@. <<set _Cost = $args[0].slaveCost>> <<elseif $args[0].slaveCost == 0>> - You spent nothing to aquire $him. + You spent nothing to acquire $him. <<set _Cost = $args[0].slaveCost>> <<else>> You have no record of how much <<if $args[0].origin != 0>>this<<else>>$he originally<</if>> cost.