From cec2c584e61cbc7c691bf8b0016719838db05bdc Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 13 Dec 2015 17:51:35 +0000 Subject: [PATCH] Fix TS EMP overlay. --- mods/ts/rules/defaults.yaml | 6 +- mods/ts/sequences/civilian.yaml | 12 ++ mods/ts/sequences/infantry.yaml | 8 ++ mods/ts/sequences/misc.yaml | 5 - mods/ts/sequences/structures.yaml | 204 ++++++++++++++++++++++++++++++ mods/ts/sequences/vehicles.yaml | 132 ++++++++++++++++++- 6 files changed, 356 insertions(+), 11 deletions(-) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 49eeea6b60..b827cfd787 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -61,10 +61,8 @@ TimedUpgradeBar@EMPDISABLE: Upgrade: empdisable Color: FFFFFF - WithDecoration@EMPDISABLE: - Image: emp - Sequence: idle - ReferencePoint: HCenter, VCenter + WithIdleOverlay@EMPDISABLE: + Sequence: emp-overlay Palette: effect UpgradeTypes: empdisable ShowToEnemies: true diff --git a/mods/ts/sequences/civilian.yaml b/mods/ts/sequences/civilian.yaml index 878e1ed3b3..5025e70b53 100644 --- a/mods/ts/sequences/civilian.yaml +++ b/mods/ts/sequences/civilian.yaml @@ -919,6 +919,12 @@ gaspot: make: gaspotmk Length: 14 ShadowStart: 14 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: spoticon Offset: 0, 0 UseTilesetCode: false @@ -935,6 +941,12 @@ galite: lighting: alphatst BlendMode: DoubleMultiplicative UseTilesetCode: false + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: liteicon Offset: 0, 0 UseTilesetCode: false diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml index 3bd73c540b..52411d9e59 100644 --- a/mods/ts/sequences/infantry.yaml +++ b/mods/ts/sequences/infantry.yaml @@ -953,6 +953,10 @@ cyc2: ShadowStart: 190 die6: electro Length: * + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive icon: cybcicon cyborg: @@ -1014,6 +1018,10 @@ cyborg: ShadowStart: 662 die6: electro Length: * + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive icon: cybiicon mutant: diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 1934ea51b1..c890696a23 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -244,11 +244,6 @@ wake: Length: * Tick: 180 -emp: - idle: emp_fx01 - Length: * - BlendMode: Additive - resources: Defaults: UseTilesetExtension: true diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index e34e2cb771..22bbce2af9 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -40,6 +40,12 @@ gacnst: Length: 10 damaged-idle-front: gtcnst_b Length: 10 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: facticon Offset: 0,0 UseTilesetCode: false @@ -89,6 +95,12 @@ gapowr: make: gtpowrmk Length: 20 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: powricon Offset: 0, 0 UseTilesetCode: false @@ -133,6 +145,12 @@ gapile: make: gtpilemk Length: 20 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: brrkicon Offset: 0, 0 UseTilesetCode: false @@ -204,6 +222,12 @@ gaweap: Start: 2 Length: 1 ZOffset: -1024 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: weapicon Offset: 0, 0 UseTilesetCode: false @@ -231,6 +255,12 @@ napowr: make: ntpowrmk Length: 19 ShadowStart: 19 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: npwricon Offset: 0, 0 UseTilesetCode: false @@ -258,6 +288,12 @@ naapwr: make: ntapwrmk Length: 19 ShadowStart: 19 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: apwricon Offset: 0, 0 UseTilesetCode: false @@ -294,6 +330,12 @@ nahand: make: nthandmk Length: 15 ShadowStart: 15 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: handicon Offset: 0, 0 UseTilesetCode: false @@ -350,6 +392,12 @@ naweap: dead-bib: ntweapbb Start: 2 ZOffset: -1024 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: nwepicon Offset: 0, 0 UseTilesetCode: false @@ -377,6 +425,12 @@ naradr: make: ntradrmk Length: 20 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: nradicon Offset: 0, 0 UseTilesetCode: false @@ -403,6 +457,12 @@ natech: make: nttechmk Length: 18 ShadowStart: 18 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: ntchicon Offset: 0, 0 UseTilesetCode: false @@ -430,6 +490,12 @@ natmpl: make: nttmplmk Length: 17 ShadowStart: 17 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: tmplicon Offset: 0, 0 UseTilesetCode: false @@ -459,6 +525,12 @@ garadr: make: gtradrmk Length: 20 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: radricon Offset: 0, 0 UseTilesetCode: false @@ -486,6 +558,12 @@ gatech: make: gttechmk Length: 20 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: techicon Offset: 0, 0 UseTilesetCode: false @@ -556,6 +634,12 @@ gatick: Length: * Offset: 0, 0 UseTilesetCode: false + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive make: gatickmk Length: 24 ShadowStart: 24 @@ -569,6 +653,12 @@ gaicbm: damaged-idle: Start: 1 ShadowStart: 4 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive make: gaicbmmk Length: 30 ShadowStart: 30 @@ -586,6 +676,12 @@ gaarty: Length: * Offset: 0, 0 UseTilesetCode: false + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive make: gaartymk Length: 16 ShadowStart: 16 @@ -613,6 +709,12 @@ naobel: make: ntobelmk Length: 19 ShadowStart: 19 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: obliicon Offset: 0, 0 UseTilesetCode: false @@ -633,6 +735,12 @@ nalasr: make: ntlasrmk Length: 21 ShadowStart: 21 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: plticon Offset: 0, 0 UseTilesetCode: false @@ -656,6 +764,12 @@ nasam: make: ntsammk Length: 8 ShadowStart: 8 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: samicon Offset: 0, 0 UseTilesetCode: false @@ -678,6 +792,12 @@ napuls.gdi: make: ntpulsmk Length: 20 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: sidec01.mix:empicon Offset: 0, 0 UseTilesetCode: false @@ -700,6 +820,12 @@ napuls.nod: make: ntpulsmk Length: 20 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: sidec02.mix:empicon Offset: 0, 0 UseTilesetCode: false @@ -727,6 +853,12 @@ nastlh: make: ntstlhmk Length: 18 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: clckicon Offset: 0, 0 UseTilesetCode: false @@ -784,6 +916,12 @@ gactwr: muzzle7: mgun-ne Length: * UseTilesetCode: false + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: towricon Offset: 0, 0 UseTilesetCode: false @@ -840,6 +978,12 @@ gahpad: Length: 18 ShadowStart: 18 ZOffset: -1c511 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: heliicon Offset: 0, 0 UseTilesetCode: false @@ -884,6 +1028,12 @@ nahpad: make: nthpadmk Length: 20 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: nhpdicon Offset: 0, 0 UseTilesetCode: false @@ -918,6 +1068,12 @@ proc.gdi: damaged-bib: ntrefnbb Start: 1 ZOffset: -1024 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: sidec01.mix:reficon Offset: 0, 0 UseTilesetCode: false @@ -952,6 +1108,12 @@ proc.nod: damaged-bib: ntrefnbb Start: 1 ZOffset: -1024 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: sidec02.mix:reficon Offset: 0, 0 UseTilesetCode: false @@ -993,6 +1155,12 @@ nawast: damaged-bib: ntwastbb Start: 1 ZOffset: -1024 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: wasticon Offset: 0, 0 UseTilesetCode: false @@ -1031,6 +1199,12 @@ gasilo.gdi: make: gtsilomk Length: 18 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: sidec01.mix:siloicon Offset: 0, 0 UseTilesetCode: false @@ -1069,6 +1243,12 @@ gasilo.nod: make: gtsilomk Length: 18 ShadowStart: 20 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: sidec02.mix:siloicon Offset: 0, 0 UseTilesetCode: false @@ -1127,6 +1307,12 @@ gadept.gdi: Length: 10 Tick: 60 ShadowStart: 10 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: sidec01.mix:fixicon Offset: 0, 0 UseTilesetCode: false @@ -1185,6 +1371,12 @@ gadept.nod: Length: 10 Tick: 60 ShadowStart: 10 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: sidec02.mix:fixicon Offset: 76, 66 UseTilesetCode: false @@ -1216,6 +1408,12 @@ namisl: Start: 10 Length: 10 Tick: 80 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: msslicon Offset: 0, 0 UseTilesetCode: false @@ -1275,6 +1473,12 @@ gaplug: make: gtplugmk Length: 17 ShadowStart: 17 + emp-overlay: emp_fx01 + Length: * + Offset: 0, 0 + UseTilesetCode: false + ZOffset: 512 + BlendMode: Additive icon: plugicon Offset: 0, 0 UseTilesetCode: false diff --git a/mods/ts/sequences/vehicles.yaml b/mods/ts/sequences/vehicles.yaml index 671610484a..4844ad4391 100644 --- a/mods/ts/sequences/vehicles.yaml +++ b/mods/ts/sequences/vehicles.yaml @@ -1,31 +1,51 @@ mcv.gdi: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: sidec01.mix:mcvicon mcv.nod: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: sidec02.mix:mcvicon apc: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: apcicon harv.gdi: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive harvest: harvestr Length: * icon: sidec01.mix:harvicon harv.nod: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive harvest: harvestr Length: * icon: sidec02.mix:harvicon hvr: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: hovricon 4tnk: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive muzzle: gunfire Length: * lpst.gdi: - icon: sidec01.mix:lpsticon idle: gadpsa Offset: 0, -12 ShadowStart: 3 @@ -33,9 +53,12 @@ lpst.gdi: Offset: 0, -12 Length: 36 ShadowStart: 36 + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive + icon: sidec01.mix:lpsticon lpst.nod: - icon: sidec02.mix:lpsticon idle: gadpsa Offset: 0, -12 ShadowStart: 3 @@ -43,20 +66,39 @@ lpst.nod: Offset: 0, -12 Length: 36 ShadowStart: 36 + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive + icon: sidec02.mix:lpsticon repair: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: rboticon art2: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: artyicon weed: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: weedicon hmec: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: hmecicon bike: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: cyclicon bggy: @@ -70,23 +112,40 @@ bggy: muzzle5: mgun-se muzzle6: mgun-e muzzle7: mgun-ne + emp-overlay: emp_fx01 + BlendMode: Additive icon: bggyicon sapc: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: sapcicon subtank: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: subticon sonic: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: soniicon ttnk: muzzle: gunfire Length: * + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: tickicon stnk: + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: stnkicon mmch: @@ -103,6 +162,9 @@ mmch: Facings: -32 muzzle: gunfire Length: * + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: mmchicon gghunt: @@ -110,6 +172,9 @@ gghunt: Facings: 1 Length: 8 ShadowStart: 8 + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive smech: stand: @@ -126,4 +191,67 @@ smech: Facings: -8 ShadowStart: 240 Tick: 100 + emp-overlay: emp_fx01 + Length: * + BlendMode: Additive icon: smchicon + +trucka: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +truckb: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +icbm: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +bus: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +pick: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +car: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +wini: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +locomotive: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +traincar: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive + +cargocar: + emp-overlay: emp_fx01 + Length: * + ZOffset: 512 + BlendMode: Additive