Compare revisions

cbe10c84 · cbe10c84 · cbe10c84 · cbe10c84 · cbe10c84 · cbe10c84
--- a/FCHost/fchost/utility.cc
+++ b/FCHost/fchost/utility.cc
+#include "./utility.h"
+
+CefString cef_string_from_path(const std::filesystem::path& p)
+{
+	return CefString(p.native());
+}
+
+void cef_string_from_path(const std::filesystem::path& p, cef_string_t* str)
+{
+	const auto& pstr = p.native();
+#if defined(OS_WIN)
+	cef_string_from_wide(pstr.c_str(), pstr.size(), str);
+#else
+	cef_string_from_utf8(pstr.c_str(), pstr.size(), str);
+#endif
+}
--- a/FCHost/fchost/utility.h
+++ b/FCHost/fchost/utility.h
+#pragma once
+
+#include "include/capi/cef_base_capi.h"
+
+#include <filesystem>
+
+CefString cef_string_from_path(const std::filesystem::path& p);
+void cef_string_from_path(const std::filesystem::path& p, cef_string_t* str);
--- a/Makefile
+++ b/Makefile
-MAKEFLAGS += -r
-export TWEEGO_PATH=devTools/tweeGo/storyFormats
-HASH := $(shell git rev-list -n 1 --abbrev-commit HEAD)
-COMMIT := $(shell git rev-parse --short HEAD)
-TWEEGO := $(shell command -v tweego 2>/dev/null)
-ifndef TWEEGO
-	uname := $(shell uname -s)
-	arch := $(shell uname -m)
-	arch := $(shell if test $(arch) = x86_64 -o $(arch) = amd64; then echo 64; else echo 32; fi)
-	ifeq ($(uname),Linux)
-		ifeq ($(arch),64)
-			TWEEGO := devTools/tweeGo/tweego_nix64
-		else
-			TWEEGO := devTools/tweeGo/tweego_nix86
-		endif
-	else ifeq ($(uname),Darwin)
-		ifeq ($(arch),64)
-			TWEEGO := devTools/tweeGo/tweego_osx64
-		else
-			TWEEGO := devTools/tweeGo/tweego_osx86
-		endif
-	endif
-endif
-
-all: bin/FC_pregmod.html bin/resources
-
-git: bin/FC_pregmod_$(HASH).html bin/resources
-
-bin/resources: resources
-	test -L "$@" || ln -s "../$<" bin/
-
-bin/%.html: bin/tmp
-	rm src/002-config/fc-version.js.commitHash.js
-	mv $< $@
-
-bin/fc.js: bin/
-	devTools/concatFiles.sh js/ '*.js' $@
-
-bin/fc.css: bin/
-	devTools/concatFiles.sh css/ '*.css' $@
-
-bin/tmp: bin/fc.js bin/fc.css injectGitCommitHash
-	$(TWEEGO) --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html src/ > $@
-	rm -f bin/fc.js
-	rm -f bin/fc.css
-
-injectGitCommitHash:
-	printf "App.Version.commitHash = '%s';\n" $(COMMIT) > src/002-config/fc-version.js.commitHash.js
-
-bin/:
-	mkdir -p $@
-
-sanity:
-	./sanityCheck.sh
+# The workflow for updating the SugarCube format.js file

 sugarcube:
-	(cd submodules/sugarcube-2/ && node build.js -6 -b 2)
-	cp submodules/sugarcube-2/build/twine2/sugarcube-2/format.js devTools/tweeGo/storyFormats/sugarcube-2/format.js
+	echo "Compiling SugarCube"
+	(cd submodules/sugarcube-2/ && node build.js -n -b 2)
+	mv submodules/sugarcube-2/build/twine2/sugarcube-2/format.js devTools/tweeGo/storyFormats/sugarcube-2/format.js
+	(cd submodules/sugarcube-2/ && git diff master fc-rebased > sugarcube-fc-changes.patch)
+	mv submodules/sugarcube-2/sugarcube-fc-changes.patch devNotes/"sugarcube stuff"/sugarcube-fc-changes.patch

-.PHONY: all sanity git sugarcube
+.PHONY: sugarcube
--- a/README.md
+++ b/README.md
+<!-- cSpell:ignore nwjs -->
+
 # Free Cities - pregmod

 Pregmod is a modification of the original [Free Cities](https://freecitiesblog.blogspot.com/) created by FCdev.

 ## Play the game

-To play the game you have to download the sources first. You can either download an archive of the current state or, if
-you plan to keep up to date with current progress, clone the repository.
-
-Clone the repo:
-
-1. [Install Git for terminal](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) or a Git GUI of your choice.
-2. Clone the repo
-    * Via terminal: `git clone --single-branch https://gitgud.io/pregmodfan/fc-pregmod.git`
-3. Get updates
-    * Via terminal: `git pull`
-
-Compile the game:
-
-* Windows
-    * Run compile.bat
-    * Second run of compile.bat will overwrite without prompt
-
-* Linux/Mac
-    1. Ensure executable permission on file `devTools/tweeGo/tweego` (not tweego.exe!)
-    2. Ensure executable permission on file `compile.sh`
-    3. In the root dir of sources (where you see src, devTools, bin...) run command `./compile.sh` from console.
-        Alternatively, if you have make installed, run `make all` in the root directory.
-
-To play open FCpregmod.html in bin/ (Recommendation: Drag it into incognito mode)
+* WARNING - FCHost users need to update or rebuild FCHost before running alpha.34 or later (or the latest build) or it WILL DELETE YOUR LOCAL SAVES!!! Download info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/README.md?ref_type=heads#fchost and build info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/HowToBuild.md#how-to-build
+
+1. Download the game
+   * [Current release](https://gitgud.io/pregmodfan/fc-pregmod/-/releases)
+   * [Latest build](https://gitgud.io/pregmodfan/fc-pregmod/-/jobs/artifacts/pregmod-master/download?job=build)
+2. Open the game in your preferred browser
+   * On PC, we recommend either Firefox or [FCHost](FCHost/README.md).
+   * Recommendation: Drag it into incognito mode
+3. Have fun!
+
+### Compile the game yourself
+
+If you want to tweak the game a bit, you can easily download the files and compile it yourself.
+
+1. Clone the git repository:
+   1. [Install Git for terminal](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) or a Git GUI of your
+      choice.
+   2. Clone the repo
+       * Via terminal: `git clone --single-branch https://gitgud.io/pregmodfan/fc-pregmod.git`
+   3. Get updates
+       * Via terminal: `git pull`
+
+2. Compile the game:
+   * Using one of two methods
+     1. The simple compiler by running `simple-compiler.bat` (Windows) or `simple-compiler.sh` (Mac/Linux)
+         * Benefits:
+           * Requires no external dependencies
+           * Slightly faster compiling
+     2. The advanced compiler by running `compile.bat` (Windows) or `compile.sh` (Mac/Linux)
+         * Requires:
+           * [Git](https://git-scm.com/)
+           * [Node.js](https://nodejs.org)
+           * ~500 MB of Node packages
+           * `compile.[bat, sh]` will attempt to help you with the installation of its dependencies
+         * Benefits:
+           * Easier debugging
+           * Early problem detection
+           * Spell checking
+           * Tweaking of compiler settings by running `setup.bat` (Windows) or `setup.sh` (Mac/Linux)
+           * Copies `FC_pregmod.html` to `FCHost` if it is installed
+           * Live reloading of FC after file changes by running `watcher.bat` (Windows) or `watcher.sh` (Mac/Linux)
+   * We suggest using the advanced compiler when possible.
+   * **The second run of the compiler will overwrite the existing `FC_pregmod.html` file!**
+   * **All our tooling expects that you are running them in FC's root directory** (Where you see devTools, src, js, etc). Failure to do so will result in errors.
+   * If you are using an ARM-based device, you may need to use `arch -x86_64 bash [compile or simple-compiler].sh` to properly compile.
+
+3. To play open `FC_pregmod.html` in the `bin/` folder
+  * Repeat steps 2 and 3 after you make any changes or use `watcher.[bat, sh]` to do them automatically.

 ## Common problems

-* I get an error on gamestart reading `Apologies! A fatal error has occurred. Aborting. Error: Unexpected token @ in
-    JSON at position 0. Stack Trace: SyntaxError: Unexpected token @ in JSON at position 0 at JSON.parse (<anonymous>)
-    at JSON.value` or some variant
-    - clear cookies
+* If compiling takes a long time (more than 2 minutes) or causes a noticeable increase in system resource utilisation.
+  - FC's compiler makes a lot of file changes over a short period of time. Some Antivirus programs will make FC's compiler wait while it scans the contents of each changed file. So it might be worth making sure FC's directory is excluded in your Antivirus settings.
+    * If your Antivirus is Windows Defender (currently tested with Windows 10 on 04/14/2024):
+      * `Start menu` -> `Windows Security` -> `Virus & threat protection` -> `Virus & threat protection settings` ->
+      `Manage settings` -> `Exclusions (near the bottom)` -> `Add or remove exclusions` -> `Add an exclusion` ->
+      `path to FC's root directory (Where you see devTools, src, js, etc).`
+
+* `sessionStorage quota exceeded` / `localStorage quota exceeded` or something similar
+  - Your saves stored inside the browser are getting too large. There are multiple ways to solve this:
+    1. Delete saves stored in the browser. If you want to keep them, save them to disk first.
+    2. Disable autosave and delete the current one. Due to technical reasons autosaves are larger than normal saves, so this may help more than expected.
+    3. If on Firefox, raise the storage limit: Type `about:config` in the address bar and search for
+       `dom.storage.default_quota`. Increase this value as needed. Default value is 5120 kilobytes / 5 MB.
+    4. Switch to a different browser. Recommended is either Firefox or [FCHost](FCHost/README.md), a custom HTML renderer specifically for Pregmod.
+    5. If you absolutely need to use Google Chrome:
+       1. download and unzip [NW.js SDK](https://nwjs.io/downloads/) for your operative system.
+       2. copy the game file (FC_pregmod.html) into the `nwjs-sdk-v0.XX.Y-YOUR_OS` folder
+       3. in the same folder, create a text file with the following content:
+          ```
+          {
+              "name": "Free Cities pregmod edition",
+              "main": "FC_pregmod.html",
+              "dom_storage_quota":30
+          }
+          ```
+          and save it as package.json. In this example, 30 is the limit (in MB) that is set for the storage quota,
+          but you can replace it with any number. Google Chrome has the same default value as Firefox.
+       4. Double click nw.exe to launch the game.

 * Everything is broken!
-    - Do not copy over your existing download as it may leave old files behind, replace it entirely
+  - **Do not copy over your existing download** as it may leave old files behind, replace it entirely

 * I can't save more than once or twice.
-    - Known issue caused by SugarCube level changes. Save to file doesn't have this problem and will likely avoid the first problem as well.
-    - It is possible to increase the memory utilized by your browser to delay this
-
-* I wish to report a sanityCheck issue.
-    - Great, however a large majority of the results are false positives coming from those specific sections being split
-      over several lines in the name of readability and git grep's
-      [intentionally](http://git.661346.n2.nabble.com/bug-git-grep-P-and-multiline-mode-td7613900.html ) lacking support
-       for multiline. An Attempt to add -Pzl (https://gitgud.io/pregmodfan/fc-pregmod/merge_requests/2108 ) created a
-       sub condition black hole. What follows are examples of common false positives that can safely be ignored:
-```
-[MissingClosingAngleBracket]src/art/vector/Generate_Stylesheet.tw:11:<<print "<style>."+_art_display_class+" {
-	<<print "<style>."+_art_display_class+" {
-position: absolute;
-height: 100%;
-margin-left: auto;
-margin-right: auto;
-left: 0;
-right: 0;
-}
-```
+  - Known issue caused by SugarCube level changes. Save to file doesn't have this problem and will likely avoid the
+    first problem as well.
+  - It is possible to increase the memory utilized by your browser to delay this
+
+* I wish to report an issue.
+  1. Search [issues](https://gitgud.io/pregmodfan/fc-pregmod/-/issues) to see if someone has already reported the issue.
+  2. [Open a new issue](https://gitgud.io/pregmodfan/fc-pregmod/-/issues/new) or, if you are interested in trying to fix it yourself, please see our guide on [contributing](CONTRIBUTING.md).

 ## Contribute

-New Contributors are always welcome. Basic information before you start can be found [here](CONTRIBUTING.md)
+New Contributors are always welcome. Basic information before you start can be found [here](CONTRIBUTING.md).

 ## Submodules


--- a/artTools/README.md
+++ b/artTools/README.md
+<!-- cSpell:ignore faraen, eart, lxml, XMLID -->
+
 # How to vector art

 Please read the whole document before starting to work.
@@ -36,6 +38,48 @@ While editing, keep the Layers in mind.
 * There are some globally available styles defined as CSS classes (e.g. skin, hair).
  Use them if your asset should be changed upon display.
  Do not set the style directly in the object.
+* You can use Inkscape to define and add classes to paths. 
+  To add a class to a path, open the XML editor with the path selected (Edit → XML Editor...)
+  Delete all fields except for those with the names 'id', and 'd'.
+  Add a new field to the path and name it 'class'.
+  Make its value one of the values defined in the below section.
+  
+**MAINTAIN THESE CLASS DEFINITIONS BY MANUALLY EDITING YOUR WORKING SVG FILE**
+
+	<style
+	type="text/css"
+	id="style">
+	/* please maintain these definitions manually */
+	.white{fill:#FFFFFF;}
+	.skin{fill:#F6E0E8;}
+	.head{}
+	.eart{}
+	.torso{}
+	.tail{}
+	.boob{}
+	.penis{}
+	.scrotum{}
+	.areola{fill:#D76B93;}
+	.bellybutton{fill:#D76B93;}
+	.labia{fill:#D76B93;}
+	.hair{fill:#3F403F;}
+	.eyebrow_hair{fill:#3F403F;}
+	.shoe{fill:#3E65B0;}
+	.shoe_shadow{fill:#15406D;}
+	.smart_piercing{fill:#4DB748;}
+	.steel_piercing{fill:#787878;}
+	.steel_chastity{fill:#BABABA;}
+	.gag{fill:#BF2126;}
+	.shadow{fill:#010101;}
+	.glasses{}
+	.eye{}
+	.sclera{fill:#FFFFFF;}
+	.lips{}
+	</style>
+	
+You should be able to find this structure somewhere in the first 500 lines of your working svg file.
+	
+The formatting of these definitions matters for `normalize_svg.py`, which is invoked as part of `vector_layer_split.py` and explained below.

 ## 3. Normalize the document (before committing)

@@ -48,7 +92,7 @@ Use

 before committing to normalize the format so git will not freak out about the changed indentation.

-If you use Inkscape, please use in Edit → Settings → Input/Output → SVG-Output → Path Data → Optimized. This is the default.
+If you use Inkscape, please use Edit → Settings → Input/Output → SVG-Output → Path Data → Optimized. This is the default.
 In case your Editor uses another path data style which cannot be changed, please contact the other artists and developers via the issue tracker to find a new common ground.

 What it does:

--- a/artTools/normalize_svg.py
+++ b/artTools/normalize_svg.py
 #!/usr/bin/env python3

-'''
+"""
 Application for "normalizing" SVGs

 These problems are addressed:
@@ -13,125 +13,125 @@ https://bugs.launchpad.net/inkscape/+bug/167937

 Usage Example:
 python3 inkscape_svg_fixup.py vector_source.svg
-'''
+"""

-import lxml.etree as etree
-import sys
 import re
+import sys
+
+import lxml.etree as etree

 color_classes = {
-	'skin', 'head', 'torso', 'boob', 'penis', 'scrotum', 'belly', 'areola', 'bellybutton', 'labia', 'hair',
-	'pubic_hair', 'armpit_hair', 'eyebrow_hair', 'shoe', 'shoe_shadow', 'smart_piercing', 'steel_piercing',
-	'steel_chastity', 'outfit_base', 'gag', 'shadow', 'glasses', 'eye', 'sclera',
-	'white', 'skin', 'skin_highlight', 'skin_shade', 'skin_strong_highlight', 'skin_strong_shade', 'arm',
-	'arm_highlight', 'arm_shade', 'head', 'head_highlight', 'head_shade', 'torso', 'torso_highlight',
-	'torso_shade', 'boob', 'boob_highlight', 'boob_shade', 'penis', 'penis_highlight', 'penis_shade',
-	'scrotum', 'scrotum_highlight', 'scrotum_shade', 'belly', 'belly_highlight', 'belly_shade', 'neck',
-	'neck_highlight', 'neck_shade', 'legs', 'legs_highlight', 'legs_shade', 'butt', 'butt_highlight',
-	'butt_shade', 'feet', 'feet_highlight', 'feet_shade', 'areola', 'labia', 'hair', 'shoe_shadow',
-	'smart_piercing', 'steel_piercing', 'steel_chastity', 'gag', 'shadow', 'glasses', 'lips', 'eyeball',
-	'iris', 'highlight1', 'highlight2', 'highlight3', 'highlightStrong', 'armpit_hair', 'pubic_hair',
-	'muscle_tone', 'belly_details', 'shoe_primary', 'shoe_primary_highlight', 'shoe_primary_shade',
-	'shoe_accent', 'shoe_accent_highlight', 'shoe_accent_shade', 'top_primary', 'top_primary_highlight',
-	'top_primary_shade', 'top_accent', 'top_accent_highlight', 'top_accent_shade', 'bottoms_primary',
-	'bottoms_primary_highlight', 'bottoms_primary_shade', 'bottoms_accent', 'bottoms_accent_highlight',
-	'bottoms_accent_shade', 'bra_primary', 'bra_primary_highlight', 'bra_primary_shade', 'bra_accent',
-	'bra_accent_highlight', 'bra_accent_shade', 'bra_strap1', 'bra_strap2', 'bra_strap3', 'shirt_center1',
-	'shirt_center2', 'shirt_center3', 'panties_primary', 'panties_primary_highlight', 'panties_primary_shade',
-	'panties_accent', 'panties_accent_highlight', 'panties_accent_shade', 'stockings_primary',
-	'stockings_accent', 'top_primary_strong_highlight', 'top_primary_strong_shade',
-	'top_accent_strong_highlight', 'top_accent_strong_shade', 'bottoms_primary_strong_highlight',
-	'bottoms_primary_strong_shade', 'bottoms_accent_strong_highlight', 'bottoms_accent_strong_shade',
-	'bellymask_1', 'bellymask_2', 'bellymask_3', 'bellymask_4', 'bellymask_5', 'bellymask_6', 'bellymask_7',
-	'bellymask_8', 'bellymask_9', 'bellymask_normal', 'bellymask_hourglass', 'bellymask_unnatural', "feet_nails"
+    'skin', 'head', 'torso', 'boob', 'penis', 'scrotum', 'belly', 'areola', 'bellybutton', 'labia', 'hair',
+    'pubic_hair', 'armpit_hair', 'eyebrow_hair', 'shoe', 'shoe_shadow', 'smart_piercing', 'steel_piercing',
+    'steel_chastity', 'outfit_base', 'gag', 'shadow', 'glasses', 'eye', 'sclera', 'eart', 'tail',
+    'white', 'skin', 'skin_highlight', 'skin_shade', 'skin_strong_highlight', 'skin_strong_shade', 'arm',
+    'arm_highlight', 'arm_shade', 'head', 'head_highlight', 'head_shade', 'torso', 'torso_highlight',
+    'torso_shade', 'boob', 'boob_highlight', 'boob_shade', 'penis', 'penis_highlight', 'penis_shade',
+    'scrotum', 'scrotum_highlight', 'scrotum_shade', 'belly', 'belly_highlight', 'belly_shade', 'neck',
+    'neck_highlight', 'neck_shade', 'legs', 'legs_highlight', 'legs_shade', 'butt', 'butt_highlight',
+    'butt_shade', 'feet', 'feet_highlight', 'feet_shade', 'areola', 'labia', 'hair', 'shoe_shadow',
+    'smart_piercing', 'steel_piercing', 'steel_chastity', 'gag', 'shadow', 'glasses', 'lips', 'eyeball',
+    'iris', 'highlight1', 'highlight2', 'highlight3', 'highlightStrong', 'armpit_hair', 'pubic_hair',
+    'muscle_tone', 'belly_details', 'shoe_primary', 'shoe_primary_highlight', 'shoe_primary_shade',
+    'shoe_accent', 'shoe_accent_highlight', 'shoe_accent_shade', 'top_primary', 'top_primary_highlight',
+    'top_primary_shade', 'top_accent', 'top_accent_highlight', 'top_accent_shade', 'bottoms_primary',
+    'bottoms_primary_highlight', 'bottoms_primary_shade', 'bottoms_accent', 'bottoms_accent_highlight',
+    'bottoms_accent_shade', 'bra_primary', 'bra_primary_highlight', 'bra_primary_shade', 'bra_accent',
+    'bra_accent_highlight', 'bra_accent_shade', 'bra_strap1', 'bra_strap2', 'bra_strap3', 'shirt_center1',
+    'shirt_center2', 'shirt_center3', 'panties_primary', 'panties_primary_highlight', 'panties_primary_shade',
+    'panties_accent', 'panties_accent_highlight', 'panties_accent_shade', 'stockings_primary',
+    'stockings_accent', 'top_primary_strong_highlight', 'top_primary_strong_shade',
+    'top_accent_strong_highlight', 'top_accent_strong_shade', 'bottoms_primary_strong_highlight',
+    'bottoms_primary_strong_shade', 'bottoms_accent_strong_highlight', 'bottoms_accent_strong_shade',
+    'bellymask_1', 'bellymask_2', 'bellymask_3', 'bellymask_4', 'bellymask_5', 'bellymask_6', 'bellymask_7',
+    'bellymask_8', 'bellymask_9', 'bellymask_normal', 'bellymask_hourglass', 'bellymask_unnatural', "feet_nails"
 }


 def fix(tree):
-	# know namespaces
-	ns = {
-		'svg': 'http://www.w3.org/2000/svg',
-		'inkscape': 'http://www.inkscape.org/namespaces/inkscape'
-	}
-
-	# find document global style definition
-	# mangle it and interpret as python dictionary
-	style_element = tree.find('./svg:style', namespaces=ns)
-	style_definitions = style_element.text
-	pythonic_style_definitions = '{'+style_definitions.\
-		replace('\t.', '"').replace('{', '":"').replace('}', '",').\
-		replace('/*', '#')+'}'
-	styles = eval(pythonic_style_definitions)
+    # know namespaces
+    ns = {
+        'svg': 'http://www.w3.org/2000/svg',
+        'inkscape': 'http://www.inkscape.org/namespaces/inkscape'
+    }

-	# go through all SVG elements
-	for elem in tree.iter():
-		if (elem.tag == etree.QName(ns['svg'], 'g')):
-			# compare inkscape label with group element ID
-			lbl = elem.get(etree.QName(ns['inkscape'], 'label'))
-			if lbl:
-				i = elem.get('id')
-				if (i != lbl):
-					print("Overwriting ID %s with Label %s..." % (i, lbl))
-					elem.set('id', lbl)
-		# clean styles (for easier manual merging)
-		style_string = elem.get('style')
-		if style_string:
-			split_styles = style_string.strip('; ').split(';')
-			styles_pairs = [s.strip('; ').split(':') for s in split_styles]
-			filtered_pairs = [(k, v) for k, v in styles_pairs if not (
-				k.startswith('font-') or
-				k.startswith('text-') or
-				k.endswith('-spacing') or
-				k in ["line-height", " direction", " writing", " baseline-shift", " white-space", " writing-mode"]
-			)]
-			split_styles = [':'.join(p) for p in filtered_pairs]
-			style_string = ';'.join(sorted(split_styles))
-			elem.attrib["style"] = style_string
+    # find document global style definition
+    # mangle it and interpret as python dictionary
+    style_element = tree.find('./svg:style', namespaces=ns)
+    style_definitions = style_element.text
+    pythonic_style_definitions = '{' + style_definitions. \
+        replace('\t.', '"').replace('{', '":"').replace('}', '",'). \
+        replace('/*', '#') + '}'
+    styles = eval(pythonic_style_definitions)

-		# remove all style attributes offending class styles
-		s = elem.get('style')
-		c = elem.get('class')
-		if (c and s):
-			if 'i' in locals():
-				s = s.lower()
-				c = c.split(' ')[0]  # regard main style only
-				classes = c.split(' ')
-				hasColorClass = any(x in color_classes for x in classes)
-				if hasColorClass:
-					s_new = re.sub('fill:#[0-9a-f]+;?', '', s)
-					if s != s_new:
-						print("Explicit fill was removed from style string ({0}) for element with ID {1} "
-												"because its class ({2}) controls the fill color".format(s, i, c))
-						s = s_new
-				if s == 'style=""':  # the style is empty now
-					del elem.attrib["style"]
-					continue
-				cs = ''
-				if c in styles:
-					cs = styles[c].strip('; ').lower()
-				if (c not in styles):
-					print("Object id %s references unknown style class %s." % (i, c))
-				else:
-					if (cs != s.strip('; ')):
-						print("Style %s removed from object id %s differed from class %s style %s." % (s, i, c, cs))
-						del elem.attrib["style"]
-			else:
-				print('--------------------------- i not defined - propably a clip-path with a style ---------------------------')
-				print("Element tag: ".format(elem.tag))
-				print("Element style: ".format(s))
-				print("Element class: ".format(c))
-				print(etree.tostring(elem, pretty_print=True))
-				print('--------------------------- i not defined - propably a clip-path with a style ---------------------------')
-		# remove explicit fill color if element class is one of the color_classes
+    # go through all SVG elements
+    for elem in tree.iter():
+        if elem.tag == etree.QName(ns['svg'], 'g'):
+            # compare inkscape label with group element ID
+            lbl = elem.get(etree.QName(ns['inkscape'], 'label'))
+            if lbl:
+                i = elem.get('id')
+                if i != lbl:
+                    print("Overwriting ID %s with Label %s..." % (i, lbl))
+                    elem.set('id', lbl)
+        # clean styles (for easier manual merging)
+        style_string = elem.get('style')
+        if style_string:
+            split_styles = style_string.strip('; ').split(';')
+            styles_pairs = [s.strip('; ').split(':') for s in split_styles]
+            filtered_pairs = [(k, v) for k, v in styles_pairs if not (
+                    k.startswith('font-') or
+                    k.startswith('text-') or
+                    k.endswith('-spacing') or
+                    k in ["line-height", " direction", " writing", " baseline-shift", " white-space", " writing-mode"]
+            )]
+            split_styles = [':'.join(p) for p in filtered_pairs]
+            style_string = ';'.join(sorted(split_styles))
+            elem.attrib["style"] = style_string

+        # remove all style attributes offending class styles
+        s = elem.get('style')
+        c = elem.get('class')
+        if c and s:
+            if 'i' in locals():
+                s = s.lower()
+                c = c.split(' ')[0]  # regard main style only
+                classes = c.split(' ')
+                has_color_class = any(x in color_classes for x in classes)
+                if has_color_class:
+                    s_new = re.sub('fill:#[0-9a-f]+;?', '', s)
+                    if s != s_new:
+                        print("Explicit fill was removed from style string ({0}) for element with ID {1} "
+                              "because its class ({2}) controls the fill color".format(s, i, c))
+                        s = s_new
+                if s == 'style=""':  # the style is empty now
+                    del elem.attrib["style"]
+                    continue
+                cs = ''
+                if c in styles:
+                    cs = styles[c].strip('; ').lower()
+                if c not in styles:
+                    print("Object id %s references unknown style class %s." % (i, c))
+                else:
+                    if cs != s.strip('; '):
+                        print("Style %s removed from object id %s differed from class %s style %s." % (s, i, c, cs))
+                        del elem.attrib["style"]
+            else:
+                print('--------------------------- i not defined - propably a clip-path with a style ---------------------------')
+                print("Element tag: ".format(elem.tag))
+                print("Element style: ".format(s))
+                print("Element class: ".format(c))
+                print(etree.tostring(elem, pretty_print=True))
+                print('--------------------------- i not defined - propably a clip-path with a style ---------------------------')
+    # remove explicit fill color if element class is one of the color_classes


 if __name__ == "__main__":
-	input_file = sys.argv[1]
-	tree = etree.parse(input_file)
-	fix(tree)
-	# store SVG into file (input file is overwritten)
-	svg = etree.tostring(tree, pretty_print=True)
-	with open(input_file, 'wb') as f:
-		f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
-		f.write(svg)
+    input_file = sys.argv[1]
+    tree = etree.parse(input_file)
+    fix(tree)
+    # store SVG into file (input file is overwritten)
+    svg = etree.tostring(tree, pretty_print=True)
+    with open(input_file, 'wb') as f:
+        f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
+        f.write(svg)
--- a/artTools/svg_split_utils.py
+++ b/artTools/svg_split_utils.py
+import os
+import subprocess
+import sys
+
+if os.name == "nt":
+    minifier = "../devTools/minify/minify_win_amd64.exe"
+elif sys.platform == "darwin":
+    minifier = "../devTools/minify/minify_darwin_amd64"
+else:
+    # probably linux, if not we don't have an alternative anyways.
+    minifier = "../devTools/minify/minify_linux_amd64"
+
+
+def save(layer, prefix, output_directory, output_format, svg_data):
+    i = layer.get('id')
+    output_path = os.path.join(output_directory, "{0}{1}.svg".format(prefix, i))
+    if output_format == 'svg':
+        with open(output_path, 'wb') as f:
+            # Header for normal SVG (XML)
+            f.write(f'<?xml version="1.0" encoding="UTF-8" standalone="no"?>{os.linesep}'.encode("utf-8"))
+            f.write(svg_data)
+    elif output_format == 'tw':
+        # send to minifier through stdin, which then saves to file
+        subprocess.run([minifier, "--mime=image/svg+xml", "-o", output_path],
+                       input=svg_data)
--- a/artTools/vector_clothing_replicator.py
+++ b/artTools/vector_clothing_replicator.py
 #!/usr/bin/env python3

-'''
+"""
 Application for procedural content adaption
 *THIS IS VERY EXPERIMENTAL*
 Contains a very poor man's implementation of spline mesh warping.
@@ -23,15 +23,16 @@ python3 vector_clothing_replicator.py infile clothing bodypart destinationfile
 Usage Example:
 python3 vector_clothing_replicator.py vector_source.svg Straps Boob vector_destination.svg
 python3 vector_clothing_replicator.py vector_source.svg Straps Torso vector_destination.svg
-'''
+"""

-from svg.path import parse_path
 import copy
-import lxml.etree as etree
 import sys

+import lxml.etree as etree
+from svg.path import parse_path
+
 REFERENCE_PATH_SAMPLES = 200
-EMBED_REPLICATIONS = True # whether to embed all replications into the input file or output separate files
+EMBED_REPLICATIONS = True  # whether to embed all replications into the input file or output separate files

 input_file = sys.argv[1]
 clothing = sys.argv[2]
@@ -39,121 +40,127 @@ bodypart = sys.argv[3]
 output_file_embed = sys.argv[4]

 # TODO: make these configurable
-output_file_pattern = '%s_%s_%s.svg' #bodypart, target_id, clothing
-
-if ('Torso' == bodypart):
-  xpath_shape = './svg:g[@id="Torso_"]/svg:g[@id="Torso_%s"]/svg:path[@class="skin torso"]/@d' # TODO: formulate more general, independent of style
-  xpath_outfit_container = '//svg:g[@id="Torso_Outfit_%s_"]'%(clothing)
-  xpath_outfit = '//svg:g[@id="Torso_Outfit_%s_%s"]'%(clothing,'%s')
-  target_ids = "Unnatural,Hourglass,Normal".split(",")
-  reference_id = "Hourglass"
+output_file_pattern = '%s_%s_%s.svg'  # bodypart, target_id, clothing
+
+if 'Torso' == bodypart:
+    xpath_shape = './svg:g[@id="Torso_"]/svg:g[@id="Torso_%s"]/svg:path[@class="skin torso"]/@d'  # TODO: formulate more general, independent of style
+    xpath_outfit_container = '//svg:g[@id="Torso_Outfit_%s_"]' % (clothing)
+    xpath_outfit = '//svg:g[@id="Torso_Outfit_%s_%s"]' % (clothing, '%s')
+    target_ids = "Unnatural,Hourglass,Normal".split(",")
+    reference_id = "Hourglass"
 else:
-  raise RuntimeError("Please specify a bodypart for clothing to replicate.")
+    raise RuntimeError("Please specify a bodypart for clothing to replicate.")

 tree = etree.parse(input_file)
-ns = {'svg' : 'http://www.w3.org/2000/svg'}
+ns = {'svg': 'http://www.w3.org/2000/svg'}

 canvas = copy.deepcopy(tree)
-for e in canvas.xpath('./svg:g',namespaces=ns)+canvas.xpath('./svg:path',namespaces=ns):
-  # TODO: this should be "remove all objects, preserve document properties"
-  e.getparent().remove(e)
+for e in canvas.xpath('./svg:g', namespaces=ns) + canvas.xpath('./svg:path', namespaces=ns):
+    # TODO: this should be "remove all objects, preserve document properties"
+    e.getparent().remove(e)
+

 def get_points(xpath_shape):
-  '''
-  This function extracts reference paths by the given xpath selector.
-  Each path is used to sample a fixed number of points.
-  '''
-  paths_data = tree.xpath(xpath_shape,namespaces=ns)
-  points = []
-  path_length = None
-  for path_data in paths_data:
-	p = parse_path(path_data)
-	points += [
-	  p.point(1.0/float(REFERENCE_PATH_SAMPLES)*i)
-	  for i in range(REFERENCE_PATH_SAMPLES)
-	]
-  if (not points):
-	raise RuntimeError(
-	  'No paths for reference points found by selector "%s".'%(xpath_shape)
-	)
-  return points
+    """
+    This function extracts reference paths by the given xpath selector.
+    Each path is used to sample a fixed number of points.
+    """
+    paths_data = tree.xpath(xpath_shape, namespaces=ns)
+    points = []
+    path_length = None
+    for path_data in paths_data:
+        p = parse_path(path_data)
+        points += [
+            p.point(1.0 / float(REFERENCE_PATH_SAMPLES) * i)
+            for i in range(REFERENCE_PATH_SAMPLES)
+        ]
+    if not points:
+        raise RuntimeError(
+            'No paths for reference points found by selector "%s".' % xpath_shape
+        )
+    return points
+

 def point_movement(point, reference_points, target_points):
-  '''
-  For a given point, finds the nearest point in the reference path.
-  Gives distance vector from the nearest reference point to the
-  respective target reference point.
-  '''
-  distances = [abs(point-reference_point) for reference_point in reference_points]
-  min_ref_dist_idx = min(enumerate(distances), key=lambda x:x[1])[0]
-  movement = target_points[min_ref_dist_idx] - reference_points[min_ref_dist_idx]
-  return movement
-
-reference_points = get_points(xpath_shape%(reference_id))
-container = tree.xpath(xpath_outfit_container,namespaces=ns)
-if (len(container) != 1):
-  raise RuntimeError('Outfit container selector "%s" does not yield exactly one layer.'%(xpath_outfit_container))
+    """
+    For a given point, finds the nearest point in the reference path.
+    Gives distance vector from the nearest reference point to the
+    respective target reference point.
+    """
+    distances = [abs(point - reference_point) for reference_point in reference_points]
+    min_ref_dist_idx = min(enumerate(distances), key=lambda x: x[1])[0]
+    movement = target_points[min_ref_dist_idx] - reference_points[min_ref_dist_idx]
+    return movement
+
+
+reference_points = get_points(xpath_shape % reference_id)
+container = tree.xpath(xpath_outfit_container, namespaces=ns)
+if len(container) != 1:
+    raise RuntimeError('Outfit container selector "%s" does not yield exactly one layer.' % xpath_outfit_container)
 container = container[0]
-outfit_source = container.xpath(xpath_outfit%(reference_id),namespaces=ns)
-if (len(outfit_source) != 1):
-  raise RuntimeError('Outfit source selector "%s" does not yield exactly one outfit layer in container selected by "%s".'%(xpath_outfit%(reference_id), xpath_outfit_container))
+outfit_source = container.xpath(xpath_outfit % reference_id, namespaces=ns)
+if len(outfit_source) != 1:
+    raise RuntimeError(
+        'Outfit source selector "%s" does not yield exactly one outfit layer in container selected by "%s".' % (
+            xpath_outfit % reference_id, xpath_outfit_container))
 outfit_source = outfit_source[0]

 for target_id in target_ids:
-  print(
-	'Generating variant "%s" of clothing "%s" for bodypart "%s"...'%
-	(target_id, clothing, bodypart)
-  )
-  outfit = copy.deepcopy(outfit_source)
-  paths = outfit.xpath('./svg:path',namespaces=ns)
-  if target_id == reference_id:
-	print("This is the source variant. Skipping...")
-  else:
-	layerid = outfit.get('id').replace('_%s'%(reference_id),'_%s'%(target_id))
-	outfit.set('id', layerid)
-	outfit.set(etree.QName('http://www.inkscape.org/namespaces/inkscape', 'label'), layerid) # for the Inkscape-users
-	target_points = get_points(xpath_shape%(target_id))
-	if (len(reference_points) != len(target_points)):
-	  raise RuntimeError(
-		('Different amounts of sampled points in reference "%s" and target "%s" paths. '+
-		'Selector "%s" probably matches different number of paths in the two layers.')%
-		(reference_id, target_id, xpath_shape)
-	  )
-	for path in paths:
-	  path_data = path.get("d")
-	  p = parse_path(path_data)
-	  for segment in p:
-		original_distance = abs(segment.end-segment.start)
-		start_movement = point_movement(segment.start, reference_points, target_points)
-		segment.start += start_movement
-		end_movement = point_movement(segment.end, reference_points, target_points)
-		segment.end += end_movement
-		distance = abs(segment.end-segment.start)
-		try:
-		  # enhance position of CubicBezier control points
-		  # amplification is relative to the distance gained by movement
-		  segment.control1 += start_movement
-		  segment.control1 += (segment.control1-segment.start)*(distance/original_distance-1.0)
-		  segment.control2 += end_movement
-		  segment.control2 += (segment.control2-segment.end)*(distance/original_distance-1.0)
-		except AttributeError as ae:
-		  # segment is not a CubicBezier
-		  pass
-	  path.set("d", p.d())
-	if EMBED_REPLICATIONS:
-	  container.append(outfit)
-  if not EMBED_REPLICATIONS:
-	container = copy.deepcopy(canvas).xpath('.',namespaces=ns)[0]
-	container.append(outfit)
-
-  if not EMBED_REPLICATIONS:
-	svg = etree.tostring(container, pretty_print=True)
-	with open((output_file_pattern%(bodypart, target_id, clothing)).lower(), 'wb') as f:
-	  f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
-	  f.write(svg)
+    print(
+        'Generating variant "%s" of clothing "%s" for bodypart "%s"...' %
+        (target_id, clothing, bodypart)
+    )
+    outfit = copy.deepcopy(outfit_source)
+    paths = outfit.xpath('./svg:path', namespaces=ns)
+    if target_id == reference_id:
+        print("This is the source variant. Skipping...")
+    else:
+        layerid = outfit.get('id').replace('_%s' % reference_id, '_%s' % target_id)
+        outfit.set('id', layerid)
+        outfit.set(etree.QName('http://www.inkscape.org/namespaces/inkscape', 'label'),
+                   layerid)  # for the Inkscape-users
+        target_points = get_points(xpath_shape % target_id)
+        if len(reference_points) != len(target_points):
+            raise RuntimeError(
+                ('Different amounts of sampled points in reference "%s" and target "%s" paths. ' +
+                 'Selector "%s" probably matches different number of paths in the two layers.') %
+                (reference_id, target_id, xpath_shape)
+            )
+        for path in paths:
+            path_data = path.get("d")
+            p = parse_path(path_data)
+            for segment in p:
+                original_distance = abs(segment.end - segment.start)
+                start_movement = point_movement(segment.start, reference_points, target_points)
+                segment.start += start_movement
+                end_movement = point_movement(segment.end, reference_points, target_points)
+                segment.end += end_movement
+                distance = abs(segment.end - segment.start)
+                try:
+                    # enhance position of CubicBezier control points
+                    # amplification is relative to the distance gained by movement
+                    segment.control1 += start_movement
+                    segment.control1 += (segment.control1 - segment.start) * (distance / original_distance - 1.0)
+                    segment.control2 += end_movement
+                    segment.control2 += (segment.control2 - segment.end) * (distance / original_distance - 1.0)
+                except AttributeError as ae:
+                    # segment is not a CubicBezier
+                    pass
+            path.set("d", p.d())
+        if EMBED_REPLICATIONS:
+            container.append(outfit)
+    if not EMBED_REPLICATIONS:
+        container = copy.deepcopy(canvas).xpath('.', namespaces=ns)[0]
+        container.append(outfit)
+
+    if not EMBED_REPLICATIONS:
+        svg = etree.tostring(container, pretty_print=True)
+        with open((output_file_pattern % (bodypart, target_id, clothing)).lower(), 'wb') as f:
+            f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
+            f.write(svg)

 if EMBED_REPLICATIONS:
-  svg = etree.tostring(tree, pretty_print=True)
-  with open(output_file_embed, 'wb') as f:
-	f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
-	f.write(svg)
+    svg = etree.tostring(tree, pretty_print=True)
+    with open(output_file_embed, 'wb') as f:
+        f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'.encode("utf-8"))
+        f.write(svg)
--- a/artTools/vector_deepmurk_extras.svg
+++ b/artTools/vector_deepmurk_extras.svg
@@ -14301,7 +14301,7 @@
   inkscape:connector-curvature="0"
   d="m 275.26378,165.16101 c -0.24741,-0.20233 -0.40657,-0.39957 -0.41866,-0.49424 0.59443,-0.44081 2.73299,-1.22002 3.5737,-1.67167 1.34564,-0.78438 2.43572,-1.00305 3.16183,0.34264 1.08347,-2.14678 3.64584,-0.39198 4.74684,-0.23561 5.00348,0.71063 7.58447,1.93656 8.85919,1.79572 -0.0429,1.02216 -7.25052,6.51089 -12.43514,6.02955 -5.63735,0.0537 -7.22484,-4.77021 -7.48776,-5.76639 z"
   id="path4815"
-   class="areola"
+   class="lip"
   style="fill:#d76b93" /><path
   sodipodi:nodetypes="ccccscscsscsssccccscccc"
   inkscape:connector-curvature="0"
@@ -14315,7 +14315,7 @@
  
  
  <path
-   class="areola"
+   class="lip"
   id="path3894"
   d="m 275.26383,165.69589 -5e-5,-5e-5 c -0.24741,-0.21873 -0.40657,-0.43196 -0.41866,-0.53431 1.41051,-1.13078 3.10302,-5.42572 6.79803,-2.99926 1.0991,-0.49268 2.23959,-0.89251 3.34059,-0.72346 5.00348,0.76824 8.92822,4.12479 10.20294,3.97254 -0.0429,1.10502 -7.00052,7.06994 -12.18514,6.54958 -6.4232,-0.80062 -7.53249,-6.04094 -7.73771,-6.26504 z"
   inkscape:connector-curvature="0"
@@ -14335,7 +14335,7 @@
 	 id="Mouth_TypeD"
 	 inkscape:label="Mouth_TypeD"
 	 style="display:none"><path
-	   class="areola"
+	   class="lip"
 	   id="path8199"
 	   d="m 275.70571,164.95554 c 1.23915,-0.50574 2.77388,-6.22503 6.05616,-4.11424 4.91199,-2.10859 8.69916,3.68583 11.71843,4.10088 -1.09392,1.46615 -1.00221,4.84767 -9.97053,6.22256 -7.43009,-1.6132 -7.24539,-3.73592 -7.80406,-6.2092 z"
 	   inkscape:connector-curvature="0"
@@ -14354,7 +14354,7 @@
 	   inkscape:connector-curvature="0"
 	   d="m 274.22874,163.7403 0.18459,0.0441 c 1.13336,-0.15224 4.12051,-4.54566 6.71792,-2.9431 1.78388,-1.79923 9.75547,2.22742 14.80161,2.90764 -1.02718,1.59873 -5.43201,6.65963 -13.0452,7.65887 -5.95821,-1.45687 -8.44457,-7.44345 -8.65892,-7.66755 z"
 	   id="path2558-9-2"
-	   class="areola"
+	   class="lip"
 	   style="fill:#d76b93" /><path
 	   sodipodi:nodetypes="cccscccsccccsscssssscscccccccscccccscscssccccscsc"
 	   inkscape:connector-curvature="0"
@@ -14369,7 +14369,7 @@
 	   inkscape:connector-curvature="0"
 	   d="m 280.21507,158.05707 c 6.25991,-1.57826 10.97517,3.24388 13.24314,5.64768 -0.62988,1.73131 1.1191,11.87454 -9.35182,12.21087 -6.72091,-1.67784 -4.32841,-10.80221 -4.53363,-11.02631 -1.04388,-2.61967 -5.44275,-8.33534 0.64231,-6.83224 z"
 	   id="path2558-9-2-4"
-	   class="areola"
+	   class="lip"
 	   style="fill:#d76b93" /><path
 	   sodipodi:nodetypes="csssccc"
 	   inkscape:connector-curvature="0"
@@ -14407,7 +14407,7 @@
   inkscape:connector-curvature="0"
   d="m 274.93237,166.08259 -5e-5,-5e-5 c -0.64515,-0.37341 -0.22979,-0.95124 0.48732,-0.67794 1.41051,-1.13078 0.85662,-4.71566 5.72351,-3.41421 8.18916,-2.06473 14.07197,3.68 14.21541,4.23346 0.254,0.98002 -7.9849,5.81994 -12.35702,6.11208 -5.70445,-1.45687 -7.86395,-6.02924 -8.06917,-6.25334 z"
   id="path2558-9"
-   class="areola"
+   class="lip"
   style="fill:#d76b93" /><path
   sodipodi:nodetypes="scccccccccscccccscscsccccccccccccscscccccscscsc"
   inkscape:connector-curvature="0"
@@ -15854,9 +15854,9 @@
 	  </g>
 	  <g
   inkscape:groupmode="layer"
-   id="Hair_Fore_Up_Med"
+   id="Hair_Fore_Up_Medium"
   style="display:none;opacity:1"
-   inkscape:label="Hair_Fore_Up_Med">
+   inkscape:label="Hair_Fore_Up_Medium">
 		<path
   d="m 262.63033,114.30711 c 0.33677,-0.20797 0.0487,51.71527 5.91031,61.18366 0.49569,0.8007 0.18476,1.43686 0.21782,1.40761 0.044,-0.0389 0.3905,-0.85171 -0.0245,-2.08965 -4.86654,-14.51683 -4.13788,-62.17393 -3.73933,-62.57241 2.22688,-2.22649 1.49231,-3.627 6.81007,-5.01625 0.62703,-0.16381 5.41628,13.8835 6.12146,13.77113 0.10895,-0.0174 0.35996,-0.30357 0.29449,-0.79776 -1.10123,-8.31224 0.79838,-15.30974 1.62411,-15.35172 0.3433,-0.0174 6.24163,2.75103 6.59145,2.74513 0.58284,-0.01 7.24794,-2.28362 7.84871,-2.25923 0.60826,0.11533 1.40489,3.11183 0.0147,14.55323 -0.0526,0.43297 0.0902,0.69301 0.17637,0.71466 0.65882,0.16561 6.99807,-12.71343 7.64282,-12.51308 7.18945,2.23413 9.69639,4.81965 15.24999,9.94873 1.63362,1.50875 -2.11462,29.15762 -10.50886,61.70738 -0.0322,0.12488 0.075,0.21548 0.12585,0.27025 1.37468,1.48077 16.87578,-48.11374 18.1457,-46.60103 2.11658,2.52119 5.15116,-0.95931 6.99189,1.46055 34.04139,-70.062712 -74.71689,-86.627596 -69.49304,-20.56119 z"
   class="hair"
--- a/artTools/vector_deepmurk_scud.svg
+++ b/artTools/vector_deepmurk_scud.svg
--- a/artTools/vector_layer_split.py
+++ b/artTools/vector_layer_split.py
 #!/usr/bin/env python3

-'''
+"""
 Application for splitting groups from one SVG file into separate files

 Usage:
@@ -8,135 +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 argparse
+import svg_split_utils

 parser = argparse.ArgumentParser(
-	description='Application for splitting groups from one SVG file into separate files.')
+    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')
+                    help='output directory')
 parser.add_argument('-f', '--format', dest='output_format',
-					choices=['svg', 'tw'], default='svg', help='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')
+                    help='Prepend this string to result file names')
 parser.add_argument('input_file', metavar='FILENAME', nargs='+',
-					help='Input SVG file with layers')
+                    help='Input SVG file with layers')

 args = parser.parse_args()
 output_format = args.output_format
 output_directory = args.output_dir


-def splitFile(inputFile):
-	tree = etree.parse(inputFile)
-	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+'"
-	ns = {
-		'svg': 'http://www.w3.org/2000/svg',
-		'inkscape': 'http://www.inkscape.org/namespaces/inkscape',
-		'sodipodi': "http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd",
-	}
-
-	# 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(' 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 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('\n')):
-			svg += '\n'
-		svg = svg.encode('utf-8')
-
-		# save SVG string to file
-		i = layer.get('id')
-		output_path = os.path.join(output_directory, "{0}{1}.svg".format(args.prefix, i))
-		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'):
-				f.write(svg)
+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)


 if not os.path.exists(output_directory):
-	os.makedirs(output_directory)
+    os.makedirs(output_directory)

 for f in args.input_file:
-	splitFile(f)
+    split_file(f)
--- a/artTools/vector_revamp_layer_split.py
+++ b/artTools/vector_revamp_layer_split.py
 #!/usr/bin/env python3

-'''
+"""
 Application for splitting groups from one SVG file into separate files

 Usage:
@@ -8,28 +8,28 @@ 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 argparse
+
+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.')
+    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')
+                    help='output directory')
 parser.add_argument('-f', '--format', dest='output_format',
-					choices=['svg', 'tw'], default='svg', help='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')
+                    help='Prepend this string to result file names')
 parser.add_argument('input_file', metavar='FILENAME', nargs=1,
-					help='Input SVG file with layers')
+                    help='Input SVG file with layers')

 args = parser.parse_args()

@@ -37,43 +37,44 @@ 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)
+    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",
+    'svg': 'http://www.w3.org/2000/svg',
+    'inkscape': 'http://www.inkscape.org/namespaces/inkscape',
+    'sodipodi': "http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd",
 }

 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"):
-		del root.attrib[a]
+    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)
+    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
@@ -83,102 +84,93 @@ 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
+    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')
-	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)
-	
-	# 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)
-
-	# 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'):
-		# 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 indentation
-		svg = svg.replace('svg:', '')  # svg namespace was removed
-
-		if (not svg.endswith('\n')):
-			svg += '\n'
-		svg = svg.encode('utf-8')
-
-	# save SVG string to file
-	i = layer.get('id')
-	output_path = os.path.join(output_directory, "{0}{1}.svg".format(args.prefix, i))
-	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'):
-			f.write(svg)
+    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)
+
+    # 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)
+
+    # 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':
+        # 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 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)
--- a/artTools/vector_revamp_source.svg
+++ b/artTools/vector_revamp_source.svg
--- a/artTools/webgl_editor.html
+++ b/artTools/webgl_editor.html
--- a/build.config.json
+++ b/build.config.json
 {
 	"dirs": {
 		"intermediate": "build",
-		"output": "bin"
+		"output": "bin",
+		"modOutput": "bin/mods"
 	},
-	"output": "FC_pregmod.html",
-	"twineformat": "sugarcube-2",
+	"output": "FC_pregmod[extras].html",
 	"gitVersionFile": "src/002-config/fc-version.js.commitHash.js",
 	"sources": {
 		"module": {
@@ -12,14 +12,17 @@
 			"css": ["css/**/*.css"]
 		},
 		"story": {
-			"css": ["src/**/*.css"],
 			"js": ["src/**/*.js"],
+			"css": ["src/**/*.css"],
 			"twee": ["src/**/*.tw"],
 			"media": [
-				"src/art/vector/layers",
-				"src/art/vector_revamp/layers"
+				"src/art/map",
+				"src/art/vector/layers/",
+				"src/art/vector_revamp/layers/"
 			]
 		},
+		"mods": "mods/dev",
+		"themes": "themes",
 		"head": "resources/raster/favicon/arcologyVector.html"
 	},
 	"options": {

--- a/compile.bat
+++ b/compile.bat
-@echo off
-:: Free Cities Basic Compiler - Windows
+@ECHO off
+:: Free Cities Compiler - Windows

-:: Set working directory
-pushd %~dp0
-SETLOCAL
-
-:: If compile is invoked with "extramemory", set SORT_MEM (used by concatFiles.bat)
-
-SET CMD_OPTION=%~1
-IF DEFINED CMD_OPTION IF /I [%CMD_OPTION%]==[EXTRAMEMORY] SET CMD_OPTION=EXTRAMEM
-IF DEFINED CMD_OPTION IF /I [%CMD_OPTION%]==[EMEMORY] SET CMD_OPTION=EXTRAMEM
-IF DEFINED CMD_OPTION IF /I [%CMD_OPTION%]==[EXTRAMEM] SET SORT_MEM=65535
+:processargs
+SET ARG=%1
+IF DEFINED ARG (
+	:: exit without user input
+	if "%ARG%"=="--no-wait" SET "NOWAIT=True"
+    SHIFT
+    GOTO processargs
+)

+:: run dependencyCheck.bat
+CALL .\devTools\scripts\dependencyCheck.bat
+SET CODE=%ERRORLEVEL%

-:: See if we can find a git installation
-set GITFOUND=no
-for %%k in (HKCU HKLM) do (
-	for %%w in (\ \Wow6432Node\) do (
-		for /f "skip=2 delims=: tokens=1*" %%a in ('reg query "%%k\SOFTWARE%%wMicrosoft\Windows\CurrentVersion\Uninstall\Git_is1" /v InstallLocation 2^> nul') do (
-			for /f "tokens=3" %%z in ("%%a") do (
-				set GIT=%%z:%%b
-				set GITFOUND=yes
-				goto FOUND
-			)
-		)
-	)
-)
-:FOUND
-if %GITFOUND% == yes (
-	set "PATH=%GIT%bin;%PATH%"
-	echo|set /p out="App.Version.commitHash = " > "%~dp0src\002-config\fc-version.js.commitHash.js"
-	git rev-parse --sq --short HEAD >> "%~dp0src\002-config\fc-version.js.commitHash.js" 2>NUL
-	if errorlevel 1 echo|set /p out="null" >> "%~dp0src\002-config\fc-version.js.commitHash.js"
-	echo|set /p out=";" >> "%~dp0src\002-config\fc-version.js.commitHash.js"
-)
+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

-if not exist "bin\resources" mkdir bin\resources
-CALL devTools/concatFiles.bat js\ "*.js" bin\fc.js
-CALL devTools/concatFiles.bat css\ "*.css" bin\fc.css
-SET TWEEGO_PATH=%~dp0devTools\tweeGo\storyFormats
-:: 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" --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html "%~dp0src"
-) else (
-	CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html "%~dp0src"
+	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
 )
-DEL bin\fc.js
-DEL bin\fc.css
-IF EXIST "%~dp0src\002-config\fc-version.js.commitHash.js" DEL "%~dp0src\002-config\fc-version.js.commitHash.js"
-
-ENDLOCAL
-popd
-ECHO Done
--- a/compile.sh
+++ b/compile.sh
 #!/bin/bash

-output=/dev/stdout
-
-# displays help text
-function displayHelp() {
-	cat <<HelpText
-Usage: compile.sh [OPTION]...
-
-Options:
-  -d, --dry      Do not compile
-  -g, --git      Add hash of HEAD to filename
-  -h, --help     Show this help text
-  -s, --sanity   Run sanityCheck
-  -q, --quiet    Suppress terminal output
-  -t, --themes   Generate theme files
-HelpText
-}
-
-#display an error message
-function echoError() {
-	echo -e "\033[0;31m$*\033[0m"
-}
-
-#display message
-function echoMessage() {
-	echo "$1" >"${output}"
-}
-
-#compile the HTML file
-function compile() {
-	mkdir -p bin/resources
-	export TWEEGO_PATH=devTools/tweeGo/storyFormats
-	TWEEGO_EXE="tweego"
-
-	if hash $TWEEGO_EXE 2>/dev/null; then
-		echoMessage "system tweego binary"
-	else
-		case "$(uname -m)" in
-			x86_64 | amd64)
-				echoMessage "x64 arch"
-				if [ "$(uname -s)" = "Darwin" ]; then
-					TWEEGO_EXE="./devTools/tweeGo/tweego_osx64"
-				elif [ "$OSTYPE" = "msys" ]; then
-					TWEEGO_EXE="./devTools/tweeGo/tweego_win64"
-				else
-					TWEEGO_EXE="./devTools/tweeGo/tweego_nix64"
-				fi
-				;;
-			x86 | i[3-6]86)
-				echoMessage "x86 arch"
-				if [ "$(uname -s)" = "Darwin" ]; then
-					TWEEGO_EXE="./devTools/tweeGo/tweego_osx86"
-				elif [ "$OSTYPE" = "msys" ]; then
-					TWEEGO_EXE="./devTools/tweeGo/tweego_win86"
-				else
-					TWEEGO_EXE="./devTools/tweeGo/tweego_nix86"
-				fi
-				;;
-			*)
-				echoError "No system tweego binary found, and no precompiled binary for your platform available."
-				echoError "Please compile tweego and put the executable in PATH."
-				exit 2
-				;;
-		esac
-	fi
-
-	file="bin/FC_pregmod.html"
-	if [[ -d .git ]]; then
-		COMMIT=$(git rev-parse --short HEAD) # Find and insert current commit
-		printf "App.Version.commitHash = '%s';\n" ${COMMIT} > src/002-config/fc-version.js.commitHash.js
-		if [[ "$usehash" ]]; then
-			file="bin/FC_pregmod_${COMMIT}.html"
-		fi
-	fi
-
-	devTools/concatFiles.sh js/ '*.js' bin/fc.js
-	devTools/concatFiles.sh css/ '*.css' bin/fc.css
-	$TWEEGO_EXE -o $file --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html src/ || build_failed="true"
-	rm -f bin/fc.js
-	rm -f bin/fc.css
-	if [ "$build_failed" = "true" ]; then
-		echoError "Build failed."
-		exit 1
-	fi
-
-	if [[ -d .git ]]; then
-		rm src/002-config/fc-version.js.commitHash.js
-	fi
-	echoMessage "Saved to $file."
-}
-
-if [[ "$1" == "" ]]; then
-	#tip if no option
-	echoMessage "For more options see compile.sh -h."
+# 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
-	#parse options
-	while [[ "$1" ]]; do
-		case $1 in
-			-d | --dry)
-				dry="true"
-				;;
-			-g | --git)
-				usehash="true"
-				;;
-			-h | --help)
-				displayHelp
-				exit 0
-				;;
-			-s | --sanity)
-				sanity="true"
-				;;
-			-q | --quiet)
-				output=/dev/null
-				;;
-	    -t | --themes)
-	      themes="true"
-	      ;;
-			*)
-				echoError "Unknown argument $1."
-				displayHelp
-				exit 1
-				;;
-		esac
-		shift
-	done
-fi
-
-# Run sanity check.
-[ -n "$sanity" ] && ./sanityCheck.sh
-
-if ! [[ -d .git ]]; then
-	echoMessage "No git repository. Git specific actions disabled."
-fi
-
-#compile
-if [[ "$dry" ]]; then
-	echoMessage "Dry run finished."
-else
-	compile
-	echoMessage "Compilation finished at $(date +%T)."
-fi
-
-# compile themes
-if [[ "$themes" ]]; then
-  (
-	  cd themes/ || exit
-    for D in *; do
-      if [ -d "${D}" ]; then
-        ../devTools/concatFiles.sh "${D}"/ '*.css' ../bin/"${D}".css
-      fi
-    done
-  )
-  echoMessage "Themes compiled at $(date +%T)"
+    node devTools/scripts/advancedCompiler.js
 fi
--- a/compile_debug.bat
+++ b/compile_debug.bat
-@echo off
-:: Free Cities Basic Compiler - Windows
-
-:: Set working directory
-pushd %~dp0
-
-:: Compile the game
-call "%~dp0compile.bat"
-
-popd
-PAUSE
--- a/compile_themes.bat
+++ b/compile_themes.bat
-@echo off
-
-set back=%cd%
-for /d %%i in (%~dp0\themes\*) do (
-    CALL :compileDirectory %%i
-)
-cd %back%
-
-EXIT /B %ERRORLEVEL%
-
-:compileDirectory
-REM ~1 is an absolute path, get name of directory here
-REM https://stackoverflow.com/a/5480568
-set var1=%~1%
-set var2=%var1%
-set i=0
-
-:loopprocess
-for /F "tokens=1* delims=\" %%A in ( "%var1%" ) do (
-  set /A i+=1
-  set var1=%%B
-  goto loopprocess
-)
-
-for /F "tokens=%i% delims=\" %%G in ( "%var2%" ) do set last=%%G
-
-REM compile
-CALL devTools/concatFiles.bat "%%~1" "*.css" bin\"%last%".css
-EXIT /B 0
--- a/cspell.json
+++ b/cspell.json
No results found