diff --git a/devTools/PreCompile.sh b/devTools/PreCompile.sh index 9c426e21f76b2088f46a7442f25719b0558fd2a8..f359b36269fa495617837b45b93d10cbbd9f38d2 100755 --- a/devTools/PreCompile.sh +++ b/devTools/PreCompile.sh @@ -1,7 +1,12 @@ -#!/bin/sh U=$1 P=$2 rDir=$3 lDir=$4 repo=$5 Reqs:MEGAcmd,minify,git -mega-login $1 $2;echo 'New clone? 0:y 1:n 2:na';read Opt +#!/bin/sh +mega-login $1 $2;echo 'New clone? 0:y 1:n 2:na';read Opt #U=$1 P=$2 rDir=$3 lDir=$4 repo=$5 Reqs:MEGAcmd,git while true;do cd $4;gen=0 - if [ $Opt == 0 ];then mkdir -p $4&&git clone -q --depth 1 $5 $4&&cd $4&&if [[ ! `mega-ls $3|cut -c29-32|paste -sd,` =~ `git log|head -1|cut -c8-11` ]];then gen=1;fi #arraryCheck:stackoverflow.com/a/15394738 - elif [[ $Opt > 0||$gen < 1 ]];then git fetch -q&&if [ `git rev-list ...origin --count` -gt 0 ];then git reset -q --hard&&git pull -q&&gen=1;fi ;fi #gitCheck:stackoverflow.com/a/17192101 - if [[ $Opt > 1||$gen > 0 ]];then rm bin/*;minify -rao $4 $4&&./compile.sh -q&&cd bin/&&mv *.h* FC-pregmod-`git log -1 --format=%cd --date=format:%m-%d-%Y-%H-%M`-`git log|head -1|cut -c8-11`.html&&mega-put -c *.h* $3&&mega-rm $3`mega-ls $3|sort -r|tail -n +11`;fi + if [[ $Opt == 0 ]];then + mkdir -p $4&&git clone -q --depth 1 $5 $4&&cd $4 + if [[ ! `mega-ls $3|cut -c29-32|paste -sd,` =~ `git log|head -1|cut -c8-11` ]];then gen=1;fi #stackoverflow.com/a/15394738 + elif [[ $Opt > 0||$gen < 1 ]];then + git fetch -q + if [ `git rev-list ..origin|wc -l` -gt 0 ];then gen=1&&git pull -q;fi #stackoverflow.com/a/17192101 + fi + if [[ $Opt > 1||$gen > 0 ]];then rm bin/*;./compile.sh -q&&cd bin/&&mv *.h* FC-`git log -1 --format=%cd --date=format:%m-%d-%Y-%H-%M`-`git log|head -1|cut -c8-11`.html&&mega-put -c *.h* $3&&mega-rm $3`mega-ls GitFC/|head -n 1`;fi Opt=-1;clear;sleep 15m;done \ No newline at end of file diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw index 01b21a175f1d2aa19fc5399279bbe23b152debd8..4caa34fc4a598888858322734062596f7f2b17af 100644 --- a/src/uncategorized/personalAssistantAppearance.tw +++ b/src/uncategorized/personalAssistantAppearance.tw @@ -1676,7 +1676,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF <<if $minimumSlaveAge == 3>> _HeA's an adorable toddler wearing a cute pink dress. <<elseif $minimumSlaveAge <= 7>> - _HeA's a cute _loliA wearing tight, crotch hugging spats and a tight tub top across _hisA flat chest. + _HeA's a cute _loliA wearing tight, crotch hugging spats and a tight tube top across _hisA flat chest. <<elseif $minimumSlaveAge <= 13>> _HeA's an attractive teenager wearing short shorts and a sheer top that shows off _hisA newly grown breasts. <<else>> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 873baaefc0cc7f40e3bae268c3e6ba9ebe4ee5c9..9dac3116fe4b65b53d78af7a31d9d832dd1810f9 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -477,7 +477,7 @@ <br> <<link "Manage Personal Affairs" "Manage Personal Affairs">> <</link>> @@.cyan;[X]@@ <</if>> </span> - <<if $corpAnnounced == 1>> + <<if $corpAnnounced == 1 && _Pass !== "Manage Corporation">> <br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>> <<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>> </span> @@ -654,6 +654,7 @@ <<if $ImplantProductionUpgrade>> <br>[[Implant Manufactory|Implant Manufactory]]<</if>> <<if $geneticMappingUpgrade>> <br>[[Gene Lab|Gene Lab]]<</if>> <<elseif ["Dispensary", "Organ Farm", "Implant Manufactory", "Gene Lab", "Prosthetics Config"].includes(_Pass)>> + <br> <<if $dispensary && _Pass !== "Dispensary">> <br>[[Pharmaceutical Fabricator|Dispensary]]<</if>> <<if $organFarmUpgrade && _Pass !== "Organ Farm">> <br>[[Organ Farm|Organ Farm]]<</if>> <<if $ImplantProductionUpgrade && _Pass !== "Implant Manufactory">> <br>[[Implant Manufactory|Implant Manufactory]]<</if>>