diff --git a/mods/ra/bits/armordropicon.shp b/mods/ra/bits/armordropicon.shp deleted file mode 100644 index c8002e8f7e..0000000000 Binary files a/mods/ra/bits/armordropicon.shp and /dev/null differ diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml index 19aea2974c..9498ddbe5a 100644 --- a/mods/ra/maps/survival01/map.yaml +++ b/mods/ra/maps/survival01/map.yaml @@ -1267,7 +1267,6 @@ Rules: Inherits: AFLD -AirstrikePower@spyplane: -ParatroopersPower@paratroopers: - -ParatroopersPower@armordrop: -AirstrikePower@parabombs: -SupportPowerChargeBar: RenderBuilding: diff --git a/mods/ra/rules/fakes.yaml b/mods/ra/rules/fakes.yaml index d89b656c6b..9d39c1e6f3 100644 --- a/mods/ra/rules/fakes.yaml +++ b/mods/ra/rules/fakes.yaml @@ -3,7 +3,7 @@ FACF: Buildable: BuildPaletteOrder: 940 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.medium + Prerequisites: ~structures.france, ~techlevel.medium Tooltip: Icon: fake-icon Name: Fake Construction Yard @@ -24,7 +24,7 @@ WEAF: Inherits: ^FakeBuilding Buildable: BuildPaletteOrder: 920 - Prerequisites: ~structures.alliesvanilla, ~techlevel.medium + Prerequisites: ~structures.france, ~techlevel.medium Queue: Defense Tooltip: Icon: fake-icon @@ -48,7 +48,7 @@ SYRF: Buildable: BuildPaletteOrder: 900 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.medium + Prerequisites: ~structures.france, ~techlevel.medium Tooltip: Icon: fake-icon Name: Fake Shipyard @@ -105,7 +105,7 @@ DOMF: Buildable: BuildPaletteOrder: 930 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.medium + Prerequisites: ~structures.france, ~techlevel.medium Building: Footprint: xx xx Dimensions: 2,2 @@ -127,7 +127,7 @@ ATEF: Buildable: BuildPaletteOrder: 940 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.unrestricted + Prerequisites: ~structures.france, ~techlevel.unrestricted Building: Footprint: xx xx Dimensions: 2,2 @@ -149,7 +149,8 @@ PDOF: Buildable: BuildPaletteOrder: 950 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.unrestricted + Prerequisites: ~structures.france, ~techlevel.unrestricted + BuildLimit: 1 Building: Footprint: xx xx Dimensions: 2,2 @@ -172,7 +173,8 @@ MSLF: Buildable: BuildPaletteOrder: 960 Queue: Defense - Prerequisites: ~structures.alliesvanilla, ~techlevel.unrestricted + Prerequisites: ~structures.france, ~techlevel.unrestricted + BuildLimit: 1 Building: Footprint: xx Dimensions: 2,1 diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 6fa3e1b41e..07c257071c 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -462,7 +462,7 @@ SHOK: Queue: Infantry BuildAtProductionType: Soldier BuildPaletteOrder: 130 - Prerequisites: ~barr, stek, tsla, ~techlevel.unrestricted + Prerequisites: ~barr, stek, tsla, ~infantry.russia, ~techlevel.unrestricted Valued: Cost: 400 Tooltip: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index e960f383d7..143b4be212 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -42,7 +42,7 @@ MSLO: DisabledOverlay: SupportPowerChargeBar: Power: - Amount: -100 + Amount: -150 MustBeDestroyed: RequiredForShortGame: false @@ -56,7 +56,7 @@ GAP: Buildable: Queue: Defense BuildPaletteOrder: 110 - Prerequisites: atek, ~!structures.france, ~structures.allies, ~techlevel.unrestricted + Prerequisites: atek, ~structures.allies, ~techlevel.unrestricted Building: Footprint: _ x Dimensions: 1,2 @@ -81,19 +81,6 @@ GAP: MustBeDestroyed: RequiredForShortGame: false -GAP.France: - Inherits: GAP - RenderBuilding: - Image: gap - Tooltip: - Name: Advanced Gap Generator - Buildable: - Prerequisites: atek, ~structures.france, ~techlevel.unrestricted - RevealsShroud: - Range: 10c0 - CreatesShroud: - Range: 10c0 - SPEN: Inherits: ^Building InfiltrateForSupportPower: @@ -410,7 +397,7 @@ TSLA: -AcceptsSupplies: DrawLineToTarget: Power: - Amount: -150 + Amount: -100 DetectCloaked: Range: 8 @@ -1129,7 +1116,7 @@ AFLD: BeaconPoster: camicon ParatroopersPower@paratroopers: OrderName: SovietParatroopers - Prerequisites: aircraft.sovietvanilla + Prerequisites: aircraft.soviet Icon: paratroopers ChargeTime: 360 Description: Paratroopers @@ -1141,28 +1128,13 @@ AFLD: CameraActor: camera.paradrop DisplayBeacon: true BeaconPoster: pinficon - ParatroopersPower@armordrop: - OrderName: RussiaArmorDrop - Prerequisites: aircraft.russia - Icon: armordrop - ChargeTime: 450 - Description: Armor Airdrop - LongDesc: Badgers drop a pair of\nHeavy Tanks anywhere on the map. - DropItems: 3TNK,3TNK - SquadSize: 2 - SelectTargetSound: slcttgt1.aud - AllowImpassableCells: false - QuantizedFacings: 8 - CameraActor: camera.paradrop - DisplayBeacon: true - BeaconPoster: armordropicon AirstrikePower@parabombs: OrderName: UkraineParabombs Prerequisites: aircraft.ukraine Icon: parabombs - ChargeTime: 270 + ChargeTime: 360 Description: Parabombs - LongDesc: A Badger drops a load of parachuted\nbombs on your target. + LongDesc: A squad of Badgers drops parachuted\nbombs on your target. SelectTargetSound: slcttgt1.aud CameraActor: camera CameraRemoveDelay: 150 @@ -1170,6 +1142,8 @@ AFLD: QuantizedFacings: 8 DisplayBeacon: true BeaconPoster: pbmbicon + SquadSize: 3 + SquadOffset: 1792,1792,0 ProductionBar: SupportPowerChargeBar: PrimaryBuilding: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index d43db333be..07d661a39b 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -564,7 +564,7 @@ TTNK: Buildable: Queue: Vehicle BuildPaletteOrder: 180 - Prerequisites: tsla, stek, ~vehicles.soviet, ~techlevel.unrestricted + Prerequisites: tsla, stek, ~vehicles.russia, ~techlevel.unrestricted Valued: Cost: 1350 Tooltip: @@ -706,7 +706,7 @@ QTNK: Buildable: Queue: Vehicle BuildPaletteOrder: 200 - Prerequisites: fix, stek, ~vehicles.russia, ~techlevel.unrestricted + Prerequisites: fix, stek, ~vehicles.soviet, ~techlevel.unrestricted Valued: Cost: 2000 Tooltip: diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 409f8062f5..b0743276f5 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -95,7 +95,7 @@ World: Name: Allies Race: allies Side: Allies - Description: Allies: Deception\nSpecial Ability: Can build fake structures + Selectable: False Country@1: Name: England Race: england @@ -105,7 +105,7 @@ World: Name: France Race: france Side: Allies - Description: France: Concealment\nSpecial Structure: Advanced Gap Generator\nSpecial Unit: Mobile Gap Generator + Description: France: Deception\nSpecial Ability: Can build fake structures\nSpecial Unit: Mobile Gap Generator Country@3: Name: Germany Race: germany @@ -115,12 +115,12 @@ World: Name: Soviet Race: soviet Side: Soviet - Description: Soviet: Infantry\nSpecial Ability: Paradrop + Selectable: False Country@5: Name: Russia Race: russia Side: Soviet - Description: Russia: Tanks\nSpecial Ability: Armor Airdrop\nSpecial Unit: MAD Tank + Description: Russia: Tesla Weapons\nSpecial Unit: Tesla Tank\nSpecial Unit: Shock Trooper Country@6: Name: Ukraine Race: ukraine @@ -133,15 +133,15 @@ World: Side: Random Description: A random country. Country@randomallies: - Name: Allied + Name: Allies Race: RandomAllies - RandomRaceMembers: allies, england, france, germany + RandomRaceMembers: england, france, germany Side: Random Description: A random Allied country. Country@randomsoviet: Name: Soviet Race: RandomSoviet - RandomRaceMembers: soviet, russia, ukraine + RandomRaceMembers: russia, ukraine Side: Random Description: A random Soviet country. DomainIndex: diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index 9a28b9fa15..81d364686e 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -114,9 +114,6 @@ beacon: pinficon: lores-pinficon Length: * Offset: 0,-42 - armordropicon: lores-pinficon - Length: * - Offset: 0,-42 clock: beaconclock Length: * Offset: 0,-42 @@ -426,7 +423,6 @@ icon: chrono: warpicon spyplane: smigicon paratroopers: pinficon - armordrop: armordropicon gps: gpssicon parabombs: pbmbicon sonar: sonricon