From 1edac09ea780e7d16ee92ab433d206a5f01b789a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 22 Aug 2013 16:43:30 +0200 Subject: [PATCH 1/7] Added attack cursor, made some other preliminary changes. --- mods/ts/cursors.yaml | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) 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 From abf772bd6405587304b1c477f7dc1105fe9e8b0f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 22 Aug 2013 16:44:36 +0200 Subject: [PATCH 2/7] Fixed two FS music entries, added support for Stomp and Initiate. --- mods/ts/music.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 From 87d2d607e633938da80a7fd460a3c972d3354b3c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 22 Aug 2013 16:45:39 +0200 Subject: [PATCH 3/7] Added shp rotor to Harpy. --- mods/ts/bits/lrotor.shp | Bin 0 -> 3008 bytes mods/ts/rules/aircraft.yaml | 2 ++ mods/ts/sequences/aircraft.yaml | 8 +++++++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 mods/ts/bits/lrotor.shp diff --git a/mods/ts/bits/lrotor.shp b/mods/ts/bits/lrotor.shp new file mode 100644 index 0000000000000000000000000000000000000000..8f56fce28ed19f0c110586e3e33ece85222bbe21 GIT binary patch literal 3008 zcmbW3TaMdC5JhiGBTC{!BT6I32@>0ZVIXVrpMSEItSP@)N>-9{tJ&hi)MQ`{!0vi< z)va6A9d}-)%g1(X;uH%M)>XYQQge{UkUM`^>~@4C+Pf1_XX|5~r>_l?M?E|s6UtJD-JRyDoU zPE=|aN8SU*b{z&U9W8A>LE8PNU2Ihqjne0d8LhVEQCw2`GItpb)7=~5{2!D@B`hla zj)@hv7Dr$>)2sfhJ43FtCut_76q9+|{UYs)%8o_Q7E4_$)3e(Adhb#0Me*WzBG2&gxKWRr``So68lyMP;Q9cQaCk9I=gpl{0_MFvvnFn^lp7VUMbLI2!`l2C zF68p!j-Bp#;qFqKbmI+MrIy_l)xoL@$Bv<@d17KJ8XGuZQBOFui7(V3d$y5nY9nQK z^O5$#hhuQ_amMXggB&rBWWCt)0FY~VRH$x|4;7T$V1;Bp-1|w2O-NllH^@%m%j2if z<%)8`YJfzPup4a@29~91<>)f>EcF!D2$qlHyCj$KLPk|sC=qD;MePt<$N}+)2jB2- z=EOo+7#!*lSCx%Rwc?5QHv}ZN$_kS1Bgh3Dl|5d-RVBUS+YG%rWPF5T1M~35CVEk` zfofv)xml6Xik1&Y&S(`Vd5d*J_pPy=wq&j|unMG1hrhB`;6?Q4y@!xaFmY@G`+Wvq z0C~W21M?LeURpJ1FKE4jPpwyEuV>`0_N1K9_}_s%o=)h=)#(=V9T0{GnDDcI9_{co zbCh5;VLOaxR?mCy71=8V=mM&y)zu64hvkg3m-Yu1{u`KLTiK@{4Lu?=+=6~mO{uO_ z>-x{|5LC9wB%zs-^oYzU=}>iwjs%^gJEQ5m63lDqUFl`?7O-wL%aQ)$b>t3t9%|MA zPZUo~o}qk2KpHOw7m(+S|KnC>aXG8YS>^@c3+^rxMqT5k1Pv`2^PK<+w Date: Thu, 22 Aug 2013 16:46:15 +0200 Subject: [PATCH 4/7] Enabled mammoth tank voxel barrel. --- mods/ts/rules/vehicles.yaml | 1 + mods/ts/sequences/voxels.yaml | 1 + 2 files changed, 2 insertions(+) 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/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: From 37208a608c2dcde345add1abe562b4d6c5489b7d Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 22 Aug 2013 16:48:33 +0200 Subject: [PATCH 5/7] Added building explosion sequence to prevent game from crashing when a building blows up. --- mods/ts/sequences/misc.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 1039ab8689..04ee84c55d 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -72,6 +72,9 @@ pips: Start: 2 explosion: + building: twlt070 + Start: 0 + Length: * piff: piff Start: 0 Length: * From acb7534ddef962837fb6f6f99ed3b9dd8053fae0 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 22 Aug 2013 16:49:54 +0200 Subject: [PATCH 6/7] Adds support for nearly all explosions, and some other misc stuff. --- mods/ts/sequences/misc.yaml | 155 ++++++++++++++++++++++++++++++++---- 1 file changed, 140 insertions(+), 15 deletions(-) diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 04ee84c55d..9ada21fa73 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -52,41 +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 From 1c7cc60205322c3add04d0e646b6c79a0af3ddc6 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 22 Aug 2013 17:06:10 +0200 Subject: [PATCH 7/7] TS weapon improvements. Fixes cases where Burst was set as Projectile or Warhead trait, fixes some other Burst and Report issues, adds Angle and Shadow to some projectiles, adds Explosions and ImpactSounds to explosive weapons. --- mods/ts/weapons.yaml | 89 +++++++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 26 deletions(-) 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