From a87789d122d58bd89bc5198fcb64ce8290434ea1 Mon Sep 17 00:00:00 2001 From: James Turk Date: Sun, 9 Apr 2023 15:38:10 -0500 Subject: [PATCH] sounds --- toomgis.p8 | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/toomgis.p8 b/toomgis.p8 index 59bdb77..ab984f9 100644 --- a/toomgis.p8 +++ b/toomgis.p8 @@ -3,7 +3,7 @@ version 41 __lua__ function _init() - start_winscreen() + start_ampm() end function _draw() @@ -42,9 +42,14 @@ end -- ampm logo function start_ampm() + state = "ampm" + music(0) ampm_t = 0 px = 0 py = 0 + vx = 0 + vy = 0 + yacc = 0 for i=2, 14 do add2body(i) add2body(i) @@ -54,15 +59,11 @@ function start_ampm() end function ampm_draw() - local tx = 1000 + local tx = 300 - ampm_t local fx = 78 - if ampm_t > 300 then - tx = 140 - (ampm_t-300) - toomgis_draw(tx, 50) - fx = min(tx, 78) - else + toomgis_draw(tx, 50) + fx = min(tx, 78) - end shift = max(ampm_t - 64, 0) width = max(128 - shift, 64) @@ -95,7 +96,7 @@ end function ampm_upd() ampm_t += 1 - if ampm_t > 500 then + if ampm_t > 350 then start_level(1) ampm_t = 0 end @@ -197,6 +198,7 @@ horizon = 64 function start_level(n) state = "level" + music(-1, 1000) -- toomgis reset tbody = {} pieces = 1 @@ -408,6 +410,7 @@ function start_gameover() py = 0 px = 64 tbody = {} + music(4) for i=18,26 do add2body(i) add2body(i) @@ -446,6 +449,7 @@ end -- winscreen function start_winscreen() + music(0) state = "winscreen" px = 64 py = -100 @@ -583,7 +587,7 @@ __gfx__ 00000000666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666600000000 00000000555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555500000000 __map__ -272800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b8b8b8b800000000000000000000000000000000000000000000000000 +272800000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b8b8b8b800000000000000000000000000000000000000000000000000 3738000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b8b8b8b8b4b8b8bdb3bdb8b8b8b8b3b1b1b3b8b8b8b8bebebebebebebebeb8b2b8b8bdb8b8beb8b6b8b8b1b4b8b8b8b8b8b8b8b8b8b8b8b8bcb8b9b8bebebebdb1b8b9beb4b8b3b1b8bdb2b8b1b8 b9b9b9b5b1b5b2b5b8b8b8b8b8b8b8b8b8bdbbb8b8b8b5b3b7bdbcbcb2b8b5b5b5bdbabdb2b8b8b6b8bebebcbcbcbcbcbcbcb6b3b5b4b4b8b5bdb3bdb5bbb5b5b3b1b1b3b8b2b8babdb2babebebebabeb7b8b5b6b4b8b7b5bdb8b7b4b1b7b8b5bbbbbbb7b7b7b5b5bdb8bcbcb9b9bebebeb8b3b6beb8b9b6b6b2bdb4bab4bebd b7b5b5b2babbbab5bdb2b1b3b6b6b2b8b8bdbbb9b5b6b4b3b8b7b4b7b8b8b5b8b5bdbabdb8b6b2b8b6bebeb5b5b5b5b5b5b5b6b3b3b5b8b5b8bdb3bdb5bbb5b5b3b1b3b3b8b2b8babdb2bab5bdb2babeb8b1beb8b8b4beb8b6b3b2b8b8b8b8b5bbbbbbb7b7b8b8b5bdb8b8bcb9b9beb8beb8b2b4b8bdb7bcb8b7b8b1b8b2b8b8 @@ -612,10 +616,21 @@ __sfx__ 361400000050200502275520050200502275520050200502275522455027552005022755227500275522455227550275002755227500275002755227500275002755224550275522750027552245522455222552 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0003000000503165531d5532155324553265532655325553225531e5531a5531855317553195531e5532055323553255532555325553255532555324553235532355322553215531d5531a5531a5531a55319553 -010300002405324053240532405309053090530905309053240532405324053240530d0530d0530d0530d053240532405324053240530a0530a0530a0530a053240532405324053240530b0530b0530b0530b053 +010200002157124571245712457124571245712457120571095710d5710d5710d5710d5710d5710d5710a57121571245712457124571245712457124571205710a5710d5710d5710d5710d5710d5710d5710a571 +011400002e4542e4542e4542e45400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +01180000220522205227052240522405229052270522705216052160521b05218052180521d0521b0521b052220522205227052240522405229052270522705216052160521b05218052180521d0521b0521b052 +011800000670006700067500675000700067500670006750007000070006750067500070006750067000675006700067000675006750007000675006700067500070000700067500675000700067500670006750 +081400002375220752217521e7521f7521c7521d7521a7521b75218752197521775217752157521375213752117521275210752107520e7520e7520b7520c752097520a752077520875207752067520575205752 +30100000002000225202200022520220002252042520b2000225204252092520b20002252042520925209200022000e252022000e252022000e25210252092000e25210252152520b2000e252102521525200200 +081400002315220152211521e1521f1521c1521d1521a1521b15218152191521715217152151521315213152111521215210152101520e1520e1520b1520c152091520a152071520815207152061520515205152 +091400002345120451214511e4511f4511c4511d4511a4511b45118451194511745117451154511345113451114511245110451104510e4510e4510b4510c451094510a451074510845107451064510545105451 __music__ 01 01424344 00 01024344 02 01024344 00 01020344 +01 0a4b4344 +00 0a0c4d44 +00 0a0c0d44 +02 0d0c4d44