diff --git a/mods/ra/maps/a-path-beyond.oramap b/mods/ra/maps/a-path-beyond.oramap
index c6f92304da..c26dfc373b 100644
Binary files a/mods/ra/maps/a-path-beyond.oramap and b/mods/ra/maps/a-path-beyond.oramap differ
diff --git a/mods/ra/maps/alaska-anarchy-redux.oramap b/mods/ra/maps/alaska-anarchy-redux.oramap
index b1df58d983..4a054c426b 100644
Binary files a/mods/ra/maps/alaska-anarchy-redux.oramap and b/mods/ra/maps/alaska-anarchy-redux.oramap differ
diff --git a/mods/ra/maps/all-connected.oramap b/mods/ra/maps/all-connected.oramap
index 87c5069270..fbb25049d0 100644
Binary files a/mods/ra/maps/all-connected.oramap and b/mods/ra/maps/all-connected.oramap differ
diff --git a/mods/ra/maps/bad-neighbors.oramap b/mods/ra/maps/bad-neighbors.oramap
index b2dd6c153c..104dfabd39 100644
Binary files a/mods/ra/maps/bad-neighbors.oramap and b/mods/ra/maps/bad-neighbors.oramap differ
diff --git a/mods/ra/maps/blitzkrieg.oramap b/mods/ra/maps/blitzkrieg.oramap
index c31dd41391..83cf750894 100644
Binary files a/mods/ra/maps/blitzkrieg.oramap and b/mods/ra/maps/blitzkrieg.oramap differ
diff --git a/mods/ra/maps/bombardment-islands.oramap b/mods/ra/maps/bombardment-islands.oramap
index dbc89fa0a2..c63c86c2dc 100644
Binary files a/mods/ra/maps/bombardment-islands.oramap and b/mods/ra/maps/bombardment-islands.oramap differ
diff --git a/mods/ra/maps/caffeinated.oramap b/mods/ra/maps/caffeinated.oramap
index f9b8c00c32..5122ce3bdd 100644
Binary files a/mods/ra/maps/caffeinated.oramap and b/mods/ra/maps/caffeinated.oramap differ
diff --git a/mods/ra/maps/center-of-attention-redux-2/map.bin b/mods/ra/maps/center-of-attention-redux-2/map.bin
index c53956b3a6..e5fb76ad16 100644
Binary files a/mods/ra/maps/center-of-attention-redux-2/map.bin and b/mods/ra/maps/center-of-attention-redux-2/map.bin differ
diff --git a/mods/ra/maps/center-of-attention-redux-2/map.png b/mods/ra/maps/center-of-attention-redux-2/map.png
index ee2b7e5616..15af4ae659 100644
Binary files a/mods/ra/maps/center-of-attention-redux-2/map.png and b/mods/ra/maps/center-of-attention-redux-2/map.png differ
diff --git a/mods/ra/maps/center-of-attention-redux-2/map.yaml b/mods/ra/maps/center-of-attention-redux-2/map.yaml
index 056a06a1ad..240e4f217a 100644
--- a/mods/ra/maps/center-of-attention-redux-2/map.yaml
+++ b/mods/ra/maps/center-of-attention-redux-2/map.yaml
@@ -72,51 +72,51 @@ Actors:
 	Actor101: oilb.strong
 		Location: 69,68
 		Owner: Neutral
-	Actor2: mine
-		Location: 71,61
+	Actor391: mine
 		Owner: Neutral
+		Location: 71,61
 	Actor93: oilb.strong
 		Location: 69,63
 		Owner: Neutral
 	Actor47: tc05
 		Location: 67,71
 		Owner: Neutral
-	Actor4: mine
-		Location: 72,20
+	Actor380: mine
 		Owner: Neutral
-	Actor5: mine
 		Location: 59,18
+	Actor379: mine
+		Owner: Neutral
+		Location: 72,20
+	Actor382: mine
 		Owner: Neutral
-	Actor6: mine
 		Location: 25,19
+	Actor381: mine
 		Owner: Neutral
-	Actor7: mine
 		Location: 21,25
+	Actor375: mine
 		Owner: Neutral
-	Actor81: mine
-		Location: 116,68
+		Location: 116,69
+	Actor376: mine
 		Owner: Neutral
-	Actor80: mine
 		Location: 117,61
+	Actor388: mine
 		Owner: Neutral
-	Actor10: mine
-		Location: 78,101
-		Owner: Neutral
-	Actor11: mine
 		Location: 79,96
+	Actor387: mine
+		Owner: Neutral
+		Location: 78,101
+	Actor390: mine
 		Owner: Neutral
-	Actor12: mine
 		Location: 107,96
+	Actor389: mine
 		Owner: Neutral
-	Actor13: mine
 		Location: 112,90
+	Actor377: mine
 		Owner: Neutral
-	Actor14: mine
-		Location: 108,22
-		Owner: Neutral
-	Actor15: mine
 		Location: 112,24
+	Actor378: mine
 		Owner: Neutral
+		Location: 108,22
 	Actor16: tc05
 		Location: 109,42
 		Owner: Neutral
@@ -150,9 +150,9 @@ Actors:
 	Actor22: tc05
 		Location: 72,8
 		Owner: Neutral
-	Actor3: t11
-		Location: 83,48
+	Actor370: t06
 		Owner: Neutral
+		Location: 108,87
 	Actor29: tc02
 		Location: 86,60
 		Owner: Neutral
@@ -195,9 +195,9 @@ Actors:
 	Actor44: tc03
 		Location: 81,56
 		Owner: Neutral
-	Actor46: mine
-		Location: 56,60
+	Actor394: mine
 		Owner: Neutral
+		Location: 56,60
 	Actor97: t03
 		Location: 88,64
 		Owner: Neutral
@@ -228,21 +228,21 @@ Actors:
 	Actor58: t12
 		Location: 56,97
 		Owner: Neutral
-	Actor59: t12
-		Location: 81,101
+	Actor273: tc01
+		Owner: Creeps
+		Location: 24,118
+	Actor384: mine
 		Owner: Neutral
-	Actor61: mine
-		Location: 36,68
-		Owner: Neutral
-	Actor60: mine
 		Location: 32,66
+	Actor383: mine
+		Owner: Neutral
+		Location: 36,68
+	Actor385: mine
 		Owner: Neutral
-	Actor9: mine
 		Location: 39,95
+	Actor386: mine
 		Owner: Neutral
-	Actor62: mine
 		Location: 35,90
-		Owner: Neutral
 	Actor63: tc04
 		Location: 15,23
 		Owner: Neutral
@@ -291,39 +291,18 @@ Actors:
 	Actor8: oilb.weak
 		Location: 39,78
 		Owner: Neutral
-	Actor68: mpspawn
-		Location: 97,27
-		Owner: Neutral
-	Actor88: mpspawn
-		Location: 64,109
-		Owner: Neutral
-	Actor79: mpspawn
-		Location: 31,29
-		Owner: Neutral
-	Actor89: mpspawn
-		Location: 31,102
-		Owner: Neutral
-	Actor86: mpspawn
-		Location: 110,51
-		Owner: Neutral
-	Actor91: mpspawn
-		Location: 70,27
-		Owner: Neutral
 	Actor82: t11
 		Location: 93,75
 		Owner: Neutral
-	Actor83: t11
-		Location: 89,59
+	Actor369: t11
 		Owner: Neutral
+		Location: 83,49
 	Actor28: tc04
 		Location: 84,80
 		Owner: Neutral
 	Actor48: t16
 		Location: 84,70
 		Owner: Neutral
-	Actor87: mpspawn
-		Location: 108,107
-		Owner: Neutral
 	Actor90: t11
 		Location: 104,76
 		Owner: Neutral
@@ -333,9 +312,9 @@ Actors:
 	Actor57: t16
 		Location: 87,72
 		Owner: Neutral
-	Actor41: mine
-		Location: 59,66
+	Actor395: mine
 		Owner: Neutral
+		Location: 59,66
 	Actor85: oilb.strong
 		Location: 64,63
 		Owner: Neutral
@@ -345,9 +324,9 @@ Actors:
 	Actor94: oilb.strong
 		Location: 64,68
 		Owner: Neutral
-	Actor0: mine
-		Location: 77,63
+	Actor392: mine
 		Owner: Neutral
+		Location: 77,63
 	Actor99: tc01
 		Location: 89,77
 		Owner: Neutral
@@ -357,12 +336,12 @@ Actors:
 	Actor84: t06
 		Location: 81,80
 		Owner: Neutral
-	Actor1: mine
+	Actor393: mine
+		Owner: Neutral
 		Location: 81,71
+	Actor396: mine
 		Owner: Neutral
-	Actor45: mine
 		Location: 57,75
-		Owner: Neutral
 	Actor104: tc02
 		Location: 54,27
 		Owner: Neutral
@@ -399,9 +378,9 @@ Actors:
 	Actor113: t17
 		Location: 44,117
 		Owner: Neutral
-	Actor114: t05
-		Location: 40,118
+	Actor303: t05
 		Owner: Neutral
+		Location: 39,123
 	Actor40: tc05
 		Location: 16,19
 		Owner: Neutral
@@ -447,12 +426,12 @@ Actors:
 	Actor129: t17
 		Location: 49,18
 		Owner: Neutral
-	Actor130: t17
-		Location: 97,16
-		Owner: Neutral
-	Actor131: t17
-		Location: 109,18
-		Owner: Neutral
+	Actor274: tc01
+		Owner: Creeps
+		Location: 42,114
+	Actor275: tc01
+		Owner: Creeps
+		Location: 22,116
 	Actor132: t17
 		Location: 29,16
 		Owner: Neutral
@@ -571,7 +550,7 @@ Actors:
 		Location: 65,66
 		Owner: Creeps
 	Actor178: agun
-		Location: 67,70
+		Location: 67,69
 		Owner: Creeps
 	Actor180: v2rl
 		Location: 73,65
@@ -618,9 +597,9 @@ Actors:
 	Actor193: oilb.weak
 		Location: 45,96
 		Owner: Neutral
-	Actor194: mpspawn
-		Location: 18,73
+	Actor408: mpspawn
 		Owner: Neutral
+		Location: 31,29
 	Actor195: oilb.weak
 		Location: 103,87
 		Owner: Neutral
@@ -778,7 +757,7 @@ Actors:
 		Location: 64,62
 		Owner: Neutral
 	Actor174: agun
-		Location: 67,62
+		Location: 67,61
 		Owner: Creeps
 	Actor248: brl3
 		Location: 71,63
@@ -874,10 +853,328 @@ Actors:
 		Location: 67,60
 		Owner: Creeps
 	Actor233: apwr
-		Location: 121,92
+		Location: 121,91
 		Owner: Creeps
 	Actor232: apwr
-		Location: 121,97
+		Location: 121,96
 		Owner: Creeps
+	Actor276: tc01
+		Owner: Creeps
+		Location: 33,121
+	Actor277: tc02
+		Owner: Creeps
+		Location: 32,117
+	Actor278: t05
+		Owner: Creeps
+		Location: 33,122
+	Actor279: t05
+		Owner: Creeps
+		Location: 21,114
+	Actor280: t02
+		Owner: Creeps
+		Location: 30,120
+	Actor281: t02
+		Owner: Creeps
+		Location: 27,113
+	Actor282: t02
+		Owner: Creeps
+		Location: 39,122
+	Actor283: t02
+		Owner: Creeps
+		Location: 31,119
+	Actor284: tc01
+		Owner: Neutral
+		Location: 115,114
+	Actor285: tc01
+		Owner: Neutral
+		Location: 111,120
+	Actor286: tc02
+		Owner: Neutral
+		Location: 116,119
+	Actor287: tc02
+		Owner: Neutral
+		Location: 112,116
+	Actor288: t16
+		Owner: Neutral
+		Location: 109,121
+	Actor289: t16
+		Owner: Neutral
+		Location: 116,111
+	Actor290: t02
+		Owner: Neutral
+		Location: 118,116
+	Actor291: t02
+		Owner: Neutral
+		Location: 106,120
+	Actor292: t02
+		Owner: Neutral
+		Location: 117,110
+	Actor293: t01
+		Owner: Neutral
+		Location: 111,123
+	Actor294: t01
+		Owner: Neutral
+		Location: 119,110
+	Actor295: tc01
+		Owner: Neutral
+		Location: 82,112
+	Actor296: tc01
+		Owner: Neutral
+		Location: 42,123
+	Actor297: tc01
+		Owner: Neutral
+		Location: 21,113
+	Actor298: t16
+		Owner: Neutral
+		Location: 17,112
+	Actor299: t02
+		Owner: Neutral
+		Location: 20,112
+	Actor300: t02
+		Owner: Neutral
+		Location: 28,118
+	Actor301: t02
+		Owner: Neutral
+		Location: 32,123
+	Actor302: t02
+		Owner: Neutral
+		Location: 44,112
+	Actor304: t05
+		Owner: Neutral
+		Location: 19,111
+	Actor305: tc02
+		Owner: Neutral
+		Location: 17,105
+	Actor306: t11
+		Owner: Neutral
+		Location: 15,103
+	Actor307: t12
+		Owner: Neutral
+		Location: 28,122
+	Actor308: t12
+		Owner: Neutral
+		Location: 25,107
+	Actor309: t05
+		Owner: Neutral
+		Location: 50,105
+	Actor310: t05
+		Owner: Neutral
+		Location: 42,115
+	Actor311: t03
+		Owner: Neutral
+		Location: 49,119
+	Actor312: t10
+		Owner: Neutral
+		Location: 84,119
+	Actor313: t13
+		Owner: Neutral
+		Location: 119,103
+	Actor314: t02
+		Owner: Neutral
+		Location: 67,87
+	Actor315: t02
+		Owner: Neutral
+		Location: 18,62
+	Actor316: t05
+		Owner: Neutral
+		Location: 15,60
+	Actor317: t02
+		Owner: Neutral
+		Location: 31,45
+	Actor318: t02
+		Owner: Neutral
+		Location: 18,32
+	Actor319: t17
+		Owner: Neutral
+		Location: 21,46
+	Actor320: tc02
+		Owner: Neutral
+		Location: 17,21
+	Actor321: tc04
+		Owner: Neutral
+		Location: 14,25
+	Actor322: tc04
+		Owner: Neutral
+		Location: 16,15
+	Actor323: tc01
+		Owner: Neutral
+		Location: 18,14
+	Actor324: tc01
+		Owner: Neutral
+		Location: 21,12
+	Actor325: t16
+		Owner: Neutral
+		Location: 15,21
+	Actor326: t13
+		Owner: Neutral
+		Location: 18,17
+	Actor327: t02
+		Owner: Neutral
+		Location: 15,14
+	Actor328: t05
+		Owner: Neutral
+		Location: 22,11
+	Actor329: t02
+		Owner: Neutral
+		Location: 16,11
+	Actor330: t12
+		Owner: Neutral
+		Location: 19,11
+	Actor331: t05
+		Owner: Neutral
+		Location: 28,10
+	Actor332: tc04
+		Owner: Neutral
+		Location: 55,11
+	Actor333: t05
+		Owner: Neutral
+		Location: 57,10
+	Actor334: t05
+		Owner: Neutral
+		Location: 47,9
+	Actor335: t01
+		Owner: Neutral
+		Location: 65,9
+	Actor336: tc04
+		Owner: Neutral
+		Location: 114,16
+	Actor337: tc01
+		Owner: Neutral
+		Location: 109,14
+	Actor338: tc02
+		Owner: Neutral
+		Location: 107,14
+	Actor339: tc01
+		Owner: Neutral
+		Location: 117,13
+	Actor340: tc04
+		Owner: Neutral
+		Location: 102,11
+	Actor341: tc01
+		Owner: Neutral
+		Location: 104,11
+	Actor342: tc01
+		Owner: Neutral
+		Location: 119,26
+	Actor343: t02
+		Owner: Neutral
+		Location: 119,28
+	Actor344: t02
+		Owner: Neutral
+		Location: 119,12
+	Actor345: t02
+		Owner: Neutral
+		Location: 100,9
+	Actor347: t07
+		Owner: Neutral
+		Location: 119,14
+	Actor346: tc05
+		Owner: Neutral
+		Location: 118,10
+	Actor348: t17
+		Owner: Neutral
+		Location: 109,11
+	Actor349: t05
+		Owner: Neutral
+		Location: 110,13
+	Actor350: t08
+		Owner: Neutral
+		Location: 117,11
+	Actor351: t01
+		Owner: Neutral
+		Location: 100,12
+	Actor352: t01
+		Owner: Neutral
+		Location: 118,30
+	Actor353: t02
+		Owner: Neutral
+		Location: 118,25
+	Actor354: t02
+		Owner: Neutral
+		Location: 115,15
+	Actor355: t02
+		Owner: Neutral
+		Location: 115,9
+	Actor356: t05
+		Owner: Neutral
+		Location: 118,12
+	Actor357: t05
+		Owner: Neutral
+		Location: 101,10
+	Actor358: t02
+		Owner: Neutral
+		Location: 106,10
+	Actor359: t02
+		Owner: Neutral
+		Location: 106,10
+	Actor360: tc01
+		Owner: Neutral
+		Location: 114,39
+	Actor361: t05
+		Owner: Neutral
+		Location: 113,39
+	Actor362: t05
+		Owner: Neutral
+		Location: 106,42
+	Actor363: t02
+		Owner: Neutral
+		Location: 119,38
+	Actor364: tc04
+		Owner: Neutral
+		Location: 118,37
+	Actor365: tc01
+		Owner: Neutral
+		Location: 119,35
+	Actor366: t05
+		Owner: Neutral
+		Location: 119,29
+	Actor367: t13
+		Owner: Neutral
+		Location: 115,35
+	Actor368: t17
+		Owner: Neutral
+		Location: 118,42
+	Actor371: tc03
+		Owner: Neutral
+		Location: 15,122
+	Actor372: t08
+		Owner: Neutral
+		Location: 17,123
+	Actor373: v05
+		Owner: Neutral
+		Location: 18,118
+	Actor374: t15
+		Owner: Neutral
+		Location: 21,122
+	Actor397: mine
+		Owner: Neutral
+		Location: 16,50
+	Actor398: mine
+		Owner: Neutral
+		Location: 97,122
+	Actor399: mine
+		Owner: Neutral
+		Location: 85,11
+	Actor407: mpspawn
+		Owner: Neutral
+		Location: 70,27
+	Actor406: mpspawn
+		Owner: Neutral
+		Location: 97,27
+	Actor405: mpspawn
+		Owner: Neutral
+		Location: 110,51
+	Actor400: mpspawn
+		Owner: Neutral
+		Location: 20,73
+	Actor401: mpspawn
+		Owner: Neutral
+		Location: 31,102
+	Actor402: mpspawn
+		Owner: Neutral
+		Location: 64,109
+	Actor403: mpspawn
+		Owner: Neutral
+		Location: 108,107
 
-Rules: rules.yaml
+Rules: rules.yaml
\ No newline at end of file
diff --git a/mods/ra/maps/chaos-canyon.oramap b/mods/ra/maps/chaos-canyon.oramap
index 913d4dc46f..0d82aed9a9 100644
Binary files a/mods/ra/maps/chaos-canyon.oramap and b/mods/ra/maps/chaos-canyon.oramap differ
diff --git a/mods/ra/maps/coastal-influence.oramap b/mods/ra/maps/coastal-influence.oramap
index 988474c81e..0d81db4c4a 100644
Binary files a/mods/ra/maps/coastal-influence.oramap and b/mods/ra/maps/coastal-influence.oramap differ
diff --git a/mods/ra/maps/cold-front.oramap b/mods/ra/maps/cold-front.oramap
index f0127667e3..1011a5ed13 100644
Binary files a/mods/ra/maps/cold-front.oramap and b/mods/ra/maps/cold-front.oramap differ
diff --git a/mods/ra/maps/doughnut.oramap b/mods/ra/maps/doughnut.oramap
index 37b851c618..c351468a0b 100644
Binary files a/mods/ra/maps/doughnut.oramap and b/mods/ra/maps/doughnut.oramap differ
diff --git a/mods/ra/maps/dual-cold-front.oramap b/mods/ra/maps/dual-cold-front.oramap
index 0b78286710..d4e2bdbe7c 100644
Binary files a/mods/ra/maps/dual-cold-front.oramap and b/mods/ra/maps/dual-cold-front.oramap differ
diff --git a/mods/ra/maps/encounter.oramap b/mods/ra/maps/encounter.oramap
index 1f5f6c0116..13567af787 100644
Binary files a/mods/ra/maps/encounter.oramap and b/mods/ra/maps/encounter.oramap differ
diff --git a/mods/ra/maps/engagement.oramap b/mods/ra/maps/engagement.oramap
index 33fe39c3ff..94ee3e1f5c 100644
Binary files a/mods/ra/maps/engagement.oramap and b/mods/ra/maps/engagement.oramap differ
diff --git a/mods/ra/maps/forest-path.oramap b/mods/ra/maps/forest-path.oramap
index 627b99047e..4832c5f94a 100644
Binary files a/mods/ra/maps/forest-path.oramap and b/mods/ra/maps/forest-path.oramap differ
diff --git a/mods/ra/maps/ghost-town.oramap b/mods/ra/maps/ghost-town.oramap
index 72543e116a..aec5da9904 100644
Binary files a/mods/ra/maps/ghost-town.oramap and b/mods/ra/maps/ghost-town.oramap differ
diff --git a/mods/ra/maps/haos-ridges.oramap b/mods/ra/maps/haos-ridges.oramap
index ce5105c82b..fbe8157429 100644
Binary files a/mods/ra/maps/haos-ridges.oramap and b/mods/ra/maps/haos-ridges.oramap differ
diff --git a/mods/ra/maps/mad-science.oramap b/mods/ra/maps/mad-science.oramap
index 6485b47c05..aa0aab2ab7 100644
Binary files a/mods/ra/maps/mad-science.oramap and b/mods/ra/maps/mad-science.oramap differ
diff --git a/mods/ra/maps/mass-confliction.oramap b/mods/ra/maps/mass-confliction.oramap
index 03b1e74d71..f1b04b13ed 100644
Binary files a/mods/ra/maps/mass-confliction.oramap and b/mods/ra/maps/mass-confliction.oramap differ
diff --git a/mods/ra/maps/northwestpassage.oramap b/mods/ra/maps/northwestpassage.oramap
index f0d2f94591..8588814426 100644
Binary files a/mods/ra/maps/northwestpassage.oramap and b/mods/ra/maps/northwestpassage.oramap differ
diff --git a/mods/ra/maps/operation-goldmine.oramap b/mods/ra/maps/operation-goldmine.oramap
index db2f50bcfa..477e80a8ba 100644
Binary files a/mods/ra/maps/operation-goldmine.oramap and b/mods/ra/maps/operation-goldmine.oramap differ
diff --git a/mods/ra/maps/poland-raid.oramap b/mods/ra/maps/poland-raid.oramap
new file mode 100644
index 0000000000..106e1d572c
Binary files /dev/null and b/mods/ra/maps/poland-raid.oramap differ
diff --git a/mods/ra/maps/poland-raid/map.bin b/mods/ra/maps/poland-raid/map.bin
deleted file mode 100644
index 86f76fda9f..0000000000
Binary files a/mods/ra/maps/poland-raid/map.bin and /dev/null differ
diff --git a/mods/ra/maps/poland-raid/map.png b/mods/ra/maps/poland-raid/map.png
deleted file mode 100644
index 67ea2bda7f..0000000000
Binary files a/mods/ra/maps/poland-raid/map.png and /dev/null differ
diff --git a/mods/ra/maps/poland-raid/map.yaml b/mods/ra/maps/poland-raid/map.yaml
deleted file mode 100644
index b35983771f..0000000000
--- a/mods/ra/maps/poland-raid/map.yaml
+++ /dev/null
@@ -1,780 +0,0 @@
-MapFormat: 11
-
-RequiresMod: ra
-
-Title: Poland Raid
-
-Author: s1w
-
-Tileset: TEMPERAT
-
-MapSize: 128,128
-
-Bounds: 16,16,96,96
-
-Visibility: Lobby
-
-Categories: Conquest
-
-Players:
-	PlayerReference@Neutral:
-		Name: Neutral
-		OwnsWorld: True
-		NonCombatant: True
-		Faction: allies
-	PlayerReference@Multi0:
-		Name: Multi0
-		Playable: True
-		AllowBots: False
-		Faction: Random
-		Enemies: Creeps
-	PlayerReference@Multi1:
-		Name: Multi1
-		Playable: True
-		AllowBots: False
-		Faction: Random
-		Enemies: Creeps
-	PlayerReference@Multi2:
-		Name: Multi2
-		Playable: True
-		AllowBots: False
-		Faction: Random
-		Enemies: Creeps
-	PlayerReference@Multi3:
-		Name: Multi3
-		Playable: True
-		AllowBots: False
-		Faction: Random
-		Enemies: Creeps
-	PlayerReference@Multi4:
-		Name: Multi4
-		Playable: True
-		AllowBots: False
-		Faction: Random
-		Enemies: Creeps
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: allies
-		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4
-
-Actors:
-	Actor1: v16
-		Location: 26,55
-		Owner: Neutral
-	Actor2: v18
-		Location: 27,54
-		Owner: Neutral
-	Actor184: mine
-		Location: 57,80
-		Owner: Neutral
-	Actor183: mine
-		Location: 86,27
-		Owner: Neutral
-	Actor59: mine
-		Location: 65,46
-		Owner: Neutral
-	Actor11: mine
-		Location: 50,78
-		Owner: Neutral
-	Actor5: mine
-		Location: 46,88
-		Owner: Neutral
-	Actor14: tc05
-		Location: 94,32
-		Owner: Neutral
-	Actor15: tc05
-		Location: 95,35
-		Owner: Neutral
-	Actor16: tc02
-		Location: 33,20
-		Owner: Neutral
-	Actor17: tc04
-		Location: 32,17
-		Owner: Neutral
-	Actor18: tc05
-		Location: 34,18
-		Owner: Neutral
-	Actor19: tc05
-		Location: 86,53
-		Owner: Neutral
-	Actor20: tc02
-		Location: 86,34
-		Owner: Neutral
-	Actor21: tc02
-		Location: 55,35
-		Owner: Neutral
-	Actor22: t17
-		Location: 58,36
-		Owner: Neutral
-	Actor23: t07
-		Location: 16,89
-		Owner: Neutral
-	Actor24: tc04
-		Location: 19,90
-		Owner: Neutral
-	Actor25: tc04
-		Location: 17,51
-		Owner: Neutral
-	Actor26: tc04
-		Location: 22,52
-		Owner: Neutral
-	Actor27: tc04
-		Location: 25,49
-		Owner: Neutral
-	Actor28: tc04
-		Location: 18,56
-		Owner: Neutral
-	Actor29: tc05
-		Location: 18,53
-		Owner: Neutral
-	Actor30: tc05
-		Location: 23,47
-		Owner: Neutral
-	Actor31: tc03
-		Location: 16,55
-		Owner: Neutral
-	Actor32: tc03
-		Location: 21,55
-		Owner: Neutral
-	Actor34: tc01
-		Location: 21,49
-		Owner: Neutral
-	Actor35: t17
-		Location: 26,52
-		Owner: Neutral
-	Actor36: t17
-		Location: 17,56
-		Owner: Neutral
-	Actor37: t14
-		Location: 23,51
-		Owner: Neutral
-	Actor38: t14
-		Location: 16,53
-		Owner: Neutral
-	Actor39: tc04
-		Location: 29,109
-		Owner: Neutral
-	Actor41: tc01
-		Location: 53,98
-		Owner: Neutral
-	Actor42: tc04
-		Location: 37,86
-		Owner: Neutral
-	Actor43: tc02
-		Location: 16,83
-		Owner: Neutral
-	Actor44: tc05
-		Location: 40,109
-		Owner: Neutral
-	Actor45: tc04
-		Location: 30,106
-		Owner: Neutral
-	Actor46: tc04
-		Location: 27,107
-		Owner: Neutral
-	Actor47: tc02
-		Location: 34,108
-		Owner: Neutral
-	Actor48: tc02
-		Location: 32,108
-		Owner: Neutral
-	Actor49: tc02
-		Location: 32,110
-		Owner: Neutral
-	Actor50: t03
-		Location: 33,106
-		Owner: Neutral
-	Actor51: t03
-		Location: 30,108
-		Owner: Neutral
-	Actor52: t16
-		Location: 41,95
-		Owner: Neutral
-	Actor53: tc05
-		Location: 109,109
-		Owner: Neutral
-	Actor54: tc05
-		Location: 37,109
-		Owner: Neutral
-	Actor55: tc01
-		Location: 35,109
-		Owner: Neutral
-	Actor135: mine
-		Location: 27,82
-		Owner: Neutral
-	Actor91: mine
-		Location: 93,109
-		Owner: Neutral
-	Actor57: mine
-		Location: 82,109
-		Owner: Neutral
-	Actor160: mine
-		Location: 42,31
-		Owner: Neutral
-	Actor62: tc01
-		Location: 57,37
-		Owner: Neutral
-	Actor63: tc03
-		Location: 59,37
-		Owner: Neutral
-	Actor64: tc03
-		Location: 53,35
-		Owner: Neutral
-	Actor13: mine
-		Location: 22,93
-		Owner: Neutral
-	Actor66: tc02
-		Location: 41,51
-		Owner: Neutral
-	Actor67: tc01
-		Location: 97,32
-		Owner: Neutral
-	Actor68: tc01
-		Location: 97,33
-		Owner: Neutral
-	Actor69: tc03
-		Location: 98,31
-		Owner: Neutral
-	Actor70: tc02
-		Location: 77,88
-		Owner: Neutral
-	Actor71: tc04
-		Location: 103,73
-		Owner: Neutral
-	Actor72: t12
-		Location: 102,74
-		Owner: Neutral
-	Actor73: t03
-		Location: 99,74
-		Owner: Neutral
-	Actor74: t08
-		Location: 84,90
-		Owner: Neutral
-	Actor75: mine
-		Location: 86,79
-		Owner: Neutral
-	Actor76: tc04
-		Location: 94,75
-		Owner: Neutral
-	Actor77: tc05
-		Location: 91,76
-		Owner: Neutral
-	Actor40: mpspawn
-		Location: 99,85
-		Owner: Neutral
-	Actor79: tc03
-		Location: 85,76
-		Owner: Neutral
-	Actor80: tc04
-		Location: 73,88
-		Owner: Neutral
-	Actor81: tc01
-		Location: 71,88
-		Owner: Neutral
-	Actor82: tc01
-		Location: 77,99
-		Owner: Neutral
-	Actor83: t07
-		Location: 26,89
-		Owner: Neutral
-	Actor84: t08
-		Location: 23,91
-		Owner: Neutral
-	Actor85: v12
-		Location: 41,94
-		Owner: Neutral
-	Actor7: mine
-		Location: 108,49
-		Owner: Neutral
-	Actor88: t11
-		Location: 38,32
-		Owner: Neutral
-	Actor89: t08
-		Location: 95,44
-		Owner: Neutral
-	Actor90: t12
-		Location: 23,48
-		Owner: Neutral
-	Actor58: mine
-		Location: 88,107
-		Owner: Neutral
-	Actor9: mine
-		Location: 59,49
-		Owner: Neutral
-	Actor94: t16
-		Location: 29,106
-		Owner: Neutral
-	Actor95: tc04
-		Location: 54,74
-		Owner: Neutral
-	Actor96: tc05
-		Location: 48,72
-		Owner: Neutral
-	Actor98: t12
-		Location: 47,72
-		Owner: Neutral
-	Actor100: tc02
-		Location: 39,78
-		Owner: Neutral
-	Actor101: tc02
-		Location: 33,90
-		Owner: Neutral
-	Actor102: tc03
-		Location: 41,76
-		Owner: Neutral
-	Actor103: t06
-		Location: 47,73
-		Owner: Neutral
-	Actor104: t08
-		Location: 33,78
-		Owner: Neutral
-	Actor105: t02
-		Location: 32,89
-		Owner: Neutral
-	Actor106: tc01
-		Location: 29,89
-		Owner: Neutral
-	Actor107: t07
-		Location: 28,89
-		Owner: Neutral
-	Actor108: tc04
-		Location: 34,75
-		Owner: Neutral
-	Actor109: t16
-		Location: 35,74
-		Owner: Neutral
-	Actor110: tc02
-		Location: 38,73
-		Owner: Neutral
-	Actor111: t11
-		Location: 37,74
-		Owner: Neutral
-	Actor112: t11
-		Location: 16,84
-		Owner: Neutral
-	Actor113: t05
-		Location: 37,78
-		Owner: Neutral
-	Actor114: t17
-		Location: 71,43
-		Owner: Neutral
-	Actor115: tc01
-		Location: 76,32
-		Owner: Neutral
-	Actor116: t16
-		Location: 75,31
-		Owner: Neutral
-	Actor117: t16
-		Location: 87,48
-		Owner: Neutral
-	Actor118: t17
-		Location: 85,44
-		Owner: Neutral
-	Actor119: t11
-		Location: 79,46
-		Owner: Neutral
-	Actor120: t08
-		Location: 72,40
-		Owner: Neutral
-	Actor121: t02
-		Location: 69,21
-		Owner: Neutral
-	Actor122: t08
-		Location: 70,22
-		Owner: Neutral
-	Actor123: tc01
-		Location: 66,23
-		Owner: Neutral
-	Actor124: t16
-		Location: 66,21
-		Owner: Neutral
-	Actor125: t05
-		Location: 69,18
-		Owner: Neutral
-	Actor126: t13
-		Location: 66,18
-		Owner: Neutral
-	Actor127: t01
-		Location: 68,21
-		Owner: Neutral
-	Actor0: tc01
-		Location: 94,24
-		Owner: Neutral
-	Actor132: tc04
-		Location: 63,18
-		Owner: Neutral
-	Actor133: tc04
-		Location: 40,49
-		Owner: Neutral
-	Actor138: tc01
-		Location: 38,50
-		Owner: Neutral
-	Actor56: mine
-		Location: 22,83
-		Owner: Neutral
-	Actor176: t16
-		Location: 100,75
-		Owner: Neutral
-	Actor137: tc01
-		Location: 42,96
-		Owner: Neutral
-	Actor190: t05
-		Location: 28,50
-		Owner: Neutral
-	Actor139: tc01
-		Location: 49,32
-		Owner: Neutral
-	Actor140: t05
-		Location: 48,33
-		Owner: Neutral
-	Actor141: t01
-		Location: 46,35
-		Owner: Neutral
-	Actor143: tc02
-		Location: 65,34
-		Owner: Neutral
-	Actor144: tc01
-		Location: 65,35
-		Owner: Neutral
-	Actor145: tc02
-		Location: 65,37
-		Owner: Neutral
-	Actor146: t08
-		Location: 56,37
-		Owner: Neutral
-	Actor147: tc05
-		Location: 53,32
-		Owner: Neutral
-	Actor148: tc01
-		Location: 56,33
-		Owner: Neutral
-	Actor149: t12
-		Location: 57,34
-		Owner: Neutral
-	Actor150: tc04
-		Location: 62,28
-		Owner: Neutral
-	Actor151: tc04
-		Location: 59,34
-		Owner: Neutral
-	Actor152: t07
-		Location: 61,28
-		Owner: Neutral
-	Actor153: t05
-		Location: 60,27
-		Owner: Neutral
-	Actor154: tc01
-		Location: 42,34
-		Owner: Neutral
-	Actor155: t07
-		Location: 43,33
-		Owner: Neutral
-	Actor156: t08
-		Location: 44,34
-		Owner: Neutral
-	Actor157: t16
-		Location: 41,34
-		Owner: Neutral
-	Actor158: tc01
-		Location: 80,30
-		Owner: Neutral
-	Actor159: t11
-		Location: 79,29
-		Owner: Neutral
-	Actor8: t06
-		Location: 89,30
-		Owner: Neutral
-	Actor128: t06
-		Location: 95,25
-		Owner: Neutral
-	Actor163: t03
-		Location: 71,33
-		Owner: Neutral
-	Actor164: t08
-		Location: 57,53
-		Owner: Neutral
-	Actor165: t08
-		Location: 30,89
-		Owner: Neutral
-	Actor166: tc01
-		Location: 28,88
-		Owner: Neutral
-	Actor167: t11
-		Location: 26,88
-		Owner: Neutral
-	Actor168: t07
-		Location: 55,99
-		Owner: Neutral
-	Actor169: t13
-		Location: 20,86
-		Owner: Neutral
-	Actor170: t11
-		Location: 33,86
-		Owner: Neutral
-	Actor171: tc05
-		Location: 16,90
-		Owner: Neutral
-	Actor172: tc02
-		Location: 22,89
-		Owner: Neutral
-	Actor173: t02
-		Location: 17,69
-		Owner: Neutral
-	Actor174: t11
-		Location: 29,72
-		Owner: Neutral
-	Actor175: t11
-		Location: 86,95
-		Owner: Neutral
-	Actor177: tc01
-		Location: 36,16
-		Owner: Neutral
-	Actor178: tc02
-		Location: 33,16
-		Owner: Neutral
-	Actor179: t15
-		Location: 31,16
-		Owner: Neutral
-	Actor180: t11
-		Location: 54,19
-		Owner: Neutral
-	Actor87: mine
-		Location: 109,46
-		Owner: Neutral
-	Actor60: mine
-		Location: 37,29
-		Owner: Neutral
-	Actor186: tc04
-		Location: 109,77
-		Owner: Neutral
-	Actor187: tc01
-		Location: 105,72
-		Owner: Neutral
-	Actor188: t10
-		Location: 107,73
-		Owner: Neutral
-	Actor93: mine
-		Location: 110,97
-		Owner: Neutral
-	Actor189: mine
-		Location: 109,102
-		Owner: Neutral
-	Actor191: tc03
-		Location: 27,110
-		Owner: Neutral
-	Actor192: t08
-		Location: 24,51
-		Owner: Neutral
-	Actor193: t08
-		Location: 21,51
-		Owner: Neutral
-	Actor194: t08
-		Location: 22,49
-		Owner: Neutral
-	Actor65: mine
-		Location: 52,105
-		Owner: Neutral
-	Actor195: mine
-		Location: 56,103
-		Owner: Neutral
-	Actor134: tc04
-		Location: 32,50
-		Owner: Neutral
-	Actor198: tc04
-		Location: 18,71
-		Owner: Neutral
-	Actor199: t16
-		Location: 16,70
-		Owner: Neutral
-	Actor200: tc02
-		Location: 20,74
-		Owner: Neutral
-	Actor201: tc05
-		Location: 17,77
-		Owner: Neutral
-	Actor202: tc03
-		Location: 19,73
-		Owner: Neutral
-	Actor203: tc05
-		Location: 16,67
-		Owner: Neutral
-	Actor204: t12
-		Location: 19,66
-		Owner: Neutral
-	Actor205: t11
-		Location: 107,83
-		Owner: Neutral
-	Actor206: t05
-		Location: 108,110
-		Owner: Neutral
-	Actor207: t15
-		Location: 65,59
-		Owner: Neutral
-	Actor208: tc03
-		Location: 57,64
-		Owner: Neutral
-	Actor209: t17
-		Location: 63,68
-		Owner: Neutral
-	Actor210: t16
-		Location: 68,70
-		Owner: Neutral
-	Actor211: tc04
-		Location: 62,66
-		Owner: Neutral
-	Actor212: t16
-		Location: 16,50
-		Owner: Neutral
-	Actor213: t16
-		Location: 21,46
-		Owner: Neutral
-	Actor214: t17
-		Location: 20,48
-		Owner: Neutral
-	Actor215: t08
-		Location: 25,38
-		Owner: Neutral
-	Actor216: t08
-		Location: 21,58
-		Owner: Neutral
-	Actor197: tc02
-		Location: 69,66
-		Owner: Neutral
-	Actor219: tc01
-		Location: 72,67
-		Owner: Neutral
-	Actor224: tc01
-		Location: 87,76
-		Owner: Neutral
-	Actor225: oilb
-		Location: 68,68
-		Owner: Neutral
-	Actor99: brl3
-		Location: 59,64
-		Owner: Neutral
-	Actor227: barl
-		Location: 67,70
-		Owner: Neutral
-	Actor228: brl3
-		Location: 66,68
-		Owner: Neutral
-	Actor226: oilb
-		Location: 59,62
-		Owner: Neutral
-	Actor230: barl
-		Location: 60,65
-		Owner: Neutral
-	Actor231: v15
-		Location: 66,70
-		Owner: Neutral
-	Actor232: dog
-		Location: 63,65
-		Owner: Creeps
-	Actor233: oilb
-		Location: 23,34
-		Owner: Neutral
-	Actor229: barl
-		Location: 61,65
-		Owner: Neutral
-	Actor235: brl3
-		Location: 26,36
-		Owner: Neutral
-	Actor33: v07
-		Location: 61,63
-		Owner: Neutral
-	Actor236: mpspawn
-		Location: 26,66
-		Owner: Neutral
-	Actor182: mine
-		Location: 40,62
-		Owner: Neutral
-	Actor234: t05
-		Location: 27,84
-		Owner: Neutral
-	Actor218: t05
-		Location: 71,67
-		Owner: Neutral
-	Actor217: t16
-		Location: 21,34
-		Owner: Neutral
-	Actor131: mpspawn
-		Location: 103,32
-		Owner: Neutral
-	Actor142: mine
-		Location: 52,84
-		Owner: Neutral
-	Actor4: mine
-		Location: 43,82
-		Owner: Neutral
-	Actor223: t13
-		Location: 46,73
-		Owner: Neutral
-	Actor238: t08
-		Location: 16,79
-		Owner: Neutral
-	Actor239: t02
-		Location: 81,77
-		Owner: Neutral
-	Actor136: t16
-		Location: 61,102
-		Owner: Neutral
-	Actor185: fenc
-		Location: 49,84
-		Owner: Neutral
-	Actor240: mpspawn
-		Location: 34,101
-		Owner: Neutral
-	Actor220: mpspawn
-		Location: 46,24
-		Owner: Neutral
-	Actor3: t08
-		Location: 53,75
-		Owner: Neutral
-	Actor92: mine
-		Location: 78,52
-		Owner: Neutral
-	Actor86: mine
-		Location: 29,92
-		Owner: Neutral
-	Actor78: t16
-		Location: 111,42
-		Owner: Neutral
-	Actor61: tc01
-		Location: 109,23
-		Owner: Neutral
-	Actor161: t08
-		Location: 107,23
-		Owner: Neutral
-	Actor162: t07
-		Location: 98,28
-		Owner: Neutral
-	Actor181: mine
-		Location: 82,22
-		Owner: Neutral
-	Actor130: mine
-		Location: 79,25
-		Owner: Neutral
-	Actor10: mine
-		Location: 60,45
-		Owner: Neutral
-	Actor129: mine
-		Location: 62,21
-		Owner: Neutral
-	Actor97: mine
-		Location: 60,17
-		Owner: Neutral
-	Actor6: mine
-		Location: 74,24
-		Owner: Neutral
-	Actor196: mine
-		Location: 58,91
-		Owner: Neutral
-	Actor12: t07
-		Location: 41,75
-		Owner: Neutral
-	Actor221: t08
-		Location: 91,86
-		Owner: Neutral
-
-Rules: rules.yaml
diff --git a/mods/ra/maps/poland-raid/rules.yaml b/mods/ra/maps/poland-raid/rules.yaml
deleted file mode 100644
index d67ee43efb..0000000000
--- a/mods/ra/maps/poland-raid/rules.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-OILB:
-	CashTrickler:
-		Period: 250
-		Amount: 100
-
-FACT:
-	RevealsShroud:
-		Range: 8c0
diff --git a/mods/ra/maps/pool-party.oramap b/mods/ra/maps/pool-party.oramap
index b24d145f46..7186b7d47a 100644
Binary files a/mods/ra/maps/pool-party.oramap and b/mods/ra/maps/pool-party.oramap differ
diff --git a/mods/ra/maps/pressure.oramap b/mods/ra/maps/pressure.oramap
index 902a308fc9..1bded88b5e 100644
Binary files a/mods/ra/maps/pressure.oramap and b/mods/ra/maps/pressure.oramap differ
diff --git a/mods/ra/maps/puddles-redux.oramap b/mods/ra/maps/puddles-redux.oramap
index b11b6cb0b7..83b4cb817c 100644
Binary files a/mods/ra/maps/puddles-redux.oramap and b/mods/ra/maps/puddles-redux.oramap differ
diff --git a/mods/ra/maps/regeneration-basin.oramap b/mods/ra/maps/regeneration-basin.oramap
index c7a622ecf1..aa8aa182d9 100644
Binary files a/mods/ra/maps/regeneration-basin.oramap and b/mods/ra/maps/regeneration-basin.oramap differ
diff --git a/mods/ra/maps/seaside-2.oramap b/mods/ra/maps/seaside-2.oramap
index 773f90d628..2e45b50f08 100644
Binary files a/mods/ra/maps/seaside-2.oramap and b/mods/ra/maps/seaside-2.oramap differ
diff --git a/mods/ra/maps/snow town/map.bin b/mods/ra/maps/snow town/map.bin
index 7decc8ecd8..28bd31710e 100644
Binary files a/mods/ra/maps/snow town/map.bin and b/mods/ra/maps/snow town/map.bin differ
diff --git a/mods/ra/maps/snow town/map.png b/mods/ra/maps/snow town/map.png
index ab5209ebb7..fa62706ee0 100644
Binary files a/mods/ra/maps/snow town/map.png and b/mods/ra/maps/snow town/map.png differ
diff --git a/mods/ra/maps/snow town/map.yaml b/mods/ra/maps/snow town/map.yaml
index b6e16aca3c..20ed1ecb5a 100644
--- a/mods/ra/maps/snow town/map.yaml	
+++ b/mods/ra/maps/snow town/map.yaml	
@@ -27,6 +27,11 @@ Players:
 		Playable: True
 		Faction: Random
 		Enemies: Creeps
+	PlayerReference@Creeps:
+		Name: Creeps
+		NonCombatant: True
+		Faction: allies
+		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
@@ -52,11 +57,6 @@ Players:
 		Playable: True
 		Faction: Random
 		Enemies: Creeps
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: allies
-		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5
 
 Actors:
 	Actor12: v10
@@ -113,12 +113,12 @@ Actors:
 	Actor7: tc04
 		Location: 54,58
 		Owner: Neutral
-	Actor5: mine
+	Actor241: mine
+		Owner: Neutral
 		Location: 45,48
+	Actor242: mine
 		Owner: Neutral
-	Actor4: mine
 		Location: 106,103
-		Owner: Neutral
 	Actor3: mine
 		Location: 82,79
 		Owner: Neutral
@@ -152,12 +152,9 @@ Actors:
 	Actor9: t05
 		Location: 55,75
 		Owner: Neutral
-	Actor41: mpspawn
-		Location: 104,59
-		Owner: Neutral
-	Actor43: mpspawn
-		Location: 63,103
+	Actor210: mpspawn
 		Owner: Neutral
+		Location: 21,68
 	Actor29: t06
 		Location: 58,61
 		Owner: Neutral
@@ -179,18 +176,6 @@ Actors:
 	Actor48: ice04
 		Location: 18,99
 		Owner: Neutral
-	Actor42: mpspawn
-		Location: 94,91
-		Owner: Neutral
-	Actor40: mpspawn
-		Location: 65,24
-		Owner: Neutral
-	Actor1: mpspawn
-		Location: 21,68
-		Owner: Neutral
-	Actor2: mpspawn
-		Location: 33,36
-		Owner: Neutral
 	Actor39: ice04
 		Location: 98,24
 		Owner: Neutral
@@ -392,9 +377,9 @@ Actors:
 	Actor113: tc05
 		Location: 24,39
 		Owner: Neutral
-	Actor114: tc03
-		Location: 28,44
+	Actor212: t08
 		Owner: Neutral
+		Location: 32,45
 	Actor115: tc01
 		Location: 28,41
 		Owner: Neutral
@@ -422,9 +407,9 @@ Actors:
 	Actor123: t07
 		Location: 34,75
 		Owner: Neutral
-	Actor124: tc04
-		Location: 50,34
+	Actor231: t01
 		Owner: Neutral
+		Location: 58,93
 	Actor125: tc05
 		Location: 53,33
 		Owner: Neutral
@@ -473,18 +458,18 @@ Actors:
 	Actor140: mine
 		Location: 21,48
 		Owner: Neutral
-	Actor141: mine
-		Location: 26,89
+	Actor211: mine
 		Owner: Neutral
-	Actor142: mine
-		Location: 39,108
+		Location: 26,88
+	Actor207: mine
 		Owner: Neutral
+		Location: 40,108
 	Actor143: mine
 		Location: 110,42
 		Owner: Neutral
-	Actor144: mine
-		Location: 84,19
+	Actor202: mine
 		Owner: Neutral
+		Location: 85,19
 	Actor145: tc02
 		Location: 46,92
 		Owner: Neutral
@@ -518,12 +503,12 @@ Actors:
 	Actor155: tc03
 		Location: 90,110
 		Owner: Neutral
-	Actor156: tc03
-		Location: 84,96
+	Actor199: tc01
 		Owner: Neutral
-	Actor157: tc05
-		Location: 86,95
+		Location: 88,94
+	Actor200: tc03
 		Owner: Neutral
+		Location: 88,95
 	Actor158: tc05
 		Location: 90,101
 		Owner: Neutral
@@ -554,9 +539,9 @@ Actors:
 	Actor167: tc04
 		Location: 106,86
 		Owner: Neutral
-	Actor168: tc02
-		Location: 95,85
+	Actor236: tc02
 		Owner: Neutral
+		Location: 95,85
 	Actor169: tc02
 		Location: 100,85
 		Owner: Neutral
@@ -642,13 +627,112 @@ Actors:
 		Location: 74,20
 		Owner: Neutral
 	Actor198: tc02
-		Location: 25,17
 		Owner: Neutral
+		Location: 25,17
 	Actor98: snowhut
 		Location: 58,65
 		Owner: Neutral
 	Actor100: snowhut
 		Location: 75,43
 		Owner: Neutral
+	Actor201: t05
+		Owner: Neutral
+		Location: 86,97
+	Actor203: tc01
+		Owner: Neutral
+		Location: 89,49
+	Actor204: mpspawn
+		Owner: Neutral
+		Location: 33,36
+	Actor205: mpspawn
+		Owner: Neutral
+		Location: 65,24
+	Actor206: mpspawn
+		Owner: Neutral
+		Location: 63,103
+	Actor213: tc01
+		Owner: Neutral
+		Location: 26,16
+	Actor214: tc01
+		Owner: Neutral
+		Location: 36,24
+	Actor215: tc01
+		Owner: Neutral
+		Location: 35,30
+	Actor216: t02
+		Owner: Neutral
+		Location: 37,27
+	Actor217: t02
+		Owner: Neutral
+		Location: 29,15
+	Actor218: t05
+		Owner: Neutral
+		Location: 38,21
+	Actor219: t06
+		Owner: Neutral
+		Location: 38,17
+	Actor220: t06
+		Owner: Neutral
+		Location: 36,16
+	Actor221: t06
+		Owner: Neutral
+		Location: 33,28
+	Actor222: t06
+		Owner: Neutral
+		Location: 33,20
+	Actor223: t06
+		Owner: Neutral
+		Location: 38,23
+	Actor224: t06
+		Owner: Neutral
+		Location: 30,42
+	Actor225: tc01
+		Owner: Neutral
+		Location: 20,39
+	Actor226: t05
+		Owner: Neutral
+		Location: 17,40
+	Actor227: tc01
+		Owner: Neutral
+		Location: 15,38
+	Actor228: t06
+		Owner: Neutral
+		Location: 55,35
+	Actor229: t07
+		Owner: Neutral
+		Location: 53,34
+	Actor230: tc04
+		Owner: Neutral
+		Location: 50,34
+	Actor232: t06
+		Owner: Neutral
+		Location: 65,93
+	Actor233: t06
+		Owner: Neutral
+		Location: 47,93
+	Actor234: tc01
+		Owner: Neutral
+		Location: 111,85
+	Actor235: t01
+		Owner: Neutral
+		Location: 95,84
+	Actor237: tc04
+		Owner: Neutral
+		Location: 29,110
+	Actor238: tc01
+		Owner: Neutral
+		Location: 32,108
+	Actor239: t01
+		Owner: Neutral
+		Location: 32,109
+	Actor240: t01
+		Owner: Neutral
+		Location: 35,105
+	Actor245: mpspawn
+		Owner: Neutral
+		Location: 94,92
+	Actor244: mpspawn
+		Owner: Neutral
+		Location: 104,59
 
-Rules: rules.yaml
+Rules: rules.yaml
\ No newline at end of file
diff --git a/mods/ra/maps/snowy-island.oramap b/mods/ra/maps/snowy-island.oramap
index c40343114c..6fbcdd4cc3 100644
Binary files a/mods/ra/maps/snowy-island.oramap and b/mods/ra/maps/snowy-island.oramap differ
diff --git a/mods/ra/maps/sunstroke.oramap b/mods/ra/maps/sunstroke.oramap
index e95d987b6f..eb21bb2d61 100644
Binary files a/mods/ra/maps/sunstroke.oramap and b/mods/ra/maps/sunstroke.oramap differ
diff --git a/mods/ra/maps/synergy.oramap b/mods/ra/maps/synergy.oramap
index 755ed4809c..995ee0d704 100644
Binary files a/mods/ra/maps/synergy.oramap and b/mods/ra/maps/synergy.oramap differ
diff --git a/mods/ra/maps/tabula-rasa.oramap b/mods/ra/maps/tabula-rasa.oramap
index 45a8c8864c..c8c064deb3 100644
Binary files a/mods/ra/maps/tabula-rasa.oramap and b/mods/ra/maps/tabula-rasa.oramap differ
diff --git a/mods/ra/maps/tainted-peak.oramap b/mods/ra/maps/tainted-peak.oramap
index 768ab74fec..1da58b2913 100644
Binary files a/mods/ra/maps/tainted-peak.oramap and b/mods/ra/maps/tainted-peak.oramap differ
diff --git a/mods/ra/maps/tournament-island.oramap b/mods/ra/maps/tournament-island.oramap
index 61b9ecc378..fa685fca05 100644
Binary files a/mods/ra/maps/tournament-island.oramap and b/mods/ra/maps/tournament-island.oramap differ
diff --git a/mods/ra/maps/vegetation.oramap b/mods/ra/maps/vegetation.oramap
index 4aca15baba..1f374b2499 100644
Binary files a/mods/ra/maps/vegetation.oramap and b/mods/ra/maps/vegetation.oramap differ
diff --git a/mods/ra/maps/warwind.oramap b/mods/ra/maps/warwind.oramap
index b0583645e4..0d8944c77d 100644
Binary files a/mods/ra/maps/warwind.oramap and b/mods/ra/maps/warwind.oramap differ