From 37f831ca9c52e30566409bed34b1f5dcfe531a6c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 22 May 2014 22:23:43 +0200 Subject: [PATCH] Adds defenses and advanced Nod power plant, fixes GDI radar dish animation Additionally tweaks offsets for deployed artillery and tick tank. --- mods/ts/rules/structures.yaml | 306 +++++++++++++++++++++++++++++- mods/ts/sequences/structures.yaml | 257 +++++++++++++++++++++++-- mods/ts/sequences/voxels.yaml | 8 +- 3 files changed, 550 insertions(+), 21 deletions(-) diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index b7df463bf1..2ad1f4e5dc 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -212,6 +212,34 @@ NAPOWR: WithIdleOverlay@LIGHTS: Sequence: idle-lights +NAAPWR: + Inherits: ^Building + Buildable: + Queue: Building + BuildPaletteOrder: 5 + Prerequisites: factory + Owner: nod + Hotkey: p + Valued: + Cost: 600 + Tooltip: + Name: Advanced Power Plant + Description: Provides more power for structures + ProvidesCustomPrerequisite: + Prerequisite: anypower + Building: + Power: 200 + Footprint: xxx xxx + Dimensions: 2,3 + Health: + HP: 900 + Armor: + Type: Wood + RevealsShroud: + Range: 4c0 + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + NAHAND: Inherits: ^Building Buildable: @@ -380,23 +408,29 @@ GATICK: Turreted: ROT: 6 InitialFacing: 128 + Offset: 170,0,213 Armament: Weapon: 90mm + LocalOffset: 384,0,128 + MuzzleSequence: muzzle AttackTurreted: + BodyOrientation: + QuantizedFacings: 32 AutoTarget: RenderRangeCircle: DrawLineToTarget: RenderBuilding: RenderVoxels: - Image: ttnk WithVoxelBarrel: + LocalOffset: 170,0,0 WithVoxelTurret: Transforms: IntoActor: ttnk Offset: 1,1 Facing: 96 - TransformSounds: + TransformSounds: place2.aud NoTransformSounds: + WithMuzzleFlash: GAICBM: Inherits: ^Building @@ -419,7 +453,7 @@ GAICBM: IntoActor: icbm Offset: 1,1 Facing: 96 - TransformSounds: + TransformSounds: place2.aud NoTransformSounds: GADPSA: @@ -443,7 +477,7 @@ GADPSA: IntoActor: lpst Offset: 1,1 Facing: 96 - TransformSounds: + TransformSounds: place2.aud NoTransformSounds: RenderDetectionCircle: DetectCloaked: @@ -471,23 +505,29 @@ GAARTY: Turreted: ROT: 5 InitialFacing: 128 + Offset: 0,0,171 Armament: Weapon: 155mm + LocalOffset: 811,0,0 + MuzzleSequence: muzzle AttackTurreted: + BodyOrientation: + QuantizedFacings: 32 AutoTarget: RenderRangeCircle: DrawLineToTarget: RenderBuilding: RenderVoxels: - Image: art2 WithVoxelBarrel: + LocalOffset: 0,0,-512 WithVoxelTurret: Transforms: IntoActor: art2 Offset: 1,1 Facing: 96 - TransformSounds: + TransformSounds: place2.aud NoTransformSounds: + WithMuzzleFlash: GASPOT: Inherits: ^Building @@ -769,6 +809,260 @@ GADEPT: WithRepairOverlay@PLATFORM: Sequence: platform +GAVULC: + Inherits: ^Building + Valued: + Cost: 600 + Tooltip: + Name: Vulcan Tower + Description: Basic base defense. \nRequires no power to operate.\n Strong vs infantry and light armor\n Cannot target Aircraft + Buildable: + Queue: Defense + BuildPaletteOrder: 30 + Owner: gdi + Building: + Power: -20 + DisabledOverlay: + -GivesBuildableArea: + Health: + HP: 500 + Armor: + Type: Light + RevealsShroud: + Range: 6c0 + BodyOrientation: + QuantizedFacings: 32 + RenderRangeCircle: + RenderDetectionCircle: + DetectCloaked: + Range: 5 + AutoTarget: + Turreted: + ROT: 10 + InitialFacing: 50 + AttackTurreted: + WithTurret: + Recoils: no + Armament@PRIMARY: + Weapon: VulcanTower + LocalOffset: 768,85,512 + Recoil: 0 + MuzzleSequence: muzzle + MuzzleSplitFacings: 8 + Armament@SECONDARY: + Name: secondary + Weapon: VulcanTower + LocalOffset: 768,-85,512 + Recoil: 0 + MuzzleSequence: muzzle + MuzzleSplitFacings: 8 + WithMuzzleFlash: + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + +GAROCK: + Inherits: ^Building + Valued: + Cost: 1000 + Tooltip: + Name: RPG Tower + Description: GDI Advanced base defense.\nRequires power to operate.\n Strong vs armored ground units\n Cannot target Aircraft + Buildable: + Queue: Defense + BuildPaletteOrder: 40 + Owner: gdi + Building: + Power: -50 + RequiresPower: + DisabledOverlay: + -GivesBuildableArea: + Health: + HP: 500 + Armor: + Type: Light + RevealsShroud: + Range: 6c0 + BodyOrientation: + QuantizedFacings: 32 + RenderRangeCircle: + RenderDetectionCircle: + DetectCloaked: + Range: 5 + AutoTarget: + Turreted: + ROT: 10 + InitialFacing: 50 + AttackTurreted: + WithTurret: + Recoils: no + Armament: + Weapon: RPGTower + LocalOffset: 512,-128,512 + Recoil: 0 + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + +GACSAM: + Inherits: ^Building + Valued: + Cost: 600 + Tooltip: + Name: S.A.M. Tower + Description: GDI Anti-Air base defense. \nRequires power to operate.\n Strong vs all Aircraft\n Cannot target ground units + Buildable: + Queue: Defense + BuildPaletteOrder: 60 + Owner: gdi + Building: + Power: -30 + RequiresPower: + DisabledOverlay: + -GivesBuildableArea: + Health: + HP: 500 + Armor: + Type: Light + RevealsShroud: + Range: 6c0 + BodyOrientation: + QuantizedFacings: 32 + RenderRangeCircle: + RenderDetectionCircle: + DetectCloaked: + Range: 5 + AutoTarget: + Turreted: + ROT: 10 + InitialFacing: 50 + AttackTurreted: + WithTurret: + Recoils: no + Armament: + Weapon: SAMTower + LocalOffset: 512,0,512 + Recoil: 0 + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + +NASAM: + Inherits: ^Building + Valued: + Cost: 600 + Tooltip: + Name: S.A.M. Site + Description: Nod Anti-Air base defense. \nRequires power to operate.\n Strong vs all Aircraft\n Cannot target ground units + Buildable: + Queue: Defense + BuildPaletteOrder: 60 + Owner: nod + Building: + Power: -30 + RequiresPower: + DisabledOverlay: + -GivesBuildableArea: + Health: + HP: 500 + Armor: + Type: Light + RevealsShroud: + Range: 6c0 + BodyOrientation: + QuantizedFacings: 32 + RenderRangeCircle: + RenderDetectionCircle: + DetectCloaked: + Range: 5 + AutoTarget: + Turreted: + ROT: 10 + InitialFacing: 50 + AttackTurreted: + WithTurret: + Recoils: no + Armament: + Weapon: SAMTower + LocalOffset: 512,0,512 + Recoil: 0 + +NALASR: + Inherits: ^Building + Valued: + Cost: 500 + Tooltip: + Name: Laser Turret + Description: Basic base defense. \nRequires power to operate.\n Strong vs all ground units\n Cannot target Aircraft + Buildable: + Queue: Defense + BuildPaletteOrder: 50 + Owner: nod + Building: + Power: -40 + RequiresPower: + DisabledOverlay: + -GivesBuildableArea: + Health: + HP: 400 + Armor: + Type: Light + RevealsShroud: + Range: 5c0 + RenderRangeCircle: + RenderDetectionCircle: + DetectCloaked: + Range: 3 + Turreted: + ROT: 10 + InitialFacing: 300 + Offset: 298,-171,256 + AttackTurreted: + Armament: + Weapon: TurretLaser + RenderVoxels: + WithVoxelTurret: + AutoTarget: + +NAOBEL: + Inherits: ^Building + Valued: + Cost: 1500 + Tooltip: + Name: Obelisk of Light + Description: Advanced base defense. \nRequires power to operate.\n Strong vs all ground units\n Cannot target Aircraft + Buildable: + Queue: Defense + BuildPaletteOrder: 90 + Prerequisites: tech + Owner: nod + Building: + Power: -150 + Footprint: xx xx + Dimensions: 2,2 + RequiresPower: + DisabledOverlay: + -GivesBuildableArea: + Health: + HP: 600 + Armor: + Type: Heavy + RevealsShroud: + Range: 8c0 + RenderBuildingCharge: + ChargeAudio: obelpowr.aud + Armament: + Weapon: ObeliskLaser + LocalOffset: 0,0,725 + AttackCharge: + ReloadTime: 50 + InitialChargeDelay: 50 + AutoTarget: + -RenderBuilding: + RenderRangeCircle: + RenderDetectionCircle: + DetectCloaked: + Range: 5 + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + ANYPOWER: Tooltip: Name: Power Plant diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index c625534e26..e8ad196076 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -222,6 +222,35 @@ napowr: icon: npwricon Start: 0 +naapwr: + idle: ntapwr + Start: 0 + ShadowStart: 3 + damaged-idle: ntapwr + Start: 1 + ShadowStart: 4 + critical-idle: ntapwr + Start: 2 + ShadowStart: 5 + idle-lights: ntapwr_a + Start: 0 + Length: 9 + Tick: 200 + damaged-idle-lights: ntapwr_a + Start: 9 + Length: 9 + Tick: 200 + critical-idle-lights: ntapwr_a + Start: 9 + Length: 9 + Tick: 200 + make: ntapwrmk + Start: 0 + Length: 19 + ShadowStart: 19 + icon: apwricon + Start: 0 + nahand: idle: nthand Start: 0 @@ -303,9 +332,9 @@ naradr: damaged-idle: ntradr Start: 1 ShadowStart: 4 - critical-idle: ntradr - Start: 2 - ShadowStart: 5 +# critical-idle: ntradr #shows a destroyed dish +# Start: 2 +# ShadowStart: 5 idle-dish: ntradr_a Start: 0 Length: 24 @@ -357,17 +386,17 @@ garadr: damaged-idle: gtradr Start: 1 ShadowStart: 4 - critical-idle: gtradr - Start: 2 - ShadowStart: 5 - idle-dish: gtradr_a # TODO: needs to ping-pong - Start: 0 - Length: 15 - Tick: 120 - damaged-idle-dish: gtradr_a # TODO: needs to ping-pong - Start: 15 - Length: 15 - Tick: 160 +# critical-idle: gtradr #shows a destroyed radar dish +# Start: 2 +# ShadowStart: 5 + 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 + 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 make: gtradrmk Start: 0 Length: 20 @@ -453,14 +482,20 @@ gatick: Start: 0 Facings: 1 ShadowStart: 3 + Offset: 0,-13 damaged-idle: Start: 1 Facings: 1 ShadowStart: 4 + Offset: 0,-13 + muzzle: gunfire + Start: 0 + Length: * make: gatickmk Start: 0 Length: 24 ShadowStart: 24 + Offset: 0,-13 gaicbm: idle: @@ -495,14 +530,207 @@ gaarty: Start: 0 Facings: 1 ShadowStart: 3 + Offset: 0,-12 damaged-idle: Start: 1 Facings: 1 ShadowStart: 4 + Offset: 0,-12 + muzzle: gunfire + Start: 0 + Length: * make: gaartymk Start: 0 Length: 16 ShadowStart: 16 + Offset: 0,-12 + +naobel: + idle: ntobel + Start: 0 + ShadowStart: 3 + damaged-idle: ntobel + Start: 1 + ShadowStart: 4 + critical-idle: ntobel + Start: 2 + ShadowStart: 5 + active: ntobel #placeholder until Charge supports overlays + Start: 0 + Length: 1 + ShadowStart: 3 +# active: ntobel_b +# Start: 0 +# Length: 12 +# Tick: 240 + idle-lights: ntobel_a + Start: 0 + Length: 12 + Tick: 80 + make: ntobelmk + Start: 0 + Length: 19 + ShadowStart: 19 + icon: obliicon + Start: 0 + +nalasr: + idle: ntlasr + Start: 0 + ShadowStart: 3 + damaged-idle: ntlasr + Start: 1 + ShadowStart: 4 + critical-idle: ntlasr + Start: 2 + ShadowStart: 5 + make: ntlasrmk + Start: 0 + Length: 21 + ShadowStart: 21 + icon: plticon + Start: 0 + +nasam: + idle: ntsam + Start: 0 + ShadowStart: 3 + damaged-idle: ntsam + Start: 1 + ShadowStart: 4 + critical-idle: ntsam + Start: 2 + ShadowStart: 5 + turret: gtctwr_d + Start: 0 + Facings: 32 + Offset: 0,20 + make: ntsammk + Start: 0 + Length: 8 + ShadowStart: 8 + icon: samicon + Start: 0 + +gavulc: + idle: gtctwr + Start: 0 + ShadowStart: 3 + damaged-idle: gtctwr + Start: 1 + ShadowStart: 4 + critical-idle: gtctwr + Start: 2 + ShadowStart: 5 + turret: gtctwr_b + Start: 0 + Facings: 32 + muzzle0: mgun-n + Start: 0 + Length: * + muzzle1: mgun-nw + Start: 0 + Length: * + muzzle2: mgun-w + Start: 0 + Length: * + muzzle3: mgun-sw + Start: 0 + Length: * + muzzle4: mgun-s + Start: 0 + Length: * + muzzle5: mgun-se + Start: 0 + Length: * + muzzle6: mgun-e + Start: 0 + Length: * + muzzle7: mgun-ne + Start: 0 + Length: * + idle-lights: gtctwr_a + Start: 0 + Length: 6 + Tick: 200 + damaged-idle-lights: gtctwr_a + Start: 0 + Length: 6 + Tick: 200 + critical-idle-lights: gtctwr_a + Start: 6 + Length: 6 + Tick: 200 + make: gtctwrmk + Start: 0 + Length: 11 + ShadowStart: 11 + icon: twr1icon + Start: 0 + +garock: + idle: gtctwr + Start: 0 + ShadowStart: 3 + damaged-idle: gtctwr + Start: 1 + ShadowStart: 4 + critical-idle: gtctwr + Start: 2 + ShadowStart: 5 + turret: gtctwr_c + Start: 0 + Facings: 32 + idle-lights: gtctwr_a + Start: 0 + Length: 6 + Tick: 200 + damaged-idle-lights: gtctwr_a + Start: 0 + Length: 6 + Tick: 200 + critical-idle-lights: gtctwr_a + Start: 6 + Length: 6 + Tick: 200 + make: gtctwrmk + Start: 0 + Length: 11 + ShadowStart: 11 + icon: twr2icon + Start: 0 + +gacsam: + idle: gtctwr + Start: 0 + ShadowStart: 3 + damaged-idle: gtctwr + Start: 1 + ShadowStart: 4 + critical-idle: gtctwr + Start: 2 + ShadowStart: 5 + turret: gtctwr_d + Start: 0 + Facings: 32 + idle-lights: gtctwr_a + Start: 0 + Length: 6 + Tick: 200 + damaged-idle-lights: gtctwr_a + Start: 0 + Length: 6 + Tick: 200 + critical-idle-lights: gtctwr_a + Start: 6 + Length: 6 + Tick: 200 + make: gtctwrmk + Start: 0 + Length: 11 + ShadowStart: 11 + icon: twr3icon + Start: 0 gaspot: idle: @@ -660,6 +888,7 @@ galite: # BlendMode: Alpha icon: liteicon Start: 0 + gadept: idle: Start: 0 diff --git a/mods/ts/sequences/voxels.yaml b/mods/ts/sequences/voxels.yaml index 7db3f18756..4b8029bfbf 100644 --- a/mods/ts/sequences/voxels.yaml +++ b/mods/ts/sequences/voxels.yaml @@ -12,6 +12,8 @@ apc: # TODO apcw in water art2: idle: + +gaarty: turret: art2tur barrel: art2barl @@ -20,7 +22,9 @@ subtank: bggy: idle: -# muzzle: # TODO: use MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW + +nalasr: + turret: laser sapc: idle: @@ -30,6 +34,8 @@ bike: ttnk: idle: + +gatick: turret: ttnktur barrel: ttnkbarl