From 9d403d30721d0730bcfdb21faf3ba1c57ce28a82 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 15 Aug 2010 02:51:15 +1200
Subject: [PATCH] Unfail `Marooned' map slightly

---
 mods/cnc/maps/scm77ea/map.bin  | Bin 20485 -> 20485 bytes
 mods/cnc/maps/scm77ea/map.uid  |   2 +-
 mods/cnc/maps/scm77ea/map.yaml | 430 ++++++++++++---------------------
 3 files changed, 158 insertions(+), 274 deletions(-)

diff --git a/mods/cnc/maps/scm77ea/map.bin b/mods/cnc/maps/scm77ea/map.bin
index 52d0ed556d0f3a59786a5a080633b38847183ee6..8b7c2c28e83cc31b351324cd6a2b452b93c55367 100644
GIT binary patch
delta 1087
zcmXX^O-~bH5T4oH?sj*9QnY>ra6vxW(!zp<5UAK{uu5n=_y;sGQKE_QED}iMqETta
z3peg6LV7Zhka+UagrqV42?7U?YU(q)W;grJ&dl@7Gc)hTHg9b6?ujj1T`3tj+g}fQ
zWZYTrZc}@Pc!ta+;w3V7Wgs&l$Ifa7f%yGNW{s#u#xAi`+=6^cuG9m&yGhg}t4YZk
zaZQo+U<7`7?5^r@C);5!Dae#(siKT~Ph{4~NGhjp^DuHx$uIBWaFwV^MqI2#)FPv$
zyk?V}Ci$p+NPH;i^EvtKxU%OjXR5?iGQSdi*K}@?*`kC@bbRQE+MyXTP#Q=klB15D
z*d2F?W?0=HJ9koX&3&S8`f_8r>*!297?qXbEj>yjIP%gS5xJBp%E9PnJqV?p@a0u@
zL(OZsH}&AMwBzF-zbV_NreuBWZ9OPTsep+T<xc@5Lya%Rmz@%XYmNQ6_ZEzTq-tIA
zx;$gC&AwFTr{!<Cnjm)AkiF6sc~Pl)He2j*0zOHHMfqL1*~JDY*=MwX2ur;(DQnlS
zyFOTK#BA9E6W=I%Xg+p&Ab*64-42*+;K23V0;k(ZhXFT&FwF=H1l_}VELZ13nJg{J
zk6Y*DV%Tp22FQZky?sIY!d`h=wI#i{(3yaOB)b?UaRM26gI&~`?SpFd+lWUhLBOyL
z)by1qr*TseSvHaE;$fT){ye}ENHg&m@cL|lUX!yn5*)T*4i%yt##g&^K&P3>2;oH>
z95JhQhz;|KMIo6i4~(f23qYMk{I!r4af1T4<G&zRH!)vOZsjqtmOxIbiBa^4YPu@b
zs48`d$w;{u)zx+_fXB723v;qGm`B8iKN(3;tm@VEqCYU`TD5nF36-WWEucmQkwFng
zr()spK!{5c**1`bv}t))%MKu*aP3V;qElCoiq&s)i|+U0F9Kt21S`%`X@vQt!v~=1
Pv5^i{4ZR?^6Q}<HmW#>>

delta 1638
zcmY*ZOK%fb6h3F3o*6rFOrRl2!vMiR8r%ew$SqcINR_74=2gT75h>Y4<spHPx+sY%
z6?IjK=&Z7WvaU#?Y^c<S!$ax<OJ>m@z`iP5Bv8tC?%2f4_1u{`_dDl&=R5cM&V9af
zpVwY_nL1IOoI0f{L>1ZdQM?@Iq~QM`uY$<s3fXJ2cju?_pTC$kIIB)xokIC8wGK$C
z!>*HGr>II?RqS${UyeQbHdySelf^{%RrP1d>)^q_??lgtpAtRQ8L`yeK-66xg%5a4
zmh!RFAZ|$4?!(9t$a=H@^Dl*7SuJ>SJblj}BMTubfcDCp^u62|+3>HB5>BYdubGFP
ze-J&<A3q`MG110C$G^LR8c~hx8hJA656JfiR$$>8IW_WSG&3Nj{7Sk;R*l>mr5a%M
zGQSR)R3n6L5{u<TcOZWs{0RipUW2R#xiWX?p{#~!ndlpo6Ni7!q1vQEBajh+`}fNK
zSOT->5WJo6CYJshx|?~fQYzSVq|~=xmOi;FSFFfyRwvxwC#7MLVLJ%kLuC`zx5F#)
zXErTccF)FdM}Ex6rI`_lN6uOt$Y$~SMxnIdvDlT-(vaLPPj{m~5&ImNIfXA9i_6u6
zvQ?gzwa>gRg3aO(v(Fyh9O)X_C$}fR+@Zbo;OQ}8*5S*!V}tT$a=OO^@(ch0@N{uo
z9LahqFH0w<KK2n#(}k?42qQs9oMJX9c&aR`MR&Igzm!R?=|RAxN{GzI2%tP{4on&c
z(7=EqSbYv<a$<g;Mppoy3<n!;`sHE-An$`$*U0Qqyl5=F0+UkfW0RDT0rX8R?<e+9
z&gpSPwXm%GQ*hAX!cBR?2CJD{UPyvKaGg8)^)WW+kp0%G!8?f$BD5t0??6>V=PC|@
z_{iPU3rw3YB5R|xCP!XO-RjhO%mqf!P_C8-<jll{jJhFpglDK~-^}7o`>1WQRVH~c
zJ}Z}Ja#=)k%+M_YVSv6U|IGAc@u6r}31A6Fr*u)i`Kq@YXjfH+(P*yA@Vf9hjM^O#
zQqS!RHXly93suAjJlYG#&Vu{&uqMPEqDpkERT&(#S*E9^`p{I*<soeQ!Z;jIB|reQ
zF4JX|69>Vx42Pq&2Bd2H@|3#AMbJ{vhaJQbL0HX*{ev0Ge&FsvK6F<W%bC0`AY$`m
z!9o8I;nH%@Ksa$pzCoPU>>zS-LJL3@1LCycCKx)R@eklcZQGMKphFCup^4sdz1)wU
zpU=XiXF_!b1!%fdEuzL^*0gcE^<I<A7dfLFxI?MtzQCTlrj7RyMEii9i&{rZH#*uS
K!sbrunSBS9S>fjZ

diff --git a/mods/cnc/maps/scm77ea/map.uid b/mods/cnc/maps/scm77ea/map.uid
index 123a0a966169..31cc79487ce2 100644
--- a/mods/cnc/maps/scm77ea/map.uid
+++ b/mods/cnc/maps/scm77ea/map.uid
@@ -1 +1 @@
-3dea102804c27f2ce68e8e604f555c4e9d1901fb
\ No newline at end of file
+22dff977439bb2ad39d86287130ea825307110cf
\ No newline at end of file
diff --git a/mods/cnc/maps/scm77ea/map.yaml b/mods/cnc/maps/scm77ea/map.yaml
index b315d577162c..8eb3ae3cea22 100644
--- a/mods/cnc/maps/scm77ea/map.yaml
+++ b/mods/cnc/maps/scm77ea/map.yaml
@@ -1,273 +1,157 @@
-Selectable: True
-
-MapFormat: 2
-
-Title: Marooned
-
-Author: Westwood Studios
-
-PlayerCount: 7
-
-Tileset: DESERT
-
-MapSize: 64,64
-
-TopLeft: 1,1
-
-BottomRight: 63,63
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		Palette:
-		Race: gdi
-		OwnsWorld: True
-		NonCombatant: True
-		Color: 255,238,238,238
-		Color2: 255,44,28,24
-
-Actors:
-	ActorReference@Actor0:
-		Id: Actor0
-		Type: t18
-		Location: 54,44
-		Owner: Neutral
-	ActorReference@Actor1:
-		Id: Actor1
-		Type: split3
-		Location: 36,32
-		Owner: Neutral
-	ActorReference@Actor2:
-		Id: Actor2
-		Type: split3
-		Location: 41,32
-		Owner: Neutral
-	ActorReference@Actor3:
-		Id: Actor3
-		Type: split3
-		Location: 39,42
-		Owner: Neutral
-	ActorReference@Actor4:
-		Id: Actor4
-		Type: split3
-		Location: 45,54
-		Owner: Neutral
-	ActorReference@Actor5:
-		Id: Actor5
-		Type: split3
-		Location: 58,54
-		Owner: Neutral
-	ActorReference@Actor6:
-		Id: Actor6
-		Type: split3
-		Location: 54,58
-		Owner: Neutral
-	ActorReference@Actor7:
-		Id: Actor7
-		Type: split3
-		Location: 14,21
-		Owner: Neutral
-	ActorReference@Actor8:
-		Id: Actor8
-		Type: split3
-		Location: 6,27
-		Owner: Neutral
-	ActorReference@Actor9:
-		Id: Actor9
-		Type: split3
-		Location: 23,60
-		Owner: Neutral
-	ActorReference@Actor10:
-		Id: Actor10
-		Type: split3
-		Location: 5,60
-		Owner: Neutral
-	ActorReference@Actor11:
-		Id: Actor11
-		Type: split3
-		Location: 37,2
-		Owner: Neutral
-	ActorReference@Actor12:
-		Id: Actor12
-		Type: split3
-		Location: 57,1
-		Owner: Neutral
-	ActorReference@Actor13:
-		Id: Actor13
-		Type: split3
-		Location: 60,25
-		Owner: Neutral
-	ActorReference@Actor14:
-		Id: Actor14
-		Type: split3
-		Location: 51,43
-		Owner: Neutral
-	ActorReference@Actor15:
-		Id: Actor15
-		Type: split3
-		Location: 32,48
-		Owner: Neutral
-	ActorReference@Actor16:
-		Id: Actor16
-		Type: t08
-		Location: 23,41
-		Owner: Neutral
-	ActorReference@Actor17:
-		Id: Actor17
-		Type: t08
-		Location: 12,49
-		Owner: Neutral
-	ActorReference@Actor18:
-		Id: Actor18
-		Type: t08
-		Location: 2,59
-		Owner: Neutral
-	ActorReference@Actor19:
-		Id: Actor19
-		Type: t08
-		Location: 29,59
-		Owner: Neutral
-	ActorReference@Actor20:
-		Id: Actor20
-		Type: t08
-		Location: 27,59
-		Owner: Neutral
-	ActorReference@Actor21:
-		Id: Actor21
-		Type: t08
-		Location: 17,62
-		Owner: Neutral
-	ActorReference@Actor22:
-		Id: Actor22
-		Type: t08
-		Location: 39,62
-		Owner: Neutral
-	ActorReference@Actor23:
-		Id: Actor23
-		Type: t08
-		Location: 51,13
-		Owner: Neutral
-	ActorReference@Actor24:
-		Id: Actor24
-		Type: t08
-		Location: 53,12
-		Owner: Neutral
-	ActorReference@Actor25:
-		Id: Actor25
-		Type: t08
-		Location: 24,15
-		Owner: Neutral
-	ActorReference@Actor26:
-		Id: Actor26
-		Type: t08
-		Location: 30,9
-		Owner: Neutral
-	ActorReference@Actor27:
-		Id: Actor27
-		Type: t08
-		Location: 27,8
-		Owner: Neutral
-	ActorReference@Actor28:
-		Id: Actor28
-		Type: t08
-		Location: 30,45
-		Owner: Neutral
-	ActorReference@Actor29:
-		Id: Actor29
-		Type: t08
-		Location: 20,50
-		Owner: Neutral
-	ActorReference@Actor30:
-		Id: Actor30
-		Type: t08
-		Location: 11,61
-		Owner: Neutral
-	ActorReference@Actor31:
-		Id: Actor31
-		Type: t08
-		Location: 1,37
-		Owner: Neutral
-	ActorReference@Actor32:
-		Id: Actor32
-		Type: t08
-		Location: 22,2
-		Owner: Neutral
-	ActorReference@Actor33:
-		Id: Actor33
-		Type: t08
-		Location: 19,16
-		Owner: Neutral
-	ActorReference@Actor34:
-		Id: Actor34
-		Type: t08
-		Location: 26,24
-		Owner: Neutral
-	ActorReference@Actor35:
-		Id: Actor35
-		Type: t08
-		Location: 50,17
-		Owner: Neutral
-	ActorReference@Actor36:
-		Id: Actor36
-		Type: t08
-		Location: 41,23
-		Owner: Neutral
-	ActorReference@Actor37:
-		Id: Actor37
-		Type: t04
-		Location: 62,20
-		Owner: Neutral
-	ActorReference@Actor38:
-		Id: Actor38
-		Type: t18
-		Location: 35,29
-		Owner: Neutral
-	ActorReference@Actor39:
-		Id: Actor39
-		Type: t18
-		Location: 29,10
-		Owner: Neutral
-	ActorReference@Actor40:
-		Id: Actor40
-		Type: t18
-		Location: 59,3
-		Owner: Neutral
-	ActorReference@Actor41:
-		Id: Actor41
-		Type: t18
-		Location: 52,31
-		Owner: Neutral
-	ActorReference@Actor42:
-		Id: Actor42
-		Type: t18
-		Location: 51,54
-		Owner: Neutral
-	ActorReference@Actor43:
-		Id: Actor43
-		Type: t18
-		Location: 14,56
-		Owner: Neutral
-	ActorReference@Actor44:
-		Id: Actor44
-		Type: t18
-		Location: 2,48
-		Owner: Neutral
-	ActorReference@Actor45:
-		Id: Actor45
-		Type: t18
-		Location: 14,27
-		Owner: Neutral
-
-Waypoints:
-	spawn6: 7,7
-	spawn5: 26,58
-	spawn4: 22,43
-	spawn3: 53,10
-	spawn2: 7,53
-	spawn1: 55,38
-	spawn0: 26,10
-
-Smudges:
-
-Rules:
-
+Selectable: True
+
+MapFormat: 3
+
+Title: Marooned
+
+Author: Westwood Studios
+
+PlayerCount: 4
+
+Tileset: DESERT
+
+MapSize: 64,64
+
+TopLeft: 1,1
+
+BottomRight: 63,63
+
+Players:
+	PlayerReference@Neutral:
+		Name: Neutral
+		Palette:
+		Race: gdi
+		OwnsWorld: True
+		NonCombatant: True
+		Color: 255,238,238,238
+		Color2: 255,44,28,24
+
+Actors:
+	Actor0: t18
+		Location: 54,44
+		Owner: Neutral
+	Actor1: split3
+		Location: 36,32
+		Owner: Neutral
+	Actor7: split3
+		Location: 14,21
+		Owner: Neutral
+	Actor8: split3
+		Location: 6,27
+		Owner: Neutral
+	Actor9: split3
+		Location: 23,60
+		Owner: Neutral
+	Actor10: split3
+		Location: 5,60
+		Owner: Neutral
+	Actor11: split3
+		Location: 37,2
+		Owner: Neutral
+	Actor12: split3
+		Location: 57,1
+		Owner: Neutral
+	Actor13: split3
+		Location: 60,25
+		Owner: Neutral
+	Actor14: split3
+		Location: 51,43
+		Owner: Neutral
+	Actor15: split3
+		Location: 32,48
+		Owner: Neutral
+	Actor16: t08
+		Location: 23,41
+		Owner: Neutral
+	Actor17: t08
+		Location: 12,49
+		Owner: Neutral
+	Actor18: t08
+		Location: 2,59
+		Owner: Neutral
+	Actor19: t08
+		Location: 29,59
+		Owner: Neutral
+	Actor20: t08
+		Location: 27,59
+		Owner: Neutral
+	Actor21: t08
+		Location: 17,62
+		Owner: Neutral
+	Actor22: t08
+		Location: 39,62
+		Owner: Neutral
+	Actor23: t08
+		Location: 51,13
+		Owner: Neutral
+	Actor25: t08
+		Location: 24,15
+		Owner: Neutral
+	Actor26: t08
+		Location: 30,9
+		Owner: Neutral
+	Actor27: t08
+		Location: 27,8
+		Owner: Neutral
+	Actor28: t08
+		Location: 30,45
+		Owner: Neutral
+	Actor29: t08
+		Location: 20,50
+		Owner: Neutral
+	Actor30: t08
+		Location: 11,61
+		Owner: Neutral
+	Actor31: t08
+		Location: 1,37
+		Owner: Neutral
+	Actor32: t08
+		Location: 22,2
+		Owner: Neutral
+	Actor33: t08
+		Location: 19,16
+		Owner: Neutral
+	Actor34: t08
+		Location: 26,24
+		Owner: Neutral
+	Actor35: t08
+		Location: 50,17
+		Owner: Neutral
+	Actor36: t08
+		Location: 41,23
+		Owner: Neutral
+	Actor37: t04
+		Location: 62,20
+		Owner: Neutral
+	Actor38: t18
+		Location: 35,29
+		Owner: Neutral
+	Actor39: t18
+		Location: 29,10
+		Owner: Neutral
+	Actor40: t18
+		Location: 59,3
+		Owner: Neutral
+	Actor41: t18
+		Location: 52,31
+		Owner: Neutral
+	Actor43: t18
+		Location: 14,56
+		Owner: Neutral
+	Actor44: t18
+		Location: 2,48
+		Owner: Neutral
+	Actor45: t18
+		Location: 14,27
+		Owner: Neutral
+
+Waypoints:
+	spawn6: 7,7
+	wp0: 53,54
+	spawn3: 53,10
+	spawn2: 7,53
+
+Smudges:
+
+Rules:
+