diff --git a/mods/ts/bits/lrotor.shp b/mods/ts/bits/lrotor.shp new file mode 100644 index 0000000000..8f56fce28e Binary files /dev/null and b/mods/ts/bits/lrotor.shp differ diff --git a/mods/ts/cursors.yaml b/mods/ts/cursors.yaml index 002451071e..64de700e9a 100644 --- a/mods/ts/cursors.yaml +++ b/mods/ts/cursors.yaml @@ -4,37 +4,37 @@ Cursors: mouse: cursor scroll-t: #TODO - start:1 - scroll-tr: #TODO start: 2 - scroll-r: #TODO + scroll-tr: #TODO start: 3 - scroll-br: #TODO + scroll-r: #TODO start: 4 + scroll-br: #TODO + start: 5 scroll-b: #TODO - start:5 + start: 6 scroll-bl: #TODO - start:6 + start: 7 scroll-l: #TODO - start:7 + start: 8 scroll-tl: #TODO - start:8 + start: 9 scroll-t-blocked: #TODO - start:124 + start: 10 scroll-tr-blocked: #TODO - start:125 + start: 11 scroll-r-blocked: #TODO - start:126 + start: 12 scroll-br-blocked: #TODO - start:127 + start: 13 scroll-b-blocked: #TODO - start:128 + start: 14 scroll-bl-blocked: #TODO - start:129 + start: 15 scroll-l-blocked: #TODO - start:130 + start: 16 scroll-tl-blocked:#TODO - start:131 + start: 17 select: start:18 length: 12 @@ -64,23 +64,23 @@ Cursors: move-blocked-minimap: start:52 attack: - start: 31 - length: 10 + start: 53 + length: 5 attack-blocked: # TODO: unused - start: 32 + start: 41 length: 1 attack-minimap: - start: 42 - length: 10 + start: 63 + length: 5 attackmove: #TODO - start:21 - length: 8 + start: 58 + length: 5 attackmove-minimap: #TODO - start:134 - length: 8 + start:68 + length: 5 harvest: #TODO - start:21 - length: 8 + start:53 + length: 5 harvest-minimap: #TODO start:134 length: 8 diff --git a/mods/ts/music.yaml b/mods/ts/music.yaml index 4888504901..e12b51ffdb 100644 --- a/mods/ts/music.yaml +++ b/mods/ts/music.yaml @@ -27,5 +27,8 @@ hacker: Hacker infiltra: Infiltration kmachine: Killing Machine linkup: Link Up -rainnite: Rain in the Night -salvesys: Slave To The System \ No newline at end of file +rainnite: Rain in the Night 2 +slavesys: Slave To The System +#Bonus tracks +stomp: Stomp +initiate: Initiate \ No newline at end of file diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index df6145fe5a..664c87dab4 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -261,6 +261,8 @@ APACHE: Ammo: 12 PipCount: 4 AutoTarget: + WithRotor: + Offset: 85,0,384 RenderSprites: RenderVoxels: WithVoxelBody: \ No newline at end of file diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index ca41fcc45e..2864a420e8 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -175,6 +175,7 @@ HVR: RenderVoxels: WithVoxelBody: WithVoxelTurret: + WithVoxelBarrel: TRUCKB: # NOTE: TRUCKA is unloaded Inherits: ^Vehicle diff --git a/mods/ts/sequences/aircraft.yaml b/mods/ts/sequences/aircraft.yaml index 70cca669a7..65b01f7e9f 100644 --- a/mods/ts/sequences/aircraft.yaml +++ b/mods/ts/sequences/aircraft.yaml @@ -28,4 +28,10 @@ scrin: apache: icon: apchicon - Start: 0 \ No newline at end of file + Start: 0 + rotor: lrotor + Start: 0 + Length: 4 + slow-rotor: lrotor + Start: 4 + Length: 8 \ No newline at end of file diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 1039ab8689..9ada21fa73 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -52,38 +52,166 @@ clock: Start: 0 Length: * -pips: - medic: - Start: 6 - tag-primary: - Start: 8 - pip-empty: - Start: 1 # TODO: - pip-green: +# needs palette.pal +pips: + medic: + Start: 6 + tag-primary: + Start: 8 + pip-empty: pips2 + Start: 0 + pip-green: pips2 + Start: 1 + pip-yellow: pips2 Start: 2 - pip-yellow: - Start: 2 - pip-gray: - Start: 2 - pip-red: - Start: 2 - pip-blue: + pip-gray: pips2 + Start: 3 + pip-red: pips2 + Start: 4 + pip-blue: pips2 + Start: 5 + pip-ammo: pips2 + Start: 6 +# TODO: + pip-empty-building: + Start: 0 + pip-green-building: + Start: 1 + pip-yellow-building: Start: 2 + pip-gray-building: + Start: 3 + pip-red-building: + Start: 4 + pip-blue-building: + Start: 5 explosion: + building: twlt070 + Start: 0 + Length: * + ionring: ring1 + Start: 0 + Length: * + Tick: 160 + pulse_explosion: pulsefx2 + Start: 0 + Length: * + Tick: 160 + BlendMode: Additive + small_watersplash: h2o_exp2 + Start: 0 + Length: * + large_watersplash: h2o_exp1 + Start: 0 + Length: * piff: piff Start: 0 Length: * piffpiff: piffpiff Start: 0 Length: * + small_explosion: explosml + Start: 0 + Length: * + medium_explosion: explomed + Start: 0 + Length: * + large_explosion: explolrg + Start: 0 + Length: * + tiny_bang: s_bang16 + Start: 0 + Length: * + small_bang: s_bang24 + Start: 0 + Length: * + medium_bang: s_bang34 + Start: 0 + Length: * + large_bang: s_bang48 + Start: 0 + Length: * + tiny_brnl: s_brnl20 + Start: 0 + Length: * + small_brnl: s_brnl30 + Start: 0 + Length: * + medium_brnl: s_brnl40 + Start: 0 + Length: * + large_brnl: s_brnl58 + Start: 0 + Length: * + tiny_tumu: s_tumu22 + Start: 0 + Length: * + small_tumu: s_tumu30 + Start: 0 + Length: * + medium_tumu: s_tumu42 + Start: 0 + Length: * + large_tumu: s_tumu60 + Start: 0 + Length: * + tiny_clsn: s_clsn16 + Start: 0 + Length: * + small_clsn: s_clsn22 + Start: 0 + Length: * + medium_clsn: s_clsn30 + Start: 0 + Length: * + large_clsn: s_clsn42 + Start: 0 + Length: * + verylarge_clsn: s_clsn58 + Start: 0 + Length: * + tiny_twlt: twlt026 + Start: 0 + Length: * + small_twlt: twlt036 + Start: 0 + Length: * + medium_twlt: twlt050 + Start: 0 + Length: * + large_twlt: twlt070 + Start: 0 + Length: * + verylarge_twlt: twlt100 + Start: 0 + Length: * + tiny_grey_explosion: xgrysml1 + Start: 0 + Length: * + small_grey_explosion: xgrysml2 + Start: 0 + Length: * + medium_grey_explosion: xgrymed1 + Start: 0 + Length: * + large_grey_explosion: xgrymed2 + Start: 0 + Length: * discus: idle: Start: 0 Length: * +# TODO: needs unit*.pal +canister: + idle: + Start: 0 + Length: * + +# TODO: needs unit*.pal + ShadowIndex: 4 dragon: idle: Start: 0 diff --git a/mods/ts/sequences/voxels.yaml b/mods/ts/sequences/voxels.yaml index 9904ebbbf7..7db3f18756 100644 --- a/mods/ts/sequences/voxels.yaml +++ b/mods/ts/sequences/voxels.yaml @@ -70,6 +70,7 @@ dshp: 4tnk: idle: turret: 4tnktur + barrel: 4tnkbarl trucka: idle: diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index 71a74ca037..a155459543 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -21,7 +21,8 @@ Grenade: Projectile: Bullet Speed: 5 High: yes - Angle: .1 + Shadow: yes + Angle: 0.1 Inaccuracy: 13 Image: DISCUS Warhead: @@ -33,6 +34,8 @@ Grenade: Heavy: 5% InfDeath: 2 Damage: 40 + Explosion: large_grey_explosion + ImpactSound: expnew13.aud Bazooka: ROF: 60 @@ -43,7 +46,7 @@ Bazooka: Speed: 25 Arm: 2 High: yes - Shadow: no + Shadow: yes Proximity: yes Inaccuracy: 3 Image: DRAGON @@ -58,6 +61,8 @@ Bazooka: Concrete: 20% InfDeath: 2 Damage: 25 + Explosion: small_clsn + ImpactSound: expnew12.aud MultiCluster: ROF: 80 @@ -68,7 +73,7 @@ MultiCluster: Speed: 20 Arm: 2 High: yes - Shadow: no + Shadow: yes Proximity: yes Inaccuracy: 3 Image: DRAGON @@ -83,6 +88,8 @@ MultiCluster: Concrete: 20% InfDeath: 2 Damage: 65 + Explosion: large_explosion + ImpactSound: expnew09.aud Heal: ROF: 80 @@ -151,13 +158,13 @@ LtRail: Vulcan3: ROF: 30 + Burst: 3 Range: 4 Report: CYGUN1.AUD Projectile: Bullet Speed: 100 Warhead: Spread: 3 - Burst: 3 Versus: Wood: 25% Light: 30% @@ -169,13 +176,13 @@ Vulcan3: Vulcan2: ROF: 50 + Burst: 3 Range: 6 Report: TSGUN4.AUD Projectile: Bullet Speed: 100 Warhead: Spread: 3 - Burst: 3 Versus: None: 100% Wood: 60% @@ -204,12 +211,14 @@ Vulcan: FiendShard: ROF: 30 + Burst: 3 Range: 5 Report: FIEND2.AUD Projectile: Missile - Burst: 3 Speed: 25 Image: CRYSTAL4 + Shadow: yes + Angle: 0.15 Warhead: Versus: Wood: 25% @@ -221,11 +230,11 @@ FiendShard: JumpCannon: ROF: 40 + Burst: 2 Range: 5 Report: JUMPJET1.AUD Projectile: Bullet Speed: 100 - Burst: 2 Warhead: Versus: Wood: 25% @@ -238,15 +247,15 @@ JumpCannon: HoverMissile: ROF: 68 + Burst: 2 Range: 8 Report: HOVRMIS1.AUD ValidTargets: Ground, Air Projectile: Missile - Burst: 2 Speed: 30 Arm: 2 High: yes - Shadow: no + Shadow: yes Proximity: yes Inaccuracy: 3 Image: DRAGON @@ -261,15 +270,20 @@ HoverMissile: Concrete: 20% InfDeath: 2 Damage: 30 + Explosion: small_clsn + ImpactSound: expnew12.aud 120mmx: ROF: 80 Range: 6.75 - Report: 120MMX9.AUD + Report: 120MMF.AUD Burst: 2 BurstDelay: 5 Projectile: Bullet Speed: 40 + Image: 120mm + Shadow: yes + Angle: 0.1 Warhead: Spread: 3 Versus: @@ -280,6 +294,8 @@ HoverMissile: Concrete: 100% InfDeath: 2 Damage: 50 + Explosion: medium_clsn + ImpactSound: expnew14.aud MammothTusk: ROF: 80 @@ -290,7 +306,7 @@ MammothTusk: Projectile: Missile Arm: 0 High: yes - Shadow: no + Shadow: yes Proximity: yes Inaccuracy: 3 Image: DRAGON @@ -306,6 +322,8 @@ MammothTusk: Heavy: 50% InfDeath: 2 Damage: 40 + Explosion: medium_bang + ImpactSound: expnew12.aud Repair: ROF: 80 @@ -326,10 +344,10 @@ Repair: SlimeAttack: ROF: 80 + Burst: 3 Range: 5 Report: VICER1.AUD Projectile: Bullet - Burst: 3 Speed: 25 Warhead: Versus: @@ -359,8 +377,6 @@ SuicideBomb: ROF: 80 Range: 6.75 Report: 120MMF.AUD - Burst: 2 - BurstDelay: 5 Projectile: Bullet Speed: 90 Warhead: @@ -373,12 +389,14 @@ SuicideBomb: Concrete: 100% InfDeath: 3 Damage: 70 + Explosion: large_clsn + ImpactSound: expnew14.aud MechRailgun: ROF: 60 Range: 8 Burst: 2 - BurstDelay:10 + BurstDelay: 10 Charges: yes Report: RAILUSE5.AUD Projectile: LaserZap @@ -409,14 +427,15 @@ AssaultCannon: BikeMissile: ROF: 60 + Burst: 2 + BurstDelay: 60 Range: 5 Report: MISL1.AUD ValidTargets: Ground - Burst: 2 Projectile: Missile Arm: 2 High: yes - Shadow: no + Shadow: yes Proximity: yes Inaccuracy: 3 Image: DRAGON @@ -432,6 +451,8 @@ BikeMissile: Heavy: 50% InfDeath: 2 Damage: 40 + Explosion: small_clsn + ImpactSound: expnew12.aud RaiderCannon: ROF: 55 @@ -465,6 +486,7 @@ FireballLauncher: # TODO: add fire particles Wood: 100% Light: 50% Heavy: 25% + Concrete: 20% InfDeath: 5 Damage: 90 @@ -472,12 +494,12 @@ SonicZap: ROF: 120 Range: 6 Burst: 2 - BurstDelay:10 + BurstDelay: 10 Charges: yes Report: SONIC4.AUD Projectile: LaserZap # TODO: SonicBeam Color: 200,0,255,255 - BeamWidth: 2 + BeamWidth: 10 Warhead: Spread: 1 InfDeath: 5 @@ -494,7 +516,7 @@ Dragon: Speed: 25 Arm: 2 High: yes - Shadow: no + Shadow: yes Proximity: yes Inaccuracy: 3 Image: DRAGON @@ -509,15 +531,18 @@ Dragon: Concrete: 20% InfDeath: 2 Damage: 30 + Explosion: small_clsn + ImpactSound: expnew12.aud 90mm: ROF: 50 Range: 6.75 Report: 120MMF.AUD - Burst: 2 - BurstDelay: 5 Projectile: Bullet Speed: 40 + Image: 120mm + Shadow: yes + Angle: 0.1 Warhead: Spread: 3 Versus: @@ -528,15 +553,18 @@ Dragon: Concrete: 100% InfDeath: 2 Damage: 36 + Explosion: medium_clsn + ImpactSound: expnew14.aud 155mm: ROF: 110 Range: 18 Report: 120MMF.AUD - Burst: 2 - BurstDelay: 5 Projectile: Bullet Speed: 10 + Image: 120mm + Angle: 0.4 + Shadow: yes MinRange: 5 Warhead: Spread: 7 @@ -548,6 +576,8 @@ Dragon: Concrete: 35% InfDeath: 2 Damage: 150 + Explosion: large_explosion + ImpactSound: expnew09.aud Hellfire: ROF: 50 @@ -559,7 +589,7 @@ Hellfire: Speed: 30 Arm: 2 High: yes - Shadow: no + Shadow: yes Proximity: yes Inaccuracy: 3 Image: DRAGON @@ -575,6 +605,8 @@ Hellfire: Concrete: 30% InfDeath: 3 Damage: 30 + Explosion: small_bang + ImpactSound: expnew12.aud Bomb: ROF: 10 @@ -582,6 +614,7 @@ Bomb: Projectile: Bullet Speed: 10 Image: 120MM + Shadow: yes Warhead: Spread: 7 Versus: @@ -592,6 +625,8 @@ Bomb: Concrete: 100% InfDeath: 2 Damage: 160 + Explosion: large_explosion + ImpactSound: expnew09.aud Proton: ROF: 3 @@ -603,7 +638,7 @@ Proton: Speed: 30 Arm: 2 High: yes - Shadow: no + Shadow: yes Proximity: yes Inaccuracy: 3 Image: TORPEDO @@ -619,6 +654,8 @@ Proton: Concrete: 60% InfDeath: 3 Damage: 20 + Explosion: small_bang + ImpactSound: expnew12.aud HarpyClaw: ROF: 36