From a29dea89aea39132cd5193b5252063282856d628 Mon Sep 17 00:00:00 2001 From: JailGamer Date: Sun, 24 May 2026 23:09:43 +0200 Subject: [PATCH] =?UTF-8?q?Reestructuraci=C3=B3=20i=20neteja=20de=20codi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/game.lua | 2 +- data/intro.lua | 3 + data/main.lua | 8 +- data/map.lua | 839 -------------------------------------- data/mapa.lua | 1 + data/stage1.lua | 1 + data/stage1_world_map.lua | 6 + data/stage_mgr.lua | 4 +- data/viewport.lua | 2 +- 9 files changed, 21 insertions(+), 845 deletions(-) delete mode 100644 data/map.lua diff --git a/data/game.lua b/data/game.lua index f1f92b3..8fefc16 100644 --- a/data/game.lua +++ b/data/game.lua @@ -19,7 +19,7 @@ require "imp3" require "fireball" require "bar_meter" -require "stage1" +-- require "stage1" require "remote_view" require "dialeg" require "trigger_event" diff --git a/data/intro.lua b/data/intro.lua index 8b9662a..14b5583 100644 --- a/data/intro.lua +++ b/data/intro.lua @@ -40,6 +40,9 @@ end function intro_init() print("INTRO_INIT") -- game_update = intro_intro + mapa = stage1_mapa + load_tilemap( sf_mapa ) + intro_wait=400 surf.source(tiles) surf.target(0) diff --git a/data/main.lua b/data/main.lua index da52f28..1039b85 100644 --- a/data/main.lua +++ b/data/main.lua @@ -4,11 +4,12 @@ require "helpers" require "controller" require "states" -require "map" +-- require "map" require "mapa" require "warp" require "fade" require "audio" + require "requirements" require "logo" require "intro" @@ -17,10 +18,11 @@ require "title" require "game" require "opcions" require "opcions_input" -require "point" require "pause" require "game_over" +require "point" + require "fps" --require "menu" @@ -56,7 +58,7 @@ end function mapa_init() sf_mapa=surf.new(mapa_room_cols*mapa_rooms_per_piso,mapa_room_rows*mapa_pisos) - load_tilemap( sf_mapa ) + -- load_tilemap( sf_mapa ) end function audio_init() diff --git a/data/map.lua b/data/map.lua deleted file mode 100644 index c7e0751..0000000 --- a/data/map.lua +++ /dev/null @@ -1,839 +0,0 @@ -mapa_room_cols = 12; -- en quantitat de tiles -mapa_room_rows = 6; -- en quantitat de tiles -mapa_rooms_per_piso = 10 -mapa_pisos = 8 -mapa_empty_tile = 256 - --- 0 1 2 3 4 5 6 7 8 9 --- 10 11 12 13 14 15 16 17 18 19 --- ... --- 70 71 72 73 74 75 76 77 78 79 - -mapa={ - -- 1 - { - 256,256,256,18,19,21,20,21,20,21,20,21, - 64,68,256,16,72,256,256,256,256,256,256,256, - 256,256,66,256,88,256,256,70,71,256,256,256, - 256,66,256,16,256,112,256,86,87,256,114,256, - 66,256,256,16,256,256,256,256,256,256,256,256, - 256,64,256,16,20,21,20,21,20,21,20,21, - - }, - -- 2 - { - 20,21,20,21,20,21,20,21,20,21,20,21, - 256,256,256,256,256,256,256,256,256,256,256,256, - 256,256,73,74,256,256,256,256,73,74,256,256, - 256,256,89,90,256,256,256,256,89,90,256,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, - 20,21,20,21,20,21,21,256,256,0,20,21, - }, - -- 3 - { - 20,21,20,21,20,21,20,21,20,21,20,21, - 256,256,256,256,256,256,256,256,256,256,256,256, - 256,96,97,96,256,73,74,256,97,96,96,256, - 256,99,256,100,256,89,90,256,99,256,100,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,18,19, - 256,256,256,256,256,256,256,256,256,256,77,17, - 256,73,74,256,256,73,74,256,98,98,93,17, - 256,89,90,256,256,89,90,256,99,100,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 - { - 66,256,256,67,256,65,256,64,256,256,256,66, - 256,256,64,256,256,256,256,256,256,68,256,67, - 18,19,18,19,18,19,18,19,256,256,65,256, - 256,256,256,256,256,256,256,16,256,256,256,256, - 256,256,256,256,256,256,256,16,256,64,256,66, - 20,21,20,21,20,21,20,21,256,256,66,256, - - }, - -- 6 - { - 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,96,97,256,256,256,256, - 256,67,256,41,256,256,99,100,256,256,256,256, - 65,256,256,41,95,256,256,256,10,11,256,256, - 256,65,42,43,44,45,44,45,10,11,44,45, - - }, - -- 7 - { - 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,65,256,67,256,67,256, - 256,256,256,256,256,256,256,256,256,256,256,256, - 42,43,20,21,20,21,20,21,20,21,20,21, - - }, - -- 8 - { - 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,65,256,67,256,67,256,256, - 256,256,256,256,256,111,111,256,256,256,256,256, - 20,21,20,21,17,256,256,17,20,21,20,21, - - }, - -- 9 - { - 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,65,256,67,256,67,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, - - }, - -- 10 - { - 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,73,74,256,256,73,74,256,256,18,19, - 256,256,89,90,256,256,89,90,256,256,17,17, - 256,256,256,256,256,256,256,256,256,256,18,19, - -- 20,21,256,80,17,18,19,17,18,19,17,17, - 20,21,256,256,0,18,19,17,18,19,17,17, - - }, - -- 11 - { - 256,66,26,27,28,29,28,29,26,27,28,29, - 256,256,256,24,256,256,256,256,15,25,256,256, - 64,68,256,256,256,256,256,256,256,25,256,256, - 256,256,66,24,256,121,256,256,256,38,256,256, - 256,66,256,24,101,102,103,256,256,38,256,256, - 66,256,256,24,28,29,28,29,28,29,28,29, - - }, - -- 12 - { - -- 28,29,28,29,28,29,29,256,256,256,26,27, - 28,29,28,29,28,29,29,1,256,256,26,27, - 256,256,256,256,256,256,256,256,256,25,72,256, - 256,256,73,74,256,256,256,256,1,256,88,256, - 256,256,89,90,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,26,27,26,27,28,29,28,29,28,29, - 256,256,256,26,27,256,256,256,256,256,256,256, - 256,256,256,256,256,256,256,256,73,74,256,256, - 256,256,256,98,98,256,256,256,89,90,256,256, - 256,256,104,101,102,103,256,256,256,256,256,256, - -- 28,29,28,29,28,29,29,256,81,25,28,29, - 28,29,28,29,28,29,29,256,256,1,28,29, - - }, - -- 14 - { - 28,29,28,29,28,29,28,29,10,11,28,25, - 256,256,256,256,256,256,256,256,10,11,256,25, - 256,73,74,256,256,256,256,256,10,11,256,256, - 256,89,90,256,256,75,76,256,10,11,256,25, - 256,256,256,256,256,91,92,256,10,11,256,25, - 28,29,28,29,28,29,28,29,28,29,28,29, - - }, - -- 15 - { - 26,27,26,27,28,29,28,29,26,27,26,27, - 28,29,256,256,256,256,256,256,256,256,28,24, - 256,256,256,256,256,73,74,256,256,256,256,24, - 256,256,75,76,256,89,90,256,75,76,256,24, - 256,256,91,92,256,256,256,256,91,92,256,24, - 26,27,28,29,28,29,28,29,28,29,26,27, - - }, - -- 16 - { - 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,107,108,256,10,11,256,256, - 65,256,256,25,256,109,110,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, - 256,256,256,256,25,41,256,256,256,256,256,256, - 256,73,74,256,25,41,256,256,73,74,256,256, - 256,89,90,78,25,41,256,256,89,90,256,256, - 256,256,95,94,25,41,256,256,10,11,256,256, - 28,29,28,29,25,41,44,45,10,11,44,45, - - }, - -- 18 - { - 44,45,44,45,41,256,256,41,44,45,44,45, - 256,256,256,256,256,69,256,256,256,256,256,256, - 256,256,256,256,256,256,69,256,256,256,256,256, - 256,256,256,256,256,111,111,256,256,256,256,256, - 256,256,256,41,41,256,69,41,41,256,256,256, - 45,44,45,42,43,256,256,42,43,44,45,44, - - }, - -- 19 - { - 44,45,44,45,42,43,42,43,44,45,44,45, - 256,256,256,256,256,40,40,256,256,256,256,256, - 256,97,98,97,256,40,40,256,98,97,96,256, - 256,99,256,100,256,40,40,256,99,256,100,256, - 256,256,256,256,256,40,40,256,256,256,256,256, - -- 3,41,83,256,44,45,44,45,44,45,44,45, - 45,3,256,256,44,45,44,45,44,45,44,45, - - }, - -- 20 - { - -- 44,45,256,256,256,42,43,41,42,43,41,41, - 44,45,3,256,256,42,43,41,42,43,41,41, - 256,256,256,256,41,41,256,256,256,77,42,43, - 256,256,256,3,256,41,256,256,256,93,41,41, - 256,256,3,256,256,39,256,256,256,256,42,43, - 256,3,256,256,256,38,256,256,8,9,41,41, - 44,45,44,45,44,45,44,45,8,9,42,43, - - }, - -- 21 - { - 34,35,36,37,36,37,36,37,36,37,36,37, - 32,256,256,256,256,256,256,256,256,256,256,256, - 32,256,97,97,98,256,256,256,97,96,97,256, - 32,256,99,256,100,256,256,256,99,256,100,256, - 32,256,8,9,256,104,101,102,103,256,256,256, - 34,35,8,9,36,37,36,37,36,37,36,37, - - }, - -- 22 - { - 36,37,33,33,36,37,36,37,33,33,36,37, - 256,256,256,256,256,256,256,256,256,256,256,256, - 256,256,256,256,96,97,96,98,256,256,256,256, - 256,256,113,256,99,256,256,100,256,114,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 - { - -- 37,36,37,36,37,36,37,256,256,256,36,37, - 37,36,37,36,37,36,37,2,256,256,36,37, - 256,256,256,256,256,256,256,256,256,33,256,256, - 256,97,98,97,256,256,112,256,2,256,256,256, - 256,99,256,100,256,256,256,2,256,75,76,256, - 256,256,256,256,256,256,2,256,256,91,92,256, - 36,37,36,37,36,37,36,37,36,37,36,37, - - }, - -- 24 - { - 34,35,256,256,256,256,256,256,256,256,34,35, - 256,2,34,35,34,35,34,35,34,35,2,256, - 256,256,113,256,256,112,114,256,256,114,256,256, - 256,256,256,256,256,256,256,256,256,256,256,256, - 256,104,101,102,256,101,102,256,101,102,103,256, - 36,37,36,37,36,37,36,37,36,37,36,37, - - }, - -- 25 - { - 36,37,36,37,36,37,36,37,36,37,34,35, - 256,256,256,256,256,256,73,74,256,256,77,32, - 256,96,97,96,256,256,89,90,256,256,93,32, - 256,99,256,100,256,121,256,256,256,256,256,32, - 256,256,256,256,256,101,102,103,8,9,256,32, - 36,37,36,37,36,37,36,37,8,9,33,32, - - }, - -- 26 - { - 18,19,17,17,18,19,17,17,10,11,18,19, - 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,75,76,256,10,11,256,256, - 18,19,256,256,256,91,92,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,10,11,18,19, - 256,256,256,256,256,256,256,256,10,11,256,256, - 256,73,74,256,256,73,74,256,10,11,256,256, - 256,89,90,256,256,89,90,256,10,11,256,256, - 256,256,256,256,256,256,256,256,10,11,256,256, - -- 17,17,18,19,17,256,80,17,18,19,17,17, - 17,17,18,19,17,256,256,0,18,19,17,17, - - }, - -- 28 - { - 18,19,17,18,19,256,256,33,33,34,35,33, - 256,256,256,17,17,256,69,34,35,72,256,256, - 256,256,256,18,19,256,69,33,33,88,256,256, - 256,256,256,17,16,256,256,34,35,256,256,256, - 256,256,256,18,19,69,256,41,33,256,256,256, - 17,18,19,17,17,69,256,34,35,33,33,34, - - }, - -- 29 - { - -- 33,256,256,256,33,33,34,35,33,33,34,35, - 33,256,256,2,33,33,34,35,33,33,34,35, - 256,33,256,256,256,256,256,256,256,256,256,256, - 256,256,2,256,256,256,256,256,256,256,256,256, - 256,256,256,2,256,256,256,117,98,106,116,256, - 256,256,256,256,2,256,104,101,102,101,102,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, - 256,256,256,256,256,256,33,33,8,9,34,35, - 256,256,256,256,256,97,34,35,8,9,33,33, - 256,256,256,256,115,100,33,33,8,9,34,35, - 256,256,256,104,101,102,34,35,8,9,33,33, - 34,35,33,33,34,35,33,33,8,9,34,35, - - }, - -- 31 - { - 40,40,8,9,40,40,40,40,40,40,40,40, - 40,45,8,9,45,44,45,44,45,44,45,44, - 40,256,8,9,256,256,256,256,256,256,256,256, - 40,256,8,9,256,256,112,75,76,113,256,256, - 40,256,8,9,256,256,256,91,92,256,256,256, - 42,43,44,45,44,45,44,45,44,45,44,45, - - }, - -- 32 - { - 40,40,40,40,40,40,40,40,40,40,40,40, - 44,45,41,45,44,41,44,45,44,45,44,45, - 256,256,38,256,256,38,256,256,256,256,256,256, - 256,112,38,256,113,38,256,256,114,256,256,113, - 256,256,38,256,256,38,256,256,256,256,256,256, - -- 44,45,41,83,256,44,45,44,45,44,45,44, - 44,45,3,256,256,44,45,44,45,44,45,44, - - }, - -- 33 - { - 40,40,40,40,40,40,40,40,40,40,40,40, - 43,44,45,44,45,42,43,44,45,44,45,42, - 256,256,256,256,256,256,256,256,256,256,256,256, - 256,256,75,76,256,114,113,256,75,76,256,256, - 256,256,91,92,256,256,256,256,91,92,256,256, - 44,45,44,45,44,45,44,45,44,45,44,45, - - }, - -- 34 - { - 40,40,40,40,40,40,40,40,40,40,40,40, - 45,44,45,44,45,44,45,44,45,44,45,40, - 256,256,256,256,256,256,256,256,73,74,256,40, - 256,256,113,256,256,114,256,121,89,90,256,40, - 256,256,256,256,256,256,256,101,102,103,256,40, - -- 44,45,41,83,256,44,45,44,45,44,45,40, - 44,45,3,256,256,44,45,44,45,44,45,40, - - }, - -- 35 - { - 26,27,28,29,28,29,28,29,8,9,26,27, - 24,15,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, - 26,27,28,29,28,29,28,29,8,9,26,27, - - }, - -- 36 - { - 24,29,256,256,1,25,26,27,25,1,28,29, - 24,256,256,256,256,256,25,26,27,256,256,256, - 24,256,256,256,256,256,256,256,25,256,256,256, - 24,256,106,116,256,256,256,256,38,256,256,256, - 24,25,101,102,256,256,256,256,38,256,256,256, - -- 28,29,28,29,25,81,256,28,29,28,29,28, - 28,29,28,29,1,256,256,28,29,28,29,28, - - }, - -- 37 - { - -- 29,26,27,28,29,256,256,256,26,27,26,27, - 29,26,27,28,29,1,256,256,26,27,26,27, - 256,256,256,256,256,256,256,25,256,256,28,29, - 256,256,256,256,256,256,1,256,256,256,256,256, - 256,112,256,256,256,1,256,256,256,256,113,256, - 256,256,256,256,1,256,101,102,103,256,256,256, - 28,29,28,29,28,29,28,29,28,29,28,29, - - }, - -- 38 - { - 27,26,27,28,29,256,256,28,29,26,27,26, - 29,256,256,256,256,256,69,256,256,256,256,28, - 256,256,98,96,98,256,256,98,98,96,256,256, - 256,256,99,256,100,256,256,99,256,100,256,256, - 256,256,256,256,256,111,111,256,256,256,256,256, - 29,28,29,28,29,69,256,28,29,28,29,28, - - }, - -- 39 - { - 28,29,25,25,28,29,25,25,28,29,25,25, - 256,256,25,25,256,256,256,256,256,256,106,24, - 256,256,15,256,256,256,256,256,256,256,95,24, - 256,256,256,256,78,97,107,108,256,106,105,24, - 256,256,256,256,94,101,102,110,103,105,98,24, - 28,29,28,29,28,29,28,29,28,29,28,29, - - }, - -- 40 - { - 24,29,28,29,28,29,28,29,8,9,26,27, - 24,256,256,256,256,256,256,256,8,9,25,25, - 24,256,114,256,256,256,112,256,8,9,26,27, - 24,256,256,256,256,256,256,256,8,9,25,25, - 24,256,256,256,105,256,256,256,8,9,26,27, - 24,29,28,29,28,29,28,29,28,29,25,25, - - }, - -- 41 - { - 26,27,28,29,28,29,26,27,26,27,28,29, - 24,72,256,256,256,256,256,28,29,256,256,256, - 24,88,256,256,256,256,256,256,256,256,256,256, - 24,256,256,256,112,256,256,256,256,256,114,256, - 24,256,256,256,256,256,256,256,256,256,256,256, - -- 28,29,28,29,28,29,25,81,256,28,29,29, - 28,29,28,29,28,29,1,256,256,28,29,29, - - }, - -- 42 - { - -- 28,29,256,256,256,1,26,27,26,27,28,29, - 28,29,256,256,1,1,26,27,26,27,28,29, - 256,256,25,256,256,256,256,28,29,256,256,256, - 256,256,256,1,256,256,256,256,256,256,256,256, - 256,113,256,256,1,256,256,96,97,96,98,256, - 256,256,256,256,256,1,256,101,256,256,102,256, - 28,29,28,29,28,29,28,29,28,29,28,29, - - }, - -- 43 - { - 28,29,28,29,26,27,26,27,28,29,26,27, - 256,256,256,256,256,28,29,256,256,256,77,24, - 256,256,256,256,256,256,256,256,256,256,93,24, - 256,113,256,256,256,75,76,256,114,256,256,24, - 256,256,10,11,256,91,92,256,256,256,256,24, - 28,29,10,11,28,29,28,29,28,29,28,29, - - }, - -- 44 - { - -- 33,37,256,256,256,36,37,36,37,36,37,2, - 33,37,256,256,2,36,37,36,37,36,37,2, - 32,256,33,256,256,256,256,256,256,256,256,256, - 32,98,256,2,256,256,256,256,256,256,256,256, - 32,99,256,256,2,256,256,256,75,76,256,256, - 32,256,256,256,256,2,256,256,91,92,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,34,35, - 256,256,256,256,256,256,256,256,8,9,256,32, - 256,256,98,97,96,256,256,256,8,9,256,32, - 256,256,99,256,100,256,256,256,8,9,256,32, - 256,256,256,256,101,102,103,256,8,9,256,32, - 36,37,36,37,36,37,36,37,36,37,36,37, - - }, - -- 46 - { - -- 18,19,18,19,256,256,256,20,21,20,21,20, - 18,19,18,19,256,256,0,20,21,20,21,20, - 18,19,72,256,17,256,256,256,256,256,256,256, - 18,19,88,256,256,0,256,256,256,256,256,256, - 18,19,256,75,76,78,0,256,256,116,256,256, - 18,19,256,91,92,94,95,0,256,101,102,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, - 256,256,256,256,256,256,256,256,256,256,256,256, - 256,97,96,98,97,256,256,96,97,98,96,256, - 114,99,256,256,100,114,114,99,256,256,100,114, - 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 - { - 20,21,20,21,17,256,256,17,20,21,20,21, - 256,256,256,256,256,256,69,256,256,256,256,256, - 256,256,96,97,256,256,69,256,256,256,256,256, - 256,115,99,100,256,256,256,256,256,117,256,256, - 256,101,102,103,256,111,111,256,101,102,103,256, - 19,18,19,18,19,69,256,18,19,18,19,18, - - }, - -- 49 - { - 20,21,256,69,18,19,18,19,20,21,20,21, - 256,256,256,256,256,256,256,256,256,256,114,256, - 256,256,69,256,256,256,114,256,256,256,256,256, - 256,114,69,111,256,256,256,256,17,18,19,17, - 256,256,111,256,18,19,18,19,18,19,18,19, - 18,19,256,69,17,18,19,18,19,18,19,17, - - }, - -- 50 - { - 20,21,20,21,20,21,20,21,20,21,20,16, - 256,114,256,256,256,256,256,256,256,256,98,16, - 256,256,256,256,256,256,256,256,256,256,100,16, - 17,19,256,256,256,114,256,256,256,256,78,16, - 18,19,18,19,256,256,256,256,256,256,94,16, - -- 17,18,19,18,19,18,19,256,80,17,18,19, - 17,18,19,18,19,18,19,256,256,0,18,19, - - }, - -- 51 - { - -- 42,43,44,45,44,45,256,256,256,44,45,45, - 42,43,44,45,44,45,256,256,3,44,45,45, - 40,72,256,256,256,256,41,256,256,256,256,256, - 40,96,256,256,256,256,256,3,256,256,256,256, - 40,99,256,114,256,114,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, - 256,256,256,256,256,256,256,256,256,256,256,40, - 256,256,73,74,256,256,256,70,71,256,97,40, - 256,256,89,90,256,256,256,86,87,256,100,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, - 44,45,3,256,256,44,44,45,44,45,44,45, - - }, - -- 53 - { - 18,19,10,11,18,19,17,17,20,21,20,21, - 16,15,10,11,256,256,256,256,256,256,256,256, - 16,256,10,11,256,256,75,76,256,256,256,256, - 16,256,10,11,256,256,91,92,256,256,256,256, - 16,256,10,11,256,256,18,19,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,256,256,256, - 256,256,256,256,256,17,18,19,256,65,68,64, - 256,256,256,256,256,256,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 - { - 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,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 - { - 256,256,256,67,34,35,34,35,34,35,34,35, - 256,64,256,256,34,35,72,256,256,256,256,256, - 256,256,256,256,34,35,88,256,256,256,256,256, - 65,67,256,256,256,38,256,256,75,76,256,256, - 256,256,256,256,256,38,256,256,91,92,256,256, - 54,55,56,54,36,37,36,37,36,37,36,37, - - }, - -- 58 - { - 35,34,35,34,35,69,256,34,35,34,35,34, - 256,256,256,256,256,69,256,256,256,256,256,256, - 256,113,70,71,114,256,256,112,107,108,113,256, - 256,256,86,87,256,256,69,256,109,110,256,256, - 256,256,256,256,256,111,111,256,256,256,256,256, - 37,36,37,36,37,256,256,36,37,36,37,36, - - }, - -- 59 - { - 34,35,256,256,34,35,34,35,34,35,34,35, - 256,256,256,69,256,256,256,256,256,256,256,256, - 256,256,69,256,256,256,97,96,256,256,256,256, - 256,256,111,111,256,256,99,100,256,256,256,256, - 256,41,120,119,41,256,256,256,8,9,256,256, - 3,41,46,47,41,3,36,37,8,9,36,37, - - }, - -- 60 - { - -- 35,34,35,34,35,34,35,256,256,33,34,35, - 35,34,35,34,35,34,35,2,256,256,34,35, - -- 256,256,36,37,256,256,256,256,256,33,34,35, - 256,256,36,37,256,256,256,256,256,2,34,35, - 256,256,256,256,256,256,256,256,2,77,34,35, - 256,256,116,256,256,256,256,2,256,93,34,35, - 256,256,101,102,103,256,2,256,256,256,34,35, - 36,37,36,37,36,37,36,37,36,37,36,37, - - }, - -- 61 - { - 18,19,21,20,21,20,21,20,21,17,18,19, - 16,15,256,256,256,256,256,256,256,77,18,19, - 16,256,256,256,256,256,256,256,256,93,18,19, - 16,256,256,256,256,256,256,116,256,78,18,19, - 16,256,10,11,256,256,101,102,256,94,18,19, - 20,21,10,11,20,21,20,21,20,21,20,21, - - }, - -- 62 - { - -- 18,19,256,256,256,20,20,21,20,21,20,21, - 18,19,256,256,0,0,20,21,20,21,20,21, - 16,72,17,256,256,256,256,256,256,256,256,256, - 16,88,256,0,256,256,256,256,256,256,256,256, - 16,256,256,78,0,256,256,114,75,76,256,256, - 16,95,256,94,256,0,256,256,91,92,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, - 256,256,256,256,256,256,256,256,256,256,256,16, - 256,256,256,256,256,256,256,256,256,256,98,16, - 256,256,256,256,256,256,117,97,96,256,100,16, - 256,256,256,256,256,256,101,256,102,103,256,16, - -- 20,21,17,80,256,20,20,21,20,21,20,21, - 20,21,0,256,256,20,20,21,20,21,20,21, - - }, - -- 64 - { - 41,48,49,48,50,49,48,49,48,50,49,48, - 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,113,256,256,114,256,256,112,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, - 256,256,256,256,256,256,256,256,256,256,112,256, - 256,256,256,256,256,256,113,256,256,256,256,256, - 256,256,114,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, - 256,113,256,256,114,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,112,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,50,49,41,42,43,48, - 256,256,256,256,256,256,256,256,77,42,43,256, - 256,256,256,256,256,256,256,256,93,42,43,256, - 256,256,114,256,256,113,256,256,256,42,43,256, - 256,256,256,256,256,256,256,256,256,42,43,256, - -- 42,43,41,41,42,43,41,83,256,42,43,50, - 42,43,41,41,42,43,3,256,256,42,43,50, - - }, - -- 68 - { - 25,28,29,26,27,256,69,26,27,28,29,28, - 24,97,256,256,256,256,256,256,256,256,256,256, - 24,99,256,256,256,69,256,256,256,256,256,256, - 24,256,95,256,113,69,256,256,114,75,76,256, - 24,101,102,103,256,111,111,256,256,91,92,256, - 28,28,29,28,29,256,69,28,29,28,29,28, - - }, - -- 69 - { - 28,29,26,27,26,27,28,29,8,9,28,29, - 256,256,256,28,29,256,256,256,8,9,256,256, - 256,256,256,256,256,256,256,256,8,9,256,256, - 75,76,75,76,75,76,75,76,8,9,256,256, - 91,92,91,92,91,92,91,92,8,9,256,256, - 28,29,1,26,27,1,28,29,8,9,28,29, - - }, - -- 70 - { - 28,29,26,27,25,25,256,256,65,256,256,256, - 256,256,256,77,26,27,256,256,256,68,256,256, - 256,256,256,93,25,25,256,256,256,256,66,256, - 256,256,256,78,26,27,256,66,256,256,256,67, - 256,256,95,94,25,25,256,256,256,256,256,256, - 28,29,28,29,26,27,54,56,54,56,55,54, - - }, - -- 71 - { - 46,47,10,11,46,47,46,47,46,47,46,47, - 47,256,10,11,256,256,256,256,256,256,256,256, - 47,98,10,11,256,256,256,256,256,256,256,256, - 47,99,10,11,256,256,115,105,256,256,256,256, - 47,256,10,11,256,256,101,102,103,256,256,256, - 46,47,46,47,46,47,46,47,46,47,46,47, - - }, - -- 72 - { - 46,47,46,47,46,47,46,47,46,47,46,47, - 256,256,256,256,256,256,26,27,26,27,28,29, - 256,256,256,256,256,256,38,256,256,256,256,256, - 256,256,256,116,256,256,38,256,256,256,256,256, - 256,256,101,102,256,256,26,27,26,27,256,256, - 46,47,46,47,46,47,46,47,46,47,28,29, - - }, - -- 73 - { - -- 46,47,256,256,256,25,26,27,26,27,26,27, - 46,47,256,256,1,25,26,27,26,27,26,27, - 28,29,25,256,256,256,256,256,256,28,29,25, - 256,256,256,1,256,256,256,116,96,96,256,256, - 256,256,256,256,1,256,256,99,256,100,256,256, - 256,25,256,256,256,1,256,256,256,256,256,256, - 28,29,28,29,26,27,26,27,26,27,26,27, - - }, - -- 74 - { - 26,27,8,9,26,27,26,27,26,27,26,27, - 25,256,8,9,1,25,28,29,28,29,25,1, - 256,256,8,9,256,256,256,256,256,256,256,256, - 256,256,8,9,256,256,256,116,106,256,256,256, - 256,256,8,9,256,256,104,101,102,103,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, - 256,256,28,29,25,28,29,25,28,29,256,256, - 256,256,256,256,256,256,256,256,256,256,256,256, - 256,114,256,256,256,113,256,256,256,256,114,256, - 256,256,256,256,256,256,256,256,256,256,256,256, - 26,27,28,29,28,29,28,29,28,29,26,27, - - }, - -- 76 - { - 26,27,26,27,26,27,26,27,18,19,20,21, - 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,114,256,256,78,25,17,256,256,256, - 256,256,256,256,256,95,94,25,17,256,256,256, - 26,27,26,27,26,27,26,27,51,53,52,51, - - }, - -- 77 - { - -- 18,19,18,19,18,19,256,256,256,18,19,52, - 18,19,18,19,18,19,256,256,0,18,19,52, - 256,256,17,72,256,256,17,256,256,256,256,256, - 256,256,38,88,256,113,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,256,256,52,53,51,52,17, - 256,256,256,256,256,256,69,256,256,256,256,17, - 256,256,256,256,256,69,256,256,256,256,256,17, - 256,256,256,256,256,111,111,106,256,256,78,17, - 256,256,256,256,17,118,119,17,256,95,94,17, - 51,52,53,53,51,53,52,53,51,52,51,17, - - }, - -- 79 - { - 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,126,127,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,256,256,256,256, - 256,256,256,256,256,15,42,43,256,256,256,256, - 256,256,256,256,256,256,42,43,256,126,127,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/data/mapa.lua b/data/mapa.lua index 8e6ebaa..1339dfe 100644 --- a/data/mapa.lua +++ b/data/mapa.lua @@ -1,6 +1,7 @@ -- require "map" tiletype={void=0,nonpc=1,stair=2,switch=3,half=4,block=5} +mapa={} mapa.wait=0 mapa.step=0 diff --git a/data/stage1.lua b/data/stage1.lua index 00a27f1..abfae17 100644 --- a/data/stage1.lua +++ b/data/stage1.lua @@ -2,6 +2,7 @@ function stages.stage1_init() stages.actors={} mapa = stage1_mapa + print("mapa loaded") tiletype={void=0,nonpc=1,stair=2,switch=3,half=4,block=5} mapa.wait=0 mapa.step=0 diff --git a/data/stage1_world_map.lua b/data/stage1_world_map.lua index 3a6554e..3df6884 100644 --- a/data/stage1_world_map.lua +++ b/data/stage1_world_map.lua @@ -1,3 +1,9 @@ +mapa_room_cols = 12; -- en quantitat de tiles +mapa_room_rows = 6; -- en quantitat de tiles +mapa_rooms_per_piso = 10 +mapa_pisos = 8 +mapa_empty_tile = 256 + stage1_mapa={ -- 1 { diff --git a/data/stage_mgr.lua b/data/stage_mgr.lua index 47af155..09fee72 100644 --- a/data/stage_mgr.lua +++ b/data/stage_mgr.lua @@ -52,4 +52,6 @@ function stages.next_stage() else stages.load_stage(true) end -end \ No newline at end of file +end + +require "stage1" \ No newline at end of file diff --git a/data/viewport.lua b/data/viewport.lua index 9fdff52..8d81179 100644 --- a/data/viewport.lua +++ b/data/viewport.lua @@ -1,4 +1,4 @@ -require "map" +-- require "map" viewport={}