Merge pull request #3373 from ScottNZ/husk
Rework aircraft destruction to use husks instead of the original actor. Fixes #3324 and closes #3216.
This commit is contained in:
Matthias Mailänder
@@ -23,10 +23,8 @@ BADR:
|
||||
Offset: -469,469,0
|
||||
Contrail@2:
|
||||
Offset: -469,-469,0
|
||||
FallsToEarth:
|
||||
Spins: no
|
||||
Moves: yes
|
||||
Explosion: UnitExplode
|
||||
LeavesHusk:
|
||||
HuskActor: BADR.Husk
|
||||
SmokeTrailWhenDamaged@0:
|
||||
Offset: -469,469,0
|
||||
Interval: 2
|
||||
@@ -36,7 +34,7 @@ BADR:
|
||||
-EjectOnDeath:
|
||||
-GpsDot:
|
||||
|
||||
BADR.bomber:
|
||||
BADR.Bomber:
|
||||
CarpetBomb:
|
||||
Range: 3
|
||||
Weapon: ParaBomb
|
||||
@@ -53,7 +51,7 @@ BADR.bomber:
|
||||
RenderUnit:
|
||||
Image: badr
|
||||
WithShadow:
|
||||
IronCurtainable:
|
||||
IronCurtainable:
|
||||
-Selectable:
|
||||
-GainsExperience:
|
||||
Tooltip:
|
||||
@@ -62,10 +60,8 @@ BADR.bomber:
|
||||
Offset: 469,469,0
|
||||
Contrail@2:
|
||||
Offset: 469,-469,0
|
||||
FallsToEarth:
|
||||
Spins: no
|
||||
Moves: yes
|
||||
Explosion: UnitExplode
|
||||
LeavesHusk:
|
||||
HuskActor: BADR.Husk
|
||||
SmokeTrailWhenDamaged@0:
|
||||
Offset: -469,469,0
|
||||
Interval: 2
|
||||
@@ -119,10 +115,8 @@ MIG:
|
||||
Offset: -598,-683,0
|
||||
Contrail@2:
|
||||
Offset: -598,683,0
|
||||
FallsToEarth:
|
||||
Spins: no
|
||||
Moves: yes
|
||||
Explosion: UnitExplode
|
||||
LeavesHusk:
|
||||
HuskActor: MIG.Husk
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -853,0,171
|
||||
Interval: 2
|
||||
@@ -172,14 +166,11 @@ YAK:
|
||||
WithMuzzleFlash:
|
||||
Contrail:
|
||||
Offset: -853,0,0
|
||||
FallsToEarth:
|
||||
Spins: no
|
||||
Moves: yes
|
||||
Explosion: UnitExplode
|
||||
LeavesHusk:
|
||||
HuskActor: YAK.Husk
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -853,0,0
|
||||
Interval: 2
|
||||
|
||||
|
||||
TRAN:
|
||||
Inherits: ^Helicopter
|
||||
@@ -219,9 +210,9 @@ TRAN:
|
||||
MaxWeight: 8
|
||||
PipCount: 8
|
||||
IronCurtainable:
|
||||
FallsToEarth:
|
||||
Explosion: UnitExplode
|
||||
|
||||
LeavesHusk:
|
||||
HuskActor: TRAN.Husk
|
||||
|
||||
TRAN.Husk1:
|
||||
Inherits: ^Husk
|
||||
Tooltip:
|
||||
@@ -277,8 +268,8 @@ HELI:
|
||||
LimitedAmmo:
|
||||
Ammo: 8
|
||||
IronCurtainable:
|
||||
FallsToEarth:
|
||||
Explosion: UnitExplode
|
||||
LeavesHusk:
|
||||
HuskActor: HELI.Husk
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -427,0,0
|
||||
|
||||
@@ -327,8 +318,8 @@ HIND:
|
||||
Selectable:
|
||||
Bounds: 38,32,0,0
|
||||
WithMuzzleFlash:
|
||||
FallsToEarth:
|
||||
Explosion: UnitExplode
|
||||
LeavesHusk:
|
||||
HuskActor: HIND.Husk
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -427,0,0
|
||||
|
||||
@@ -350,10 +341,129 @@ U2:
|
||||
Offset: -725,683,0
|
||||
Contrail@2:
|
||||
Offset: -725,-683,0
|
||||
FallsToEarth:
|
||||
Spins: no
|
||||
Moves: yes
|
||||
Explosion: UnitExplode
|
||||
LeavesHusk:
|
||||
HuskActor: U2.Husk
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -1c43,0,0
|
||||
Interval: 2
|
||||
Interval: 2
|
||||
|
||||
BADR.Husk:
|
||||
Inherits: ^PlaneHusk
|
||||
Tooltip:
|
||||
Name: Badger
|
||||
RenderUnit:
|
||||
Image: badr
|
||||
WithShadow:
|
||||
Plane:
|
||||
ROT: 5
|
||||
Speed: 16
|
||||
SmokeTrailWhenDamaged@0:
|
||||
Offset: -469,469,0
|
||||
Interval: 2
|
||||
MinDamage: Undamaged
|
||||
SmokeTrailWhenDamaged@1:
|
||||
Offset: -469,-469,0
|
||||
Interval: 2
|
||||
MinDamage: Undamaged
|
||||
|
||||
MIG.Husk:
|
||||
Inherits: ^PlaneHusk
|
||||
Tooltip:
|
||||
Name: Mig Attack Plane
|
||||
RenderUnit:
|
||||
CameraPitch: 99
|
||||
Image: mig
|
||||
WithShadow:
|
||||
Contrail@1:
|
||||
Offset: -598,-683,0
|
||||
Contrail@2:
|
||||
Offset: -598,683,0
|
||||
Plane:
|
||||
ROT: 5
|
||||
Speed: 20
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -853,0,171
|
||||
Interval: 2
|
||||
MinDamage: Undamaged
|
||||
|
||||
YAK.Husk:
|
||||
Inherits: ^PlaneHusk
|
||||
Tooltip:
|
||||
Name: Yak Attack Plane
|
||||
RenderUnit:
|
||||
CameraPitch: 99
|
||||
Image: yak
|
||||
WithShadow:
|
||||
Contrail:
|
||||
Offset: -853,0,0
|
||||
Plane:
|
||||
ROT: 5
|
||||
Speed: 16
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -853,0,0
|
||||
Interval: 2
|
||||
MinDamage: Undamaged
|
||||
|
||||
TRAN.Husk:
|
||||
Inherits: ^HelicopterHusk
|
||||
Tooltip:
|
||||
Name: Transport Helicopter
|
||||
RenderUnit:
|
||||
Image: tran
|
||||
WithShadow:
|
||||
Helicopter:
|
||||
ROT: 4
|
||||
Speed: 16
|
||||
WithRotor@PRIMARY:
|
||||
Offset: -597,0,341
|
||||
WithRotor@SECONDARY:
|
||||
Id: rotor_2
|
||||
Offset: 597,0,213
|
||||
|
||||
HELI.Husk:
|
||||
Inherits: ^HelicopterHusk
|
||||
Tooltip:
|
||||
Name: Longbow
|
||||
RenderUnit:
|
||||
Image: heli
|
||||
WithShadow:
|
||||
Helicopter:
|
||||
ROT: 4
|
||||
Speed: 16
|
||||
WithRotor:
|
||||
Offset: 0,0,85
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -427,0,0
|
||||
MinDamage: Undamaged
|
||||
|
||||
HIND.Husk:
|
||||
Inherits: ^HelicopterHusk
|
||||
Tooltip:
|
||||
Name: Hind
|
||||
RenderUnit:
|
||||
Image: hind
|
||||
WithShadow:
|
||||
Helicopter:
|
||||
ROT: 4
|
||||
Speed: 12
|
||||
WithRotor:
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -427,0,0
|
||||
MinDamage: Undamaged
|
||||
|
||||
U2.Husk:
|
||||
Inherits: ^PlaneHusk
|
||||
RenderUnit:
|
||||
Image: u2
|
||||
WithShadow:
|
||||
Plane:
|
||||
ROT: 7
|
||||
Speed: 40
|
||||
Contrail@1:
|
||||
Offset: -725,683,0
|
||||
Contrail@2:
|
||||
Offset: -725,-683,0
|
||||
SmokeTrailWhenDamaged:
|
||||
Offset: -1c43,0,0
|
||||
Interval: 2
|
||||
MinDamage: Undamaged
|
||||
@@ -368,6 +368,24 @@
|
||||
BelowUnits:
|
||||
BodyOrientation:
|
||||
|
||||
^HelicopterHusk:
|
||||
Inherits: ^Husk
|
||||
-Husk:
|
||||
-Burns:
|
||||
FallsToEarth:
|
||||
Spins: True
|
||||
Moves: False
|
||||
-BelowUnits:
|
||||
|
||||
^PlaneHusk:
|
||||
Inherits: ^Husk
|
||||
-Husk:
|
||||
-Burns:
|
||||
FallsToEarth:
|
||||
Spins: False
|
||||
Moves: True
|
||||
-BelowUnits:
|
||||
|
||||
^Bridge:
|
||||
Tooltip:
|
||||
Name: Bridge
|
||||
|
||||
Reference in New Issue
Block a user