From 345bc9e17e860f894ff999cf75d06629c2f0eff3 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 02:15:12 +0200 Subject: [PATCH] Fix palette, Z-sorting and sound of TS Ion Cannon --- mods/ts/rules/gdi-structures.yaml | 4 ++- mods/ts/sequences/misc.yaml | 43 +++++++++---------------------- mods/ts/weapons/superweapons.yaml | 8 +++++- 3 files changed, 22 insertions(+), 33 deletions(-) diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml index 565fd7401a..f932ee03e0 100644 --- a/mods/ts/rules/gdi-structures.yaml +++ b/mods/ts/rules/gdi-structures.yaml @@ -401,7 +401,9 @@ GAPLUG: UpgradeTypes: plug.ioncannon UpgradeMinEnabledLevel: 1 Icon: ioncannon - Effect: ionring + Effect: explosion + EffectSequence: ionring + EffectPalette: effectalpha75 WeaponDelay: 0 ChargeTime: 510 Description: Ion Cannon diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index cd1ff8357d..707bfd35ad 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -132,38 +132,31 @@ explosion: building: twlt070 Offset: 0, 0, 36 ionring: ring1 - BlendMode: Additive ZRamp: 1 Tick: 100 ionbeam: ionbeam - Offset: 0,-60 - BlendMode: Additive - Length: * + Offset: 0, -60, 60 + ZRamp: 1 Tick: 100 ionbeam2: ionbeam - Offset: 0,-180 - BlendMode: Additive - Length: * + Offset: 0, -180, 60 + ZRamp: 1 Tick: 100 ionbeam3: ionbeam - Offset: 0,-300 - BlendMode: Additive - Length: * + Offset: 0, -300, 60 + ZRamp: 1 Tick: 100 ionbeam4: ionbeam - Offset: 0,-420 - BlendMode: Additive - Length: * + Offset: 0, -420, 60 + ZRamp: 1 Tick: 100 ionbeam5: ionbeam - Offset: 0,-540 - BlendMode: Additive - Length: * + Offset: 0, -540, 60 + ZRamp: 1 Tick: 100 ionbeam6: ionbeam - Offset: 0,-660 - BlendMode: Additive - Length: * + Offset: 0, -660, 60 + ZRamp: 1 Tick: 100 pulse_explosion: pulsefx2 BlendMode: Additive @@ -424,18 +417,6 @@ clustermissile: down: null # TODO Length: * -ionbeam: - idle: - Length: * - Offset: 0, -78 - ZOffset: 1023 - -ionring: - idle: ring1 - Length: * - ZOffset: -512 - Tick: 120 - ^rock: idle: ShadowStart: 1 diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index 3eeaad1e23..90d7069c10 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -77,17 +77,23 @@ IonCannon: Delay: 3 Warhead@4Effect: CreateEffect Explosions: ionbeam - ImpactSound: ion1.aud + ExplosionPalette: effectalpha75 + ImpactSounds: ion1.aud Warhead@5Effect: CreateEffect Explosions: ionbeam2 + ExplosionPalette: effectalpha75 Warhead@6Effect: CreateEffect Explosions: ionbeam3 + ExplosionPalette: effectalpha75 Warhead@7Effect: CreateEffect Explosions: ionbeam4 + ExplosionPalette: effectalpha75 Warhead@8Effect: CreateEffect Explosions: ionbeam5 + ExplosionPalette: effectalpha75 Warhead@9Effect: CreateEffect Explosions: ionbeam6 + ExplosionPalette: effectalpha75 EMPulseCannon: ReloadDelay: 100