From 805e78a672752b6d1500a29b9504090c8c9d5880 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 02:12:25 +0200 Subject: [PATCH 1/8] Add static alpha effect palettes to TS for 25, 50 and 75% alpha --- mods/ts/rules/palettes.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mods/ts/rules/palettes.yaml b/mods/ts/rules/palettes.yaml index 30083e5b13..1f7d7d3995 100644 --- a/mods/ts/rules/palettes.yaml +++ b/mods/ts/rules/palettes.yaml @@ -41,6 +41,18 @@ PaletteFromFile@effect: Name: effect Filename: anim.pal + PaletteFromPaletteWithAlpha@effectalpha25: + Name: effectalpha25 + Alpha: 0.25 + BasePalette: effect + PaletteFromPaletteWithAlpha@effectalpha50: + Name: effectalpha50 + Alpha: 0.5 + BasePalette: effect + PaletteFromPaletteWithAlpha@effectalpha75: + Name: effectalpha75 + Alpha: 0.75 + BasePalette: effect PaletteFromFile@sidebar: Name: sidebar Filename: sidebar-nod|sidebar.pal From 8c67a32dd909b21217250254c0e87fe123855938 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 02:13:10 +0200 Subject: [PATCH 2/8] Set Ion Cannon ChargeTime to its original value --- mods/ts/rules/gdi-structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml index 9be58d917d..565fd7401a 100644 --- a/mods/ts/rules/gdi-structures.yaml +++ b/mods/ts/rules/gdi-structures.yaml @@ -403,7 +403,7 @@ GAPLUG: Icon: ioncannon Effect: ionring WeaponDelay: 0 - ChargeTime: 180 + ChargeTime: 510 Description: Ion Cannon LongDesc: Initiate an Ion Cannon strike.\nApplies instant damage to a small area. EndChargeSpeechNotification: IonCannonReady From 345bc9e17e860f894ff999cf75d06629c2f0eff3 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 02:15:12 +0200 Subject: [PATCH 3/8] 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 From b9da5d5f81d8c9441564e6c0a00b5d0b0088a201 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 02:36:58 +0200 Subject: [PATCH 4/8] Fix Tick Tank and Titan gun explosions to match original --- mods/ts/weapons/largeguns.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml index 95d277f1e8..1eba06fe54 100644 --- a/mods/ts/weapons/largeguns.yaml +++ b/mods/ts/weapons/largeguns.yaml @@ -19,7 +19,7 @@ Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosions: medium_clsn + Explosions: small_clsn ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect @@ -48,7 +48,7 @@ Concrete: 60 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect - Explosions: large_clsn + Explosions: medium_clsn ImpactSounds: expnew14.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect From fc17297a39602da92f904950e16ef7a27cfcea7a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 03:10:14 +0200 Subject: [PATCH 5/8] Fix Cyborg Commando weapon explosion to match original --- mods/ts/weapons/energyweapons.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml index 8f0b71be88..01d7adba0e 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -125,7 +125,7 @@ CyCannon: Concrete: 80 DamageTypes: Prone350Percent, TriggerProne, EnergyDeath Warhead@2Eff: CreateEffect - Explosions: large_bang + Explosions: large_explosion ImpactSounds: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect From 09baf2c119daa1c71cb606640d7f9b38663e5618 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 03:10:51 +0200 Subject: [PATCH 6/8] Change large TS explosions to use alpha transparency --- mods/ts/weapons/bombsandgrenades.yaml | 1 + mods/ts/weapons/energyweapons.yaml | 1 + mods/ts/weapons/explosions.yaml | 2 ++ mods/ts/weapons/largeguns.yaml | 1 + 4 files changed, 5 insertions(+) diff --git a/mods/ts/weapons/bombsandgrenades.yaml b/mods/ts/weapons/bombsandgrenades.yaml index d9d8bff90d..c8f0a2942d 100644 --- a/mods/ts/weapons/bombsandgrenades.yaml +++ b/mods/ts/weapons/bombsandgrenades.yaml @@ -53,6 +53,7 @@ Bomb: DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_explosion + ExplosionPalette: effectalpha75 ImpactSounds: expnew09.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml index 01d7adba0e..4dbe58a19d 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -126,6 +126,7 @@ CyCannon: DamageTypes: Prone350Percent, TriggerProne, EnergyDeath Warhead@2Eff: CreateEffect Explosions: large_explosion + ExplosionPalette: effectalpha75 ImpactSounds: expnew12.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml index b950dc267e..98d42e4907 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/mods/ts/weapons/explosions.yaml @@ -11,6 +11,7 @@ UnitExplode: DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_twlt + ExplosionPalette: effectalpha75 ImpactSounds: expnew09.aud Warhead@4Smu: LeaveSmudge SmudgeType: MediumCrater @@ -53,6 +54,7 @@ TiberiumExplosion: Size: 1,1 Warhead@3Eff: CreateEffect Explosions: large_explosion + ExplosionPalette: effectalpha75 ImpactSounds: expnew09.aud SmallDebris: diff --git a/mods/ts/weapons/largeguns.yaml b/mods/ts/weapons/largeguns.yaml index 1eba06fe54..31d62f5ab2 100644 --- a/mods/ts/weapons/largeguns.yaml +++ b/mods/ts/weapons/largeguns.yaml @@ -119,6 +119,7 @@ DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath Warhead@2Eff: CreateEffect Explosions: large_explosion + ExplosionPalette: effectalpha75 ImpactSounds: expnew06.aud InvalidImpactTypes: Water Warhead@3EffWater: CreateEffect From 40c2aaa1c609e3b7d5508ba12c0df66d4b128ef4 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 03:11:29 +0200 Subject: [PATCH 7/8] Fix Z-sorting of several effects in TS --- mods/ts/sequences/misc.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 707bfd35ad..d9d153bb6d 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -51,6 +51,7 @@ crate-effects: Defaults: Length: * ZOffset: 2047 + Offset: 0, 0, 24 dollar: money reveal-map: reveal hide-map: shroudx @@ -211,22 +212,26 @@ discus: idle: Length: * ZOffset: 1023 + Offset: 0, 0, 12 canister: idle: Length: * ZOffset: 1023 + Offset: 0, 0, 12 pulsball: idle: Length: * BlendMode: Additive ZOffset: 1023 + Offset: 0, 0, 24 dragon: idle: Facings: 32 ZOffset: 1023 + Offset: 0, 0, 6 crystal4: idle: @@ -234,15 +239,18 @@ crystal4: ShadowStart: 15 UseTilesetExtension: true ZOffset: 1023 + Offset: 0, 0, 6 120mm: idle: ZOffset: 1023 + Offset: 0, 0, 4 torpedo: idle: Length: * ZOffset: 1023 + Offset: 0, 0, 8 flameall: idle: @@ -250,42 +258,51 @@ flameall: Facings: -8 Tick: 160 ZOffset: 1023 + Offset: 0, 0, 24 largesmoke: idle: lgrysmk1 Length: * ZOffset: 1023 + Offset: 0, 0, 24 smallsmoke: idle: sgrysmk1 Length: * ZOffset: 1023 + Offset: 0, 0, 24 large_smoke_trail: idle: smokey Length: * ZOffset: 1023 + Offset: 0, 0, 24 small_smoke_trail: idle: smokey2 Length: * ZOffset: 1023 + Offset: 0, 0, 24 largefire: idle: fire1 Length: * + Offset: 0, 0, 36 mediumfire: idle: fire2 Length: * + Offset: 0, 0, 24 smallfire: idle: fire3 Length: * + Offset: 0, 0, 24 tinyfire: idle: fire4 Length: * + Offset: 0, 0, 24 moveflsh: idle: ring From effeddda14fcaa065b93c4957a14ae17fc21ca89 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Sep 2016 04:11:08 +0200 Subject: [PATCH 8/8] Fix TS Bazooka infantry and Bike firing offsets --- mods/ts/rules/nod-infantry.yaml | 2 +- mods/ts/rules/nod-vehicles.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 66a92798cc..826ab87f8e 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -17,7 +17,7 @@ E3: Speed: 42 Armament@PRIMARY: Weapon: Bazooka - LocalOffset: 128,0,640 + LocalOffset: 252,0,684 AttackFrontal: Voice: Attack WithInfantryBody: diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 51fad48922..99fdde3b22 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -56,12 +56,12 @@ BIKE: UpgradeTypes: eliteweapon UpgradeMaxEnabledLevel: 0 UpgradeMaxAcceptedLevel: 1 - LocalOffset: -128,-170,213, -128,170,213 + LocalOffset: -108,-144,360, -108,144,360 Armament@ELITE: Weapon: HoverMissile UpgradeTypes: eliteweapon UpgradeMinEnabledLevel: 1 - LocalOffset: -128,-170,213, -128,170,213 + LocalOffset: -108,-144,360, -108,144,360 AttackFrontal: Voice: Attack AutoTarget: