diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index ec0092305a..eb94f35579 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -620,8 +620,8 @@ GivesBuildableArea: AreaTypes: building RepairableBuilding: - PlayerExperience: 25 RepairStep: 700 + PlayerExperience: 25 EngineerRepairable: AcceptsDeliveredCash: WithMakeAnimation: @@ -905,7 +905,7 @@ Husk: AllowedTerrain: Clear, Rough, Road, Ore, Gems, Beach Burns: - Damage: 2 + Damage: 200 Capturable: Types: husk CaptureThreshold: 100 diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index e6196208ad..08578d6328 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -162,9 +162,9 @@ SPEN: PrimaryCondition: primary -EmitInfantryOnSell: RepairsUnits: + HpPerStep: 1000 FinishRepairingNotification: UnitRepaired PlayerExperience: 15 - HpPerStep: 1000 RallyPoint: ProductionBar: Power: @@ -266,9 +266,9 @@ SYRD: PrimaryCondition: primary -EmitInfantryOnSell: RepairsUnits: + HpPerStep: 1000 FinishRepairingNotification: UnitRepaired PlayerExperience: 15 - HpPerStep: 1000 RallyPoint: ProductionBar: Power: @@ -1761,10 +1761,10 @@ FIX: Reservable: RallyPoint: RepairsUnits: + HpPerStep: 1000 Interval: 7 FinishRepairingNotification: UnitRepaired PlayerExperience: 15 - HpPerStep: 1000 WithRepairAnimation: WithRearmAnimation: Power: diff --git a/mods/ra/weapons/ballistics.yaml b/mods/ra/weapons/ballistics.yaml index 0ed875d79a..5441e7870a 100644 --- a/mods/ra/weapons/ballistics.yaml +++ b/mods/ra/weapons/ballistics.yaml @@ -37,12 +37,13 @@ Speed: 853 Image: 50CAL Warhead@1Dam: SpreadDamage - Damage: 2700 + Damage: 2500 Versus: - Wood: 50 - Light: 110 - Heavy: 45 - Concrete: 30 + None: 32 + Wood: 40 + Light: 116 + Heavy: 48 + Concrete: 32 -Warhead@2Smu: LeaveSmudge Warhead@3Eff: CreateEffect -ImpactSounds: @@ -83,8 +84,8 @@ TurretGun: Warhead@1Dam: SpreadDamage Damage: 6000 Versus: - Wood: 50 None: 20 + Wood: 50 ^Artillery: Inherits: ^Cannon @@ -153,6 +154,11 @@ TurretGun: Speed: 426 Warhead@1Dam: SpreadDamage Damage: 2500 + Versus: + None: 28 + Wood: 72 + Light: 72 + Concrete: 48 Grenade: Inherits: ^Artillery diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index 1e6613bd92..8f232fa238 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -127,7 +127,7 @@ CivBuildingExplosion: Inherits: SmallBuildingExplode Warhead@1Dam: SpreadDamage # Used to panic civilians which are emitted from a killed CivBuilding Spread: 64 - Damage: 100 + Damage: 1 Delay: 1 BarrelExplode: @@ -181,9 +181,9 @@ OreExplosion: Damage: 1000 Versus: None: 90 - Wood: 75 + Wood: 70 Light: 60 - Heavy: 25 + Heavy: 20 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@3Res: CreateResource AddsResourceType: Ore diff --git a/mods/ra/weapons/missiles.yaml b/mods/ra/weapons/missiles.yaml index c8f4441753..7952825c32 100644 --- a/mods/ra/weapons/missiles.yaml +++ b/mods/ra/weapons/missiles.yaml @@ -19,8 +19,8 @@ ValidTargets: Ground, Water, Air Versus: None: 10 - Wood: 75 - Light: 35 + Wood: 74 + Light: 34 Heavy: 100 Concrete: 50 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath @@ -103,6 +103,7 @@ HellfireAA: Damage: 4000 ValidTargets: Air Versus: + Wood: 75 Light: 75 Warhead@3Eff: CreateEffect Explosions: med_explosion_air @@ -124,7 +125,7 @@ MammothTusk: Versus: None: 100 Light: 60 - Heavy: 25 + Heavy: 24 Concrete: 50 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@3Eff: CreateEffect @@ -188,11 +189,13 @@ Stinger: Speed: 170 CloseEnough: 149 Warhead@1Dam: SpreadDamage - Damage: 3000 + Damage: 2500 Versus: - None: 30 - Light: 75 - Concrete: 50 + None: 36 + Wood: 88 + Light: 88 + Heavy: 120 + Concrete: 60 StingerAA: Inherits: Stinger @@ -214,11 +217,13 @@ APTusk: HorizontalRateOfTurn: 10 RangeLimit: 7c204 Warhead@1Dam: SpreadDamage - Damage: 3000 + Damage: 2500 Versus: - None: 25 - Light: 75 - Concrete: 50 + None: 28 + Wood: 88 + Light: 88 + Heavy: 120 + Concrete: 60 TorpTube: ReloadDelay: 100 @@ -335,6 +340,7 @@ SCUD: ValidTargets: Ground, Water, Trees Versus: None: 90 + Wood: 75 Light: 70 Heavy: 40 Concrete: 100 diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index cff2a6311c..4314cf4c44 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -46,9 +46,13 @@ Flamer: Inaccuracy: 853 Warhead@1Dam: SpreadDamage Spread: 341 - Damage: 800 + Damage: 1000 Versus: - Wood: 100 + None: 70 + Wood: 80 + Light: 40 + Heavy: 20 + Concrete: 10 Warhead@3Eff: CreateEffect Explosions: small_napalm @@ -92,7 +96,7 @@ PortaTesla: Warhead@1Dam: SpreadDamage Damage: 4500 Versus: - Wood: 75 + Wood: 73 Heavy: 60 TTankZap: @@ -155,9 +159,9 @@ Claw: Speed: 1c682 Warhead@1Dam: SpreadDamage Spread: 213 - Damage: 3300 + Damage: 3000 Versus: - None: 90 + None: 97 Wood: 10 Light: 30 Heavy: 10 @@ -169,6 +173,8 @@ Mandible: ReloadDelay: 10 Warhead@1Dam: SpreadDamage Damage: 6000 + Versus: + None: 90 MADTankThump: InvalidTargets: MADTank, Infantry diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml index 68e675d3b6..9350400a02 100644 --- a/mods/ra/weapons/smallcaliber.yaml +++ b/mods/ra/weapons/smallcaliber.yaml @@ -32,7 +32,7 @@ ZSU-23: Warhead@1Dam: SpreadDamage Damage: 1200 Versus: - None: 30 + None: 25 Wood: 75 Light: 75 Heavy: 100 @@ -65,13 +65,13 @@ FLAK-23-AG: Speed: 1c682 Warhead@1Dam: SpreadDamage Spread: 128 - Damage: 3000 + Damage: 2500 Versus: - None: 100 - Wood: 50 - Light: 60 - Heavy: 25 - Concrete: 25 + None: 120 + Wood: 60 + Light: 72 + Heavy: 28 + Concrete: 28 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosions: piffs @@ -84,10 +84,11 @@ FLAK-23-AG: ^LightMG: Inherits: ^HeavyMG Warhead@1Dam: SpreadDamage - Damage: 1500 + Damage: 1000 Versus: + None: 150 Wood: 10 - Light: 30 + Light: 40 Heavy: 10 Concrete: 10 @@ -97,7 +98,10 @@ Vulcan: Damage: 1000 Versus: None: 200 + Wood: 50 Light: 50 + Heavy: 20 + Concrete: 20 Warhead@4Dam_2: SpreadDamage Spread: 128 Damage: 1000 @@ -106,8 +110,8 @@ Vulcan: None: 200 Wood: 50 Light: 50 - Heavy: 25 - Concrete: 25 + Heavy: 20 + Concrete: 20 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@4Eff_2: CreateEffect Explosions: piffs @@ -126,8 +130,8 @@ Vulcan: None: 200 Wood: 50 Light: 50 - Heavy: 25 - Concrete: 25 + Heavy: 20 + Concrete: 20 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@6Eff_3: CreateEffect Explosions: piffs @@ -146,8 +150,8 @@ Vulcan: None: 200 Wood: 50 Light: 50 - Heavy: 25 - Concrete: 25 + Heavy: 20 + Concrete: 20 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@8Eff_4: CreateEffect Explosions: piffs @@ -166,8 +170,8 @@ Vulcan: None: 200 Wood: 50 Light: 50 - Heavy: 25 - Concrete: 25 + Heavy: 20 + Concrete: 20 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@10Eff_5: CreateEffect Explosions: piffs @@ -186,8 +190,8 @@ Vulcan: None: 200 Wood: 50 Light: 50 - Heavy: 25 - Concrete: 25 + Heavy: 20 + Concrete: 20 DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@12Eff_6: CreateEffect Explosions: piffs @@ -208,7 +212,7 @@ ChainGun: Blockable: false Warhead@1Dam: SpreadDamage Versus: - None: 120 + None: 144 ChainGun.Yak: Inherits: ^HeavyMG @@ -219,6 +223,12 @@ ChainGun.Yak: Blockable: false Warhead@1Dam: SpreadDamage Damage: 4000 + Versus: + None: 100 + Wood: 50 + Light: 60 + Heavy: 25 + Concrete: 25 Pistol: Inherits: ^LightMG @@ -227,6 +237,8 @@ Pistol: Report: gun27.aud Warhead@1Dam: SpreadDamage Damage: 100 + Versus: + None: 100 Warhead@2Eff: CreateEffect Explosions: piff Warhead@3EffWater: CreateEffect @@ -239,7 +251,7 @@ M1Carbine: Report: gun11.aud Warhead@1Dam: SpreadDamage Versus: - Wood: 25 + Wood: 30 M60mg: Inherits: ^LightMG