Merge pull request #12540 from reaperrr/takeovers/minelayer-merge

Merge RA minelayers
2017-01-21 19:51:29 +01:00
parent 85053d8d59 8f685ee849
commit e5dda218ea
15 changed files with 37 additions and 97 deletions
--- a/mods/ra/maps/allies-03a/rules.yaml
+++ b/mods/ra/maps/allies-03a/rules.yaml
@@ -138,7 +138,7 @@ MCV:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/allies-05a/rules.yaml
+++ b/mods/ra/maps/allies-05a/rules.yaml
@@ -161,7 +161,7 @@ MCV:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/evacuation/rules.yaml
+++ b/mods/ra/maps/evacuation/rules.yaml
@@ -152,11 +152,7 @@ APC:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
-	Buildable:
-		Prerequisites: ~disabled
-
-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/exodus/rules.yaml
+++ b/mods/ra/maps/exodus/rules.yaml
@@ -138,11 +138,7 @@ APC:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
-	Buildable:
-		Prerequisites: ~disabled
-
-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/infiltration/rules.yaml
+++ b/mods/ra/maps/infiltration/rules.yaml
@@ -189,11 +189,7 @@ APC:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
-	Buildable:
-		Prerequisites: ~disabled
-
-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/intervention/rules.yaml
+++ b/mods/ra/maps/intervention/rules.yaml
@@ -159,11 +159,7 @@ MGG:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AT:
-	Buildable:
-		Prerequisites: ~disabled
-
-MNLY.AP:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/monster-tank-madness/rules.yaml
+++ b/mods/ra/maps/monster-tank-madness/rules.yaml
@@ -212,11 +212,7 @@ MCV:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
-	Buildable:
-		Prerequisites: ~disabled
-
-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/soviet-05/map.yaml
+++ b/mods/ra/maps/soviet-05/map.yaml
@@ -405,7 +405,7 @@ Actors:
 		SubCell: 1
 		Facing: 96
 		TurretFacing: 192
-	Minelayer: mnly.at
+	Minelayer: mnly
 		Owner: GoodGuy
 		Location: 67,45
 		Facing: 92
--- a/mods/ra/maps/soviet-06a/rules.yaml
+++ b/mods/ra/maps/soviet-06a/rules.yaml
@@ -142,7 +142,7 @@ GAP:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/soviet-06b/rules.yaml
+++ b/mods/ra/maps/soviet-06b/rules.yaml
@@ -142,7 +142,7 @@ GAP:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/survival01/rules.yaml
+++ b/mods/ra/maps/survival01/rules.yaml
@@ -104,11 +104,7 @@ MCV:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
-	Buildable:
-		Prerequisites: ~disabled
-
-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/survival02/rules.yaml
+++ b/mods/ra/maps/survival02/rules.yaml
@@ -82,11 +82,7 @@ MCV:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
-	Buildable:
-		Prerequisites: ~disabled
-
-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled

--- a/mods/ra/maps/training-camp/rules.yaml
+++ b/mods/ra/maps/training-camp/rules.yaml
@@ -252,11 +252,7 @@ MCV:
 	Buildable:
 		Prerequisites: ~disabled

-MNLY.AP:
-	Buildable:
-		Prerequisites: ~disabled
-
-MNLY.AT:
+MNLY:
 	Buildable:
 		Prerequisites: ~disabled