Merge pull request #5695 from Mailaender/parachute-dangers

Added the possibility for paratroopers to die on impact
This commit is contained in:
Paul Chote
2014-07-05 19:49:15 +12:00
18 changed files with 200 additions and 63 deletions

Binary file not shown.

View File

@@ -196,6 +196,8 @@
LuaScriptEvents:
ScriptTriggers:
DeathSounds:
Parachutable:
FallRate: 130
^Plane:
AppearsOnRadar:

Binary file not shown.

View File

@@ -41,8 +41,9 @@
EjectOnDeath:
PilotActor: e1
SuccessRate: 20
EjectOnGround: yes
EjectInAir: no
EjectOnGround: true
EjectInAir: false
AllowUnsuitableCell: false
Huntable:
LuaScriptEvents:
Demolishable:
@@ -97,8 +98,9 @@
EjectOnDeath:
PilotActor: e1
SuccessRate: 20
EjectOnGround: yes
EjectInAir: no
EjectOnGround: true
EjectInAir: false
AllowUnsuitableCell: false
Huntable:
LuaScriptEvents:
Demolishable:
@@ -149,8 +151,6 @@
GivesBounty:
GpsDot:
String: Infantry
ParachuteAttachment:
Offset: 0,0,427
CrushableInfantry:
CrushSound: squishy2.aud
UpdatesPlayerStatistics:
@@ -175,6 +175,11 @@
DeathSounds@ZAPPED:
DeathSound: Zapped
InfDeaths: 6
Parachutable:
ParachuteOffset: 0,0,427
KilledOnImpassableTerrain: true
ParachuteSequence: parach
ShadowSequence: parach-shadow
^Ship:
AppearsOnRadar:
@@ -211,7 +216,7 @@
^Plane:
AppearsOnRadar:
UseLocation: yes
UseLocation: true
SelectionDecorations:
Selectable:
Voice: GenericVoice
@@ -232,8 +237,9 @@
EjectOnDeath:
PilotActor: E1
SuccessRate: 50
EjectOnGround: no
EjectInAir: yes
EjectOnGround: false
EjectInAir: true
AllowUnsuitableCell: true
GivesBounty:
GpsDot:
String: Plane
@@ -277,7 +283,7 @@
GivesExperience:
CaptureNotification:
EditorAppearance:
RelativeToTopLeft: yes
RelativeToTopLeft: true
ShakeOnDeath:
ProximityCaptor:
Types: Building
@@ -322,7 +328,7 @@
Palette: terrain
GivesExperience:
EditorAppearance:
RelativeToTopLeft: yes
RelativeToTopLeft: true
UseTerrainPalette: true
AutoTargetIgnore:
ProximityCaptor:
@@ -425,7 +431,7 @@
RadarColorFromTerrain:
Terrain: Tree
EditorAppearance:
RelativeToTopLeft: yes
RelativeToTopLeft: true
UseTerrainPalette: true
ProximityCaptor:
Types: Tree
@@ -460,11 +466,11 @@
LuaScriptEvents:
TargetableUnit:
TargetTypes: Ground
RequiresForceFire: yes
RequiresForceFire: true
AutoTargetIgnore:
Capturable:
Type: husk
AllowAllies: yes
AllowAllies: true
CaptureThreshold: 1.0
TransformOnCapture:
ForceHealthPercentage: 25
@@ -501,7 +507,7 @@
BelowUnits:
TargetableBuilding:
TargetTypes: Ground, Water
RequiresForceFire: yes
RequiresForceFire: true
Building:
Footprint: ____ ____
Dimensions: 4,2
@@ -528,7 +534,7 @@
RadarColorFromTerrain:
Terrain: Tree
EditorAppearance:
RelativeToTopLeft: yes
RelativeToTopLeft: true
UseTerrainPalette: true
ProximityCaptor:
Types: Tree

View File

@@ -60,6 +60,9 @@ CRATE:
Crate:
Lifetime: 120
TerrainTypes: Clear, Rough, Road, Water, Ore, Beach
Parachutable:
KilledOnImpassableTerrain: false
ParachuteSequence: parach
GiveCashCrateAction:
Amount: 1000
SelectionShares: 50

View File

@@ -905,6 +905,7 @@ AFLD:
LongDesc: A Badger drops a squad of infantry\nanywhere on the map.
DropItems: E1,E1,E1,E3,E3
SelectTargetSound: slcttgt1.aud
AllowImpassableCells: false
ProductionBar:
SupportPowerChargeBar:
PrimaryBuilding:

View File

@@ -72,6 +72,10 @@ explosion:
small_napalm: napalm1
Start: 0
Length: *
corpse: corpse1
Start: 0
Length: 6
Tick: 1600
pips:
groups:
@@ -366,6 +370,11 @@ parach:
Start: 5
Length: 11
parach-shadow:
idle:
Start: 0
Length: *
atomicup:
idle:
Start: 0