From dd7e578fe640d21b6969a33cf8b84a2b6c97b70f Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 9 Sep 2010 22:39:03 +1200
Subject: [PATCH] nearly finished laying out shellmap

---
 mods/cnc/maps/shellmap/map.bin  | Bin 23045 -> 23045 bytes
 mods/cnc/maps/shellmap/map.uid  |   2 +-
 mods/cnc/maps/shellmap/map.yaml | 602 ++++++++++++++++++++++++++++++--
 mods/cnc/mod.yaml               |   2 +-
 4 files changed, 582 insertions(+), 24 deletions(-)

diff --git a/mods/cnc/maps/shellmap/map.bin b/mods/cnc/maps/shellmap/map.bin
index b4bd741f596f8414801d83c2feaece6c0bc83149..ec3418debf3ab62e4a1b45d78989b611a4a3a9c4 100644
GIT binary patch
delta 112
zcmZqO!q~cnaRVm@^EL*S$vhmrK$>;(9F8uwZ46A?7}zE=@~Tf%;F%oH84eTyO0rL$
z$ZNd$J?9z@w(SfI+ku)E3UvXQjN5_w4264vOd#T#D5yU9wQw@ab_VwClNohHCMt+-
Jt`_NX1pp<cAi)3t

delta 90
zcmZqO!q~cnaRVpEL<P>tLLBWNY7s}vL<OG7v!#V5_sB_4j^_*qakXW1H^1jx160T}
kc?OT%<fB4qAf^Vd+(ZSo$<e~e6BTqPzXnsAt3|q80Y?iR<p2Nx

diff --git a/mods/cnc/maps/shellmap/map.uid b/mods/cnc/maps/shellmap/map.uid
index 86492c8ae3..b038a947b2 100644
--- a/mods/cnc/maps/shellmap/map.uid
+++ b/mods/cnc/maps/shellmap/map.uid
@@ -1 +1 @@
-5a0ccbc84b80634e03ad1d5bfe631b5831aec147
\ No newline at end of file
+e7b9badb3b7d49ccc773a7aa086c0ff9a1136b77
\ No newline at end of file
diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml
index c533777ff8..469d4c1f12 100644
--- a/mods/cnc/maps/shellmap/map.yaml
+++ b/mods/cnc/maps/shellmap/map.yaml
@@ -280,35 +280,35 @@ Actors:
 	Actor85: brik
 		Location: 24,5
 		Owner: Neutral
-	Actor86: brik
-		Location: 32,5
-		Owner: Neutral
-	Actor87: brik
-		Location: 32,4
-		Owner: Neutral
-	Actor88: brik
-		Location: 33,4
-		Owner: Neutral
-	Actor89: brik
-		Location: 34,4
+	Actor91: brik
+		Location: 27,5
 		Owner: Neutral
 	Actor90: brik
-		Location: 34,5
+		Location: 28,5
 		Owner: Neutral
-	Actor91: brik
-		Location: 38,3
+	Actor89: brik
+		Location: 29,5
 		Owner: Neutral
-	Actor92: brik
-		Location: 38,2
+	Actor88: brik
+		Location: 30,5
 		Owner: Neutral
-	Actor93: brik
-		Location: 39,2
+	Actor87: brik
+		Location: 31,5
 		Owner: Neutral
-	Actor94: brik
-		Location: 40,2
+	Actor35: gun
+		Location: 20,11
 		Owner: Neutral
-	Actor95: brik
-		Location: 40,3
+	Actor36: gun
+		Location: 16,14
+		Owner: Neutral
+	Actor41: brik
+		Location: 32,5
+		Owner: Neutral
+	Actor44: brik
+		Location: 32,4
+		Owner: Neutral
+	Actor86: brik
+		Location: 31,4
 		Owner: Neutral
 	Actor96: gun
 		Location: 33,5
@@ -361,6 +361,564 @@ Actors:
 	Actor112: tc02
 		Location: 86,6
 		Owner: Neutral
+	Actor92: brik
+		Location: 26,5
+		Owner: Neutral
+	Actor93: brik
+		Location: 25,5
+		Owner: Neutral
+	Actor94: brik
+		Location: 39,1
+		Owner: Neutral
+	Actor95: brik
+		Location: 39,2
+		Owner: Neutral
+	Actor113: brik
+		Location: 38,2
+		Owner: Neutral
+	Actor114: brik
+		Location: 38,1
+		Owner: Neutral
+	Actor115: tc02
+		Location: 36,0
+		Owner: Neutral
+	Actor116: proc
+		Location: 57,4
+		Owner: Neutral
+	Actor117: silo
+		Location: 54,5
+		Owner: Neutral
+	Actor118: silo
+		Location: 54,6
+		Owner: Neutral
+	Actor119: e1
+		Location: 12,5
+		Owner: Neutral
+	Actor120: e1
+		Location: 11,6
+		Owner: Neutral
+	Actor121: e6
+		Location: 14,4
+		Owner: Neutral
+	Actor122: e3
+		Location: 18,4
+		Owner: Neutral
+	Actor123: e3
+		Location: 38,3
+		Owner: Neutral
+	Actor124: e3
+		Location: 59,8
+		Owner: Neutral
+	Actor125: e3
+		Location: 58,9
+		Owner: Neutral
+	Actor126: ltnk
+		Location: 21,4
+		Owner: Neutral
+	Actor127: ltnk
+		Location: 22,4
+		Owner: Neutral
+	Actor128: ltnk
+		Location: 23,4
+		Owner: Neutral
+	Actor129: bggy
+		Location: 11,10
+		Owner: Neutral
+	Actor130: bggy
+		Location: 10,10
+		Owner: Neutral
+	Actor131: gun
+		Location: 13,16
+		Owner: Neutral
+	Actor132: gun
+		Location: 12,16
+		Owner: Neutral
+	Actor133: brik
+		Location: 9,16
+		Owner: Neutral
+	Actor134: brik
+		Location: 8,16
+		Owner: Neutral
+	Actor135: tc01
+		Location: 10,16
+		Owner: Neutral
+	Actor136: v07
+		Location: 8,17
+		Owner: Neutral
+	Actor137: split3
+		Location: 13,20
+		Owner: Neutral
+	Actor138: v01
+		Location: 36,16
+		Owner: Neutral
+	Actor139: v02
+		Location: 37,19
+		Owner: Neutral
+	Actor140: v03
+		Location: 31,18
+		Owner: Neutral
+	Actor141: v11
+		Location: 33,19
+		Owner: Neutral
+	Actor142: v04
+		Location: 34,16
+		Owner: Neutral
+	Actor143: v06
+		Location: 40,17
+		Owner: Neutral
+	Actor144: c1
+		Location: 34,18
+		Owner: Neutral
+	Actor145: c4
+		Location: 37,21
+		Owner: Neutral
+	Actor146: c9
+		Location: 40,15
+		Owner: Neutral
+	Actor147: c5
+		Location: 39,16
+		Owner: Neutral
+	Actor148: cycl
+		Location: 31,20
+		Owner: Neutral
+	Actor149: cycl
+		Location: 32,20
+		Owner: Neutral
+	Actor150: cycl
+		Location: 33,20
+		Owner: Neutral
+	Actor151: cycl
+		Location: 34,20
+		Owner: Neutral
+	Actor152: cycl
+		Location: 34,21
+		Owner: Neutral
+	Actor153: cycl
+		Location: 34,22
+		Owner: Neutral
+	Actor154: cycl
+		Location: 35,22
+		Owner: Neutral
+	Actor155: cycl
+		Location: 35,23
+		Owner: Neutral
+	Actor156: gun
+		Location: 34,23
+		Owner: Neutral
+	Actor157: sam
+		Location: 32,22
+		Owner: Neutral
+	Actor158: e1
+		Location: 32,21
+		Owner: Neutral
+	Actor159: e1
+		Location: 33,21
+		Owner: Neutral
+	Actor160: e1
+		Location: 40,12
+		Owner: Neutral
+	Actor161: e1
+		Location: 39,13
+		Owner: Neutral
+	Actor162: cycl
+		Location: 50,5
+		Owner: Neutral
+	Actor163: cycl
+		Location: 51,5
+		Owner: Neutral
+	Actor167: cycl
+		Location: 51,8
+		Owner: Neutral
+	Actor165: cycl
+		Location: 51,6
+		Owner: Neutral
+	Actor166: cycl
+		Location: 51,7
+		Owner: Neutral
+	Actor168: cycl
+		Location: 51,9
+		Owner: Neutral
+	Actor169: cycl
+		Location: 51,10
+		Owner: Neutral
+	Actor170: cycl
+		Location: 52,10
+		Owner: Neutral
+	Actor171: cycl
+		Location: 52,9
+		Owner: Neutral
+	Actor172: tc04
+		Location: 47,4
+		Owner: Neutral
+	Actor173: v02
+		Location: 49,6
+		Owner: Neutral
+	Actor174: v04
+		Location: 49,7
+		Owner: Neutral
+	Actor175: v10
+		Location: 47,7
+		Owner: Neutral
+	Actor176: v08
+		Location: 47,10
+		Owner: Neutral
+	Actor177: c3
+		Location: 48,9
+		Owner: Neutral
+	Actor178: c4
+		Location: 44,12
+		Owner: Neutral
+	Actor179: v09
+		Location: 44,10
+		Owner: Neutral
+	Actor180: wood
+		Location: 71,12
+		Owner: Neutral
+	Actor181: wood
+		Location: 71,13
+		Owner: Neutral
+	Actor182: wood
+		Location: 71,14
+		Owner: Neutral
+	Actor183: wood
+		Location: 71,15
+		Owner: Neutral
+	Actor184: wood
+		Location: 71,16
+		Owner: Neutral
+	Actor185: wood
+		Location: 71,17
+		Owner: Neutral
+	Actor186: wood
+		Location: 71,18
+		Owner: Neutral
+	Actor187: wood
+		Location: 71,19
+		Owner: Neutral
+	Actor188: wood
+		Location: 47,16
+		Owner: Neutral
+	Actor189: wood
+		Location: 48,16
+		Owner: Neutral
+	Actor190: wood
+		Location: 49,16
+		Owner: Neutral
+	Actor191: wood
+		Location: 50,16
+		Owner: Neutral
+	Actor192: wood
+		Location: 51,16
+		Owner: Neutral
+	Actor193: wood
+		Location: 52,16
+		Owner: Neutral
+	Actor194: wood
+		Location: 52,15
+		Owner: Neutral
+	Actor195: wood
+		Location: 52,14
+		Owner: Neutral
+	Actor196: wood
+		Location: 52,13
+		Owner: Neutral
+	Actor197: v18
+		Location: 51,15
+		Owner: Neutral
+	Actor198: v18
+		Location: 51,14
+		Owner: Neutral
+	Actor199: v18
+		Location: 50,14
+		Owner: Neutral
+	Actor200: v18
+		Location: 50,15
+		Owner: Neutral
+	Actor201: v16
+		Location: 49,14
+		Owner: Neutral
+	Actor202: v16
+		Location: 49,15
+		Owner: Neutral
+	Actor203: v16
+		Location: 48,15
+		Owner: Neutral
+	Actor204: v16
+		Location: 48,14
+		Owner: Neutral
+	Actor205: v16
+		Location: 47,14
+		Owner: Neutral
+	Actor206: v16
+		Location: 47,15
+		Owner: Neutral
+	Actor207: v14
+		Location: 50,13
+		Owner: Neutral
+	Actor208: v14
+		Location: 51,13
+		Owner: Neutral
+	Actor212: v06
+		Location: 48,13
+		Owner: Neutral
+	Actor213: v07
+		Location: 41,20
+		Owner: Neutral
+	Actor211: v15
+		Location: 47,13
+		Owner: Neutral
+	Actor215: c1
+		Location: 42,21
+		Owner: Neutral
+	Actor216: c7
+		Location: 43,20
+		Owner: Neutral
+	Actor217: c10
+		Location: 45,22
+		Owner: Neutral
+	Actor218: c9
+		Location: 44,21
+		Owner: Neutral
+	Actor219: e1
+		Location: 45,27
+		Owner: Neutral
+	Actor220: e1
+		Location: 46,28
+		Owner: Neutral
+	Actor222: v01
+		Location: 69,19
+		Owner: Neutral
+	Actor223: t03
+		Location: 72,18
+		Owner: Neutral
+	Actor224: tc05
+		Location: 61,10
+		Owner: Neutral
+	Actor225: tc04
+		Location: 60,12
+		Owner: Neutral
+	Actor226: tc01
+		Location: 59,16
+		Owner: Neutral
+	Actor227: tc03
+		Location: 57,16
+		Owner: Neutral
+	Actor228: tc04
+		Location: 57,17
+		Owner: Neutral
+	Actor229: v04
+		Location: 58,19
+		Owner: Neutral
+	Actor230: tc04
+		Location: 75,10
+		Owner: Neutral
+	Actor231: tc02
+		Location: 75,16
+		Owner: Neutral
+	Actor232: tc05
+		Location: 79,17
+		Owner: Neutral
+	Actor233: tc04
+		Location: 79,12
+		Owner: Neutral
+	Actor234: tc01
+		Location: 83,14
+		Owner: Neutral
+	Actor235: wood
+		Location: 81,20
+		Owner: Neutral
+	Actor236: wood
+		Location: 81,21
+		Owner: Neutral
+	Actor237: wood
+		Location: 81,22
+		Owner: Neutral
+	Actor238: t17
+		Location: 82,22
+		Owner: Neutral
+	Actor239: c4
+		Location: 84,17
+		Owner: Neutral
+	Actor240: e1
+		Location: 79,9
+		Owner: Neutral
+	Actor241: e1
+		Location: 78,10
+		Owner: Neutral
+	Actor242: e3
+		Location: 58,1
+		Owner: Neutral
+	Actor243: e3
+		Location: 52,8
+		Owner: Neutral
+	Actor244: cycl
+		Location: 52,27
+		Owner: Neutral
+	Actor245: cycl
+		Location: 52,26
+		Owner: Neutral
+	Actor246: cycl
+		Location: 51,26
+		Owner: Neutral
+	Actor247: cycl
+		Location: 51,27
+		Owner: Neutral
+	Actor248: cycl
+		Location: 62,26
+		Owner: Neutral
+	Actor249: cycl
+		Location: 62,27
+		Owner: Neutral
+	Actor250: cycl
+		Location: 63,27
+		Owner: Neutral
+	Actor251: cycl
+		Location: 63,26
+		Owner: Neutral
+	Actor252: gun
+		Location: 53,27
+		Owner: Neutral
+	Actor253: gun
+		Location: 50,27
+		Owner: Neutral
+	Actor254: gun
+		Location: 61,27
+		Owner: Neutral
+	Actor255: gun
+		Location: 64,27
+		Owner: Neutral
+	Actor256: v03
+		Location: 68,21
+		Owner: Neutral
+	Actor257: v02
+		Location: 67,19
+		Owner: Neutral
+	Actor258: tc05
+		Location: 70,21
+		Owner: Neutral
+	Actor259: v07
+		Location: 69,23
+		Owner: Neutral
+	Actor260: c3
+		Location: 67,21
+		Owner: Neutral
+	Actor262: c9
+		Location: 65,22
+		Owner: Neutral
+	Actor263: c7
+		Location: 66,20
+		Owner: Neutral
+	Actor264: e2
+		Location: 70,43
+		Owner: Neutral
+	Actor265: e2
+		Location: 71,43
+		Owner: Neutral
+	Actor266: tc04
+		Location: 47,42
+		Owner: Neutral
+	Actor267: tc05
+		Location: 73,42
+		Owner: Neutral
+	Actor268: tc05
+		Location: 44,42
+		Owner: Neutral
+	Actor269: tc01
+		Location: 75,44
+		Owner: Neutral
+	Actor270: t11
+		Location: 43,44
+		Owner: Neutral
+	Actor271: t01
+		Location: 41,41
+		Owner: Neutral
+	Actor272: tc04
+		Location: 40,41
+		Owner: Neutral
+	Actor273: tc04
+		Location: 38,43
+		Owner: Neutral
+	Actor274: tc05
+		Location: 35,42
+		Owner: Neutral
+	Actor275: tc01
+		Location: 32,44
+		Owner: Neutral
+	Actor276: tc04
+		Location: 30,42
+		Owner: Neutral
+	Actor277: tc05
+		Location: 23,42
+		Owner: Neutral
+	Actor278: v03
+		Location: 26,44
+		Owner: Neutral
+	Actor279: tc04
+		Location: 17,41
+		Owner: Neutral
+	Actor280: tc01
+		Location: 18,44
+		Owner: Neutral
+	Actor281: tc04
+		Location: 14,43
+		Owner: Neutral
+	Actor282: tc04
+		Location: 12,41
+		Owner: Neutral
+	Actor283: tc04
+		Location: 9,43
+		Owner: Neutral
+	Actor284: tc04
+		Location: 77,41
+		Owner: Neutral
+	Actor285: tc04
+		Location: 79,43
+		Owner: Neutral
+	Actor286: tc01
+		Location: 82,42
+		Owner: Neutral
+	Actor287: tc05
+		Location: 82,43
+		Owner: Neutral
+	Actor288: tc05
+		Location: 85,42
+		Owner: Neutral
+	Actor289: wood
+		Location: 72,26
+		Owner: Neutral
+	Actor290: wood
+		Location: 71,26
+		Owner: Neutral
+	Actor291: wood
+		Location: 70,26
+		Owner: Neutral
+	Actor292: wood
+		Location: 69,26
+		Owner: Neutral
+	Actor293: wood
+		Location: 68,26
+		Owner: Neutral
+	Actor294: c4
+		Location: 71,25
+		Owner: Neutral
+	Actor295: v33
+		Location: 72,20
+		Owner: Neutral
+	Actor164: nuke
+		Location: 8,12
+		Owner: Neutral
+	Actor209: nuke
+		Location: 10,12
+		Owner: Neutral
+	Actor210: nuke
+		Location: 53,45
+		Owner: Neutral
+	Actor214: nuke
+		Location: 55,45
+		Owner: Neutral
+	Actor221: jeep
+		Location: 57,45
+		Owner: Neutral
 
 Waypoints:
 
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index c0f968e0a3..ce816c8966 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -77,4 +77,4 @@ TileSets:
 	mods/cnc/tilesets/snow.yaml
 
 LoadScreen: NullLoadScreen
-ShellmapUid:5a0ccbc84b80634e03ad1d5bfe631b5831aec147
+ShellmapUid:e7b9badb3b7d49ccc773a7aa086c0ff9a1136b77