From d55e58ea1c4a0b2dd2f65c4281f99535f350cd8b Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Tue, 9 Nov 2010 23:22:34 +1300
Subject: [PATCH] Map Tweaks: Remove algernon, remove hospital on chokepoint,
 fix broken water tiles on wargames.

---
 mods/cnc/maps/algernon/map.bin    | Bin 20485 -> 0 bytes
 mods/cnc/maps/algernon/map.uid    |   1 -
 mods/cnc/maps/algernon/map.yaml   | 493 --------------------------
 mods/cnc/maps/chokepoint/map.uid  |   2 +-
 mods/cnc/maps/chokepoint/map.yaml | 379 ++++++++++----------
 mods/cnc/maps/wargames/map.bin    | Bin 20485 -> 20485 bytes
 mods/cnc/maps/wargames/map.uid    |   2 +-
 mods/cnc/maps/wargames/map.yaml   | 566 +++++++++++++++---------------
 8 files changed, 479 insertions(+), 964 deletions(-)
 delete mode 100644 mods/cnc/maps/algernon/map.bin
 delete mode 100644 mods/cnc/maps/algernon/map.uid
 delete mode 100644 mods/cnc/maps/algernon/map.yaml

diff --git a/mods/cnc/maps/algernon/map.bin b/mods/cnc/maps/algernon/map.bin
deleted file mode 100644
index 1518b64a21cea585e9312f7ae40937ee74c5bbb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20485
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
VA%4WlS?6VjG3dr<dFy{p`d=w+u8jZy

diff --git a/mods/cnc/maps/algernon/map.uid b/mods/cnc/maps/algernon/map.uid
deleted file mode 100644
index 41f4e4caab..0000000000
--- a/mods/cnc/maps/algernon/map.uid
+++ /dev/null
@@ -1 +0,0 @@
-39088fecadb07eab59ac1a529de6619cab583423
\ No newline at end of file
diff --git a/mods/cnc/maps/algernon/map.yaml b/mods/cnc/maps/algernon/map.yaml
deleted file mode 100644
index 49b51b9d73..0000000000
--- a/mods/cnc/maps/algernon/map.yaml
+++ /dev/null
@@ -1,493 +0,0 @@
-Selectable: True
-
-MapFormat: 3
-
-Title: Battle at Algernon
-
-Author: Westwood Studios
-
-PlayerCount: 4
-
-Tileset: TEMPERAT
-
-MapSize: 64,64
-
-TopLeft: 1,1
-
-BottomRight: 63,63
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		Palette:
-		OwnsWorld: True
-		NonCombatant: True
-		Playable: False
-		DefaultStartingUnits: False
-		AllowBots: True
-		LockRace: False
-		Race: gdi
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi0:
-		Name: Multi0
-		Palette:
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		AllowBots: True
-		LockRace: False
-		Race: Random
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi1:
-		Name: Multi1
-		Palette:
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		AllowBots: True
-		LockRace: False
-		Race: Random
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi2:
-		Name: Multi2
-		Palette:
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		AllowBots: True
-		LockRace: False
-		Race: Random
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi3:
-		Name: Multi3
-		Palette:
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		AllowBots: True
-		LockRace: False
-		Race: Random
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-
-Actors:
-	Actor0: t16
-		Location: 36,60
-		Owner: Neutral
-	Actor1: tc02
-		Location: 31,60
-		Owner: Neutral
-	Actor2: tc04
-		Location: 21,60
-		Owner: Neutral
-	Actor3: t01
-		Location: 57,59
-		Owner: Neutral
-	Actor4: t08
-		Location: 41,59
-		Owner: Neutral
-	Actor5: t01
-		Location: 9,58
-		Owner: Neutral
-	Actor6: tc03
-		Location: 36,57
-		Owner: Neutral
-	Actor7: t01
-		Location: 51,56
-		Owner: Neutral
-	Actor8: tc01
-		Location: 39,56
-		Owner: Neutral
-	Actor9: tc04
-		Location: 24,53
-		Owner: Neutral
-	Actor10: t01
-		Location: 13,53
-		Owner: Neutral
-	Actor11: t01
-		Location: 58,52
-		Owner: Neutral
-	Actor12: t01
-		Location: 8,52
-		Owner: Neutral
-	Actor13: tc04
-		Location: 38,51
-		Owner: Neutral
-	Actor14: tc04
-		Location: 32,50
-		Owner: Neutral
-	Actor15: t14
-		Location: 26,50
-		Owner: Neutral
-	Actor16: tc01
-		Location: 23,48
-		Owner: Neutral
-	Actor17: tc03
-		Location: 29,47
-		Owner: Neutral
-	Actor18: split2
-		Location: 61,45
-		Owner: Neutral
-	Actor19: split2
-		Location: 46,45
-		Owner: Neutral
-	Actor20: split2
-		Location: 17,45
-		Owner: Neutral
-	Actor21: split2
-		Location: 1,45
-		Owner: Neutral
-	Actor22: tc02
-		Location: 40,44
-		Owner: Neutral
-	Actor23: t12
-		Location: 39,43
-		Owner: Neutral
-	Actor24: split2
-		Location: 36,43
-		Owner: Neutral
-	Actor25: tc02
-		Location: 28,43
-		Owner: Neutral
-	Actor26: tc04
-		Location: 22,42
-		Owner: Neutral
-	Actor27: tc02
-		Location: 61,40
-		Owner: Neutral
-	Actor28: t01
-		Location: 58,40
-		Owner: Neutral
-	Actor29: tc03
-		Location: 53,40
-		Owner: Neutral
-	Actor30: t15
-		Location: 30,40
-		Owner: Neutral
-	Actor31: t12
-		Location: 20,40
-		Owner: Neutral
-	Actor32: t11
-		Location: 47,39
-		Owner: Neutral
-	Actor33: t14
-		Location: 21,39
-		Owner: Neutral
-	Actor34: tc04
-		Location: 4,39
-		Owner: Neutral
-	Actor35: tc05
-		Location: 1,39
-		Owner: Neutral
-	Actor36: split2
-		Location: 27,38
-		Owner: Neutral
-	Actor37: tc03
-		Location: 10,38
-		Owner: Neutral
-	Actor38: t03
-		Location: 61,37
-		Owner: Neutral
-	Actor39: tc02
-		Location: 56,37
-		Owner: Neutral
-	Actor40: t08
-		Location: 52,37
-		Owner: Neutral
-	Actor41: tc01
-		Location: 14,37
-		Owner: Neutral
-	Actor42: t02
-		Location: 5,37
-		Owner: Neutral
-	Actor43: t01
-		Location: 2,37
-		Owner: Neutral
-	Actor44: tc01
-		Location: 45,36
-		Owner: Neutral
-	Actor45: tc01
-		Location: 39,36
-		Owner: Neutral
-	Actor46: split2
-		Location: 37,35
-		Owner: Neutral
-	Actor47: split2
-		Location: 32,35
-		Owner: Neutral
-	Actor48: t01
-		Location: 7,35
-		Owner: Neutral
-	Actor49: tc01
-		Location: 27,34
-		Owner: Neutral
-	Actor50: tc04
-		Location: 20,34
-		Owner: Neutral
-	Actor51: split2
-		Location: 38,33
-		Owner: Neutral
-	Actor52: split2
-		Location: 36,33
-		Owner: Neutral
-	Actor53: split2
-		Location: 34,33
-		Owner: Neutral
-	Actor54: split2
-		Location: 29,33
-		Owner: Neutral
-	Actor55: tc04
-		Location: 4,33
-		Owner: Neutral
-	Actor56: tc02
-		Location: 60,32
-		Owner: Neutral
-	Actor57: split2
-		Location: 35,32
-		Owner: Neutral
-	Actor58: tc01
-		Location: 14,32
-		Owner: Neutral
-	Actor59: split2
-		Location: 39,31
-		Owner: Neutral
-	Actor60: split2
-		Location: 38,31
-		Owner: Neutral
-	Actor61: split2
-		Location: 36,31
-		Owner: Neutral
-	Actor62: split2
-		Location: 34,31
-		Owner: Neutral
-	Actor63: split2
-		Location: 32,31
-		Owner: Neutral
-	Actor64: tc01
-		Location: 2,31
-		Owner: Neutral
-	Actor65: split2
-		Location: 29,30
-		Owner: Neutral
-	Actor66: split2
-		Location: 9,30
-		Owner: Neutral
-	Actor67: tc01
-		Location: 59,29
-		Owner: Neutral
-	Actor68: split2
-		Location: 38,29
-		Owner: Neutral
-	Actor69: split2
-		Location: 36,29
-		Owner: Neutral
-	Actor70: split2
-		Location: 34,29
-		Owner: Neutral
-	Actor71: split2
-		Location: 32,29
-		Owner: Neutral
-	Actor72: split2
-		Location: 30,29
-		Owner: Neutral
-	Actor73: t11
-		Location: 22,29
-		Owner: Neutral
-	Actor74: tc03
-		Location: 4,29
-		Owner: Neutral
-	Actor75: split2
-		Location: 35,28
-		Owner: Neutral
-	Actor76: tc04
-		Location: 48,27
-		Owner: Neutral
-	Actor77: split2
-		Location: 45,27
-		Owner: Neutral
-	Actor78: split2
-		Location: 37,27
-		Owner: Neutral
-	Actor79: t07
-		Location: 30,27
-		Owner: Neutral
-	Actor80: split2
-		Location: 28,27
-		Owner: Neutral
-	Actor81: tc05
-		Location: 60,26
-		Owner: Neutral
-	Actor82: tc05
-		Location: 1,26
-		Owner: Neutral
-	Actor83: t02
-		Location: 49,25
-		Owner: Neutral
-	Actor84: tc01
-		Location: 40,25
-		Owner: Neutral
-	Actor85: t03
-		Location: 45,24
-		Owner: Neutral
-	Actor86: tc01
-		Location: 36,24
-		Owner: Neutral
-	Actor87: t07
-		Location: 22,24
-		Owner: Neutral
-	Actor88: t11
-		Location: 13,24
-		Owner: Neutral
-	Actor89: tc01
-		Location: 8,24
-		Owner: Neutral
-	Actor90: tc03
-		Location: 60,23
-		Owner: Neutral
-	Actor91: tc02
-		Location: 52,23
-		Owner: Neutral
-	Actor92: tc03
-		Location: 47,23
-		Owner: Neutral
-	Actor93: t15
-		Location: 27,23
-		Owner: Neutral
-	Actor94: tc04
-		Location: 16,23
-		Owner: Neutral
-	Actor95: tc02
-		Location: 21,22
-		Owner: Neutral
-	Actor96: tc02
-		Location: 5,22
-		Owner: Neutral
-	Actor97: tc02
-		Location: 1,22
-		Owner: Neutral
-	Actor98: tc05
-		Location: 39,19
-		Owner: Neutral
-	Actor99: split2
-		Location: 28,18
-		Owner: Neutral
-	Actor100: tc01
-		Location: 26,18
-		Owner: Neutral
-	Actor101: split2
-		Location: 61,17
-		Owner: Neutral
-	Actor102: split2
-		Location: 46,17
-		Owner: Neutral
-	Actor103: tc01
-		Location: 33,17
-		Owner: Neutral
-	Actor104: split2
-		Location: 17,17
-		Owner: Neutral
-	Actor105: split2
-		Location: 1,17
-		Owner: Neutral
-	Actor106: tc01
-		Location: 41,15
-		Owner: Neutral
-	Actor107: t08
-		Location: 28,15
-		Owner: Neutral
-	Actor108: t02
-		Location: 27,13
-		Owner: Neutral
-	Actor109: tc02
-		Location: 23,13
-		Owner: Neutral
-	Actor110: t01
-		Location: 54,11
-		Owner: Neutral
-	Actor111: t01
-		Location: 9,11
-		Owner: Neutral
-	Actor112: t01
-		Location: 38,10
-		Owner: Neutral
-	Actor113: tc01
-		Location: 23,9
-		Owner: Neutral
-	Actor114: tc01
-		Location: 40,8
-		Owner: Neutral
-	Actor115: t08
-		Location: 38,7
-		Owner: Neutral
-	Actor116: split2
-		Location: 30,6
-		Owner: Neutral
-	Actor117: tc03
-		Location: 40,5
-		Owner: Neutral
-	Actor118: t01
-		Location: 59,4
-		Owner: Neutral
-	Actor119: t01
-		Location: 52,3
-		Owner: Neutral
-	Actor120: split2
-		Location: 23,3
-		Owner: Neutral
-	Actor121: t01
-		Location: 12,3
-		Owner: Neutral
-	Actor122: t01
-		Location: 5,3
-		Owner: Neutral
-	Actor123: t08
-		Location: 42,2
-		Owner: Neutral
-	Actor124: t12
-		Location: 38,2
-		Owner: Neutral
-	Actor125: tc01
-		Location: 32,1
-		Owner: Neutral
-	Actor126: tc05
-		Location: 27,1
-		Owner: Neutral
-
-Waypoints:
-	spawn5: 10,5
-	spawn4: 7,57
-	spawn3: 56,55
-	spawn2: 55,6
-
-Smudges:
-
-Rules:
-
diff --git a/mods/cnc/maps/chokepoint/map.uid b/mods/cnc/maps/chokepoint/map.uid
index f4add401f4..08a5684950 100644
--- a/mods/cnc/maps/chokepoint/map.uid
+++ b/mods/cnc/maps/chokepoint/map.uid
@@ -1 +1 @@
-8da6f89fa3897f8b5d2d00795ca9eda02041d738
\ No newline at end of file
+c15280c531e67ed8d3d7ba90e020d49693fc5c52
\ No newline at end of file
diff --git a/mods/cnc/maps/chokepoint/map.yaml b/mods/cnc/maps/chokepoint/map.yaml
index 9d6b6b5d4a..0b75de11fb 100644
--- a/mods/cnc/maps/chokepoint/map.yaml
+++ b/mods/cnc/maps/chokepoint/map.yaml
@@ -1,185 +1,194 @@
-Selectable: True
-
-MapFormat: 3
-
-Title: Chokepoint
-
-Description: A battle over a small stream with only small passes
-
-Author: Tiberian
-
-PlayerCount: 2
-
-Tileset: DESERT
-
-MapSize: 128,128
-
-TopLeft: 16,16
-
-BottomRight: 80,48
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		Palette:
-		Race: gdi
-		OwnsWorld: True
-		NonCombatant: True
-		Playable: False
-		DefaultStartingUnits: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi0:
-		Name: Multi0
-		Palette:
-		Race: Random
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi1:
-		Name: Multi1
-		Palette:
-		Race: Random
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-
-Actors:
-	Actor0: v01
-		Location: 16,42
-		Owner: Neutral
-	Actor1: v03
-		Location: 18,42
-		Owner: Neutral
-	Actor3: hosp
-		Location: 20,46
-		Owner: Neutral
-	Actor4: tc04
-		Location: 15,46
-		Owner: Neutral
-	Actor5: v32
-		Location: 20,44
-		Owner: Neutral
-	Actor6: c7
-		Location: 16,44
-		Owner: Neutral
-	Actor7: c10
-		Location: 19,44
-		Owner: Neutral
-	Actor8: c1
-		Location: 18,45
-		Owner: Neutral
-	Actor9: v16
-		Location: 16,45
-		Owner: Neutral
-	Actor10: t18
-		Location: 17,38
-		Owner: Neutral
-	Actor11: tc03
-		Location: 25,46
-		Owner: Neutral
-	Actor12: t08
-		Location: 24,42
-		Owner: Neutral
-	Actor13: t10
-		Location: 74,16
-		Owner: Neutral
-	Actor14: t15
-		Location: 73,18
-		Owner: Neutral
-	Actor15: tc01
-		Location: 76,16
-		Owner: Neutral
-	Actor16: tc03
-		Location: 78,16
-		Owner: Neutral
-	Actor17: t18
-		Location: 73,20
-		Owner: Neutral
-	Actor18: v11
-		Location: 76,18
-		Owner: Neutral
-	Actor19: v09
-		Location: 77,18
-		Owner: Neutral
-	Actor20: v09
-		Location: 78,18
-		Owner: Neutral
-	Actor21: wood
-		Location: 75,22
-		Owner: Neutral
-	Actor22: wood
-		Location: 76,22
-		Owner: Neutral
-	Actor30: c9
-		Location: 75,21
-		Owner: Neutral
-	Actor24: wood
-		Location: 78,22
-		Owner: Neutral
-	Actor25: wood
-		Location: 79,22
-		Owner: Neutral
-	Actor27: arco
-		Location: 78,20
-		Owner: Neutral
-	Actor28: c2
-		Location: 75,19
-		Owner: Neutral
-	Actor29: c7
-		Location: 77,21
-		Owner: Neutral
-	Actor31: tc02
-		Location: 69,17
-		Owner: Neutral
-	Actor32: tc03
-		Location: 77,26
-		Owner: Neutral
-	Actor33: tc05
-		Location: 70,24
-		Owner: Neutral
-	Actor34: t09
-		Location: 70,21
-		Owner: Neutral
-	Actor35: split3
-		Location: 62,44
-		Owner: Neutral
-	Actor36: split2
-		Location: 69,42
-		Owner: Neutral
-	Actor37: split3
-		Location: 76,44
-		Owner: Neutral
-	Actor38: split2
-		Location: 20,15
-		Owner: Neutral
-	Actor39: split3
-		Location: 26,17
-		Owner: Neutral
-	Actor40: split2
-		Location: 32,15
-		Owner: Neutral
-
-Waypoints:
-	wp0: 22,29
-	wp1: 72,32
-
-Smudges:
-
-Rules:
-
+Selectable: True
+
+MapFormat: 3
+
+Title: Chokepoint
+
+Description: A battle over a small stream with only small passes
+
+Author: Tiberian
+
+PlayerCount: 2
+
+Tileset: DESERT
+
+MapSize: 128,128
+
+TopLeft: 16,16
+
+BottomRight: 80,48
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		OwnsWorld: True
+		NonCombatant: True
+		Playable: False
+		DefaultStartingUnits: False
+		AllowBots: True
+		LockRace: False
+		Race: gdi
+		LockColor: False
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+		InitialCash: 0
+		Allies:
+		Enemies:
+	PlayerReference@Multi0:
+		Name: Multi0
+		Palette:
+		OwnsWorld: False
+		NonCombatant: False
+		Playable: True
+		DefaultStartingUnits: True
+		AllowBots: True
+		LockRace: False
+		Race: Random
+		LockColor: False
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+		InitialCash: 0
+		Allies:
+		Enemies:
+	PlayerReference@Multi1:
+		Name: Multi1
+		Palette:
+		OwnsWorld: False
+		NonCombatant: False
+		Playable: True
+		DefaultStartingUnits: True
+		AllowBots: True
+		LockRace: False
+		Race: Random
+		LockColor: False
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+		InitialCash: 0
+		Allies:
+		Enemies:
+
+Actors:
+	Actor0: v01
+		Location: 16,42
+		Owner: Neutral
+	Actor1: v03
+		Location: 18,42
+		Owner: Neutral
+	Actor2: v02
+		Location: 20,46
+		Owner: Neutral
+	Actor4: tc04
+		Location: 15,46
+		Owner: Neutral
+	Actor5: v32
+		Location: 20,44
+		Owner: Neutral
+	Actor6: c7
+		Location: 16,44
+		Owner: Neutral
+	Actor7: c10
+		Location: 19,44
+		Owner: Neutral
+	Actor8: c1
+		Location: 18,45
+		Owner: Neutral
+	Actor9: v16
+		Location: 16,45
+		Owner: Neutral
+	Actor10: t18
+		Location: 17,38
+		Owner: Neutral
+	Actor11: tc03
+		Location: 25,46
+		Owner: Neutral
+	Actor12: t08
+		Location: 24,42
+		Owner: Neutral
+	Actor13: t10
+		Location: 74,16
+		Owner: Neutral
+	Actor14: t15
+		Location: 73,18
+		Owner: Neutral
+	Actor15: tc01
+		Location: 76,16
+		Owner: Neutral
+	Actor16: tc03
+		Location: 78,16
+		Owner: Neutral
+	Actor17: t18
+		Location: 73,20
+		Owner: Neutral
+	Actor18: v11
+		Location: 76,18
+		Owner: Neutral
+	Actor19: v09
+		Location: 77,18
+		Owner: Neutral
+	Actor20: v09
+		Location: 78,18
+		Owner: Neutral
+	Actor21: wood
+		Location: 75,22
+		Owner: Neutral
+	Actor22: wood
+		Location: 76,22
+		Owner: Neutral
+	Actor30: c9
+		Location: 75,21
+		Owner: Neutral
+	Actor24: wood
+		Location: 78,22
+		Owner: Neutral
+	Actor25: wood
+		Location: 79,22
+		Owner: Neutral
+	Actor27: arco
+		Location: 78,20
+		Owner: Neutral
+	Actor28: c2
+		Location: 75,19
+		Owner: Neutral
+	Actor29: c7
+		Location: 77,21
+		Owner: Neutral
+	Actor31: tc02
+		Location: 69,17
+		Owner: Neutral
+	Actor32: tc03
+		Location: 77,26
+		Owner: Neutral
+	Actor33: tc05
+		Location: 70,24
+		Owner: Neutral
+	Actor34: t09
+		Location: 70,21
+		Owner: Neutral
+	Actor35: split3
+		Location: 62,44
+		Owner: Neutral
+	Actor36: split2
+		Location: 69,42
+		Owner: Neutral
+	Actor37: split3
+		Location: 76,44
+		Owner: Neutral
+	Actor38: split2
+		Location: 20,15
+		Owner: Neutral
+	Actor39: split3
+		Location: 26,17
+		Owner: Neutral
+	Actor40: split2
+		Location: 32,15
+		Owner: Neutral
+
+Waypoints:
+	wp0: 22,29
+	wp1: 72,32
+
+Smudges:
+
+Rules:
+
diff --git a/mods/cnc/maps/wargames/map.bin b/mods/cnc/maps/wargames/map.bin
index 3dcf65422bf76f9598e8f12a12957f3acfdfb738..25b0d310439c9428978f996ecbaa9ff343c7998b 100644
GIT binary patch
delta 63
zcmZo&z}UKgaf2}*n<oQ<Cj-l5OTJw|CZi_<>*Sw&TX_C6{0AaW1}0AiwuyrFlYj76
RPrfCgK2d>l^J0M{djMeh6kh-U

delta 46
zcmV+}0MY-2paF%T0kAU;lUpbclR^%$lN%`ylL8N`0jQIa7bB4%CzJROdyyS5v!f7V
EKXe@s1poj5

diff --git a/mods/cnc/maps/wargames/map.uid b/mods/cnc/maps/wargames/map.uid
index ad061bd8bb..ee6c4cf013 100644
--- a/mods/cnc/maps/wargames/map.uid
+++ b/mods/cnc/maps/wargames/map.uid
@@ -1 +1 @@
-236c7300b6d3134f880d1f34d12d9b114e4b23c1
\ No newline at end of file
+49d17201dc2b40900c2b50f40e84e1e22fae3762
\ No newline at end of file
diff --git a/mods/cnc/maps/wargames/map.yaml b/mods/cnc/maps/wargames/map.yaml
index a9704d9df3..c7db89d74f 100644
--- a/mods/cnc/maps/wargames/map.yaml
+++ b/mods/cnc/maps/wargames/map.yaml
@@ -1,283 +1,283 @@
-Selectable: True
-
-MapFormat: 3
-
-Title: Wargames
-
-Author: Westwood Studios
-
-PlayerCount: 4
-
-Tileset: TEMPERAT
-
-MapSize: 64,64
-
-TopLeft: 1,1
-
-BottomRight: 63,63
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		Palette:
-		OwnsWorld: True
-		NonCombatant: True
-		Playable: False
-		DefaultStartingUnits: False
-		AllowBots: True
-		LockRace: False
-		Race: gdi
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi0:
-		Name: Multi0
-		Palette:
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		AllowBots: True
-		LockRace: False
-		Race: Random
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi1:
-		Name: Multi1
-		Palette:
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		AllowBots: True
-		LockRace: False
-		Race: Random
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi2:
-		Name: Multi2
-		Palette:
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		AllowBots: True
-		LockRace: False
-		Race: Random
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-	PlayerReference@Multi3:
-		Name: Multi3
-		Palette:
-		OwnsWorld: False
-		NonCombatant: False
-		Playable: True
-		DefaultStartingUnits: True
-		AllowBots: True
-		LockRace: False
-		Race: Random
-		LockColor: False
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-		InitialCash: 0
-		Allies:
-		Enemies:
-
-Actors:
-	Actor0: brik
-		Location: 62,34
-		Owner: Neutral
-	Actor1: brik
-		Location: 61,34
-		Owner: Neutral
-	Actor2: brik
-		Location: 60,34
-		Owner: Neutral
-	Actor3: brik
-		Location: 34,33
-		Owner: Neutral
-	Actor4: brik
-		Location: 32,33
-		Owner: Neutral
-	Actor5: brik
-		Location: 30,33
-		Owner: Neutral
-	Actor6: brik
-		Location: 35,32
-		Owner: Neutral
-	Actor7: brik
-		Location: 33,32
-		Owner: Neutral
-	Actor8: brik
-		Location: 31,32
-		Owner: Neutral
-	Actor9: brik
-		Location: 29,32
-		Owner: Neutral
-	Actor10: brik
-		Location: 34,31
-		Owner: Neutral
-	Actor11: brik
-		Location: 32,31
-		Owner: Neutral
-	Actor12: brik
-		Location: 30,31
-		Owner: Neutral
-	Actor13: brik
-		Location: 35,30
-		Owner: Neutral
-	Actor14: brik
-		Location: 33,30
-		Owner: Neutral
-	Actor15: brik
-		Location: 31,30
-		Owner: Neutral
-	Actor16: brik
-		Location: 29,30
-		Owner: Neutral
-	Actor17: brik
-		Location: 3,30
-		Owner: Neutral
-	Actor18: brik
-		Location: 2,30
-		Owner: Neutral
-	Actor19: brik
-		Location: 1,30
-		Owner: Neutral
-	Actor20: brik
-		Location: 34,29
-		Owner: Neutral
-	Actor21: brik
-		Location: 32,29
-		Owner: Neutral
-	Actor22: brik
-		Location: 30,29
-		Owner: Neutral
-	Actor23: split3
-		Location: 38,60
-		Owner: Neutral
-	Actor24: split3
-		Location: 31,60
-		Owner: Neutral
-	Actor25: split3
-		Location: 23,59
-		Owner: Neutral
-	Actor26: split3
-		Location: 57,58
-		Owner: Neutral
-	Actor27: split3
-		Location: 7,58
-		Owner: Neutral
-	Actor28: split3
-		Location: 31,55
-		Owner: Neutral
-	Actor29: split3
-		Location: 57,38
-		Owner: Neutral
-	Actor30: split3
-		Location: 10,37
-		Owner: Neutral
-	Actor31: t01
-		Location: 5,34
-		Owner: Neutral
-	Actor32: split3
-		Location: 2,34
-		Owner: Neutral
-	Actor33: t02
-		Location: 59,33
-		Owner: Neutral
-	Actor34: tc04
-		Location: 6,33
-		Owner: Neutral
-	Actor35: tc01
-		Location: 61,32
-		Owner: Neutral
-	Actor36: t02
-		Location: 40,32
-		Owner: Neutral
-	Actor37: t02
-		Location: 11,32
-		Owner: Neutral
-	Actor38: tc04
-		Location: 8,32
-		Owner: Neutral
-	Actor39: t01
-		Location: 60,31
-		Owner: Neutral
-	Actor40: tc01
-		Location: 1,31
-		Owner: Neutral
-	Actor41: split3
-		Location: 60,29
-		Owner: Neutral
-	Actor42: tc01
-		Location: 55,29
-		Owner: Neutral
-	Actor43: t01
-		Location: 22,29
-		Owner: Neutral
-	Actor44: t02
-		Location: 4,29
-		Owner: Neutral
-	Actor45: t01
-		Location: 57,28
-		Owner: Neutral
-	Actor46: tc04
-		Location: 53,28
-		Owner: Neutral
-	Actor47: tc01
-		Location: 52,28
-		Owner: Neutral
-	Actor48: t02
-		Location: 51,28
-		Owner: Neutral
-	Actor49: split3
-		Location: 53,24
-		Owner: Neutral
-	Actor50: split3
-		Location: 5,24
-		Owner: Neutral
-	Actor51: split3
-		Location: 31,7
-		Owner: Neutral
-	Actor52: split3
-		Location: 57,3
-		Owner: Neutral
-	Actor53: split3
-		Location: 7,3
-		Owner: Neutral
-	Actor54: split3
-		Location: 31,2
-		Owner: Neutral
-	Actor55: split3
-		Location: 38,1
-		Owner: Neutral
-	Actor56: split3
-		Location: 23,1
-		Owner: Neutral
-
-Waypoints:
-	wp1: 46,50
-	wp3: 50,10
-	wp0: 17,51
-	wp2: 16,10
-
-Smudges:
-
-Rules:
-
+Selectable: True
+
+MapFormat: 3
+
+Title: Wargames
+
+Author: Westwood Studios
+
+PlayerCount: 4
+
+Tileset: TEMPERAT
+
+MapSize: 64,64
+
+TopLeft: 1,1
+
+BottomRight: 63,63
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		OwnsWorld: True
+		NonCombatant: True
+		Playable: False
+		DefaultStartingUnits: False
+		AllowBots: True
+		LockRace: False
+		Race: gdi
+		LockColor: False
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+		InitialCash: 0
+		Allies:
+		Enemies:
+	PlayerReference@Multi0:
+		Name: Multi0
+		Palette:
+		OwnsWorld: False
+		NonCombatant: False
+		Playable: True
+		DefaultStartingUnits: True
+		AllowBots: True
+		LockRace: False
+		Race: Random
+		LockColor: False
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+		InitialCash: 0
+		Allies:
+		Enemies:
+	PlayerReference@Multi1:
+		Name: Multi1
+		Palette:
+		OwnsWorld: False
+		NonCombatant: False
+		Playable: True
+		DefaultStartingUnits: True
+		AllowBots: True
+		LockRace: False
+		Race: Random
+		LockColor: False
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+		InitialCash: 0
+		Allies:
+		Enemies:
+	PlayerReference@Multi2:
+		Name: Multi2
+		Palette:
+		OwnsWorld: False
+		NonCombatant: False
+		Playable: True
+		DefaultStartingUnits: True
+		AllowBots: True
+		LockRace: False
+		Race: Random
+		LockColor: False
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+		InitialCash: 0
+		Allies:
+		Enemies:
+	PlayerReference@Multi3:
+		Name: Multi3
+		Palette:
+		OwnsWorld: False
+		NonCombatant: False
+		Playable: True
+		DefaultStartingUnits: True
+		AllowBots: True
+		LockRace: False
+		Race: Random
+		LockColor: False
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+		InitialCash: 0
+		Allies:
+		Enemies:
+
+Actors:
+	Actor0: brik
+		Location: 62,34
+		Owner: Neutral
+	Actor1: brik
+		Location: 61,34
+		Owner: Neutral
+	Actor2: brik
+		Location: 60,34
+		Owner: Neutral
+	Actor3: brik
+		Location: 34,33
+		Owner: Neutral
+	Actor4: brik
+		Location: 32,33
+		Owner: Neutral
+	Actor5: brik
+		Location: 30,33
+		Owner: Neutral
+	Actor6: brik
+		Location: 35,32
+		Owner: Neutral
+	Actor7: brik
+		Location: 33,32
+		Owner: Neutral
+	Actor8: brik
+		Location: 31,32
+		Owner: Neutral
+	Actor9: brik
+		Location: 29,32
+		Owner: Neutral
+	Actor10: brik
+		Location: 34,31
+		Owner: Neutral
+	Actor11: brik
+		Location: 32,31
+		Owner: Neutral
+	Actor12: brik
+		Location: 30,31
+		Owner: Neutral
+	Actor13: brik
+		Location: 35,30
+		Owner: Neutral
+	Actor14: brik
+		Location: 33,30
+		Owner: Neutral
+	Actor15: brik
+		Location: 31,30
+		Owner: Neutral
+	Actor16: brik
+		Location: 29,30
+		Owner: Neutral
+	Actor17: brik
+		Location: 3,30
+		Owner: Neutral
+	Actor18: brik
+		Location: 2,30
+		Owner: Neutral
+	Actor19: brik
+		Location: 1,30
+		Owner: Neutral
+	Actor20: brik
+		Location: 34,29
+		Owner: Neutral
+	Actor21: brik
+		Location: 32,29
+		Owner: Neutral
+	Actor22: brik
+		Location: 30,29
+		Owner: Neutral
+	Actor23: split3
+		Location: 38,60
+		Owner: Neutral
+	Actor24: split3
+		Location: 31,60
+		Owner: Neutral
+	Actor25: split3
+		Location: 23,59
+		Owner: Neutral
+	Actor26: split3
+		Location: 57,58
+		Owner: Neutral
+	Actor27: split3
+		Location: 7,58
+		Owner: Neutral
+	Actor28: split3
+		Location: 31,55
+		Owner: Neutral
+	Actor29: split3
+		Location: 57,38
+		Owner: Neutral
+	Actor30: split3
+		Location: 10,37
+		Owner: Neutral
+	Actor31: t01
+		Location: 5,34
+		Owner: Neutral
+	Actor32: split3
+		Location: 2,34
+		Owner: Neutral
+	Actor33: t02
+		Location: 59,33
+		Owner: Neutral
+	Actor34: tc04
+		Location: 6,33
+		Owner: Neutral
+	Actor35: tc01
+		Location: 61,32
+		Owner: Neutral
+	Actor36: t02
+		Location: 40,32
+		Owner: Neutral
+	Actor37: t02
+		Location: 11,32
+		Owner: Neutral
+	Actor38: tc04
+		Location: 8,32
+		Owner: Neutral
+	Actor39: t01
+		Location: 60,31
+		Owner: Neutral
+	Actor40: tc01
+		Location: 1,31
+		Owner: Neutral
+	Actor41: split3
+		Location: 60,29
+		Owner: Neutral
+	Actor42: tc01
+		Location: 55,29
+		Owner: Neutral
+	Actor43: t01
+		Location: 22,29
+		Owner: Neutral
+	Actor44: t02
+		Location: 4,29
+		Owner: Neutral
+	Actor45: t01
+		Location: 57,28
+		Owner: Neutral
+	Actor46: tc04
+		Location: 53,28
+		Owner: Neutral
+	Actor47: tc01
+		Location: 52,28
+		Owner: Neutral
+	Actor48: t02
+		Location: 51,28
+		Owner: Neutral
+	Actor49: split3
+		Location: 53,24
+		Owner: Neutral
+	Actor50: split3
+		Location: 5,24
+		Owner: Neutral
+	Actor51: split3
+		Location: 31,7
+		Owner: Neutral
+	Actor52: split3
+		Location: 57,3
+		Owner: Neutral
+	Actor53: split3
+		Location: 7,3
+		Owner: Neutral
+	Actor54: split3
+		Location: 31,2
+		Owner: Neutral
+	Actor55: split3
+		Location: 38,1
+		Owner: Neutral
+	Actor56: split3
+		Location: 23,1
+		Owner: Neutral
+
+Waypoints:
+	wp1: 46,50
+	wp3: 50,10
+	wp0: 17,51
+	wp2: 16,10
+
+Smudges:
+
+Rules:
+