From 1574809fe903e08088b7a04b143ab4a283ef4ff3 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Thu, 27 Oct 2022 18:51:56 +0200
Subject: [PATCH] - minimap generation for debug - gorro implemented - objects
 implemented

---
 abad.lua    |   1 +
 elalien.lua |   2 +-
 game.ini    |   4 +--
 gorro.lua   |  21 ++++++++++++
 main.lua    |   9 +++++
 map.lua     |  96 ++++++++++++++++++++++++++--------------------------
 mapa.lua    |  29 ++++++++++++++++
 score.lua   |   4 +++
 tiles.gif   | Bin 4622 -> 4785 bytes
 9 files changed, 115 insertions(+), 51 deletions(-)
 create mode 100644 gorro.lua

diff --git a/abad.lua b/abad.lua
index 9b69998..d58a76a 100644
--- a/abad.lua
+++ b/abad.lua
@@ -3,6 +3,7 @@ abad={x=40,y=24,flip=false,frame=1,wait=0,hab=10,vides=3,energia=40,step=0,updat
 
 function abad_init()
     abad.update=abad_state_normal
+    abad.objects={}
 end
 
 function abad:draw()
diff --git a/elalien.lua b/elalien.lua
index c260e20..c935466 100644
--- a/elalien.lua
+++ b/elalien.lua
@@ -5,7 +5,7 @@ function elalien.init()
     elalien.update=elalien.update_normal
     elalien.draw=elalien.draw
     local habs={66,56,59,53}
-    premiere.hab=habs[1+rnd(4)]
+    elalien.hab=habs[1+rnd(4)]
 end
 
 function elalien.draw()
diff --git a/game.ini b/game.ini
index 5dc3e6b..e54faea 100644
--- a/game.ini
+++ b/game.ini
@@ -1,5 +1,5 @@
 title=Cacaus
 width=128
 height=96
-zoom=4
-files=scenes.lua,starter.lua,score.lua,switches.lua,map.lua,mapa.lua,cacau.lua,batman.lua,elalien.lua,premiere.lua,caco.lua,zombie.lua,abad.lua,main.lua
+zoom=5
+files=scenes.lua,starter.lua,score.lua,switches.lua,map.lua,mapa.lua,cacau.lua,gorro.lua,batman.lua,elalien.lua,premiere.lua,caco.lua,zombie.lua,abad.lua,main.lua
diff --git a/gorro.lua b/gorro.lua
new file mode 100644
index 0000000..193a562
--- /dev/null
+++ b/gorro.lua
@@ -0,0 +1,21 @@
+gorro={hab=5,x=48,y=24,bb={x=0,y=0,w=8,h=8}}
+
+function gorro.init()
+    local habs={11,11,11,11}
+    gorro.hab=habs[1+rnd(4)]
+    gorro.update=gorro.update
+    gorro.draw=gorro.draw
+end
+
+function gorro.draw()
+    sspr(96,32,16,16,gorro.x,gorro.y,16,16)
+end
+
+function gorro.update()
+    if gorro.hab==abad.hab then
+        if aabb(abad,gorro) then
+            abad.objects.gorro=true
+            remove_actor(gorro)
+        end
+    end
+end
diff --git a/main.lua b/main.lua
index 3b64a24..12d7055 100644
--- a/main.lua
+++ b/main.lua
@@ -27,10 +27,16 @@ function _init()
     --mapa_new()
     abad_init()
     table.insert(actors,abad)
+
+    gorro.init()
+    table.insert(actors,gorro)
+
     premiere.init()
     table.insert(actors,premiere)
+
     elalien.init()
     table.insert(actors,elalien)
+
     batman.init()
     table.insert(actors,batman)
 
@@ -128,6 +134,9 @@ function update_game()
             _update=update_dialog
         elseif btnp(KEY_C) then
             mapa_cycle_colors(abad.hab)
+        elseif btnp(KEY_M) then
+            mapa_create_minimap()
+            return
         end
         if btn(KEY_TAB) then
             scroll=2
diff --git a/map.lua b/map.lua
index 44664dd..b82babf 100644
--- a/map.lua
+++ b/map.lua
@@ -96,7 +96,7 @@ mapa={
         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,20,21,20,21,256,80,17,17,17,17,
+        20,21,256,80,17,18,19,17,18,19,17,17,
         
     },
     -- 11
@@ -165,8 +165,8 @@ mapa={
         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,256,256,256,256,
-        28,29,28,29,25,41,44,45,44,45,44,45,
+        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
@@ -181,21 +181,21 @@ mapa={
     },
     -- 19
     {
-        44,45,44,45,44,45,44,45,44,45,44,45,
-        256,256,256,256,256,256,256,256,256,256,256,256,
-        256,97,98,97,256,73,74,256,98,97,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,
-        44,45,44,45,44,45,256,83,41,45,44,45,
+        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,
         
     },
     -- 20
     {
-        44,45,44,45,44,45,256,256,41,41,41,41,
-        256,256,256,256,256,256,256,256,41,77,42,43,
-        256,256,73,74,256,256,256,3,256,93,41,41,
-        256,256,89,90,256,256,3,256,256,256,42,43,
-        256,256,256,256,256,3,256,256,8,9,41,41,
+        44,45,256,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,
         
     },
@@ -261,11 +261,11 @@ mapa={
     },
     -- 27
     {
-        17,17,18,19,17,17,18,19,17,17,18,19,
-        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,
+        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,
         
     },
@@ -281,11 +281,11 @@ mapa={
     },
     -- 29
     {
-        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,117,98,256,256,256,2,256,256,106,116,256,
-        256,101,102,103,256,2,256,256,104,101,102,256,
+        33,256,256,256,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,
         
     },
@@ -312,10 +312,10 @@ mapa={
     -- 32
     {
         40,40,40,40,40,40,40,40,40,40,40,40,
-        44,45,44,45,44,45,44,45,44,45,44,45,
-        256,256,256,256,256,256,256,256,256,256,256,256,
-        256,112,256,256,113,256,256,256,114,256,256,113,
-        256,256,256,256,256,256,256,256,256,256,256,256,
+        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,
         
     },
@@ -342,7 +342,7 @@ mapa={
     -- 35
     {
         26,27,28,29,28,29,28,29,8,9,26,27,
-        24,256,256,256,256,256,256,256,8,9,256,24,
+        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,
@@ -352,10 +352,10 @@ mapa={
     -- 36
     {
         24,29,256,256,1,25,26,27,25,1,28,29,
-        24,256,256,256,256,256,26,27,256,256,256,256,
-        24,256,256,256,256,256,256,256,256,256,256,256,
-        24,256,106,116,256,256,256,256,256,105,256,256,
-        24,25,101,102,256,256,256,256,101,102,256,256,
+        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,
         
     },
@@ -375,18 +375,18 @@ mapa={
         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,10,11,256,256,
-        29,28,29,28,29,69,256,28,10,11,29,28,
+        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,256,69,256,256,256,256,256,256,95,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,111,111,94,101,102,110,103,105,98,24,
-        28,29,69,256,28,29,28,29,28,29,28,29,
+        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
@@ -471,11 +471,11 @@ mapa={
     },
     -- 48
     {
-        20,21,20,21,17,256,256,17,10,11,20,21,
-        256,256,256,256,256,256,69,256,10,11,256,256,
-        256,256,96,97,256,256,69,256,10,11,256,256,
-        256,115,99,100,256,256,256,256,10,11,256,256,
-        256,101,102,103,256,111,111,256,10,11,256,256,
+        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,
         
     },
@@ -522,7 +522,7 @@ mapa={
     -- 53
     {
         18,19,10,11,18,19,17,17,20,21,20,21,
-        16,256,10,11,256,256,256,256,256,256,256,256,
+        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,
@@ -533,7 +533,7 @@ mapa={
     {
         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,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,
@@ -601,8 +601,8 @@ mapa={
     },
     -- 61
     {
-        17,20,21,20,21,20,21,20,21,17,18,19,
-        16,256,256,256,256,256,256,256,256,77,18,19,
+        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,
@@ -792,7 +792,7 @@ mapa={
     -- 80
     {
         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,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,
diff --git a/mapa.lua b/mapa.lua
index 81282b2..7de4b7d 100644
--- a/mapa.lua
+++ b/mapa.lua
@@ -143,3 +143,32 @@ function check_tile(hab,x,y)
         return tiletype.void
     end
 end
+
+pix={14,10,7,1,0,0,0,0,4,4,4,4,0,0,0,8,14,14,14,14,14,14,0,0,10,10,10,10,10,10,10,10,7,7,7,7,7,7,2,2,1,1,1,1,1,1,12,12,1,1,1,9,9,9,10,10,10,0,0,0,0,0,0,0}
+
+function mapa_create_minimap()
+    minimap = newsurf(128,96)
+    setdest(minimap)
+    for h=0,79 do
+        for y=0,5 do
+            for x=0,11 do
+                local tile=mapa[h+1][1+x+y*12]
+                if h==45 then
+                    print(x..","..y.."="..tile)
+                end
+                if tile<64 then
+                    pset(x+(h%10)*12,y+flr(h/10)*6,pix[1+tile])
+                end
+            end
+        end
+    end
+    _update=mapa_draw_minimap
+end
+
+function mapa_draw_minimap()
+    --print("HOLA")
+    setsource(minimap)
+    setdest(0)
+    cls(16)
+    sspr(0,0,128,96,0,0)
+end
\ No newline at end of file
diff --git a/score.lua b/score.lua
index 1322243..5cf88a0 100644
--- a/score.lua
+++ b/score.lua
@@ -31,4 +31,8 @@ end
 function score.draw()
     setsource(score.surf)
     sspr(0,0,32,96,96,0)
+    setsource(tiles)
+    if abad.objects.gorro~=nil then sspr(96,32,16,16,99,44) end
+    if abad.objects.peu~=nil then sspr(112,32,16,16,109,44) end
+    if abad.objects.gps~=nil then sspr(112,48,16,16,100,55) end
 end
\ No newline at end of file
diff --git a/tiles.gif b/tiles.gif
index 9a489e2e10bb0ba9e468d9685ab5b214db343aaa..675e715f249d79ab47204a1ba961b605d7c5ae56 100644
GIT binary patch
delta 3009
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
D!R(eI

delta 2845
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