diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index 860511020d..4c7f48d9cf 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -84,13 +84,33 @@ World: Name: Nod Race: nod DomainIndex: - SmudgeLayer@SCORCH: - Type: Scorch - Sequence: scorches + SmudgeLayer@SMALLSCORCH: + Type: SmallScorch + Sequence: smallscorches + SmokeType: smallfire SmokePercentage: 50 - SmudgeLayer@CRATER: - Type: Crater - Sequence: craters + SmudgeLayer@MEDIUMSCORCH: + Type: MediumScorch + Sequence: mediumscorches + SmokeType: mediumfire + SmokePercentage: 75 + SmudgeLayer@LARGESCORCH: + Type: LargeScorch + Sequence: largescorches + SmokeType: largefire + SmokePercentage: 100 + SmudgeLayer@SMALLCRATER: + Type: SmallCrater + SmokeType: smallsmoke + Sequence: smallcraters + SmudgeLayer@MEDIUMCRATER: + Type: MediumCrater + SmokeType: smallsmoke + Sequence: mediumcraters + SmudgeLayer@LARGECRATER: + Type: LargeCrater + SmokeType: largesmoke + Sequence: largecraters ResourceLayer: ResourceClaimLayer: FixedColorPalette@GreenTiberium: diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index ad6b64cd48..320c52464b 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -310,12 +310,36 @@ flameall: Facings: -8 Tick: 160 -#TODO: placeholder to fix crashes related to smoke -smoke_m: +largesmoke: + idle: lgrysmk1 + Start: 0 + Length: * + +smallsmoke: + idle: sgrysmk1 + Start: 0 + Length: * + +largefire: + idle: fire1 + Start: 0 + Length: * + +mediumfire: + idle: fire2 + Start: 0 + Length: * + +smallfire: idle: fire3 Start: 0 Length: * +tinyfire: + idle: fire4 + Start: 0 + Length: * + moveflsh: idle: ring Start: 0 @@ -430,42 +454,86 @@ shroud: fog: fog Length: * -scorches: #TODO: make use of 07-12 as well +smallscorches: sc1: burnt01 - Length: * + Length: 1 Offset: 0, -12 sc2: burnt02 - Length: * + Length: 1 Offset: 0, -12 sc3: burnt03 - Length: * + Length: 1 Offset: 0, -12 sc4: burnt04 - Length: * + Length: 1 Offset: 0, -12 sc5: burnt05 - Length: * + Length: 1 Offset: 0, -12 sc6: burnt06 - Length: * + Length: 1 Offset: 0, -12 -craters: #TODO: make use of 07-12 as well +mediumscorches: + sc7: burnt07 + Length: 1 + Offset: 0, -18 + sc8: burnt08 + Length: 1 + Offset: 0, -18 + sc9: burnt09 + Length: 1 + Offset: 0, -18 + sc10: burnt10 + Length: 1 + Offset: 0, -18 + +largescorches: + sc11: burnt11 + Length: 1 + Offset: 0, -24 + sc12: burnt12 + Length: 1 + Offset: 0, -24 + +smallcraters: cr1: crater01 - Length: * + Length: 1 Offset: 0, -12 cr2: crater02 - Length: * + Length: 1 Offset: 0, -12 cr3: crater03 - Length: * + Length: 1 Offset: 0, -12 cr4: crater04 - Length: * + Length: 1 Offset: 0, -12 cr5: crater05 - Length: * + Length: 1 Offset: 0, -12 cr6: crater06 - Length: * + Length: 1 Offset: 0, -12 + +mediumcraters: + cr7: crater07 + Length: 1 + Offset: 0, -12 + cr8: crater08 + Length: 1 + Offset: 0, -12 + cr9: crater09 + Length: 1 + Offset: 0, -12 + cr10: crater10 + Length: 1 + Offset: 0, -12 + +largecraters: + cr11: crater11 + Length: 1 + Offset: 0, -24 + cr12: crater12 + Length: 1 + Offset: 0, -24 diff --git a/mods/ts/tilesets/temperat.yaml b/mods/ts/tilesets/temperat.yaml index 34554dd6d6..b40d14e778 100644 --- a/mods/ts/tilesets/temperat.yaml +++ b/mods/ts/tilesets/temperat.yaml @@ -9,7 +9,7 @@ General: Terrain: TerrainType@Clear: Type: Clear - AcceptsSmudgeType: Crater, Scorch + AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch Color: 116, 85, 55 TargetTypes: Ground TerrainType@Road: @@ -42,12 +42,12 @@ Terrain: TargetTypes: Ground TerrainType@Tiberium: Type: Tiberium - AcceptsSmudgeType: Crater, Scorch + AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch Color: 161, 226, 28 TargetTypes: Ground TerrainType@BlueTiberium: Type: BlueTiberium - AcceptsSmudgeType: Crater, Scorch + AcceptsSmudgeType: SmallCrater, MediumCrater, LargeCrater, SmallScorch, MediumScorch, LargeScorch Color: 28, 64, 248 TargetTypes: Ground diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index a015dd2b74..b8dc504917 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -79,6 +79,8 @@ Grenade: Explosion: small_watersplash ImpactSound: ssplash3.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater Bazooka: ReloadDelay: 60 @@ -120,6 +122,8 @@ Bazooka: Explosion: small_twlt ImpactSound: expnew12.aud ValidImpactTypes: Air, AirHit + Warhead@5Smu: LeaveSmudge + SmudgeType: SmallCrater MultiCluster: ReloadDelay: 80 @@ -155,6 +159,8 @@ MultiCluster: Explosion: small_watersplash ImpactSound: ssplash2.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater Heal: ReloadDelay: 80 @@ -265,6 +271,8 @@ CyCannon: Explosion: small_watersplash ImpactSound: ssplash3.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: SmallScorch Vulcan3: ReloadDelay: 30 @@ -427,6 +435,8 @@ HoverMissile: Explosion: small_twlt ImpactSound: expnew12.aud ValidImpactTypes: Air, AirHit + Warhead@5: LeaveSmudge + SmudgeType: SmallCrater 120mmx: ReloadDelay: 80 @@ -458,6 +468,8 @@ HoverMissile: Explosion: small_watersplash ImpactSound: ssplash3.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater MammothTusk: ReloadDelay: 80 @@ -571,6 +583,8 @@ SuicideBomb: Explosion: small_watersplash ImpactSound: ssplash3.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater MechRailgun: ReloadDelay: 60 @@ -652,6 +666,8 @@ BikeMissile: Explosion: small_watersplash ImpactSound: ssplash3.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: SmallCrater RaiderCannon: ReloadDelay: 55 @@ -699,6 +715,8 @@ FireballLauncher: Light: 59 Heavy: 6 Concrete: 2 + Warhead@2Smu: LeaveSmudge + SmudgeType: SmallScorch SonicZap: ReloadDelay: 120 @@ -756,6 +774,8 @@ Dragon: Explosion: small_twlt ImpactSound: expnew12.aud ValidImpactTypes: Air, AirHit + Warhead@5Smu: LeaveSmudge + SmudgeType: SmallCrater 90mm: ReloadDelay: 50 @@ -785,6 +805,8 @@ Dragon: Explosion: small_watersplash ImpactSound: ssplash3.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: SmallCrater 155mm: ReloadDelay: 110 @@ -817,6 +839,8 @@ Dragon: Explosion: small_watersplash ImpactSound: ssplash2.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater Hellfire: ReloadDelay: 50 @@ -857,6 +881,8 @@ Hellfire: Explosion: small_twlt ImpactSound: expnew12.aud ValidImpactTypes: Air, AirHit + Warhead@5Smu: LeaveSmudge + SmudgeType: SmallCrater Bomb: ReloadDelay: 10 @@ -885,6 +911,8 @@ Bomb: Explosion: small_watersplash ImpactSound: ssplash3.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater Proton: ReloadDelay: 3 @@ -1003,7 +1031,7 @@ IonCannon: Delay: 3 ValidTargets: Ground, Air Warhead@4Smu_area: LeaveSmudge - SmudgeType: Scorch + SmudgeType: SmallScorch Size: 2,1 Delay: 3 @@ -1059,6 +1087,8 @@ RPGTower: Explosion: small_watersplash ImpactSound: ssplash2.aud ValidImpactTypes: Water + Warhead@4Smu: LeaveSmudge + SmudgeType: MediumCrater SAMTower: ReloadDelay: 55 @@ -1096,8 +1126,6 @@ ObeliskLaser: Damage: 250 DeathType: 5 ProneModifier: 60 - Warhead@2Smu: LeaveSmudge - SmudgeType: Scorch TurretLaser: ReloadDelay: 40 @@ -1111,8 +1139,6 @@ TurretLaser: Damage: 30 DeathType: 5 ProneModifier: 60 - Warhead@2Smu: LeaveSmudge - SmudgeType: Scorch EMPulseCannon: ReloadDelay: 100