diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index 4002ad64b2..dc831fc885 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -167,8 +167,8 @@ World: Type: Scorch Sequence: scorches SmokeChance: 50 - SmokeImage: smoke_m - SmokeSequences: idle + SmokeImage: scorch_flames + SmokeSequences: large_flame, medium_flame, small_flame MaxSmokeOffsetDistance: 341 SmudgeLayer@CRATER: Type: Crater diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml index 2887918395..314d155da8 100644 --- a/mods/cnc/sequences/misc.yaml +++ b/mods/cnc/sequences/misc.yaml @@ -83,6 +83,218 @@ smoke_m: Offset: 2, -5 ZOffset: 512 +scorch_flames: + large_flame: + Length: * + Combine: + 0: + Filename: fire1.shp + Length: * + Offset: 0,-3 + 1: + Filename: fire1.shp + Length: * + Offset: 0,-3 + 2: + Filename: fire1.shp + Length: * + Offset: 0,-3 + 3: + Filename: fire1.shp + Length: * + Offset: 0,-3 + 4: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 5: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 6: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 7: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + 8: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + 9: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.75 + 10: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.5 + 11: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.25 + medium_flame: + Length: * + Combine: + 0: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 1: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 2: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 3: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 4: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 5: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + 6: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.75 + 7: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.5 + 8: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.25 + small_flame: + Combine: + 0: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 1: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 2: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 3: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 4: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 5: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + Scale: 0.75 + 6: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.5 + 7: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.25 + Length: * + Offset: 0,-3 + tiny_flame: + Combine: + 0: + Filename: fire4.shp + Length: * + Offset: 0,-3 + 1: + Filename: fire4.shp + Length: * + Offset: 0,-3 + 2: + Filename: fire4.shp + Length: * + Offset: 0,-3 + 3: + Filename: fire4.shp + Length: * + Offset: 0,-3 + 4: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + Scale: 0.3 + 5: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.2 + Length: * + Offset: 0,-3 + smoke: + Combine: + 0: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + 1: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + 2: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.8 + 3: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.6 + 4: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.4 + 5: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.2 + laserfire: idle: Filename: veh-hit3.shp diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index ee5a5c2c03..799d7881fe 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -190,8 +190,8 @@ World: Type: Scorch Sequence: scorches SmokeChance: 50 - SmokeImage: smoke_m - SmokeSequences: idle + SmokeImage: scorch_flames + SmokeSequences: large_flame, medium_flame, small_flame MaxSmokeOffsetDistance: 341 SmudgeLayer@CRATER: Type: Crater diff --git a/mods/ra/sequences/misc.yaml b/mods/ra/sequences/misc.yaml index c277ac0df7..544424350a 100644 --- a/mods/ra/sequences/misc.yaml +++ b/mods/ra/sequences/misc.yaml @@ -236,6 +236,218 @@ smoke_m: Offset: 2, -5 ZOffset: 512 +scorch_flames: + large_flame: + Length: * + Combine: + 0: + Filename: fire1.shp + Length: * + Offset: 0,-3 + 1: + Filename: fire1.shp + Length: * + Offset: 0,-3 + 2: + Filename: fire1.shp + Length: * + Offset: 0,-3 + 3: + Filename: fire1.shp + Length: * + Offset: 0,-3 + 4: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 5: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 6: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 7: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + 8: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + 9: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.75 + 10: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.5 + 11: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.25 + medium_flame: + Length: * + Combine: + 0: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 1: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 2: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 3: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 4: + Filename: fire2.shp + Length: * + Offset: 0,-3 + 5: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + 6: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.75 + 7: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.5 + 8: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.25 + small_flame: + Combine: + 0: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 1: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 2: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 3: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 4: + Filename: fire3.shp + Length: * + Offset: 0,-3 + 5: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + Scale: 0.75 + 6: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.5 + 7: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.25 + Length: * + Offset: 0,-3 + tiny_flame: + Combine: + 0: + Filename: fire4.shp + Length: * + Offset: 0,-3 + 1: + Filename: fire4.shp + Length: * + Offset: 0,-3 + 2: + Filename: fire4.shp + Length: * + Offset: 0,-3 + 3: + Filename: fire4.shp + Length: * + Offset: 0,-3 + 4: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + Scale: 0.3 + 5: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.2 + Length: * + Offset: 0,-3 + smoke: + Combine: + 0: + Filename: smoke_m.shp + Length: * + Offset: 2, -5 + 1: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + 2: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.8 + 3: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.6 + 4: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.4 + 5: + Filename: smoke_m.shp + Start: 49 + Length: 42 + Offset: 2, -5 + Scale: 0.2 + dragon: idle: Filename: dragon.shp diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index fcc4343088..b67000c0b7 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -55,6 +55,8 @@ Flamer: Light: 40 Heavy: 20 Concrete: 10 + Warhead@2Smu: LeaveSmudge + Chance: 15 Warhead@3Eff: CreateEffect Explosions: small_napalm