From 01eb2847d1205e497156c3a50e18ffcd6d8c0e55 Mon Sep 17 00:00:00 2001
From: Blank <blank@national.shitposting.agency>
Date: Thu, 14 Mar 2019 18:44:39 -0700
Subject: [PATCH] (Ready to merge) FixesAndTweaks
---
.gitignore | 1 +
bin/.gitignore | 4 ----
compile | 2 +-
devNotes/Useful JS Function Documentation.txt | 8 ++++++++
devTools/PreCompile.sh | 13 ++++++-------
src/js/utilJS.js | 8 ++++++++
src/uncategorized/BackwardsCompatibility.tw | 2 +-
7 files changed, 25 insertions(+), 13 deletions(-)
delete mode 100644 bin/.gitignore
diff --git a/.gitignore b/.gitignore
index a4201c23f5f..25465c24776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
+bin/*
# PyInstaller
# Usually these files are written by a python script from a template
diff --git a/bin/.gitignore b/bin/.gitignore
deleted file mode 100644
index 835f2b74dbd..00000000000
--- a/bin/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except the following:
-!.gitignore
\ No newline at end of file
diff --git a/compile b/compile
index c9bb6c0cd57..71583bfdcf9 100755
--- a/compile
+++ b/compile
@@ -1,5 +1,5 @@
#!/bin/bash
-
+find bin/ >/dev/null 2>&1;if [ `echo $?` -gt 0 ];then mkdir bin/;fi
while [[ "$1" ]]
do
case $1 in
diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 8f1186b094e..a074ec31fe0 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -349,3 +349,11 @@ UtilJS [script]
HackingSkillMultiplier() - outputs a value based off of the PC's hacking skill.
upgradeMultiplierArcology() - outputs a value based off of the PC's engineering skill.
+
+ passageLink() - Creates a HTML element with custom SugarCube attributes which works as a passage link
+
+ SkillIncrease() - Depeciates the sugarcube fuctions.
+
+ jsNdef - A .js port of sugarcube's ndef.
+
+ jsDef - A .js port of sugarcube's def.
\ No newline at end of file
diff --git a/devTools/PreCompile.sh b/devTools/PreCompile.sh
index d06102056df..e0f9f459b97 100755
--- a/devTools/PreCompile.sh
+++ b/devTools/PreCompile.sh
@@ -1,8 +1,7 @@
#!/bin/sh
-x=bin/* #Packages required: MEGAcmd,minify,git. U=$1 P=$2 remtDir=$3 locDir=$4 repo=$5
-echo 'New clone? 0:y 1:n 2:na';read Opt;clear;mega-login $U $P >/dev/null
-while true;do cd $4 2>/dev/null && if [ $? -eq 0 ];then cd $4;fi
- if [ $Opt -eq 0 ];then A=[$(mega-ls $3/|cut -c 29-|sed s/.html//|paste -sd,"")];mkdir -p $4 && git clone -q --no-tags --depth 1 $5 $4 && cd $4 && V=$(git log -1|grep comm|cut -c 8-11);if [[ ! " ${A[@]} " =~ " ${V} " ]];then gen=1;fi #arraryCheck:stackoverflow.com/a/15394738
- elif [[ $Opt > 0||$gen < 1 ]];then git fetch -q;if [ `git rev-list HEAD...origin/pregmod-master --count` -gt 0 ];then git reset -q --hard HEAD && git pull -q && gen=1;fi ;fi #gitCheck:stackoverflow.com/a/17192101
- if [[ $Opt > 1||$gen > 0 ]];then rm $x 2>/dev/null;minify -rao $4 $4 && ./compile --insane >/dev/null && mv $x bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%d-%m-%Y-%H-%M')-$(git log -1|grep comm|cut -c 8-11).html && mega-put -c $x $3 && if [ `mega-ls $3|wc -l` -gt 10 ];then mega-rm $3$(mega-ls $3|sort -r|tail -n +11);fi ; fi
-gen=0;Opt=-1;sleep 15m;done
\ No newline at end of file
+mega-login $1 $2;echo 'New clone? 0:y 1:n 2:na';read Opt #Requirements:MEGAcmd,minify,git. U=$1 P=$2 rDir=$3 lDir=$4 repo=$5
+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 minify -rao $4 $4&&./compile --insane&&cd bin/&&rm FC-*;mv * 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 * $3&&mega-rm $3`mega-ls $3|sort -r|tail -n +11`;fi
+Opt=-1;clear;sleep 15m;done
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 58f1ef7bf16..98279ec9e7c 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1391,4 +1391,12 @@ window.upgradeMultiplierArcology = function() {
} else if (V.PC.engineering >= 100 || V.PC.career === "arcology owner") {
return 0.80;
}
+};
+
+window.jsNdef = function(input) {
+ if (typeof input === "undefined") return true; else return false;
+};
+
+window.jsDef = function(input) {
+ if (typeof input !== "undefined") return true; else return false;
};
\ No newline at end of file
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 3c1bb3c7b0b..0c0406f501e 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3567,4 +3567,4 @@ Done!
<<set $upgradeMultiplierArcology = upgradeMultiplierArcology()>>
/* reset NaNArray after BC is run */
-<<set $NaNArray = findNaN()>>
\ No newline at end of file
+<<set $NaNArray = findNaN()>>
--
GitLab