diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 0601877d6b..5351584631 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -215,7 +215,9 @@ UpgradeTypes: hazmatsuits UpgradeMaxEnabledLevel: 0 Terrain: Tiberium, BlueTiberium - Weapon: Tiberium + Damage: 2 + DamageInterval: 16 + DamageTypes: TiberiumDeath GlobalUpgradable@BIO: Upgrades: hazmatsuits Prerequisites: bio @@ -420,7 +422,9 @@ Voice: Move Guardable: DamagedByTerrain: - Weapon: Heal + Damage: -1 + DamageInterval: 4 + DamageTypes: TiberiumDeath Terrain: Tiberium, BlueTiberium Voiced: VoiceSet: DinoVoice diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml index c6a5c1a409..6ae400d624 100644 --- a/mods/cnc/weapons/other.yaml +++ b/mods/cnc/weapons/other.yaml @@ -144,13 +144,6 @@ Laser: SmudgeType: Scorch InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep -Tiberium: - ReloadDelay: 16 - Warhead@1Dam: SpreadDamage - Spread: 42 - Damage: 2 - DamageTypes: TiberiumDeath - TiberiumExplosion: Warhead@1Dam: SpreadDamage Spread: 9 @@ -168,12 +161,6 @@ TiberiumExplosion: Explosions: chemball ImpactSounds: xplosml2.aud -Heal: - ReloadDelay: 4 - Warhead@1Dam: SpreadDamage - Spread: 42 - Damage: -1 - Tail: ReloadDelay: 30 Range: 1c0 diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index 8abff7fb97..c0c9116a9b 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -280,7 +280,8 @@ WithCrumbleOverlay: Demolishable: DamagedByTerrain: - Weapon: weathering + Damage: 10 + DamageInterval: 100 Terrain: Rock DamageThreshold: 50 StartOnThreshold: true diff --git a/mods/d2k/weapons/other.yaml b/mods/d2k/weapons/other.yaml index 93c89fcde5..4864fca353 100644 --- a/mods/d2k/weapons/other.yaml +++ b/mods/d2k/weapons/other.yaml @@ -216,11 +216,6 @@ grenade: Explosions: med_explosion ImpactSounds: EXPLLG5.WAV -Weathering: - ReloadDelay: 100 - Warhead@1Dam: SpreadDamage - Damage: 10 - GrenDeath: Warhead@1Dam: SpreadDamage Spread: 320 diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 7cb1ba4291..1a0f72761d 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -25,6 +25,7 @@ WEEDGUY: UMAGON: Inherits: ^Soldier + Inherits@2: ^HealsOnTiberium Valued: Cost: 400 Tooltip: @@ -35,9 +36,6 @@ UMAGON: Speed: 71 Health: HP: 150 - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Passenger: RevealsShroud: Range: 7c0 @@ -83,6 +81,7 @@ CHAMSPY: MUTANT: Inherits: ^Soldier + Inherits@2: ^HealsOnTiberium Valued: Cost: 100 Tooltip: @@ -91,9 +90,6 @@ MUTANT: VoiceSet: Mutant Health: HP: 50 - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Mobile: Speed: 56 RevealsShroud: @@ -109,6 +105,7 @@ MUTANT: MWMN: Inherits: ^Soldier + Inherits@2: ^HealsOnTiberium Valued: Cost: 100 Tooltip: @@ -117,9 +114,6 @@ MWMN: VoiceSet: CivilianFemale Health: HP: 50 - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Mobile: Speed: 56 RevealsShroud: @@ -135,6 +129,7 @@ MWMN: MUTANT3: Inherits: ^Soldier + Inherits@2: ^HealsOnTiberium Valued: Cost: 100 Tooltip: @@ -143,9 +138,6 @@ MUTANT3: VoiceSet: Mutant Health: HP: 50 - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Mobile: Speed: 56 RevealsShroud: @@ -161,6 +153,7 @@ MUTANT3: TRATOS: Inherits: ^Soldier + Inherits@2: ^HealsOnTiberium Valued: Cost: 100 Tooltip: @@ -169,9 +162,6 @@ TRATOS: VoiceSet: Tratos Health: HP: 200 - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Mobile: Speed: 71 RevealsShroud: @@ -219,15 +209,13 @@ SLAV: DOGGIE: Inherits@1: ^Infantry Inherits@2: ^RegularInfantryDeath + Inherits@3: ^HealsOnTiberium Tooltip: Name: Tiberian Fiend Health: HP: 250 Shape: Circle Radius: 213 - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Valued: Cost: 100 Armor: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index be1f92f4e6..fa421cf784 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -288,7 +288,9 @@ ActorLostNotification: DamagedByTerrain: Terrain: Tiberium, BlueTiberium - Weapon: Tiberium + Damage: 2 + DamageInterval: 16 + DamageTypes: ExplosionDeath, TriggerVisceroid Guard: Voice: Move Guardable: @@ -376,6 +378,7 @@ ^Cyborg: Inherits@1: ^Infantry Inherits@2: ^EmpDisableMobile + Inherits@3: ^HealsOnTiberium ExplosionOnDamageTransition: Weapon: CyborgExplode DamageState: Critical @@ -387,9 +390,6 @@ RevealsShroud: Range: 4c0 MustBeDestroyed: - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium WithPermanentInjury: WithInfantryBody: AttackSequence: attack @@ -609,6 +609,7 @@ ^Visceroid: Inherits@1: ^ExistsInWorld Inherits@2: ^SpriteActor + Inherits@3: ^HealsOnTiberium DrawLineToTarget: Health: Shape: Circle @@ -638,9 +639,6 @@ TargetTypes: Ground, Creep AttackMove: HiddenUnderFog: - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Guardable: WithSpriteBody: @@ -871,3 +869,9 @@ WallConnections: 0,-1, 0,3 LineBuildNode: Connections: 0,-1, 0,1 + +^HealsOnTiberium: + DamagedByTerrain: + Damage: -2 + DamageInterval: 16 + Terrain: Tiberium, BlueTiberium diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index e5db95918b..9babe4779b 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -95,6 +95,7 @@ JUMPJET: GHOST: Inherits: ^Soldier + Inherits@2: ^HealsOnTiberium Valued: Cost: 1750 Tooltip: @@ -113,9 +114,6 @@ GHOST: Speed: 56 Health: HP: 200 - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Passenger: RevealsShroud: Range: 6c0 diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 4499c541a6..66a92798cc 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -95,6 +95,7 @@ CYC2: MHIJACK: Inherits: ^Soldier + Inherits@2: ^HealsOnTiberium Buildable: Queue: Infantry BuildPaletteOrder: 60 @@ -109,9 +110,6 @@ MHIJACK: VoiceSet: Hijacker Health: HP: 300 - DamagedByTerrain: - Weapon: TiberiumHeal - Terrain: Tiberium, BlueTiberium Mobile: Speed: 99 -Crushable: diff --git a/mods/ts/weapons/healweapons.yaml b/mods/ts/weapons/healweapons.yaml index 05cf9c1a1b..6e82fbdff3 100644 --- a/mods/ts/weapons/healweapons.yaml +++ b/mods/ts/weapons/healweapons.yaml @@ -23,9 +23,3 @@ Repair: Spread: 213 Damage: -50 ValidTargets: Repair - -TiberiumHeal: - ReloadDelay: 16 - Warhead@1Dam: SpreadDamage - Spread: 42 - Damage: -2 diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index 17008b09d4..b06dfae0af 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/mods/ts/weapons/otherweapons.yaml @@ -61,13 +61,6 @@ SlimeAttack: Concrete: 20 DamageTypes: Prone100Percent, TriggerProne, SmallExplosionDeath -Tiberium: - ReloadDelay: 16 - Warhead@1Dam: SpreadDamage - Spread: 42 - Damage: 2 - DamageTypes: ExplosionDeath, TriggerVisceroid - Veins: ReloadDelay: 16 Warhead@Damage: SpreadDamage