diff --git a/mods/ts/cursors.yaml b/mods/ts/cursors.yaml index 64de700e9a..6ae5c78658 100644 --- a/mods/ts/cursors.yaml +++ b/mods/ts/cursors.yaml @@ -84,52 +84,52 @@ Cursors: harvest-minimap: #TODO start:134 length: 8 - enter: #TODO - start:113 - length: 3 - enter-minimap: #TODO - start:139 - length: 3 - enter-blocked: #TODO - start:212 + enter: + start: 89 + length: 10 + enter-minimap: + start: 100 + length: 10 + enter-blocked: + start: 99 length: 1 enter-blocked-minimap: #TODO start:33 - c4: #TODO - start:116 - length: 3 + c4: + start: 309 + length: 10 c4-minimap: #TODO start:121 length: 3 - guard: #TODO - start:147 - length: 1 - guard-minimap: #TODO - start:146 - length: 1 - capture: #TODO - start:164 - length: 3 - capture-minimap: #TODO - start:167 - length: 3 - heal: #TODO - start:160 - length: 4 + guard: + start: 68 + length: 5 + guard-minimap: + start: 73 + length: 5 + capture: + start: 89 + length: 10 + capture-minimap: + start: 100 + length: 10 + heal: + start: 346 + length: 10 heal-minimap: #TODO start:194 length: 1 - ability: #TODO - start:82 - length: 8 + ability: + start: 78 + length: 10 ability-minimap: #TODO start:214 length: 8 deploy: - start:110 + start: 110 length: 9 deploy-blocked: - start:119 + start: 119 length: 1 undeploy: #TODO: unused start:120 @@ -158,9 +158,9 @@ Cursors: repair-blocked: start:190 length: 1 - sell2: #TODO ? - start:148 - length: 12 + sell2: + start:139 + length: 10 powerdown-blocked: start:345 length: 1 diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 664c87dab4..16558fb91d 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -204,12 +204,12 @@ SCRIN: Buildable: Queue: Air BuildPaletteOrder: 20 - Prerequisites: #nahpad, natech + Prerequisites: nahpad #, natech Owner: nod Selectable: Bounds: 30,24 Helicopter: - RearmBuildings: #nahpad # TODO: use DROPUP1.AUD and DROPDWN1.AUD + RearmBuildings: nahpad # TODO: use DROPUP1.AUD and DROPDWN1.AUD ROT: 3 Speed: 18 Health: @@ -239,12 +239,12 @@ APACHE: Buildable: Queue: Air BuildPaletteOrder: 20 - Prerequisites: #nahpad + Prerequisites: nahpad Owner: nod Selectable: Bounds: 30,24 Helicopter: - RearmBuildings: #nahpad + RearmBuildings: nahpad ROT: 5 Speed: 14 Health: diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index 69c03e16a1..57fe851208 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -128,10 +128,109 @@ GAWEAP: Range: 4 -RenderBuilding: RenderBuildingWarFactory: -# RallyPoint: # TODO: setup sequences + RallyPoint: # TODO: setup sequences/palettes + RallyPoint: 6,5 +# IndicatorPalettePrefix: effect Exit@1: - SpawnOffset: -8,-8 + SpawnOffset: -4,24 + ExitCell: 3,3 + Production: + Produces: Vehicle + ProductionBar: + +NAPOWR: + Inherits: ^Building + Buildable: + Queue: Building + BuildPaletteOrder: 0 + Owner: nod + Hotkey: p + Valued: + Cost: 300 + Tooltip: + Name: Nod Power Plant + Description: Provides power for other structures + ProvidesCustomPrerequisite: + Prerequisite: anypower + Building: + Power: 100 + Footprint: xx xx + Dimensions: 2,2 + Health: + HP: 750 + Armor: + Type: Wood + RevealsShroud: + Range: 4 + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + +NAHAND: + Inherits: ^Building + Buildable: + Queue: Building + BuildPaletteOrder: 30 + Prerequisites: anypower + Owner: nod + Hotkey: b + Valued: + Cost: 300 + Tooltip: + Name: Hand of Nod + Description: Produces infantry + Building: + Power: -20 + Footprint: xxx xxx + Dimensions: 3,2 + Health: + HP: 800 + Armor: + Type: Wood + RevealsShroud: + Range: 5 +# RallyPoint: #TODO: setup sequences + Exit@1: + SpawnOffset: -64,64,0 ExitCell: 0,2 + Production: + Produces: Infantry + PrimaryBuilding: + IronCurtainable: + ProductionBar: + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + WithIdleOverlay@LIGHT: + Sequence: idle-light + +NAWEAP: + Inherits: ^Building + Valued: + Cost: 2000 + Tooltip: + Name: Nod War Factory + Description: Assembly point for\nvehicle reinforcements +# ProvidesCustomPrerequisite: +# Prerequisite: VehicleProduction + Buildable: + Queue: Building + BuildPaletteOrder: 50 + Owner: nod + Building: + Power: -30 + Footprint: ___ xxx === + Dimensions: 3,3 + Health: + HP: 1000 + RevealsShroud: + Range: 4 + -RenderBuilding: + RenderBuildingWarFactory: + RallyPoint: # TODO: setup sequences/palettes + RallyPoint: 6,5 +# IndicatorPalettePrefix: effect + Exit@1: + SpawnOffset: -4,24 + ExitCell: 3,3 Production: Produces: Vehicle ProductionBar: @@ -348,6 +447,40 @@ GAHPAD: WithIdleOverlay@LIGHTS: Sequence: idle-lights +NAHPAD: + Inherits: ^Building + Valued: + Cost: 500 + Tooltip: + Name: Nod Helipad + Description: Produces, rearms and\nrepairs helicopters + Buildable: + BuildPaletteOrder: 60 +# Prerequisites: naradr + Owner: nod + Queue: Building + Building: + Power: -10 + Footprint: xx xx + Dimensions: 2,2 + Health: + HP: 600 + RevealsShroud: + Range: 5 + Exit@1: + SpawnOffset: 0,-6 + Production: + Produces: Air + BelowUnits: + Reservable: + RepairsUnits: +# RallyPoint: + ProductionBar: + WithIdleOverlay@PLATFORM: + Sequence: idle-platform + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + # custom prerequisites: ANYPOWER: Tooltip: diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 9ada21fa73..6e3ad05f23 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -32,6 +32,18 @@ allyrepair: Length: * Tick: 160 +# TODO: fix/replace them, just placeholders +rallypoint: + flag: smokland + Start: 40 + Length: 50 + Offset: 5,-3 + BlendMode: Additive + circles: ring + Start: 0 + Length: 12 + BlendMode: Additive + rank: # TODO: backfall to RA asset rank: Start: 0 diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index 51d7adff5a..ea73ec208e 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -160,6 +160,99 @@ gaweap: Start: 0 # TODO: gtweap_1 & gtweapbb & gtweap_a & gtweap_b & gtweap_c are unused +napowr: + idle: ntpowr + Start: 0 + ShadowStart: 3 + damaged-idle: ntpowr + Start: 1 + ShadowStart: 4 + critical-idle: ntpowr + Start: 2 + ShadowStart: 5 + idle-lights: ntpowr_a + Start: 0 + Length: 9 + Tick: 200 + damaged-idle-lights: ntpowr_a + Start: 9 + Length: 9 + Tick: 200 + critical-idle-lights: ntpowr_a + Start: 9 + Length: 9 + Tick: 200 + make: ntpowrmk + Start: 0 + Length: 19 + ShadowStart: 19 + icon: npwricon + Start: 0 + +nahand: + idle: nthand + Start: 0 + ShadowStart: 3 + damaged-idle: nthand + Start: 1 + ShadowStart: 4 + critical-idle: nthand + Start: 2 + ShadowStart: 5 + idle-light: nthand_a + Start: 0 + Length: 5 + Tick: 100 + damaged-idle-light: nthand_a + Start: 5 + Length: 5 + Tick: 100 + idle-lights: nthand_b + Start: 0 + Length: 8 + Tick: 200 + damaged-idle-lights: nthand_b + Start: 8 + Length: 8 + Tick: 200 + make: nthandmk + Start: 0 + Length: 15 + ShadowStart: 15 + icon: handicon + Start: 0 + +naweap: + idle: ntweap + Start: 0 + ShadowStart: 3 + damaged-idle: ntweap + Start: 1 + ShadowStart: 4 + dead: ntweap + Start: 2 + ShadowStart: 5 + build-top: ntweap_b + Start: 0 + Length: 10 + ShadowStart: 10 + damaged-build-top: ntweap_b + Start: 10 + Length: 10 + ShadowStart: 20 + idle-top: ntweap_2 + Start: 0 + damaged-idle-top: ntweap_2 + Start: 1 + make: ntweapmk + Start: 0 + Length: 22 + Tick: 80 + ShadowStart: 22 + icon: nwepicon + Start: 0 +# TODO: ntweap_1 & ntweapbb & ntweap_a & ntweap_b & ntweap_c are unused + gasand: # TODO frame order (horizontal seems busted) idle: gtsand Start: 0 @@ -258,13 +351,13 @@ gaspot: Start: 0 gahpad: - idle: + idle: gthpad Start: 0 ShadowStart: 3 - damaged-idle: + damaged-idle: gthpad Start: 1 ShadowStart: 4 - critical-idle: + critical-idle: gthpad Start: 2 ShadowStart: 5 idle-platform: gthpadbb @@ -276,7 +369,7 @@ gahpad: critical-idle-platform: gthpadbb Start: 2 ShadowStart: 5 - idle-lights: gahpad_a + idle-lights: gthpad_a Start: 0 Length: 8 Offset: 2,-12 @@ -291,9 +384,50 @@ gahpad: Length: 8 Offset: 24,-24 Tick: 200 - make: gahpadmk + make: gthpadmk Start: 0 Length: 18 ShadowStart: 18 icon: heliicon + Start: 0 + +nahpad: + idle: nthpad + Start: 0 + ShadowStart: 3 + damaged-idle: nthpad + Start: 1 + ShadowStart: 4 + critical-idle: nthpad + Start: 2 + ShadowStart: 5 + idle-platform: nthpadbb + Start: 0 + ShadowStart: 3 + damaged-idle-platform: nthpadbb + Start: 1 + ShadowStart: 4 + critical-idle-platform: nthpadbb + Start: 2 + ShadowStart: 5 + idle-lights: nthpad_a + Start: 0 + Length: 46 +# Offset: 2,-12 + Tick: 120 + damaged-idle-lights: nthpad_a + Start: 46 + Length: 46 +# Offset: 16,-16 + Tick: 120 + critical-idle-lights: nthpad_a + Start: 46 + Length: 46 +# Offset: 24,-24 + Tick: 200 + make: nthpadmk + Start: 0 + Length: 20 + ShadowStart: 20 + icon: nhpdicon Start: 0 \ No newline at end of file