diff --git a/mods/ts/bits/infdie.shp b/mods/ts/bits/infdie.shp new file mode 100644 index 0000000000..803158b318 Binary files /dev/null and b/mods/ts/bits/infdie.shp differ diff --git a/mods/ts/bits/infexpl.shp b/mods/ts/bits/infexpl.shp new file mode 100644 index 0000000000..bdc531b881 Binary files /dev/null and b/mods/ts/bits/infexpl.shp differ diff --git a/mods/ts/notifications.yaml b/mods/ts/notifications.yaml index f6e5c00a4e..02c05ecbc8 100644 --- a/mods/ts/notifications.yaml +++ b/mods/ts/notifications.yaml @@ -27,7 +27,7 @@ Speech: Sounds: Notifications: - RadarUp: + RadarUp:commup1 RadarDown:radardn1 CashTickUp: credup1 CashTickDown: creddwn1 @@ -35,8 +35,8 @@ Sounds: DisablePower: EnablePower: ChatLine:message1 - BuildPaletteOpen: - BuildPaletteClose: + BuildPaletteOpen:emblem + BuildPaletteClose:emblem TabClick: ClickSound:clicky1 ClickDisabledSound:wrong1 diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index c44f884fb3..5b6eeb68ed 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -8,12 +8,13 @@ Building: Dimensions: 1,1 Footprint: x + BuildSounds: place2.aud TerrainTypes: Clear,Road GivesBuildableArea: Capturable: SoundOnDamageTransition: - DamagedSound: - DestroyedSound: + DamagedSound: expnew01.aud + DestroyedSound: crmble2.aud RenderBuilding: WithBuildingExplosion: RepairableBuilding: @@ -38,6 +39,44 @@ LuaScriptEvents: Demolishable: +^Wall: + AppearsOnRadar: + Building: + Dimensions: 1,1 + Footprint: x + BuildSounds: place2.aud + Adjacent: 7 + TerrainTypes: Clear,Road + SoundOnDamageTransition: + DamagedSound: expnew01.aud + DestroyedSound: crmble2.aud + Wall: + CrushClasses: wall + LineBuild: + Range: 8 + NodeTypes: wall + LineBuildNode: + Types: wall + SelectionDecorations: + Selectable: + Priority: 1 + TargetableBuilding: + TargetTypes: Ground, C4 + RenderBuildingWall: + HasMakeAnimation: no + GivesExperience: + EditorAppearance: + RelativeToTopLeft: yes + UseTerrainPalette: yes + AutoTargetIgnore: + ProximityCaptor: + Types: Wall + Sellable: + UpdatesPlayerStatistics: + BodyOrientation: + LuaScriptEvents: + Demolishable: + ^Infantry: AppearsOnRadar: Health: @@ -147,41 +186,6 @@ Huntable: LuaScriptEvents: -^Wall: - AppearsOnRadar: - Building: - Dimensions: 1,1 - Footprint: x - BuildSounds: placbldg.aud - Adjacent: 7 - TerrainTypes: Clear,Road - Wall: - CrushClasses: wall - LineBuild: - Range: 8 - NodeTypes: wall - LineBuildNode: - Types: wall - SelectionDecorations: - Selectable: - Priority: 1 - TargetableBuilding: - TargetTypes: Ground, C4 - RenderBuildingWall: - HasMakeAnimation: no - GivesExperience: - EditorAppearance: - RelativeToTopLeft: yes - UseTerrainPalette: yes - AutoTargetIgnore: - ProximityCaptor: - Types: Wall - Sellable: - UpdatesPlayerStatistics: - BodyOrientation: - LuaScriptEvents: - Demolishable: - ^Helicopter: AppearsOnRadar: UseLocation: yes diff --git a/mods/ts/rules/infantry.yaml b/mods/ts/rules/infantry.yaml index 4534c32185..b4a4fc0478 100644 --- a/mods/ts/rules/infantry.yaml +++ b/mods/ts/rules/infantry.yaml @@ -298,7 +298,7 @@ CHAMSPY: CYBORG: Inherits: ^Infantry Armor: - Type: Heavy + Type: Light Valued: Cost: 650 Tooltip: diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index a5c59a8fde..68b2484bee 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -3,6 +3,7 @@ GACNST: Building: Power: 0 Footprint: xxx xxx xxx + BuildSounds: facbld1.aud Dimensions: 3,3 Buildable: Queue: Building @@ -79,6 +80,8 @@ GAPILE: Tooltip: Name: GDI Barracks Description: Produces infantry + ProvidesCustomPrerequisite: + Prerequisite: barracks Building: Power: -20 Footprint: xx xx @@ -111,6 +114,8 @@ GAWEAP: Tooltip: Name: GDI War Factory Description: Assembly point for\nvehicle reinforcements + ProvidesCustomPrerequisite: + Prerequisite: factory Buildable: Queue: Building BuildPaletteOrder: 50 @@ -133,6 +138,12 @@ GAWEAP: Production: Produces: Vehicle ProductionBar: + WithIdleOverlay@LIGHTS1: + Sequence: idle-lights1 + WithIdleOverlay@LIGHTS2: + Sequence: idle-lights2 + WithIdleOverlay@TURBINES: + Sequence: idle-turbines NAPOWR: Inherits: ^Building @@ -174,6 +185,8 @@ NAHAND: Tooltip: Name: Hand of Nod Description: Produces infantry + ProvidesCustomPrerequisite: + Prerequisite: barracks Building: Power: -20 Footprint: xxx xxx @@ -204,6 +217,8 @@ NAWEAP: Tooltip: Name: Nod War Factory Description: Assembly point for\nvehicle reinforcements + ProvidesCustomPrerequisite: + Prerequisite: factory Buildable: Queue: Building BuildPaletteOrder: 50 @@ -226,6 +241,8 @@ NAWEAP: Production: Produces: Vehicle ProductionBar: + WithIdleOverlay@LIGHTS: + Sequence: idle-lights GASAND: Inherits: ^Wall @@ -250,6 +267,52 @@ GASAND: Armor: Type: Light +GAWALL: + Inherits: ^Wall + Buildable: + Queue: Defense + BuildPaletteOrder: 1001 + Prerequisites: gacnst + Owner: gdi + Hotkey: b + SoundOnDamageTransition: + DamagedSound: + DestroyedSound: + Valued: + Cost: 50 + CustomSellValue: + Value: 0 + Tooltip: + Name: Concrete Wall + Description: Stops infantry and blocks enemy fire.\nCan NOT be crushed by tanks. + Health: + HP: 300 + Armor: + Type: Concrete + +NAWALL: + Inherits: ^Wall + Buildable: + Queue: Defense + BuildPaletteOrder: 1001 + Prerequisites: gacnst + Owner: nod + Hotkey: b + SoundOnDamageTransition: + DamagedSound: + DestroyedSound: + Valued: + Cost: 50 + CustomSellValue: + Value: 0 + Tooltip: + Name: Concrete Wall + Description: Stops infantry and blocks enemy fire.\nCan NOT be crushed by tanks. + Health: + HP: 300 + Armor: + Type: Concrete + GATICK: Inherits: ^Building Valued: @@ -405,6 +468,132 @@ GASPOT: WithIdleOverlay@LIGHTS: Sequence: idle-lights +GARADR: + Inherits: ^Building + Buildable: + Queue: Building + BuildPaletteOrder: 90 + Owner: gdi + Prerequisites: anypower, factory + Valued: + Cost: 1000 + Tooltip: + Name: GDI Radar + Description: Provides radar screen + ProvidesCustomPrerequisite: + Prerequisite: radar + Building: + Power: -50 + Footprint: ___ xxx xxx + Dimensions: 3,3 + Health: + HP: 800 + Armor: + Type: Wood + RequiresPower: + CanPowerDown: + ProvidesRadar: + Infiltratable: + Type: Exploration + InfiltrateForExploration: + DetectCloaked: + Range: 10 + RenderDetectionCircle: + RevealsShroud: + Range: 10c0 + WithIdleOverlay@DISH: + Sequence: idle-dish + +NARADR: + Inherits: ^Building + Buildable: + Queue: Building + BuildPaletteOrder: 90 + Owner: nod + Prerequisites: anypower, factory + Valued: + Cost: 1000 + Tooltip: + Name: Nod Radar + Description: Provides radar screen + ProvidesCustomPrerequisite: + Prerequisite: radar + Building: + Power: -50 + Footprint: xx xx + Dimensions: 2,2 + Health: + HP: 800 + Armor: + Type: Wood + RequiresPower: + CanPowerDown: + ProvidesRadar: + Infiltratable: + Type: Exploration + InfiltrateForExploration: + DetectCloaked: + Range: 10 + RenderDetectionCircle: + RevealsShroud: + Range: 10c0 + WithIdleOverlay@DISH: + Sequence: idle-dish + +GATECH: + Inherits: ^Building + Buildable: + Queue: Building + BuildPaletteOrder: 100 + Owner: gdi + Prerequisites: garadr + Valued: + Cost: 2000 + Tooltip: + Name: GDI Tech Center + Description: Required for high-\ntech research + ProvidesCustomPrerequisite: + Prerequisite: tech + Building: + Power: -150 + Footprint: xxx xxx xxx + Dimensions: 3,3 + Health: + HP: 500 + Armor: + Type: Wood + RevealsShroud: + Range: 4c0 + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + +NATECH: + Inherits: ^Building + Buildable: + Queue: Building + BuildPaletteOrder: 100 + Owner: nod + Prerequisites: naradr + Valued: + Cost: 2000 + Tooltip: + Name: Nod Tech Center + Description: Required for high-\ntech research + ProvidesCustomPrerequisite: + Prerequisite: tech + Building: + Power: -150 + Footprint: xx xx + Dimensions: 2,2 + Health: + HP: 500 + Armor: + Type: Wood + RevealsShroud: + Range: 4c0 + WithIdleOverlay@LIGHTS: + Sequence: idle-lights + GAHPAD: Inherits: ^Building Valued: @@ -479,3 +668,17 @@ BARRACKS: Name: Infantry Production Description: Infantry Production +FACTORY: + Tooltip: + Name: Vehicle Production + Description: Vehicle Production + +RADAR: + Tooltip: + Name: Radar + Description: Radar + +TECH: + Tooltip: + Name: Tech Center + Description: Tech Center diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index 5772a5694d..9779e8e200 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -28,7 +28,7 @@ MCV: IntoActor: gacnst Offset: -1,-1 Facing: 96 - TransformSounds: + TransformSounds: facbld1.aud NoTransformSounds: RenderSprites: RenderVoxels: @@ -104,7 +104,7 @@ HVR: Description: Hover Multi-Launch Rocket System Buildable: Queue: Vehicle - BuildPaletteOrder: 30 + BuildPaletteOrder: 50 Owner: gdi Mobile: Speed: 99 @@ -468,7 +468,7 @@ MMCH: Name: Medium Mech Buildable: Queue: Vehicle - BuildPaletteOrder: 300 + BuildPaletteOrder: 30 Owner: gdi Mobile: ROT: 5 @@ -501,7 +501,7 @@ HMEC: Name: Mammoth Mk. II Buildable: Queue: Vehicle - BuildPaletteOrder: 40 + BuildPaletteOrder: 80 Owner: gdi Mobile: ROT: 3 @@ -674,7 +674,7 @@ SONIC: Name: Disruptor Buildable: Queue: Vehicle - BuildPaletteOrder: 40 + BuildPaletteOrder: 70 Owner: gdi Mobile: ROT: 4 diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml index 00ad1d6548..3d532aaf0d 100644 --- a/mods/ts/sequences/infantry.yaml +++ b/mods/ts/sequences/infantry.yaml @@ -11,33 +11,37 @@ e1: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 ShadowStart: 441 + die3: infdie + Start: 0 + Length: * shoot: Start: 164 Length: 6 @@ -76,33 +80,37 @@ e2: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 ShadowStart: 441 + die3: infdie + Start: 0 + Length: * shoot: Start: 164 Length: 6 @@ -141,33 +149,37 @@ e3: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 ShadowStart: 441 + die3: infdie + Start: 0 + Length: * shoot: Start: 164 Length: 6 @@ -218,15 +230,16 @@ weedguy: Facings: 8 prone-run: weed Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 288 prone-stand: weed - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 346 + Stride: 6 + ShadowStart: 288 die1: weed Start: 160 Length: 6 @@ -257,34 +270,47 @@ medic: stand: Start: 0 Facings: 8 + ShadowStart: 307 run: Start: 8 Length: 6 Facings: 8 Tick: 100 + ShadowStart: 315 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 + ShadowStart: 363 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 + ShadowStart: 378 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 + ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 + ShadowStart: 441 die2: + Start: 149 + Length: 15 + ShadowStart: 455 + die3: # TODO: copy-paste of die2 Start: 149 Length: 14 + ShadowStart: 455 shoot: Start: 164 Length: 6 @@ -297,9 +323,11 @@ medic: Start: 260 Length: 2 Facings: 8 + ShadowStart: 567 heal: Start: 292 Length: 14 + ShadowStart: 599 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 @@ -313,41 +341,56 @@ engineer: stand: Start: 0 Facings: 8 + ShadowStart: 292 run: Start: 8 Length: 6 Facings: 8 Tick: 100 + ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 + ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 + ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 + ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 + ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 + ShadowStart: 441 standup-0: Start: 260 Length: 2 Facings: 8 + ShadowStart: 552 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 + ShadowStart: 190 die6: electro Start: 0 Length: * @@ -367,32 +410,37 @@ umagon: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -432,32 +480,37 @@ ghost: # TODO unused GUNFIRE.SHP ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -488,46 +541,60 @@ jumpjet: # TODO: ShadowStart: stand: Start: 0 Facings: 8 + ShadowStart: 451 run: Start: 8 Length: 6 Facings: 8 Tick: 100 + ShadowStart: 459 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 + ShadowStart: 507 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 + ShadowStart: 523 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 + ShadowStart: 538 prone-stand: - Start: 144 - Length: 4 + Start: 0 Facings: 8 - die1: + ShadowStart: 451 + die1: Start: 134 - Length: 14 + Length: 15 + ShadowStart: 585 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 600 + die3: + Start: 436 + Length: 15 + ShadowStart: 887 shoot: Start: 164 Length: 6 Facings: 8 + ShadowStart: 615 prone-shoot: Start: 212 Length: 6 Facings: 8 + ShadowStart: 663 standup-0: Start: 260 Length: 2 Facings: 8 + ShadowStart: 711 die5: flameguy # TODO: walking animation unused Start: 42 Length: 104 @@ -551,32 +618,37 @@ mhijack: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -616,32 +688,37 @@ chamspy: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -681,12 +758,12 @@ cyc2: ShadowStart: 316 idle1: Start: 80 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 388 idle2: Start: 95 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 413 prone-run: @@ -695,19 +772,23 @@ cyc2: Facings: 8 Tick: 100 ShadowStart: 418 - prone-stand: # TODO: N/A? - Start: 144 - Length: 4 + prone-stand: + Start: 110 + Length: 1 Facings: 8 - ShadowStart: 452 + Stride: 8 + ShadowStart: 418 die1: Start: 182 - Length: 14 + Length: 15 ShadowStart: 490 die2: Start: 197 - Length: 14 + Length: 15 ShadowStart: 505 + die3: infexpl + Start: 0 + Length: * shoot: Start: 212 Length: 6 @@ -746,53 +827,64 @@ cyborg: ShadowStart: 378 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 + ShadowStart: 426 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 + ShadowStart: 441 prone-run: Start: 86 Length: 6 Facings: 8 Tick: 100 + ShadowStart: 456 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 + Stride: 6 + ShadowStart: 456 die1: Start: 134 - Length: 14 + Length: 15 + ShadowStart: 504 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 519 shoot: Start: 164 Length: 6 Facings: 8 + ShadowStart: 534 prone-shoot: Start: 212 Length: 6 Facings: 8 + ShadowStart: 582 standup-0: # TODO: N/A as they don't do that Start: 260 Length: 2 Facings: 8 + ShadowStart: 630 die5: # TODO: unused running frame 322 and following Start: 292 Length: 14 - ShadowStart: 560 + ShadowStart: 662 die3: Start: 307 Length: 14 + ShadowStart: 677 die6: electro Start: 0 Length: * icon: cybiicon Start: 0 -mutant: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW +mutant: stand: Start: 0 Facings: 8 @@ -805,32 +897,37 @@ mutant: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-N ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -857,7 +954,7 @@ mutant: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-N icon: mutcicon Start: 0 -mwmn: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW +mwmn: stand: Start: 0 Facings: 8 @@ -870,32 +967,37 @@ mwmn: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN-NW ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -935,32 +1037,37 @@ mutant3: # TODO unused MGUN-N,MGUN-NE,MGUN-E,MGUN-SE,MGUN-S,MGUN-SW,MGUN-W,MGUN- ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -1000,32 +1107,37 @@ tratos: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -1065,32 +1177,37 @@ oxanna: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -1130,32 +1247,37 @@ slav: ShadowStart: 300 idle1: Start: 56 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 348 idle2: Start: 71 - Length: 14 + Length: 15 Tick: 120 ShadowStart: 363 prone-run: Start: 86 - Length: 4 + Length: 6 Facings: 8 Tick: 100 ShadowStart: 378 prone-stand: - Start: 144 - Length: 4 + Start: 86 + Length: 1 Facings: 8 - ShadowStart: 436 + Stride: 6 + ShadowStart: 378 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 + ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 ShadowStart: 441 shoot: Start: 164 @@ -1195,24 +1317,28 @@ doggie: # TODO: not sure what frame 88 and following is ShadowStart: 127 die1: Start: 99 - Length: 9 + Length: 10 ShadowStart: 218 die2: Start: 99 - Length: 9 + Length: 10 ShadowStart: 218 - shoot: # TODO: partly wrong + die3: + Start: 99 + Length: 10 + ShadowStart: 218 + shoot: Start: 56 - Length: 6 + Length: 4 Facings: 8 ShadowStart: 175 die5: Start: 109 - Length: 9 + Length: 10 ShadowStart: 228 die6: Start: 109 - Length: 9 + Length: 10 ShadowStart: 228 icon: xxicon Start: 0 @@ -1259,18 +1385,26 @@ civ1: Facings: 8 ShadowStart: 378 shoot: - Start: 165 + Start: 164 Length: 6 Facings: 8 ShadowStart: 457 die1: Start: 134 - Length: 14 + Length: 15 ShadowStart: 426 die2: Start: 149 - Length: 14 + Length: 15 ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 15 + ShadowStart: 441 + die5: flameguy # TODO: walking animation unused + Start: 42 + Length: 104 + ShadowStart: 190 die6: electro Start: 0 Length: * @@ -1310,6 +1444,14 @@ civ2: Start: 149 Length: 14 ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 14 + ShadowStart: 441 + die5: flameguy # TODO: walking animation unused + Start: 42 + Length: 104 + ShadowStart: 190 die6: electro Start: 0 Length: * @@ -1349,6 +1491,14 @@ civ3: Start: 149 Length: 14 ShadowStart: 441 + die3: # TODO: copy-paste of die2 + Start: 149 + Length: 14 + ShadowStart: 441 + die5: flameguy # TODO: walking animation unused + Start: 42 + Length: 104 + ShadowStart: 190 die6: electro Start: 0 Length: * diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index ea73ec208e..ede205e187 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -139,6 +139,36 @@ gaweap: dead: gtweap Start: 2 ShadowStart: 5 + idle-lights1: gtweap_a + Start: 0 + Length: 8 + Tick: 100 + ZOffset: 2048 + damaged-idle-lights1: gtweap_a + Start: 8 + Length: 8 + Tick: 100 + ZOffset: 2048 + idle-lights2: gtweap_b + Start: 0 + Length: 4 + Tick: 120 + ZOffset: 2048 + damaged-idle-lights2: gtweap_b + Start: 4 + Length: 4 + Tick: 120 + ZOffset: 2048 + idle-turbines: gtweap_c + Start: 0 + Length: 4 + Tick: 80 + ZOffset: 2048 + damaged-idle-turbines: gtweap_c + Start: 0 + Length: 4 + Tick: 80 + ZOffset: 2048 build-top: gtweap_d Start: 0 Length: 9 @@ -232,6 +262,16 @@ naweap: dead: ntweap Start: 2 ShadowStart: 5 + idle-lights: ntweap_a + Start: 0 + Length: 16 + Tick: 100 + ZOffset: 2048 + damaged-idle-lights: ntweap_a + Start: 16 + Length: 16 + Tick: 100 + ZOffset: 2048 build-top: ntweap_b Start: 0 Length: 10 @@ -251,7 +291,115 @@ naweap: ShadowStart: 22 icon: nwepicon Start: 0 -# TODO: ntweap_1 & ntweapbb & ntweap_a & ntweap_b & ntweap_c are unused +# TODO: ntweap_1 & ntweapbb & ntweap_b & ntweap_c are unused + +naradr: + idle: ntradr + Start: 0 + ShadowStart: 3 + damaged-idle: ntradr + Start: 1 + ShadowStart: 4 + critical-idle: ntradr + Start: 2 + ShadowStart: 5 + idle-dish: ntradr_a + Start: 0 + Length: 24 + Tick: 120 + damaged-idle-dish: ntradr_a + Start: 24 + Length: 24 + Tick: 120 + make: ntradrmk + Start: 0 + Length: 20 + ShadowStart: 20 + icon: nradicon + Start: 0 + +natech: + idle: nttech + Start: 0 + ShadowStart: 3 + damaged-idle: nttech + Start: 1 + ShadowStart: 4 + critical-idle: nttech + Start: 2 + ShadowStart: 5 + idle-lights: nttech_a + Start: 0 + Length: 9 + Tick: 120 + damaged-idle-lights: nttech_a + Start: 0 + Length: 9 + Tick: 120 + critical-idle-lights: nttech_a + Start: 0 + Length: 9 + Tick: 120 + make: nttechmk + Start: 0 + Length: 18 + ShadowStart: 18 + icon: ntchicon + Start: 0 + +garadr: + idle: gtradr + Start: 0 + ShadowStart: 3 + 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 + make: gtradrmk + Start: 0 + Length: 20 + ShadowStart: 20 + icon: radricon + Start: 0 + +gatech: + idle: gttech + Start: 0 + ShadowStart: 3 + damaged-idle: gttech + Start: 1 + ShadowStart: 4 + critical-idle: gttech + Start: 2 + ShadowStart: 5 + idle-lights: gttech_a + Start: 0 + Length: 8 + Tick: 200 + damaged-idle-lights: gttech_a + Start: 8 + Length: 8 + Tick: 240 + critical-idle-lights: gttech_a + Start: 8 + Length: 8 + Tick: 240 + make: gttechmk + Start: 0 + Length: 20 + ShadowStart: 20 + icon: techicon + Start: 0 gasand: # TODO frame order (horizontal seems busted) idle: gtsand @@ -265,6 +413,38 @@ gasand: # TODO frame order (horizontal seems busted) icon: sbagicon Start: 0 +gawall: # TODO frame order (horizontal seems busted) + idle: gtwall + Start: 0 + Length: 16 + ShadowStart: 48 + damaged-idle: gtwall + Start: 16 + Length: 16 + ShadowStart: 64 + critical-idle: gtwall + Start: 32 + Length: 16 + ShadowStart: 80 + icon: wallicon + Start: 0 + +nawall: # TODO frame order (horizontal seems busted) + idle: ntwall + Start: 0 + Length: 16 + ShadowStart: 48 + damaged-idle: ntwall + Start: 16 + Length: 16 + ShadowStart: 64 + critical-idle: ntwall + Start: 32 + Length: 16 + ShadowStart: 80 + icon: nwalicon + Start: 0 + gatick: idle: Start: 0 diff --git a/mods/ts/voices.yaml b/mods/ts/voices.yaml index 03118156c5..4ee23d50f6 100644 --- a/mods/ts/voices.yaml +++ b/mods/ts/voices.yaml @@ -78,14 +78,14 @@ Cyborg: Select: 22-I000, 22-I002, 22-I006 Move: 22-I008, 22-I010, 22-I014, 22-I016, 22-I020 Attack: 22-I008, 22-I010, 22-I012, 22-I018 - Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6 + Die: 22-N104, 22-N106, 22-N108 CyborgCommando: Voices: Select: 23-I000, 23-I002, 23-I004, 23-I006 Move: 23-I008, 23-I010, 23-I012, 23-I016 Attack: 23-I014, 23-I018, 23-I020, 23-I022 - Die: DEDMAN1, DEDMAN2, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6 + Die: 22-N104, 22-N106, 22-N108 Mutant: Voices: diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index a1710e6213..8b45223884 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -12,7 +12,7 @@ Minigun: Heavy: 10% Concrete: 10% Explosion: piffpiff - InfDeath: 2 + InfDeath: 1 Damage: 15 Grenade: @@ -32,7 +32,7 @@ Grenade: Wood: 100% Light: 25% Heavy: 5% - InfDeath: 2 + InfDeath: 3 Damage: 40 Explosion: large_grey_explosion ImpactSound: expnew13.aud @@ -84,7 +84,7 @@ MultiCluster: Wood: 75% Light: 35% Concrete: 20% - InfDeath: 2 + InfDeath: 3 Damage: 65 Explosion: large_explosion ImpactSound: expnew09.aud @@ -119,7 +119,7 @@ Sniper: Wood: 5% Light: 5% Heavy: 5% - InfDeath: 2 + InfDeath: 1 M1Carbine: ROF: 20 @@ -135,7 +135,7 @@ M1Carbine: Light: 30% Heavy: 10% Explosion: piffpiff - InfDeath: 2 + InfDeath: 1 Damage: 15 LtRail: @@ -169,7 +169,7 @@ Vulcan3: Heavy: 10% Concrete: 10% Explosion: piffpiff - InfDeath: 2 + InfDeath: 1 Damage: 10 Vulcan2: @@ -204,7 +204,7 @@ Vulcan: Heavy: 10% Concrete: 10% Explosion: piffpiff - InfDeath: 2 + InfDeath: 1 Damage: 20 FiendShard: @@ -223,7 +223,7 @@ FiendShard: Light: 30% Heavy: 10% Concrete: 10% - InfDeath: 2 + InfDeath: 1 Damage: 35 JumpCannon: @@ -240,7 +240,7 @@ JumpCannon: Heavy: 10% Concrete: 10% Explosion: piffpiff - InfDeath: 2 + InfDeath: 1 Damage: 15 HoverMissile: @@ -316,7 +316,7 @@ MammothTusk: Wood: 75% Light: 75% Heavy: 50% - InfDeath: 2 + InfDeath: 3 Damage: 40 Explosion: medium_bang ImpactSound: expnew12.aud @@ -383,7 +383,7 @@ SuicideBomb: Light: 100% Heavy: 100% Concrete: 100% - InfDeath: 3 + InfDeath: 2 Damage: 70 Explosion: large_clsn ImpactSound: expnew14.aud @@ -417,7 +417,7 @@ AssaultCannon: Heavy: 40% Concrete: 10% Explosion: piffpiff - InfDeath: 2 + InfDeath: 1 Damage: 40 BikeMissile: @@ -462,7 +462,7 @@ RaiderCannon: Heavy: 10% Concrete: 10% Explosion: piffpiff - InfDeath: 2 + InfDeath: 1 Damage: 40 FireballLauncher: @@ -566,7 +566,7 @@ Dragon: Light: 68% Heavy: 35% Concrete: 35% - InfDeath: 2 + InfDeath: 3 Damage: 150 Explosion: large_explosion ImpactSound: expnew09.aud @@ -594,7 +594,7 @@ Hellfire: Light: 150% Heavy: 100% Concrete: 30% - InfDeath: 3 + InfDeath: 2 Damage: 30 Explosion: small_bang ImpactSound: expnew12.aud @@ -614,7 +614,7 @@ Bomb: Light: 75% Heavy: 32% Concrete: 100% - InfDeath: 2 + InfDeath: 3 Damage: 160 Explosion: large_explosion ImpactSound: expnew09.aud @@ -662,7 +662,7 @@ HarpyClaw: Heavy: 10% Concrete: 10% Explosion: piffpiff - InfDeath: 2 + InfDeath: 1 Damage: 60 Pistola: @@ -679,6 +679,6 @@ Pistola: Heavy: 25% Concrete: 25% Explosion: piff - InfDeath: 2 + InfDeath: 1 Damage: 2