From fa3e7b5e1b6a948ff40179bcdcf25bf0df0bbc51 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 17 Aug 2014 21:54:58 +1200 Subject: [PATCH] Convert versus to integers. --- OpenRA.Game/GameRules/DamageWarhead.cs | 21 +- OpenRA.Utility/UpgradeRules.cs | 9 +- mods/cnc/maps/gdi01/map.yaml | 2 +- mods/cnc/maps/gdi04c/map.yaml | 2 +- mods/cnc/weapons.yaml | 372 +++++++++--------- mods/d2k/weapons.yaml | 272 ++++++------- mods/ra/maps/drop-zone-w/map.yaml | 14 +- mods/ra/maps/fort-lonestar/map.yaml | 72 ++-- mods/ra/maps/training-camp/map.yaml | 24 +- mods/ra/weapons.yaml | 517 ++++++++++++------------- mods/ts/weapons.yaml | 360 ++++++++--------- 11 files changed, 835 insertions(+), 830 deletions(-) diff --git a/OpenRA.Game/GameRules/DamageWarhead.cs b/OpenRA.Game/GameRules/DamageWarhead.cs index c5cd27dea5..ad20e891c9 100644 --- a/OpenRA.Game/GameRules/DamageWarhead.cs +++ b/OpenRA.Game/GameRules/DamageWarhead.cs @@ -31,27 +31,26 @@ namespace OpenRA.GameRules public readonly int ProneModifier = 50; [FieldLoader.LoadUsing("LoadVersus")] - [Desc("Damage vs each armortype. 0% = can't target.")] - public readonly Dictionary Versus; + [Desc("Damage percentage versus each armortype. 0% = can't target.")] + public readonly Dictionary Versus; public static object LoadVersus(MiniYaml yaml) { var nd = yaml.ToDictionary(); return nd.ContainsKey("Versus") - ? nd["Versus"].ToDictionary(my => FieldLoader.GetValue("(value)", my.Value)) - : new Dictionary(); + ? nd["Versus"].ToDictionary(my => FieldLoader.GetValue("(value)", my.Value)) + : new Dictionary(); } public int DamageVersus(ActorInfo victim) { var armor = victim.Traits.GetOrDefault(); - if (armor == null || armor.Type == null) - return 100; - - // TODO: Change versus definitions to integer percentages - float versus; - if (Versus.TryGetValue(armor.Type, out versus)) - return (int)(versus * 100); + if (armor != null && armor.Type != null) + { + int versus; + if (Versus.TryGetValue(armor.Type, out versus)) + return versus; + } return 100; } diff --git a/OpenRA.Utility/UpgradeRules.cs b/OpenRA.Utility/UpgradeRules.cs index c1e348eda7..fe0ec8c408 100644 --- a/OpenRA.Utility/UpgradeRules.cs +++ b/OpenRA.Utility/UpgradeRules.cs @@ -29,7 +29,7 @@ namespace OpenRA.Utility static void ConvertFloatArrayToPercentArray(ref string input) { input = string.Join(", ", input.Split(',') - .Select(s => ((int)(float.Parse(s) * 100)).ToString())); + .Select(s => ((int)Math.Round(FieldLoader.GetValue("(float value)", s) * 100)).ToString())); } static void ConvertPxToRange(ref string input) @@ -755,6 +755,13 @@ namespace OpenRA.Utility } } + if (engineVersion < 20140821) + { + // Converted versus definitions to integers + if (depth == 3 && parentKey == "Versus") + ConvertFloatArrayToPercentArray(ref node.Value.Value); + } + UpgradeWeaponRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index c06e937d74..8948d0b9f6 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -541,7 +541,7 @@ Weapons: BoatMissile: Warhead: SpreadDamage Versus: - Heavy: 50% + Heavy: 50 Damage: 50 Voices: diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 91929a834d..705d4534a2 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -919,7 +919,7 @@ Weapons: Rockets: Warhead: SpreadDamage Versus: - None: 20% + None: 20 Voices: diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index ce1ffc0909..cf9199b9b4 100644 --- a/mods/cnc/weapons.yaml +++ b/mods/cnc/weapons.yaml @@ -29,10 +29,10 @@ UnitExplode: Damage: 500 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: poof ImpactSound: xplobig6.aud @@ -43,10 +43,10 @@ UnitExplodeSmall: Damage: 40 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: big_frag ImpactSound: xplobig4.aud @@ -57,10 +57,10 @@ GrenadierExplode: Damage: 10 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: poof ImpactSound: xplosml2.aud @@ -74,10 +74,10 @@ Atomic: InfDeath: 5 ValidTargets: Ground, Air Versus: - None: 100% - Wood: 100% - Light: 60% - Heavy: 50% + None: 100 + Wood: 100 + Light: 60 + Heavy: 50 Warhead@2Eff_impact: CreateEffect Explosion: 6 ImpactSound: nukexplo.aud @@ -88,10 +88,10 @@ Atomic: Delay: 3 ValidTargets: Ground, Air Versus: - None: 100% - Wood: 100% - Light: 60% - Heavy: 50% + None: 100 + Wood: 100 + Light: 60 + Heavy: 50 Warhead@4Res_areanukea: DestroyResource Size: 3 Delay: 3 @@ -109,10 +109,10 @@ Atomic: Delay: 6 ValidTargets: Ground, Air Versus: - None: 100% - Wood: 100% - Light: 60% - Heavy: 50% + None: 100 + Wood: 100 + Light: 60 + Heavy: 50 Warhead@8Res_areanukeb: DestroyResource Size: 4 Delay: 6 @@ -127,10 +127,10 @@ Atomic: Delay: 9 ValidTargets: Ground, Air Versus: - None: 100% - Wood: 100% - Light: 60% - Heavy: 50% + None: 100 + Wood: 100 + Light: 60 + Heavy: 50 Warhead@11Res_areanukec: DestroyResource Size: 5 Delay: 9 @@ -188,10 +188,10 @@ HighV: Damage: 30 InfDeath: 2 Versus: - None: 100% - Wood: 50% - Light: 70% - Heavy: 35% + None: 100 + Wood: 50 + Light: 70 + Heavy: 35 Warhead@2Eff: CreateEffect Explosion: piffs @@ -211,10 +211,10 @@ HeliAGGun: InfDeath: 2 ValidTargets: Ground Versus: - None: 100% - Wood: 50% - Light: 75% - Heavy: 25% + None: 100 + Wood: 50 + Light: 75 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: piffs @@ -234,10 +234,10 @@ HeliAAGun: InfDeath: 2 ValidTargets: Air Versus: - None: 100% - Wood: 50% - Light: 50% - Heavy: 25% + None: 100 + Wood: 50 + Light: 50 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: piffs @@ -254,10 +254,10 @@ Pistol: InfDeath: 2 InvalidTargets: Wall Versus: - None: 100% - Wood: 50% - Light: 50% - Heavy: 25% + None: 100 + Wood: 50 + Light: 50 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: piff @@ -274,10 +274,10 @@ M16: InfDeath: 2 InvalidTargets: Wall Versus: - None: 100% - Wood: 25% - Light: 30% - Heavy: 10% + None: 100 + Wood: 25 + Light: 30 + Heavy: 10 Warhead@2Eff: CreateEffect Explosion: piff @@ -302,11 +302,11 @@ Rockets: InfDeath: 4 ValidTargets: Ground, Air Versus: - None: 50% - Wood: 85% - Light: 100% - Heavy: 100% - Concrete: 25% + None: 50 + Wood: 85 + Light: 100 + Heavy: 100 + Concrete: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -336,11 +336,11 @@ BikeRockets: InfDeath: 4 ValidTargets: Ground, Air Versus: - None: 25% - Wood: 75% - Light: 100% - Heavy: 100% - Concrete: 50% + None: 25 + Wood: 75 + Light: 100 + Heavy: 100 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -370,10 +370,10 @@ OrcaAGMissiles: InfDeath: 4 ValidTargets: Ground Versus: - None: 50% - Wood: 100% - Light: 100% - Heavy: 75% + None: 50 + Wood: 100 + Light: 100 + Heavy: 75 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -403,8 +403,8 @@ OrcaAAMissiles: InfDeath: 4 ValidTargets: Air Versus: - Light: 75% - Heavy: 50% + Light: 75 + Heavy: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -424,10 +424,10 @@ Flamethrower: InfDeath: 5 InvalidTargets: Wall Versus: - None: 100% - Wood: 100% - Light: 100% - Heavy: 20% + None: 100 + Wood: 100 + Light: 100 + Heavy: 20 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -449,10 +449,10 @@ BigFlamer: InfDeath: 5 InvalidTargets: Wall Versus: - None: 100% - Wood: 100% - Light: 67% - Heavy: 25% + None: 100 + Wood: 100 + Light: 67 + Heavy: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -470,10 +470,10 @@ Chemspray: Damage: 80 InfDeath: 6 Versus: - None: 100% - Wood: 35% - Light: 75% - Heavy: 50% + None: 100 + Wood: 35 + Light: 75 + Heavy: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -495,10 +495,10 @@ Grenade: Damage: 50 InfDeath: 3 Versus: - None: 100% - Wood: 50% - Light: 75% - Heavy: 35% + None: 100 + Wood: 50 + Light: 75 + Heavy: 35 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -517,11 +517,11 @@ Grenade: Damage: 25 InfDeath: 4 Versus: - None: 25% - Wood: 75% - Light: 100% - Heavy: 100% - Concrete: 50% + None: 25 + Wood: 75 + Light: 100 + Heavy: 100 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -540,10 +540,10 @@ Grenade: Damage: 30 InfDeath: 4 Versus: - None: 30% - Wood: 75% - Light: 75% - Heavy: 100% + None: 30 + Wood: 75 + Light: 75 + Heavy: 100 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -562,11 +562,11 @@ Grenade: Damage: 40 InfDeath: 4 Versus: - None: 25% - Wood: 100% - Light: 100% - Heavy: 100% - Concrete: 50% + None: 25 + Wood: 100 + Light: 100 + Heavy: 100 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -587,11 +587,11 @@ Grenade: Damage: 40 InfDeath: 4 Versus: - None: 25% - Wood: 100% - Light: 100% - Heavy: 100% - Concrete: 100% + None: 25 + Wood: 100 + Light: 100 + Heavy: 100 + Concrete: 100 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -610,10 +610,10 @@ TurretGun: Damage: 40 InfDeath: 4 Versus: - None: 20% - Wood: 25% - Light: 100% - Heavy: 100% + None: 20 + Wood: 25 + Light: 100 + Heavy: 100 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -643,10 +643,10 @@ MammothMissiles: InfDeath: 4 ValidTargets: Ground, Air Versus: - None: 50% - Wood: 75% - Light: 100% - Heavy: 50% + None: 50 + Wood: 75 + Light: 100 + Heavy: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -683,10 +683,10 @@ MammothMissiles: InfDeath: 4 ValidTargets: Ground Versus: - None: 35% - Wood: 60% - Light: 100% - Heavy: 50% + None: 35 + Wood: 60 + Light: 100 + Heavy: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -716,10 +716,10 @@ MammothMissiles: InfDeath: 4 ValidTargets: Ground, Air Versus: - None: 25% - Wood: 75% - Light: 100% - Heavy: 90% + None: 25 + Wood: 75 + Light: 100 + Heavy: 90 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -743,10 +743,10 @@ ArtilleryShell: Damage: 150 InfDeath: 3 Versus: - None: 100% - Wood: 80% - Light: 75% - Heavy: 50% + None: 100 + Wood: 80 + Light: 75 + Heavy: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -767,11 +767,11 @@ MachineGun: InfDeath: 2 InvalidTargets: Wall Versus: - None: 100% - Wood: 20% - Light: 50% - Heavy: 20% - Concrete: 10% + None: 100 + Wood: 20 + Light: 50 + Heavy: 20 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs @@ -796,10 +796,10 @@ BoatMissile: Damage: 60 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -832,10 +832,10 @@ TowerMissle: InfDeath: 3 ValidTargets: Ground Versus: - None: 50% - Wood: 25% - Light: 100% - Heavy: 100% + None: 50 + Wood: 25 + Light: 100 + Heavy: 100 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -855,10 +855,10 @@ Vulcan: InfDeath: 2 ValidTargets: Ground, Water Versus: - None: 100% - Wood: 25% - Light: 100% - Heavy: 35% + None: 100 + Wood: 25 + Light: 100 + Heavy: 35 Warhead@2Eff: CreateEffect Explosion: piffs @@ -876,10 +876,10 @@ Napalm: InfDeath: 5 ValidTargets: Ground, Water Versus: - None: 100% - Wood: 100% - Light: 100% - Heavy: 80% + None: 100 + Wood: 100 + Light: 100 + Heavy: 80 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -892,10 +892,10 @@ Napalm.Crate: Damage: 500 InfDeath: 5 Versus: - None: 90% - Wood: 100% - Light: 60% - Heavy: 25% + None: 90 + Wood: 100 + Light: 60 + Heavy: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -915,7 +915,7 @@ Laser: Damage: 360 InfDeath: 5 Versus: - Wood: 50% + Wood: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch @@ -937,10 +937,10 @@ SAMMissile: Spread: 682 ValidTargets: Air Versus: - None: 100% - Wood: 100% - Light: 100% - Heavy: 75% + None: 100 + Wood: 100 + Light: 100 + Heavy: 75 InfDeath: 4 Damage: 30 Warhead@2Smu: LeaveSmudge @@ -968,10 +968,10 @@ HonestJohn: Damage: 100 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -992,10 +992,10 @@ TiberiumExplosion: Damage: 10 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Res: CreateResource AddsResourceType: Tiberium Size: 1,1 @@ -1022,10 +1022,10 @@ APCGun: Damage: 15 ValidTargets: Ground Versus: - None: 50% - Wood: 50% - Light: 100% - Heavy: 50% + None: 50 + Wood: 50 + Light: 100 + Heavy: 50 Warhead@2Eff: CreateEffect Explosion: small_poof @@ -1042,7 +1042,7 @@ APCGun.AA: Damage: 25 ValidTargets: Air Versus: - Heavy: 50% + Heavy: 50 Warhead@2Eff: CreateEffect Explosion: small_frag @@ -1065,10 +1065,10 @@ Patriot: Spread: 682 ValidTargets: Air Versus: - None: 100% - Wood: 100% - Light: 100% - Heavy: 75% + None: 100 + Wood: 100 + Light: 100 + Heavy: 75 InfDeath: 4 Damage: 32 Warhead@2Smu: LeaveSmudge @@ -1087,11 +1087,11 @@ Tail: Damage: 180 InfDeath: 1 Versus: - None: 90% - Wood: 10% - Light: 30% - Heavy: 10% - Concrete: 10% + None: 90 + Wood: 10 + Light: 30 + Heavy: 10 + Concrete: 10 Horn: ReloadDelay: 20 @@ -1103,11 +1103,11 @@ Horn: Damage: 120 InfDeath: 1 Versus: - None: 90% - Wood: 10% - Light: 30% - Heavy: 10% - Concrete: 10% + None: 90 + Wood: 10 + Light: 30 + Heavy: 10 + Concrete: 10 Teeth: ReloadDelay: 30 @@ -1119,11 +1119,11 @@ Teeth: Damage: 180 InfDeath: 1 Versus: - None: 90% - Wood: 10% - Light: 30% - Heavy: 10% - Concrete: 10% + None: 90 + Wood: 10 + Light: 30 + Heavy: 10 + Concrete: 10 Claw: ReloadDelay: 10 @@ -1135,11 +1135,11 @@ Claw: Damage: 60 InfDeath: 1 Versus: - None: 90% - Wood: 10% - Light: 30% - Heavy: 10% - Concrete: 10% + None: 90 + Wood: 10 + Light: 30 + Heavy: 10 + Concrete: 10 Demolish: Warhead@1Dam: SpreadDamage diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index f68ecd0ac1..b67dbd9051 100644 --- a/mods/d2k/weapons.yaml +++ b/mods/d2k/weapons.yaml @@ -13,10 +13,10 @@ LMG: Damage: 15 InfDeath: 2 Versus: - Wood: 25% - Light: 40% - Heavy: 10% - Concrete: 20% + Wood: 25 + Light: 40 + Heavy: 10 + Concrete: 20 Warhead@2Eff: CreateEffect Explosion: piffs @@ -39,11 +39,11 @@ Bazooka: InfDeath: 4 ValidTargets: Ground Versus: - None: 10% - Wood: 75% - Light: 60% - Heavy: 90% - Concrete: 40% + None: 10 + Wood: 75 + Light: 60 + Heavy: 90 + Concrete: 40 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -65,11 +65,11 @@ Sniper: Damage: 60 InfDeath: 2 Versus: - None: 100% - Wood: 0% - Light: 1% - Heavy: 0% - Concrete: 0% + None: 100 + Wood: 0 + Light: 1 + Heavy: 0 + Concrete: 0 Vulcan: ReloadDelay: 30 @@ -88,10 +88,10 @@ Vulcan: InfDeath: 2 ValidTargets: Ground, Air Versus: - Wood: 0% - Light: 60% - Heavy: 10% - Concrete: 0% + Wood: 0 + Light: 60 + Heavy: 10 + Concrete: 0 Warhead@2Eff: CreateEffect Explosion: piffs @@ -114,11 +114,11 @@ Slung: InfDeath: 4 ValidTargets: Ground Versus: - None: 0% - Wood: 75% - Light: 40% - Heavy: 90% - Concrete: 50% + None: 0 + Wood: 75 + Light: 40 + Heavy: 90 + Concrete: 50 Warhead@2Eff: CreateEffect Explosion: small_explosion ImpactSound: EXPLLG5.WAV @@ -140,10 +140,10 @@ HMG: Damage: 30 InfDeath: 2 Versus: - Wood: 15% - Light: 45% - Heavy: 20% - Concrete: 20% + Wood: 15 + Light: 45 + Heavy: 20 + Concrete: 20 Warhead@2Eff: CreateEffect Explosion: piffs @@ -164,10 +164,10 @@ HMGo: Damage: 40 InfDeath: 2 Versus: - Wood: 15% - Light: 45% - Heavy: 25% - Concrete: 20% + Wood: 15 + Light: 45 + Heavy: 25 + Concrete: 20 Warhead@2Eff: CreateEffect Explosion: piffs @@ -191,11 +191,11 @@ QuadRockets: InfDeath: 4 ValidTargets: Ground, Air Versus: - None: 35% - Wood: 45% - Light: 100% - Heavy: 100% - Concrete: 35% + None: 35 + Wood: 45 + Light: 100 + Heavy: 100 + Concrete: 35 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -217,10 +217,10 @@ TurretGun: Damage: 55 InfDeath: 4 Versus: - None: 50% - Wood: 75% - Light: 100% - Concrete: 65% + None: 50 + Wood: 75 + Light: 100 + Concrete: 65 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -251,11 +251,11 @@ TowerMissile: InfDeath: 3 ValidTargets: Ground, Air Versus: - None: 50% - Wood: 45% - Light: 100% - Heavy: 50% - Concrete: 35% + None: 50 + Wood: 45 + Light: 100 + Heavy: 50 + Concrete: 35 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -275,10 +275,10 @@ TowerMissile: Damage: 40 InfDeath: 4 Versus: - None: 50% - Wood: 50% - Light: 100% - Concrete: 50% + None: 50 + Wood: 50 + Light: 100 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -298,10 +298,10 @@ TowerMissile: Damage: 40 InfDeath: 4 Versus: - None: 50% - Wood: 50% - Light: 100% - Concrete: 50% + None: 50 + Wood: 50 + Light: 100 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -320,11 +320,11 @@ DevBullet: Damage: 100 InfDeath: 4 Versus: - None: 100% - Wood: 50% - Light: 100% - Heavy: 100% - Concrete: 80% + None: 100 + Wood: 50 + Light: 100 + Heavy: 100 + Concrete: 80 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -354,11 +354,11 @@ DevBullet: InfDeath: 4 ValidTargets: Ground Versus: - None: 20% - Wood: 50% - Light: 100% - Heavy: 50% - Concrete: 80% + None: 20 + Wood: 50 + Light: 100 + Heavy: 50 + Concrete: 80 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -383,9 +383,9 @@ FakeMissile: Spread: 96 Damage: 10 Versus: - None: 0% - Wood: 0% - Concrete: 0% + None: 0 + Wood: 0 + Concrete: 0 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -410,11 +410,11 @@ FakeMissile: Damage: 100 InfDeath: 3 Versus: - None: 100% - Wood: 80% - Light: 75% - Heavy: 50% - Concrete: 100% + None: 100 + Wood: 80 + Light: 75 + Heavy: 50 + Concrete: 100 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater, RockCrater Warhead@3Eff: CreateEffect @@ -435,10 +435,10 @@ Sound: Damage: 150 InfDeath: 6 Versus: - None: 60% - Wood: 85% - Light: 80% - Concrete: 75% + None: 60 + Wood: 85 + Light: 80 + Concrete: 75 ChainGun: ReloadDelay: 10 @@ -453,10 +453,10 @@ ChainGun: Damage: 20 InfDeath: 2 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@2Eff: CreateEffect Explosion: piffs @@ -471,10 +471,10 @@ Heal: Damage: -50 InfDeath: 1 Versus: - Wood: 0% - Light: 0% - Heavy: 0% - Concrete: 0% + Wood: 0 + Light: 0 + Heavy: 0 + Concrete: 0 WormJaw: ReloadDelay: 10 @@ -484,8 +484,8 @@ WormJaw: Spread: 160 Damage: 100 Versus: - Wood: 0% - Concrete: 0% + Wood: 0 + Concrete: 0 ParaBomb: ReloadDelay: 10 @@ -498,10 +498,10 @@ ParaBomb: Damage: 500 InfDeath: 4 Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -518,11 +518,11 @@ Napalm: Damage: 300 InfDeath: 4 Versus: - None: 20% - Wood: 100% - Light: 30% - Heavy: 20% - Concrete: 70% + None: 20 + Wood: 100 + Light: 30 + Heavy: 20 + Concrete: 70 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -547,11 +547,11 @@ Atomic: Damage: 1800 InfDeath: 5 Versus: - None: 100% - Wood: 100% - Light: 100% - Heavy: 50% - Concrete: 50% + None: 100 + Wood: 100 + Light: 100 + Heavy: 50 + Concrete: 50 Warhead@2Eff: CreateEffect Explosion: nuke ImpactSound: EXPLLG2.WAV @@ -562,11 +562,11 @@ CrateNuke: Damage: 800 InfDeath: 5 Versus: - None: 20% - Wood: 75% - Light: 25% - Heavy: 25% - Concrete: 50% + None: 20 + Wood: 75 + Light: 25 + Heavy: 25 + Concrete: 50 Warhead@2Eff: CreateEffect Explosion: nuke ImpactSound: EXPLLG2.WAV @@ -577,10 +577,10 @@ CrateExplosion: Damage: 400 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: building ImpactSound: EXPLSML4.WAV @@ -591,10 +591,10 @@ UnitExplode: Damage: 500 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: building ImpactSound: EXPLMD1.WAV @@ -605,10 +605,10 @@ UnitExplodeSmall: Damage: 60 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: self_destruct ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV @@ -619,10 +619,10 @@ UnitExplodeTiny: Damage: 30 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: med_explosion ImpactSound: EXPLMD2.WAV, EXPLSML1.WAV, EXPLSML2.WAV, EXPLSML3.WAV @@ -633,10 +633,10 @@ UnitExplodeScale: Damage: 90 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: building ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV @@ -656,10 +656,10 @@ Grenade: Damage: 60 InfDeath: 3 Versus: - None: 50% - Wood: 100% - Light: 25% - Heavy: 5% + None: 50 + Wood: 100 + Light: 25 + Heavy: 5 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect @@ -686,10 +686,10 @@ Shrapnel: Damage: 60 InfDeath: 3 Versus: - None: 50% - Wood: 100% - Light: 25% - Heavy: 5% + None: 50 + Wood: 100 + Light: 25 + Heavy: 5 Warhead@2Smu: LeaveSmudge SmudgeType: SandCrater Warhead@3Eff: CreateEffect @@ -702,10 +702,10 @@ SpiceExplosion: Damage: 10 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Res: CreateResource AddsResourceType: Spice Size: 2,2 diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 3a1ed4a6a3..c99546fa8a 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -316,10 +316,10 @@ Weapons: Warhead: SpreadDamage Spread: 128 Versus: - None: 60% - Wood: 75% - Light: 60% - Heavy: 25% + None: 60 + Wood: 75 + Light: 60 + Heavy: 25 InfDeath: 2 Damage: 250 Warhead@1Eff: CreateEffect @@ -345,9 +345,9 @@ Weapons: Warhead: SpreadDamage Spread: 426 Versus: - None: 40% - Light: 30% - Heavy: 30% + None: 40 + Light: 30 + Heavy: 30 InfDeath: blownaway Damage: 400 Warhead@1Eff: CreateEffect diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index bd21cd60a8..bbe725fa56 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -774,10 +774,10 @@ Weapons: Warhead: SpreadDamage Spread: 256 Versus: - None: 75% - Wood: 75% - Light: 75% - Concrete: 100% + None: 75 + Wood: 75 + Light: 75 + Concrete: 100 InfDeath: 4 Damage: 150 Warhead@2Smu: LeaveSmudge @@ -807,11 +807,11 @@ Weapons: Spread: 640 ValidTargets: Ground, Air Versus: - None: 125% - Wood: 110% - Light: 110% - Heavy: 100% - Concrete: 200% + None: 125 + Wood: 110 + Light: 110 + Heavy: 100 + Concrete: 200 InfDeath: 3 Damage: 250 Warhead@2Smu: LeaveSmudge @@ -836,11 +836,11 @@ Weapons: Spread: 341 ValidTargets: Ground Versus: - None: 90% - Wood: 170% - Light: 100% - Heavy: 100% - Concrete: 100% + None: 90 + Wood: 170 + Light: 100 + Heavy: 100 + Concrete: 100 InfDeath: 4 Damage: 15 Warhead@2Smu: LeaveSmudge @@ -858,10 +858,10 @@ Weapons: Warhead: SpreadDamage Spread: 426 Versus: - None: 125% - Wood: 100% - Light: 60% - Concrete: 25% + None: 125 + Wood: 100 + Light: 60 + Concrete: 25 InfDeath: 5 Damage: 200 Warhead@2Smu: LeaveSmudge @@ -887,11 +887,11 @@ Weapons: Warhead: SpreadDamage Spread: 426 Versus: - None: 80% - Wood: 100% - Light: 60% - Heavy: 75% - Concrete: 35% + None: 80 + Wood: 100 + Light: 60 + Heavy: 75 + Concrete: 35 InfDeath: 5 Damage: 10 Warhead@2Smu: LeaveSmudge @@ -912,11 +912,11 @@ Weapons: Spread: 213 ValidTargets: Air, Ground Versus: - None: 35% - Wood: 30% - Light: 30% - Heavy: 40% - Concrete: 30% + None: 35 + Wood: 30 + Light: 30 + Heavy: 40 + Concrete: 30 Damage: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch @@ -940,10 +940,10 @@ Weapons: Warhead: SpreadDamage Spread: 853 Versus: - None: 100% - Wood: 90% - Light: 80% - Heavy: 70% + None: 100 + Wood: 90 + Light: 80 + Heavy: 70 InfDeath: 3 Damage: 500 Warhead@2Smu: LeaveSmudge @@ -962,10 +962,10 @@ Weapons: Warhead: SpreadDamage Spread: 128 Versus: - Wood: 0% - Light: 0% - Heavy: 50% - Concrete: 0% + Wood: 0 + Light: 0 + Heavy: 50 + Concrete: 0 InfDeath: 2 Damage: 150 Warhead@2Eff: CreateEffect diff --git a/mods/ra/maps/training-camp/map.yaml b/mods/ra/maps/training-camp/map.yaml index e8e6c4c204..05b5fcbcac 100644 --- a/mods/ra/maps/training-camp/map.yaml +++ b/mods/ra/maps/training-camp/map.yaml @@ -1080,10 +1080,10 @@ Weapons: Damage: 250 Size: 4 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Delay: 12 InfDeath: 4 Warhead@areanuke2Smu: LeaveSmudge @@ -1101,10 +1101,10 @@ Weapons: Damage: 250 Size: 3 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Delay: 24 InfDeath: 4 Warhead@areanuke3Smu: LeaveSmudge @@ -1121,10 +1121,10 @@ Weapons: Warhead@areanuke4: PerCellDamage Damage: 250 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Delay: 36 InfDeath: 4 Warhead@areanuke4Smu: LeaveSmudge diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index b3c245a8ee..7914d0fe27 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -9,11 +9,11 @@ Colt45: Damage: 50 InfDeath: 2 Versus: - None: 100% - Wood: 0% - Light: 0% - Heavy: 0% - Concrete: 0% + None: 100 + Wood: 0 + Light: 0 + Heavy: 0 + Concrete: 0 Warhead@2Eff: CreateEffect Explosion: piff InvalidImpactTypes: Water @@ -36,10 +36,10 @@ ZSU-23: Damage: 12 ValidTargets: Air Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Eff: CreateEffect Explosion: small_explosion_air @@ -54,10 +54,10 @@ Vulcan: Damage: 10 InfDeath: 2 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@2Eff_1: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -70,10 +70,10 @@ Vulcan: InfDeath: 2 Delay: 2 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@4Eff_2: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -88,10 +88,10 @@ Vulcan: InfDeath: 2 Delay: 4 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@6Eff_3: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -106,10 +106,10 @@ Vulcan: InfDeath: 2 Delay: 6 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@8Eff_4: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -124,10 +124,10 @@ Vulcan: InfDeath: 2 Delay: 8 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@10Eff_5: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -142,10 +142,10 @@ Vulcan: InfDeath: 2 Delay: 10 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@12Eff_6: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -178,10 +178,10 @@ Maverick: InfDeath: 4 ValidTargets: Ground, Water Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -207,11 +207,11 @@ FireballLauncher: Damage: 150 InfDeath: 5 Versus: - None: 90% - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -234,11 +234,11 @@ Flamer: Damage: 8 InfDeath: 5 Versus: - None: 90% - Wood: 100% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Wood: 100 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -258,11 +258,11 @@ ChainGun: Damage: 30 InfDeath: 2 Versus: - None: 120% - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + None: 120 + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -283,10 +283,10 @@ ChainGun.Yak: Damage: 40 InfDeath: 2 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -305,10 +305,10 @@ Pistol: Damage: 1 InfDeath: 2 Versus: - Wood: 50% - Light: 60% - Heavy: 25% - Concrete: 25% + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Warhead@2Eff: CreateEffect Explosion: piff InvalidImpactTypes: Water @@ -327,10 +327,10 @@ M1Carbine: Damage: 15 InfDeath: 2 Versus: - Wood: 25% - Light: 30% - Heavy: 10% - Concrete: 10% + Wood: 25 + Light: 30 + Heavy: 10 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -359,10 +359,10 @@ Dragon: InfDeath: 4 ValidTargets: Ground, Water Versus: - None: 10% - Wood: 75% - Light: 35% - Concrete: 20% + None: 10 + Wood: 75 + Light: 35 + Concrete: 20 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -396,10 +396,10 @@ HellfireAG: InfDeath: 4 ValidTargets: Ground, Water Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -433,10 +433,10 @@ HellfireAA: InfDeath: 4 ValidTargets: Air Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -463,10 +463,10 @@ Grenade: Damage: 60 InfDeath: 3 Versus: - None: 50% - Wood: 100% - Light: 25% - Heavy: 5% + None: 50 + Wood: 100 + Light: 25 + Heavy: 5 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -490,10 +490,10 @@ Grenade: Damage: 16 InfDeath: 4 Versus: - None: 30% - Wood: 40% - Heavy: 40% - Concrete: 30% + None: 30 + Wood: 40 + Heavy: 40 + Concrete: 30 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect @@ -515,10 +515,10 @@ Grenade: Damage: 40 InfDeath: 4 Versus: - None: 20% - Wood: 75% - Light: 75% - Concrete: 50% + None: 20 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect @@ -544,10 +544,10 @@ Grenade: Damage: 40 InfDeath: 4 Versus: - None: 20% - Wood: 75% - Light: 75% - Concrete: 50% + None: 20 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect @@ -574,10 +574,10 @@ Grenade: InfDeath: 4 InvalidTargets: Air, Infantry Versus: - None: 20% - Wood: 75% - Light: 75% - Concrete: 50% + None: 20 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect @@ -601,10 +601,10 @@ TurretGun: Damage: 60 InfDeath: 4 Versus: - None: 20% - Wood: 50% - Light: 75% - Concrete: 50% + None: 20 + Wood: 50 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect @@ -637,10 +637,10 @@ MammothTusk: InfDeath: 3 ValidTargets: Air, Infantry Versus: - None: 100% - Wood: 75% - Light: 60% - Heavy: 25% + None: 100 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3EffGround: CreateEffect @@ -673,11 +673,11 @@ MammothTusk: Damage: 220 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -701,10 +701,10 @@ M60mg: Damage: 15 InfDeath: 2 Versus: - Wood: 10% - Light: 30% - Heavy: 10% - Concrete: 10% + Wood: 10 + Light: 30 + Heavy: 10 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -724,10 +724,10 @@ Napalm: Damage: 100 InfDeath: 5 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -745,10 +745,10 @@ CrateNapalm: Damage: 600 InfDeath: 5 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -761,10 +761,10 @@ CrateExplosion: Damage: 500 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: self_destruct ImpactSound: kaboom15.aud @@ -775,10 +775,10 @@ CrateNuke: Damage: 1000 InfDeath: 5 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@2Res_impact: DestroyResource Warhead@3Eff_impact: CreateEffect Explosion: nuke @@ -789,19 +789,19 @@ CrateNuke: InfDeath: 5 Delay: 4 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@5Dam_areanuke: SpreadDamage Damage: 250 InfDeath: 5 Delay: 4 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@6Res_areanuke: DestroyResource Size: 5,4 Delay: 4 @@ -824,8 +824,8 @@ TeslaZap: Damage: 100 InfDeath: 6 Versus: - None: 1000% - Wood: 60% + None: 1000 + Wood: 60 Nike: ReloadDelay: 15 @@ -846,11 +846,11 @@ Nike: InfDeath: 3 ValidTargets: Air Versus: - None: 90% - Wood: 0% - Light: 90% - Heavy: 50% - Concrete: 0% + None: 90 + Wood: 0 + Light: 90 + Heavy: 50 + Concrete: 0 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -876,10 +876,10 @@ RedEye: InfDeath: 3 ValidTargets: Air Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -903,10 +903,10 @@ RedEye: Damage: 250 InfDeath: 3 Versus: - None: 60% - Wood: 75% - Light: 60% - Heavy: 25% + None: 60 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -936,9 +936,9 @@ SubMissile: Damage: 300 InfDeath: 3 Versus: - None: 40% - Light: 30% - Heavy: 30% + None: 40 + Light: 30 + Heavy: 30 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -972,10 +972,10 @@ Stinger: InfDeath: 4 ValidTargets: Air, Ground, Water Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -1013,10 +1013,10 @@ TorpTube: InfDeath: 4 ValidTargets: Water, Underwater, Bridge Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 500% + None: 30 + Wood: 75 + Light: 75 + Concrete: 500 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -1044,10 +1044,10 @@ TorpTube: Damage: 25 InfDeath: 4 Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -1075,10 +1075,10 @@ DepthCharge: InfDeath: 4 ValidTargets: Underwater Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -1102,10 +1102,10 @@ ParaBomb: Damage: 500 InfDeath: 4 Versus: - None: 30% - Wood: 75% - Light: 75% - Concrete: 50% + None: 30 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -1128,10 +1128,10 @@ DogJaw: InfDeath: 1 ValidTargets: Infantry Versus: - Wood: 0% - Light: 0% - Heavy: 0% - Concrete: 0% + Wood: 0 + Light: 0 + Heavy: 0 + Concrete: 0 Heal: ReloadDelay: 80 @@ -1144,10 +1144,10 @@ Heal: Damage: -50 InfDeath: 1 Versus: - Wood: 0% - Light: 0% - Heavy: 0% - Concrete: 0% + Wood: 0 + Light: 0 + Heavy: 0 + Concrete: 0 Repair: ReloadDelay: 80 @@ -1162,11 +1162,11 @@ Repair: InfDeath: 1 ValidTargets: Repair Versus: - None: 0% - Wood: 0% - Light: 100% - Heavy: 100% - Concrete: 0% + None: 0 + Wood: 0 + Light: 100 + Heavy: 100 + Concrete: 0 SilencedPPK: ReloadDelay: 80 @@ -1179,10 +1179,10 @@ SilencedPPK: Damage: 150 InfDeath: 2 Versus: - Wood: 0% - Light: 0% - Heavy: 0% - Concrete: 0% + Wood: 0 + Light: 0 + Heavy: 0 + Concrete: 0 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -1209,10 +1209,10 @@ SCUD: Damage: 450 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 70% - Heavy: 40% + None: 90 + Wood: 75 + Light: 70 + Heavy: 40 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -1224,7 +1224,6 @@ SCUD: ImpactSound: splash9.aud ValidImpactTypes: Water - Atomic: ValidTargets: Ground, Water, Air Warhead@1Dam_impact: SpreadDamage @@ -1233,7 +1232,7 @@ Atomic: InfDeath: 5 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@2Res_impact: DestroyResource Size: 1 Warhead@3Smu_impact: LeaveSmudge @@ -1249,7 +1248,7 @@ Atomic: Delay: 5 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@6Res_areanuke1: DestroyResource Size: 2 Delay: 5 @@ -1267,7 +1266,7 @@ Atomic: Delay: 10 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@10Res_areanuke2: DestroyResource Size: 3 Delay: 10 @@ -1282,7 +1281,7 @@ Atomic: Delay: 15 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@13Res_areanuke3: DestroyResource Size: 4 Delay: 15 @@ -1297,7 +1296,7 @@ Atomic: Delay: 20 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@16Res_areanuke4: DestroyResource Size: 5 Delay: 20 @@ -1314,7 +1313,7 @@ MiniNuke: InfDeath: 5 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@2Res_impact: DestroyResource Size: 1 Warhead@3Eff_impact: CreateEffect @@ -1327,7 +1326,7 @@ MiniNuke: Delay: 5 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@5Res_areanuke1: DestroyResource Size: 2 Delay: 5 @@ -1341,7 +1340,7 @@ MiniNuke: Delay: 10 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@8Res_areanuke2: DestroyResource Size: 3 Delay: 10 @@ -1352,7 +1351,7 @@ MiniNuke: Delay: 15 ValidTargets: Ground, Water, Air Versus: - Concrete: 25% + Concrete: 25 Warhead@10Res_areanuke3: DestroyResource Size: 4 Delay: 15 @@ -1367,10 +1366,10 @@ UnitExplode: Damage: 500 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: self_destruct ImpactSound: kaboom22.aud @@ -1386,10 +1385,10 @@ UnitExplodeShip: Damage: 50 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: building ImpactSound: kaboom25.aud @@ -1400,10 +1399,10 @@ UnitExplodeSubmarine: Damage: 50 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: large_splash ImpactSound: splash9.aud @@ -1414,10 +1413,10 @@ UnitExplodeSmall: Damage: 40 InfDeath: 4 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: large_explosion ImpactSound: kaboom15.aud @@ -1434,11 +1433,11 @@ BarrelExplode: InfDeath: 4 Delay: 5 Versus: - None: 120% - Wood: 200% - Light: 50% - Heavy: 25% - Concrete: 10% + None: 120 + Wood: 200 + Light: 50 + Heavy: 25 + Concrete: 10 Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Size: 2,1 @@ -1488,7 +1487,7 @@ PortaTesla: Damage: 45 InfDeath: 6 Versus: - None: 1000% + None: 1000 TTankZap: ReloadDelay: 120 @@ -1501,7 +1500,7 @@ TTankZap: Damage: 100 InfDeath: 6 Versus: - None: 1000% + None: 1000 FLAK-23: ReloadDelay: 10 @@ -1516,11 +1515,11 @@ FLAK-23: Damage: 20 ValidTargets: Air, Ground, Water Versus: - None: 40% - Wood: 10% - Light: 60% - Heavy: 10% - Concrete: 20% + None: 40 + Wood: 10 + Light: 60 + Heavy: 10 + Concrete: 20 Warhead@2Eff: CreateEffect Explosion: small_explosion InvalidImpactTypes: Air, AirHit, Water @@ -1542,11 +1541,11 @@ Sniper: Damage: 140 InfDeath: 2 Versus: - None: 100% - Wood: 0% - Light: 0% - Heavy: 0% - Concrete: 0% + None: 100 + Wood: 0 + Light: 0 + Heavy: 0 + Concrete: 0 APTusk: ReloadDelay: 60 @@ -1569,10 +1568,10 @@ APTusk: InfDeath: 4 ValidTargets: Ground, Water Versus: - None: 25% - Wood: 75% - Light: 75% - Concrete: 50% + None: 25 + Wood: 75 + Light: 75 + Concrete: 50 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Warhead@3Eff: CreateEffect @@ -1594,11 +1593,11 @@ Claw: Damage: 33 InfDeath: 1 Versus: - None: 90% - Wood: 10% - Light: 30% - Heavy: 10% - Concrete: 10% + None: 90 + Wood: 10 + Light: 30 + Heavy: 10 + Concrete: 10 Mandible: ReloadDelay: 10 @@ -1610,11 +1609,11 @@ Mandible: Damage: 60 InfDeath: 1 Versus: - None: 90% - Wood: 10% - Light: 30% - Heavy: 10% - Concrete: 10% + None: 90 + Wood: 10 + Light: 30 + Heavy: 10 + Concrete: 10 MADTankThump: InvalidTargets: MADTank @@ -1623,7 +1622,7 @@ MADTankThump: Damage: 1 InvalidTargets: MADTank Versus: - None: 0% + None: 0 MADTankDetonate: InvalidTargets: MADTank @@ -1632,7 +1631,7 @@ MADTankDetonate: Damage: 19 InvalidTargets: MADTank Versus: - None: 0% + None: 0 Warhead@2Smu: LeaveSmudge SmudgeType: Crater Size: 7,6 @@ -1646,10 +1645,10 @@ OreExplosion: Damage: 10 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Res: CreateResource AddsResourceType: Ore Size: 1,1 diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index f7f2bfcb7c..13d6a8dea8 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -4,10 +4,10 @@ UnitExplode: Damage: 500 InfDeath: 2 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: large_twlt ImpactSound: expnew09.aud @@ -18,10 +18,10 @@ UnitExplodeSmall: Damage: 40 InfDeath: 2 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Eff: CreateEffect Explosion: medium_brnl ImpactSound: expnew13.aud @@ -38,10 +38,10 @@ Minigun: InfDeath: 1 ProneModifier: 70 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -65,11 +65,11 @@ Grenade: InfDeath: 3 ProneModifier: 70 Versus: - None: 100% - Wood: 85% - Light: 70% - Heavy: 35% - Concrete: 28% + None: 100 + Wood: 85 + Light: 70 + Heavy: 35 + Concrete: 28 Warhead@2Eff: CreateEffect Explosion: large_grey_explosion ImpactSound: expnew13.aud @@ -100,11 +100,11 @@ Bazooka: InfDeath: 2 ValidTargets: Ground, Air Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: small_clsn ImpactSound: expnew12.aud @@ -139,11 +139,11 @@ MultiCluster: InfDeath: 3 ValidTargets: Ground Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: large_explosion ImpactSound: expnew09.aud @@ -165,10 +165,10 @@ Heal: InfDeath: 1 ProneModifier: 100 Versus: - Wood: 0% - Light: 0% - Heavy: 0% - Concrete: 0% + Wood: 0 + Light: 0 + Heavy: 0 + Concrete: 0 Sniper: ReloadDelay: 60 @@ -182,11 +182,11 @@ Sniper: InfDeath: 1 ProneModifier: 100 Versus: - None: 100% - Wood: 0% - Light: 0% - Heavy: 0% - Concrete: 0% + None: 100 + Wood: 0 + Light: 0 + Heavy: 0 + Concrete: 0 M1Carbine: ReloadDelay: 20 @@ -200,10 +200,10 @@ M1Carbine: InfDeath: 1 ProneModifier: 70 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -226,11 +226,11 @@ LtRail: InfDeath: 2 ProneModifier: 100 Versus: - None: 100% - Wood: 130% - Light: 150% - Heavy: 110% - Concrete: 5% + None: 100 + Wood: 130 + Light: 150 + Heavy: 110 + Concrete: 5 CyCannon: ReloadDelay: 50 @@ -249,11 +249,11 @@ CyCannon: ProneModifier: 100 ValidTargets: Ground Versus: - None: 100% - Wood: 65% - Light: 75% - Heavy: 50% - Concrete: 40% + None: 100 + Wood: 65 + Light: 75 + Heavy: 50 + Concrete: 40 Warhead@2Eff: CreateEffect Explosion: large_bang ImpactSound: expnew12.aud @@ -276,10 +276,10 @@ Vulcan3: InfDeath: 1 ProneModifier: 70 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -300,11 +300,11 @@ Vulcan2: InfDeath: 1 ProneModifier: 70 Versus: - None: 100% - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + None: 100 + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -324,10 +324,10 @@ Vulcan: InfDeath: 1 ProneModifier: 70 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -352,10 +352,10 @@ FiendShard: InfDeath: 1 ProneModifier: 100 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@3EffWater: CreateEffect Explosion: small_watersplash ImpactSound: ssplash3.aud @@ -374,10 +374,10 @@ JumpCannon: InfDeath: 1 ProneModifier: 70 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -407,11 +407,11 @@ HoverMissile: InfDeath: 2 ValidTargets: Ground, Air Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: small_clsn ImpactSound: expnew12.aud @@ -442,11 +442,11 @@ HoverMissile: Damage: 50 InfDeath: 2 Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: medium_clsn ImpactSound: expnew14.aud @@ -479,11 +479,11 @@ MammothTusk: ProneModifier: 70 ValidTargets: Air Versus: - None: 100% - Wood: 85% - Light: 70% - Heavy: 35% - Concrete: 28% + None: 100 + Wood: 85 + Light: 70 + Heavy: 35 + Concrete: 28 Warhead@2Eff: CreateEffect Explosion: medium_bang ImpactSound: expnew12.aud @@ -505,11 +505,11 @@ Repair: InfDeath: 1 ProneModifier: 100 Versus: - None: 0% - Wood: 0% - Light: 100% - Heavy: 100% - Concrete: 0% + None: 0 + Wood: 0 + Light: 100 + Heavy: 100 + Concrete: 0 SlimeAttack: ReloadDelay: 80 @@ -523,10 +523,10 @@ SlimeAttack: InfDeath: 2 ProneModifier: 100 Versus: - Wood: 25% - Light: 30% - Heavy: 10% - Concrete: 10% + Wood: 25 + Light: 30 + Heavy: 10 + Concrete: 10 SuicideBomb: ReloadDelay: 1 @@ -537,10 +537,10 @@ SuicideBomb: Damage: 11000 InfDeath: 5 Versus: - None: 90% - Light: 60% - Heavy: 25% - Concrete: 50% + None: 90 + Light: 60 + Heavy: 25 + Concrete: 50 Warhead@2Res: DestroyResource 120mm: @@ -554,11 +554,11 @@ SuicideBomb: Damage: 70 InfDeath: 2 Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: large_clsn ImpactSound: expnew14.aud @@ -583,11 +583,11 @@ MechRailgun: InfDeath: 5 ProneModifier: 100 Versus: - None: 200% - Wood: 175% - Light: 160% - Heavy: 100% - Concrete: 25% + None: 200 + Wood: 175 + Light: 160 + Heavy: 100 + Concrete: 25 AssaultCannon: ReloadDelay: 50 @@ -601,10 +601,10 @@ AssaultCannon: InfDeath: 1 ProneModifier: 70 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -635,11 +635,11 @@ BikeMissile: InfDeath: 2 ValidTargets: Ground Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: small_clsn ImpactSound: expnew12.aud @@ -663,10 +663,10 @@ RaiderCannon: InfDeath: 1 ProneModifier: 70 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -690,11 +690,11 @@ FireballLauncher: InfDeath: 5 ProneModifier: 100 Versus: - None: 600% - Wood: 148% - Light: 59% - Heavy: 6% - Concrete: 2% + None: 600 + Wood: 148 + Light: 59 + Heavy: 6 + Concrete: 2 SonicZap: ReloadDelay: 120 @@ -710,8 +710,8 @@ SonicZap: Damage: 100 InfDeath: 5 Versus: - Heavy: 80% - Concrete: 60% + Heavy: 80 + Concrete: 60 Dragon: ReloadDelay: 50 @@ -735,11 +735,11 @@ Dragon: InfDeath: 2 ValidTargets: Ground, Air Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: small_clsn ImpactSound: expnew12.aud @@ -768,11 +768,11 @@ Dragon: Damage: 36 InfDeath: 2 Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: medium_clsn ImpactSound: expnew14.aud @@ -800,11 +800,11 @@ Dragon: InfDeath: 3 ProneModifier: 100 Versus: - None: 100% - Wood: 85% - Light: 68% - Heavy: 35% - Concrete: 35% + None: 100 + Wood: 85 + Light: 68 + Heavy: 35 + Concrete: 35 Warhead@2Eff: CreateEffect Explosion: large_explosion ImpactSound: expnew06.aud @@ -836,11 +836,11 @@ Hellfire: InfDeath: 2 ValidTargets: Ground, Air Versus: - None: 30% - Wood: 65% - Light: 150% - Heavy: 100% - Concrete: 30% + None: 30 + Wood: 65 + Light: 150 + Heavy: 100 + Concrete: 30 Warhead@2Eff: CreateEffect Explosion: small_bang ImpactSound: expnew12.aud @@ -868,11 +868,11 @@ Bomb: InfDeath: 3 ProneModifier: 100 Versus: - None: 200% - Wood: 90% - Light: 75% - Heavy: 32% - Concrete: 100% + None: 200 + Wood: 90 + Light: 75 + Heavy: 32 + Concrete: 100 Warhead@2Eff: CreateEffect Explosion: large_explosion ImpactSound: expnew09.aud @@ -903,11 +903,11 @@ Proton: InfDeath: 3 ValidTargets: Ground, Air Versus: - None: 25% - Wood: 65% - Light: 75% - Heavy: 100% - Concrete: 60% + None: 25 + Wood: 65 + Light: 75 + Heavy: 100 + Concrete: 60 Warhead@2Eff: CreateEffect Explosion: small_bang ImpactSound: expnew12.aud @@ -931,10 +931,10 @@ HarpyClaw: ProneModifier: 70 ValidTargets: Ground, Air Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -954,10 +954,10 @@ Pistola: InfDeath: 1 ProneModifier: 70 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piff InvalidImpactTypes: Water @@ -1013,10 +1013,10 @@ VulcanTower: Damage: 18 InfDeath: 1 Versus: - Wood: 60% - Light: 40% - Heavy: 25% - Concrete: 10% + Wood: 60 + Light: 40 + Heavy: 25 + Concrete: 10 Warhead@2Eff: CreateEffect Explosion: piffs InvalidImpactTypes: Water @@ -1041,11 +1041,11 @@ RPGTower: InfDeath: 2 ProneModifier: 70 Versus: - None: 30% - Wood: 75% - Light: 90% - Heavy: 100% - Concrete: 70% + None: 30 + Wood: 75 + Light: 90 + Heavy: 100 + Concrete: 70 Warhead@2Eff: CreateEffect Explosion: large_clsn ImpactSound: expnew14.aud @@ -1115,10 +1115,10 @@ TiberiumExplosion: Damage: 10 InfDeath: 3 Versus: - None: 90% - Wood: 75% - Light: 60% - Heavy: 25% + None: 90 + Wood: 75 + Light: 60 + Heavy: 25 Warhead@2Res: CreateResource AddsResourceType: Tiberium Size: 1,1