From 2988c500c0917d2612d2b6d35f29e5bccc3dde23 Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Wed, 24 Sep 2014 14:18:09 -0500 Subject: [PATCH] More TS art fixes. --- mods/ts/rules/structures.yaml | 4 +- mods/ts/sequences/misc.yaml | 10 ++ mods/ts/sequences/structures.yaml | 200 +++++++++++++++++++----------- 3 files changed, 138 insertions(+), 76 deletions(-) diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index e292d47529..de18954fc3 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -752,8 +752,8 @@ GATECH: ProvidesCustomPrerequisite: Prerequisite: tech Building: - Footprint: xxx xxx xxx - Dimensions: 3,3 + Footprint: xxx xxx + Dimensions: 3,2 Health: HP: 500 Armor: diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 6bc0e1ea91..2eb2cbfa0c 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -1,24 +1,34 @@ overlay: build-valid-interior: place Start: 0 + Offset: 0, 12 build-valid-snow: place Start: 0 + Offset: 0, 12 build-valid-temperat: place Start: 0 + Offset: 0, 12 build-invalid: place Start: 1 + Offset: 0, 12 target-select: place Start: 1 + Offset: 0, 12 target-valid-desert: place Start: 1 + Offset: 0, 12 target-valid-interior: place Start: 1 + Offset: 0, 12 target-valid-snow: place Start: 1 + Offset: 0, 12 target-valid-temperat: place Start: 1 + Offset: 0, 12 target-invalid: place Start: 1 + Offset: 0, 12 poweroff: offline: poweroff diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index c41e3c2352..97ec03b797 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -56,50 +56,40 @@ gapowr: idle: gtpowr Start: 0 ShadowStart: 3 - Offset: 0, -10 damaged-idle: gtpowr Start: 1 ShadowStart: 4 - Offset: 0, -10 critical-idle: gtpowr Start: 2 ShadowStart: 5 - Offset: 0, -10 idle-lights: gtpowr_a Start: 0 Length: 12 Tick: 200 - Offset: 0, -10 damaged-idle-lights: gtpowr_a Start: 12 Length: 12 Tick: 200 - Offset: 0, -10 critical-idle-lights: gtpowr_a Start: 24 Length: 12 Tick: 200 - Offset: 0, -10 idle-plug: gtpowr_b Start: 0 Length: 12 Tick: 200 - Offset: 0, -10 damaged-idle-plug: gtpowr_b Start: 0 Length: 12 Tick: 200 - Offset: 0, -10 critical-idle-plug: gtpowr_b Start: 0 Length: 12 Tick: 200 - Offset: 0, -10 make: gtpowrmk Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -10 icon: powricon Start: 0 @@ -107,48 +97,38 @@ gapile: idle: gtpile Start: 0 ShadowStart: 3 - Offset: 0, -12 damaged-idle: gtpile Start: 1 ShadowStart: 4 - Offset: 0, -12 critical-idle: gtpile Start: 2 ShadowStart: 5 - Offset: 0, -12 production-lights: gtpile_a Start: 0 Length: 7 Tick: 200 - Offset: 0, -12 damaged-production-lights: gtpile_a Start:7 Length: 7 Tick: 200 - Offset: 0, -12 idle-light: gtpile_b Start: 0 Length: 7 Tick: 200 - Offset: 0, -12 damaged-idle-light: gtpile_b Start:7 Length: 7 Tick: 200 - Offset: 0, -12 idle-flag: gtpile_c Start:0 Length: 7 - Offset: 0, -12 damaged-idle-flag: gtpile_c Start:7 Length: 7 - Offset: 0, -12 make: gtpilemk Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -12 icon: brrkicon Start: 0 @@ -156,87 +136,87 @@ gaweap: idle: gtweap Start: 0 ShadowStart: 3 - Offset: -12, -28 + Offset: 0, -12 damaged-idle: gtweap Start: 1 ShadowStart: 4 - Offset: -12, -28 + Offset: 0, -12 dead: gtweap Start: 2 ShadowStart: 5 - Offset: -12, -28 + Offset: 0, -12 production-lights-white: gtweap_a Start: 0 Length: 8 Tick: 100 ZOffset: 2048 - Offset: -12, -28 + Offset: 0, -12 damaged-production-lights-white: gtweap_a Start: 8 Length: 8 Tick: 100 ZOffset: 2048 - Offset: -12, -28 + Offset: 0, -12 production-lights-red: gtweap_b Start: 0 Length: 4 Tick: 120 ZOffset: 2048 - Offset: -12, -28 + Offset: 0, -12 damaged-production-lights-red: gtweap_b Start: 4 Length: 4 Tick: 120 ZOffset: 2048 - Offset: -12, -28 + Offset: 0, -12 idle-turbines: gtweap_c Start: 0 Length: 4 Tick: 80 ZOffset: 2048 - Offset: -12, -28 + Offset: 0, -12 damaged-idle-turbines: gtweap_c Start: 0 Length: 4 Tick: 80 ZOffset: 2048 - Offset: -12, -28 + Offset: 0, -12 build-top: gtweap_d Start: 0 Length: 9 ShadowStart: 9 - Offset: -12, -28 + Offset: 0, -12 damaged-build-top: gtweap_d Start: 0 Length: 9 ShadowStart: 9 - Offset: -12, -28 + Offset: 0, -12 idle-top: gtweap_2 Start: 0 - Offset: -12, -28 + Offset: 0, -12 damaged-idle-top: gtweap_2 Start: 1 - Offset: -12, -28 + Offset: 0, -12 make: gtweapmk Start: 0 Length: 20 Tick: 80 ShadowStart: 20 - Offset: -12, -28 + Offset: 0, -12 icon: weapicon Start: 0 bib: gtweapbb Start: 0 Length: 1 - Offset: -12, -28 + Offset: 0, -12 damaged-bib: gtweapbb Start: 1 Length: 1 - Offset: -12, -28 + Offset: 0, -12 critical-bib: gtweapbb Start: 2 Length: 1 - Offset: -12, -28 + Offset: 0, -12 # TODO: gtweap_1 & gtweap_a & gtweap_b & gtweap_c are unused napowr: @@ -271,29 +251,36 @@ napowr: naapwr: idle: ntapwr Start: 0 + Offset: 12, -6 ShadowStart: 3 damaged-idle: ntapwr Start: 1 ShadowStart: 4 + Offset: 12, -6 critical-idle: ntapwr Start: 2 ShadowStart: 5 + Offset: 12, -6 idle-lights: ntapwr_a Start: 0 Length: 9 Tick: 200 + Offset: 12, -6 damaged-idle-lights: ntapwr_a Start: 9 Length: 9 Tick: 200 + Offset: 12, -6 critical-idle-lights: ntapwr_a Start: 9 Length: 9 Tick: 200 + Offset: 12, -6 make: ntapwrmk Start: 0 Length: 19 ShadowStart: 19 + Offset: 12, -6 icon: apwricon Start: 0 @@ -301,40 +288,40 @@ nahand: idle: nthand Start: 0 ShadowStart: 3 - Offset: -14, -14 + Offset: -6, -6 damaged-idle: nthand Start: 1 ShadowStart: 4 - Offset: -14, -14 + Offset: -6, -6 critical-idle: nthand Start: 2 ShadowStart: 5 - Offset: -14, -14 + Offset: -6, -6 production-light: nthand_a Start: 0 Length: 5 Tick: 100 - Offset: -14, -14 + Offset: -6, -6 damaged-production-light: nthand_a Start: 5 Length: 5 Tick: 100 - Offset: -14, -14 + Offset: -6, -6 idle-lights: nthand_b Start: 0 Length: 8 Tick: 200 - Offset: -14, -14 + Offset: -6, -6 damaged-idle-lights: nthand_b Start: 8 Length: 8 Tick: 200 - Offset: -14, -14 + Offset: -6, -6 make: nthandmk Start: 0 Length: 15 ShadowStart: 15 - Offset: -14, -14 + Offset: -6, -6 icon: handicon Start: 0 @@ -342,63 +329,63 @@ naweap: idle: ntweap Start: 0 ShadowStart: 3 - Offset: -12, -28 + Offset: 0, -12 damaged-idle: ntweap Start: 1 ShadowStart: 4 - Offset: -12, -28 + Offset: 0, -12 dead: ntweap Start: 2 ShadowStart: 5 - Offset: -12, -28 + Offset: 0, -12 production-lights: ntweap_a Start: 0 Length: 16 Tick: 100 ZOffset: 2048 - Offset: -12, -28 + Offset: 0, -12 damaged-production-lights: ntweap_a Start: 16 Length: 16 Tick: 100 ZOffset: 2048 - Offset: -12, -28 + Offset: 0, -12 build-top: ntweap_b Start: 0 Length: 10 ShadowStart: 10 - Offset: -12, -28 + Offset: 0, -12 damaged-build-top: ntweap_b Start: 10 Length: 10 ShadowStart: 20 - Offset: -12, -28 + Offset: 0, -12 idle-top: ntweap_2 Start: 0 - Offset: -12, -28 + Offset: 0, -12 damaged-idle-top: ntweap_2 Start: 1 - Offset: -12, -28 + Offset: 0, -12 make: ntweapmk Start: 0 Length: 22 Tick: 80 ShadowStart: 22 - Offset: -12, -28 + Offset: 0, -12 icon: nwepicon Start: 0 bib: ntweapbb Start: 0 Length: 1 - Offset: -12, -28 + Offset: 0, -12 damaged-bib: ntweapbb Start: 1 Length: 1 - Offset: -12, -28 + Offset: 0, -12 critical-bib: ntweapbb Start: 2 Length: 1 - Offset: -12, -28 + Offset: 0, -12 # TODO: ntweap_1 & ntweap_b & ntweap_c are unused naradr: @@ -459,30 +446,24 @@ garadr: idle: gtradr Start: 0 ShadowStart: 3 - Offset: 0, -14 damaged-idle: gtradr Start: 1 ShadowStart: 4 - Offset: 0, -14 # critical-idle: gtradr #shows a destroyed radar dish # Start: 2 # ShadowStart: 5 -# Offset: 0, -14 idle-dish: gtradr_a Frames: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 Length: 28 Tick: 200 - Offset: 0, -14 damaged-idle-dish: gtradr_a Frames: 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16 Length: 28 Tick: 240 - Offset: 0, -14 make: gtradrmk Start: 0 Length: 20 ShadowStart: 20 - Offset: 0, -14 icon: radricon Start: 0 @@ -490,28 +471,35 @@ gatech: idle: gttech Start: 0 ShadowStart: 3 + Offset: -12, -6 damaged-idle: gttech Start: 1 ShadowStart: 4 + Offset: -12, -6 critical-idle: gttech Start: 2 ShadowStart: 5 + Offset: -12, -6 idle-lights: gttech_a Start: 0 Length: 8 Tick: 200 + Offset: -12, -6 damaged-idle-lights: gttech_a Start: 8 Length: 8 Tick: 240 + Offset: -12, -6 critical-idle-lights: gttech_a Start: 8 Length: 8 Tick: 240 + Offset: -12, -6 make: gttechmk Start: 0 Length: 20 ShadowStart: 20 + Offset: -12, -6 icon: techicon Start: 0 @@ -520,10 +508,12 @@ gasand: Start: 0 Length: 16 ShadowStart: 32 + Offset: 0, 12 damaged-idle: gtsand Start: 16 Length: 16 ShadowStart: 48 + Offset: 0, 12 icon: sbagicon Start: 0 @@ -532,14 +522,17 @@ gawall: Start: 0 Length: 16 ShadowStart: 48 + Offset: 0, 12 damaged-idle: gtwall Start: 16 Length: 16 ShadowStart: 64 + Offset: 0, 12 critical-idle: gtwall Start: 32 Length: 16 ShadowStart: 80 + Offset: 0, 12 icon: wallicon Start: 0 @@ -548,14 +541,17 @@ nawall: Start: 0 Length: 16 ShadowStart: 48 + Offset: 0, 12 damaged-idle: ntwall Start: 16 Length: 16 ShadowStart: 64 + Offset: 0, 12 critical-idle: ntwall Start: 32 Length: 16 ShadowStart: 80 + Offset: 0, 12 icon: nwalicon Start: 0 @@ -660,16 +656,20 @@ nalasr: idle: ntlasr Start: 0 ShadowStart: 3 + Offset: 0, 12 damaged-idle: ntlasr Start: 1 ShadowStart: 4 + Offset: 0, 12 critical-idle: ntlasr Start: 2 ShadowStart: 5 + Offset: 0, 12 make: ntlasrmk Start: 0 Length: 21 ShadowStart: 21 + Offset: 0, 12 icon: plticon Start: 0 @@ -677,12 +677,15 @@ nasam: idle: ntsam Start: 0 ShadowStart: 3 + Offset: 0, 12 damaged-idle: ntsam Start: 1 ShadowStart: 4 + Offset: 0, 12 critical-idle: ntsam Start: 2 ShadowStart: 5 + Offset: 0, 12 turret: gtctwr_d Start: 0 Facings: 32 @@ -691,6 +694,7 @@ nasam: Start: 0 Length: 8 ShadowStart: 8 + Offset: 0, 12 icon: samicon Start: 0 @@ -698,55 +702,71 @@ gavulc: idle: gtctwr Start: 0 ShadowStart: 3 + Offset: 0, 12 damaged-idle: gtctwr Start: 1 ShadowStart: 4 + Offset: 0, 12 critical-idle: gtctwr Start: 2 ShadowStart: 5 + Offset: 0, 12 turret: gtctwr_b Start: 0 Facings: 32 + Offset: 0, 12 muzzle0: mgun-n Start: 0 Length: * + Offset: 0, 12 muzzle1: mgun-nw Start: 0 Length: * + Offset: 0, 12 muzzle2: mgun-w Start: 0 Length: * + Offset: 0, 12 muzzle3: mgun-sw Start: 0 Length: * + Offset: 0, 12 muzzle4: mgun-s Start: 0 Length: * + Offset: 0, 12 muzzle5: mgun-se Start: 0 Length: * + Offset: 0, 12 muzzle6: mgun-e Start: 0 Length: * + Offset: 0, 12 muzzle7: mgun-ne Start: 0 Length: * + Offset: 0, 12 idle-lights: gtctwr_a Start: 0 Length: 6 Tick: 200 + Offset: 0, 12 damaged-idle-lights: gtctwr_a Start: 0 Length: 6 Tick: 200 + Offset: 0, 12 critical-idle-lights: gtctwr_a Start: 6 Length: 6 Tick: 200 + Offset: 0, 12 make: gtctwrmk Start: 0 Length: 11 ShadowStart: 11 + Offset: 0, 12 icon: twr1icon Start: 0 @@ -754,31 +774,39 @@ garock: idle: gtctwr Start: 0 ShadowStart: 3 + Offset: 0, 12 damaged-idle: gtctwr Start: 1 ShadowStart: 4 + Offset: 0, 12 critical-idle: gtctwr Start: 2 ShadowStart: 5 + Offset: 0, 12 turret: gtctwr_c Start: 0 Facings: 32 + Offset: 0, 12 idle-lights: gtctwr_a Start: 0 Length: 6 Tick: 200 + Offset: 0, 12 damaged-idle-lights: gtctwr_a Start: 0 Length: 6 Tick: 200 + Offset: 0, 12 critical-idle-lights: gtctwr_a Start: 6 Length: 6 Tick: 200 + Offset: 0, 12 make: gtctwrmk Start: 0 Length: 11 ShadowStart: 11 + Offset: 0, 12 icon: twr2icon Start: 0 @@ -786,31 +814,39 @@ gacsam: idle: gtctwr Start: 0 ShadowStart: 3 + Offset: 0, 12 damaged-idle: gtctwr Start: 1 ShadowStart: 4 + Offset: 0, 12 critical-idle: gtctwr Start: 2 ShadowStart: 5 + Offset: 0, 12 turret: gtctwr_d Start: 0 Facings: 32 + Offset: 0, 12 idle-lights: gtctwr_a Start: 0 Length: 6 Tick: 200 + Offset: 0, 12 damaged-idle-lights: gtctwr_a Start: 0 Length: 6 Tick: 200 + Offset: 0, 12 critical-idle-lights: gtctwr_a Start: 6 Length: 6 Tick: 200 + Offset: 0, 12 make: gtctwrmk Start: 0 Length: 11 ShadowStart: 11 + Offset: 0, 12 icon: twr3icon Start: 0 @@ -818,28 +854,35 @@ gaspot: idle: Start: 0 ShadowStart: 3 + Offset: 0, 12 damaged-idle: Start: 1 ShadowStart: 4 + Offset: 0, 12 critical-idle: Start: 2 ShadowStart: 5 + Offset: 0, 12 idle-lights: gaspot_a Start: 0 Length: 8 Tick: 200 + Offset: 0, 12 damaged-idle-lights: gaspot_a Start: 8 Length: 8 Tick: 200 + Offset: 0, 12 critical-idle-lights: gaspot_a Start: 16 Length: 8 Tick: 200 + Offset: 0, 12 make: gaspotmk Start: 0 Length: 14 ShadowStart: 14 + Offset: 0, 12 icon: spoticon Start: 0 @@ -847,47 +890,40 @@ gahpad: idle: gthpad Start: 0 ShadowStart: 3 - Offset: 0, -14 damaged-idle: gthpad Start: 1 ShadowStart: 4 - Offset: 0, -14 critical-idle: gthpad Start: 2 ShadowStart: 5 - Offset: 0, -14 idle-platform: gthpadbb Start: 0 ShadowStart: 3 - Offset: 0, -14 damaged-idle-platform: gthpadbb Start: 1 ShadowStart: 4 - Offset: 0, -14 critical-idle-platform: gthpadbb Start: 2 ShadowStart: 5 - Offset: 0, -14 idle-lights: gthpad_a Start: 0 Length: 8 - Offset: 2,-26 Tick: 200 + Offset:0, -12 damaged-idle-lights: gthpad_a Start: 8 Length: 8 - Offset: 16,-30 Tick: 200 + Offset:0, -12 critical-idle-lights: gthpad_a Start: 16 Length: 8 - Offset: 24,-38 Tick: 200 + Offset:0, -12 make: gthpadmk Start: 0 Length: 18 ShadowStart: 18 - Offset: 0, -14 icon: heliicon Start: 0 @@ -1022,9 +1058,11 @@ galite: idle: gtlite Start: 0 ShadowStart: 2 + Offset: 0, 12 damaged-idle: gtlite Start: 1 ShadowStart: 3 + Offset: 0, 12 # lighting: alphatst # Start: 0 # ZOffset: -1c511 @@ -1036,55 +1074,69 @@ gadept: idle: gtdept Start: 0 ShadowStart: 3 + Offset: 0, -12 damaged-idle: gtdept Start: 1 ShadowStart: 4 + Offset: 0, -12 critical-idle: gtdept Start: 2 ShadowStart: 5 + Offset: 0, -12 ground: gtdeptbb Start: 0 ShadowStart: 3 ZOffset: -1c611 + Offset: 0, -12 damaged-ground: gtdeptbb Start: 1 ShadowStart: 4 ZOffset: -1c611 + Offset: 0, -12 critical-ground: gtdeptbb Start: 2 ShadowStart: 5 ZOffset: -1c611 + Offset: 0, -12 idle-light: gtdept_b Start: 0 Length: 7 Tick: 120 + Offset: 0, -12 damaged-idle-light: gtdept_b Start: 7 Length: 7 Tick: 120 + Offset: 0, -12 circuits: gtdept_a Start: 0 Length: 5 ZOffset: -1c511 + Offset: 0, -12 damaged-circuits: gtdept_a Start: 5 Length: 5 ZOffset: -1c511 + Offset: 0, -12 crane: gtdept_c Start: 0 Length: 16 + Offset: 0, -12 platform: gtdept_d Start: 0 Length: 7 ZOffset: -1c511 + Offset: 0, -12 damaged-platform: gtdept_d Start: 7 Length: 7 ZOffset: -1c511 + Offset: 0, -12 make: gtdeptmk Start: 0 Length: 10 Tick: 60 ShadowStart: 10 + Offset: 0, -12 icon: fixicon Start: 0