diff --git a/mods/ts/rules/civilian.yaml b/mods/ts/rules/civilian.yaml index 6e31d9bf08..ff9abfe8b7 100644 --- a/mods/ts/rules/civilian.yaml +++ b/mods/ts/rules/civilian.yaml @@ -99,7 +99,7 @@ ABAN07: ABAN08: Inherits: ^CivBuilding Tooltip: - Name: Abandoned Wharehouse + Name: Abandoned Warehouse Building: Footprint: xx xx Dimensions: 2, 2 diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 68c31ab780..2ff1258e24 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -20,6 +20,9 @@ DestroyedSounds: crmble2.aud RenderBuilding: WithBuildingExplosion: + WithDeathAnimation: + DeathSequence: dead + UseDeathTypeSuffix: false RepairableBuilding: EngineerRepairable: EmitInfantryOnSell@gdi: @@ -70,6 +73,7 @@ -UpdatesPlayerStatistics: -CombatDebugOverlay: -WithMakeAnimation: + -WithDeathAnimation: Health: HP: 900 Armor: diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index e2ed659f58..84bfda6505 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -656,6 +656,7 @@ GALITE: RenderBuilding: Palette: terrain -WithMakeAnimation: + -WithDeathAnimation: Health: HP: 600 Armor: @@ -836,6 +837,9 @@ GAHPAD: Sequence: idle-platform WithIdleOverlay@LIGHTS: Sequence: idle-lights + WithDeathAnimation@BIB: + DeathSequence: dead-platform + UseDeathTypeSuffix: false Power: Amount: -10 Selectable: @@ -872,6 +876,9 @@ NAHPAD: Sequence: idle-platform WithIdleOverlay@LIGHTS: Sequence: idle-lights + WithDeathAnimation@BIB: + DeathSequence: dead-platform + UseDeathTypeSuffix: false Power: Amount: -10 Selectable: @@ -910,6 +917,9 @@ GADEPT: Sequence: crane WithRepairOverlay@PLATFORM: Sequence: platform + WithDeathAnimation@BIB: + DeathSequence: dead-ground + UseDeathTypeSuffix: false Power: Amount: -30 diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index 46a7ed67f4..ef9a15b5f0 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -7,10 +7,11 @@ gacnst: Start: 1 ShadowStart: 4 Offset: 0, -36 - critical-idle: gtcnst + dead: gtcnst Start: 2 ShadowStart: 5 Offset: 0, -36 + Tick: 400 make: gtcnstmk Start: 0 Length: 24 @@ -38,9 +39,6 @@ gacnst: Length: 15 Tick: 200 Offset: 0, -36 - critical-idle-top: gtcnst_c - Start: 30 - Offset: 0, -36 idle-side: gtcnst_a Start: 0 Length: 10 @@ -49,10 +47,6 @@ gacnst: Start: 10 Length: 10 Offset: 0, -36 - critical-idle-side: gtcnst_a - Start: 20 - Length: 10 - Offset: 0, -36 idle-front: gtcnst_b Start: 0 Length: 10 @@ -61,10 +55,6 @@ gacnst: Start: 0 Length: 10 Offset: 0, -36 - critical-idle-front: gtcnst_b - Start: 0 - Length: 10 - Offset: 0, -36 icon: facticon Start: 0 @@ -77,10 +67,11 @@ gapowr: Start: 1 ShadowStart: 4 Offset: 0, -24 - critical-idle: gtpowr + dead: gtpowr Start: 2 ShadowStart: 5 Offset: 0, -24 + Tick: 400 idle-lights: gtpowr_a Start: 0 Length: 12 @@ -91,11 +82,6 @@ gapowr: Length: 12 Tick: 200 Offset: 0, -24 - critical-idle-lights: gtpowr_a - Start: 24 - Length: 12 - Tick: 200 - Offset: 0, -24 idle-plug: gtpowr_b Start: 0 Length: 12 @@ -106,11 +92,6 @@ gapowr: Length: 12 Tick: 200 Offset: 0, -24 - critical-idle-plug: gtpowr_b - Start: 0 - Length: 12 - Tick: 200 - Offset: 0, -24 make: gtpowrmk Start: 0 Length: 20 @@ -128,10 +109,11 @@ gapile: Start: 1 ShadowStart: 4 Offset: 0, -24 - critical-idle: gtpile + dead: gtpile Start: 2 ShadowStart: 5 Offset: 0, -24 + Tick: 400 production-lights: gtpile_a Start: 0 Length: 7 @@ -181,6 +163,7 @@ gaweap: Start: 2 ShadowStart: 5 Offset: -12, -42 + Tick: 400 production-lights-white: gtweap_a Start: 0 Length: 8 @@ -249,7 +232,7 @@ gaweap: Start: 1 Length: 1 Offset: -12, -42 - critical-bib: gtweapbb + dead-bib: gtweapbb Start: 2 Length: 1 Offset: -12, -42 @@ -264,10 +247,11 @@ napowr: Start: 1 ShadowStart: 4 Offset: 0, -24 - critical-idle: ntpowr + dead: ntpowr Start: 2 ShadowStart: 5 Offset: 0, -24 + Tick: 400 idle-lights: ntpowr_a Start: 0 Length: 9 @@ -278,11 +262,6 @@ napowr: Length: 9 Tick: 200 Offset: 0, -24 - critical-idle-lights: ntpowr_a - Start: 9 - Length: 9 - Tick: 200 - Offset: 0, -24 make: ntpowrmk Start: 0 Length: 19 @@ -300,10 +279,11 @@ naapwr: Start: 1 ShadowStart: 4 Offset: 12, -30 - critical-idle: ntapwr + dead: ntapwr Start: 2 ShadowStart: 5 Offset: 12, -30 + Tick: 400 idle-lights: ntapwr_a Start: 0 Length: 9 @@ -314,11 +294,6 @@ naapwr: Length: 9 Tick: 200 Offset: 12, -30 - critical-idle-lights: ntapwr_a - Start: 9 - Length: 9 - Tick: 200 - Offset: 12, -30 make: ntapwrmk Start: 0 Length: 19 @@ -336,10 +311,11 @@ nahand: Start: 1 ShadowStart: 4 Offset: -6, -30 - critical-idle: nthand + dead: nthand Start: 2 ShadowStart: 5 Offset: -6, -30 + Tick: 400 production-light: nthand_a Start: 0 Length: 5 @@ -381,6 +357,7 @@ naweap: Start: 2 ShadowStart: 5 Offset: -12, -42 + Tick: 400 production-lights: ntweap_a Start: 0 Length: 16 @@ -425,7 +402,7 @@ naweap: Start: 1 Length: 1 Offset: -12, -42 - critical-bib: ntweapbb + dead-bib: ntweapbb Start: 2 Length: 1 Offset: -12, -42 @@ -440,10 +417,11 @@ naradr: Start: 1 ShadowStart: 4 Offset: 0, -24 - critical-idle: ntradr + dead: ntradr Start: 2 ShadowStart: 5 Offset: 0, -24 + Tick: 400 idle-dish: ntradr_a Start: 0 Length: 24 @@ -454,11 +432,6 @@ naradr: Length: 24 Tick: 120 Offset: 0, -24 - critical-idle-dish: ntradr_a - Start: 48 - Length: 24 - Tick: 120 - Offset: 0, -24 make: ntradrmk Start: 0 Length: 20 @@ -476,10 +449,11 @@ natech: Start: 1 ShadowStart: 4 Offset: 0, -24 - critical-idle: nttech + dead: nttech Start: 2 ShadowStart: 5 Offset: 0, -24 + Tick: 400 idle-lights: nttech_a Start: 0 Length: 9 @@ -490,11 +464,6 @@ natech: Length: 9 Tick: 120 Offset: 0, -24 - critical-idle-lights: nttech_a - Start: 0 - Length: 9 - Tick: 120 - Offset: 0, -24 make: nttechmk Start: 0 Length: 18 @@ -512,10 +481,11 @@ garadr: Start: 1 ShadowStart: 4 Offset: 0, -24 - critical-idle: gtradr + dead: gtradr Start: 2 ShadowStart: 5 Offset: 0, -24 + Tick: 400 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 @@ -526,11 +496,6 @@ garadr: Length: 28 Tick: 240 Offset: 0, -24 - critical-idle-dish: gtradr_a - Start: 30 - Length: 30 - Tick: 240 - Offset: 0, -24 make: gtradrmk Start: 0 Length: 20 @@ -548,10 +513,11 @@ gatech: Start: 1 ShadowStart: 4 Offset: -12, -30 - critical-idle: gttech + dead: gttech Start: 2 ShadowStart: 5 Offset: -12, -30 + Tick: 400 idle-lights: gttech_a Start: 0 Length: 8 @@ -562,11 +528,6 @@ gatech: Length: 8 Tick: 240 Offset: -12, -30 - critical-idle-lights: gttech_a - Start: 8 - Length: 8 - Tick: 240 - Offset: -12, -30 make: gttechmk Start: 0 Length: 20 @@ -710,10 +671,11 @@ naobel: Start: 1 ShadowStart: 4 Offset: 0, -24 - critical-idle: ntobel + dead: ntobel Start: 2 ShadowStart: 5 Offset: 0, -24 + Tick: 400 active: ntobel #placeholder until Charge supports overlays Start: 0 Length: 1 @@ -746,10 +708,11 @@ nalasr: Start: 1 ShadowStart: 4 Offset: 0, -12 - critical-idle: ntlasr + dead: ntlasr Start: 2 ShadowStart: 5 Offset: 0, -12 + Tick: 400 make: ntlasrmk Start: 0 Length: 21 @@ -767,10 +730,11 @@ nasam: Start: 1 ShadowStart: 4 Offset: 0, -12 - critical-idle: ntsam + dead: ntsam Start: 2 ShadowStart: 5 Offset: 0, -12 + Tick: 400 turret: gtctwr_d Start: 0 Facings: 32 @@ -792,10 +756,11 @@ napuls: Start: 1 ShadowStart: 4 Offset: 0, -24 - critical-idle: ntpuls + dead: ntpuls Start: 2 ShadowStart: 5 Offset: 0, -24 + Tick: 400 turret: ntpuls_a Start: 0 Facings: 32 @@ -815,9 +780,10 @@ nastlh: damaged-idle: ntstlh Start: 1 ShadowStart: 4 - critical-idle: ntstlh + dead: ntstlh Start: 2 ShadowStart: 5 + Tick: 400 pulse: ntstlh_a Start: 0 Length: 4 @@ -842,10 +808,11 @@ gavulc: Start: 1 ShadowStart: 4 Offset: 0, -12 - critical-idle: gtctwr + dead: gtctwr Start: 2 ShadowStart: 5 Offset: 0, -12 + Tick: 400 turret: gtctwr_b Start: 0 Facings: 32 @@ -892,11 +859,6 @@ gavulc: 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 @@ -914,10 +876,11 @@ garock: Start: 1 ShadowStart: 4 Offset: 0, -12 - critical-idle: gtctwr + dead: gtctwr Start: 2 ShadowStart: 5 Offset: 0, -12 + Tick: 400 turret: gtctwr_c Start: 0 Facings: 32 @@ -932,11 +895,6 @@ garock: 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 @@ -954,10 +912,11 @@ gacsam: Start: 1 ShadowStart: 4 Offset: 0, -12 - critical-idle: gtctwr + dead: gtctwr Start: 2 ShadowStart: 5 Offset: 0, -12 + Tick: 400 turret: gtctwr_d Start: 0 Facings: 32 @@ -972,11 +931,6 @@ gacsam: 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 @@ -994,10 +948,11 @@ gaspot: Start: 1 ShadowStart: 4 Offset: 0, -12 - critical-idle: + dead: Start: 2 ShadowStart: 5 Offset: 0, -12 + Tick: 400 idle-lights: gaspot_a Start: 0 Length: 8 @@ -1008,11 +963,6 @@ gaspot: 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 @@ -1032,11 +982,12 @@ gahpad: ShadowStart: 4 Offset: 0, -24 ZOffset: -1c511 - critical-idle: gthpad + dead: gthpad Start: 2 ShadowStart: 5 Offset: 0, -24 ZOffset: -1c511 + Tick: 400 idle-platform: gthpadbb Start: 0 ShadowStart: 3 @@ -1047,11 +998,12 @@ gahpad: ShadowStart: 4 Offset: 0, -24 ZOffset: -1c511 - critical-idle-platform: gthpadbb + dead-platform: gthpadbb Start: 2 ShadowStart: 5 Offset: 0, -24 ZOffset: -1c511 + Tick: 400 idle-lights: gthpad_a Start: 0 Length: 8 @@ -1064,12 +1016,6 @@ gahpad: Tick: 200 Offset: 0, -36 ZOffset: -1c511 - critical-idle-lights: gthpad_a - Start: 16 - Length: 8 - Tick: 200 - Offset: 0, -36 - ZOffset: -1c511 make: gthpadmk Start: 0 Length: 18 @@ -1090,11 +1036,12 @@ nahpad: ShadowStart: 4 Offset: 0, -24 ZOffset: -1c511 - critical-idle: nthpad + dead: nthpad Start: 2 ShadowStart: 5 Offset: 0, -24 ZOffset: -1c511 + Tick: 400 idle-platform: nthpadbb Start: 0 ShadowStart: 3 @@ -1105,11 +1052,12 @@ nahpad: ShadowStart: 4 Offset: 0, -24 ZOffset: -1c511 - critical-idle-platform: nthpadbb + dead-platform: nthpadbb Start: 2 ShadowStart: 5 Offset: 0, -24 ZOffset: -1c511 + Tick: 400 idle-lights: nthpad_a Start: 0 Length: 46 @@ -1122,12 +1070,6 @@ nahpad: Tick: 120 Offset: 0, -24 ZOffset: -1c511 - critical-idle-lights: nthpad_a - Start: 46 - Length: 46 - Tick: 200 - Offset: 0, -24 - ZOffset: -1c511 make: nthpadmk Start: 0 Length: 20 @@ -1145,10 +1087,11 @@ proc: # TODO: unused narefn_a, narefn_b Start: 1 ShadowStart: 4 Offset: -12, -42 - critical-idle: ntrefn + dead: ntrefn Start: 2 ShadowStart: 5 Offset: -12, -42 + Tick: 400 make: ntrefnmk Start: 0 Length: 20 @@ -1164,11 +1107,6 @@ proc: # TODO: unused narefn_a, narefn_b Length: 16 Tick: 120 Offset: -12, -42 - critical-idle-redlights: ntrefn_c - Start: 16 - Length: 16 - Tick: 200 - Offset: -12, -42 bib: ntrefnbb Start: 0 Length: 1 @@ -1177,10 +1115,6 @@ proc: # TODO: unused narefn_a, narefn_b Start: 1 Length: 1 Offset: -12, -42 - critical-bib: ntrefnbb - Start: 2 - Length: 1 - Offset: -12, -42 icon: reficon Start: 0 @@ -1203,11 +1137,12 @@ gasilo: ShadowStart: 4 ZOffset: -512 Offset: 0, -24 - critical-idle-underlay: gtsilo + dead: gtsilo Start: 2 ShadowStart: 5 ZOffset: -512 Offset: 0, -24 + Tick: 400 idle-lights: gtsilo_b Start: 0 Length: 16 @@ -1218,11 +1153,6 @@ gasilo: Length: 16 Tick: 120 Offset: 0, -24 - critical-idle-lights: gtsilo_b - Start: 32 - Length: 16 - Tick: 200 - Offset: 0, -24 icon: siloicon Start: 0 make: gtsilomk @@ -1256,10 +1186,11 @@ gadept: Start: 1 ShadowStart: 4 Offset: 0, -36 - critical-idle: gtdept + dead: gtdept Start: 2 ShadowStart: 5 Offset: 0, -36 + Tick: 400 ground: gtdeptbb Start: 0 ShadowStart: 3 @@ -1270,11 +1201,12 @@ gadept: ShadowStart: 4 ZOffset: -1c611 Offset: 0, -36 - critical-ground: gtdeptbb + dead-ground: gtdeptbb Start: 2 ShadowStart: 5 ZOffset: -1c611 Offset: 0, -36 + Tick: 400 idle-light: gtdept_b Start: 0 Length: 7 @@ -1325,9 +1257,10 @@ namisl: damaged-idle: ntmisl Start: 1 Offset: 0, -24 - critical-idle: ntmisl + dead: ntmisl Start: 2 Offset: 0, -24 + Tick: 400 idle-lights: ntmisl_b Start: 0 Length: 10 @@ -1365,10 +1298,11 @@ gaplug: Start: 1 ShadowStart: 4 Offset: 12, -30 - critical-idle: gaplug + dead: gaplug Start: 2 ShadowStart: 5 Offset: 12, -30 + Tick: 400 idle-dish: gaplug_a Start: 0 Length: 20