Skip to content
Snippets Groups Projects
Commit 27095c26 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'ITTBugFixes' into 'pregmod-master' 

Build script rework and specify tier two unlock path.

See merge request pregmodfan/fc-pregmod!1467
parents 0cc90663 3c9aedbb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
devTools/AutoGitVersionUpload.sh deleted 100644 → 0
+ 0
− 17
View file @ 0cc90663
#!/bin/sh
#Requires MEGAcmd, git, mv, cd, mkidr, echo
COUNTER=0
while [ $COUNTER -ge 0 ]; do
LocalDir=~/fc-pregmod/ RemoteDir=FC-GIT U=anon@anon.anon P=13245 && mega-login $U $P
if [ $COUNTER -eq 0 ]; then mega-mkdir $RemoteDir && mega-export -a $RemoteDir && mkdir $LocalDir && git clone https://gitgud.io/pregmodfan/fc-pregmod.git $LocalDir
fi
cd $LocalDir/ && AbrevHash=`git log -n1 --abbrev-commit |grep -m1 commit | sed 's/commit //'`
if [ $COUNTER -eq 0 ]; then
echo "First run. Compliling, formatting and placing .html." && ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(date '+%F-%H-%M' --utc --date="$(git show '--format=format:%cD' HEAD)")-$AbrevHash.html" && mega-put bin/*.html $RemoteDir && echo "Compiled .html placed."
else
git pull| if [ "Already up to date" ]; then echo "No updated files, exiting." && mega-logout > /dev/null && exit
else echo "Compliling, formatting and placing .html." && ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(date '+%F-%H-%M' --utc --date="$(git show '--format=format:%cD' HEAD)")-$AbrevHash.html" && mega-put bin/*.html $RemoteDir && echo "Compiled .html placed."
fi
fi
mega-logout > /dev/null && let COUNTER=COUNTER+1 && clear && sleep 900s
done
\ No newline at end of file
devTools/AutoGitVersionUploadBackground.sh 0 → 100644
+ 15
− 0
View file @ 27095c26
#!/bin/sh
#Requires MEGAcmd, git, mv, cd, mkidr, echo
COUNTER=0
while [ $COUNTER -ge 0 ]; do LocalDir=/tmp/VZZ RemoteDir=GitHTML U=Spait1972@dayrep.com P=Spait1972@dayrep.com
if [ $COUNTER -eq 0 ]; then mega-login $U $P && mega-mkdir $RemoteDir && mega-export -a $RemoteDir && mkdir $LocalDir
git clone -q https://gitgud.io/pregmodfan/fc-pregmod.git $LocalDir
fi
cd $LocalDir/ && AbrevHash=`git log -n1 --abbrev-commit --reverse |grep -m1 commit | sed 's/commit //'`
if [ $COUNTER -eq 0 ]; then ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(date '+%F-%H-%M' --utc --date="$(git show '--format=format:%cD' HEAD)")-$AbrevHash.html" && mega-put bin/*.html $RemoteDir
fi
git pull| if [ "Already up to date" ]; then exit
elif [ ! "Already up to date" ]; then rm bin/*.html && ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(date '+%F-%H-%M' --utc --date="$(git show '--format=format:%cD' HEAD)")-$AbrevHash.html" && mega-put bin/*.html $RemoteDir
fi
let COUNTER=COUNTER+1 && mega-logout > /dev/null && sleep 300s
done
\ No newline at end of file
devTools/AutoGitVersionUploadForground.sh 0 → 100644
+ 15
− 0
View file @ 27095c26
#!/bin/sh
#Requires MEGAcmd, git, mv, cd, mkidr, echo
COUNTER=0
while [ $COUNTER -ge 0 ]; do LocalDir=~/fc-pregmod/ RemoteDir=FC-GIT U=anon@anon.anon P=13245 && mega-login $U $P
if [ $COUNTER -eq 0 ]; then mega-login $U $P && mega-mkdir $RemoteDir && mega-export -a $RemoteDir && mkdir $LocalDir
git clone -q https://gitgud.io/pregmodfan/fc-pregmod.git $LocalDir
fi
cd $LocalDir/ && AbrevHash=`git log -n1 --abbrev-commit --reverse |grep -m1 commit | sed 's/commit //'`
if [ $COUNTER -eq 0 ]; then echo "First run. Compliling, formatting and placing .html." && ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(date '+%F-%H-%M' --utc --date="$(git show '--format=format:%cD' HEAD)")-$AbrevHash.html" && mega-put bin/*.html $RemoteDir
fi
git pull| if [ "Already up to date" ]; then echo "No updated files, exiting." && mega-logout > /dev/null && exit
elif [ ! "Already up to date" ]; then echo "Compliling, formatting and placing updated .html." && rm bin/*.html && ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(date '+%F-%H-%M' --utc --date="$(git show '--format=format:%cD' HEAD)")-$AbrevHash.html" && mega-put bin/*.html $RemoteDir && echo "Updated .html placed."
fi
let COUNTER=COUNTER+1 && mega-logout > /dev/null && sleep 300s
done
\ No newline at end of file
src/uncategorized/SFMBarracks.tw
+ 18
− 14
View file @ 27095c26
......@@ -12,7 +12,7 @@
<</if>>
<<set $TierTwoUnlock = 0>>
<<if _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>>
<<if _StimulantLab == 5 && _Barracks == 5 && $securityForceVehiclePower == 5 && _Armoury == 5 && _DroneBay == 5 && $securityForceAircraftPower == 5>>
<<set $TierTwoUnlock = 1>>
<</if>>
......@@ -125,6 +125,10 @@
<br>//$securityForceName is fully equipped and upgraded - nothing else can be done.//
<</if>>
<<if $TierTwoUnlock == 0>>
<br>You have <<print (30-$SFAO)>> upgrades left before you can move unlock the next tier. ''StimulantLab:'' _StimulantLab/5 ''_Barracks:'' _Barracks/5 ''Garage:'' $securityForceVehiclePower/5 ''Armoury:'' _Armoury/5 ''DroneBay:'' _DroneBay/5 ''Airforce:'' $securityForceAircraftPower/5
<</if>>
<<if $securityForceGiftToken == 1>>
<br>//_Name has already provided you with extra tribute this week.//
<</if>>
......@@ -208,7 +212,7 @@
<</if>>
<</replace>>
<</link>>
<br><<link "In the HQ of $securityForceName.">>
<<replace "#result3">>
<span id="result10">
......@@ -357,28 +361,28 @@
<</replace>>
<<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "Ass">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
<<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "Both pussy and ass">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
<<set $securityForceSexedColonel += 2>>
<</link>>
<br><<link "Mouth">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
<<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "All three holes">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
......@@ -388,7 +392,7 @@
</span>
<</replace>>
<</link>>
<br><<link "On The Colonel's throne.">>
<<replace "#result11">>
<span id="result6">
......@@ -399,32 +403,32 @@
<</link>>
<br><<link "Pussy">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
<<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "Ass">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
<<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "Both pussy and ass">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
<<set $securityForceSexedColonel += 2>>
<</link>>
<br><<link "Mouth">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
<<include "SpecialForceColonelSexDec">>
<</replace>>
<<set $securityForceSexedColonel += 1>>
<</link>>
<br><<link "All three holes">>
<<replace "#result6">>
<<include "SpecialForceColonelSexDec">>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment