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

Merge pull request #9054 from penev92/bleed_aircraft

Browse Source 
Merge Plane and Helicopter traits
This commit is contained in:
reaperrr
2015-10-03 01:52:30 +02:00
parent 22183fd5c7 0ee38de4bb
commit 2ae0694385
39 changed files with 527 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mods/cnc/rules/aircraft.yaml
View File

@@ -9,14 +9,13 @@ TRAN:
BuildPaletteOrder: 10
Prerequisites: hpad
Queue: Aircraft.GDI, Aircraft.Nod
Helicopter:
Aircraft:
LandWhenIdle: true
ROT: 5
Speed: 140
InitialFacing: 0
LandableTerrainTypes: Clear,Rough,Road,Ore,Beach,Tiberium,BlueTiberium
AltitudeVelocity: 0c100
AirborneUpgrades: airborne
Health:
HP: 90
Armor:
@@ -53,11 +52,10 @@ HELI:
BuildPaletteOrder: 20
Prerequisites: hpad, anyhq, ~techlevel.medium
Queue: Aircraft.Nod
Helicopter:
Aircraft:
RearmBuildings: hpad
ROT: 4
Speed: 186
AirborneUpgrades: airborne
Health:
HP: 125
Armor:
@@ -105,11 +103,10 @@ ORCA:
BuildPaletteOrder: 20
Prerequisites: hpad, anyhq, ~techlevel.medium
Queue: Aircraft.GDI
Helicopter:
Aircraft:
RearmBuildings: hpad
ROT: 4
Speed: 186
AirborneUpgrades: airborne
Health:
HP: 90
Armor:
@@ -151,7 +148,7 @@ C17:
Description: Drops vehicle reinforcements on Airstrips
Valued:
Cost: 2000
Plane:
Aircraft:
ROT: 5
Speed: 326
Repulsable: False
@@ -188,7 +185,7 @@ A10:
Description: Used to deliver air strikes.
Valued:
Cost: 2000
Plane:
Aircraft:
ROT: 4
Speed: 373
Repulsable: False
@@ -221,10 +218,9 @@ TRAN.Husk:
Inherits: ^HelicopterHusk
Tooltip:
Name: Chinook Transport
Helicopter:
Aircraft:
ROT: 5
Speed: 140
AirborneUpgrades: airborne
RevealsShroud:
Range: 8c0
Type: CenterPosition
@@ -239,10 +235,9 @@ HELI.Husk:
Inherits: ^HelicopterHusk
Tooltip:
Name: Apache Longbow
Helicopter:
Aircraft:
ROT: 4
Speed: 186
AirborneUpgrades: airborne
RevealsShroud:
Range: 10c0
Type: CenterPosition
@@ -255,10 +250,9 @@ ORCA.Husk:
Inherits: ^HelicopterHusk
Tooltip:
Name: Orca
Helicopter:
Aircraft:
ROT: 4
Speed: 186
AirborneUpgrades: airborne
RevealsShroud:
Range: 10c0
Type: CenterPosition

6
mods/cnc/rules/defaults.yaml
View File

@@ -131,11 +131,12 @@
SelectionDecorations:
Selectable:
Bounds: 24,24
Helicopter:
Aircraft:
RepairBuildings: hpad
RearmBuildings:
LandWhenIdle: false
AirborneUpgrades: airborne
CanHover: True
HiddenUnderFog:
Type: CenterPosition
ActorLostNotification:
@@ -664,6 +665,9 @@
^HelicopterHusk:
Inherits: ^CommonHuskDefaults
WithShadow:
Aircraft:
AirborneUpgrades: airborne
CanHover: True
FallsToEarth:
Spins: True
Moves: False

14
mods/d2k/rules/aircraft.yaml
View File

@@ -9,7 +9,7 @@ carryall.reinforce:
HP: 4800
Armor:
Type: light
Helicopter:
Aircraft:
CruiseAltitude: 2100
InitialFacing: 0
ROT: 4
@@ -21,6 +21,7 @@ carryall.reinforce:
LandAltitude: 100
LandWhenIdle: False
AirborneUpgrades: airborne
CanHover: True
Targetable@GROUND:
TargetTypes: Ground, Vehicle
UpgradeTypes: airborne
@@ -51,7 +52,7 @@ frigate:
Tooltip:
Name: Frigate
Description: Supply spacecraft
Plane:
Aircraft:
ROT: 1
Speed: 126
RepairBuildings: repair_pad
@@ -66,7 +67,6 @@ frigate:
ornithopter:
Inherits: ^Plane
Targetable:
TargetTypes: Air
AttackBomber:
Armament:
@@ -75,12 +75,13 @@ ornithopter:
HP: 900
Armor:
Type: light
Plane:
Aircraft:
ROT: 2
Speed: 189
RepairBuildings:
RearmBuildings:
Repulsable: False
CanHover: True
AmmoPool:
Ammo: 5
Tooltip:
@@ -93,7 +94,7 @@ ornithopter.husk:
Inherits: ^AircraftHusk
Tooltip:
Name: Ornithopter
Plane:
Aircraft:
ROT: 5
Speed: 189
RepairBuildings:
@@ -105,11 +106,12 @@ carryall.husk:
Inherits: ^AircraftHusk
Tooltip:
Name: Carryall
Helicopter:
Aircraft:
ROT: 4
Speed: 112
RepairBuildings:
RearmBuildings:
CanHover: True
RenderSprites:
Image: carryall

2
mods/d2k/rules/misc.yaml
View File

@@ -131,7 +131,7 @@ waypoint:
^carryall.colorpicker:
Inherits: carryall
Helicopter:
Aircraft:
InitialFacing: 104
RenderSprites:
Image: carryall

2
mods/ra/maps/fort-lonestar/map.yaml
View File

@@ -719,7 +719,7 @@ Rules:
HP: 60
Armor:
Type: Light
Plane:
Aircraft:
ROT: 5
Speed: 280
AmmoPool:

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

@@ -6,7 +6,7 @@ BADR:
HP: 300
Armor:
Type: Light
Plane:
Aircraft:
CruiseAltitude: 2560
ROT: 5
Speed: 149
@@ -44,7 +44,7 @@ BADR.Bomber:
HP: 300
Armor:
Type: Light
Plane:
Aircraft:
CruiseAltitude: 2560
ROT: 5
Speed: 149
@@ -100,7 +100,7 @@ MIG:
LocalYaw: -40, 24
AttackPlane:
FacingTolerance: 20
Plane:
Aircraft:
CruiseAltitude: 2560
InitialFacing: 192
ROT: 4
@@ -162,7 +162,7 @@ YAK:
MuzzleSequence: muzzle
AttackPlane:
FacingTolerance: 20
Plane:
Aircraft:
CruiseAltitude: 2560
RearmBuildings: afld
InitialFacing: 192
@@ -212,7 +212,7 @@ TRAN:
RevealsShroud:
Range: 12c0
Type: CenterPosition
Helicopter:
Aircraft:
RearmBuildings: hpad
InitialFacing: 0
ROT: 5
@@ -220,6 +220,7 @@ TRAN:
LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
AltitudeVelocity: 0c100
AirborneUpgrades: airborne
CanHover: True
WithRotor@PRIMARY:
Offset: -597,0,341
Sequence: rotor2
@@ -260,13 +261,14 @@ HELI:
LocalOffset: 0,213,-85
AttackHeli:
FacingTolerance: 20
Helicopter:
Aircraft:
RearmBuildings: hpad
LandWhenIdle: false
InitialFacing: 20
ROT: 4
Speed: 149
AirborneUpgrades: airborne
CanHover: True
AutoTarget:
InitialStance: HoldFire
WithRotor:
@@ -312,13 +314,14 @@ HIND:
MuzzleSequence: muzzle
AttackHeli:
FacingTolerance: 20
Helicopter:
Aircraft:
RearmBuildings: hpad
LandWhenIdle: false
InitialFacing: 20
ROT: 4
Speed: 112
AirborneUpgrades: airborne
CanHover: True
AutoTarget:
InitialStance: HoldFire
WithRotor:
@@ -342,7 +345,7 @@ U2:
HP: 2000
Armor:
Type: Heavy
Plane:
Aircraft:
CruiseAltitude: 2560
ROT: 7
Speed: 373

17
mods/ra/rules/husks.yaml
View File

@@ -85,10 +85,11 @@ TRAN.Husk:
Inherits: ^HelicopterHusk
Tooltip:
Name: Transport Helicopter
Helicopter:
Aircraft:
ROT: 4
Speed: 149
AirborneUpgrades: airborne
CanHover: True
WithRotor@PRIMARY:
Offset: -597,0,341
WithRotor@SECONDARY:
@@ -117,7 +118,7 @@ BADR.Husk:
Inherits: ^PlaneHusk
Tooltip:
Name: Badger
Plane:
Aircraft:
ROT: 5
Speed: 149
AirborneUpgrades: airborne
@@ -140,7 +141,7 @@ MIG.Husk:
Offset: -598,-683,0
Contrail@2:
Offset: -598,683,0
Plane:
Aircraft:
ROT: 5
Speed: 186
AirborneUpgrades: airborne
@@ -160,7 +161,7 @@ YAK.Husk:
Name: Yak Attack Plane
Contrail:
Offset: -853,0,0
Plane:
Aircraft:
ROT: 5
Speed: 149
AirborneUpgrades: airborne
@@ -178,10 +179,11 @@ HELI.Husk:
Inherits: ^HelicopterHusk
Tooltip:
Name: Longbow
Helicopter:
Aircraft:
ROT: 4
Speed: 149
AirborneUpgrades: airborne
CanHover: True
WithRotor:
Offset: 0,0,85
SmokeTrailWhenDamaged:
@@ -197,10 +199,11 @@ HIND.Husk:
Inherits: ^HelicopterHusk
Tooltip:
Name: Hind
Helicopter:
Aircraft:
ROT: 4
Speed: 112
AirborneUpgrades: airborne
CanHover: True
WithRotor:
SmokeTrailWhenDamaged:
Offset: -427,0,0
@@ -213,7 +216,7 @@ HIND.Husk:
U2.Husk:
Inherits: ^PlaneHusk
Plane:
Aircraft:
ROT: 7
Speed: 373
AirborneUpgrades: airborne

22
mods/ts/rules/aircraft.yaml
View File

@@ -4,13 +4,12 @@ DPOD:
Cost: 10
Tooltip:
Name: Drop Pod
Helicopter:
Aircraft:
LandWhenIdle: yes
ROT: 5
Speed: 149
InitialFacing: 0
LandableTerrainTypes: Clear
AirborneUpgrades: airborne
Health:
HP: 60
Armor:
@@ -40,7 +39,7 @@ DSHP:
Cost: 1000
Tooltip:
Name: Dropship
Helicopter:
Aircraft:
LandWhenIdle: yes
ROT: 5
Speed: 168
@@ -48,7 +47,6 @@ DSHP:
LandableTerrainTypes: Clear
TakeoffSound: dropup1.aud
LandingSound: dropdwn1.aud
AirborneUpgrades: airborne
Health:
HP: 200
Armor:
@@ -76,11 +74,10 @@ ORCA:
Prerequisites: ~gahpad
Selectable:
Bounds: 30,24
Helicopter:
Aircraft:
RearmBuildings: gahpad, nahpad
ROT: 5
Speed: 186
AirborneUpgrades: airborne
Health:
HP: 200
Armor:
@@ -115,7 +112,7 @@ ORCAB:
Prerequisites: ~gahpad, gatech
Selectable:
Bounds: 30,24
Plane:
Aircraft:
CruiseAltitude: 3072
MaximumPitch: 120
ROT: 3
@@ -155,7 +152,7 @@ ORCATRAN:
BuildPaletteOrder: 10
Prerequisites: ~disabled
RenderSprites:
Helicopter:
Aircraft:
LandWhenIdle: yes
ROT: 5
Speed: 84
@@ -163,7 +160,6 @@ ORCATRAN:
LandableTerrainTypes: Clear
TakeoffSound: dropup1.aud
LandingSound: dropdwn1.aud
AirborneUpgrades: airborne
Health:
HP: 200
Armor:
@@ -189,7 +185,7 @@ TRNSPORT:
Queue: Air
BuildPaletteOrder: 10
Prerequisites: ~gahpad, gadept
Helicopter:
Aircraft:
LandWhenIdle: yes
ROT: 5
Speed: 149
@@ -198,7 +194,6 @@ TRNSPORT:
TakeoffSound: dropup1.aud
LandingSound: dropdwn1.aud
AltitudeVelocity: 64
AirborneUpgrades: airborne
Health:
HP: 175
Armor:
@@ -226,7 +221,7 @@ SCRIN:
Bounds: 30,24
Voiced:
VoiceSet: Scrin
Plane:
Aircraft:
MaximumPitch: 90
ROT: 3
Speed: 168
@@ -265,11 +260,10 @@ APACHE:
Prerequisites: ~nahpad
Selectable:
Bounds: 30,24
Helicopter:
Aircraft:
RearmBuildings: gahpad, nahpad
ROT: 5
Speed: 130
AirborneUpgrades: airborne
Health:
HP: 225
Armor:

5
mods/ts/rules/defaults.yaml
View File

@@ -482,17 +482,18 @@
^Helicopter:
Inherits: ^Aircraft
Helicopter:
Aircraft:
RepairBuildings: gadept
RearmBuildings:
LandWhenIdle: no
CruiseAltitude: 2048
Voice: Move
AirborneUpgrades: airborne
CanHover: True
^Plane:
Inherits: ^Aircraft
Plane:
Aircraft:
RepairBuildings: gadept
RearmBuildings: gahpad, nahpad
LandWhenIdle: no