Improve TS map importer and reimport classic maps.

2020-07-09 17:57:42 +01:00
parent c5ea496c45
commit 70cb0d2924
43 changed files with 10611 additions and 8870 deletions
--- a/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs
+++ b/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs
@@ -108,6 +108,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
 			{ 0x7D, "lobrdg_r_sw" }, // lobrdg4

 			// Other
+			{ 0x1B, "bigblue" },
 			{ 0xA7, "veinhole" },
 			{ 0xA8, "srock01" },
 			{ 0xA9, "srock02" },
@@ -241,6 +242,14 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
 			{ "gatick", "ttnk" }
 		};

+		static readonly string[] LampActors =
+		{
+			"GALITE", "INGALITE", "NEGLAMP", "REDLAMP", "NEGRED", "GRENLAMP", "BLUELAMP", "YELWLAMP",
+			"INYELWLAMP", "PURPLAMP", "INPURPLAMP", "INORANLAMP", "INGRNLMP", "INREDLMP", "INBLULMP"
+		};
+
+		static readonly string[] CreepActors = { "DOGGIE", "VISC_SML", "VISC_LRG", "JFISH" };
+
 		[Desc("FILENAME", "Convert a Tiberian Sun map to the OpenRA format.")]
 		void IUtilityCommand.Run(Utility utility, string[] args)
 		{
@@ -273,6 +282,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
 			ReadWaypoints(map, file, fullSize);
 			ReadOverlay(map, file, fullSize);
 			ReadLighting(map, file);
+			ReadLamps(map, file);

 			var spawnCount = map.ActorDefinitions.Count(n => n.Value.Value == "mpspawn");
 			var mapPlayers = new MapPlayers(map.Rules, spawnCount);
@@ -526,7 +536,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
 				var health = short.Parse(entries[2]);
 				var rx = int.Parse(entries[3]);
 				var ry = int.Parse(entries[4]);
-				var facing = (byte)(byte.Parse(entries[5]) + 96);
+				var facing = (byte)(224 - byte.Parse(entries[5]));

 				var dx = rx - ry + fullSize.X - 1;
 				var dy = rx + ry - fullSize.X - 1;
@@ -535,14 +545,13 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
 				var ar = new ActorReference(name)
 				{
 					new LocationInit(cell),
-					new OwnerInit("Neutral")
+					new OwnerInit(CreepActors.Contains(entries[1]) ? "Creeps" : "Neutral")
 				};

 				if (health != 256)
 					ar.Add(new HealthInit(100 * health / 256));

-				if (facing != 96)
-					ar.Add(new FacingInit(WAngle.FromFacing(facing)));
+				ar.Add(new FacingInit(WAngle.FromFacing(facing)));

 				if (isDeployed)
 					ar.Add(new DeployStateInit(DeployState.Deployed));
@@ -556,29 +565,92 @@ namespace OpenRA.Mods.Cnc.UtilityCommands

 		static void ReadLighting(Map map, IniFile file)
 		{
-			var lightingTypes = new[] { "Red", "Green", "Blue", "Ambient" };
+			var lightingTypes = new Dictionary<string, string>()
+			{
+				{ "Red", "RedTint" },
+				{ "Green", "GreenTint" },
+				{ "Blue", "BlueTint" },
+				{ "Ambient", "Intensity" },
+				{ "Level", "HeightStep" },
+				{ "Ground", null }
+			};
+
 			var lightingSection = file.GetSection("Lighting");
+			var parsed = new Dictionary<string, float>();
 			var lightingNodes = new List<MiniYamlNode>();

 			foreach (var kv in lightingSection)
 			{
-				if (lightingTypes.Contains(kv.Key))
-				{
-					var val = FieldLoader.GetValue<float>(kv.Key, kv.Value);
-					if (val != 1.0f)
-						lightingNodes.Add(new MiniYamlNode(kv.Key, FieldSaver.FormatValue(val)));
-				}
+				if (lightingTypes.ContainsKey(kv.Key))
+					parsed[kv.Key] = FieldLoader.GetValue<float>(kv.Key, kv.Value);
 				else
 					Console.WriteLine("Ignoring unknown lighting type: `{0}`".F(kv.Key));
 			}

+			// Merge Ground into Ambient
+			float ground = 0;
+			if (parsed.TryGetValue("Ground", out ground))
+			{
+				if (!parsed.ContainsKey("Ambient"))
+					parsed["Ambient"] = 1f;
+				parsed["Ambient"] -= ground;
+			}
+
+			foreach (var node in lightingTypes)
+			{
+				float val;
+				if (node.Value != null && parsed.TryGetValue(node.Key, out val) && ((node.Key == "Level" && val != 0) || (node.Key != "Level" && val != 1.0f)))
+					lightingNodes.Add(new MiniYamlNode(node.Value, FieldSaver.FormatValue(val)));
+			}
+
 			if (lightingNodes.Any())
 			{
-				map.RuleDefinitions.Nodes.Add(new MiniYamlNode("World", new MiniYaml("", new List<MiniYamlNode>()
+				map.RuleDefinitions.Nodes.Add(new MiniYamlNode("^BaseWorld", new MiniYaml("", new List<MiniYamlNode>()
 				{
-					new MiniYamlNode("GlobalLightingPaletteEffect", new MiniYaml("", lightingNodes))
+					new MiniYamlNode("TerrainLighting", new MiniYaml("", lightingNodes))
 				})));
 			}
 		}
+
+		static void ReadLamps(Map map, IniFile file)
+		{
+			var lightingTypes = new Dictionary<string, string>()
+			{
+				{ "LightIntensity", "Intensity" },
+				{ "LightRedTint", "RedTint" },
+				{ "LightGreenTint", "GreenTint" },
+				{ "LightBlueTint", "BlueTint" },
+			};
+
+			foreach (var lamp in LampActors)
+			{
+				var lightingSection = file.GetSection(lamp, true);
+				var lightingNodes = new List<MiniYamlNode>();
+
+				foreach (var kv in lightingSection)
+				{
+					if (kv.Key == "LightVisibility")
+					{
+						// Convert leptons to WDist
+						var visibility = FieldLoader.GetValue<int>(kv.Key, kv.Value);
+						lightingNodes.Add(new MiniYamlNode("Range", FieldSaver.FormatValue(new WDist(visibility * 4))));
+					}
+					else if (lightingTypes.ContainsKey(kv.Key))
+					{
+						// Some maps use "," instead of "."!
+						var value = FieldLoader.GetValue<float>(kv.Key, kv.Value.Replace(',', '.'));
+						lightingNodes.Add(new MiniYamlNode(lightingTypes[kv.Key], FieldSaver.FormatValue(value)));
+					}
+				}
+
+				if (lightingNodes.Any())
+				{
+					map.RuleDefinitions.Nodes.Add(new MiniYamlNode(lamp, new MiniYaml("", new List<MiniYamlNode>()
+					{
+						new MiniYamlNode("TerrainLightSource", new MiniYaml("", lightingNodes))
+					})));
+				}
+			}
+		}
 	}
 }
--- a/mods/ts/maps/1ice6/map.png
+++ b/mods/ts/maps/1ice6/map.png
--- a/mods/ts/maps/1ice6/map.yaml
+++ b/mods/ts/maps/1ice6/map.yaml
--- a/mods/ts/maps/2temp7/map.png
+++ b/mods/ts/maps/2temp7/map.png
--- a/mods/ts/maps/2temp7/map.yaml
+++ b/mods/ts/maps/2temp7/map.yaml
@@ -52,38 +52,31 @@ Actors:
 	Actor0: cabhut
 		Location: 141,0
 		Owner: Neutral
-		Health: 100
-		Facing: 96
+		Facing: 896
 	Actor1: cabhut
 		Location: 137,-11
 		Owner: Neutral
-		Health: 100
-		Facing: 96
+		Facing: 896
 	Actor2: cabhut
 		Location: 79,25
 		Owner: Neutral
-		Health: 100
-		Facing: 96
+		Facing: 896
 	Actor3: cabhut
 		Location: 83,16
 		Owner: Neutral
-		Health: 100
-		Facing: 96
+		Facing: 896
 	Actor4: cabhut
 		Location: 81,-15
 		Owner: Neutral
-		Health: 100
-		Facing: 96
+		Facing: 896
 	Actor5: cabhut
 		Location: 77,-28
 		Owner: Neutral
-		Health: 100
-		Facing: 96
+		Facing: 896
 	Actor6: city22
 		Location: 175,8
 		Owner: Neutral
-		Health: 100
-		Facing: 96
+		Facing: 896
 	Actor7: tibtre01
 		Location: 45,0
 		Owner: Neutral
@@ -597,12 +590,24 @@ Actors:
 	Actor177: lobrdg_a
 		Location: 138,-7
 		Owner: Neutral
+	Actor178: lobrdg_r_nw
+		Location: 125,7
+		Owner: Neutral
 	Actor179: lobrdg_a
 		Location: 138,-6
 		Owner: Neutral
+	Actor180: lobrdg_b
+		Location: 126,7
+		Owner: Neutral
 	Actor181: lobrdg_a
 		Location: 138,-5
 		Owner: Neutral
+	Actor182: lobrdg_r_nw
+		Location: 125,9
+		Owner: Neutral
+	Actor183: lobrdg_b
+		Location: 127,7
+		Owner: Neutral
 	Actor184: lobrdg_a
 		Location: 138,-4
 		Owner: Neutral
--- a/mods/ts/maps/ThePit/map.png
+++ b/mods/ts/maps/ThePit/map.png
--- a/mods/ts/maps/ThePit/map.yaml
+++ b/mods/ts/maps/ThePit/map.yaml
@@ -1173,27 +1173,27 @@ Actors:
 	Actor434: car
 		Owner: Neutral
 		Location: 82,-56
-		Facing: 32
+		Facing: 128
 	Actor433: pick
 		Owner: Neutral
 		Location: 74,64
-		Facing: 92
+		Facing: 368
 	Actor432: car
 		Owner: Neutral
 		Location: 77,58
-		Facing: 32
+		Facing: 128
 	Actor435: pick
 		Owner: Neutral
 		Location: 101,-48
-		Facing: -32
+		Facing: 896
 	Actor436: bus
 		Owner: Neutral
 		Location: 29,0
-		Facing: 32
+		Facing: 128
 	Actor437: truckb
 		Owner: Neutral
 		Location: 130,1
-		Facing: 160
+		Facing: 640
 	Actor431: trock03
 		Owner: Neutral
 		Location: 29,3
--- a/mods/ts/maps/arivruns/map.png
+++ b/mods/ts/maps/arivruns/map.png
--- a/mods/ts/maps/arivruns/map.yaml
+++ b/mods/ts/maps/arivruns/map.yaml
--- a/mods/ts/maps/cliffsin/map.png
+++ b/mods/ts/maps/cliffsin/map.png
--- a/mods/ts/maps/cliffsin/map.yaml
+++ b/mods/ts/maps/cliffsin/map.yaml
--- a/mods/ts/maps/drawbrid/map.png
+++ b/mods/ts/maps/drawbrid/map.png
--- a/mods/ts/maps/drawbrid/map.yaml
+++ b/mods/ts/maps/drawbrid/map.yaml
--- a/mods/ts/maps/fields-of-green/map.png
+++ b/mods/ts/maps/fields-of-green/map.png
--- a/mods/ts/maps/fields-of-green/map.yaml
+++ b/mods/ts/maps/fields-of-green/map.yaml
@@ -28,17 +28,17 @@ Players:
 		Enemies: Creeps, Nod, GDI
 	PlayerReference@Nod:
 		Name: Nod
+		LockFaction: True
 		Faction: nod
-		LockFaction: true
+		LockColor: True
 		Color: FE1100
-		LockColor: true
 		Enemies: GDI, Creeps
 	PlayerReference@GDI:
 		Name: GDI
+		LockFaction: True
 		Faction: gdi
-		LockFaction: true
+		LockColor: True
 		Color: EEEE66
-		LockColor: true
 		Enemies: Nod, Creeps

 Actors:
@@ -120,15 +120,15 @@ Actors:
 	Actor27: nalasr
 		Owner: Nod
 		Location: 43,5
-		Facing: 170
+		Facing: 680
 	Actor28: nalasr
 		Owner: Nod
 		Location: 43,9
-		Facing: 170
+		Facing: 680
 	nodhand1: nahand
 		Owner: Nod
 		Location: 38,4
-	Actor30: galite
+	Actor30: tstlamp
 		Owner: Nod
 		Location: 40,2
 	Actor31: gaoldcc2
@@ -206,13 +206,13 @@ Actors:
 	Actor55: gactwr
 		Owner: GDI
 		Location: 84,-1
-		TurretFacing: 92
-		Facing: 60
+		TurretFacing: 128
+		Facing: 240
 		Plug: tower.vulcan
 	Actor56: gactwr
 		Owner: GDI
 		Location: 80,-3
-		Facing: 60
+		Facing: 240
 		Plug: tower.vulcan
 	Actor57: gawall
 		Owner: GDI
@@ -244,7 +244,7 @@ Actors:
 	Actor66: gactwr
 		Owner: GDI
 		Location: 84,-4
-		Facing: 60
+		Facing: 240
 		Plug: tower.rocket
 	Actor67: gawall
 		Owner: GDI
@@ -282,7 +282,7 @@ Actors:
 	Actor78: proc
 		Owner: GDI
 		Location: 79,-7
-	Actor79: galite
+	Actor79: tstlamp
 		Owner: GDI
 		Location: 78,-4
 	gdibar1: gapile
@@ -291,7 +291,7 @@ Actors:
 	Actor81: gapowr
 		Owner: GDI
 		Location: 86,-3
-		Facing: 60
+		Facing: 240
 		Plug@pluga: powrup
 		Plug@plugb: powrup
 	Actor82: gapowr
@@ -302,7 +302,7 @@ Actors:
 	Actor91: gactwr
 		Owner: GDI
 		Location: 85,-11
-		Facing: -40
+		Facing: 864
 		Plug: tower.vulcan
 	Actor90: gasilo
 		Owner: GDI
@@ -319,7 +319,7 @@ Actors:
 	Actor88: gactwr
 		Owner: GDI
 		Location: 81,-11
-		Facing: -40
+		Facing: 864
 		Plug: tower.vulcan
 	Actor89: gagate_a
 		Owner: GDI
@@ -408,15 +408,15 @@ Actors:
 	Actor119: pick
 		Owner: Neutral
 		Location: 73,1
-		Facing: 92
+		Facing: 368
 	Actor120: car
 		Owner: Neutral
 		Location: 49,-11
-		Facing: 92
+		Facing: 368
 	Actor121: wini
 		Owner: Neutral
 		Location: 48,-11
-		Facing: 92
+		Facing: 368
 	Actor122: srock01
 		Owner: Neutral
 		Location: 52,6
@@ -432,7 +432,7 @@ Actors:
 	Actor126: trucka
 		Owner: Neutral
 		Location: 51,1
-		Facing: 92
+		Facing: 368
 	Actor127: ca0014
 		Owner: Neutral
 		Location: 53,22
@@ -1343,62 +1343,52 @@ Actors:
 		Owner: GDI
 		Location: 85,-5
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor440: e1
 		Owner: GDI
 		Location: 86,-10
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor431: e1
 		Owner: GDI
 		Location: 85,-7
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor432: e2
 		Owner: GDI
 		Location: 83,-8
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor433: e2
 		Owner: GDI
 		Location: 83,-9
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor434: e1
 		Owner: Nod
 		Location: 39,6
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor439: e1
 		Owner: Nod
 		Location: 39,11
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor436: e1
 		Owner: Nod
 		Location: 40,6
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor437: e3
 		Owner: Nod
 		Location: 37,3
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	Actor438: e3
 		Owner: Nod
 		Location: 37,4
 		SubCell: 2
-		Facing: 92
-		TurretFacing: 92
+		Facing: 368
 	North: waypoint
 		Owner: Neutral
 		Location: 41,-33
@@ -1411,5 +1401,17 @@ Actors:
 	NodBase: waypoint
 		Owner: Neutral
 		Location: 45,6
+	Actor441: ingrnlmp
+		Owner: Neutral
+		Location: 60,-6
+	Actor442: ingrnlmp
+		Owner: Neutral
+		Location: 66,-1
+	Actor443: ingrnlmp
+		Owner: Neutral
+		Location: 60,11
+	Actor444: ingrnlmp
+		Owner: Neutral
+		Location: 58,16

 Rules: rules.yaml
--- a/mods/ts/maps/fields-of-green/rules.yaml
+++ b/mods/ts/maps/fields-of-green/rules.yaml
@@ -14,9 +14,19 @@ World:
 		BackgroundMusic: intro
 		DisableWorldSounds: true
 		AllowMuteBackgroundMusic: true
-	GlobalLightingPaletteEffect:
-		Blue: 0.7
-		Ambient: 0.7
+
+^BaseWorld:
+	TerrainLighting:
+		BlueTint: 0.7
+		Intensity: 0.6
+
+INGRNLMP:
+	TerrainLightSource:
+		RedTint: 0.01
+		GreenTint: 0.7
+		BlueTint: 0.01
+		Intensity: 0.1
+		Range: 5c0

 ^ExistsInWorld:
 	GivesExperience:
--- a/mods/ts/maps/float/map.png
+++ b/mods/ts/maps/float/map.png
--- a/mods/ts/maps/float/map.yaml
+++ b/mods/ts/maps/float/map.yaml
--- a/mods/ts/maps/forestfr/map.png
+++ b/mods/ts/maps/forestfr/map.png
--- a/mods/ts/maps/forestfr/map.yaml
+++ b/mods/ts/maps/forestfr/map.yaml
--- a/mods/ts/maps/karasjok/map.png
+++ b/mods/ts/maps/karasjok/map.png
--- a/mods/ts/maps/karasjok/map.yaml
+++ b/mods/ts/maps/karasjok/map.yaml
--- a/mods/ts/maps/ot11/map.png
+++ b/mods/ts/maps/ot11/map.png
--- a/mods/ts/maps/rivrrad4/map.png
+++ b/mods/ts/maps/rivrrad4/map.png
--- a/mods/ts/maps/rivrrad4/map.yaml
+++ b/mods/ts/maps/rivrrad4/map.yaml
--- a/mods/ts/maps/springs/map.png
+++ b/mods/ts/maps/springs/map.png
--- a/mods/ts/maps/springs/map.yaml
+++ b/mods/ts/maps/springs/map.yaml
--- a/mods/ts/maps/sunstroke/map.png
+++ b/mods/ts/maps/sunstroke/map.png
--- a/mods/ts/maps/sunstroke/map.yaml
+++ b/mods/ts/maps/sunstroke/map.yaml
--- a/mods/ts/maps/sunstroke/rules.yaml
+++ b/mods/ts/maps/sunstroke/rules.yaml
@@ -10,14 +10,17 @@ World:
 		Height: 5
 		Orientation: Y
 		Length: 19
-	GlobalLightingPaletteEffect:
-		Red: 1.6
-		Blue: 0.9
-		Green: 1.2
-		Ambient: 0.3
 	LuaScript:
 		Scripts: sunstroke.lua

+^BaseWorld:
+	TerrainLighting:
+		RedTint: 1.6
+		GreenTint: 1.2
+		BlueTint: 0.9
+		Intensity: 0.3
+		HeightStep: 0.002
+
 GAOLDCC2:
 	CaptureManager:
 	Capturable:
@@ -49,3 +52,43 @@ SLAV:
 		Voice: Attack
 	Armament:
 		Weapon: Sniper
+
+GRENLAMP:
+	TerrainLightSource:
+		RedTint: -0.15
+		BlueTint: 0
+		GreenTint: 0.2
+		Intensity: 0.1
+		Range: 10c760
+
+INYELWLAMP:
+	TerrainLightSource:
+		RedTint: 0.1
+		BlueTint: 0
+		GreenTint: 0.15
+		Intensity: 0.1
+		Range: 19c544
+
+INGRNLMP:
+	TerrainLightSource:
+		RedTint: -0.1
+		BlueTint: 0
+		GreenTint: 0.25
+		Intensity: 0.15
+		Range: 15c640
+
+INREDLMP:
+	TerrainLightSource:
+		RedTint: 0.25
+		BlueTint: -0.1
+		GreenTint: 0.1
+		Intensity: 0.2
+		Range: 15c640
+
+INBLULMP:
+	TerrainLightSource:
+		RedTint: -0.25
+		BlueTint: 0.1
+		GreenTint: 0.1
+		Intensity: -0.1
+		Range: 11c736
--- a/mods/ts/maps/t_garden/map.png
+++ b/mods/ts/maps/t_garden/map.png
--- a/mods/ts/maps/t_garden/map.yaml
+++ b/mods/ts/maps/t_garden/map.yaml
--- a/mods/ts/maps/tactical/map.png
+++ b/mods/ts/maps/tactical/map.png
--- a/mods/ts/maps/tactical/map.yaml
+++ b/mods/ts/maps/tactical/map.yaml
--- a/mods/ts/maps/terrace/map.png
+++ b/mods/ts/maps/terrace/map.png
--- a/mods/ts/maps/terrace/map.yaml
+++ b/mods/ts/maps/terrace/map.yaml
@@ -49,467 +49,519 @@ Players:
 		Enemies: Creeps

 Actors:
-	Actor0: tibtre01
+	Actor0: ingrnlmp
+		Location: 205,-13
+		Owner: Neutral
+		Facing: 896
+	Actor1: ingrnlmp
+		Location: 186,18
+		Owner: Neutral
+		Facing: 896
+	Actor2: ingrnlmp
+		Location: 143,60
+		Owner: Neutral
+		Facing: 896
+	Actor3: ingrnlmp
+		Location: 117,102
+		Owner: Neutral
+		Facing: 896
+	Actor4: ingrnlmp
+		Location: 82,23
+		Owner: Neutral
+		Facing: 896
+	Actor5: ingrnlmp
+		Location: 118,-2
+		Owner: Neutral
+		Facing: 896
+	Actor6: ingrnlmp
+		Location: 150,-42
+		Owner: Neutral
+		Facing: 896
+	Actor7: ingrnlmp
+		Location: 136,-84
+		Owner: Neutral
+		Facing: 896
+	Actor8: ingrnlmp
+		Location: 103,-46
+		Owner: Neutral
+		Facing: 896
+	Actor9: ingrnlmp
+		Location: 35,9
+		Owner: Neutral
+		Facing: 896
+	Actor10: ingrnlmp
+		Location: 141,12
+		Owner: Neutral
+		Facing: 896
+	Actor11: tibtre01
 		Location: 83,24
 		Owner: Neutral
-	Actor1: tibtre02
+	Actor12: tibtre02
 		Location: 144,61
 		Owner: Neutral
-	Actor2: tibtre03
+	Actor13: tibtre03
 		Location: 187,19
 		Owner: Neutral
-	Actor3: tibtre01
+	Actor14: tibtre01
 		Location: 137,-83
 		Owner: Neutral
-	Actor4: tibtre01
+	Actor15: tibtre01
 		Location: 119,-1
 		Owner: Neutral
-	Actor5: tibtre01
+	Actor16: tibtre01
 		Location: 104,-45
 		Owner: Neutral
-	Actor6: tibtre02
+	Actor17: tibtre02
 		Location: 151,-41
 		Owner: Neutral
-	Actor7: tree04
+	Actor18: tree04
 		Location: 114,-74
 		Owner: Neutral
-	Actor8: tree05
+	Actor19: tree05
 		Location: 114,-73
 		Owner: Neutral
-	Actor9: tree06
+	Actor20: tree06
 		Location: 115,-73
 		Owner: Neutral
-	Actor10: tree06
+	Actor21: tree06
 		Location: 85,-53
 		Owner: Neutral
-	Actor11: tree07
+	Actor22: tree07
 		Location: 86,-53
 		Owner: Neutral
-	Actor12: tree08
+	Actor23: tree08
 		Location: 86,-52
 		Owner: Neutral
-	Actor13: tree09
+	Actor24: tree09
 		Location: 86,-54
 		Owner: Neutral
-	Actor14: tree10
+	Actor25: tree10
 		Location: 85,-54
 		Owner: Neutral
-	Actor15: tree10
+	Actor26: tree10
 		Location: 55,23
 		Owner: Neutral
-	Actor16: tree11
+	Actor27: tree11
 		Location: 56,23
 		Owner: Neutral
-	Actor17: tree12
+	Actor28: tree12
 		Location: 57,24
 		Owner: Neutral
-	Actor18: tree13
+	Actor29: tree13
 		Location: 57,25
 		Owner: Neutral
-	Actor19: tree14
+	Actor30: tree14
 		Location: 58,25
 		Owner: Neutral
-	Actor20: tree14
+	Actor31: tree14
 		Location: 116,56
 		Owner: Neutral
-	Actor21: tree15
+	Actor32: tree15
 		Location: 117,57
 		Owner: Neutral
-	Actor22: tree16
+	Actor33: tree16
 		Location: 117,56
 		Owner: Neutral
-	Actor23: tree17
+	Actor34: tree17
 		Location: 118,56
 		Owner: Neutral
-	Actor24: tree18
+	Actor35: tree18
 		Location: 118,55
 		Owner: Neutral
-	Actor25: tree18
+	Actor36: tree18
 		Location: 152,40
 		Owner: Neutral
-	Actor26: tree19
+	Actor37: tree19
 		Location: 153,41
 		Owner: Neutral
-	Actor27: tree20
+	Actor38: tree20
 		Location: 152,41
 		Owner: Neutral
-	Actor28: tree12
+	Actor39: tree12
 		Location: 160,70
 		Owner: Neutral
-	Actor29: tree13
+	Actor40: tree13
 		Location: 161,70
 		Owner: Neutral
-	Actor30: tree14
+	Actor41: tree14
 		Location: 161,69
 		Owner: Neutral
-	Actor31: tree15
+	Actor42: tree15
 		Location: 162,69
 		Owner: Neutral
-	Actor32: tree15
+	Actor43: tree15
 		Location: 168,47
 		Owner: Neutral
-	Actor33: tree16
+	Actor44: tree16
 		Location: 169,48
 		Owner: Neutral
-	Actor34: tree17
+	Actor45: tree17
 		Location: 169,49
 		Owner: Neutral
-	Actor35: tree18
+	Actor46: tree18
 		Location: 170,50
 		Owner: Neutral
-	Actor36: tree19
+	Actor47: tree19
 		Location: 170,49
 		Owner: Neutral
-	Actor37: tree20
+	Actor48: tree20
 		Location: 171,50
 		Owner: Neutral
-	Actor38: tree21
+	Actor49: tree21
 		Location: 171,49
 		Owner: Neutral
-	Actor39: tree22
+	Actor50: tree22
 		Location: 172,30
 		Owner: Neutral
-	Actor40: tree23
+	Actor51: tree23
 		Location: 173,30
 		Owner: Neutral
-	Actor41: tree24
+	Actor52: tree24
 		Location: 172,29
 		Owner: Neutral
-	Actor42: tree25
+	Actor53: tree25
 		Location: 174,28
 		Owner: Neutral
-	Actor43: tibtre01
+	Actor54: tibtre01
 		Location: 141,13
 		Owner: Neutral
-	Actor44: tree01
+	Actor55: tree01
 		Location: 149,34
 		Owner: Neutral
-	Actor45: tree01
+	Actor56: tree01
 		Location: 149,35
 		Owner: Neutral
-	Actor46: tree01
+	Actor57: tree01
 		Location: 149,36
 		Owner: Neutral
-	Actor47: tree03
+	Actor58: tree03
 		Location: 150,35
 		Owner: Neutral
-	Actor48: tree04
+	Actor59: tree04
 		Location: 151,36
 		Owner: Neutral
-	Actor49: tree05
+	Actor60: tree05
 		Location: 148,35
 		Owner: Neutral
-	Actor50: tree06
+	Actor61: tree06
 		Location: 148,34
 		Owner: Neutral
-	Actor51: tree09
+	Actor62: tree09
 		Location: 107,17
 		Owner: Neutral
-	Actor52: tree10
+	Actor63: tree10
 		Location: 106,16
 		Owner: Neutral
-	Actor53: tree10
+	Actor64: tree10
 		Location: 107,-17
 		Owner: Neutral
-	Actor54: tree11
+	Actor65: tree11
 		Location: 106,-19
 		Owner: Neutral
-	Actor55: tree12
+	Actor66: tree12
 		Location: 107,-18
 		Owner: Neutral
-	Actor56: tree13
+	Actor67: tree13
 		Location: 108,-18
 		Owner: Neutral
-	Actor57: tree14
+	Actor68: tree14
 		Location: 108,-19
 		Owner: Neutral
-	Actor58: tree14
+	Actor69: tree14
 		Location: 89,-16
 		Owner: Neutral
-	Actor59: tree15
+	Actor70: tree15
 		Location: 89,-18
 		Owner: Neutral
-	Actor60: tree16
+	Actor71: tree16
 		Location: 88,-18
 		Owner: Neutral
-	Actor61: tree17
+	Actor72: tree17
 		Location: 89,-19
 		Owner: Neutral
-	Actor62: tree18
+	Actor73: tree18
 		Location: 90,-20
 		Owner: Neutral
-	Actor63: tree10
+	Actor74: tree10
 		Location: 122,-8
 		Owner: Neutral
-	Actor64: tree11
+	Actor75: tree11
 		Location: 123,-8
 		Owner: Neutral
-	Actor65: tree12
+	Actor76: tree12
 		Location: 123,-9
 		Owner: Neutral
-	Actor66: tree13
+	Actor77: tree13
 		Location: 124,-9
 		Owner: Neutral
-	Actor67: tree13
+	Actor78: tree13
 		Location: 145,16
 		Owner: Neutral
-	Actor68: tree14
+	Actor79: tree14
 		Location: 146,17
 		Owner: Neutral
-	Actor69: tree15
+	Actor80: tree15
 		Location: 146,16
 		Owner: Neutral
-	Actor70: tree15
+	Actor81: tree15
 		Location: 99,2
 		Owner: Neutral
-	Actor71: tree16
+	Actor82: tree16
 		Location: 99,1
 		Owner: Neutral
-	Actor72: tree17
+	Actor83: tree17
 		Location: 100,1
 		Owner: Neutral
-	Actor73: tree18
+	Actor84: tree18
 		Location: 99,0
 		Owner: Neutral
-	Actor74: tree19
+	Actor85: tree19
 		Location: 100,0
 		Owner: Neutral
-	Actor75: tree19
+	Actor86: tree19
 		Location: 175,-21
 		Owner: Neutral
-	Actor76: tree21
+	Actor87: tree21
 		Location: 176,-20
 		Owner: Neutral
-	Actor77: tree22
+	Actor88: tree22
 		Location: 176,-21
 		Owner: Neutral
-	Actor78: tree23
+	Actor89: tree23
 		Location: 176,-22
 		Owner: Neutral
-	Actor79: tree24
+	Actor90: tree24
 		Location: 175,-22
 		Owner: Neutral
-	Actor80: tree01
+	Actor91: tree01
 		Location: 101,36
 		Owner: Neutral
-	Actor81: tree03
+	Actor92: tree03
 		Location: 102,37
 		Owner: Neutral
-	Actor82: tree05
+	Actor93: tree05
 		Location: 103,36
 		Owner: Neutral
-	Actor83: tree06
+	Actor94: tree06
 		Location: 103,35
 		Owner: Neutral
-	Actor84: tree07
+	Actor95: tree07
 		Location: 104,35
 		Owner: Neutral
-	Actor85: tree25
+	Actor96: tree25
 		Location: 172,-33
 		Owner: Neutral
-	Actor86: tree24
+	Actor97: tree24
 		Location: 173,-33
 		Owner: Neutral
-	Actor87: tree23
+	Actor98: tree23
 		Location: 152,-23
 		Owner: Neutral
-	Actor88: tree22
+	Actor99: tree22
 		Location: 153,-23
 		Owner: Neutral
-	Actor89: tree21
+	Actor100: tree21
 		Location: 153,-22
 		Owner: Neutral
-	Actor90: tree21
+	Actor101: tree21
 		Location: 168,12
 		Owner: Neutral
-	Actor91: tree20
+	Actor102: tree20
 		Location: 167,11
 		Owner: Neutral
-	Actor92: tree19
+	Actor103: tree19
 		Location: 168,11
 		Owner: Neutral
-	Actor93: tree19
+	Actor104: tree19
 		Location: 136,42
 		Owner: Neutral
-	Actor94: tree18
+	Actor105: tree18
 		Location: 137,43
 		Owner: Neutral
-	Actor95: tree17
+	Actor106: tree17
 		Location: 137,44
 		Owner: Neutral
-	Actor96: tree16
+	Actor107: tree16
 		Location: 138,44
 		Owner: Neutral
-	Actor97: tree15
+	Actor108: tree15
 		Location: 138,43
 		Owner: Neutral
-	Actor98: tree14
+	Actor109: tree14
 		Location: 139,44
 		Owner: Neutral
-	Actor99: tree13
+	Actor110: tree13
 		Location: 139,43
 		Owner: Neutral
-	Actor100: tree12
+	Actor111: tree12
 		Location: 139,42
 		Owner: Neutral
-	Actor101: tree12
+	Actor112: tree12
 		Location: 99,67
 		Owner: Neutral
-	Actor102: tree11
+	Actor113: tree11
 		Location: 100,66
 		Owner: Neutral
-	Actor103: tree10
+	Actor114: tree10
 		Location: 101,67
 		Owner: Neutral
-	Actor104: tree09
+	Actor115: tree09
 		Location: 101,65
 		Owner: Neutral
-	Actor105: tree08
+	Actor116: tree08
 		Location: 60,-10
 		Owner: Neutral
-	Actor106: tree08
+	Actor117: tree08
 		Location: 134,0
 		Owner: Neutral
-	Actor107: tree07
+	Actor118: tree07
 		Location: 136,0
 		Owner: Neutral
-	Actor108: tree06
+	Actor119: tree06
 		Location: 135,-2
 		Owner: Neutral
-	Actor109: tree05
+	Actor120: tree05
 		Location: 136,-2
 		Owner: Neutral
-	Actor110: tree05
+	Actor121: tree05
 		Location: 176,33
 		Owner: Neutral
-	Actor111: tree05
+	Actor122: tree05
 		Location: 130,67
 		Owner: Neutral
-	Actor112: tree04
+	Actor123: tree04
 		Location: 130,65
 		Owner: Neutral
-	Actor113: tree03
+	Actor124: tree03
 		Location: 132,67
 		Owner: Neutral
-	Actor114: tree03
+	Actor125: tree03
 		Location: 114,92
 		Owner: Neutral
-	Actor115: tree02
+	Actor126: tree02
 		Location: 115,90
 		Owner: Neutral
-	Actor116: tree01
+	Actor127: tree01
 		Location: 115,91
 		Owner: Neutral
-	Actor117: tree06
+	Actor128: tree06
 		Location: 116,93
 		Owner: Neutral
-	Actor118: tree06
+	Actor129: tree06
 		Location: 93,-36
 		Owner: Neutral
-	Actor119: tree07
+	Actor130: tree07
 		Location: 93,-39
 		Owner: Neutral
-	Actor120: tree08
+	Actor131: tree08
 		Location: 94,-38
 		Owner: Neutral
-	Actor121: tree09
+	Actor132: tree09
 		Location: 94,-37
 		Owner: Neutral
-	Actor122: tree09
+	Actor133: tree09
 		Location: 115,-57
 		Owner: Neutral
-	Actor123: tree10
+	Actor134: tree10
 		Location: 116,-57
 		Owner: Neutral
-	Actor124: tree11
+	Actor135: tree11
 		Location: 116,-58
 		Owner: Neutral
-	Actor125: tree12
+	Actor136: tree12
 		Location: 117,-58
 		Owner: Neutral
-	Actor126: tree13
+	Actor137: tree13
 		Location: 119,-57
 		Owner: Neutral
-	Actor127: tree13
+	Actor138: tree13
 		Location: 156,-6
 		Owner: Neutral
-	Actor128: tree14
+	Actor139: tree14
 		Location: 158,-6
 		Owner: Neutral
-	Actor129: tree15
+	Actor140: tree15
 		Location: 158,-4
 		Owner: Neutral
-	Actor130: tree16
+	Actor141: tree16
 		Location: 160,-5
 		Owner: Neutral
-	Actor131: tree17
+	Actor142: tree17
 		Location: 160,-6
 		Owner: Neutral
-	Actor132: tree17
+	Actor143: tree17
 		Location: 147,-4
 		Owner: Neutral
-	Actor133: tree18
+	Actor144: tree18
 		Location: 148,-4
 		Owner: Neutral
-	Actor134: tree19
+	Actor145: tree19
 		Location: 146,-3
 		Owner: Neutral
-	Actor135: tree20
+	Actor146: tree20
 		Location: 145,-3
 		Owner: Neutral
-	Actor136: tree20
+	Actor147: tree20
 		Location: 140,-15
 		Owner: Neutral
-	Actor137: tree21
+	Actor148: tree21
 		Location: 140,-16
 		Owner: Neutral
-	Actor138: tree22
+	Actor149: tree22
 		Location: 141,-16
 		Owner: Neutral
-	Actor139: tree23
+	Actor150: tree23
 		Location: 140,-17
 		Owner: Neutral
-	Actor140: tibtre02
+	Actor151: tibtre02
 		Location: 206,-12
 		Owner: Neutral
-	Actor141: tibtre03
+	Actor152: tibtre03
 		Location: 118,103
 		Owner: Neutral
-	Actor142: tibtre02
+	Actor153: tibtre02
 		Location: 36,10
 		Owner: Neutral
-	Actor143: mpspawn
+	Actor154: mpspawn
 		Location: 34,-2
 		Owner: Neutral
-	Actor144: mpspawn
+	Actor155: mpspawn
 		Location: 187,-10
 		Owner: Neutral
-	Actor145: mpspawn
+	Actor156: mpspawn
 		Location: 113,79
 		Owner: Neutral
-	Actor146: mpspawn
+	Actor157: mpspawn
 		Location: 129,-91
 		Owner: Neutral
-	Actor147: waypoint
+	Actor158: waypoint
 		Location: 120,0
 		Owner: Neutral
-	Actor148: waypoint
+	Actor159: waypoint
 		Location: 120,0
 		Owner: Neutral
-	Actor149: trock04
+	Actor160: trock04
 		Location: 61,51
 		Owner: Neutral
-	Actor150: trock02
+	Actor161: trock02
 		Location: 69,52
 		Owner: Neutral
-	Actor151: trock03
+	Actor162: trock03
 		Location: 81,60
 		Owner: Neutral
-	Actor152: trock05
+	Actor163: trock05
 		Location: 84,60
 		Owner: Neutral

 Rules:
-	World:
-		GlobalLightingPaletteEffect:
-			Ambient: 0.63
+	^BaseWorld:
+		TerrainLighting:
+			Intensity: 0.605
+			HeightStep: 0.05
+	INGRNLMP:
+		TerrainLightSource:
+			Range: 7c832
+			Intensity: 0.01
+			RedTint: 0.01
+			GreenTint: 0.7
+			BlueTint: 0.01
--- a/mods/ts/maps/tiers/map.png
+++ b/mods/ts/maps/tiers/map.png
--- a/mods/ts/maps/tiers/map.yaml
+++ b/mods/ts/maps/tiers/map.yaml
@@ -39,374 +39,429 @@ Players:
 		Enemies: Creeps

 Actors:
-	Actor0: tibtre01
-		Location: 57,44
-		Owner: Neutral
-	Actor1: tibtre02
-		Location: 80,7
-		Owner: Neutral
-	Actor2: tibtre03
-		Location: 49,7
-		Owner: Neutral
-	Actor3: tibtre01
-		Location: 51,-15
-		Owner: Neutral
-	Actor4: tibtre02
-		Location: 78,-26
-		Owner: Neutral
-	Actor5: tibtre03
-		Location: 85,-14
-		Owner: Neutral
-	Actor6: fona01
-		Location: 62,35
-		Owner: Neutral
-	Actor7: fona02
-		Location: 63,28
-		Owner: Neutral
-	Actor8: fona03
-		Location: 73,34
-		Owner: Neutral
-	Actor9: fona04
-		Location: 71,29
-		Owner: Neutral
-	Actor10: fona05
-		Location: 69,20
-		Owner: Neutral
-	Actor11: fona01
-		Location: 81,22
-		Owner: Neutral
-	Actor12: fona02
-		Location: 78,18
-		Owner: Neutral
-	Actor13: fona03
-		Location: 80,29
-		Owner: Neutral
-	Actor14: fona04
-		Location: 69,13
-		Owner: Neutral
-	Actor15: fona11
-		Location: 66,30
-		Owner: Neutral
-	Actor16: fona12
-		Location: 79,31
-		Owner: Neutral
-	Actor17: fona13
-		Location: 63,35
-		Owner: Neutral
-	Actor18: fona14
-		Location: 78,16
-		Owner: Neutral
-	Actor19: fona15
-		Location: 80,25
-		Owner: Neutral
-	Actor20: fona01
-		Location: 57,-45
-		Owner: Neutral
-	Actor21: fona02
-		Location: 57,-40
-		Owner: Neutral
-	Actor22: fona03
-		Location: 66,-40
-		Owner: Neutral
-	Actor23: fona04
-		Location: 70,-36
-		Owner: Neutral
-	Actor24: fona05
-		Location: 74,-40
-		Owner: Neutral
-	Actor25: fona11
-		Location: 68,-39
-		Owner: Neutral
-	Actor26: fona12
-		Location: 72,-39
-		Owner: Neutral
-	Actor27: fona13
-		Location: 55,-40
-		Owner: Neutral
-	Actor28: fona14
-		Location: 67,-46
-		Owner: Neutral
-	Actor29: fona15
-		Location: 72,-47
-		Owner: Neutral
-	Actor30: fona06
-		Location: 50,25
-		Owner: Neutral
-	Actor31: fona07
-		Location: 54,26
-		Owner: Neutral
-	Actor32: fona08
-		Location: 46,18
-		Owner: Neutral
-	Actor33: fona09
-		Location: 52,19
-		Owner: Neutral
-	Actor34: fona10
-		Location: 48,17
-		Owner: Neutral
-	Actor35: fona08
-		Location: 48,21
-		Owner: Neutral
-	Actor36: fona06
-		Location: 68,6
-		Owner: Neutral
-	Actor37: fona07
-		Location: 70,5
-		Owner: Neutral
-	Actor38: fona08
-		Location: 72,3
-		Owner: Neutral
-	Actor39: fona09
-		Location: 74,0
-		Owner: Neutral
-	Actor40: fona10
-		Location: 57,-10
-		Owner: Neutral
-	Actor41: fona08
-		Location: 54,-8
-		Owner: Neutral
-	Actor42: fona07
-		Location: 56,-7
-		Owner: Neutral
-	Actor43: fona06
-		Location: 58,-28
-		Owner: Neutral
-	Actor44: fona08
-		Location: 59,-30
-		Owner: Neutral
-	Actor45: fona07
-		Location: 57,-22
-		Owner: Neutral
-	Actor46: fona09
-		Location: 54,-22
-		Owner: Neutral
-	Actor47: fona10
-		Location: 53,-22
-		Owner: Neutral
-	Actor48: tree01
-		Location: 16,9
-		Owner: Neutral
-	Actor49: tree03
-		Location: 14,6
-		Owner: Neutral
-	Actor50: tree04
-		Location: 19,5
-		Owner: Neutral
-	Actor51: tree05
-		Location: 18,7
-		Owner: Neutral
-	Actor52: tree06
-		Location: 19,13
-		Owner: Neutral
-	Actor53: tree07
-		Location: 31,-10
-		Owner: Neutral
-	Actor54: tree08
-		Location: 34,-12
-		Owner: Neutral
-	Actor55: tree09
-		Location: 30,-8
-		Owner: Neutral
-	Actor56: tree10
-		Location: 36,-11
-		Owner: Neutral
-	Actor57: tree11
-		Location: 32,-11
-		Owner: Neutral
-	Actor58: tree12
-		Location: 36,28
-		Owner: Neutral
-	Actor59: tree13
-		Location: 38,28
-		Owner: Neutral
-	Actor60: tree14
-		Location: 37,30
-		Owner: Neutral
-	Actor61: tree15
-		Location: 28,22
-		Owner: Neutral
-	Actor62: tree15
-		Location: 73,24
-		Owner: Neutral
-	Actor63: tree16
-		Location: 65,43
-		Owner: Neutral
-	Actor64: tree17
-		Location: 67,45
-		Owner: Neutral
-	Actor65: tree18
-		Location: 90,14
-		Owner: Neutral
-	Actor66: tree19
-		Location: 90,16
-		Owner: Neutral
-	Actor67: tree20
-		Location: 92,16
-		Owner: Neutral
-	Actor68: tree02
-		Location: 90,15
-		Owner: Neutral
-	Actor69: tree03
-		Location: 98,13
-		Owner: Neutral
-	Actor70: tree04
-		Location: 98,15
-		Owner: Neutral
-	Actor71: tree05
-		Location: 92,19
-		Owner: Neutral
-	Actor72: tree06
-		Location: 94,18
-		Owner: Neutral
-	Actor73: tree06
-		Location: 39,-17
-		Owner: Neutral
-	Actor74: tree07
-		Location: 41,-16
-		Owner: Neutral
-	Actor75: tree08
-		Location: 37,-16
-		Owner: Neutral
-	Actor76: tree09
-		Location: 41,-23
-		Owner: Neutral
-	Actor77: tree10
-		Location: 43,-21
-		Owner: Neutral
-	Actor78: tree11
-		Location: 41,-15
-		Owner: Neutral
-	Actor79: tree12
-		Location: 38,-20
-		Owner: Neutral
-	Actor80: tree12
-		Location: 114,-8
-		Owner: Neutral
-	Actor81: tree12
-		Location: 113,-8
-		Owner: Neutral
-	Actor82: tree13
-		Location: 113,-7
-		Owner: Neutral
-	Actor83: tree14
-		Location: 115,-6
-		Owner: Neutral
-	Actor84: tree15
-		Location: 113,-10
-		Owner: Neutral
-	Actor85: tree01
-		Location: 81,-34
-		Owner: Neutral
-	Actor86: tree02
-		Location: 79,-43
-		Owner: Neutral
-	Actor87: tree03
-		Location: 85,-35
-		Owner: Neutral
-	Actor88: tree04
-		Location: 89,-34
-		Owner: Neutral
-	Actor89: tree05
-		Location: 86,-36
-		Owner: Neutral
-	Actor90: tree06
-		Location: 77,-46
-		Owner: Neutral
-	Actor91: tree07
-		Location: 83,-35
-		Owner: Neutral
-	Actor92: tree08
-		Location: 89,-32
-		Owner: Neutral
-	Actor93: tree09
-		Location: 70,-25
-		Owner: Neutral
-	Actor94: tree09
-		Location: 61,-50
-		Owner: Neutral
-	Actor95: tree10
-		Location: 63,-51
-		Owner: Neutral
-	Actor96: tree11
-		Location: 66,-50
-		Owner: Neutral
-	Actor97: tree12
-		Location: 58,-47
-		Owner: Neutral
-	Actor98: tree13
-		Location: 62,-50
-		Owner: Neutral
-	Actor99: tree14
-		Location: 63,-49
-		Owner: Neutral
-	Actor100: tree14
-		Location: 70,-51
-		Owner: Neutral
-	Actor101: tree15
-		Location: 72,-51
-		Owner: Neutral
-	Actor102: tree16
-		Location: 72,-50
-		Owner: Neutral
-	Actor103: tree17
-		Location: 74,-48
-		Owner: Neutral
-	Actor104: tree18
-		Location: 57,9
-		Owner: Neutral
-	Actor105: tree20
-		Location: 62,11
-		Owner: Neutral
-	Actor106: tree21
-		Location: 65,-2
-		Owner: Neutral
-	Actor107: tree22
-		Location: 56,-4
-		Owner: Neutral
-	Actor108: tree23
-		Location: 69,1
-		Owner: Neutral
-	Actor109: tree24
-		Location: 65,-13
-		Owner: Neutral
-	Actor110: tree25
-		Location: 72,-7
-		Owner: Neutral
-	Actor111: bigblue3
-		Location: 66,33
-		Owner: Neutral
-	Actor112: bigblue3
-		Location: 71,17
-		Owner: Neutral
-	Actor113: bigblue3
-		Location: 62,-45
-		Owner: Neutral
-	Actor114: bigblue3
+	Actor0: inblulmp
 		Location: 71,-45
 		Owner: Neutral
-	Actor115: mpspawn
+		Facing: 896
+	Actor1: inblulmp
+		Location: 62,-45
+		Owner: Neutral
+		Facing: 896
+	Actor2: inblulmp
+		Location: 71,17
+		Owner: Neutral
+		Facing: 896
+	Actor3: inblulmp
+		Location: 66,33
+		Owner: Neutral
+		Facing: 896
+	Actor4: ingrnlmp
+		Location: 85,-14
+		Owner: Neutral
+		Facing: 896
+	Actor5: ingrnlmp
+		Location: 49,7
+		Owner: Neutral
+		Facing: 896
+	Actor6: ingrnlmp
+		Location: 51,-15
+		Owner: Neutral
+		Facing: 896
+	Actor7: ingrnlmp
+		Location: 80,7
+		Owner: Neutral
+		Facing: 896
+	Actor8: ingrnlmp
+		Location: 57,44
+		Owner: Neutral
+		Facing: 896
+	Actor9: ingrnlmp
+		Location: 78,-26
+		Owner: Neutral
+		Facing: 896
+	Actor10: tibtre01
+		Location: 57,44
+		Owner: Neutral
+	Actor11: tibtre02
+		Location: 80,7
+		Owner: Neutral
+	Actor12: tibtre03
+		Location: 49,7
+		Owner: Neutral
+	Actor13: tibtre01
+		Location: 51,-15
+		Owner: Neutral
+	Actor14: tibtre02
+		Location: 78,-26
+		Owner: Neutral
+	Actor15: tibtre03
+		Location: 85,-14
+		Owner: Neutral
+	Actor16: fona01
+		Location: 62,35
+		Owner: Neutral
+	Actor17: fona02
+		Location: 63,28
+		Owner: Neutral
+	Actor18: fona03
+		Location: 73,34
+		Owner: Neutral
+	Actor19: fona04
+		Location: 71,29
+		Owner: Neutral
+	Actor20: fona05
+		Location: 69,20
+		Owner: Neutral
+	Actor21: fona01
+		Location: 81,22
+		Owner: Neutral
+	Actor22: fona02
+		Location: 78,18
+		Owner: Neutral
+	Actor23: fona03
+		Location: 80,29
+		Owner: Neutral
+	Actor24: fona04
+		Location: 69,13
+		Owner: Neutral
+	Actor25: fona11
+		Location: 66,30
+		Owner: Neutral
+	Actor26: fona12
+		Location: 79,31
+		Owner: Neutral
+	Actor27: fona13
+		Location: 63,35
+		Owner: Neutral
+	Actor28: fona14
+		Location: 78,16
+		Owner: Neutral
+	Actor29: fona15
+		Location: 80,25
+		Owner: Neutral
+	Actor30: fona01
+		Location: 57,-45
+		Owner: Neutral
+	Actor31: fona02
+		Location: 57,-40
+		Owner: Neutral
+	Actor32: fona03
+		Location: 66,-40
+		Owner: Neutral
+	Actor33: fona04
+		Location: 70,-36
+		Owner: Neutral
+	Actor34: fona05
+		Location: 74,-40
+		Owner: Neutral
+	Actor35: fona11
+		Location: 68,-39
+		Owner: Neutral
+	Actor36: fona12
+		Location: 72,-39
+		Owner: Neutral
+	Actor37: fona13
+		Location: 55,-40
+		Owner: Neutral
+	Actor38: fona14
+		Location: 67,-46
+		Owner: Neutral
+	Actor39: fona15
+		Location: 72,-47
+		Owner: Neutral
+	Actor40: fona06
+		Location: 50,25
+		Owner: Neutral
+	Actor41: fona07
+		Location: 54,26
+		Owner: Neutral
+	Actor42: fona08
+		Location: 46,18
+		Owner: Neutral
+	Actor43: fona09
+		Location: 52,19
+		Owner: Neutral
+	Actor44: fona10
+		Location: 48,17
+		Owner: Neutral
+	Actor45: fona08
+		Location: 48,21
+		Owner: Neutral
+	Actor46: fona06
+		Location: 68,6
+		Owner: Neutral
+	Actor47: fona07
+		Location: 70,5
+		Owner: Neutral
+	Actor48: fona08
+		Location: 72,3
+		Owner: Neutral
+	Actor49: fona09
+		Location: 74,0
+		Owner: Neutral
+	Actor50: fona10
+		Location: 57,-10
+		Owner: Neutral
+	Actor51: fona08
+		Location: 54,-8
+		Owner: Neutral
+	Actor52: fona07
+		Location: 56,-7
+		Owner: Neutral
+	Actor53: fona06
+		Location: 58,-28
+		Owner: Neutral
+	Actor54: fona08
+		Location: 59,-30
+		Owner: Neutral
+	Actor55: fona07
+		Location: 57,-22
+		Owner: Neutral
+	Actor56: fona09
+		Location: 54,-22
+		Owner: Neutral
+	Actor57: fona10
+		Location: 53,-22
+		Owner: Neutral
+	Actor58: tree01
+		Location: 16,9
+		Owner: Neutral
+	Actor59: tree03
+		Location: 14,6
+		Owner: Neutral
+	Actor60: tree04
+		Location: 19,5
+		Owner: Neutral
+	Actor61: tree05
+		Location: 18,7
+		Owner: Neutral
+	Actor62: tree06
+		Location: 19,13
+		Owner: Neutral
+	Actor63: tree07
+		Location: 31,-10
+		Owner: Neutral
+	Actor64: tree08
+		Location: 34,-12
+		Owner: Neutral
+	Actor65: tree09
+		Location: 30,-8
+		Owner: Neutral
+	Actor66: tree10
+		Location: 36,-11
+		Owner: Neutral
+	Actor67: tree11
+		Location: 32,-11
+		Owner: Neutral
+	Actor68: tree12
+		Location: 36,28
+		Owner: Neutral
+	Actor69: tree13
+		Location: 38,28
+		Owner: Neutral
+	Actor70: tree14
+		Location: 37,30
+		Owner: Neutral
+	Actor71: tree15
+		Location: 28,22
+		Owner: Neutral
+	Actor72: tree15
+		Location: 73,24
+		Owner: Neutral
+	Actor73: tree16
+		Location: 65,43
+		Owner: Neutral
+	Actor74: tree17
+		Location: 67,45
+		Owner: Neutral
+	Actor75: tree18
+		Location: 90,14
+		Owner: Neutral
+	Actor76: tree19
+		Location: 90,16
+		Owner: Neutral
+	Actor77: tree20
+		Location: 92,16
+		Owner: Neutral
+	Actor78: tree02
+		Location: 90,15
+		Owner: Neutral
+	Actor79: tree03
+		Location: 98,13
+		Owner: Neutral
+	Actor80: tree04
+		Location: 98,15
+		Owner: Neutral
+	Actor81: tree05
+		Location: 92,19
+		Owner: Neutral
+	Actor82: tree06
+		Location: 94,18
+		Owner: Neutral
+	Actor83: tree06
+		Location: 39,-17
+		Owner: Neutral
+	Actor84: tree07
+		Location: 41,-16
+		Owner: Neutral
+	Actor85: tree08
+		Location: 37,-16
+		Owner: Neutral
+	Actor86: tree09
+		Location: 41,-23
+		Owner: Neutral
+	Actor87: tree10
+		Location: 43,-21
+		Owner: Neutral
+	Actor88: tree11
+		Location: 41,-15
+		Owner: Neutral
+	Actor89: tree12
+		Location: 38,-20
+		Owner: Neutral
+	Actor90: tree12
+		Location: 114,-8
+		Owner: Neutral
+	Actor91: tree12
+		Location: 113,-8
+		Owner: Neutral
+	Actor92: tree13
+		Location: 113,-7
+		Owner: Neutral
+	Actor93: tree14
+		Location: 115,-6
+		Owner: Neutral
+	Actor94: tree15
+		Location: 113,-10
+		Owner: Neutral
+	Actor95: tree01
+		Location: 81,-34
+		Owner: Neutral
+	Actor96: tree02
+		Location: 79,-43
+		Owner: Neutral
+	Actor97: tree03
+		Location: 85,-35
+		Owner: Neutral
+	Actor98: tree04
+		Location: 89,-34
+		Owner: Neutral
+	Actor99: tree05
+		Location: 86,-36
+		Owner: Neutral
+	Actor100: tree06
+		Location: 77,-46
+		Owner: Neutral
+	Actor101: tree07
+		Location: 83,-35
+		Owner: Neutral
+	Actor102: tree08
+		Location: 89,-32
+		Owner: Neutral
+	Actor103: tree09
+		Location: 70,-25
+		Owner: Neutral
+	Actor104: tree09
+		Location: 61,-50
+		Owner: Neutral
+	Actor105: tree10
+		Location: 63,-51
+		Owner: Neutral
+	Actor106: tree11
+		Location: 66,-50
+		Owner: Neutral
+	Actor107: tree12
+		Location: 58,-47
+		Owner: Neutral
+	Actor108: tree13
+		Location: 62,-50
+		Owner: Neutral
+	Actor109: tree14
+		Location: 63,-49
+		Owner: Neutral
+	Actor110: tree14
+		Location: 70,-51
+		Owner: Neutral
+	Actor111: tree15
+		Location: 72,-51
+		Owner: Neutral
+	Actor112: tree16
+		Location: 72,-50
+		Owner: Neutral
+	Actor113: tree17
+		Location: 74,-48
+		Owner: Neutral
+	Actor114: tree18
+		Location: 57,9
+		Owner: Neutral
+	Actor115: tree20
+		Location: 62,11
+		Owner: Neutral
+	Actor116: tree21
+		Location: 65,-2
+		Owner: Neutral
+	Actor117: tree22
+		Location: 56,-4
+		Owner: Neutral
+	Actor118: tree23
+		Location: 69,1
+		Owner: Neutral
+	Actor119: tree24
+		Location: 65,-13
+		Owner: Neutral
+	Actor120: tree25
+		Location: 72,-7
+		Owner: Neutral
+	Actor121: bigblue3
+		Location: 66,33
+		Owner: Neutral
+	Actor122: bigblue3
+		Location: 71,17
+		Owner: Neutral
+	Actor123: bigblue3
+		Location: 62,-45
+		Owner: Neutral
+	Actor124: bigblue3
+		Location: 71,-45
+		Owner: Neutral
+	Actor125: mpspawn
 		Location: 40,5
 		Owner: Neutral
-	Actor116: mpspawn
+	Actor126: mpspawn
 		Location: 97,-10
 		Owner: Neutral
-	Actor117: waypoint
+	Actor127: waypoint
 		Location: 55,-5
 		Owner: Neutral
-	Actor118: waypoint
+	Actor128: waypoint
 		Location: 55,-5
 		Owner: Neutral
-	Actor119: veinhole
+	Actor129: veinhole
 		Location: 61,-18
 		Owner: Neutral
-	Actor120: veinhole
+	Actor130: veinhole
 		Location: 72,-11
 		Owner: Neutral
-	Actor121: veinhole
+	Actor131: veinhole
 		Location: 62,1
 		Owner: Neutral

 Rules:
-	World:
-		GlobalLightingPaletteEffect:
-			Ambient: 0.79
+	^BaseWorld:
+		TerrainLighting:
+			Intensity: 0.79
+			HeightStep: 0.014
+	INGRNLMP:
+		TerrainLightSource:
+			Range: 7c832
+			Intensity: 0.01
+			RedTint: 0.01
+			GreenTint: 0.7
+			BlueTint: 0.01
+	INBLULMP:
+		TerrainLightSource:
+			Range: 9c784
+			Intensity: 0.01
+			RedTint: 0.01
+			GreenTint: 0.01
+			BlueTint: 0.7
--- a/mods/ts/maps/tread_l/map.png
+++ b/mods/ts/maps/tread_l/map.png
--- a/mods/ts/maps/tread_l/map.yaml
+++ b/mods/ts/maps/tread_l/map.yaml
--- a/mods/ts/maps/ts_rift/map.png
+++ b/mods/ts/maps/ts_rift/map.png
--- a/mods/ts/maps/ts_rift/map.yaml
+++ b/mods/ts/maps/ts_rift/map.yaml
@@ -43,87 +43,87 @@ Actors:
 		Location: 156,34
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor3: ca0007
 		Location: 160,36
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor4: ca0006
 		Location: 160,32
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor5: ca0003
 		Location: 161,28
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor6: ca0018
 		Location: 164,37
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor7: ca0020
 		Location: 164,35
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor8: ca0020
 		Location: 167,35
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor9: ca0019
 		Location: 167,37
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor10: ca0015
 		Location: 164,27
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor11: ca0008
 		Location: 153,-21
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor12: ca0009
 		Location: 106,22
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor13: ca0015
 		Location: 150,-23
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor14: ca0016
 		Location: 157,-21
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor15: ca0017
 		Location: 107,28
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor16: ca0013
 		Location: 101,22
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor17: ca0012
 		Location: 110,27
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor18: ca0011
 		Location: 150,-27
 		Owner: Neutral
 		Health: 100
-		Facing: 160
+		Facing: 640
 	Actor22: tree21
 		Location: 104,-54
 		Owner: Neutral
@@ -1685,37 +1685,37 @@ Actors:
 		Owner: Neutral
 		Location: 167,30
 		SubCell: 2
-		Facing: 92
+		Facing: 368
 	Actor549: civ1
 		Owner: Neutral
 		Location: 161,41
 		SubCell: 1
-		Facing: 92
+		Facing: 368
 	Actor550: civ2
 		Owner: Neutral
 		Location: 159,34
 		SubCell: 2
-		Facing: 92
+		Facing: 368
 	Actor551: civ2
 		Owner: Neutral
 		Location: 162,31
 		SubCell: 2
-		Facing: 92
+		Facing: 368
 	Actor552: civ3
 		Owner: Neutral
 		Location: 162,33
 		SubCell: 2
-		Facing: 92
+		Facing: 368
 	Actor553: civ2
 		Owner: Neutral
 		Location: 155,-20
 		SubCell: 2
-		Facing: 92
+		Facing: 368
 	Actor554: civ2
 		Owner: Neutral
 		Location: 108,25
 		SubCell: 2
-		Facing: 92
+		Facing: 368
 	Actor555: fona11
 		Owner: Neutral
 		Location: 105,-31
--- a/mods/ts/maps/uganda/map.png
+++ b/mods/ts/maps/uganda/map.png