diff --git a/mods/ra/rules/decoration.yaml b/mods/ra/rules/decoration.yaml index bb25e016a5..b7ebd2133b 100644 --- a/mods/ra/rules/decoration.yaml +++ b/mods/ra/rules/decoration.yaml @@ -5,6 +5,8 @@ T01: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T01.Husk T02: Inherits: ^Tree @@ -13,6 +15,8 @@ T02: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T02.Husk T03: Inherits: ^Tree @@ -21,6 +25,8 @@ T03: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T03.Husk T04: Inherits: ^Tree @@ -29,6 +35,8 @@ T04: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: INTERIOR + SpawnActorOnDeath: + Actor: T04.Husk T05: Inherits: ^Tree @@ -37,6 +45,8 @@ T05: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T05.Husk T06: Inherits: ^Tree @@ -45,6 +55,8 @@ T06: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T06.Husk T07: Inherits: ^Tree @@ -53,12 +65,23 @@ T07: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T07.Husk T08: Inherits: ^Tree Building: Footprint: x_ Dimensions: 2,1 + SpawnActorOnDeath: + Actor: T08.Husk + +T09: + Inherits: ^Tree + EditorTilesetFilter: + ExcludeTilesets: TEMPERAT, SNOW, INTERIOR + SpawnActorOnDeath: + Actor: T09.Husk T10: Inherits: ^Tree @@ -67,6 +90,8 @@ T10: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T10.Husk T11: Inherits: ^Tree @@ -75,6 +100,8 @@ T11: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T11.Husk T12: Inherits: ^Tree @@ -83,6 +110,8 @@ T12: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T12.Husk T13: Inherits: ^Tree @@ -91,6 +120,8 @@ T13: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T13.Husk T14: Inherits: ^Tree @@ -99,6 +130,8 @@ T14: Dimensions: 3,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T14.Husk T15: Inherits: ^Tree @@ -107,6 +140,8 @@ T15: Dimensions: 3,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T15.Husk T16: Inherits: ^Tree @@ -115,6 +150,8 @@ T16: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T16.Husk T17: Inherits: ^Tree @@ -123,6 +160,8 @@ T17: Dimensions: 2,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: T17.Husk TC01: Inherits: ^Tree @@ -131,6 +170,8 @@ TC01: Dimensions: 3,2 EditorTilesetFilter: ExcludeTilesets: INTERIOR + SpawnActorOnDeath: + Actor: TC01.Husk TC02: Inherits: ^Tree @@ -139,6 +180,8 @@ TC02: Dimensions: 3,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: TC02.Husk TC03: Inherits: ^Tree @@ -147,6 +190,8 @@ TC03: Dimensions: 3,2 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: TC03.Husk TC04: Inherits: ^Tree @@ -155,6 +200,8 @@ TC04: Dimensions: 4,3 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: TC04.Husk TC05: Inherits: ^Tree @@ -163,6 +210,8 @@ TC05: Dimensions: 4,3 EditorTilesetFilter: ExcludeTilesets: DESERT, INTERIOR + SpawnActorOnDeath: + Actor: TC05.Husk BOXES01: Inherits: ^Tree diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 061af76ddd..bca4783423 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -617,12 +617,42 @@ HP: 500 Armor: Type: Wood + Targetable: + TargetTypes: Trees + WithDamageOverlay@SmallBurn: + DamageType: Incendiary + Image: burn-s + MinimumDamageState: Light + MaximumDamageState: Medium + WithDamageOverlay@MediumBurn: + DamageType: Incendiary + Image: burn-m + MinimumDamageState: Medium + MaximumDamageState: Heavy + WithDamageOverlay@LargeBurn: + DamageType: Incendiary + Image: burn-l + MinimumDamageState: Heavy + MaximumDamageState: Dead AutoTargetIgnore: HiddenUnderShroud: ScriptTriggers: EditorTilesetFilter: ExcludeTilesets: INTERIOR +^TreeHusk: + Inherits@1: ^SpriteActor + AppearsOnRadar: + Building: + Footprint: x + Dimensions: 1,1 + WithSpriteBody: + Tooltip: + Name: Tree (Burnt) + ShowOwnerRow: false + FrozenUnderFog: + ScriptTriggers: + ^BasicHusk: Inherits@1: ^SpriteActor Health: diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index 51b7911df5..79f532afa3 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -222,3 +222,174 @@ U2.Husk: MinDamage: Undamaged RenderSprites: Image: u2 + +T01.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T02.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T03.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T04.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: INTERIOR + +T05.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T06.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T07.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T08.Husk: + Inherits: ^TreeHusk + Building: + Footprint: x_ + Dimensions: 2,1 + +T09.Husk: + Inherits: ^TreeHusk + EditorTilesetFilter: + ExcludeTilesets: TEMPERAT, SNOW, INTERIOR + +T10.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ xx + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T11.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ xx + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T12.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T13.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T14.Husk: + Inherits: ^TreeHusk + Building: + Footprint: ___ xx_ + Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T15.Husk: + Inherits: ^TreeHusk + Building: + Footprint: ___ xx_ + Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T16.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +T17.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __ x_ + Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +TC01.Husk: + Inherits: ^TreeHusk + Building: + Footprint: ___ xx_ + Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: INTERIOR + +TC02.Husk: + Inherits: ^TreeHusk + Building: + Footprint: _x_ xx_ + Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +TC03.Husk: + Inherits: ^TreeHusk + Building: + Footprint: xx_ xx_ + Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +TC04.Husk: + Inherits: ^TreeHusk + Building: + Footprint: ____ xxx_ x___ + Dimensions: 4,3 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR + +TC05.Husk: + Inherits: ^TreeHusk + Building: + Footprint: __x_ xxx_ _xx_ + Dimensions: 4,3 + EditorTilesetFilter: + ExcludeTilesets: DESERT, INTERIOR diff --git a/mods/ra/sequences/decorations.yaml b/mods/ra/sequences/decorations.yaml index a677b72d00..a1893a9e5a 100644 --- a/mods/ra/sequences/decorations.yaml +++ b/mods/ra/sequences/decorations.yaml @@ -5,7 +5,14 @@ tc04: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +tc04.husk: + Defaults: tc04 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -19,7 +26,14 @@ tc05: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +tc05.husk: + Defaults: tc05 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -33,7 +47,14 @@ tc03: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +tc03.husk: + Defaults: tc03 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -47,7 +68,14 @@ tc02: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +tc02.husk: + Defaults: tc02 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -60,7 +88,13 @@ tc01: TilesetOverrides: INTERIOR: TEMPERAT idle: - damaged-idle: + +tc01.husk: + Defaults: tc01 + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -74,7 +108,14 @@ t17: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t17.husk: + Defaults: t17 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -88,7 +129,14 @@ t16: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t16.husk: + Defaults: t16 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -96,13 +144,20 @@ t16: Tick: 80 t15: - Defaults: + Defaults: t15 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: + +t15.husk: + Defaults: t15 UseTilesetExtension: true TilesetOverrides: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: Start: 1 dead: Start: 2 @@ -116,7 +171,14 @@ t14: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t14.husk: + Defaults: t14 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -130,7 +192,14 @@ t13: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t13.husk: + Defaults: t13 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -144,7 +213,14 @@ t12: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t12.husk: + Defaults: t12 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -158,7 +234,14 @@ t11: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t11.husk: + Defaults: t11 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -172,7 +255,14 @@ t10: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t10.husk: + Defaults: t10 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -185,7 +275,13 @@ t08: TilesetOverrides: INTERIOR: TEMPERAT idle: - damaged-idle: + +t08.husk: + Defaults: t08 + UseTilesetExtension: true + TilesetOverrides: + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -199,7 +295,14 @@ t07: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t07.husk: + Defaults: t07 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -213,7 +316,14 @@ t06: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t06.husk: + Defaults: t06 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -227,7 +337,14 @@ t05: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t05.husk: + Defaults: t05 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -241,7 +358,56 @@ t03: DESERT: TEMPERAT INTERIOR: TEMPERAT idle: - damaged-idle: + +t03.husk: + Defaults: t03 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: + Start: 1 + dead: + Start: 2 + Length: 8 + Tick: 80 + +t02: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: + +t02.husk: + Defaults: t02 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: + Start: 1 + dead: + Start: 2 + Length: 8 + Tick: 80 + +t01: + Defaults: + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: + +t01.husk: + Defaults: t01 + UseTilesetExtension: true + TilesetOverrides: + DESERT: TEMPERAT + INTERIOR: TEMPERAT + idle: Start: 1 dead: Start: 2 @@ -273,34 +439,6 @@ ice05: Length: * AddExtension: false -t02: - Defaults: - UseTilesetExtension: true - TilesetOverrides: - DESERT: TEMPERAT - INTERIOR: TEMPERAT - idle: - damaged-idle: - Start: 1 - dead: - Start: 2 - Length: 8 - Tick: 80 - -t01: - Defaults: - UseTilesetExtension: true - TilesetOverrides: - DESERT: TEMPERAT - INTERIOR: TEMPERAT - idle: - damaged-idle: - Start: 1 - dead: - Start: 2 - Length: 8 - Tick: 80 - v01: Defaults: UseTilesetExtension: true @@ -650,13 +788,32 @@ t04: Defaults: AddExtension: false idle: t04.des - damaged-idle: t04.des + +t04.husk: + Defaults: t04.des + AddExtension: false + idle: Start: 1 dead: t04.des Start: 2 Length: 8 Tick: 80 +t09: + Defaults: + AddExtension: false + idle: t09.des + +t09.husk: + Defaults: t09 + AddExtension: false + idle: t09.des + Start: 1 + dead: t09.des + Start: 2 + Length: 8 + Tick: 80 + v20: Defaults: AddExtension: false diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index 36cbfdb11f..a140fdc011 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -50,6 +50,45 @@ explosion: DESERT: TEMPERAT INTERIOR: TEMPERAT +burn-l: + idle: + Length: * + ZOffset: 512 + loop: + Start: 16 + Length: 44 + ZOffset: 512 + end: + Start: 60 + Length: 6 + ZOffset: 512 + +burn-m: + idle: + Length: * + ZOffset: 512 + loop: + Start: 16 + Length: 44 + ZOffset: 512 + end: + Start: 60 + Length: 6 + ZOffset: 512 + +burn-s: + idle: + Length: * + ZOffset: 512 + loop: + Start: 12 + Length: 46 + ZOffset: 512 + end: + Start: 59 + Length: 5 + ZOffset: 512 + pips: groups: Start: 8 diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml index da57ecb555..ac21a2ebba 100644 --- a/mods/ra/weapons/explosions.yaml +++ b/mods/ra/weapons/explosions.yaml @@ -1,7 +1,9 @@ CrateNapalm: + ValidTargets: Ground, Trees Warhead@1Dam: SpreadDamage Spread: 170 Damage: 60 + ValidTargets: Ground, Trees Falloff: 1000, 368, 135, 50, 18, 7, 0 Versus: None: 90 @@ -9,7 +11,7 @@ CrateNapalm: Heavy: 25 Concrete: 50 AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -33,15 +35,16 @@ CrateExplosion: ImpactSounds: kaboom15.aud CrateNuke: + ValidTargets: Ground, Trees, Water, Air Warhead@1Dam_impact: SpreadDamage Spread: 1c0 Damage: 100 Falloff: 1000, 368, 135, 50, 18, 7, 0 - ValidTargets: Ground, Water, Air + ValidTargets: Ground, Trees, Water, Air Versus: Concrete: 25 AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@2Res_impact: DestroyResource Warhead@3Eff_impact: CreateEffect Explosions: nuke @@ -51,11 +54,11 @@ CrateNuke: Damage: 60 Falloff: 1000, 600, 400, 250, 150, 100, 0 Delay: 4 - ValidTargets: Ground, Water, Air + ValidTargets: Ground, Trees, Water, Air Versus: Concrete: 25 AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@5Res_areanuke: DestroyResource Size: 5,4 Delay: 4 @@ -68,16 +71,16 @@ CrateNuke: Delay: 4 MiniNuke: - ValidTargets: Ground, Water, Underwater, Air + ValidTargets: Ground, Trees, Water, Underwater, Air Warhead@1Dam_impact: SpreadDamage Spread: 1c0 Damage: 150 Falloff: 1000, 368, 135, 50, 18, 7, 0 - ValidTargets: Ground, Water, Air + ValidTargets: Ground, Trees, Water, Air Versus: Concrete: 25 AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@2Res_impact: DestroyResource Size: 1 Warhead@3Eff_impact: CreateEffect @@ -88,11 +91,11 @@ MiniNuke: Damage: 60 Falloff: 1000, 368, 135, 50, 18, 7, 0 Delay: 5 - ValidTargets: Ground, Water, Underwater, Air + ValidTargets: Ground, Trees, Water, Underwater, Air Versus: Concrete: 25 AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@5Res_areanuke1: DestroyResource Size: 2 Delay: 5 @@ -104,11 +107,11 @@ MiniNuke: Damage: 60 Falloff: 1000, 368, 135, 50, 18, 7, 0 Delay: 10 - ValidTargets: Ground, Water, Underwater + ValidTargets: Ground, Trees, Water, Underwater Versus: Concrete: 25 AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@8Res_areanuke2: DestroyResource Size: 3 Delay: 10 @@ -117,11 +120,11 @@ MiniNuke: Damage: 60 Falloff: 1000, 368, 135, 50, 18, 7, 0 Delay: 15 - ValidTargets: Ground, Water, Underwater + ValidTargets: Ground, Trees, Water, Underwater Versus: Concrete: 25 AffectsParent: true - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@10Res_areanuke3: DestroyResource Size: 4 Delay: 15 diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index 2f9a7f6e42..8d389c6cc0 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -1,4 +1,5 @@ FireballLauncher: + ValidTargets: Ground, Water, Trees ReloadDelay: 65 Range: 5c0 Burst: 2 @@ -10,13 +11,14 @@ FireballLauncher: Warhead@1Dam: SpreadDamage Spread: 213 Damage: 150 + ValidTargets: Ground, Water, Trees Versus: None: 90 Wood: 50 Light: 60 Heavy: 25 Concrete: 50 - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -24,6 +26,7 @@ FireballLauncher: ImpactSounds: firebl3.aud Flamer: + ValidTargets: Ground, Water, Trees ReloadDelay: 50 Range: 5c0 Burst: 15 @@ -37,13 +40,14 @@ Flamer: Warhead@1Dam: SpreadDamage Spread: 341 Damage: 8 + ValidTargets: Ground, Water, Trees Versus: None: 90 Wood: 100 Light: 60 Heavy: 25 Concrete: 50 - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect @@ -51,6 +55,7 @@ Flamer: ImpactSounds: firebl3.aud Napalm: + ValidTargets: Ground, Water, Trees ReloadDelay: 20 Range: 4c512 Projectile: Bullet @@ -60,12 +65,13 @@ Napalm: Warhead@1Dam: SpreadDamage Spread: 170 Damage: 100 + ValidTargets: Ground, Water, Trees Versus: None: 90 Light: 60 Heavy: 25 Concrete: 50 - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@2Smu: LeaveSmudge SmudgeType: Scorch Warhead@3Eff: CreateEffect diff --git a/mods/ra/weapons/superweapons.yaml b/mods/ra/weapons/superweapons.yaml index 796f91c68f..a5be7f3f8c 100644 --- a/mods/ra/weapons/superweapons.yaml +++ b/mods/ra/weapons/superweapons.yaml @@ -28,15 +28,15 @@ ParaBomb: ValidImpactTypes: Water Atomic: - ValidTargets: Ground, Water, Underwater, Air + ValidTargets: Ground, Trees, Water, Underwater, Air Warhead@1Dam_impact: SpreadDamage Spread: 1c0 Damage: 150 Falloff: 1000, 368, 135, 50, 18, 7, 0 - ValidTargets: Ground, Water, Underwater, Air + ValidTargets: Ground, Trees, Water, Underwater, Air Versus: Concrete: 25 - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@2Res_impact: DestroyResource Size: 1 Warhead@3Smu_impact: LeaveSmudge @@ -50,10 +50,10 @@ Atomic: Damage: 60 Falloff: 1000, 368, 135, 50, 18, 7, 0 Delay: 5 - ValidTargets: Ground, Water, Underwater, Air + ValidTargets: Ground, Trees, Water, Underwater, Air Versus: Concrete: 25 - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@6Res_areanuke1: DestroyResource Size: 2 Delay: 5 @@ -69,10 +69,10 @@ Atomic: Damage: 60 Falloff: 1000, 368, 135, 50, 18, 7, 0 Delay: 10 - ValidTargets: Ground, Water, Underwater, Air + ValidTargets: Ground, Trees, Water, Underwater, Air Versus: Concrete: 25 - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@10Res_areanuke2: DestroyResource Size: 3 Delay: 10 @@ -85,10 +85,10 @@ Atomic: Damage: 60 Falloff: 1000, 368, 135, 50, 18, 7, 0 Delay: 15 - ValidTargets: Ground, Water, Underwater, Air + ValidTargets: Ground, Trees, Water, Underwater, Air Versus: Concrete: 25 - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@13Res_areanuke3: DestroyResource Size: 4 Delay: 15 @@ -101,10 +101,10 @@ Atomic: Damage: 60 Falloff: 1000, 368, 135, 50, 18, 7, 0 Delay: 20 - ValidTargets: Ground, Water, Underwater, Air + ValidTargets: Ground, Trees, Water, Underwater, Air Versus: Concrete: 25 - DamageTypes: Prone50Percent, TriggerProne, FireDeath + DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary Warhead@16Res_areanuke4: DestroyResource Size: 5 Delay: 20