diff --git a/mods/ts/bits/flameall.shp b/mods/ts/bits/flameall.shp new file mode 100644 index 0000000000..ffa4df5ffd Binary files /dev/null and b/mods/ts/bits/flameall.shp differ diff --git a/mods/ts/bits/levelup.shp b/mods/ts/bits/levelup.shp deleted file mode 100644 index eec8a7f72c..0000000000 Binary files a/mods/ts/bits/levelup.shp and /dev/null differ diff --git a/mods/ts/music.yaml b/mods/ts/music.yaml index e12b51ffdb..248342f338 100644 --- a/mods/ts/music.yaml +++ b/mods/ts/music.yaml @@ -1,6 +1,6 @@ #Tiberian Sun intro: Intro -maps: Maps +maps: Map Selection approach: Approach defense: The Defense duskhour: Dusk Hour @@ -27,7 +27,7 @@ hacker: Hacker infiltra: Infiltration kmachine: Killing Machine linkup: Link Up -rainnite: Rain in the Night 2 +rainnite: Rain In The Night 2 slavesys: Slave To The System #Bonus tracks stomp: Stomp diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 389c6f9c59..5c65dcfac7 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -177,10 +177,10 @@ Crushes: crate TerrainSpeeds: Clear: 80 - Rough: 40 + Rough: 60 Road: 100 - Beach: 40 - Tiberium: 40 + Beach: 60 + Tiberium: 60 ROT: 5 SelectionDecorations: Palette: pips @@ -215,6 +215,9 @@ Huntable: LuaScriptEvents: ScriptTriggers: + Explodes: + Weapon: UnitExplodeSmall + EmptyWeapon: UnitExplodeSmall ^Helicopter: AppearsOnRadar: diff --git a/mods/ts/rules/infantry.yaml b/mods/ts/rules/infantry.yaml index cab87f39e2..7a7dbe3f34 100644 --- a/mods/ts/rules/infantry.yaml +++ b/mods/ts/rules/infantry.yaml @@ -45,7 +45,7 @@ E2: Armament: Weapon: Grenade LocalOffset: 0,0,555 - FireDelay: 15 + FireDelay: 5 AttackFrontal: TakeCover: -RenderInfantry: @@ -73,7 +73,7 @@ E3: Speed: 42 Armament@PRIMARY: Weapon: Bazooka - LocalOffset: 0,0,555 + LocalOffset: 128,0,640 AttackFrontal: TakeCover: -RenderInfantry: @@ -101,9 +101,8 @@ WEEDGUY: CrushableInfantry: CrushSound: squish2.aud Armament: - Weapon: MultiCluster + Weapon: FireballLauncher LocalOffset: 85,0,384 - FireDelay: 3 AttackFrontal: -RenderInfantry: RenderInfantryProne: @@ -224,6 +223,7 @@ GHOST: Range: 6c0 Armament: Weapon: LtRail + LocalOffset: 85,0,384 CrushableInfantry: CrushSound: squish2.aud AttackFrontal: @@ -311,7 +311,7 @@ CYBORG: -CrushableInfantry: CrushSound: squish2.aud Selectable: - Bounds: 12,17,0,-6 + Bounds: 14,30,0,-7 Voice: Cyborg Mobile: Speed: 56 @@ -344,7 +344,7 @@ CYC2: -CrushableInfantry: CrushSound: squish2.aud Selectable: - Bounds: 12,17,0,-6 + Bounds: 14,30,0,-7 Voice: CyborgCommando Mobile: Speed: 56 @@ -354,7 +354,8 @@ CYC2: RevealsShroud: Range: 7c0 Armament: - Weapon: Sniper + Weapon: CyCannon + LocalOffset: 170,85,683 AttackFrontal: TakeCover: -RenderInfantry: diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index b7df463bf1..77faa36515 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,263 @@ GADEPT: WithRepairOverlay@PLATFORM: Sequence: platform +#TODO: Placeholder, replace with Component Tower + Vulcan Upgrade +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 + +#TODO: Placeholder, replace with Component Tower + RPG Upgrade +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 + +#TODO: Placeholder, replace with Component Tower + SAM Upgrade +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/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index 9025464ca8..ff37c87327 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -118,6 +118,7 @@ HVR: Weapon: HoverMissile Turreted: ROT: 7 + Offset: -128,0,0 AttackTurreted: AutoTarget: RenderSprites: @@ -149,8 +150,11 @@ HVR: ROT: 3 Armament@PRIMARY: Weapon: 120mmx + LocalOffset: 640,85,384, 640,-85,384 + MuzzleSequence: muzzle Armament@SECONDARY: Weapon: MammothTusk + LocalOffset: 0,256,426, 0,-256,426 AttackTurreted: AutoTarget: SelfHealing: @@ -162,6 +166,7 @@ HVR: WithVoxelBody: WithVoxelTurret: WithVoxelBarrel: + WithMuzzleFlash: TRUCKB: Inherits: ^Vehicle @@ -482,6 +487,7 @@ MMCH: RenderInfantry: SpawnsCorpse: false Turreted: + ROT: 5 AttackTurreted: WithTurret: Recoils: no @@ -491,7 +497,7 @@ MMCH: RecoilRecovery: 26 RenderVoxels: WithVoxelBarrel: - LocalOffset: -128, 128, 213 + LocalOffset: -128, 85, 256 AutoTarget: HMEC: @@ -519,9 +525,10 @@ HMEC: AutoTarget: Armament@MISSILES: Weapon: MammothTusk + LocalOffset: -128,-384,980, -128,384,980 Armament@RAILGUN: Weapon: MechRailgun - LocalOffset: 640,-640,980, 640,640,980 + LocalOffset: 640,-384,980, 640,384,980 RenderVoxels: WithVoxelWalkerBody: @@ -606,11 +613,15 @@ BGGY: Range: 6c0 Armament: Weapon: RaiderCannon + LocalOffset: 0,-43,384, 0,43,384 + MuzzleSequence: muzzle + MuzzleSplitFacings: 8 AttackFrontal: AutoTarget: RenderSprites: RenderVoxels: WithVoxelBody: + WithMuzzleFlash: SAPC: Inherits: ^Vehicle @@ -691,6 +702,8 @@ SONIC: Weapon: SonicZap AttackTurreted: Turreted: + ROT: 5 + Offset: -170,0,0 AutoTarget: RenderSprites: RenderVoxels: @@ -749,8 +762,8 @@ STNK: Cloak: InitialDelay: 90 CloakDelay: 90 - CloakSound: - UncloakSound: + CloakSound: cloak5.aud + UncloakSound: cloak5.aud Armament: Weapon: Dragon LocalOffset: 213,43,128, 213,-43,128 diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index dcac7c751a..6fd8631aa1 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -104,12 +104,26 @@ World: AllowedTerrainTypes: Clear AllowUnderActors: false TerrainType: Tiberium + SmudgeLayer@SCORCH: + Type: Scorch + Sequence: scorches + SmokePercentage: 50 + SmudgeLayer@CRATER: + Type: Crater + Sequence: craters PathfinderDebugOverlay: SpawnMapActors: CreateMPPlayers: - MPStartUnits: + MPStartUnits@MCV: Races: gdi, nod BaseActor: mcv + MPStartUnits@TEST: + Class: heavy + Races: gdi,nod + BaseActor: mcv + SupportActors: e1,e2,e3,cyborg,cyc2,jumpjet,umagon,ghost,mmch,smech,hmec,bggy,bike,art2,ttnk,hvr,sonic,subtank,repair,4tnk + InnerSupportRadius: 3 + OuterSupportRadius: 5 MPStartLocations: SpawnMPUnits: PathFinder: diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml index 06e3f218d8..f9cce3fd00 100644 --- a/mods/ts/sequences/infantry.yaml +++ b/mods/ts/sequences/infantry.yaml @@ -35,35 +35,43 @@ e1: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: infdie Start: 0 Length: * + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: e1icon Start: 0 @@ -104,35 +112,43 @@ e2: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: infdie Start: 0 Length: * + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: e2icon Start: 0 @@ -173,35 +189,43 @@ e3: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: infdie Start: 0 Length: * + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: e4icon Start: 0 @@ -220,14 +244,17 @@ weedguy: Start: 56 Length: 1 Facings: 8 + Tick: 80 prone-shoot: weed Start: 212 Length: 6 Facings: 8 + Tick: 80 standup-0: weed Start: 260 Length: 2 Facings: 8 + Tick: 80 prone-run: weed Start: 86 Length: 6 @@ -244,25 +271,31 @@ weedguy: Start: 160 Length: 6 ShadowStart: 362 + Tick: 80 die1: weed Start: 149 Length: 11 ShadowStart: 351 + Tick: 80 die3: weed Start: 166 Length: 10 ShadowStart: 368 + Tick: 80 die4: weed Start: 197 Length: 5 ShadowStart: 399 + Tick: 80 die5: weed Start: 177 Length: 19 ShadowStart: 379 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: weaticon Start: 0 @@ -303,37 +336,46 @@ medic: Start: 134 Length: 15 ShadowStart: 441 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 455 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 455 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 567 + Tick: 80 heal: Start: 292 Length: 14 ShadowStart: 599 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: mediicon Start: 0 @@ -374,26 +416,32 @@ engineer: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: engnicon Start: 0 @@ -434,36 +482,44 @@ umagon: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: umagicon Start: 0 @@ -504,36 +560,44 @@ ghost: # TODO unused GUNFIRE.SHP Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: gosticon Start: 0 @@ -572,36 +636,44 @@ jumpjet: # TODO: ShadowStart: Start: 134 Length: 15 ShadowStart: 585 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 600 + Tick: 80 die3: #TODO: animation doesn't fit this InfDeath Start: 436 Length: 15 ShadowStart: 887 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 615 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 663 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 711 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: jjeticon Start: 0 @@ -642,36 +714,44 @@ mhijack: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: mutcicon Start: 0 @@ -712,36 +792,44 @@ chamspy: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: chamicon Start: 0 @@ -782,35 +870,43 @@ cyc2: Start: 182 Length: 15 ShadowStart: 490 + Tick: 80 die2: Start: 197 Length: 15 ShadowStart: 505 + Tick: 80 die3: infexpl Start: 0 Length: * + Tick: 80 shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 520 + Tick: 80 prone-shoot: Start: 260 Length: 6 Facings: 8 ShadowStart: 568 + Tick: 80 standup-0: # TODO: N/A as they only crawl when severly damaged Start: 260 Length: 2 Facings: 8 ShadowStart: 568 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: cybcicon Start: 0 @@ -823,7 +919,7 @@ cyborg: Start: 8 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 378 idle1: Start: 56 @@ -839,7 +935,7 @@ cyborg: Start: 86 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 456 prone-stand: Start: 86 @@ -851,36 +947,44 @@ cyborg: Start: 134 Length: 15 ShadowStart: 504 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 519 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 534 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 582 + Tick: 80 standup-0: # TODO: N/A as they don't do that Start: 260 Length: 2 Facings: 8 ShadowStart: 630 + Tick: 80 die5: # TODO: unused running frame 322 and following Start: 292 Length: 14 ShadowStart: 662 + Tick: 80 die3: Start: 307 Length: 14 ShadowStart: 677 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: cybiicon Start: 0 @@ -893,7 +997,7 @@ mutant: Start: 8 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 300 idle1: Start: 56 @@ -909,7 +1013,7 @@ mutant: Start: 86 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 378 prone-stand: Start: 86 @@ -921,36 +1025,44 @@ mutant: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: mutcicon Start: 0 @@ -963,7 +1075,7 @@ mwmn: Start: 8 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 300 idle1: Start: 56 @@ -979,7 +1091,7 @@ mwmn: Start: 86 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 378 prone-stand: Start: 86 @@ -991,36 +1103,44 @@ mwmn: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: mutcicon Start: 0 @@ -1033,7 +1153,7 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN- Start: 8 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 300 idle1: Start: 56 @@ -1049,7 +1169,7 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN- Start: 86 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 378 prone-stand: Start: 86 @@ -1061,36 +1181,44 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN- Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: mutcicon Start: 0 @@ -1103,7 +1231,7 @@ tratos: Start: 8 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 300 idle1: Start: 56 @@ -1119,7 +1247,7 @@ tratos: Start: 86 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 378 prone-stand: Start: 86 @@ -1131,36 +1259,44 @@ tratos: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: mutcicon Start: 0 @@ -1173,7 +1309,7 @@ oxanna: Start: 8 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 300 idle1: Start: 56 @@ -1189,7 +1325,7 @@ oxanna: Start: 86 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 378 prone-stand: Start: 86 @@ -1201,36 +1337,44 @@ oxanna: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: mutcicon Start: 0 @@ -1243,7 +1387,7 @@ slav: Start: 8 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 300 idle1: Start: 56 @@ -1259,7 +1403,7 @@ slav: Start: 86 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 378 prone-stand: Start: 86 @@ -1271,36 +1415,44 @@ slav: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 456 + Tick: 80 prone-shoot: Start: 212 Length: 6 Facings: 8 ShadowStart: 504 + Tick: 80 standup-0: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: mutcicon Start: 0 @@ -1313,33 +1465,39 @@ doggie: # TODO: not sure what frame 88 and following is Start: 8 Length: 6 Facings: 8 - Tick: 100 + Tick: 80 ShadowStart: 127 die1: Start: 99 Length: 10 ShadowStart: 218 + Tick: 80 die2: Start: 99 Length: 10 ShadowStart: 218 + Tick: 80 die3: Start: 99 Length: 10 ShadowStart: 218 + Tick: 80 shoot: Start: 56 Length: 4 Facings: 8 ShadowStart: 175 + Tick: 80 die5: Start: 109 Length: 10 ShadowStart: 228 + Tick: 80 die6: Start: 109 Length: 10 ShadowStart: 228 + Tick: 80 icon: xxicon Start: 0 @@ -1374,40 +1532,49 @@ civ1: Length: 6 Facings: 8 ShadowStart: 300 + Tick: 80 panic-stand: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 panic-run: Start: 86 Length: 6 Facings: 8 ShadowStart: 378 + Tick: 80 shoot: Start: 164 Length: 6 Facings: 8 ShadowStart: 457 + Tick: 80 die1: Start: 134 Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: xxicon Start: 0 @@ -1421,40 +1588,49 @@ civ2: Length: 6 Facings: 8 ShadowStart: 300 + Tick: 80 panic-stand: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 panic-run: Start: 86 Length: 6 Facings: 8 ShadowStart: 378 + Tick: 80 shoot: - Start: 165 + Start: 164 Length: 6 Facings: 8 ShadowStart: 457 + Tick: 80 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: xxicon Start: 0 @@ -1468,39 +1644,48 @@ civ3: Length: 6 Facings: 8 ShadowStart: 300 + Tick: 80 panic-stand: Start: 260 Length: 2 Facings: 8 ShadowStart: 552 + Tick: 80 panic-run: Start: 86 Length: 6 Facings: 8 ShadowStart: 378 + Tick: 80 shoot: - Start: 165 + Start: 164 Length: 6 Facings: 8 ShadowStart: 457 + Tick: 80 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 + Tick: 80 die2: Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die3: # TODO: copy-paste of die2 Start: 149 Length: 15 ShadowStart: 441 + Tick: 80 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 ShadowStart: 190 + Tick: 80 die6: electro Start: 0 Length: * + Tick: 80 icon: xxicon - Start: 0 \ No newline at end of file + Start: 0 diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index d09e628123..59e152eadd 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -54,10 +54,33 @@ beacon: BlendMode: Additive crate-effects: - levelup: levelup + dollar: money + Start: 0 + Length: * + reveal-map: reveal + Start: 0 + Length: * + hide-map: shroudx + Start: 0 + Length: * + fpower: firepowr + Start: 0 + Length: * + armor: armor + Start: 0 + Length: * + stealth: cloak + Start: 0 + Length: * + heal: healall + Start: 0 + Length: * + nuke: mltimisl + Start: 0 + Length: * + levelup: veteran Start: 0 Length: * - Tick: 200 rank: rank: pips @@ -235,13 +258,11 @@ discus: Start: 0 Length: * -# TODO: needs unit*.pal canister: idle: Start: 0 Length: * -# TODO: needs unit*.pal + ShadowIndex: 4 dragon: idle: Start: 0 @@ -262,6 +283,19 @@ torpedo: Start: 0 Length: * +flameall: + idle: + Start: 0 + Length: 19 + Facings: -8 + Tick: 160 + +#TODO: placeholder to fix crashes related to smoke +smoke_m: + idle: fire3 + Start: 0 + Length: * + moveflsh: idle: ring Start: 0 @@ -351,5 +385,33 @@ resources: ShadowStart: 12 shroud: - shroud: shadow - Length: * \ No newline at end of file + shroud: shadow #TODO: use shroud.shp + Length: * + +scorches: #TODO: make use of 07-12 as well + sc1: burnt01 + Length: * + sc2: burnt02 + Length: * + sc3: burnt03 + Length: * + sc4: burnt04 + Length: * + sc5: burnt05 + Length: * + sc6: burnt06 + Length: * + +craters: #TODO: make use of 07-12 as well + cr1: crater01 + Length: * + cr2: crater02 + Length: * + cr3: crater03 + Length: * + cr4: crater04 + Length: * + cr5: crater05 + Length: * + cr6: crater06 + Length: * 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/vehicles.yaml b/mods/ts/sequences/vehicles.yaml index 00ce6acd8c..5e643d3f4c 100644 --- a/mods/ts/sequences/vehicles.yaml +++ b/mods/ts/sequences/vehicles.yaml @@ -15,6 +15,9 @@ hvr: Start: 0 4tnk: + muzzle: gunfire + Start: 0 + Length: * icon: xxicon Start: 0 @@ -67,6 +70,30 @@ bike: Start: 0 bggy: + 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: * icon: bggyicon Start: 0 @@ -83,6 +110,9 @@ sonic: Start: 0 ttnk: + muzzle: gunfire + Start: 0 + Length: * icon: tickicon Start: 0 @@ -104,6 +134,9 @@ mmch: turret: Start: 120 Facings: -32 + muzzle: gunfire + Start: 0 + Length: * icon: mmchicon Start: 0 diff --git a/mods/ts/sequences/voxels.yaml b/mods/ts/sequences/voxels.yaml index 7db3f18756..8caf4b2f24 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 @@ -115,6 +121,40 @@ sonic: #utnk: # TODO: unused alternative version of Devil's Tongue # idle: +#mrj: # TODO: unused +# idle: +# turret: mrjtur + +#m113: # TODO: unused +# idle: +# turret: m113tur + +#mlrs: # TODO: unused +# idle: +# turret: mlrstur + +#arty: # TODO: unused +# idle: +# barrel: artybarl + +#1tnk: # TODO: unused +# idle: +# turret: 1tnktur +# barrel: 1tnkbarl + +#2tnk: # TODO: unused +# idle: +# turret: 2tnktur +# barrel: 2tnkbarl + +#3tnk: # TODO: unused +# idle: +# turret: 3tnktur +# barrel: 3tnkbarl + +#ftnk: # TODO: unused +# idle: + #tire: # TODO: unused debris # idle: diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index 427ab893db..23260ac305 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -1,3 +1,29 @@ +UnitExplode: + Warhead: + Damage: 500 + Spread: 426 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: large_twlt + InfDeath: 2 + ImpactSound: expnew09.aud + +UnitExplodeSmall: + Warhead: + Damage: 40 + Spread: 426 + Versus: + None: 90% + Wood: 75% + Light: 60% + Heavy: 25% + Explosion: medium_brnl + InfDeath: 2 + ImpactSound: expnew13.aud + Minigun: ROF: 21 Range: 4c0 @@ -7,13 +33,13 @@ Minigun: Warhead: Spread: 128 Versus: - Wood: 25% - Light: 30% - Heavy: 10% + Wood: 60% + Light: 40% + Heavy: 25% Concrete: 10% Explosion: piffpiff InfDeath: 1 - Damage: 15 + Damage: 12 Grenade: ROF: 60 @@ -26,12 +52,13 @@ Grenade: Inaccuracy: 554 Image: DISCUS Warhead: - Spread: 256 + Spread: 171 Versus: - None: 50% - Wood: 100% - Light: 25% - Heavy: 5% + None: 100% + Wood: 85% + Light: 70% + Heavy: 35% + Concrete: 28% InfDeath: 3 Damage: 40 Explosion: large_grey_explosion @@ -55,10 +82,11 @@ Bazooka: Warhead: Spread: 128 Versus: - None: 10% - Wood: 75% - Light: 35% - Concrete: 20% + None: 25% + Wood: 65% + Light: 75% + Heavy: 100% + Concrete: 60% InfDeath: 2 Damage: 25 Explosion: small_clsn @@ -82,10 +110,11 @@ MultiCluster: Warhead: Spread: 128 Versus: - None: 10% - Wood: 75% - Light: 35% - Concrete: 20% + None: 25% + Wood: 65% + Light: 75% + Heavy: 100% + Concrete: 60% InfDeath: 3 Damage: 65 Explosion: large_explosion @@ -118,9 +147,10 @@ Sniper: Spread: 42 Versus: None: 100% - Wood: 5% - Light: 5% - Heavy: 5% + Wood: 0% + Light: 0% + Heavy: 0% + Concrete: 0% InfDeath: 1 M1Carbine: @@ -132,10 +162,10 @@ M1Carbine: Warhead: Spread: 128 Versus: - None: 100% - Wood: 25% - Light: 30% - Heavy: 10% + Wood: 60% + Light: 40% + Heavy: 25% + Concrete: 10% Explosion: piffpiff InfDeath: 1 Damage: 15 @@ -144,18 +174,45 @@ LtRail: ROF: 60 Range: 6c0 Report: BIGGGUN1.AUD - Projectile: Bullet + Projectile: LaserZap Speed: 1c682 + BeamWidth: 1 + BeamDuration: 10 + Color: 200,0,128,255 Warhead: Damage: 150 Spread: 42 Versus: None: 100% - Wood: 5% - Light: 5% - Heavy: 5% + Wood: 130% + Light: 150% + Heavy: 110% + Concrete: 5% InfDeath: 2 +CyCannon: + ROF: 50 + Range: 7c0 + Report: SCRIN5B.AUD + ValidTargets: Ground + Projectile: Bullet + Speed: 192 + High: yes + Shadow: yes + Image: TORPEDO + Warhead: + Spread: 256 + Versus: + None: 100% + Wood: 65% + Light: 75% + Heavy: 50% + Concrete: 40% + InfDeath: 6 + Damage: 120 + Explosion: large_bang + ImpactSound: expnew12.aud + Vulcan3: ROF: 30 Burst: 3 @@ -166,9 +223,9 @@ Vulcan3: Warhead: Spread: 128 Versus: - Wood: 25% - Light: 30% - Heavy: 10% + Wood: 60% + Light: 40% + Heavy: 25% Concrete: 10% Explosion: piffpiff InfDeath: 1 @@ -200,10 +257,11 @@ Vulcan: Projectile: Bullet Speed: 1c682 Warhead: + Spread: 128 Versus: - Wood: 25% - Light: 30% - Heavy: 10% + Wood: 60% + Light: 40% + Heavy: 25% Concrete: 10% Explosion: piffpiff InfDeath: 1 @@ -221,9 +279,9 @@ FiendShard: Angle: 88 Warhead: Versus: - Wood: 25% - Light: 30% - Heavy: 10% + Wood: 60% + Light: 40% + Heavy: 25% Concrete: 10% InfDeath: 1 Damage: 35 @@ -236,10 +294,11 @@ JumpCannon: Projectile: Bullet Speed: 1c682 Warhead: + Spread: 128 Versus: - Wood: 25% - Light: 30% - Heavy: 10% + Wood: 60% + Light: 40% + Heavy: 25% Concrete: 10% Explosion: piffpiff InfDeath: 1 @@ -264,10 +323,11 @@ HoverMissile: Warhead: Spread: 128 Versus: - None: 10% - Wood: 75% - Light: 35% - Concrete: 20% + None: 25% + Wood: 65% + Light: 75% + Heavy: 100% + Concrete: 60% InfDeath: 2 Damage: 30 Explosion: small_clsn @@ -288,11 +348,11 @@ HoverMissile: Warhead: Spread: 128 Versus: - None: 30% - Wood: 75% - Light: 100% + None: 25% + Wood: 65% + Light: 75% Heavy: 100% - Concrete: 100% + Concrete: 60% InfDeath: 2 Damage: 50 Explosion: medium_clsn @@ -315,12 +375,13 @@ MammothTusk: Speed: 170 RangeLimit: 35 Warhead: - Spread: 256 + Spread: 171 Versus: - None: 40% - Wood: 75% - Light: 75% - Heavy: 50% + None: 100% + Wood: 85% + Light: 70% + Heavy: 35% + Concrete: 28% InfDeath: 3 Damage: 40 Explosion: medium_bang @@ -383,11 +444,11 @@ SuicideBomb: Warhead: Spread: 128 Versus: - None: 30% - Wood: 75% - Light: 100% + None: 25% + Wood: 65% + Light: 75% Heavy: 100% - Concrete: 100% + Concrete: 60% InfDeath: 2 Damage: 70 Explosion: large_clsn @@ -398,13 +459,18 @@ MechRailgun: Range: 8c0 Burst: 2 BurstDelay: 10 - Charges: yes Report: RAILUSE5.AUD Projectile: LaserZap Color: 200,0,255,255 - BeamWidth: 2 + BeamWidth: 3 Warhead: Spread: 42 + Versus: + None: 200% + Wood: 175% + Light: 160% + Heavy: 100% + Concrete: 25% InfDeath: 5 Damage: 200 @@ -417,9 +483,9 @@ AssaultCannon: Warhead: Spread: 128 Versus: - Wood: 100% - Light: 60% - Heavy: 40% + Wood: 60% + Light: 40% + Heavy: 25% Concrete: 10% Explosion: piffpiff InfDeath: 1 @@ -445,10 +511,11 @@ BikeMissile: Warhead: Spread: 256 Versus: - None: 40% - Wood: 75% + None: 25% + Wood: 65% Light: 75% - Heavy: 50% + Heavy: 100% + Concrete: 60% InfDeath: 2 Damage: 40 Explosion: small_clsn @@ -457,15 +524,17 @@ BikeMissile: RaiderCannon: ROF: 55 Range: 4c0 + Burst: 2 #purely cosmetical, for alternate muzzle position + BurstDelay: 55 Report: CHAINGN1.AUD Projectile: Bullet Speed: 1c682 Warhead: Spread: 128 Versus: - Wood: 25% - Light: 30% - Heavy: 10% + Wood: 60% + Light: 40% + Heavy: 25% Concrete: 10% Explosion: piffpiff InfDeath: 1 @@ -476,32 +545,36 @@ FireballLauncher: Range: 4c256 Report: FLAMTNK1.AUD Projectile: Bullet - Speed: 341 - Burst: 2 - BurstDelay: 25 + Speed: 64 + Image: FLAMEALL + Inacuracy: 384 + Burst: 5 + BurstDelay: 5 Warhead: Spread: 341 Versus: - None: 100% - Wood: 100% - Light: 50% - Heavy: 25% - Concrete: 20% + None: 600% + Wood: 148% + Light: 59% + Heavy: 6% + Concrete: 2% InfDeath: 5 - Damage: 90 + Damage: 25 SonicZap: ROF: 120 Range: 6c0 - Burst: 2 - BurstDelay: 10 Charges: yes Report: SONIC4.AUD Projectile: LaserZap Color: 200,0,255,255 - BeamWidth: 10 + BeamWidth: 12 + BeamDuration: 50 Warhead: Spread: 42 + Versus: + Heavy: 80% + Concrete: 60% InfDeath: 5 Damage: 100 @@ -524,10 +597,11 @@ Dragon: Warhead: Spread: 128 Versus: - None: 10% - Wood: 75% - Light: 35% - Concrete: 20% + None: 25% + Wood: 65% + Light: 75% + Heavy: 100% + Concrete: 60% InfDeath: 2 Damage: 30 Explosion: small_clsn @@ -546,11 +620,11 @@ Dragon: Warhead: Spread: 128 Versus: - None: 30% - Wood: 75% - Light: 100% + None: 25% + Wood: 65% + Light: 75% Heavy: 100% - Concrete: 100% + Concrete: 60% InfDeath: 2 Damage: 36 Explosion: medium_clsn @@ -668,9 +742,9 @@ HarpyClaw: Warhead: Spread: 128 Versus: - Wood: 25% - Light: 30% - Heavy: 10% + Wood: 60% + Light: 40% + Heavy: 25% Concrete: 10% Explosion: piffpiff InfDeath: 1 @@ -685,10 +759,10 @@ Pistola: Warhead: Spread: 128 Versus: - Wood: 50% - Light: 60% + Wood: 60% + Light: 40% Heavy: 25% - Concrete: 25% + Concrete: 10% Explosion: piff InfDeath: 1 Damage: 2 @@ -701,3 +775,105 @@ Tiberium: Damage: 2 PreventProne: yes +IonCannon: + ValidTargets: Ground, Air + Warhead@impact: + Damage: 1000 + Spread: 1c0 + InfDeath: 5 + Explosion: ring1 + Warhead@area: + DamageModel: PerCell + Damage: 250 + SmudgeType: Scorch + Size: 2,1 + Delay: 3 + InfDeath: 5 + +VulcanTower: + ROF: 26 + Range: 6c0 + Report: CHAINGN1.AUD + Projectile: Bullet + Speed: 1c682 + Warhead: + Spread: 128 + Versus: + Wood: 60% + Light: 40% + Heavy: 25% + Concrete: 10% + Explosion: piffpiff + InfDeath: 1 + Damage: 18 + +RPGTower: + ROF: 80 + Range: 8c0 + Report: GLNCH4.AUD + Palette: player + Projectile: Bullet + Speed: 384 + Image: canister + Shadow: yes + Angle: 62 + Warhead: + Spread: 128 + Versus: + None: 30% + Wood: 75% + Light: 90% + Heavy: 100% + Concrete: 70% + InfDeath: 2 + Damage: 110 + Explosion: large_clsn + ImpactSound: expnew14.aud + +SAMTower: + ROF: 55 + Range: 15c0 + Report: SAMSHOT1.AUD + ValidTargets: Air + Palette: ra + Projectile: Missile + Speed: 298 + Arm: 2 + High: yes + Shadow: yes + Inaccuracy: 128 + Image: DRAGON + ROT: 5 + RangeLimit: 60 + Warhead: + Spread: 128 + InfDeath: 2 + Damage: 33 + Explosion: small_clsn + ImpactSound: expnew12.aud + +ObeliskLaser: + ROF: 120 + Range: 10c512 + Charges: true + Report: OBELRAY1.AUD + Projectile: LaserZap + BeamWidth: 4 + Warhead: + Spread: 42 + InfDeath: 5 + SmudgeType: Scorch + Damage: 250 + +TurretLaser: + ROF: 40 + Range: 5c512 + Report: LASTUR1.AUD + Projectile: LaserZap + BeamWidth: 2 + BeamDuration: 5 + Warhead: + Spread: 42 + InfDeath: 5 + SmudgeType: Scorch + Damage: 30