From edd07509d02d7ad873d56dc493ec76aa748c3a56 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Mon, 23 Mar 2026 13:02:38 +0100
Subject: [PATCH] - [NEW] Marcador millorat i funcionant

---
 data/gfx/score_font.fnt |  11 ++++++++
 data/gfx/score_font.gif | Bin 0 -> 133 bytes
 data/modules/score.lua  |  59 +++++++++++++++++++++++++++++++++-------
 data/stages/game.lua    |   6 ++--
 4 files changed, 64 insertions(+), 12 deletions(-)
 create mode 100644 data/gfx/score_font.fnt
 create mode 100644 data/gfx/score_font.gif

diff --git a/data/gfx/score_font.fnt b/data/gfx/score_font.fnt
new file mode 100644
index 0000000..a355355
--- /dev/null
+++ b/data/gfx/score_font.fnt
@@ -0,0 +1,11 @@
+bitmap=gfx/score_font.gif
+48: 0 0 8 8 0   # 0
+49: 8 0 8 8 0   # 1
+50: 16 0 8 8 0  # 2
+51: 24 0 8 8 0  # 3
+52: 32 0 8 8 0  # 4
+53: 40 0 8 8 0  # 5
+54: 48 0 8 8 0  # 6
+55: 56 0 8 8 0  # 7
+56: 64 0 8 8 0  # 8
+57: 72 0 8 8 0  # 9
diff --git a/data/gfx/score_font.gif b/data/gfx/score_font.gif
new file mode 100644
index 0000000000000000000000000000000000000000..67ee28997c8ee6ebfc24764f66c2ca90778ada08
GIT binary patch
literal 133
zcmZ?wbh9u|3}E13XkY+=|Ns9h{$%0c0y1?#e2@$SQ;bX90_p4<ay>d{mn>_US^lLm
zc4_RnZGo8_+ort?dZ0e>Mss{`SyAEN*;n1<gbkRgPqyq?FzJf$#S*^z!lrwt_Be}q
hXWs1!-9J_Qm#bH1+U5((>gGTDvg>c(`N!N0)&N4qH<SPX

literal 0
HcmV?d00001

diff --git a/data/modules/score.lua b/data/modules/score.lua
index 15861ae..7f3721d 100644
--- a/data/modules/score.lua
+++ b/data/modules/score.lua
@@ -1,26 +1,65 @@
 score = {
     points = 0,
-    color = 28,
-    zoom = 1,
+    color = 21,
+    ypos = 3,
     surf = nil,
+    font = nil
 } local me = score
 
 function me.init()
     me.points = 0
     me.surf = surf.load("gfx/sprites.gif")
+    me.font = font.load("gfx/score_font.fnt")
+end
+
+local function draw_text()
+    font.current(me.font)
+    font.spacing(0)
+    local txt = string.format("%03d", me.points)
+    draw.text(txt,2,me.ypos-1,27)
+    draw.text(txt,3,me.ypos-1,27)
+    draw.text(txt,4,me.ypos-1,27)
+    draw.text(txt,2,me.ypos,27)
+    draw.text(txt,4,me.ypos,27)
+    draw.text(txt,2,me.ypos+1,27)
+    draw.text(txt,4,me.ypos+1,27)
+    draw.text(txt,2,me.ypos+2,27)
+    draw.text(txt,3,me.ypos+2,27)
+    draw.text(txt,4,me.ypos+2,27)
+    draw.text(txt,3,me.ypos+1,1)
+    draw.text(txt,3,me.ypos,me.color)
+    font.current(font.DEFAULT)
+    font.spacing(1)
+    surf.source(me.surf)
+end
+
+local function draw_key(sx,sy,dx,dy)
+    pal.subpal(1,26,27)
+    for y=-1,1 do
+        for x=-1,1 do
+            if x~=0 and y~=0 then draw.surf(sx,sy,16,8, dx+x,dy+y) end
+        end
+    end
+    pal.subpal()
+    draw.surf(sx,sy,16,8, dx,dy)
 end
 
 function me.draw()
-    draw.rectf(0,0,160,8,1)
-    draw.text(string.format("%03d", me.points),1,1,me.color)
-    surf.source(me.surf)
-    if sprites.hero.keys["verda"] then draw.surf(16,48,16,8, 32,-1) end
-    if sprites.hero.keys["groga"] then draw.surf(16,56,16,8, 32,-1) end
-    if sprites.hero.keys["roja"]  then draw.surf(32,48,16,8, 32,-1) end
-    if sprites.hero.keys["blava"] then draw.surf(32,56,16,8, 32,-1) end
+    view.origin(0,0)
+    surf.target(0)
+    view.clip()
+
+    draw_text()
+
+    local y = 3
+    if sprites.hero.keys["verda"] then draw_key(16,48,140,y) y=y+8 end
+    if sprites.hero.keys["groga"] then draw_key(16,56,140,y) y=y+8 end
+    if sprites.hero.keys["roja"]  then draw_key(32,48,140,y) y=y+8 end
+    if sprites.hero.keys["blava"] then draw_key(32,56,140,y) y=y+8 end
 end
 
 function me.inc(value)
     me.points = me.points + value
-    tweening.add(8, 0, 0.5, easing.linear, function(val,progress,finished) me.color = (math.floor(val)&1) == 0 and 28 or 14 end)
+    tweening.add(8, 0, 0.5, easing.linear, function(val,progress,finished) me.color = (math.floor(val)&1) == 0 and 21 or 14 end)
+    tweening.add(5, 3, 0.5, easing.easeOutElastic, function(val,progress,finished) me.ypos = math.floor(val) end)
 end
diff --git a/data/stages/game.lua b/data/stages/game.lua
index 2037f7a..7f5f4e7 100644
--- a/data/stages/game.lua
+++ b/data/stages/game.lua
@@ -51,7 +51,6 @@ game = {
         surf.target(0)
         view.clip()
 
-        score.draw()
         surf.target(game.back_buf)
 
         -- Pintar el mapa i sprites
@@ -61,6 +60,8 @@ game = {
         game.apply_water()
         game.apply_light()
 
+        score.draw()
+
         if key.press(key.ESCAPE) or key.press(key.F9) then
             rooms.reload()
             sprites.add_from_room(rooms.pos.x, rooms.pos.y)
@@ -87,7 +88,6 @@ game = {
         surf.target(0)
         view.clip()
 
-        score.draw()
         surf.target(game.back_buf)
         --view.clip()
 
@@ -102,6 +102,8 @@ game = {
         game.apply_water()
         game.apply_light()
 
+        score.draw()
+
         game.chg_step = game.chg_step - 1
         if game.chg_step == 0 then
             sprites.remove_out_of_room()