diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index 24244dac90..0fccc6af14 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -28,6 +28,11 @@ E1: AttackSequence: shoot ProducibleWithLevel: Prerequisites: barracks.upgraded + RenderSprites: + Image: e1.gdi + RaceImages: + gdi: e1.gdi + nod: e1.nod ENGINEER: Inherits: ^Soldier @@ -54,4 +59,9 @@ ENGINEER: CaptureTypes: building -AutoTarget: -GainsExperience: + RenderSprites: + Image: engineer.gdi + RaceImages: + gdi: engineer.gdi + nod: engineer.nod diff --git a/mods/ts/rules/shared-structures.yaml b/mods/ts/rules/shared-structures.yaml index 75a54d8b45..2ceecb6bed 100644 --- a/mods/ts/rules/shared-structures.yaml +++ b/mods/ts/rules/shared-structures.yaml @@ -97,6 +97,11 @@ PROC: ProvidesPrerequisite@buildingname: SelectionDecorations: VisualBounds: 134, 122, 0, -18 + RenderBuilding: + Image: proc.gdi + RaceImages: + gdi: proc.gdi + nod: proc.nod GASILO: Inherits: ^Building @@ -123,6 +128,10 @@ GASILO: Range: 4c0 -RenderBuilding: RenderBuildingSilo: + Image: gasilo.gdi + RaceImages: + gdi: gasilo.gdi + nod: gasilo.nod WithIdleOverlay@UNDERLAY: Sequence: idle-underlay WithIdleOverlay@LIGHTS: diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml index fe87e03dc5..3ae05356e7 100644 --- a/mods/ts/rules/shared-support.yaml +++ b/mods/ts/rules/shared-support.yaml @@ -79,4 +79,9 @@ NAPULS: Amount: -150 SelectionDecorations: VisualBounds: 78, 54, 0, -12 + RenderBuilding: + Image: napuls.gdi + RaceImages: + gdi: napuls.gdi + nod: napuls.nod diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index 5582a185df..3fc6029fd4 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -32,6 +32,11 @@ MCV: Voice: Move SelectionDecorations: VisualBounds: 42,42 + RenderSprites: + Image: mcv.gdi + RaceImages: + gdi: mcv.gdi + nod: mcv.nod HARV: Inherits: ^VoxelTank @@ -87,6 +92,11 @@ HARV: Palette: effect SelectionDecorations: VisualBounds: 36,36 + RenderSprites: + Image: harv.gdi + RaceImages: + gdi: harv.gdi + nod: harv.nod LPST: Inherits: ^VoxelVehicle @@ -114,6 +124,11 @@ LPST: TransformSounds: NoTransformSounds: Voice: Move + RenderSprites: + Image: lpst.gdi + RaceImages: + gdi: lpst.gdi + nod: lpst.nod GGHUNT: Inherits: ^Vehicle diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml index 3657c57bf2..3bd73c540b 100644 --- a/mods/ts/sequences/infantry.yaml +++ b/mods/ts/sequences/infantry.yaml @@ -1,5 +1,5 @@ -e1: - Defaults: +e1.gdi: + Defaults: e1 Tick: 80 stand: Facings: 8 @@ -66,7 +66,77 @@ e1: ShadowStart: 190 die6: electro Length: * - icon: e1icon + icon: sidec01.mix:e1icon + +e1.nod: + Defaults: e1 + Tick: 80 + stand: + Facings: 8 + ShadowStart: 292 + run: + Start: 8 + Length: 6 + Facings: 8 + ShadowStart: 300 + idle1: + Start: 56 + Length: 15 + ShadowStart: 348 + idle2: + Start: 71 + Length: 15 + ShadowStart: 363 + prone-run: + Start: 86 + Length: 6 + Facings: 8 + ShadowStart: 378 + prone-stand: + Start: 86 + Facings: 8 + Stride: 6 + ShadowStart: 378 + die1: + Start: 134 + Length: 15 + ShadowStart: 426 + die2: + Start: 149 + Length: 15 + ShadowStart: 441 + die3: infdie + Length: * + die4: s_bang34 + Length: * + die-crushed: + Start: 159 + Length: 5 + ShadowStart: 451 + Tick: 800 + ZOffset: -511 + shoot: + Start: 164 + Length: 6 + Facings: 8 + ShadowStart: 456 + prone-shoot: + Start: 212 + Length: 6 + Facings: 8 + ShadowStart: 504 + standup-0: + Start: 260 + Length: 2 + Facings: 8 + ShadowStart: 552 + die5: flameguy # TODO: walking animation unused + Start: 42 + Length: 104 + ShadowStart: 190 + die6: electro + Length: * + icon: sidec02.mix:e1icon e2: Defaults: @@ -347,8 +417,8 @@ medic: Length: * icon: mediicon -engineer: - Defaults: +engineer.gdi: + Defaults: engineer Tick: 80 stand: Facings: 8 @@ -407,7 +477,69 @@ engineer: ShadowStart: 190 die6: electro Length: * - icon: engnicon + icon: sidec01.mix:engnicon + +engineer.nod: + Defaults: engineer + Tick: 80 + stand: + Facings: 8 + ShadowStart: 292 + run: + Start: 8 + Length: 6 + Facings: 8 + ShadowStart: 300 + idle1: + Start: 56 + Length: 15 + ShadowStart: 348 + idle2: + Start: 71 + Length: 15 + ShadowStart: 363 + prone-run: + Start: 86 + Length: 6 + Facings: 8 + ShadowStart: 378 + prone-stand: + Start: 86 + Facings: 8 + Stride: 6 + ShadowStart: 378 + die1: + Start: 134 + Length: 15 + ShadowStart: 426 + die2: + Start: 149 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 + ShadowStart: 441 + die4: s_bang34 + Length: * + die-crushed: + Start: 159 + Length: 5 + ShadowStart: 451 + Tick: 800 + ZOffset: -511 + standup-0: + Start: 260 + Length: 2 + Facings: 8 + ShadowStart: 552 + die5: flameguy # TODO: walking animation unused + Start: 42 + Length: 104 + ShadowStart: 190 + die6: electro + Length: * + icon: sidec02.mix:engnicon umagon: Defaults: diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index d996a705ae..1f626de3e4 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -665,8 +665,8 @@ nasam: Offset: 0, 0 UseTilesetCode: false -napuls: - Defaults: +napuls.gdi: + Defaults: ntpuls Offset: 0, -24 UseTilesetCode: true idle: @@ -678,12 +678,34 @@ napuls: Start: 2 ShadowStart: 5 Tick: 400 - turret: ntpuls_a + turret:_a Facings: 32 - make: ntpulsmk + make:mk Length: 20 ShadowStart: 20 - icon: empicon + icon: sidec01.mix:empicon + Offset: 0, 0 + UseTilesetCode: false + +napuls.nod: + Defaults: ntpuls + Offset: 0, -24 + UseTilesetCode: true + idle: + ShadowStart: 3 + damaged-idle: + Start: 1 + ShadowStart: 4 + dead: + Start: 2 + ShadowStart: 5 + Tick: 400 + turret:_a + Facings: 32 + make:mk + Length: 20 + ShadowStart: 20 + icon: sidec02.mix:empicon Offset: 0, 0 UseTilesetCode: false @@ -871,16 +893,17 @@ nahpad: Offset: 0, 0 UseTilesetCode: false -proc: # TODO: unused narefn_a - Defaults: +# TODO: unused narefn_a +proc.gdi: + Defaults: ntrefn Offset: -12, -42 UseTilesetCode: true - idle: ntrefn + idle: ShadowStart: 3 - damaged-idle: ntrefn + damaged-idle: Start: 1 ShadowStart: 4 - dead: ntrefn + dead: Start: 2 ShadowStart: 5 Tick: 400 @@ -900,12 +923,46 @@ proc: # TODO: unused narefn_a damaged-bib: ntrefnbb Start: 1 ZOffset: -1024 - icon: reficon + icon: sidec01.mix:reficon Offset: 0, 0 UseTilesetCode: false -gasilo: - Defaults: +# TODO: unused narefn_a +proc.nod: + Defaults: ntrefn + Offset: -12, -42 + UseTilesetCode: true + idle: + ShadowStart: 3 + damaged-idle: + Start: 1 + ShadowStart: 4 + dead: + Start: 2 + ShadowStart: 5 + Tick: 400 + make: ntrefnmk + Length: 20 + ShadowStart: 20 + flame: ntrefn_b + Length: * + idle-redlights: ntrefn_c + Length: 16 + Tick: 120 + damaged-idle-redlights: ntrefn_c + Length: 16 + Tick: 120 + bib: ntrefnbb + ZOffset: -1024 + damaged-bib: ntrefnbb + Start: 1 + ZOffset: -1024 + icon: sidec02.mix:reficon + Offset: 0, 0 + UseTilesetCode: false + +gasilo.gdi: + Defaults: gtsilo Offset: 0, -24 UseTilesetCode: true idle: gtsilo_a @@ -935,7 +992,42 @@ gasilo: make: gtsilomk Length: 18 ShadowStart: 20 - icon: siloicon + icon: sidec01.mix:siloicon + Offset: 0, 0 + UseTilesetCode: false + +gasilo.nod: + Defaults: gtsilo + Offset: 0, -24 + UseTilesetCode: true + idle: gtsilo_a + Length: 4 + damaged-idle: gtsilo_a + Start: 4 + Length: 4 + idle-underlay: + ShadowStart: 3 + ZOffset: -512 + damaged-idle-underlay: + Start: 1 + ShadowStart: 4 + ZOffset: -512 + dead: + Start: 2 + ShadowStart: 5 + ZOffset: -512 + Tick: 400 + idle-lights: gtsilo_b + Length: 16 + Tick: 120 + damaged-idle-lights: gtsilo_b + Start: 16 + Length: 16 + Tick: 120 + make: gtsilomk + Length: 18 + ShadowStart: 20 + icon: sidec02.mix:siloicon Offset: 0, 0 UseTilesetCode: false diff --git a/mods/ts/sequences/vehicles.yaml b/mods/ts/sequences/vehicles.yaml index 529d6d8df9..f54745f0e2 100644 --- a/mods/ts/sequences/vehicles.yaml +++ b/mods/ts/sequences/vehicles.yaml @@ -1,13 +1,21 @@ -mcv: - icon: mcvicon +mcv.gdi: + icon: sidec01.mix:mcvicon + +mcv.nod: + icon: sidec02.mix:mcvicon apc: icon: apcicon -harv: - icon: harvicon +harv.gdi: harvest: harvestr Length: * + icon: sidec01.mix:harvicon + +harv.nod: + harvest: harvestr + Length: * + icon: sidec02.mix:harvicon hvr: icon: hovricon @@ -16,8 +24,11 @@ hvr: muzzle: gunfire Length: * -lpst: - icon: lpsticon +lpst.gdi: + icon: sidec01.mix:lpsticon + +lpst.nod: + icon: sidec02.mix:lpsticon repair: icon: rboticon