diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index d4fa156c20..bc921226ae 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -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: diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml index 97b1033a5a..d9d8bff90d 100644 --- a/mods/ts/weapons/bombsandgrenades.yaml +++ b/mods/ts/weapons/bombsandgrenades.yaml @@ -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 diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml index e8dba50916..60bd6cd74f 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -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 diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml index f51b23ca8e..b950dc267e 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/mods/ts/weapons/explosions.yaml @@ -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 diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml index cb692f0ec4..95d277f1e8 100644 --- a/mods/ts/weapons/largeguns.yaml +++ b/mods/ts/weapons/largeguns.yaml @@ -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 diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml index 9cf2d75c4b..3d7ea66cd0 100644 --- a/mods/ts/weapons/missiles.yaml +++ b/mods/ts/weapons/missiles.yaml @@ -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 diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index fe66744197..17008b09d4 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -20,6 +20,7 @@ FireballLauncher: DamageTypes: Prone100Percent, TriggerProne, FireDeath Warhead@2Smu: LeaveSmudge SmudgeType: SmallScorch + InvalidTargets: Vehicle, Building, Wall FiendShard: ReloadDelay: 30 diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index cbbbb7edb0..b72e0d162d 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -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