epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge the RA aircraft queues. Closes #5961.

Browse Source
This commit is contained in:
Paul Chote
2014-07-15 15:14:01 +12:00
parent c164ec8c8c
commit 90d310690b
4 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mods/ra/chrome.yaml
View File

@@ -77,15 +77,13 @@ tabs-selected: tabs.png
allies-Defense: 0,40,27,41
allies-Infantry: 0,80,27,41
allies-Vehicle: 0,120,27,41
allies-Plane: 162,200,27,41
allies-Helicopter: 0,160,27,41
allies-Aircraft: 162,200,27,41
allies-Ship: 0,200,27,41
soviet-Building: 81,0,27,41
soviet-Defense: 81,40,27,41
soviet-Infantry: 81,80,27,41
soviet-Vehicle: 81,120,27,41
soviet-Plane: 81,160,27,41
soviet-Helicopter: 162,80,27,41
soviet-Aircraft: 81,160,27,41
soviet-Ship: 81,200,27,41
tabs-ready: tabs.png
@@ -93,15 +91,13 @@ tabs-ready: tabs.png
allies-Defense: 27,40,27,41
allies-Infantry: 27,80,27,41
allies-Vehicle: 27,120,27,41
allies-Plane: 162,160,27,41
allies-Helicopter: 27,160,27,41
allies-Aircraft: 162,160,27,41
allies-Ship: 27,200,27,41
soviet-Building: 108,0,27,41
soviet-Defense: 108,40,27,41
soviet-Infantry: 108,80,27,41
soviet-Vehicle: 108,120,27,41
soviet-Plane: 108,160,27,41
soviet-Helicopter: 162,40,27,41
soviet-Aircraft: 108,160,27,41
soviet-Ship: 108,200,27,41
tabs-normal: tabs.png
@@ -109,15 +105,13 @@ tabs-normal: tabs.png
allies-Defense: 54,40,27,41
allies-Infantry: 54,80,27,41
allies-Vehicle: 54,120,27,41
allies-Plane: 162,120,27,41
allies-Helicopter: 54,160,27,41
allies-Aircraft: 162,120,27,41
allies-Ship: 54,200,27,41
soviet-Building: 135,0,27,41
soviet-Defense: 135,40,27,41
soviet-Infantry: 135,80,27,41
soviet-Vehicle: 135,120,27,41
soviet-Plane: 135,160,27,41
soviet-Helicopter: 162,0,27,41
soviet-Aircraft: 135,160,27,41
soviet-Ship: 135,200,27,41
# Used for the menu

25
mods/ra/rules/aircraft.yaml
View File

@@ -75,9 +75,10 @@ BADR.Bomber:
MIG:
Inherits: ^Plane
Buildable:
Queue: Plane
Queue: Aircraft
BuildAtProductionType: Plane
BuildPaletteOrder: 50
Prerequisites: afld, stek, ~techlevel.unrestricted
Prerequisites: ~afld, stek, ~techlevel.unrestricted
Hotkey: m
Valued:
Cost: 2000
@@ -127,9 +128,10 @@ MIG:
YAK:
Inherits: ^Plane
Buildable:
Queue: Plane
Queue: Aircraft
BuildAtProductionType: Plane
BuildPaletteOrder: 30
Prerequisites: afld, ~techlevel.medium
Prerequisites: ~afld, ~techlevel.medium
Hotkey: y
Valued:
Cost: 1000
@@ -185,9 +187,10 @@ YAK:
TRAN:
Inherits: ^Helicopter
Buildable:
Queue: Helicopter
Queue: Aircraft
BuildAtProductionType: Helicopter
BuildPaletteOrder: 10
Prerequisites: hpad, ~techlevel.medium
Prerequisites: ~hpad, ~techlevel.medium
Hotkey: t
Valued:
Cost: 900
@@ -227,9 +230,10 @@ TRAN:
HELI:
Inherits: ^Helicopter
Buildable:
Queue: Helicopter
Queue: Aircraft
BuildAtProductionType: Helicopter
BuildPaletteOrder: 40
Prerequisites: hpad, atek, ~techlevel.unrestricted
Prerequisites: ~hpad, atek, ~techlevel.unrestricted
Hotkey: l
Valued:
Cost: 2000
@@ -277,9 +281,10 @@ HELI:
HIND:
Inherits: ^Helicopter
Buildable:
Queue: Helicopter
Queue: Aircraft
BuildAtProductionType: Helicopter
BuildPaletteOrder: 20
Prerequisites: hpad, ~techlevel.medium
Prerequisites: ~hpad, ~techlevel.medium
Hotkey: h
Valued:
Cost: 1000

10
mods/ra/rules/player.yaml
View File

@@ -34,14 +34,8 @@ Player:
LowPowerSlowdown: 3
SpeedUp: True
RequireOwner: false
ClassicProductionQueue@Plane:
Type: Plane
BuildSpeed: .4
LowPowerSlowdown: 3
SpeedUp: True
RequireOwner: false
ClassicProductionQueue@Helicopter:
Type: Helicopter
ClassicProductionQueue@Aircraft:
Type: Aircraft
BuildSpeed: .4
LowPowerSlowdown: 3
SpeedUp: True

4
mods/ra/rules/structures.yaml
View File

@@ -858,7 +858,7 @@ HPAD:
MoveIntoWorld: false
RallyPoint:
Production:
Produces: Helicopter
Produces: Aircraft, Helicopter
Reservable:
IronCurtainable:
ProductionBar:
@@ -893,7 +893,7 @@ AFLD:
MoveIntoWorld: false
RallyPoint:
Production:
Produces: Plane
Produces: Aircraft, Plane
Reservable:
IronCurtainable:
AirstrikePower: