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

Merge pull request #11592 from reaperrr/fix-smudges

Browse Source 
Fix smudges spawning/growing on cells occupied by structures or vehicles
This commit is contained in:
Matthias Mailänder
2016-07-09 20:51:39 +02:00
committed by GitHub
parent 6e0b058ec6 e2cf6fdb9a
commit 57acfe355b
24 changed files with 143 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs
View File

@@ -38,7 +38,12 @@ namespace OpenRA.Mods.Common.Warheads
foreach (var sc in allCells)
{
var smudgeType = world.Map.GetTerrainInfo(sc).AcceptsSmudgeType.FirstOrDefault(SmudgeType.Contains);
if (smudgeType == null) continue;
if (smudgeType == null)
continue;
var cellActors = world.ActorMap.GetActorsAt(sc);
if (cellActors.Any(a => !IsValidAgainst(a, firedBy)))
continue;
SmudgeLayer smudgeLayer;
if (!smudgeLayers.TryGetValue(smudgeType, out smudgeLayer))

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

@@ -346,7 +346,7 @@
Selectable:
Bounds: 24,24
Targetable:
TargetTypes: Ground
TargetTypes: Ground, Creep
HiddenUnderFog:
RenderSprites:
Palette: terrain
@@ -392,7 +392,7 @@
Selectable:
Bounds: 24,24
Targetable:
TargetTypes: Ground
TargetTypes: Ground, Creep
AutoTarget:
ScanRadius: 5
AttackMove:

11
mods/cnc/weapons/explosions.yaml
View File

@@ -6,6 +6,8 @@ FlametankExplode:
Warhead@2Eff: CreateEffect
Explosions: big_napalm
ImpactSounds: xplobig6.aud
Warhead@3Smu: LeaveSmudge
SmudgeType: Scorch
HeliCrash:
Warhead@1Dam: SpreadDamage
@@ -15,6 +17,9 @@ HeliCrash:
Warhead@2Eff: CreateEffect
Explosions: poof
ImpactSounds: xplos.aud
Warhead@3Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
HeliExplode:
Warhead@1Dam: SpreadDamage
@@ -36,6 +41,8 @@ UnitExplode:
Warhead@2Eff: CreateEffect
Explosions: poof
ImpactSounds: xplobig6.aud
Warhead@3Smu: LeaveSmudge
SmudgeType: Crater
UnitExplodeShip:
Inherits: UnitExplode
@@ -55,6 +62,8 @@ UnitExplodeSmall:
Warhead@2Eff: CreateEffect
Explosions: big_frag
ImpactSounds: xplobig4.aud
Warhead@3Smu: LeaveSmudge
SmudgeType: Crater
GrenadierExplode:
Warhead@1Dam: SpreadDamage
@@ -69,6 +78,8 @@ GrenadierExplode:
Warhead@2Eff: CreateEffect
Explosions: poof
ImpactSounds: xplosml2.aud
Warhead@3Smu: LeaveSmudge
SmudgeType: Crater
Napalm.Crate:
Warhead@1Dam: SpreadDamage

8
mods/cnc/weapons/largecaliber.yaml
View File

@@ -16,6 +16,7 @@
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -38,6 +39,7 @@
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -60,6 +62,7 @@
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -84,6 +87,7 @@
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -106,6 +110,7 @@ TurretGun:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -133,6 +138,7 @@ ArtilleryShell:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: poof
ImpactSounds: XPLOSML2.AUD
ImpactSounds: xplosml2.aud

14
mods/cnc/weapons/missiles.yaml
View File

@@ -26,6 +26,7 @@ Rockets:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -59,6 +60,7 @@ BikeRockets:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -93,6 +95,7 @@ OrcaAGMissiles:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -123,8 +126,6 @@ OrcaAAMissiles:
Light: 75
Heavy: 50
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -158,6 +159,7 @@ MammothMissiles:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_poof
ImpactSounds: xplos.aud
@@ -198,6 +200,7 @@ MammothMissiles:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: med_frag
ImpactSounds: xplos.aud
@@ -231,6 +234,7 @@ MammothMissiles:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_frag
ImpactSounds: xplos.aud
@@ -262,6 +266,7 @@ BoatMissile:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_poof
ImpactSounds: xplos.aud
@@ -298,6 +303,7 @@ TowerMissle:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: med_frag
ImpactSounds: xplos.aud
@@ -326,8 +332,6 @@ SAMMissile:
Heavy: 75
Damage: 35
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: small_building
ImpactSounds: xplos.aud
@@ -382,8 +386,6 @@ Patriot:
Heavy: 75
Damage: 50
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: poof
ImpactSounds: xplos.aud

6
mods/cnc/weapons/other.yaml
View File

@@ -19,6 +19,7 @@ Flamethrower:
DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall
Warhead@3Eff: CreateEffect
Explosions: small_napalm
ImpactSounds: flamer2.aud
@@ -46,6 +47,7 @@ BigFlamer:
DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall
Warhead@3Eff: CreateEffect
Explosions: med_napalm
ImpactSounds: flamer2.aud
@@ -67,6 +69,7 @@ Chemspray:
DamageTypes: Prone50Percent, TriggerProne, TiberiumDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: chemball
ImpactSounds: xplos.aud
@@ -92,6 +95,7 @@ Grenade:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Eff: CreateEffect
Explosions: small_poof
ImpactSounds: xplos.aud
@@ -117,6 +121,7 @@ Napalm:
DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall
Warhead@3Eff: CreateEffect
Explosions: med_napalm
ImpactSounds: flamer2.aud
@@ -137,6 +142,7 @@ Laser:
DamageTypes: Prone50Percent, TriggerProne, FireDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Tiberium:
ReloadDelay: 16

6
mods/cnc/weapons/superweapons.yaml
View File

@@ -32,6 +32,7 @@ Atomic:
Delay: 3
Warhead@5Smu_areanukea: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall
Size: 3
Delay: 3
Warhead@6Eff_areanukea: CreateEffect
@@ -54,6 +55,7 @@ Atomic:
Delay: 6
Warhead@9Smu_areanukeb: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall
Size: 4
Delay: 6
Warhead@10Dam_areanukec: SpreadDamage
@@ -73,6 +75,7 @@ Atomic:
Delay: 9
Warhead@12Smu_areanukec: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall
Size: 5
Delay: 9
@@ -86,8 +89,10 @@ IonCannon:
DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
Warhead@2Smu_impact: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Warhead@3Smu_area: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Size: 1
Delay: 3
Warhead@4Res_area2: DestroyResource
@@ -95,5 +100,6 @@ IonCannon:
Delay: 6
Warhead@5Smu_area2: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
Size: 2,1
Delay: 6

4
mods/d2k/weapons/debris.yaml
View File

@@ -25,6 +25,7 @@ Debris:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: small_explosion
ImpactSounds: EXPLLG5.WAV
@@ -59,6 +60,7 @@ Debris2:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: EXPLLG5.WAV
@@ -93,6 +95,7 @@ Debris3:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: EXPLLG5.WAV
@@ -127,6 +130,7 @@ Debris4:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: large_explosion
ImpactSounds: EXPLLG5.WAV

54
mods/d2k/weapons/largeguns.yaml
View File

@@ -24,6 +24,7 @@
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: small_napalm
ImpactSounds: EXPLSML4.WAV
@@ -52,62 +53,17 @@
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: small_napalm
80mm_H:
Inherits: 80mm_A
ReloadDelay: 55
Range: 4c0
Report: MEDTANK1.WAV
Projectile: Bullet
Speed: 562
Inaccuracy: 380
Image: 120mm
Warhead@1Dam: SpreadDamage
Spread: 256
Falloff: 100, 50, 25, 0
Damage: 270
Versus:
none: 20
wall: 50
building: 50
wood: 60
heavy: 75
invulnerable: 0
cy: 20
harvester: 50
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
Warhead@3Eff: CreateEffect
Explosions: small_napalm
80mm_O:
Inherits: 80mm_A
ReloadDelay: 45
Range: 4c0
Report: MEDTANK1.WAV
Projectile: Bullet
Speed: 562
Inaccuracy: 380
Image: 120mm
Warhead@1Dam: SpreadDamage
Spread: 256
Falloff: 100, 50, 25, 0
Damage: 270
Versus:
none: 20
wall: 50
building: 50
wood: 60
heavy: 75
invulnerable: 0
cy: 20
harvester: 50
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
Warhead@3Eff: CreateEffect
Explosions: small_napalm
DevBullet:
ReloadDelay: 75
@@ -130,6 +86,7 @@ DevBullet:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: shockwave
ImpactSounds: EXPLMD1.WAV
@@ -161,6 +118,7 @@ DevBullet:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: EXPLMD2.WAV

6
mods/d2k/weapons/missiles.yaml
View File

@@ -27,6 +27,7 @@ Bazooka:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: tiny_explosion
ImpactSounds: EXPLSML1.WAV
@@ -59,6 +60,7 @@ Rocket:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: rocket_explosion
ExplosionPalette: effect75alpha
@@ -102,6 +104,7 @@ TowerMissile:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: small_explosion
ImpactSounds: EXPLSML1.WAV
@@ -143,6 +146,7 @@ mtank_pri:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: small_explosion
ImpactSounds: EXPLSML1.WAV
@@ -181,8 +185,6 @@ DeviatorMissile:
cy: 10
harvester: 20
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater, RockCrater
Warhead@3Eff: CreateEffect
Explosions: deviator
ExplosionPalette: deviatorgas

2
mods/d2k/weapons/other.yaml
View File

@@ -90,6 +90,7 @@ OrniBomb:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: large_explosion
ImpactSounds: NAPALM1.WAV
@@ -210,6 +211,7 @@ grenade:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SandCrater
InvalidTargets: Vehicle, Structure
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: EXPLLG5.WAV

23
mods/ra/weapons/explosions.yaml
View File

@@ -14,6 +14,7 @@ CrateNapalm:
DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Structure, Wall, Trees
Warhead@3Eff: CreateEffect
Explosions: napalm
ImpactSounds: firebl3.aud
@@ -33,6 +34,9 @@ CrateExplosion:
Warhead@2Eff: CreateEffect
Explosions: self_destruct
ImpactSounds: kaboom15.aud
Warhead@3Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Structure, Wall, Trees
CrateNuke:
ValidTargets: Ground, Trees, Water, Air
@@ -64,6 +68,7 @@ CrateNuke:
Delay: 4
Warhead@6Smu_areanuke: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Tank, Structure, Wall, Trees
Size: 5,4
Delay: 4
Warhead@7Eff_areanuke: CreateEffect
@@ -130,6 +135,7 @@ MiniNuke:
Delay: 15
Warhead@11Smu_areanuke3: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Tank, Structure, Wall, Trees
Size: 4
Delay: 15
@@ -152,6 +158,9 @@ UnitExplode:
Explosions: large_splash
ImpactSounds: splash9.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Structure, Wall, Trees
UnitExplodeShip:
Warhead@1Dam: SpreadDamage
@@ -199,6 +208,9 @@ UnitExplodeSmall:
Explosions: large_splash
ImpactSounds: splash9.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Structure, Wall, Trees
ArtilleryExplode:
Warhead@1Dam: SpreadDamage
@@ -218,6 +230,9 @@ ArtilleryExplode:
Explosions: large_splash
ImpactSounds: splash9.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Structure, Wall, Trees
V2Explode:
Inherits: SCUD
@@ -239,7 +254,7 @@ BarrelExplode:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
Size: 2,1
Size: 2
Delay: 5
Warhead@3Eff: CreateEffect
Explosions: napalm
@@ -255,6 +270,9 @@ ATMine:
Warhead@2Eff: CreateEffect
Explosions: large_explosion
ImpactSounds: mineblo1.aud
Warhead@3Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Structure, Wall, Trees
APMine:
Warhead@1Dam: SpreadDamage
@@ -265,6 +283,9 @@ APMine:
Warhead@2Eff: CreateEffect
Explosions: napalm
ImpactSounds: mine1.aud
Warhead@3Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Structure, Wall, Trees
OreExplosion:
Warhead@1Dam: SpreadDamage

9
mods/ra/weapons/largecaliber.yaml
View File

@@ -14,8 +14,6 @@
Heavy: 40
Concrete: 30
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3EffGround: CreateEffect
Explosions: small_explosion
InvalidImpactTypes: Water
@@ -41,6 +39,7 @@
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3EffGround: CreateEffect
Explosions: small_explosion
ImpactSounds: kaboom12.aud
@@ -70,6 +69,7 @@
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3EffGround: CreateEffect
Explosions: small_explosion
ImpactSounds: kaboom12.aud
@@ -100,6 +100,7 @@
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3EffGround: CreateEffect
Explosions: small_explosion
ImpactSounds: kaboom12.aud
@@ -127,6 +128,7 @@ TurretGun:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3EffGround: CreateEffect
Explosions: small_explosion
ImpactSounds: kaboom12.aud
@@ -160,6 +162,7 @@ TurretGun:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: artillery_explosion
ImpactSounds: kaboom15.aud
@@ -193,6 +196,7 @@ TurretGun:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: artillery_explosion
ImpactSounds: kaboom15.aud
@@ -220,6 +224,7 @@ TurretGun:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: small_explosion
ImpactSounds: kaboom12.aud

18
mods/ra/weapons/missiles.yaml
View File

@@ -27,6 +27,7 @@ Maverick:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: kaboom25.aud
@@ -64,6 +65,7 @@ Dragon:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: kaboom25.aud
@@ -101,6 +103,7 @@ HellfireAG:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: kaboom25.aud
@@ -137,8 +140,6 @@ HellfireAA:
Light: 75
Concrete: 50
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: med_explosion_air
ImpactSounds: kaboom25.aud
@@ -175,6 +176,7 @@ MammothTusk:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3EffGround: CreateEffect
Explosions: med_explosion
ImpactSounds: kaboom12.aud
@@ -210,8 +212,6 @@ Nike:
Light: 90
Heavy: 50
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: med_explosion_air
ImpactSounds: kaboom25.aud
@@ -239,8 +239,6 @@ RedEye:
Light: 60
Heavy: 25
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: med_explosion_air
ImpactSounds: kaboom25.aud
@@ -269,6 +267,7 @@ SubMissile:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: artillery_explosion
ImpactSounds: kaboom15.aud
@@ -306,6 +305,7 @@ Stinger:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: kaboom25.aud
@@ -344,8 +344,6 @@ StingerAA:
Light: 75
Concrete: 50
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: kaboom25.aud
@@ -385,8 +383,6 @@ TorpTube:
Light: 75
Concrete: 500
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: large_explosion
ImpactSounds: kaboom15.aud
@@ -427,6 +423,7 @@ SCUD:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: napalm
ImpactSounds: firebl3.aud
@@ -463,6 +460,7 @@ APTusk:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: kaboom25.aud

6
mods/ra/weapons/other.yaml
View File

@@ -21,6 +21,7 @@ FireballLauncher:
DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Structure, Wall
Warhead@3Eff: CreateEffect
Explosions: napalm
ImpactSounds: firebl3.aud
@@ -50,6 +51,7 @@ Flamer:
DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Structure, Wall
Warhead@3Eff: CreateEffect
Explosions: small_napalm
ImpactSounds: firebl3.aud
@@ -74,6 +76,7 @@ Napalm:
DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
Warhead@2Smu: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Structure, Wall
Warhead@3Eff: CreateEffect
Explosions: napalm
ImpactSounds: firebl3.aud
@@ -105,6 +108,7 @@ Grenade:
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: med_explosion
ImpactSounds: kaboom25.aud
@@ -134,8 +138,6 @@ DepthCharge:
Light: 75
Concrete: 50
DamageTypes: ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
Warhead@3Eff: CreateEffect
Explosions: large_splash
ImpactSounds: h2obomb2.aud

6
mods/ra/weapons/superweapons.yaml
View File

@@ -18,6 +18,7 @@ ParaBomb:
DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: Crater
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Warhead@3Eff: CreateEffect
Explosions: artillery_explosion
ImpactSounds: kaboom15.aud
@@ -41,6 +42,7 @@ Atomic:
Size: 1
Warhead@3Smu_impact: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Tank, Structure, Wall
Size: 1
Warhead@4Eff_impact: CreateEffect
Explosions: nuke
@@ -59,6 +61,7 @@ Atomic:
Delay: 5
Warhead@7Smu_areanuke1: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Size: 2
Delay: 5
Warhead@8Eff_areanuke1: CreateEffect
@@ -78,6 +81,7 @@ Atomic:
Delay: 10
Warhead@11Smu_areanuke2: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Size: 3
Delay: 10
Warhead@12Dam_areanuke3: SpreadDamage
@@ -94,6 +98,7 @@ Atomic:
Delay: 15
Warhead@14Smu_areanuke3: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Size: 4
Delay: 15
Warhead@15Dam_areanuke4: SpreadDamage
@@ -110,5 +115,6 @@ Atomic:
Delay: 20
Warhead@17Smu_areanuke4: LeaveSmudge
SmudgeType: Scorch
InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
Size: 5
Delay: 20

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

@@ -524,7 +524,7 @@
AppearsOnRadar:
UseLocation: true
Targetable@GROUND:
TargetTypes: Ground
TargetTypes: Ground, Vehicle
UpgradeTypes: airborne
UpgradeMaxEnabledLevel: 0
Targetable@AIRBORNE:
@@ -628,7 +628,7 @@
Selectable:
Bounds: 26,26,0,-3
Targetable:
TargetTypes: Ground
TargetTypes: Ground, Creep
AttackMove:
HiddenUnderFog:
PoisonedByTiberium:
@@ -742,7 +742,7 @@
Palette: pips
Selectable:
Targetable:
TargetTypes: Ground, Repair
TargetTypes: Ground, Building, Repair
Guardable:
HiddenUnderFog:
ActorLostNotification:

3
mods/ts/weapons/bombsandgrenades.yaml
View File

@@ -29,6 +29,7 @@ Grenade:
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
Bomb:
ReloadDelay: 60
@@ -61,6 +62,7 @@ Bomb:
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
RPGTower:
ReloadDelay: 80
@@ -94,3 +96,4 @@ RPGTower:
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall

4
mods/ts/weapons/energyweapons.yaml
View File

@@ -135,6 +135,7 @@ CyCannon:
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: SmallScorch
InvalidTargets: Vehicle, Building, Wall
Proton:
ReloadDelay: 50
@@ -170,6 +171,9 @@ Proton:
ExplosionPalette: player
ImpactSounds: ssplash3.aud
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumScorch
InvalidTargets: Vehicle, Building, Wall
ObeliskLaserFire:
ReloadDelay: 1

6
mods/ts/weapons/explosions.yaml
View File

@@ -12,6 +12,9 @@ UnitExplode:
Warhead@2Eff: CreateEffect
Explosions: large_twlt
ImpactSounds: expnew09.aud
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Building, Wall
UnitExplodeSmall:
Warhead@1Dam: SpreadDamage
@@ -26,6 +29,9 @@ UnitExplodeSmall:
Warhead@2Eff: CreateEffect
Explosions: medium_brnl
ImpactSounds: expnew13.aud
Warhead@4Smu: LeaveSmudge
SmudgeType: SmallCrater
InvalidTargets: Building, Wall
CyborgExplode:
Warhead@1Eff: CreateEffect

4
mods/ts/weapons/largeguns.yaml
View File

@@ -29,6 +29,7 @@
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: SmallCrater
InvalidTargets: Vehicle, Building, Wall
120mm:
ReloadDelay: 80
@@ -57,6 +58,7 @@
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
120mmx:
ReloadDelay: 80
@@ -91,6 +93,7 @@
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
155mm:
ReloadDelay: 110
@@ -125,3 +128,4 @@
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall

5
mods/ts/weapons/missiles.yaml
View File

@@ -42,6 +42,7 @@ Bazooka:
ImpactSounds: expnew05.aud
Warhead@5Smu: LeaveSmudge
SmudgeType: SmallCrater
InvalidTargets: Vehicle, Building, Wall
HoverMissile:
ReloadDelay: 68
@@ -88,6 +89,7 @@ HoverMissile:
ImpactSounds: expnew06.aud
Warhead@5: LeaveSmudge
SmudgeType: SmallCrater
InvalidTargets: Vehicle, Building, Wall
MammothTusk:
ReloadDelay: 80
@@ -170,6 +172,7 @@ BikeMissile:
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: SmallCrater
InvalidTargets: Vehicle, Building, Wall
Dragon:
ReloadDelay: 50
@@ -216,6 +219,7 @@ Dragon:
ImpactSounds: expnew06.aud
Warhead@5Smu: LeaveSmudge
SmudgeType: SmallCrater
InvalidTargets: Vehicle, Building, Wall
Hellfire:
ReloadDelay: 50
@@ -262,6 +266,7 @@ Hellfire:
ImpactSounds: expnew06.aud
Warhead@5Smu: LeaveSmudge
SmudgeType: SmallCrater
InvalidTargets: Vehicle, Building, Wall
RedEye2:
ReloadDelay: 55

1
mods/ts/weapons/otherweapons.yaml
View File

@@ -20,6 +20,7 @@ FireballLauncher:
DamageTypes: Prone100Percent, TriggerProne, FireDeath
Warhead@2Smu: LeaveSmudge
SmudgeType: SmallScorch
InvalidTargets: Vehicle, Building, Wall
FiendShard:
ReloadDelay: 30

9
mods/ts/weapons/superweapons.yaml
View File

@@ -37,6 +37,7 @@ MultiCluster:
ValidImpactTypes: Water
Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater
InvalidTargets: Vehicle, Building, Wall
SuicideBomb:
ReloadDelay: 1
@@ -74,7 +75,8 @@ IonCannon:
DamageTypes: Prone50Percent, TriggerProne, EnergyDeath
Warhead@4Smu_area: LeaveSmudge
SmudgeType: SmallScorch
Size: 2,1
InvalidTargets: Vehicle, Building, Wall
Size: 2
Delay: 3
EMPulseCannon:
@@ -111,6 +113,7 @@ ClusterMissile:
Size: 1
Warhead@ClusterSmudges0: LeaveSmudge
SmudgeType: LargeCrater
InvalidTargets: Vehicle, Building, Wall
Size: 1
Warhead@ClusterDamage1: SpreadDamage
Spread: 2c0
@@ -126,6 +129,7 @@ ClusterMissile:
Delay: 5
Warhead@ClusterSmudges1: LeaveSmudge
SmudgeType: LargeScorch
InvalidTargets: Vehicle, Building, Wall
Size: 2
Delay: 5
Warhead@ClusterDamage2: SpreadDamage
@@ -142,6 +146,7 @@ ClusterMissile:
Delay: 10
Warhead@ClusterSmudges2: LeaveSmudge
SmudgeType: LargeScorch
InvalidTargets: Vehicle, Building, Wall
Size: 3
Delay: 10
Warhead@ClusterDamage3: SpreadDamage
@@ -158,6 +163,7 @@ ClusterMissile:
Delay: 15
Warhead@ClusterSmudges3: LeaveSmudge
SmudgeType: MediumScorch
InvalidTargets: Vehicle, Building, Wall
Size: 4
Delay: 15
Warhead@ClusterDamage4: SpreadDamage
@@ -174,5 +180,6 @@ ClusterMissile:
Delay: 20
Warhead@ClusterSmudges4: LeaveSmudge
SmudgeType: SmallScorch
InvalidTargets: Vehicle, Building, Wall
Size: 5
Delay: 20