Work around RA aircraft inherits.

This commit is contained in:
Paul Chote
2016-12-14 20:00:52 +00:00
parent 623842d699
commit 0145bfc0c0
2 changed files with 8 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
BADR: BADR:
Inherits: ^Plane Inherits: ^NeutralPlane
ParaDrop: ParaDrop:
DropRange: 4c0 DropRange: 4c0
Health: Health:
@@ -18,7 +18,6 @@ BADR:
SelectionDecorations: SelectionDecorations:
RenderSelectionBars: False RenderSelectionBars: False
-Voiced: -Voiced:
-GainsExperience:
Tooltip: Tooltip:
Name: Badger Name: Badger
Contrail@1: Contrail@1:
@@ -39,7 +38,7 @@ BADR:
Experience: 1000 Experience: 1000
BADR.Bomber: BADR.Bomber:
Inherits: ^Plane Inherits: ^NeutralPlane
AttackBomber: AttackBomber:
Armament: Armament:
Weapon: ParaBomb Weapon: ParaBomb
@@ -59,7 +58,6 @@ BADR.Bomber:
SelectionDecorations: SelectionDecorations:
RenderSelectionBars: False RenderSelectionBars: False
-Voiced: -Voiced:
-GainsExperience:
Tooltip: Tooltip:
Name: Badger Name: Badger
Contrail@1: Contrail@1:
@@ -358,7 +356,7 @@ HIND:
Prerequisites: aircraft.upgraded Prerequisites: aircraft.upgraded
U2: U2:
Inherits: ^Plane Inherits: ^NeutralPlane
Health: Health:
HP: 2000 HP: 2000
Tooltip: Tooltip:
@@ -377,7 +375,6 @@ U2:
RenderSelectionBars: False RenderSelectionBars: False
-Voiced: -Voiced:
-Targetable@AIRBORNE: -Targetable@AIRBORNE:
-GainsExperience:
Contrail@1: Contrail@1:
Offset: -725,683,0 Offset: -725,683,0
Contrail@2: Contrail@2:

View File

@@ -410,9 +410,8 @@
VoiceSet: VehicleVoice VoiceSet: VehicleVoice
WithFacingSpriteBody: WithFacingSpriteBody:
^Plane: ^NeutralPlane:
Inherits@1: ^ExistsInWorld Inherits@1: ^ExistsInWorld
Inherits@2: ^GainsExperience
Inherits@3: ^IronCurtainable Inherits@3: ^IronCurtainable
Inherits@4: ^SpriteActor Inherits@4: ^SpriteActor
Huntable: Huntable:
@@ -462,6 +461,10 @@
Voiced: Voiced:
VoiceSet: GenericVoice VoiceSet: GenericVoice
^Plane:
Inherits: ^NeutralPlane
Inherits@2: ^GainsExperience
^Helicopter: ^Helicopter:
Inherits: ^Plane Inherits: ^Plane
Tooltip: Tooltip: