From adc89cf11c05ac4ed11c38f90fabdeba8df88c7c Mon Sep 17 00:00:00 2001 From: JailDoctor Date: Mon, 24 Oct 2022 15:01:47 +0200 Subject: [PATCH] - WIP animated tiles --- main.lua | 15 +- map.lua | 770 +++++++++++++++++++++++++-------------------------- mapa.lua | 25 +- switches.lua | 2 +- tiles.gif | Bin 3259 -> 3437 bytes 5 files changed, 419 insertions(+), 393 deletions(-) diff --git a/main.lua b/main.lua index 2f7a047..b6cc551 100644 --- a/main.lua +++ b/main.lua @@ -72,7 +72,7 @@ function update_dialog() _update=update_game end end - +scroll=0 function update_game() cls(16) @@ -80,7 +80,7 @@ function update_game() draw_hab(abad.hab,0,0,true) text(abad.hab,120,1,2) - sspr(0,64,128,48,0,48) + sspr(0,64+scroll*8,128,48,0,48) color(3) local xx=(seltile&15)*8 local yy=48+(seltile>>4)*8 @@ -88,6 +88,7 @@ function update_game() text("EDIT",100,1,3) local hx = abad.hab%10 local hy = flr(abad.hab/10) + scroll=0 if btnp(KEY_RIGHT) and hx<9 then abad.hab=abad.hab+1 elseif btnp(KEY_LEFT) and hx>0 then @@ -104,6 +105,9 @@ function update_game() elseif btnp(KEY_C) then mapa_cycle_colors(abad.hab) end + if btn(KEY_TAB) then + scroll=2 + end local mx,my=mousex(),mousey() if mx>>3 < 12 and my>>3 < 6 then @@ -113,13 +117,13 @@ function update_game() end if mbtn(1) then if my>=48 then - seltile=(mx>>3)+((my-48)>>3)*16 + seltile=(mx>>3)+((my-48+(scroll*8))>>3)*16 elseif mx<96 then mapa_set_tile(abad.hab,mx>>3,my>>3,seltile) end elseif mbtn(3) then if my<48 and mx<96 then - mapa_set_tile(abad.hab,mx>>3,my>>3,255) + mapa_set_tile(abad.hab,mx>>3,my>>3,256) end end if mx>>3 < 12 and my>>3 < 6 then @@ -130,11 +134,14 @@ function update_game() draw_hab(abad.hab,0,0) text(abad.hab,1,1,2) draw_hab(premiere.hab,0,48) + text("Premiere",2,49,2) score.draw() setsource(tiles) prnt("x"..abad.vides,114,13,2) rectfill(102+(abad.energia>>1),30,122,37,16) + + mapa_update() for key,actor in pairs(actors) do actor:update() if actor.hab==cacau.hab and actor~=abad then diff --git a/map.lua b/map.lua index 785d7f4..e2bed09 100644 --- a/map.lua +++ b/map.lua @@ -2,801 +2,801 @@ mapa={ -- 1 { 18,19,20,21,20,21,20,21,18,19,20,21, - 16,72,255,255,255,15,255,255,255,17,255,255, - 16,88,255,255,255,255,255,255,255,17,255,255, - 16,255,255,255,255,255,255,255,255,38,255,255, - 16,255,255,255,255,255,255,255,255,38,255,255, + 16,72,256,256,256,15,256,256,256,17,256,256, + 16,88,256,256,256,256,256,256,256,17,256,256, + 16,256,256,256,256,256,256,256,256,38,256,256, + 16,256,256,256,256,256,256,256,256,38,256,256, 20,21,20,21,20,21,20,21,20,21,20,21, }, -- 2 { 20,21,20,21,20,21,20,21,20,21,20,21, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,69,255,255,255,69,255,255,255,69,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 20,21,20,21,20,21,21,255,255,17,20,21, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,69,256,256,256,69,256,256,256,69,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 20,21,20,21,20,21,21,256,80,17,20,21, }, -- 3 { 20,21,20,21,20,21,20,21,20,21,20,21, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 20,21,20,21,20,21,20,21,20,21,20,21, }, -- 4 { 20,21,20,21,20,21,20,21,20,21,20,21, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,10,11,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,10,11,256,256, 20,21,20,21,20,21,20,21,10,11,20,21, }, -- 5 { 20,21,20,21,20,21,20,21,20,21,20,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, 20,21,20,21,20,21,20,21,20,21,20,21, }, -- 6 { - 255,66,255,41,44,45,44,45,44,45,44,45, - 64,255,255,41,255,255,255,255,255,255,255,255, - 68,255,66,255,255,255,255,255,255,255,255,255, - 255,67,255,41,255,255,255,255,255,255,255,255, - 65,255,255,41,255,255,255,255,255,255,255,255, - 255,65,42,43,44,45,44,45,44,45,44,45, + 256,66,256,41,44,45,44,45,44,45,44,45, + 64,256,256,41,256,256,256,256,256,256,256,256, + 68,256,66,256,256,256,256,256,256,256,256,256, + 256,67,256,41,256,256,256,256,256,256,256,256, + 65,256,256,41,256,256,256,256,10,11,256,256, + 256,65,42,43,44,45,44,45,10,11,44,45, }, -- 7 { - 42,43,255,255,255,255,65,255,255,255,255,64, - 255,41,255,67,255,255,255,255,68,255,255,255, - 255,41,255,255,255,66,255,255,255,255,255,255, - 255,255,255,64,255,255,255,255,67,255,67,255, - 255,255,255,255,255,255,65,255,255,255,255,255, + 42,43,256,256,256,256,65,256,256,256,256,64, + 256,41,256,67,256,256,256,256,68,256,256,256, + 256,41,256,256,256,66,256,256,256,256,256,256, + 256,256,256,64,256,256,256,256,67,256,67,256, + 256,256,256,256,256,256,65,256,256,256,256,256, 42,43,20,21,20,21,20,21,20,21,20,21, }, -- 8 { - 67,255,255,255,255,65,255,255,255,255,64,255, - 255,255,67,255,255,255,255,68,255,255,255,255, - 255,255,255,255,66,255,255,255,255,255,255,67, - 255,255,64,255,255,255,255,67,255,67,255,255, - 255,255,255,255,255,65,255,255,255,255,255,255, - 20,21,20,21,20,255,255,21,20,21,20,21, + 67,256,256,256,256,65,256,256,256,256,64,256, + 256,256,67,256,256,256,256,68,256,256,256,256, + 256,256,256,256,66,256,256,256,256,256,256,67, + 256,256,64,256,256,256,256,67,256,67,256,256, + 256,256,256,256,256,65,256,256,256,256,256,256, + 20,21,20,21,17,256,256,17,20,21,20,21, }, -- 9 { - 255,255,255,255,65,255,255,255,255,64,17,17, - 255,67,255,255,255,255,68,255,255,255,17,255, - 255,255,255,66,255,255,255,255,255,255,17,255, - 255,64,255,255,255,255,67,255,67,255,255,255, - 255,255,255,255,65,255,255,255,255,255,255,255, + 256,256,256,256,65,256,256,256,256,64,17,17, + 256,67,256,256,256,256,68,256,256,256,17,256, + 256,256,256,66,256,256,256,256,256,256,17,256, + 256,64,256,256,256,256,67,256,67,256,256,256, + 256,256,256,256,65,256,256,256,256,256,256,256, 20,21,20,21,20,21,20,21,20,21,20,21, }, -- 10 { - 20,21,20,21,20,21,20,21,20,21,20,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 20,21,20,21,20,21,20,21,20,21,20,21, + 17,17,17,17,17,17,17,17,17,17,18,19, + 256,256,256,256,256,256,256,256,256,256,17,17, + 256,256,256,256,256,256,256,256,256,256,18,19, + 256,256,256,256,256,256,256,256,256,256,17,17, + 256,256,256,256,256,256,256,256,256,256,18,19, + 20,21,20,21,20,21,256,80,17,17,17,17, }, -- 11 { 25,29,28,29,28,29,28,29,28,29,28,29, - 24,255,255,255,255,255,255,255,255,255,255,255, - 24,255,255,255,255,70,71,255,255,255,255,255, - 24,255,255,255,69,86,87,69,255,255,255,255, - 24,255,255,255,255,255,255,255,255,255,255,255, + 24,256,256,256,256,256,256,256,256,256,256,256, + 24,256,256,256,256,70,71,256,256,256,256,256, + 24,256,256,256,69,86,87,69,256,256,256,256, + 24,256,256,256,256,256,256,256,256,256,256,256, 28,29,28,29,28,29,28,29,28,29,28,29, }, -- 12 { - 28,29,28,29,28,29,29,255,255,255,28,29, - 255,255,255,255,255,255,255,255,255,25,255,255, - 255,255,255,255,255,255,255,255,1,255,255,255, - 255,255,255,255,255,255,255,1,255,255,255,255, - 255,255,255,255,255,255,1,255,255,255,255,255, + 28,29,28,29,28,29,29,256,256,256,28,29, + 256,256,256,256,256,256,256,256,256,25,256,256, + 256,256,256,256,256,256,256,256,1,256,256,256, + 256,256,256,256,256,256,256,1,256,256,256,256, + 256,256,256,256,256,256,1,256,256,256,256,256, 28,29,28,29,28,29,28,29,28,29,28,29, }, -- 13 { 28,29,28,29,28,29,28,29,28,29,28,29, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 28,29,28,29,28,29,29,255,255,25,28,29, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 28,29,28,29,28,29,29,256,81,25,28,29, }, -- 14 { 28,29,28,29,28,29,28,29,10,11,28,29, - 255,255,255,255,255,255,255,255,10,11,255,255, - 255,255,255,255,255,255,255,255,10,11,255,255, - 255,255,255,255,255,255,255,255,10,11,255,255, - 255,255,255,255,255,255,255,255,10,11,255,255, + 256,256,256,256,256,256,256,256,10,11,256,256, + 256,256,256,256,256,256,256,256,10,11,256,256, + 256,256,256,256,256,256,256,256,10,11,256,256, + 256,256,256,256,256,256,256,256,10,11,256,256, 28,29,28,29,28,29,28,29,28,29,28,29, }, -- 15 { 28,29,28,29,28,29,28,29,28,29,28,24, - 255,255,255,255,255,255,255,255,255,255,255,24, - 255,255,255,255,255,255,255,255,255,255,255,24, - 255,255,255,255,255,255,255,255,255,255,255,24, - 255,255,255,255,255,255,255,255,255,255,255,24, + 256,256,256,256,256,256,256,256,256,256,256,24, + 256,256,256,256,256,256,256,256,256,256,256,24, + 256,256,256,256,256,256,256,256,256,256,256,24, + 256,256,256,256,256,256,256,256,256,256,256,24, 28,29,28,29,28,29,28,29,28,29,28,29, }, -- 16 { - 64,255,26,27,28,29,28,29,10,11,28,29, - 68,255,66,25,255,255,255,255,10,11,255,255, - 255,67,255,255,255,255,255,255,10,11,255,255, - 65,255,255,25,255,255,255,255,10,11,255,255, - 255,65,255,25,255,255,255,255,10,11,255,255, - 255,255,26,27,28,29,28,29,10,11,28,29, + 64,256,26,27,28,29,28,29,10,11,28,29, + 68,256,66,25,256,256,256,256,10,11,256,256, + 256,67,256,256,256,256,256,256,10,11,256,256, + 65,256,256,25,256,256,256,256,10,11,256,256, + 256,65,256,25,256,256,256,256,10,11,256,256, + 256,256,26,27,28,29,28,29,10,11,28,29, }, -- 17 { 28,29,28,29,25,41,44,45,44,45,44,45, - 255,255,255,255,25,41,255,255,255,255,255,255, - 255,255,255,255,25,41,255,255,255,255,255,255, - 255,255,255,255,25,41,255,255,255,255,255,255, - 255,255,255,255,25,41,255,255,255,255,255,255, + 256,256,256,256,25,41,256,256,256,256,256,256, + 256,256,256,256,25,41,256,256,256,256,256,256, + 256,256,256,256,25,41,256,256,256,256,256,256, + 256,256,256,256,25,41,256,256,256,256,256,256, 28,29,28,29,25,41,44,45,44,45,44,45, }, -- 18 { - 44,45,44,45,44,255,255,45,44,45,44,45, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 44,45,44,45,44,255,255,45,44,45,44,45, + 44,45,44,45,41,256,256,41,44,45,44,45, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,41,41,256,256,41,41,256,256,256, + 45,44,45,42,43,256,256,42,43,44,45,44, }, -- 19 { 44,45,44,45,44,45,44,45,44,45,44,45, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 44,45,44,45,44,45,255,83,41,45,44,45, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 44,45,44,45,44,45,256,83,41,45,44,45, }, -- 20 { - 44,45,44,45,44,45,44,45,44,45,44,45, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,8,9,255,255, - 44,45,44,45,44,45,44,45,8,9,44,45, + 44,45,44,45,44,45,256,256,41,41,41,41, + 256,256,256,256,256,256,256,256,41,256,42,43, + 256,256,256,256,256,256,256,3,256,256,41,41, + 256,256,256,256,256,256,3,256,256,256,42,43, + 256,256,256,256,256,3,256,256,8,9,41,41, + 44,45,44,45,44,45,44,45,8,9,42,43, }, -- 21 { 33,37,36,37,36,37,36,37,36,37,36,37, - 32,255,255,255,255,255,255,255,255,255,255,255, - 32,255,255,255,255,255,255,255,255,255,255,255, - 32,255,255,255,255,255,255,255,255,255,255,255, - 32,255,8,9,255,255,255,255,255,255,255,255, + 32,256,256,256,256,256,256,256,256,256,256,256, + 32,256,256,256,256,256,256,256,256,256,256,256, + 32,256,256,256,256,256,256,256,256,256,256,256, + 32,256,8,9,256,256,256,256,256,256,256,256, 36,37,8,9,36,37,36,37,36,37,36,37, }, -- 22 { 36,37,36,37,36,37,36,37,36,37,36,37, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 36,37,36,37,36,37,36,37,36,37,36,37, }, -- 23 { - 36,37,36,37,36,37,37,255,255,255,36,37, - 255,255,255,255,255,255,255,255,255,33,255,255, - 255,255,255,255,255,255,255,255,2,255,255,255, - 255,255,255,255,255,255,255,2,255,255,255,255, - 255,255,255,255,255,255,2,255,255,255,255,255, + 36,37,36,37,36,37,37,256,256,256,36,37, + 256,256,256,256,256,256,256,256,256,33,256,256, + 256,256,256,256,256,256,256,256,2,256,256,256, + 256,256,256,256,256,256,256,2,256,256,256,256, + 256,256,256,256,256,256,2,256,256,256,256,256, 36,37,36,37,36,37,36,37,36,37,36,37, }, -- 24 { 36,37,36,37,36,37,36,37,36,37,36,37, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 36,37,36,37,36,37,36,37,36,37,36,37, }, -- 25 { 36,37,36,37,36,37,36,37,36,37,36,33, - 255,255,255,255,255,255,255,255,255,255,255,32, - 255,255,255,255,255,255,255,255,255,255,255,32, - 255,255,255,255,255,255,255,255,255,255,255,32, - 255,255,255,255,255,255,255,255,8,9,255,32, + 256,256,256,256,256,256,256,256,256,256,256,32, + 256,256,256,256,256,256,256,256,256,256,256,32, + 256,256,256,256,256,256,256,256,256,256,256,32, + 256,256,256,256,256,256,256,256,8,9,256,32, 36,37,36,37,36,37,36,37,8,9,36,37, }, -- 26 { 18,19,17,17,18,19,17,17,10,11,18,19, - 17,255,255,255,255,255,255,255,10,11,255,255, - 18,19,255,255,255,255,255,255,10,11,255,255, - 255,17,255,255,255,255,255,255,10,11,255,255, - 18,19,255,255,255,255,255,255,10,11,255,255, - 20,21,255,255,18,19,17,17,18,19,17,17, + 17,256,256,256,256,256,256,256,10,11,256,256, + 18,19,256,256,256,256,256,256,10,11,256,256, + 256,17,256,256,256,256,256,256,10,11,256,256, + 18,19,256,256,256,256,256,256,10,11,256,256, + 20,21,256,256,18,19,17,17,18,19,17,17, }, -- 27 { 17,17,18,19,17,17,18,19,17,17,18,19, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 17,17,18,19,17,255,80,17,18,19,17,17, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 17,17,18,19,17,256,80,17,18,19,17,17, }, -- 28 { - 18,19,17,18,19,255,255,33,33,34,35,33, - 255,255,255,17,17,255,255,34,35,255,255,255, - 255,255,255,18,19,255,255,33,33,255,255,255, - 255,255,255,17,17,255,255,34,35,255,255,255, - 255,255,255,18,19,255,255,33,33,255,255,255, - 17,18,19,17,17,255,255,34,35,33,33,34, + 18,19,17,18,19,256,256,33,33,34,35,33, + 256,256,256,17,17,256,256,34,35,256,256,256, + 256,256,256,18,19,256,256,33,33,256,256,256, + 256,256,256,17,17,256,256,34,35,256,256,256, + 256,256,256,18,19,256,256,33,33,256,256,256, + 17,18,19,17,17,256,256,34,35,33,33,34, }, -- 29 { - 36,37,36,37,36,37,255,255,255,33,34,35, - 255,255,255,255,255,255,255,255,33,255,255,255, - 255,255,255,255,255,255,255,2,255,255,255,255, - 255,255,255,255,255,255,2,255,255,255,255,255, - 255,255,255,255,255,2,255,255,255,255,255,255, + 36,37,36,37,36,37,256,256,256,33,34,35, + 256,256,256,256,256,256,256,256,33,256,256,256, + 256,256,256,256,256,256,256,2,256,256,256,256, + 256,256,256,256,256,256,2,256,256,256,256,256, + 256,256,256,256,256,2,256,256,256,256,256,256, 34,35,33,33,34,35,33,33,34,35,33,33, }, -- 30 { 33,33,34,35,33,33,34,35,8,9,33,33, - 255,255,255,255,255,255,33,33,8,9,34,35, - 255,255,255,255,255,255,34,35,8,9,33,33, - 255,255,255,255,255,255,33,33,8,9,34,35, - 255,255,255,255,255,255,34,35,8,9,33,33, + 256,256,256,256,256,256,33,33,8,9,34,35, + 256,256,256,256,256,256,34,35,8,9,33,33, + 256,256,256,256,256,256,33,33,8,9,34,35, + 256,256,256,256,256,256,34,35,8,9,33,33, 34,35,33,33,34,35,33,33,8,9,34,35, }, -- 31 { 41,45,8,9,44,45,44,45,44,45,44,45, - 40,255,8,9,255,255,255,255,255,255,255,255, - 40,255,8,9,255,255,255,255,255,255,255,255, - 40,255,8,9,255,255,255,255,255,255,255,255, - 40,255,8,9,255,255,255,255,255,255,255,255, + 40,256,8,9,256,256,256,256,256,256,256,256, + 40,256,8,9,256,256,256,256,256,256,256,256, + 40,256,8,9,256,256,256,256,256,256,256,256, + 40,256,8,9,256,256,256,256,256,256,256,256, 44,45,8,9,44,45,44,45,44,45,44,45, }, -- 32 { 44,45,44,45,44,45,44,45,44,45,44,45, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 44,45,44,45,44,45,45,255,255,41,44,45, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 44,45,44,45,44,45,45,256,83,41,44,45, }, -- 33 { 44,45,44,45,44,45,44,45,44,45,44,45, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 44,45,44,45,44,45,44,45,44,45,44,45, }, -- 34 { 44,45,44,45,44,45,44,45,44,45,44,41, - 255,255,255,255,255,255,255,255,255,255,255,40, - 255,255,255,255,255,255,255,255,255,255,255,40, - 255,255,255,255,255,255,255,255,255,255,255,40, - 255,255,255,255,255,255,255,255,255,255,255,40, - 44,45,41,255,255,44,44,45,44,45,44,45, + 256,256,256,256,256,256,256,256,256,256,256,40, + 256,256,256,256,256,256,256,256,256,256,256,40, + 256,256,256,256,256,256,256,256,256,256,256,40, + 256,256,256,256,256,256,256,256,256,256,256,40, + 44,45,41,83,256,44,44,45,44,45,44,45, }, -- 35 { 25,29,28,29,28,29,28,29,8,9,28,25, - 24,255,255,255,255,255,255,255,8,9,255,24, - 24,255,255,255,255,255,255,255,8,9,255,24, - 24,255,255,255,255,255,255,255,8,9,255,24, - 24,255,255,255,255,255,255,255,8,9,255,24, + 24,256,256,256,256,256,256,256,8,9,256,24, + 24,256,256,256,256,256,256,256,8,9,256,24, + 24,256,256,256,256,256,256,256,8,9,256,24, + 24,256,256,256,256,256,256,256,8,9,256,24, 28,29,28,29,28,29,28,29,8,9,28,29, }, -- 36 { - 24,29,255,255,28,29,28,29,28,29,28,29, - 24,255,255,255,255,255,255,255,255,255,255,255, - 24,255,255,255,255,255,255,255,255,255,255,255, - 24,255,255,255,255,255,255,255,255,255,255,255, - 24,25,255,255,255,255,255,255,255,255,255,255, - 28,29,28,29,25,81,255,28,29,28,29,28, + 24,29,256,256,28,29,28,29,28,29,28,29, + 24,256,256,256,256,256,256,256,256,256,256,256, + 24,256,256,256,256,256,256,256,256,256,256,256, + 24,256,256,256,256,256,256,256,256,256,256,256, + 24,25,256,256,256,256,256,256,256,256,256,256, + 28,29,28,29,25,81,256,28,29,28,29,28, }, -- 37 { - 29,28,29,28,29,255,255,255,26,27,28,29, - 255,255,255,255,255,255,255,25,255,255,255,255, - 255,255,255,255,255,255,1,255,255,255,255,255, - 255,255,255,255,255,1,255,255,255,255,255,255, - 255,255,255,255,1,255,255,255,255,255,255,255, + 29,28,29,28,29,256,256,256,26,27,28,29, + 256,256,256,256,256,256,256,25,256,256,256,256, + 256,256,256,256,256,256,1,256,256,256,256,256, + 256,256,256,256,256,1,256,256,256,256,256,256, + 256,256,256,256,1,256,256,256,256,256,256,256, 28,29,28,29,28,29,28,29,28,29,28,29, }, -- 38 { - 28,29,28,29,28,255,255,29,28,29,28,29, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,10,11,255,255, - 28,29,28,29,28,255,255,29,10,11,28,29, + 29,28,29,28,29,256,256,28,29,28,29,28, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,10,11,256,256, + 29,28,29,28,29,256,256,28,10,11,29,28, }, -- 39 { 28,29,28,29,28,29,28,29,28,29,28,29, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 28,29,255,255,28,29,28,29,28,29,28,29, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 28,29,256,256,28,29,28,29,28,29,28,29, }, -- 40 { 28,29,28,29,28,29,28,29,8,9,26,27, - 255,255,255,255,255,255,255,255,8,9,25,25, - 255,255,255,255,255,255,255,255,8,9,26,27, - 255,255,255,255,255,255,255,255,8,9,25,25, - 255,255,255,255,255,255,255,255,8,9,26,27, + 256,256,256,256,256,256,256,256,8,9,25,25, + 256,256,256,256,256,256,256,256,8,9,26,27, + 256,256,256,256,256,256,256,256,8,9,25,25, + 256,256,256,256,256,256,256,256,8,9,26,27, 28,29,28,29,28,29,28,29,28,29,25,25, }, -- 41 { 25,29,8,9,28,29,28,29,28,29,28,29, - 24,255,8,9,255,255,255,255,255,255,255,255, - 24,255,8,9,255,255,255,255,255,255,255,255, - 24,255,8,9,255,255,255,255,255,255,255,255, - 24,255,8,9,255,255,255,255,255,255,255,255, - 28,29,28,29,28,29,25,255,255,28,29,29, + 24,256,8,9,256,256,256,256,256,256,256,256, + 24,256,8,9,256,256,256,256,256,256,256,256, + 24,256,8,9,256,256,256,256,256,256,256,256, + 24,256,8,9,256,256,256,256,256,256,256,256, + 28,29,28,29,28,29,25,81,256,28,29,29, }, -- 42 { - 28,29,28,29,28,29,29,255,255,255,28,29, - 255,255,255,255,255,255,255,255,255,25,255,255, - 255,255,255,255,255,255,255,255,1,255,255,255, - 255,255,255,255,255,255,255,1,255,255,255,255, - 255,255,255,255,255,255,1,255,255,255,255,255, + 28,29,28,29,28,29,29,256,256,256,28,29, + 256,256,256,256,256,256,256,256,256,25,256,256, + 256,256,256,256,256,256,256,256,1,256,256,256, + 256,256,256,256,256,256,256,1,256,256,256,256, + 256,256,256,256,256,256,1,256,256,256,256,256, 28,29,28,29,28,29,28,29,28,29,28,29, }, -- 43 { 28,29,28,29,28,29,28,29,28,29,28,25, - 255,255,255,255,255,255,255,255,255,255,255,24, - 255,255,255,255,255,255,255,255,255,255,255,24, - 255,255,255,255,255,255,255,255,255,255,255,24, - 255,255,10,11,255,255,255,255,255,255,255,24, + 256,256,256,256,256,256,256,256,256,256,256,24, + 256,256,256,256,256,256,256,256,256,256,256,24, + 256,256,256,256,256,256,256,256,256,256,256,24, + 256,256,10,11,256,256,256,256,256,256,256,24, 28,29,10,11,28,29,28,29,28,29,28,29, }, -- 44 { - 33,37,255,255,255,36,36,37,36,37,36,37, - 32,255,33,255,255,255,255,255,255,255,255,255, - 32,255,255,2,255,255,255,255,255,255,255,255, - 32,255,255,255,2,255,255,255,255,255,255,255, - 32,255,255,255,255,2,255,255,255,255,255,255, + 33,37,256,256,256,36,36,37,36,37,36,37, + 32,256,33,256,256,256,256,256,256,256,256,256, + 32,256,256,2,256,256,256,256,256,256,256,256, + 32,256,256,256,2,256,256,256,256,256,256,256, + 32,256,256,256,256,2,256,256,256,256,256,256, 36,37,36,37,36,37,36,37,36,37,36,37, }, -- 45 { 36,37,36,37,36,37,36,37,8,9,36,33, - 255,255,255,255,255,255,255,255,8,9,255,32, - 255,255,255,255,255,255,255,255,8,9,255,32, - 255,255,255,255,255,255,255,255,8,9,255,32, - 255,255,255,255,255,255,255,255,8,9,255,32, + 256,256,256,256,256,256,256,256,8,9,256,32, + 256,256,256,256,256,256,256,256,8,9,256,32, + 256,256,256,256,256,256,256,256,8,9,256,32, + 256,256,256,256,256,256,256,256,8,9,256,32, 36,37,36,37,36,37,36,37,36,37,36,37, }, -- 46 { - 18,19,18,19,255,255,255,20,21,20,21,20, - 18,19,255,255,17,255,255,255,255,255,255,255, - 18,19,255,255,255,0,255,255,255,255,255,255, - 18,19,255,255,255,255,0,255,255,255,255,255, - 18,19,255,255,255,255,255,0,255,255,255,255, + 18,19,18,19,256,256,256,20,21,20,21,20, + 18,19,256,256,17,256,256,256,256,256,256,256, + 18,19,256,256,256,0,256,256,256,256,256,256, + 18,19,256,256,256,256,0,256,256,256,256,256, + 18,19,256,256,256,256,256,0,256,256,256,256, 18,19,18,19,18,19,18,19,18,19,18,19, }, -- 47 { 20,21,20,21,20,21,20,21,20,21,20,21, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 18,19,18,19,18,19,18,19,18,19,18,19, }, -- 48 { - 21,20,21,20,21,255,255,20,10,11,20,21, - 255,255,255,255,255,255,255,255,10,11,255,255, - 255,255,255,255,255,255,255,255,10,11,255,255, - 255,255,255,255,255,255,255,255,10,11,255,255, - 255,255,255,255,255,255,255,255,10,11,255,255, - 19,18,19,18,19,255,255,18,19,18,19,18, + 21,20,21,20,21,256,256,20,10,11,20,21, + 256,256,256,256,256,256,256,256,10,11,256,256, + 256,256,256,256,256,256,256,256,10,11,256,256, + 256,256,256,256,256,256,256,256,10,11,256,256, + 256,256,256,256,256,256,256,256,10,11,256,256, + 19,18,19,18,19,256,256,18,19,18,19,18, }, -- 49 { - 20,21,255,255,20,21,20,21,20,21,20,21, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 18,19,255,255,18,19,18,19,18,19,18,19, + 20,21,256,256,20,21,20,21,20,21,20,21, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 18,19,256,256,18,19,18,19,18,19,18,19, }, -- 50 { 20,21,20,21,20,21,20,21,20,21,20,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 19,18,19,18,19,18,19,255,80,17,18,19, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 19,18,19,18,19,18,19,256,80,17,18,19, }, -- 51 { - 42,43,44,45,44,45,255,255,255,44,45,45, - 40,72,255,255,255,255,41,255,255,255,255,255, - 40,88,255,255,255,255,255,3,255,255,255,255, - 40,255,255,255,255,255,255,255,3,255,255,255, - 40,255,255,255,255,255,255,255,255,3,255,255, + 42,43,44,45,44,45,256,256,256,44,45,45, + 40,72,256,256,256,256,41,256,256,256,256,256, + 40,88,256,256,256,256,256,3,256,256,256,256, + 40,256,256,256,256,256,256,256,3,256,256,256, + 40,256,256,256,256,256,256,256,256,3,256,256, 44,45,44,45,44,45,44,45,44,45,44,45, }, -- 52 { 44,45,44,45,44,45,44,45,44,45,44,41, - 255,255,255,255,255,255,255,255,255,255,255,40, - 255,255,255,255,255,255,255,255,255,255,255,40, - 255,255,255,255,255,255,255,255,255,255,255,40, - 255,255,255,255,255,255,255,255,255,255,255,40, - 44,45,41,255,255,44,44,45,44,45,44,45, + 256,256,256,256,256,256,256,256,256,256,256,40, + 256,256,256,256,256,256,256,256,256,256,256,40, + 256,256,256,256,256,256,256,256,256,256,256,40, + 256,256,256,256,256,256,256,256,256,256,256,40, + 44,45,41,83,256,44,44,45,44,45,44,45, }, -- 53 { 17,21,10,11,20,21,20,21,20,21,20,21, - 16,255,10,11,255,255,255,255,255,255,255,255, - 16,255,10,11,255,255,255,255,255,255,255,255, - 16,255,10,11,255,255,255,255,255,255,255,255, - 16,255,10,11,255,255,255,255,255,255,255,255, + 16,256,10,11,256,256,256,256,256,256,256,256, + 16,256,10,11,256,256,256,256,256,256,256,256, + 16,256,10,11,256,256,256,256,256,256,256,256, + 16,256,10,11,256,256,256,256,256,256,256,256, 20,21,20,21,20,21,20,21,20,21,20,21, }, -- 54 { - 20,21,20,21,21,17,18,19,67,255,255,255, - 255,255,255,255,255,17,18,19,255,65,68,64, - 255,255,255,255,255,15,18,19,255,255,255,255, - 255,255,255,255,255,255,38,255,67,255,64,255, - 255,255,255,255,255,255,38,255,255,255,255,255, + 20,21,20,21,21,17,18,19,67,256,256,256, + 256,256,256,256,256,17,18,19,256,65,68,64, + 256,256,256,256,256,15,18,19,256,256,256,256, + 256,256,256,256,256,256,38,256,67,256,64,256, + 256,256,256,256,256,256,38,256,256,256,256,256, 20,21,20,21,20,21,20,21,54,55,54,56, }, -- 55 { - 255,65,255,255,255,67,255,67,255,255,255,255, - 255,255,255,64,255,255,255,255,65,68,64,255, - 255,255,255,255,255,255,64,255,255,255,255,67, - 255,255,65,67,255,255,64,255,255,64,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 256,65,256,256,256,67,256,67,256,256,256,256, + 256,256,256,64,256,256,256,256,65,68,64,256, + 256,256,256,256,256,256,64,256,256,256,256,67, + 256,256,65,67,256,256,64,256,256,64,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 54,55,54,56,56,55,54,56,54,56,55,54, }, -- 56 { - 65,255,255,255,67,255,67,255,255,255,255,64, - 255,255,64,255,255,255,255,65,68,64,255,255, - 255,255,255,255,255,64,255,255,255,255,67,255, - 255,65,67,255,255,64,255,255,64,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 65,256,256,256,67,256,67,256,256,256,256,64, + 256,256,64,256,256,256,256,65,68,64,256,256, + 256,256,256,256,256,64,256,256,256,256,67,256, + 256,65,67,256,256,64,256,256,64,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 55,54,55,54,56,54,55,56,54,55,54,56, }, -- 57 { - 255,255,255,67,34,35,34,35,34,35,34,35, - 255,64,255,255,34,35,255,255,255,255,255,255, - 255,255,255,255,34,35,255,255,255,255,255,255, - 65,67,255,255,255,38,255,255,255,255,255,255, - 255,255,255,255,255,38,255,255,255,255,255,255, + 256,256,256,67,34,35,34,35,34,35,34,35, + 256,64,256,256,34,35,256,256,256,256,256,256, + 256,256,256,256,34,35,256,256,256,256,256,256, + 65,67,256,256,256,38,256,256,256,256,256,256, + 256,256,256,256,256,38,256,256,256,256,256,256, 54,55,56,54,36,37,36,37,36,37,36,37, }, -- 58 { - 35,34,35,34,35,255,255,34,35,34,35,34, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 37,36,37,36,37,255,255,36,37,36,37,36, + 35,34,35,34,35,256,256,34,35,34,35,34, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 37,36,37,36,37,256,256,36,37,36,37,36, }, -- 59 { - 34,35,255,255,34,35,34,35,34,35,34,35, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,8,9,255,255, + 34,35,256,256,34,35,34,35,34,35,34,35, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,8,9,256,256, 36,37,36,37,36,37,36,37,8,9,36,37, }, -- 60 { - 35,34,35,34,35,34,35,255,255,33,34,35, - 255,255,255,255,255,255,255,255,255,33,34,35, - 255,255,255,255,255,255,255,255,2,255,34,35, - 255,255,255,255,255,255,255,2,255,255,34,35, - 255,255,255,255,255,255,2,255,255,255,34,35, + 35,34,35,34,35,34,35,256,256,33,34,35, + 256,256,256,256,256,256,256,256,256,33,34,35, + 256,256,256,256,256,256,256,256,2,256,34,35, + 256,256,256,256,256,256,256,2,256,256,34,35, + 256,256,256,256,256,256,2,256,256,256,34,35, 36,37,36,37,36,37,36,37,36,37,36,37, }, -- 61 { 17,21,20,21,20,21,20,21,20,21,20,21, - 16,255,255,255,255,255,255,255,255,255,255,255, - 16,255,255,255,255,255,255,255,255,255,255,255, - 16,255,255,255,255,255,255,255,255,255,255,255, - 16,255,10,11,255,255,255,255,255,255,255,255, + 16,256,256,256,256,256,256,256,256,256,256,256, + 16,256,256,256,256,256,256,256,256,256,256,256, + 16,256,256,256,256,256,256,256,256,256,256,256, + 16,256,10,11,256,256,256,256,256,256,256,256, 20,21,10,11,20,21,20,21,20,21,20,21, }, -- 62 { - 20,21,255,255,255,20,20,21,20,21,20,21, - 255,255,17,255,255,255,255,255,255,255,255,255, - 255,255,255,0,255,255,255,255,255,255,255,255, - 255,255,255,255,0,255,255,255,255,255,255,255, - 255,255,255,255,255,0,255,255,255,255,255,255, + 20,21,256,256,256,20,20,21,20,21,20,21, + 256,256,17,256,256,256,256,256,256,256,256,256, + 256,256,256,0,256,256,256,256,256,256,256,256, + 256,256,256,256,0,256,256,256,256,256,256,256, + 256,256,256,256,256,0,256,256,256,256,256,256, 20,21,20,21,20,21,20,21,20,21,20,21, }, -- 63 { 20,21,20,21,20,21,20,21,20,21,20,17, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 255,255,255,255,255,255,255,255,255,255,255,16, - 20,21,17,255,255,20,20,21,20,21,20,21, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 256,256,256,256,256,256,256,256,256,256,256,16, + 20,21,17,80,256,20,20,21,20,21,20,21, }, -- 64 { 41,48,49,48,50,49,48,49,48,50,49,48, - 41,255,255,255,255,255,255,255,255,255,255,255, - 41,255,255,255,255,255,255,255,255,255,255,255, - 41,255,255,255,255,255,255,255,255,255,255,255, - 41,255,8,9,255,255,255,255,255,255,255,255, + 41,256,256,256,256,256,256,256,256,256,256,256, + 41,256,256,256,256,256,256,256,256,256,256,256, + 41,256,256,256,256,256,256,256,256,256,256,256, + 41,256,8,9,256,256,256,256,256,256,256,256, 42,43,8,9,42,43,42,43,42,43,42,43, }, -- 65 { 48,50,48,49,50,49,50,48,50,49,50,48, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,42,43,42,43, - 255,255,255,255,42,43,42,43,255,255,255,255, - 42,43,42,43,255,255,255,255,255,255,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,42,43,42,43, + 256,256,256,256,42,43,42,43,256,256,256,256, + 42,43,42,43,256,256,256,256,256,256,256,256, }, -- 66 { 48,49,48,48,50,49,48,50,49,48,48,50, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 42,43,42,43,42,43,255,255,255,255,255,255, - 255,255,255,255,42,43,3,255,255,255,255,255, - 255,255,255,255,42,43,42,43,42,43,42,43, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 42,43,42,43,42,43,256,256,256,256,256,256, + 256,256,256,256,42,43,3,256,256,256,256,256, + 256,256,256,256,42,43,42,43,42,43,42,43, }, -- 67 { 50,48,50,49,50,48,49,50,48,42,43,48, - 255,255,255,255,255,255,255,255,255,42,43,255, - 255,255,255,255,255,255,255,255,255,42,43,255, - 255,255,255,255,255,255,255,255,255,42,43,255, - 255,255,255,255,255,255,255,255,255,42,43,255, - 42,43,42,43,42,43,41,255,255,42,43,50, + 256,256,256,256,256,256,256,256,256,42,43,256, + 256,256,256,256,256,256,256,256,256,42,43,256, + 256,256,256,256,256,256,256,256,256,42,43,256, + 256,256,256,256,256,256,256,256,256,42,43,256, + 42,43,42,43,42,43,41,83,256,42,43,50, }, -- 68 { - 25,29,28,29,28,255,255,29,28,29,28,29, - 24,255,255,255,255,255,255,255,255,255,255,255, - 24,255,255,255,255,255,255,255,255,255,255,255, - 24,255,255,255,255,255,255,255,255,255,255,255, - 24,255,255,255,255,255,255,255,255,255,255,255, - 28,28,29,28,29,255,255,28,29,28,29,28, + 25,28,29,28,29,256,256,28,29,28,29,28, + 24,256,256,256,256,256,256,256,256,256,256,256, + 24,256,256,256,256,256,256,256,256,256,256,256, + 24,256,256,256,256,256,256,256,256,256,256,256, + 24,256,256,256,256,256,256,256,256,256,256,256, + 28,28,29,28,29,256,256,28,29,28,29,28, }, -- 69 { 28,29,28,29,28,29,28,29,8,9,28,29, - 255,255,255,255,255,255,255,255,8,9,255,255, - 255,255,255,255,255,255,255,255,8,9,255,255, - 255,255,255,255,255,255,255,255,8,9,255,255, - 255,255,255,255,255,255,255,255,8,9,255,255, + 256,256,256,256,256,256,256,256,8,9,256,256, + 256,256,256,256,256,256,256,256,8,9,256,256, + 256,256,256,256,256,256,256,256,8,9,256,256, + 256,256,256,256,256,256,256,256,8,9,256,256, 28,29,28,29,28,29,28,29,8,9,28,29, }, -- 70 { 28,29,26,27,26,27,26,27,26,27,26,27, - 255,255,255,255,28,29,26,27,26,27,26,27, - 255,255,255,255,255,255,255,255,28,29,26,27, - 255,255,255,255,255,69,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,26,27,26,27, + 256,256,256,256,28,29,26,27,26,27,26,27, + 256,256,256,256,256,256,256,256,28,29,26,27, + 256,256,256,256,256,69,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,26,27,26,27, 28,29,28,29,26,27,26,27,26,27,26,27, }, -- 71 { 26,27,10,11,26,27,26,27,26,27,26,27, - 25,255,10,11,255,255,255,255,255,255,255,255, - 25,255,10,11,255,255,255,255,255,255,255,255, - 25,255,10,11,255,255,255,255,255,255,255,255, - 25,255,10,11,255,255,255,255,255,255,255,255, + 25,256,10,11,256,256,256,256,256,256,256,256, + 25,256,10,11,256,256,256,256,256,256,256,256, + 25,256,10,11,256,256,256,256,256,256,256,256, + 25,256,10,11,256,256,256,256,256,256,256,256, 26,27,26,27,26,27,26,27,26,27,26,27, }, -- 72 { 26,27,26,27,26,27,26,27,26,27,26,27, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 26,27,26,27,26,27,26,27,26,27,26,27, }, -- 73 { - 26,27,255,255,255,25,26,27,26,27,26,27, - 255,255,25,255,255,255,255,255,255,255,255,255, - 255,255,255,1,255,255,255,255,255,255,255,255, - 255,255,255,255,1,255,255,255,255,255,255,255, - 255,255,255,255,255,1,255,255,255,255,255,255, + 26,27,256,256,256,25,26,27,26,27,26,27, + 256,256,25,256,256,256,256,256,256,256,256,256, + 256,256,256,1,256,256,256,256,256,256,256,256, + 256,256,256,256,1,256,256,256,256,256,256,256, + 256,256,256,256,256,1,256,256,256,256,256,256, 26,27,26,27,26,27,26,27,26,27,26,27, }, -- 74 { 26,27,8,9,26,27,26,27,26,27,26,27, - 255,255,8,9,255,255,255,255,255,255,255,255, - 255,255,8,9,255,255,255,255,255,255,255,255, - 255,255,8,9,255,255,255,255,255,255,255,255, - 255,255,8,9,255,255,255,255,255,255,255,255, + 256,256,8,9,256,256,256,256,256,256,256,256, + 256,256,8,9,256,256,256,256,256,256,256,256, + 256,256,8,9,256,256,256,256,256,256,256,256, + 256,256,8,9,256,256,256,256,256,256,256,256, 26,27,26,27,26,27,26,27,26,27,26,27, }, -- 75 { 26,27,26,27,26,27,26,27,26,27,26,27, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 26,27,26,27,26,27,26,27,26,27,26,27, }, -- 76 { 26,27,26,27,26,27,26,27,18,19,18,19, - 255,255,255,255,255,255,15,25,17,15,255,255, - 255,255,255,255,255,255,255,25,17,255,255,255, - 255,255,255,255,255,255,255,25,17,255,255,255, - 255,255,255,255,255,255,255,25,17,255,255,255, + 256,256,256,256,256,256,15,25,17,15,256,256, + 256,256,256,256,256,256,256,25,17,256,256,256, + 256,256,256,256,256,256,256,25,17,256,256,256, + 256,256,256,256,256,256,256,25,17,256,256,256, 26,27,26,27,26,27,26,27,51,53,52,51, }, -- 77 { - 18,19,18,19,18,19,255,255,255,18,19,52, - 255,255,17,255,255,255,17,255,255,255,255,255, - 255,255,38,255,255,255,255,0,255,255,255,255, - 255,255,38,255,255,255,255,255,0,255,255,255, - 255,255,38,255,255,255,255,255,255,0,255,255, + 18,19,18,19,18,19,256,256,256,18,19,52, + 256,256,17,256,256,256,17,256,256,256,256,256, + 256,256,38,256,256,256,256,0,256,256,256,256, + 256,256,38,256,256,256,256,256,0,256,256,256, + 256,256,38,256,256,256,256,256,256,0,256,256, 52,51,52,53,52,53,51,52,51,53,52,53, }, -- 78 { - 51,52,53,51,52,255,255,52,53,51,52,17, - 255,255,255,255,255,255,255,255,255,255,255,17, - 255,255,255,255,255,255,255,255,255,255,255,17, - 255,255,255,255,255,255,255,255,255,255,255,17, - 255,255,255,255,255,22,22,255,255,255,255,17, + 51,52,53,51,52,256,256,52,53,51,52,17, + 256,256,256,256,256,256,256,256,256,256,256,17, + 256,256,256,256,256,256,256,256,256,256,256,17, + 256,256,256,256,256,256,256,256,256,256,256,17, + 256,256,256,256,256,22,22,256,256,256,256,17, 51,52,53,53,51,53,52,53,51,52,51,17, }, -- 79 { - 255,255,255,255,42,43,42,43,8,9,42,43, - 255,255,255,255,42,43,72,255,8,9,255,255, - 255,255,255,255,42,43,88,255,8,9,255,255, - 255,255,255,255,42,43,255,255,8,9,255,255, - 255,255,255,255,42,43,255,255,8,9,255,255, - 255,255,255,255,42,43,42,43,42,43,42,43, + 256,256,256,256,42,43,42,43,8,9,42,43, + 256,256,256,256,42,43,72,256,8,9,256,256, + 256,256,256,256,42,43,88,256,8,9,256,256, + 256,256,256,256,42,43,256,256,8,9,256,256, + 256,256,256,256,42,43,256,256,8,9,256,256, + 256,256,256,256,42,43,42,43,42,43,42,43, }, -- 80 { - 42,43,42,43,42,43,42,43,255,255,255,255, - 255,255,255,255,255,255,42,43,255,255,255,255, - 255,255,255,255,255,255,42,43,255,255,255,255, - 255,255,255,255,255,255,42,43,255,255,255,255, - 255,255,255,255,255,255,42,43,255,255,255,255, - 42,43,42,43,42,43,42,43,255,255,255,255, + 42,43,42,43,42,43,42,43,256,256,256,256, + 256,256,256,256,256,256,42,43,256,256,256,256, + 256,256,256,256,256,256,42,43,256,256,256,256, + 256,256,256,256,256,256,42,43,256,256,256,256, + 256,256,256,256,256,256,42,43,256,256,256,256, + 42,43,42,43,42,43,42,43,256,256,256,256, }, } diff --git a/mapa.lua b/mapa.lua index eefb06b..6c1373e 100644 --- a/mapa.lua +++ b/mapa.lua @@ -1,6 +1,7 @@ --mapa={} tiletype={void=0,stair=1,switch=2,half=3,block=4} - +mapa.wait=0 +mapa.step=0 function mapa_do_backup() mapa_backup={} for i=1,#mapa do @@ -26,7 +27,7 @@ function mapa_new() mapa[mi]={} for ty=0,5 do for tx=0,11 do - local tile=255 + local tile=256 if mx==0 and tx==0 then tile=16 elseif mx==4 and tx==11 then @@ -61,11 +62,29 @@ function mapa_save() io.close(file) end +anim_tiles={177,178,176} +function mapa_update() + mapa.wait=mapa.wait+1 + + if mapa.wait==6 then + mapa.wait=0 + mapa.step=(mapa.step+1)&7 + for ty=0,5 do + for tx=0,11 do + local tile=mapa[1+hab][1+tx+ty*12] + if tile>=176 and tile<190 then + mapa[1+hab][1+tx+ty*12]=anim_tiles[tile-175] + end + end + end + end +end + function mapa_draw(hab) for ty=0,5 do for tx=0,11 do local tile=mapa[1+hab][1+tx+ty*12] - if tile~=255 then + if tile~=256 and (tile<190 or mapa.step~=0) then sspr((tile&15)*8,64+(tile>>4)*8,8,8,tx*8,ty*8) end end diff --git a/switches.lua b/switches.lua index e0277fb..00a4eae 100644 --- a/switches.lua +++ b/switches.lua @@ -26,7 +26,7 @@ function switches.update() if switches.wait==6 then switches.wait=0 - mapa_set_tile_by_index(switches.current_list[1]-1,switches.current_list[switches.current_index]+1,255) + mapa_set_tile_by_index(switches.current_list[1]-1,switches.current_list[switches.current_index]+1,256) switches.current_index=switches.current_index+1 if switches.current_index>#switches.current_list then switches.current_list=nil diff --git a/tiles.gif b/tiles.gif index 1aabda5f7bd6a9a1f292c880874ad13855746547..fadc5819a542b58f1402fad7d3e9b50ae0e4bbc2 100644 GIT binary patch delta 237 zcmVD2BLJaL>brBXJpWIEOI^hd&Wp!KHeSWrr{|5-~MZwS|X|wO~WI9CH8e8DG)PIVH5Scs72QegyBl*oyHSc#o@g=gegu%&v>cYf$M n5T^)-jrCYvgo+T6imF%ud^m`tsE4x{i?p~9vRI285fA`7tY=_r delta 58 zcmaDWwOew705c=UW