From 508038e3f3b96d301c3898dbc6887906b7ffa30b Mon Sep 17 00:00:00 2001 From: roundowl Date: Tue, 1 Nov 2016 19:20:44 +0300 Subject: [PATCH] Merges minelayers into single unit placing AT mines AP minelayer is removed, AT minelayer is made generic and available to both factions. BuildPaletteOrder is pushed up to remove gap. I didn't remove AP mine from weapons and explosions, because graphics are still there and may be used in future. --- mods/ra/maps/allies-03a/rules.yaml | 2 +- mods/ra/maps/allies-05a/rules.yaml | 2 +- mods/ra/maps/evacuation/rules.yaml | 6 +- mods/ra/maps/exodus/rules.yaml | 6 +- mods/ra/maps/infiltration/rules.yaml | 6 +- mods/ra/maps/intervention/rules.yaml | 6 +- mods/ra/maps/monster-tank-madness/rules.yaml | 6 +- mods/ra/maps/soviet-05/map.yaml | 2 +- mods/ra/maps/soviet-06a/rules.yaml | 2 +- mods/ra/maps/soviet-06b/rules.yaml | 2 +- mods/ra/maps/survival01/rules.yaml | 6 +- mods/ra/maps/survival02/rules.yaml | 6 +- mods/ra/maps/training-camp/rules.yaml | 6 +- mods/ra/rules/vehicles.yaml | 59 ++++---------------- 14 files changed, 25 insertions(+), 92 deletions(-) diff --git a/mods/ra/maps/allies-03a/rules.yaml b/mods/ra/maps/allies-03a/rules.yaml index 308bad527b..21570e38fb 100644 --- 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 diff --git a/mods/ra/maps/allies-05a/rules.yaml b/mods/ra/maps/allies-05a/rules.yaml index f9af9a6894..c07d269ff7 100644 --- 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 diff --git a/mods/ra/maps/evacuation/rules.yaml b/mods/ra/maps/evacuation/rules.yaml index 0734818db8..598aeb90af 100644 --- 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 diff --git a/mods/ra/maps/exodus/rules.yaml b/mods/ra/maps/exodus/rules.yaml index 1522bfbbad..4b60d0e24c 100644 --- 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 diff --git a/mods/ra/maps/infiltration/rules.yaml b/mods/ra/maps/infiltration/rules.yaml index 402ec85ca9..2e9f56a035 100644 --- 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 diff --git a/mods/ra/maps/intervention/rules.yaml b/mods/ra/maps/intervention/rules.yaml index 53007debae..5cc41c6ca6 100644 --- 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 diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index 74ffd63f35..6345be53b9 100644 --- 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 diff --git a/mods/ra/maps/soviet-05/map.yaml b/mods/ra/maps/soviet-05/map.yaml index 9eb1e06c75..771cc37fde 100644 --- 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 diff --git a/mods/ra/maps/soviet-06a/rules.yaml b/mods/ra/maps/soviet-06a/rules.yaml index 574f05d567..2368ed4ae5 100644 --- 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 diff --git a/mods/ra/maps/soviet-06b/rules.yaml b/mods/ra/maps/soviet-06b/rules.yaml index 5c15934db0..b7968d374d 100644 --- 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 diff --git a/mods/ra/maps/survival01/rules.yaml b/mods/ra/maps/survival01/rules.yaml index a0d5669910..78f84b1d83 100644 --- 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 diff --git a/mods/ra/maps/survival02/rules.yaml b/mods/ra/maps/survival02/rules.yaml index 67e33bd700..0c5e0095db 100644 --- 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 diff --git a/mods/ra/maps/training-camp/rules.yaml b/mods/ra/maps/training-camp/rules.yaml index c5d0f2fe1a..3df327b505 100644 --- 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 diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index afec84f2b2..9d89f79194 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -72,7 +72,7 @@ V2RL: Inherits: ^Tank Buildable: Queue: Vehicle - BuildPaletteOrder: 120 + BuildPaletteOrder: 110 Prerequisites: fix, ~vehicles.allies, ~techlevel.medium Description: Allied Main Battle Tank.\n Strong vs Vehicles\n Weak vs Infantry, Aircraft Valued: @@ -111,7 +111,7 @@ V2RL: Inherits: ^Tank Buildable: Queue: Vehicle - BuildPaletteOrder: 130 + BuildPaletteOrder: 120 Prerequisites: fix, ~vehicles.soviet, ~techlevel.medium Description: Soviet Main Battle Tank, with dual cannons\n Strong vs Vehicles\n Weak vs Infantry, Aircraft Valued: @@ -150,7 +150,7 @@ V2RL: Inherits: ^Tank Buildable: Queue: Vehicle - BuildPaletteOrder: 190 + BuildPaletteOrder: 180 Prerequisites: fix, stek, ~vehicles.soviet, ~techlevel.high BuildDuration: 2500 BuildDurationModifier: 40 @@ -395,47 +395,12 @@ APC: ProducibleWithLevel: Prerequisites: vehicles.upgraded -MNLY.AP: - Inherits: ^Tank - Buildable: - Queue: Vehicle - BuildPaletteOrder: 110 - Prerequisites: fix, ~vehicles.soviet, ~techlevel.medium - Description: Lays mines to destroy\nunwary enemy units.\nCan detect mines.\n Unarmed - Valued: - Cost: 800 - Tooltip: - Name: Minelayer - Health: - HP: 150 - Armor: - Type: Heavy - Mobile: - Speed: 128 - Crushes: wall, mine, crate, infantry - RevealsShroud: - Range: 5c0 - Minelayer: - Mine: MINP - MineImmune: - AmmoPool: - Ammo: 5 - RearmSound: minelay1.aud - DetectCloaked: - Range: 5c0 - CloakTypes: Mine - RenderDetectionCircle: - Explodes: - Weapon: APMine - RenderSprites: - Image: MNLY - -MNLY.AT: +MNLY: Inherits: ^Tank Buildable: Queue: Vehicle BuildPaletteOrder: 100 - Prerequisites: fix, ~vehicles.allies, ~techlevel.medium + Prerequisites: fix, ~techlevel.medium Description: Lays mines to destroy\nunwary enemy units.\nCan detect mines.\n Unarmed Valued: Cost: 800 @@ -494,7 +459,7 @@ MGG: Inherits: ^Vehicle Buildable: Queue: Vehicle - BuildPaletteOrder: 160 + BuildPaletteOrder: 150 Prerequisites: atek, ~vehicles.france, ~techlevel.high Description: Regenerates the shroud nearby, \nobscuring the area.\n Unarmed Valued: @@ -526,7 +491,7 @@ MRJ: Name: Mobile Radar Jammer Buildable: Queue: Vehicle - BuildPaletteOrder: 150 + BuildPaletteOrder: 140 Prerequisites: atek, ~vehicles.allies, ~techlevel.high Description: Jams nearby enemy radar domes\nand deflects incoming missiles.\nCan detect cloaked units.\n Unarmed Health: @@ -553,7 +518,7 @@ TTNK: Inherits: ^Tank Buildable: Queue: Vehicle - BuildPaletteOrder: 180 + BuildPaletteOrder: 170 Prerequisites: tsla, stek, ~vehicles.russia, ~techlevel.high Description: Tank with mounted tesla coil.\n Strong vs Infantry, Vehicles, Buildings\n Weak vs Aircraft Valued: @@ -628,7 +593,7 @@ DTRK: Inherits: ^Vehicle Buildable: Queue: Vehicle - BuildPaletteOrder: 170 + BuildPaletteOrder: 160 Prerequisites: stek, ~vehicles.ukraine, ~techlevel.high Description: Demolition Truck, actively armed with\nnuclear explosives. Has very weak armor. Valued: @@ -657,7 +622,7 @@ CTNK: Inherits: ^Vehicle Buildable: Queue: Vehicle - BuildPaletteOrder: 210 + BuildPaletteOrder: 200 Prerequisites: atek, ~vehicles.germany, ~techlevel.high Description: Chrono Tank, teleports to areas within range.\n Strong vs Vehicles, Buildings\n Weak vs Infantry, Aircraft\n Special ability: Can teleport Valued: @@ -694,7 +659,7 @@ QTNK: Inherits: ^Tank Buildable: Queue: Vehicle - BuildPaletteOrder: 200 + BuildPaletteOrder: 190 Prerequisites: fix, stek, ~vehicles.soviet, ~techlevel.high Description: Deals seismic damage to nearby vehicles\nand structures.\n Strong vs Vehicles, Buildings\n Weak vs Infantry, Aircraft Valued: @@ -721,7 +686,7 @@ STNK: Inherits: ^Vehicle Buildable: Queue: Vehicle - BuildPaletteOrder: 140 + BuildPaletteOrder: 130 Prerequisites: atek, ~vehicles.england, ~techlevel.high Description: Lightly armored infantry transport\nwhich can cloak. Can detect cloaked units.\n Strong vs Light armor\n Weak vs Infantry, Tanks, Aircraft Valued: