From 319862df30decee47aa811651e4ee7f44f5879fe Mon Sep 17 00:00:00 2001 From: JailGamer Date: Sun, 15 Mar 2026 23:39:21 +0100 Subject: [PATCH] Ja se veuen be el gorro, el gps, el peu, el cacau, la fireball i el imp que eixia 'flipat' --- data/cacau.lua | 7 +++++-- data/fireball.lua | 9 ++++++--- data/gorro.lua | 13 +++++++++++++ data/gps.lua | 15 ++++++++++++++- data/imp.lua | 2 +- data/peu.lua | 13 +++++++++++++ 6 files changed, 52 insertions(+), 7 deletions(-) diff --git a/data/cacau.lua b/data/cacau.lua index 9a5e173..eec82e3 100644 --- a/data/cacau.lua +++ b/data/cacau.lua @@ -1,3 +1,6 @@ +local arcade_config = require("arcade_config") +o2aX = arcade_config.org2arc_escala + cacau={hab=-1,x=0,y=0,wait=0,flip=false,bb={x=0,y=0,w=4,h=4}} function cacau.init(_hab,_x,_y,_flip) @@ -9,8 +12,8 @@ function cacau.init(_hab,_x,_y,_flip) end function cacau.draw() - draw.circf(cacau.x,cacau.y,2,16) - draw.circf(cacau.x,cacau.y,1,6) + draw.circf(cacau.x*o2aX,cacau.y*o2aX,2*o2aX,16) + draw.circf(cacau.x*o2aX,cacau.y*o2aX,1*o2aX,6) end function cacau.update() diff --git a/data/fireball.lua b/data/fireball.lua index 2b51a5c..7500a63 100644 --- a/data/fireball.lua +++ b/data/fireball.lua @@ -1,3 +1,6 @@ +local arcade_config = require("arcade_config") +o2aX = arcade_config.org2arc_escala + fireball={hab=-1,x=0,y=0,wait=0,flip=false,bb={x=0,y=0,w=4,h=4}} function fireball.init(_hab,_x,_y,_flip) @@ -9,9 +12,9 @@ function fireball.init(_hab,_x,_y,_flip) end function fireball.draw() - draw.circf(fireball.x,fireball.y,3,16) - draw.circf(fireball.x,fireball.y,2,3) - draw.circf(fireball.x,fireball.y,1,8) + draw.circf(fireball.x*o2aX,fireball.y*o2aX,3*o2aX,16) + draw.circf(fireball.x*o2aX,fireball.y*o2aX,2*o2aX,3) + draw.circf(fireball.x*o2aX,fireball.y*o2aX,1*o2aX,8) end function fireball.update() diff --git a/data/gorro.lua b/data/gorro.lua index 8e06818..1f9c032 100644 --- a/data/gorro.lua +++ b/data/gorro.lua @@ -1,3 +1,13 @@ +local arcade_config = require("arcade_config") +o2aX = arcade_config.org2arc_escala +cxr = arcade_config.character_per_row-1 +cxr2 = arcade_config.character_per_row_base2 +cw = arcade_config.character_width +ch = arcade_config.character_height +-- posició en el gif +gorro_gif_col = 6 +gorro_gif_row = 2 + gorro={hab=5,x=48,y=24,bb={x=0,y=0,w=8,h=8}} function gorro.init() @@ -11,6 +21,9 @@ end function gorro.draw() draw.surf(96,32,16,16,gorro.x,gorro.y,16,16) + local x = gorro_gif_col*cw + local y = gorro_gif_row*ch + draw.surf(x,y,cw,ch,gorro.x*o2aX,gorro.y*o2aX,cw,ch) end function gorro.update() diff --git a/data/gps.lua b/data/gps.lua index 67d38ca..6c016df 100644 --- a/data/gps.lua +++ b/data/gps.lua @@ -1,3 +1,13 @@ +local arcade_config = require("arcade_config") +o2aX = arcade_config.org2arc_escala +cxr = arcade_config.character_per_row-1 +cxr2 = arcade_config.character_per_row_base2 +cw = arcade_config.character_width +ch = arcade_config.character_height +-- posició en el gif +gps_gif_col = 7 +gps_gif_row = 3 + gps={hab=5,x=48,y=24,bb={x=0,y=0,w=8,h=8}} function gps.init() @@ -10,7 +20,10 @@ function gps.init() end function gps.draw() - draw.surf(112,48,16,16,gps.x,gps.y,16,16) + -- draw.surf(112,48,16,16,gps.x,gps.y,16,16) + local x = gps_gif_col*cw + local y = gps_gif_row*ch + draw.surf(x,y,cw,ch,gps.x*o2aX,gps.y*o2aX,cw,ch) end function gps.update() diff --git a/data/imp.lua b/data/imp.lua index eb2939a..427d5bc 100644 --- a/data/imp.lua +++ b/data/imp.lua @@ -52,7 +52,7 @@ end function imp.draw() if imp.enabled then -- draw.surf((imp.frame&7)*16,(imp.frame>>3)*16,16,16,imp.x,imp.y,16,16,imp.flip) - draw.surf((imp.frame&7)*cw,(imp.frame>>cxr2)*ch,cw,ch,imp.x*o2aX,imp.y*o2aX,cw,ch,flip) + draw.surf((imp.frame&7)*cw,(imp.frame>>cxr2)*ch,cw,ch,imp.x*o2aX,imp.y*o2aX,cw,ch,imp.flip) end end diff --git a/data/peu.lua b/data/peu.lua index 0059233..dd82c2a 100644 --- a/data/peu.lua +++ b/data/peu.lua @@ -1,3 +1,13 @@ +local arcade_config = require("arcade_config") +o2aX = arcade_config.org2arc_escala +cxr = arcade_config.character_per_row-1 +cxr2 = arcade_config.character_per_row_base2 +cw = arcade_config.character_width +ch = arcade_config.character_height +-- posició en el gif +peu_gif_col = 7 +peu_gif_row = 2 + peu={hab=5,x=48,y=24,bb={x=0,y=0,w=8,h=8}} function peu.init() @@ -11,6 +21,9 @@ end function peu.draw() draw.surf(112,32,16,16,peu.x,peu.y,16,16) + local x = peu_gif_col*cw + local y = peu_gif_row*ch + draw.surf(x,y,cw,ch,peu.x*o2aX,peu.y*o2aX,cw,ch) end function peu.update()