Add upgrade rules to remove DamageWarhead.DeathType

and replace it with proper DamageTypes
This commit is contained in:
penev92
2015-05-15 21:29:06 +03:00
parent b5e4876b7f
commit 1c44fcbad4
31 changed files with 282 additions and 424 deletions

View File

@@ -232,6 +232,7 @@
PoisonedByTiberium:
SpawnViceroid:
ViceroidActor: vissml
DeathType: EnergyDeath # TODO: FIX ME! (Tiberium currently uses the wrong damage type!)
UpdatesPlayerStatistics:
CombatDebugOverlay:
Guard:

View File

@@ -11,14 +11,13 @@ Grenade:
Warhead@1Dam: SpreadDamage
Spread: 171
Damage: 40
DeathType: 3
Versus:
None: 100
Wood: 85
Light: 70
Heavy: 35
Concrete: 28
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: large_grey_explosion
ImpactSound: expnew13.aud
@@ -43,14 +42,13 @@ Bomb:
Warhead@1Dam: SpreadDamage
Spread: 298
Damage: 160
DeathType: 3
Versus:
None: 200
Wood: 90
Light: 75
Heavy: 32
Concrete: 100
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: large_explosion
ImpactSound: expnew09.aud
@@ -76,14 +74,13 @@ RPGTower:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 110
DeathType: 2
Versus:
None: 30
Wood: 75
Light: 90
Heavy: 100
Concrete: 70
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: large_clsn
ImpactSound: expnew14.aud

View File

@@ -10,14 +10,13 @@ LtRail:
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 150
DeathType: 2
Versus:
None: 100
Wood: 130
Light: 150
Heavy: 110
Concrete: 5
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, SmallExplosionDeath
MechRailgun:
ReloadDelay: 60
@@ -31,14 +30,13 @@ MechRailgun:
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 200
DeathType: 5
Versus:
None: 200
Wood: 175
Light: 160
Heavy: 100
Concrete: 25
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, FireDeath
SonicZap:
ReloadDelay: 120
@@ -52,11 +50,10 @@ SonicZap:
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 100
DeathType: 5
Versus:
Heavy: 80
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, FireDeath
CyCannon:
ReloadDelay: 50
@@ -72,7 +69,6 @@ CyCannon:
Warhead@1Dam: SpreadDamage
Spread: 43
Damage: 120
DeathType: 6
ValidTargets: Ground
Versus:
None: 350
@@ -80,7 +76,7 @@ CyCannon:
Light: 205
Heavy: 150
Concrete: 80
DamageTypes: Prone350Percent, TriggerProne
DamageTypes: Prone350Percent, TriggerProne, EnergyDeath
Warhead@2Eff: CreateEffect
Explosion: large_bang
ImpactSound: expnew12.aud
@@ -109,7 +105,6 @@ Proton:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 20
DeathType: 3
ValidTargets: Ground
Versus:
None: 25
@@ -117,7 +112,7 @@ Proton:
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: small_bang
ImpactSound: expnew12.aud
@@ -138,8 +133,7 @@ LaserFire:
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 250
DeathType: 5
DamageTypes: Prone60Percent, TriggerProne
DamageTypes: Prone60Percent, TriggerProne, EnergyDeath
# Laser turret
LaserFire2:
@@ -152,6 +146,5 @@ LaserFire2:
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 30
DeathType: 5
DamageTypes: Prone60Percent, TriggerProne
DamageTypes: Prone60Percent, TriggerProne, EnergyDeath

View File

@@ -3,13 +3,12 @@ UnitExplode:
Spread: 426
Damage: 50
Falloff: 1000, 368, 135, 50, 18, 7, 0
DeathType: 2
Versus:
None: 90
Wood: 75
Light: 60
Heavy: 25
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: large_twlt
ImpactSound: expnew09.aud
@@ -18,13 +17,12 @@ UnitExplodeSmall:
Warhead@1Dam: SpreadDamage
Spread: 426
Damage: 40
DeathType: 2
Versus:
None: 90
Wood: 75
Light: 60
Heavy: 25
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: medium_brnl
ImpactSound: expnew13.aud
@@ -33,13 +31,12 @@ TiberiumExplosion:
Warhead@1Dam: SpreadDamage
Spread: 9
Damage: 10
DeathType: 3
Versus:
None: 90
Wood: 75
Light: 60
Heavy: 25
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Res: CreateResource
AddsResourceType: Tiberium
Size: 1,1

View File

@@ -7,7 +7,6 @@ Heal:
Warhead@1Dam: SpreadDamage
Spread: 213
Damage: -50
DeathType: 1
Versus:
Wood: 0
Light: 0
@@ -23,7 +22,6 @@ Repair:
Warhead@1Dam: SpreadDamage
Spread: 213
Damage: -50
DeathType: 1
Versus:
None: 0
Wood: 0
@@ -36,5 +34,4 @@ TiberiumHeal:
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: -2
DeathType: 6

View File

@@ -11,14 +11,13 @@
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 36
DeathType: 2
Versus:
None: 25
Wood: 65
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: medium_clsn
ImpactSound: expnew14.aud
@@ -39,14 +38,13 @@
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 70
DeathType: 2
Versus:
None: 25
Wood: 65
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: large_clsn
ImpactSound: expnew14.aud
@@ -73,14 +71,13 @@
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 50
DeathType: 2
Versus:
None: 25
Wood: 65
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: medium_clsn
ImpactSound: expnew14.aud
@@ -107,14 +104,13 @@
Warhead@1Dam: SpreadDamage
Spread: 298
Damage: 150
DeathType: 3
Versus:
None: 100
Wood: 85
Light: 68
Heavy: 35
Concrete: 35
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: large_explosion
ImpactSound: expnew06.aud

View File

@@ -17,7 +17,6 @@ Bazooka:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 25
DeathType: 2
ValidTargets: Ground, Air
Versus:
None: 25
@@ -25,7 +24,7 @@ Bazooka:
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: small_clsn
ImpactSound: expnew12.aud
@@ -61,7 +60,6 @@ HoverMissile:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 30
DeathType: 2
ValidTargets: Ground, Air
Versus:
None: 25
@@ -69,7 +67,7 @@ HoverMissile:
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: small_clsn
ImpactSound: expnew12.aud
@@ -104,7 +102,6 @@ MammothTusk:
Warhead@1Dam: SpreadDamage
Spread: 171
Damage: 40
DeathType: 3
ValidTargets: Air
Versus:
None: 100
@@ -112,6 +109,7 @@ MammothTusk:
Light: 70
Heavy: 35
Concrete: 28
DamageTypes: Explosion
Warhead@2Eff: CreateEffect
Explosion: medium_bang
ImpactSound: expnew12.aud
@@ -142,7 +140,6 @@ BikeMissile:
Warhead@1Dam: SpreadDamage
Spread: 256
Damage: 40
DeathType: 2
ValidTargets: Ground
Versus:
None: 25
@@ -150,7 +147,7 @@ BikeMissile:
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: small_clsn
ImpactSound: expnew12.aud
@@ -182,7 +179,6 @@ Dragon:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 30
DeathType: 2
ValidTargets: Ground, Air
Versus:
None: 25
@@ -190,7 +186,7 @@ Dragon:
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: small_clsn
ImpactSound: expnew12.aud
@@ -226,7 +222,6 @@ Hellfire:
Warhead@1Dam: SpreadDamage
Spread: 85
Damage: 30
DeathType: 2
ValidTargets: Ground
Versus:
None: 30
@@ -234,7 +229,7 @@ Hellfire:
Light: 150
Heavy: 100
Concrete: 30
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: small_bang
ImpactSound: expnew12.aud
@@ -269,8 +264,8 @@ RedEye2:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 33
DeathType: 2
ValidTargets: Air
DamageTypes: SmallExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: small_clsn
ImpactSound: expnew12.aud

View File

@@ -11,14 +11,13 @@ FireballLauncher:
Warhead@1Dam: SpreadDamage
Spread: 341
Damage: 25
DeathType: 5
Versus:
None: 600
Wood: 148
Light: 59
Heavy: 6
Concrete: 2
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, FireDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SmallScorch
@@ -36,12 +35,11 @@ FiendShard:
Palette: greentiberium
Warhead@1Dam: SpreadDamage
Damage: 35
DeathType: 1
Versus:
Light: 60
Heavy: 40
Concrete: 20
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, BulletDeath
Warhead@3EffWater: CreateEffect
Explosion: small_watersplash
ImpactSound: ssplash3.aud
@@ -55,17 +53,16 @@ SlimeAttack:
Speed: 426
Warhead@1Dam: SpreadDamage
Damage: 100
DeathType: 2
Versus:
Light: 60
Heavy: 40
Concrete: 20
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, SmallExplosionDeath
Tiberium:
ReloadDelay: 16
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 2
DeathType: 6
DamageTypes: EnergyDeath # TODO: FIX ME!

View File

@@ -7,13 +7,12 @@ Minigun:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 8
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -30,13 +29,12 @@ M1Carbine:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 15
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -53,13 +51,12 @@ Vulcan:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 20
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -77,14 +74,13 @@ Vulcan2:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 50
DeathType: 1
Versus:
None: 100
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -102,13 +98,12 @@ Vulcan3:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 10
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -125,13 +120,12 @@ VulcanTower:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 18
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -149,13 +143,12 @@ JumpCannon:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 15
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -172,13 +165,12 @@ AssaultCannon:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 40
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -197,13 +189,12 @@ RaiderCannon:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 40
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -221,14 +212,13 @@ HarpyClaw:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 60
DeathType: 1
ValidTargets: Ground, Air
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piffs
InvalidImpactTypes: Water
@@ -245,13 +235,12 @@ Pistola:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 2
DeathType: 1
Versus:
Wood: 60
Light: 40
Heavy: 25
Concrete: 10
DamageTypes: Prone70Percent, TriggerProne
DamageTypes: Prone70Percent, TriggerProne, BulletDeath
Warhead@2Eff: CreateEffect
Explosion: piff
InvalidImpactTypes: Water
@@ -268,12 +257,11 @@ Sniper:
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 150
DeathType: 1
Versus:
None: 100
Wood: 5
Light: 5
Heavy: 5
Concrete: 5
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, BulletDeath

View File

@@ -16,7 +16,6 @@ MultiCluster:
Warhead@1Dam: SpreadDamage
Spread: 128
Damage: 65
DeathType: 3
ValidTargets: Ground
Versus:
None: 25
@@ -24,7 +23,7 @@ MultiCluster:
Light: 75
Heavy: 100
Concrete: 60
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect
Explosion: large_explosion
ImpactSound: expnew09.aud
@@ -44,13 +43,12 @@ SuicideBomb:
Spread: 256
Damage: 110
Falloff: 10000, 3680, 1350, 500, 180, 70, 0
DeathType: 5
Versus:
None: 90
Light: 60
Heavy: 25
Concrete: 50
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, FireDeath
Warhead@2Res: DestroyResource
IonCannon:
@@ -59,9 +57,8 @@ IonCannon:
Spread: 1c0
Damage: 100
Falloff: 1000, 368, 135, 50, 18, 7, 0
DeathType: 5
ValidTargets: Ground, Air
DamageTypes: Prone100Percent, TriggerProne
DamageTypes: Prone100Percent, TriggerProne, EnergyDeath
Warhead@2Eff_impact: CreateEffect
Explosion: ionring
ImpactSound: ion1.aud
@@ -69,10 +66,9 @@ IonCannon:
Spread: 1c0
Damage: 250
Falloff: 100, 50, 25, 0
DeathType: 5
Delay: 3
ValidTargets: Ground, Air
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, EnergyDeath
Warhead@4Smu_area: LeaveSmudge
SmudgeType: SmallScorch
Size: 2,1
@@ -107,11 +103,10 @@ ClusterMissile:
Spread: 1c0
Damage: 150
Falloff: 1000, 368, 135, 50, 18, 7, 0
DeathType: 5
ValidTargets: Ground, Water, Air
Versus:
Concrete: 25
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, FireDeath
Warhead@SoundEffect0: CreateEffect
Explosion: large_explosion
ImpactSound: expnew19.aud
@@ -124,12 +119,11 @@ ClusterMissile:
Spread: 2c0
Damage: 60
Falloff: 1000, 368, 135, 50, 18, 7, 0
DeathType: 5
Delay: 5
ValidTargets: Ground, Water, Air
Versus:
Concrete: 25
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, FireDeath
Warhead@ResourceDestruction1: DestroyResource
Size: 2
Delay: 5
@@ -141,12 +135,11 @@ ClusterMissile:
Spread: 3c0
Damage: 60
Falloff: 1000, 368, 135, 50, 18, 7, 0
DeathType: 5
Delay: 10
ValidTargets: Ground, Water, Air
Versus:
Concrete: 25
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, FireDeath
Warhead@ResourceDestruction2: DestroyResource
Size: 3
Delay: 10
@@ -158,12 +151,11 @@ ClusterMissile:
Spread: 4c0
Damage: 60
Falloff: 1000, 368, 135, 50, 18, 7, 0
DeathType: 5
Delay: 15
ValidTargets: Ground, Water, Air
Versus:
Concrete: 25
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, FireDeath
Warhead@ResourceDestruction3: DestroyResource
Size: 4
Delay: 15
@@ -175,12 +167,11 @@ ClusterMissile:
Spread: 5c0
Damage: 60
Falloff: 1000, 368, 135, 50, 18, 7, 0
DeathType: 5
Delay: 20
ValidTargets: Ground, Water, Air
Versus:
Concrete: 25
DamageTypes: Prone50Percent, TriggerProne
DamageTypes: Prone50Percent, TriggerProne, FireDeath
Warhead@ResourceDestruction4: DestroyResource
Size: 5
Delay: 20