CLI

.gitignore

@@ -117,7 +117,6 @@ Thumbs.db
 !/ios-moe/xcode/*.xcodeproj/xcshareddata
 !/ios-moe/xcode/*.xcodeproj/project.pbxproj
 /ios-moe/xcode/native/
-SaveFiles/
 android/android-release.apk
 android/assets/GameSettings.json
 android/release/output.json
@@ -142,3 +141,17 @@ android/assets/music/
 
 # Visual Studio Code
 .vscode/
+
+# Unciv
+maps/
+mods/
+SaveFiles/
+SaveFiles
+GameSettings.json
+
+# Python
+*.pyc
+__pycache__
+
+# Geany
+.geany

android/assets/jsons/Civ V - Gods & Kings/Terrains.json

@@ -230,7 +230,7 @@
 		"uniques": ["Nullifies all other stats this tile provides", "Doesn't generate naturally"],
 		// For map editor only - the generator won't place it without code or enabling uniques
 		// If the map generator is ever updated to always take these into account, it should also take the "Doesn't generate naturally" unique into account
-		"occursOn": ["Grassland","Plains","Desert","Tundra","Snow","Forest","Jungle","Hill","Flood plains","Marsh","Oasis"]
+		"occursOn": ["Grassland","Plains","Desert","Tundra","Snow","Forest","Jungle","Hill","Flood plains","Marsh","Oasis"],
 		"defenceBonus": -0.15
 	},
 	{
@@ -490,7 +490,7 @@
 		"impassable": true,
 		"unbuildable": true,
 		"weight": 10
-	},
+	}//,
 /*
 	// BNW wonders
 	{

android/assets/jsons/Civ V - Vanilla/Terrains.json

@@ -230,7 +230,7 @@
 		"uniques": ["Nullifies all other stats this tile provides", "Doesn't generate naturally"],
 		// For map editor only - the generator won't place it without code or enabling uniques
 		// If the map generator is ever updated to always take these into account, it should also take the "Doesn't generate naturally" unique into account
-		"occursOn": ["Grassland","Plains","Desert","Tundra","Snow","Forest","Jungle","Hill","Flood plains","Marsh","Oasis"]
+		"occursOn": ["Grassland","Plains","Desert","Tundra","Snow","Forest","Jungle","Hill","Flood plains","Marsh","Oasis"],
 		"defenceBonus": -0.15
 	},
 	{
@@ -490,7 +490,7 @@
 		"impassable": true,
 		"unbuildable": true,
 		"weight": 10
-	},
+	}//,
 	/*
         // BNW wonders
         {

android/assets/scripting/LICENSE

@@ -0,0 +1 @@
+Copyright 2021 will-ca. All rights reserved (for now).

android/assets/scripting/ScriptingEngineConstants.json

@@ -0,0 +1,61 @@
+{ // Internal directories can't be identified, traversed, or copied on Desktop because all assets are indistinguishable on the classpath or something. So manually list out all files that are part of each engine's runtime environment instead.
+	engines: {
+		python: {
+			files: [
+				unciv_lib/
+				unciv_lib/__init__.py
+				unciv_lib/api.py
+				unciv_lib/autocompletion.py
+				unciv_lib/ipc.py
+				unciv_lib/shadow.py
+				unciv_lib/utils.py
+				unciv_lib/wrapping.py
+				PythonScripting.md
+				unciv_pyhelpers.py
+				main.py
+				unciv_scripting_examples/
+				unciv_scripting_examples/__init__.py
+				unciv_scripting_examples/EndTimes.py
+				unciv_scripting_examples/EventPopup.py
+				unciv_scripting_examples/ExternalPipe.py
+				unciv_scripting_examples/MapEditingMacros.py
+				unciv_scripting_examples/Merfolk.py
+				unciv_scripting_examples/PlayerMacros.py
+				unciv_scripting_examples/ProceduralTechtree.py
+				unciv_scripting_examples/Tests.py
+				unciv_scripting_examples/TicTacToe.py
+				unciv_scripting_examples/Utils.py
+				unciv_scripting_examples/example_assets/EarthTerrainFantasyHex.jpg
+				unciv_scripting_examples/example_assets/EarthTerrainRaw.png
+				unciv_scripting_examples/example_assets/EarthTopography.png
+				unciv_scripting_examples/example_assets/Elizabeth300
+				unciv_scripting_examples/example_assets/StarryNight.jpg
+				unciv_scripting_examples/example_assets/TurboRainbow.png
+				unciv_scripting_examples/example_assets/WheatField.jpg
+			]
+			syntaxHighlightingRegexStack: [
+			]
+		}
+		lua: {
+			files: [
+				unciv/
+				main.lua
+			]
+			syntaxHighlightingRegexStack: [
+			]
+		}
+		qjs: {
+			files: [
+				unciv/
+				main.js
+			]
+			syntaxHighlightingRegexStack: [
+			]
+		}
+	}
+
+	sharedfiles: [
+		ScriptAPI.json
+		ScriptAPIConstants.json
+	]
+}

android/assets/scripting/enginefiles/lua/main.lua

@@ -0,0 +1,19 @@
+
+io.stdout:setvbuf('full')
+
+
+function motd ()
+	return "\nRunning ".._VERSION..".\n\nThis backend is HIGHLY EXPERIMENTAL. It does not implement any API bindings yet, and it may not be stable. Use it at your own risk!\n\n"
+end
+
+
+while true do
+	_in = io.stdin:read()
+	io.stdout:write("> ".._in.."\n")
+	_, _out = pcall(load("return ".._in))
+	if not _ then
+		_, _out = pcall(load(_in))
+	end
+	io.stdout:write((_out or "").."\n")
+	io.stdout:flush()
+end