diff --git a/devTools/AutoGitVersionUploadBackground.sh b/devTools/AutoGitVersionUploadBackground.sh index c062f474e2e63ecf17866b6451d2c910a31c76ee..cb5a7c2b030175084fb60e820d283c1da8a84645 100644 --- a/devTools/AutoGitVersionUploadBackground.sh +++ b/devTools/AutoGitVersionUploadBackground.sh @@ -1,15 +1,13 @@ -#!/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 +#!/bin/sh Requires MEGAcmd, git, mv, cd, mkidr, echo +COUNTER=0 LocalDir=~/fc-pregmod/ RemoteDir=FC-GIT U=anon@anon.anon P=13245 && mega-login $U $P +while [ $COUNTER -ge 0 ]; do + 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 --reverse -n1 --abbrev-commit |grep -m1 commit | sed 's/commit //'` + if [ $COUNTER -eq 0 ]; then ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%F-%H-%M')-$AbrevHash.html" && mega-put bin/*.html $RemoteDir + else if [ "$(git pull)" == "Already up to date." ]; then exit + else rm bin/*.html ; .compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%F-%H-%M')-$AbrevHash.html" && mega-put bin/*.html $RemoteDir fi + fi let COUNTER=COUNTER+1 && mega-logout > /dev/null && sleep 300s -done \ No newline at end of file +done \ No newline at end of file diff --git a/devTools/AutoGitVersionUploadForground.sh b/devTools/AutoGitVersionUploadForground.sh index 07b8dc79d069ebcff4c667942c86b881caed558a..13e742e1ac5478033eb96568301fbc743e0ac2b4 100644 --- a/devTools/AutoGitVersionUploadForground.sh +++ b/devTools/AutoGitVersionUploadForground.sh @@ -1,15 +1,13 @@ -#!/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." +#!/bin/sh Requires MEGAcmd, git, mv, cd, mkidr, echo +COUNTER=0 LocalDir=~/fc-pregmod/ RemoteDir=FC-GIT U=anon@anon.anon P=13245 && mega-login $U $P +while [ $COUNTER -ge 0 ]; do + 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 --reverse --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-$(git log -1 --format='%cd' --date='format:%F-%H-%M')-$AbrevHash.html" && mega-put bin/*.html $RemoteDir && echo "Inital compiled .html placed." + else if [ "$(git pull)" == "Already up to date." ]; then echo "No updated files." + else echo "Compliling, formatting and placing updated .html." ; rm bin/*.html ; ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%F-%H-%M')-$AbrevHash.html" && mega-put bin/*.html $RemoteDir ; echo "Updated .html placed." fi + fi let COUNTER=COUNTER+1 && mega-logout > /dev/null && sleep 300s -done \ No newline at end of file +done \ No newline at end of file diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 1c276720d0d32438ce86a9eae5530fac6f4c6c03..0baeb4091774f17b32b45bf994bf9afba8f64c19 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -23,11 +23,11 @@ <</if>> <<set $Env = simpleWorldEconomyCheck()>> <<switch $Env>> - <<case "3">> + <<case "n1">> <<set $EnvCash2 = 450, $EnvCash3 = 200, $EnvCash4 = 100, $EnvProsp = 3, _BaseDiscount = _BaseDiscount-.005>> - <<case "5">> + <<case "n2">> <<set $EnvCash2 = 500, $EnvCash3 = 250, $EnvCash4 = 150, $EnvProsp = 5, _BaseDiscount = _BaseDiscount>> - <<case "7">> + <<case "n3">> <<set $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>> <</switch>>