diff --git a/vacation.p8 b/vacation.p8 index ca6121c..546aec0 100644 --- a/vacation.p8 +++ b/vacation.p8 @@ -407,6 +407,79 @@ function ditherer:draw() rectfill(0,0,128,128,self.c) end +fuzzy = { + p = 0xffff, + n = 0, + interval = 3, + tries = 2, +} +mknew(fuzzy, function(x) + local p = (x.p or fuzzy.p) & 0xffff + x.mass = 0 + while p ~= 0 do + x.mass += p & 0x8000 + p = p << 1 + end +end) + +function fuzzy:update() + self.n += 1 + if (self.n < self.interval) return + self.n = 0 + for i=1,self.tries do + local b = 1 << rnd(15) + if b & self.p == 0 then + if i == self.tries or not self.weight or self.mass <= self.weight then + self.mass += 1 + self.p |= b + return + end + else + if i == self.tries or not self.weight or self.mass >= self.weight then + self.mass -= 1 + self.p &= ~b + return + end + end + end +end + +function fuzzy:set_fillp() + fillp(self.p + 0x0.8) +end + +fuzzy_stripey = { + y = 0, + dy = -0.25, + thicc = 3, + weight = 12, + spacing = 7, + gap = 32, + colors = {5, 2, 1}, +} +mknew(fuzzy_stripey, function(f) + f.fuzz = fuzzy.new{ + weight = f.weight or fuzzy_stripey.weight, + } +end) + +function fuzzy_stripey:update() + self.y += self.dy + if (self.y <= -self.gap) self.y += self.gap + if (self.y >= self.gap) self.y -= self.gap + self.fuzz:update() +end + +function fuzzy_stripey:draw() + self.fuzz:set_fillp() + for y=self.y,128,self.gap do + for i,c in ipairs(self.colors) do + local y0 = y + (i-1) * self.spacing + rectfill(0, y0, 128, y0 + self.thicc, c) + end + end +end + -->8 -- awakener @@ -928,7 +1001,11 @@ function sequencer:next() mainview = newtitle() return end - mainview = rec.f(unpack(rec.params)) + if rec.params then + mainview = rec.f(unpack(rec.params)) + else + mainview = rec.f() + end mainview:update() end @@ -937,9 +1014,15 @@ function start_game() { f = arcade_level.new, params = {{ - max_score=5, + max_score=2, }} - } + }, + { + f = function() + pal() + return view.of{bg.new(), fuzzy_stripey.new()} + end, + }, } seq:next() end @@ -1033,39 +1116,6 @@ __gfx__ 00000000000000000eeee26200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000eee22600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000ee2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -__map__ -0608090000010000000000000000000045102051550075740000000000541606020000006006260000070710705750100500010070072700000000200070740100006066600060600060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -00000000000000000101010101000100000a0a050000000000123f12123f1200000e15050e14150e2215150a285454220609090629112e000002020100000000020101010101020001020202020201000004150a150400000004041f040400000000000000020201000000000f00000000000000000001000808040402020101 -0e11151515110e000407040404041f000e11100804021f000f10100e10100f00080c0a091f0808001f010f1010110e000e11010f11110e001f111008040202000e11110e11110e000e11111e1008060000000100000100000000000200020201000402010204000000003f003f00000000010204020100000e11100c02000400 -1e212d291d413e00000e101e11111e0001010f1111110f00000e110101011e0010101e1111111e00000e111f01011e001c02020f02020200001e1111111e100e01010d131111110002000302020207000007020202020201001109050709110000010101010106000036494949494900000c131111111100000e111111110e00 -000f1111110f0101001e1111111e1010000d030101010100000e010e10110e0001010f0101010e000011111111191600001111110a0a04000020252525251a0000110a04040a11000000090909060403000f080402010f00030101010101030001010202040408080302020202020300040a110000000000000000000000003f -00010202000000000e1111111f1111000f11110f11110f000e11010101110e001f22222222221e001f01010f01011f001f01010f010101001e01011911111e001111111f1111110007020202020207000f0404040404030011090507090911000101010101010f002121332d2121210011131519111111000e11111111110e00 -0f11110f010101000e111111150916000f11110f091111000e11010e10110e001f040404040404001111111111110e00111111110a0a0400414149494955220011110a040a1111001111110a040404001f10080402011f00040a020101020a040101010101010101020504080804050200000026190000000000000000000000 -00007f7f7f7f7f000000552a552a55000000417f5d5d3e0000003e6363773e0000001144114411000000021e0e0f080000000e171f1f0e0000001b1f1f0e040000001c3677361c0000000e0e1f0e0a0000001c3e7f2a3a0000003e6763673e0000007f5d7f417f0000001c040407070000003e636b633e000000040e1f0e0400 -000000005500000000003e7363733e000000081c7f3e220000001f0e040e1f0000003e7763633e000000000552200000000000112a44000000003e6b776b3e0000007f007f007f000000555555555500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -04050700000100000000000000607700672000617700060600000000006677070100000060072700000010200070700000000110600020111000102100000671333313111333121333103333117766007600f1758f17677f7788767086182273ff8fff01ffffedff81ff8f7f8188f800ff8fff01ffffeeff88888808818888f0 -0007070707070000000007070700000000000705070000000000050205000000000005000500000000000505050000000004060706040000000103070301000000070101010000000000040404070000000507020702000000000001000000000000000001020000000000000303000000050500000000000002050200000000 -000000000000000000010101000100000005050000000000000a1f0a1f0a0000000207030607020000050402010500000002050e050e0000000101000000000000020101010200000001020202010000000502070205000000000207020000000000000000010100000000070000000000000000000100000004040201010000 -0002050505020000000203020207000000030402010700000003040204030000000505070404000000070103040300000006010305020000000704040202000000020502050200000002050604030000000001000100000000000001000101000000020102000000000003000300000000000102010000000003040200020000 -0006090d0106000000000306050700000001030505030000000006010106000000040605050600000000020503060000000402070202000000000605060403000001010305050000000100010101000000020002020201000001050305050000000101010102000000000f151515000000000305050500000000020505020000 -000003050503010000000605050604000000030501010000000006030603000000020702020600000000090909060000000005050503000000001111150a000000000502050500000000050505060300000007060307000000030101010300000001020202040000000302020203000000020500000000000000000000070000 -0002040000000000000205070505000000030503050300000006010101060000000709090907000000070103010700000007010301010000000e010d090600000005050705050000000101010101000000040404040502000005050305050000000101010107000000111b151111000000090b0f0d0900000006090909060000 -0003050301010000000609090d06080000030503050500000006010204030000000702020202000000090909090600000009090905030000001111151b1100000005050205050000000505020202000000070402010700000006020102060000000101000101000000030204020300000000000a050000000003030000000000 -007f7f7f7f7f7f0000752a752a752a0000617f5d5d3e0000003e6363773e0000001164116411640000021e0e0f080000000e171f1f0e0000001b1f1f0e040000001c3677361c0000000e0e1f0e0a0000001c3e7f2a3a0000003e6763673e0000003f2d3f213f0000001c040407070000003e636b633e000000040e1f0e040000 -0000007500000000003e7363733e000000081c7f3e220000001f0e040e1f0000003e7763633e000000000572200000000000112a64000000003e6b776b3e0000001f001f001f00000015151515150000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -000000000000000000000100010101000000040e050e0400000c0207020f000000110e0a0e11000000050502070200000001010001010000000603050603000000050000000000000006090d09060000000306050700000000001209120000000000000704000000000000000000000000030503050000000007000000000000 -000205020000000000020702000700000003020103000000000103020100000000020100000000000000000505030100000f0b0b0a0a000000000001000000000000000000020300000203020200000000020502000000000000091209000000001109052a3920000011091d120918000021130a757240000000020002010600 -000204030605070000020103060507000002050306050700000a0503060507000005000306050700000200030605070000000b160d1f00000000000e010e040000020402050306000002010205030600000205020503060000050002050306000001020000020200000201000001010000020500000202000005000000020200 -000e1217120e0000000a050007090900000102000205020000040200020502000002050002050200000a0500060906000005000002050200000005020500000000100e15120d0000000204000909060000040200090906000006090009090600000900000909060000040200050506030001050b0b0501000006090509050000 -000204020507050000020102050705000002050205070500000a0506090f090000050002050705000002000205070500001e050f051d0000000e0101010e040000020407030107000002010703010700000205070301070000050007030107000001020002020200000201000101010000020500020202000005000002020200 -0002050e09090600000a05090b0d0900000204060909060000040206090906000002050609090600000a0506090906000009000609090600000200070002000000160915120d00000002040909090600000402090909060000020508090906000009000909090600000402050502020000010709090701000005000505020200 __label__ cssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc s777sccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc @@ -1196,3 +1246,36 @@ h000h000h000h000h000h000h000h000h000h000h000h000h000h000h000h000h000h000h000h000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +__map__ +0608090000010000000000000000000045102051550075740000000000541606020000006006260000070710705750100500010070072700000000200070740100006066600060600060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000101010101000100000a0a050000000000123f12123f1200000e15050e14150e2215150a285454220609090629112e000002020100000000020101010101020001020202020201000004150a150400000004041f040400000000000000020201000000000f00000000000000000001000808040402020101 +0e11151515110e000407040404041f000e11100804021f000f10100e10100f00080c0a091f0808001f010f1010110e000e11010f11110e001f111008040202000e11110e11110e000e11111e1008060000000100000100000000000200020201000402010204000000003f003f00000000010204020100000e11100c02000400 +1e212d291d413e00000e101e11111e0001010f1111110f00000e110101011e0010101e1111111e00000e111f01011e001c02020f02020200001e1111111e100e01010d131111110002000302020207000007020202020201001109050709110000010101010106000036494949494900000c131111111100000e111111110e00 +000f1111110f0101001e1111111e1010000d030101010100000e010e10110e0001010f0101010e000011111111191600001111110a0a04000020252525251a0000110a04040a11000000090909060403000f080402010f00030101010101030001010202040408080302020202020300040a110000000000000000000000003f +00010202000000000e1111111f1111000f11110f11110f000e11010101110e001f22222222221e001f01010f01011f001f01010f010101001e01011911111e001111111f1111110007020202020207000f0404040404030011090507090911000101010101010f002121332d2121210011131519111111000e11111111110e00 +0f11110f010101000e111111150916000f11110f091111000e11010e10110e001f040404040404001111111111110e00111111110a0a0400414149494955220011110a040a1111001111110a040404001f10080402011f00040a020101020a040101010101010101020504080804050200000026190000000000000000000000 +00007f7f7f7f7f000000552a552a55000000417f5d5d3e0000003e6363773e0000001144114411000000021e0e0f080000000e171f1f0e0000001b1f1f0e040000001c3677361c0000000e0e1f0e0a0000001c3e7f2a3a0000003e6763673e0000007f5d7f417f0000001c040407070000003e636b633e000000040e1f0e0400 +000000005500000000003e7363733e000000081c7f3e220000001f0e040e1f0000003e7763633e000000000552200000000000112a44000000003e6b776b3e0000007f007f007f000000555555555500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +04050700000100000000000000607700672000617700060600000000006677070100000060072700000010200070700000000110600020111000102100000671333313111333121333103333117766007600f1758f17677f7788767086182273ff8fff01ffffedff81ff8f7f8188f800ff8fff01ffffeeff88888808818888f0 +0007070707070000000007070700000000000705070000000000050205000000000005000500000000000505050000000004060706040000000103070301000000070101010000000000040404070000000507020702000000000001000000000000000001020000000000000303000000050500000000000002050200000000 +000000000000000000010101000100000005050000000000000a1f0a1f0a0000000207030607020000050402010500000002050e050e0000000101000000000000020101010200000001020202010000000502070205000000000207020000000000000000010100000000070000000000000000000100000004040201010000 +0002050505020000000203020207000000030402010700000003040204030000000505070404000000070103040300000006010305020000000704040202000000020502050200000002050604030000000001000100000000000001000101000000020102000000000003000300000000000102010000000003040200020000 +0006090d0106000000000306050700000001030505030000000006010106000000040605050600000000020503060000000402070202000000000605060403000001010305050000000100010101000000020002020201000001050305050000000101010102000000000f151515000000000305050500000000020505020000 +000003050503010000000605050604000000030501010000000006030603000000020702020600000000090909060000000005050503000000001111150a000000000502050500000000050505060300000007060307000000030101010300000001020202040000000302020203000000020500000000000000000000070000 +0002040000000000000205070505000000030503050300000006010101060000000709090907000000070103010700000007010301010000000e010d090600000005050705050000000101010101000000040404040502000005050305050000000101010107000000111b151111000000090b0f0d0900000006090909060000 +0003050301010000000609090d06080000030503050500000006010204030000000702020202000000090909090600000009090905030000001111151b1100000005050205050000000505020202000000070402010700000006020102060000000101000101000000030204020300000000000a050000000003030000000000 +007f7f7f7f7f7f0000752a752a752a0000617f5d5d3e0000003e6363773e0000001164116411640000021e0e0f080000000e171f1f0e0000001b1f1f0e040000001c3677361c0000000e0e1f0e0a0000001c3e7f2a3a0000003e6763673e0000003f2d3f213f0000001c040407070000003e636b633e000000040e1f0e040000 +0000007500000000003e7363733e000000081c7f3e220000001f0e040e1f0000003e7763633e000000000572200000000000112a64000000003e6b776b3e0000001f001f001f00000015151515150000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000100010101000000040e050e0400000c0207020f000000110e0a0e11000000050502070200000001010001010000000603050603000000050000000000000006090d09060000000306050700000000001209120000000000000704000000000000000000000000030503050000000007000000000000 +000205020000000000020702000700000003020103000000000103020100000000020100000000000000000505030100000f0b0b0a0a000000000001000000000000000000020300000203020200000000020502000000000000091209000000001109052a3920000011091d120918000021130a757240000000020002010600 +000204030605070000020103060507000002050306050700000a0503060507000005000306050700000200030605070000000b160d1f00000000000e010e040000020402050306000002010205030600000205020503060000050002050306000001020000020200000201000001010000020500000202000005000000020200 +000e1217120e0000000a050007090900000102000205020000040200020502000002050002050200000a0500060906000005000002050200000005020500000000100e15120d0000000204000909060000040200090906000006090009090600000900000909060000040200050506030001050b0b0501000006090509050000 +000204020507050000020102050705000002050205070500000a0506090f090000050002050705000002000205070500001e050f051d0000000e0101010e040000020407030107000002010703010700000205070301070000050007030107000001020002020200000201000101010000020500020202000005000002020200 +0002050e09090600000a05090b0d0900000204060909060000040206090906000002050609090600000a0506090906000009000609090600000200070002000000160915120d00000002040909090600000402090909060000020508090906000009000909090600000402050502020000010709090701000005000505020200