artTools/vector_layer_split.py

 #!/usr/bin/env python3
 
-'''
+"""
 Application for splitting groups from one SVG file into separate files
 
 Usage:
@@ -8,112 +8,128 @@ python3 vector_layer_split.py infile format outdir
 
 Usage Example:
 python3 vector_layer_split.py vector_source.svg tw ../src/art/vector/layers/
-'''
+"""
 
-import lxml.etree as etree
-import sys
-import os
+import argparse
 import copy
+import os
 import re
+
+import lxml.etree as etree
 import normalize_svg
+import svg_split_utils
+
+parser = argparse.ArgumentParser(
+    description='Application for splitting groups from one SVG file into separate files.')
+parser.add_argument('-o', '--output', dest='output_dir', required=True,
+                    help='output directory')
+parser.add_argument('-f', '--format', dest='output_format',
+                    choices=['svg', 'tw'], default='svg', help='output format.')
+parser.add_argument('-p', '--prefix', dest='prefix', default='',
+                    help='Prepend this string to result file names')
+parser.add_argument('input_file', metavar='FILENAME', nargs='+',
+                    help='Input SVG file with layers')
+
+args = parser.parse_args()
+output_format = args.output_format
+output_directory = args.output_dir
+
+
+def split_file(input_file):
+    tree = etree.parse(input_file)
+    normalize_svg.fix(tree)
+
+    ns = {
+        'svg': 'http://www.w3.org/2000/svg',
+        'inkscape': 'http://www.inkscape.org/namespaces/inkscape',
+        'sodipodi': "http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd",
+    }
+
+    # strip undesired editor attributes from the tree
+    etree.strip_attributes(tree, f"{{{ns['inkscape']}}}*", f"{{{ns['sodipodi']}}}*");
+
+    # prepare output template
+    template = copy.deepcopy(tree)
+    root = template.getroot()
+
+    # remove all svg root attributes except document size
+    for a in root.attrib:
+        if a != "viewBox":
+            del root.attrib[a]
+
+    # remove all content, including metadata
+    # for twine output, style definitions are removed, too
+    defs = None
+    for e in root:
+        if e.tag == etree.QName(ns['svg'], 'defs'):
+            defs = e
+        if (e.tag == etree.QName(ns['svg'], 'g') or
+                e.tag == etree.QName(ns['svg'], 'metadata') or
+                e.tag == etree.QName(ns['svg'], 'defs') or
+                e.tag == etree.QName(ns['sodipodi'], 'namedview') or
+                (output_format == 'tw' and e.tag == etree.QName(ns['svg'], 'style'))
+        ):
+            root.remove(e)
+    # template preparation finished
+
+    # prepare regex for later use
+    regex_xmlns = re.compile(' xmlns[^ ]+')
+    regex_space = re.compile(r'[>]\s+[<]')
+
+    # find all groups
+    layers = tree.xpath('//svg:g', namespaces=ns)
+    for layer in layers:
+        i = layer.get('id')
+        if (  # disregard non-content groups
+                i.endswith("_") or  # manually suppressed with underscore
+                i.startswith("XMLID") or  # Illustrator generated group
+                i.startswith("g")  # Inkscape generated group
+        ):
+            continue
+
+        # create new canvas
+        output = copy.deepcopy(template)
+        # copy all shapes into template
+        canvas = output.getroot()
+        for e in layer:
+            canvas.append(e)
+        # represent template as SVG (binary string)
+        svg = etree.tostring(output, pretty_print=False)
+        # poor man's conditional defs insertion
+        # TODO: extract only referenced defs (filters, gradients, ...)
+        # TODO: detect necessity by traversing the elements. do not stupidly search in the string representation
+        if "filter:" in svg.decode('utf-8'):
+            # it seems there is a filter referenced in the generated SVG, re-insert defs from main document
+            canvas.insert(0, defs)
+            # re-generate output
+            svg = etree.tostring(output, pretty_print=False)
+
+        if output_format == 'tw':
+            # remove unnecessary attributes
+            # TODO: never generate unnecessary attributes in the first place
+            svg = svg.decode('utf-8')
+            svg = regex_xmlns.sub('', svg)
+            svg = svg.replace('\n', '').replace('\r', '')  # print cannot be multi-line
+            svg = regex_space.sub('><', svg)  # remove indentation
+            svg = svg.replace('svg:', '')  # svg namespace was removed
+            if "Boob" in i:  # internal groups are used for scaling
+                svg = svg.replace('<g ', '<g data-transform="boob" ')  # boob art uses the boob scaling
+            elif "Belly" in i:
+                svg = svg.replace('<g ', '<g data-transform="belly" ')  # belly art uses the belly scaling
+            elif "Balls" in i:
+                svg = svg.replace('<g ', '<g data-transform="balls" ')  # balls art uses the balls scaling
+            else:
+                svg = svg.replace('<g ', '<g data-transform="art" ')  # otherwise use default scaling
+        if not svg.endswith(os.linesep):
+            svg += os.linesep
+        svg = svg.encode('utf-8')
+
+        # save SVG string to file
+        svg_split_utils.save(layer, args.prefix, output_directory, output_format, svg)
+
 
-input_file = sys.argv[1]
-output_format = sys.argv[2]
-output_directory = sys.argv[3]
 if not os.path.exists(output_directory):
     os.makedirs(output_directory)
 
-ns = {
-  'svg' : 'http://www.w3.org/2000/svg',
-  'inkscape' : 'http://www.inkscape.org/namespaces/inkscape',
-  'sodipodi':"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd",
-}
-
-tree = etree.parse(input_file)
-normalize_svg.fix(tree)
-
-# prepare output template
-template = copy.deepcopy(tree)
-root = template.getroot()
-
-# remove all svg root attributes except document size
-for a in root.attrib:
-  if (a != "viewBox"):
-    del root.attrib[a]
-
-# add placeholder for CSS class (needed for workaround for non HTML 5.1 compliant browser)
-if output_format == 'tw':
-  root.attrib["class"] = "'+_art_display_class+'"
-
-# remove all content, including metadata
-# for twine output, style definitions are removed, too
-defs = None
-for e in root:
-  if (e.tag == etree.QName(ns['svg'], 'defs')):
-    defs = e
-  if (e.tag == etree.QName(ns['svg'], 'g') or
-      e.tag == etree.QName(ns['svg'], 'metadata') or
-      e.tag == etree.QName(ns['svg'], 'defs') or
-      e.tag == etree.QName(ns['sodipodi'], 'namedview') or
-      (output_format == 'tw' and e.tag == etree.QName(ns['svg'], 'style'))
-      ):
-    root.remove(e)
-# template preparation finished
-
-# prepare regex for later use
-regex_xmlns = re.compile(' xmlns[^ ]+',)
-regex_space = re.compile('[>][ ]+[<]',)
-
-# find all groups
-layers = tree.xpath('//svg:g',namespaces=ns)
-for layer in layers:
-  i = layer.get('id')
-  if ( # disregard non-content groups
-    i.endswith("_") or # manually suppressed with underscore
-    i.startswith("XMLID") or # Illustrator generated group 
-    i.startswith("g") # Inkscape generated group
-  ):
-    continue
-  # create new canvas
-  output = copy.deepcopy(template)
-  # copy all shapes into template
-  canvas = output.getroot()
-  for e in layer:
-    canvas.append(e)
-  # represent template as SVG (binary string)
-  svg = etree.tostring(output, pretty_print=False)
-  # poor man's conditional defs insertion
-  # TODO: extract only referenced defs (filters, gradients, ...)
-  # TODO: detect necessity by traversing the elements. do not stupidly search in the string representation
-  if ("filter:" in svg.decode('utf-8')):
-    # it seems there is a filter referenced in the generated SVG, re-insert defs from main document
-    canvas.insert(0,defs)
-    # re-generate output
-    svg = etree.tostring(output, pretty_print=False)
-  
-  if (output_format == 'tw'):
-    # remove unnecessary attributes
-    # TODO: never generate unnecessary attributes in the first place
-    svg = svg.decode('utf-8')
-    svg = regex_xmlns.sub('',svg)
-    svg = svg.replace(' inkscape:connector-curvature="0"','') # this just saves space
-    svg = svg.replace('\n','').replace('\r','') # print cannot be multi-line
-    svg = regex_space.sub('><',svg) # remove indentaion
-    svg = svg.replace('svg:','') # svg namespace was removed
-    svg = svg.replace('<g ','<g transform="\'+_art_transform+\'"') # internal groups are used for scaling
-    svg = svg.encode('utf-8')
-  
-  # save SVG string to file
-  i = layer.get('id')
-  output_path = os.path.join(output_directory,i+'.'+output_format)
-  with open(output_path, 'wb') as f:
-    if (output_format == 'svg'):
-      # Header for normal SVG (XML)
-      f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
-      f.write(svg)
-    elif (output_format == 'tw'):
-      # Header for SVG in Twine file (SugarCube print statement)
-      f.write((':: Art_Vector_%s [nobr]\n\n'%(i)).encode("utf-8"))
-      f.write("<<print '<html>".encode("utf-8"))
-      f.write(svg)
-      f.write("</html>' >>".encode("utf-8"))
+for f in args.input_file:
+    split_file(f)

artTools/vector_revamp_layer_split.py

 #!/usr/bin/env python3
 
-'''
+"""
 Application for splitting groups from one SVG file into separate files
 
 Usage:
@@ -8,20 +8,34 @@ python3 vector_layer_split.py infile format outdir
 
 Usage Example:
 python3 vector_layer_split.py vector_source.svg tw ../src/art/vector/layers/
-'''
+"""
 
-import lxml.etree as etree
-from lxml.etree import XMLParser, parse
-
-import sys
-import os
+import argparse
 import copy
+import os
 import re
+
+import lxml.etree as etree
 import normalize_svg
+from lxml.etree import XMLParser, parse
+import svg_split_utils
+
+parser = argparse.ArgumentParser(
+    description='Application for splitting groups from one SVG file into separate files.')
+parser.add_argument('-o', '--output', dest='output_dir', required=True,
+                    help='output directory')
+parser.add_argument('-f', '--format', dest='output_format',
+                    choices=['svg', 'tw'], default='svg', help='output format.')
+parser.add_argument('-p', '--prefix', dest='prefix', default='',
+                    help='Prepend this string to result file names')
+parser.add_argument('input_file', metavar='FILENAME', nargs=1,
+                    help='Input SVG file with layers')
 
-input_file = sys.argv[1]
-output_format = sys.argv[2]
-output_directory = sys.argv[3]
+args = parser.parse_args()
+
+output_format = args.output_format
+output_directory = args.output_dir
+input_file = args.input_file[0]
 
 if not os.path.exists(output_directory):
     os.makedirs(output_directory)
@@ -34,27 +48,25 @@ ns = {
 
 p = XMLParser(huge_tree=True)
 tree = parse(input_file, parser=p)
-#tree = etree.parse(input_file)
 normalize_svg.fix(tree)
 
+# strip undesired editor attributes from the tree
+etree.strip_attributes(tree, f"{{{ns['inkscape']}}}*", f"{{{ns['sodipodi']}}}*")
+
 # prepare output template
 template = copy.deepcopy(tree)
 root = template.getroot()
 
 # remove all svg root attributes except document size
 for a in root.attrib:
-    if (a != "viewBox"):
+    if a != "viewBox":
         del root.attrib[a]
 
-# add placeholder for CSS class (needed for workaround for non HTML 5.1 compliant browser)
-if output_format == 'tw':
-    root.attrib["class"] = "'+_art_display_class+'"
-
 # remove all content, including metadata
 # for twine output, style definitions are removed, too
 defs = None
 for e in root:
-    if (e.tag == etree.QName(ns['svg'], 'defs')):
+    if e.tag == etree.QName(ns['svg'], 'defs'):
         defs = e
     if (e.tag == etree.QName(ns['svg'], 'g') or
             e.tag == etree.QName(ns['svg'], 'metadata') or
@@ -66,12 +78,22 @@ for e in root:
 # template preparation finished
 
 # prepare regex for later use
-regex_xmlns = re.compile(' xmlns[^ ]+', )
-regex_space = re.compile('[>][ ]+[<]', )
-regex_transformValue = re.compile('(?<=transformVariableName=")[^"]*', )
-regex_transformVar = re.compile('transformVariableName="[^"]*"', )
-regex_transformAttr = re.compile('transform="[^"]*"', )
-# find all groups
+regex_xmlns = re.compile(' xmlns[^ ]+')
+regex_space = re.compile(r'[>]\s+[<]')
+
+# create dict with all needed definitions   
+gra_dict = {}
+for gra in defs:
+    if (gra.tag == etree.QName(ns['svg'], 'linearGradient') or
+            gra.tag == etree.QName(ns['svg'], 'radialGradient') or
+            gra.tag == etree.QName(ns['svg'], 'clipPath') or
+            gra.tag == etree.QName(ns['svg'], 'mask') or
+            gra.tag == etree.QName(ns['svg'], 'filter')):
+        gra_id = gra.get('id')
+        gra = etree.tostring(gra, pretty_print=False)
+        gra = gra.decode('utf-8')
+        gra_dict[gra_id] = gra
+    # find all groups
 layers = tree.xpath('//svg:g', namespaces=ns)
 for layer in layers:
     i = layer.get('id')
@@ -89,52 +111,66 @@ for layer in layers:
         canvas.append(e)
     # represent template as SVG (binary string)
     svg = etree.tostring(output, pretty_print=False)
-    # poor man's conditional defs insertion
-    # TODO: extract only referenced defs (filters, gradients, ...)
-    # TODO: detect necessity by traversing the elements. do not stupidly search in the string representation
-    if ("filter:" in svg.decode('utf-8')):
-        # it seems there is a filter referenced in the generated SVG, re-insert defs from main document
-        canvas.insert(0, defs)
-        # re-generate output
+
+    # replace <use> with the referenced object
+    # this is a very poor way to do it. A more elegant way would be to insert
+    # referenced object in the <def> part of the file, but then the colors of
+    # objects with a class definition will not be changed.
+    # As a substitute the <use> is overwritten with the object.
+    # THIS WILL REMOVE ANY MODIFICATIONS (movement, clip-paths, etc.)
+    # To prevent this the cloned object should be put into a group, and changes
+    # made to the group.
+    # TODO: If colors can be changed based on class in defs - put reference in defs instead
+    if "<svg:use" in svg.decode('utf-8'):
+        # get a reference map
+        output_map = {c: p for p in canvas.iter() for c in p}
+        # find use elements
+        for elem in list(canvas.xpath('//svg:use', namespaces=ns)):
+            # get referenced id
+            def_id = elem.get('{http://www.w3.org/1999/xlink}href')
+            def_id = def_id[1:]
+            # loop through all layers to find the referenced element
+            def_orig = None
+            for def_l in layers:
+                for e in (e for e in def_l if e.get('id') == def_id):
+                    def_orig = copy.deepcopy(e)
+                if def_orig is not None:
+                    break
+            parent_index = list(output_map).index(elem)
+            output_map[elem].remove(elem)
+            output_map[elem].insert(parent_index, def_orig)
+        # Update svg
         svg = etree.tostring(output, pretty_print=False)
-    elif ("clip-path=" in svg.decode('utf-8')):
-        # it seems there is a clip path referenced in the generated SVG, re-insert defs from main document
-        canvas.insert(0, defs)
+
+    # Conditional defs insertion - only inserts the needed defs
+    svg_dec = svg.decode('utf-8')
+    if any(x in svg_dec for x in ["filter", "Gradient", "mask=", "clip-path="]):
+        moreDefsNeeded = True
+        gra_str = '<defs>'
+        while moreDefsNeeded:
+            moreDefsNeeded = False
+            s = svg.decode('utf-8')
+            for key in gra_dict.keys():
+                if ('#' + key in s or '#' + key in gra_str) and 'id="' + key not in gra_str:
+                    moreDefsNeeded = True
+                    gra_str += gra_dict[key]
+        gra_str += '</defs>'
+        canvas.insert(0, etree.fromstring(gra_str))
         # re-generate output
         svg = etree.tostring(output, pretty_print=False)
 
-    if (output_format == 'tw'):
+    if output_format == 'tw':
         # remove unnecessary attributes
         # TODO: never generate unnecessary attributes in the first place
         svg = svg.decode('utf-8')
         svg = regex_xmlns.sub('', svg)
-        svg = svg.replace(' inkscape:connector-curvature="0"', '')  # this just saves space
         svg = svg.replace('\n', '').replace('\r', '')  # print cannot be multi-line
-        svg = regex_space.sub('><', svg)  # remove indentaion
+        svg = regex_space.sub('><', svg)  # remove indentation
         svg = svg.replace('svg:', '')  # svg namespace was removed
 
-        transformGroups = regex_transformVar.findall(svg)
-
-        if (len(transformGroups) > 0):
-            svg = regex_transformAttr.sub('', svg)
-            for transformGroup in transformGroups:
-                transformValue = regex_transformValue.search(transformGroup)
-                if (transformValue is not None):
-                    svg = svg.replace(transformGroup, ' transform="\'+' + transformValue.group() + '+\'" ')  # internal groups are used for scaling
-
+        if not svg.endswith(os.linesep):
+            svg += os.linesep
         svg = svg.encode('utf-8')
 
     # save SVG string to file
-    i = layer.get('id')
-    output_path = os.path.join(output_directory, i + '.' + output_format)
-    with open(output_path, 'wb') as f:
-        if (output_format == 'svg'):
-            # Header for normal SVG (XML)
-            f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
-            f.write(svg)
-        elif (output_format == 'tw'):
-            # Header for SVG in Twine file (SugarCube print statement)
-            f.write((':: Art_Vector_Revamp_%s [nobr]\n\n' % (i)).encode("utf-8"))
-            f.write("<<print '<html>".encode("utf-8"))
-            f.write(svg)
-            f.write("</html>' >>".encode("utf-8"))
+    svg_split_utils.save(layer, args.prefix, output_directory, output_format, svg)

bin/.gitignore

-# Ignore everything in this directory
-*
-# Except the following:
-!.gitignore
\ No newline at end of file

build.config.json

+{
+	"dirs": {
+		"intermediate": "build",
+		"output": "bin",
+		"modOutput": "bin/mods"
+	},
+	"output": "FC_pregmod[extras].html",
+	"gitVersionFile": "src/002-config/fc-version.js.commitHash.js",
+	"sources": {
+		"module": {
+			"js": ["js/**/*.js"],
+			"css": ["css/**/*.css"]
+		},
+		"story": {
+			"js": ["src/**/*.js"],
+			"css": ["src/**/*.css"],
+			"twee": ["src/**/*.tw"],
+			"media": [
+				"src/art/vector/layers/",
+				"src/art/vector_revamp/layers/"
+			]
+		},
+		"mods": "mods/dev",
+		"themes": "themes",
+		"head": "resources/raster/favicon/arcologyVector.html"
+	},
+	"options": {
+		"css": {
+			"autoprefix": true
+		},
+		"twee": {
+			"environment": {
+				"TWEEGO_PATH": "devTools/tweeGo/storyFormats"
+			}
+		}
+	}
+}

compile

-#!/bin/bash
-
-while [[ "$1" ]]
-do
-	case $1 in
-	--insane)
-		insane="true"
-	;;
-	*)
-		echo "Unknown argument $1"
-		exit 1
-	esac
-	shift
-done
-
-# Find and insert current commit
-COMMIT=$(git rev-parse --short HEAD)
-sed -Ei "s/build .releaseID/\0 commit $COMMIT/" src/gui/mainMenu/AlphaDisclaimer.tw
-
-if [[ ! "$insane" ]]
-then
-	# Run sanity check.
-	./sanityCheck
-fi
-
-ARCH="$(uname -m)"
-if [ "$ARCH" = "x86_64" ]
-then
-	echo "x64 arch"
-	./devTools/tweeGo/tweego_nix64 -o bin/FC_pregmod.html src/ || build_failed="true"
-elif echo "$ARCH" | grep -Ee '86$' > /dev/null
-then
-	echo "x86 arch"
-	./devTools/tweeGo/tweego_nix86 -o bin/FC_pregmod.html src/ || build_failed="true"
-elif echo "$ARCH" | grep -Ee '^arm' > /dev/null
-then
-	echo "arm arch"
-	# tweego doesn't provide arm binaries so you have to build it yourself
-	export TWEEGO_PATH=devTools/tweeGo/storyFormats
-	tweego -o bin/FC_pregmod.html src/ || build_failed="true"
-else
-	exit 2
-fi
-
-# Revert AlphaDisclaimer for next compilation
-git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
-
-if [ "$build_failed" = "true" ]
-then
-	exit 1
-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.html

compile-git

-#!/bin/bash
-
-# Run sanity check.
-./sanityCheck
-
-HASH="$(git rev-list -n 1 --abbrev-commit HEAD)"
-ARCH="$(uname -m)"
-if [ "$ARCH" = "x86_64" ]
-then
-	echo "x64 arch"
-	./devTools/tweeGo/tweego_nix64 -o "bin/FC_pregmod_$HASH.html" src/
-elif echo "$ARCH" | grep -Ee '86$' > /dev/null
-then
-	echo "x86 arch"
-	./devTools/tweeGo/tweego_nix86 -o "bin/FC_pregmod_$HASH.html" src/
-elif echo "$ARCH" | grep -Ee '^arm' > /dev/null
-then
-	echo "arm arch"
-	# tweego doesn't provide arm binaries so you have to build it yourself
-	export TWEEGO_PATH=devTools/tweeGo/storyFormats
-	tweego -o "bin/FC_pregmod_$HASH.html" src/
-else
-	exit 2
-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_$HASH.html"
-
-echo "FC_pregmod_$HASH.html" compilation finished.

compile.bat

-@echo off
-:: Free Cities Basic Compiler - Windows
+@ECHO off
+:: Free Cities Compiler - Windows
 
-:: Set working directory
-pushd %~dp0
-
-:: Run the appropriate compiler for the user's CPU architecture.
-if %PROCESSOR_ARCHITECTURE% == AMD64 (
-    CALL "%~dp0devTools\tweeGo\tweego_win64.exe" -o "%~dp0bin/FC_pregmod.html" "%~dp0src"
-) else (
-    CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" "%~dp0src"
+:processargs
+SET ARG=%1
+IF DEFINED ARG (
+	:: exit without user input
+	if "%ARG%"=="--no-wait" SET "NOWAIT=True"
+    SHIFT
+    GOTO processargs
 )
 
-popd
-ECHO Done
+:: run dependencyCheck.bat
+CALL .\devTools\scripts\dependencyCheck.bat
+SET CODE=%ERRORLEVEL%
+
+IF %CODE% EQU 69 (
+	:: if exit code is 69, then we don't have all the dependencies we need
+	:: fall back to the simple compiler
+	ECHO.
+	ECHO Dependencies not met, falling back to simple compiler.
+    ECHO.
+    :: run simple-compiler.bat, passing all arguments to it
+	CALL ./simple-compiler.bat %*
+	EXIT /b 0
+) ELSE IF %CODE% EQU 0 (
+	:: if exit code is 0, run new compiler passing all arguments to it
+	CALL node devTools\scripts\advancedCompiler.js
+
+	EXIT /b 0
+) ELSE (
+	:: if exit code is not 0, print error message and then attempt to fall back to the simple compiler
+	ECHO.
+	ECHO dependencyCheck.bat exited with code: %CODE%
+	ECHO Dependency check failed unexpectedly, falling back to the simple compiler.
+    ECHO.
+	CALL ./simple-compiler.bat %*
+    EXIT /b 0
+)

compile.sh

+#!/bin/bash
+
+# Free Cities Compiler - Unix
+
+# run dependencyCheck.sh
+./devTools/scripts/dependencyCheck.sh
+exitCode=$?
+# exit code is now stored in $exitCode
+
+# if exit code is 69, then we don't have all the dependencies we need
+# fall back to the simple compiler
+if [[ $exitCode -eq 69 ]]; then
+    echo "Dependencies not met, falling back to the simple compiler."
+    echo ""
+    # run simple-compiler.sh, passing all arguments to it
+   ./simple-compiler.sh "$@"
+   exit 0
+# if exit code is not 0, print error message and then attempt to fall back to the simple compiler
+elif [[ $exitCode -ne 0 ]]; then
+    echo "Dependency check failed unexpectedly, falling back to the simple compiler."
+    echo ""
+    # run simple-compiler.sh, passing all arguments to it
+   ./simple-compiler.sh "$@"
+    exit 0
+# if exit code is 0, run new compiler passing all arguments to it
+else
+    node devTools/scripts/advancedCompiler.js
+fi

css/001-lib/macros.css

+/*! <<checkvars>> macro for SugarCube 2.x */
+#ui-dialog-body.checkvars{padding:1em}#ui-dialog-body.checkvars h1{font-size:1em;margin-top:0}#ui-dialog-body.checkvars table{border-collapse:collapse;border-spacing:0}#ui-dialog-body.checkvars thead tr{border-bottom:2px solid #444}#ui-dialog-body.checkvars tr:not(:first-child){border-top:1px solid #444}#ui-dialog-body.checkvars td,#ui-dialog-body.checkvars th{padding:.25em 1em}#ui-dialog-body.checkvars td:first-child,#ui-dialog-body.checkvars th:first-child{padding-left:.5em;border-right:1px solid #444}#ui-dialog-body.checkvars td:last-child,#ui-dialog-body.checkvars th:last-child{padding-right:.5em}#ui-dialog-body.checkvars th:first-child{text-align:center}#ui-dialog-body.checkvars td:first-child{font-weight:700;text-align:right}#ui-dialog-body.checkvars td{font-family:monospace,monospace;vertical-align:top;white-space:pre-wrap}#ui-dialog-body.checkvars .scroll-pad{margin:0;padding:0}

css/001-lib/tippy.css

+.tippy-touch{cursor:pointer!important}.tippy-popper{max-width:400px;-webkit-perspective:800px;perspective:800px;z-index:9999}.tippy-popper.html-template{max-width:96%;max-width:calc(100% - 20px)}.tippy-popper[x-placement^=top] [x-arrow]{position:absolute;width:0;height:0;border-top:7px solid #333;border-right:7px solid transparent;border-left:7px solid transparent;bottom:-7px}.tippy-popper[x-placement^=top] [x-arrow].arrow-small{border-top:5px solid #333;border-right:5px solid transparent;border-left:5px solid transparent;bottom:-5px}.tippy-popper[x-placement^=top] [x-arrow].arrow-big{border-top:9px solid #333;border-right:9px solid transparent;border-left:9px solid transparent;bottom:-9px}.tippy-popper[x-placement^=top] [x-circle]{-webkit-transform-origin:0 50%;transform-origin:0 50%}.tippy-popper[x-placement^=top] [x-circle].enter{opacity:1;-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%)}.tippy-popper[x-placement^=top] [x-circle].leave{opacity:0;-webkit-transform:scale(.4) translate(-50%,-50%);transform:scale(.4) translate(-50%,-50%)}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow]{border-top:7px solid #fff;border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-top:5px solid #fff;border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-top:9px solid #fff;border-right:9px solid transparent;border-left:9px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow]{border-top:7px solid rgba(0,0,0,.7);border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-top:5px solid rgba(0,0,0,.7);border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=top] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-top:9px solid rgba(0,0,0,.7);border-right:9px solid transparent;border-left:9px solid transparent}.tippy-popper[x-placement^=top] [data-animation=perspective]{-webkit-transform-origin:bottom;transform-origin:bottom}.tippy-popper[x-placement^=top] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateY(-10px) rotateX(0);transform:translateY(-10px) rotateX(0)}.tippy-popper[x-placement^=top] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateY(0) rotateX(90deg);transform:translateY(0) rotateX(90deg)}.tippy-popper[x-placement^=top] [data-animation=fade].enter{opacity:1;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=fade].leave{opacity:0;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=shift].enter{opacity:1;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.tippy-popper[x-placement^=top] [data-animation=shift].leave{opacity:0;-webkit-transform:translateY(0);transform:translateY(0)}.tippy-popper[x-placement^=top] [data-animation=scale].enter{opacity:1;-webkit-transform:translateY(-10px) scale(1);transform:translateY(-10px) scale(1)}.tippy-popper[x-placement^=top] [data-animation=scale].leave{opacity:0;-webkit-transform:translateY(0) scale(0);transform:translateY(0) scale(0)}.tippy-popper[x-placement^=bottom] [x-arrow]{position:absolute;width:0;height:0;border-bottom:7px solid #333;border-right:7px solid transparent;border-left:7px solid transparent;top:-7px}.tippy-popper[x-placement^=bottom] [x-arrow].arrow-small{border-bottom:5px solid #333;border-right:5px solid transparent;border-left:5px solid transparent;top:-5px}.tippy-popper[x-placement^=bottom] [x-arrow].arrow-big{border-bottom:9px solid #333;border-right:9px solid transparent;border-left:9px solid transparent;top:-9px}.tippy-popper[x-placement^=bottom] [x-circle]{-webkit-transform-origin:0 -50%;transform-origin:0 -50%}.tippy-popper[x-placement^=bottom] [x-circle].enter{opacity:1;-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%)}.tippy-popper[x-placement^=bottom] [x-circle].leave{opacity:0;-webkit-transform:scale(.4) translate(-50%);transform:scale(.4) translate(-50%)}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow]{border-bottom:7px solid #fff;border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-bottom:5px solid #fff;border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-bottom:9px solid #fff;border-right:9px solid transparent;border-left:9px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow]{border-bottom:7px solid rgba(0,0,0,.7);border-right:7px solid transparent;border-left:7px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-bottom:5px solid rgba(0,0,0,.7);border-right:5px solid transparent;border-left:5px solid transparent}.tippy-popper[x-placement^=bottom] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-bottom:9px solid rgba(0,0,0,.7);border-right:9px solid transparent;border-left:9px solid transparent}.tippy-popper[x-placement^=bottom] [data-animation=perspective]{-webkit-transform-origin:top;transform-origin:top}.tippy-popper[x-placement^=bottom] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateY(10px) rotateX(0);transform:translateY(10px) rotateX(0)}.tippy-popper[x-placement^=bottom] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateY(0) rotateX(-90deg);transform:translateY(0) rotateX(-90deg)}.tippy-popper[x-placement^=bottom] [data-animation=fade].enter{opacity:1;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=fade].leave{opacity:0;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=shift].enter{opacity:1;-webkit-transform:translateY(10px);transform:translateY(10px)}.tippy-popper[x-placement^=bottom] [data-animation=shift].leave{opacity:0;-webkit-transform:translateY(0);transform:translateY(0)}.tippy-popper[x-placement^=bottom] [data-animation=scale].enter{opacity:1;-webkit-transform:translateY(10px) scale(1);transform:translateY(10px) scale(1)}.tippy-popper[x-placement^=bottom] [data-animation=scale].leave{opacity:0;-webkit-transform:translateY(0) scale(0);transform:translateY(0) scale(0)}.tippy-popper[x-placement^=left] [x-arrow]{position:absolute;width:0;height:0;border-left:7px solid #333;border-top:7px solid transparent;border-bottom:7px solid transparent;right:-7px;top:50%}.tippy-popper[x-placement^=left] [x-arrow].arrow-small{border-left:5px solid #333;border-top:5px solid transparent;border-bottom:5px solid transparent;right:-5px;top:50%}.tippy-popper[x-placement^=left] [x-arrow].arrow-big{border-left:9px solid #333;border-top:9px solid transparent;border-bottom:9px solid transparent;right:-9px;top:50%}.tippy-popper[x-placement^=left] [x-circle]{-webkit-transform-origin:50% 5%;transform-origin:50% 5%}.tippy-popper[x-placement^=left] [x-circle].enter{opacity:1;-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%)}.tippy-popper[x-placement^=left] [x-circle].leave{opacity:0;-webkit-transform:scale(.4) translate(-50%,-33%);transform:scale(.4) translate(-50%,-33%)}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow]{border-left:7px solid #fff;border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-left:5px solid #fff;border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-left:9px solid #fff;border-top:9px solid transparent;border-bottom:9px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow]{border-left:7px solid rgba(0,0,0,.7);border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-left:5px solid rgba(0,0,0,.7);border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=left] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-left:9px solid rgba(0,0,0,.7);border-top:9px solid transparent;border-bottom:9px solid transparent}.tippy-popper[x-placement^=left] [data-animation=perspective]{-webkit-transform-origin:right;transform-origin:right}.tippy-popper[x-placement^=left] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateX(-10px) rotateY(0);transform:translateX(-10px) rotateY(0)}.tippy-popper[x-placement^=left] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateX(0) rotateY(-90deg);transform:translateX(0) rotateY(-90deg)}.tippy-popper[x-placement^=left] [data-animation=fade].enter{opacity:1;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=fade].leave{opacity:0;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=shift].enter{opacity:1;-webkit-transform:translateX(-10px);transform:translateX(-10px)}.tippy-popper[x-placement^=left] [data-animation=shift].leave{opacity:0;-webkit-transform:translateX(0);transform:translateX(0)}.tippy-popper[x-placement^=left] [data-animation=scale].enter{opacity:1;-webkit-transform:translateX(-10px) scale(1);transform:translateX(-10px) scale(1)}.tippy-popper[x-placement^=left] [data-animation=scale].leave{opacity:0;-webkit-transform:translateX(0) scale(0);transform:translateX(0) scale(0)}.tippy-popper[x-placement^=right] [x-arrow]{position:absolute;width:0;height:0;border-right:7px solid #333;border-top:7px solid transparent;border-bottom:7px solid transparent;left:-7px;top:50%}.tippy-popper[x-placement^=right] [x-arrow].arrow-small{border-right:5px solid #333;border-top:5px solid transparent;border-bottom:5px solid transparent;left:-5px;top:50%}.tippy-popper[x-placement^=right] [x-arrow].arrow-big{border-right:9px solid #333;border-top:9px solid transparent;border-bottom:9px solid transparent;left:-9px;top:50%}.tippy-popper[x-placement^=right] [x-circle]{-webkit-transform-origin:-50% 5%;transform-origin:-50% 5%}.tippy-popper[x-placement^=right] [x-circle].enter{opacity:1;-webkit-transform:scale(1) translate(-50%,-50%);transform:scale(1) translate(-50%,-50%)}.tippy-popper[x-placement^=right] [x-circle].leave{opacity:0;-webkit-transform:scale(.4) translate(-50%,-33%);transform:scale(.4) translate(-50%,-33%)}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-circle]{background-color:#fff}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow]{border-right:7px solid #fff;border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow].arrow-small{border-right:5px solid #fff;border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.light-theme [x-arrow].arrow-big{border-right:9px solid #fff;border-top:9px solid transparent;border-bottom:9px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-circle]{background-color:rgba(0,0,0,.7)}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow]{border-right:7px solid rgba(0,0,0,.7);border-top:7px solid transparent;border-bottom:7px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow].arrow-small{border-right:5px solid rgba(0,0,0,.7);border-top:5px solid transparent;border-bottom:5px solid transparent}.tippy-popper[x-placement^=right] .tippy-tooltip.transparent-theme [x-arrow].arrow-big{border-right:9px solid rgba(0,0,0,.7);border-top:9px solid transparent;border-bottom:9px solid transparent}.tippy-popper[x-placement^=right] [data-animation=perspective]{-webkit-transform-origin:left;transform-origin:left}.tippy-popper[x-placement^=right] [data-animation=perspective].enter{opacity:1;-webkit-transform:translateX(10px) rotateY(0);transform:translateX(10px) rotateY(0)}.tippy-popper[x-placement^=right] [data-animation=perspective].leave{opacity:0;-webkit-transform:translateX(0) rotateY(90deg);transform:translateX(0) rotateY(90deg)}.tippy-popper[x-placement^=right] [data-animation=fade].enter{opacity:1;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=fade].leave{opacity:0;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=shift].enter{opacity:1;-webkit-transform:translateX(10px);transform:translateX(10px)}.tippy-popper[x-placement^=right] [data-animation=shift].leave{opacity:0;-webkit-transform:translateX(0);transform:translateX(0)}.tippy-popper[x-placement^=right] [data-animation=scale].enter{opacity:1;-webkit-transform:translateX(10px) scale(1);transform:translateX(10px) scale(1)}.tippy-popper[x-placement^=right] [data-animation=scale].leave{opacity:0;-webkit-transform:translateX(0) scale(0);transform:translateX(0) scale(0)}.tippy-popper [x-circle]{background-color:#fff}.tippy-popper[data-animatefill]{background-color:transparent}.tippy-popper [x-arrow]{position:absolute;width:0;height:0}.tippy-popper .tippy-tooltip.transparent-theme{background-color:rgba(0,0,0,.8)}.tippy-popper .tippy-tooltip.transparent-theme[data-animatefill]{background-color:transparent}.tippy-popper .tippy-tooltip.light-theme{color:#203d5d;box-shadow:0 4px 20px 4px rgba(0,20,60,.1),0 4px 80px -8px rgba(0,20,60,.2);background-color:#fff}.tippy-popper .tippy-tooltip.light-theme[data-animatefill]{background-color:transparent}.tippy-tooltip{position:relative;color:#fff;border-radius:4px;font-size:.95rem;padding:.4rem .8rem;text-align:center;will-change:transform;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-color:#333}.tippy-tooltip--small{padding:.25rem .5rem;font-size:.8rem}.tippy-tooltip--big{padding:.6rem 1.2rem;font-size:1.2rem}.tippy-tooltip[data-animatefill]{overflow:hidden;background-color:transparent}.tippy-tooltip[data-inertia]{-webkit-transition-timing-function:cubic-bezier(.53,1,.36,.85);transition-timing-function:cubic-bezier(.53,2,.36,.85)}.tippy-tooltip [x-circle]{position:absolute;will-change:transform;background-color:#333;border-radius:50%;width:120%;width:calc(100% + 2rem);-webkit-transition:all ease-out;transition:all ease-out;left:50%;z-index:-1;opacity:0;overflow:hidden}.tippy-tooltip [x-circle]:before{content:"";padding-top:100%;padding-top:calc(60% + 2rem);float:left}@media (max-width:500px){.tippy-popper{max-width:96%;max-width:calc(100% - 20px)}}
\ No newline at end of file