diff --git a/data/abad.lua b/data/abad.lua index b76fac0..bcd8c4c 100644 --- a/data/abad.lua +++ b/data/abad.lua @@ -46,8 +46,8 @@ end function abad_hurt(howmuch) if abad.hurting == 0 and abad.respawning==0 then sound.play(audio_abad_hit) - -- abad.energia=abad.energia-howmuch - abad.energia=abad.energia + abad.energia=abad.energia-howmuch + -- abad.energia=abad.energia if abad.energia<=0 then abad.vides=abad.vides-1 if abad.vides==0 then diff --git a/data/cacau.lua b/data/cacau.lua index eec82e3..cb346e7 100644 --- a/data/cacau.lua +++ b/data/cacau.lua @@ -13,7 +13,9 @@ end function cacau.draw() draw.circf(cacau.x*o2aX,cacau.y*o2aX,2*o2aX,16) + draw.circf((cacau.x+2)*o2aX,cacau.y*o2aX,2*o2aX,16) draw.circf(cacau.x*o2aX,cacau.y*o2aX,1*o2aX,6) + draw.circf((cacau.x+2)*o2aX,cacau.y*o2aX,1*o2aX,6) end function cacau.update() diff --git a/data/final.lua b/data/final.lua index 22ce92e..c0c768e 100644 --- a/data/final.lua +++ b/data/final.lua @@ -1,3 +1,5 @@ +require "logo" + local arcade_config = require("arcade_config") o2aX = arcade_config.org2arc_escala cxr = arcade_config.character_per_row-1 @@ -36,7 +38,8 @@ function update_final() draw.rect(15*o2aX,40*o2aX,99*o2aX,50*o2aX,2) -- text("C A C A U S", 42, 12, 17) - arc_textB("C A C A U S", 42*o2aX, 12*o2aX, 17) + -- arc_textB("C A C A U S", 42*o2aX, 12*o2aX, 17) + draw_logo(14*o2aX, 10*o2aX) -- text(actor.name, 64-(#actor.name*2), 28, 11) arc_textB(actor.name, (64-(#actor.name*2))*o2aX, 28*o2aX, 11) @@ -140,7 +143,8 @@ function update_final2() surf.cls(16) -- text("C A C A U S", 42, 12, 17) - arc_textB("C A C A U S", 42*o2aX, 12*o2aX, 17) + -- arc_textB("C A C A U S", 42*o2aX, 12*o2aX, 17) + draw_logo(14*o2aX, 10*o2aX) -- text("GRACIES PER JUGAR", 30, 48, 10) arc_text("GRACIES PER JUGAR", 30*o2aX, 48*o2aX, 10) diff --git a/data/game.ini b/data/game.ini index df70a58..8b73789 100644 --- a/data/game.ini +++ b/data/game.ini @@ -1,4 +1,4 @@ -title=Cacaus +title=X2 Cacaus config=cacaus width=256 height=192 diff --git a/data/game.lua b/data/game.lua index e4459d7..4298096 100644 --- a/data/game.lua +++ b/data/game.lua @@ -17,6 +17,7 @@ require "bambolla" require "cacau" require "fireball" require "switches" +require "logo" local arcade_config = require("arcade_config") o2aX = arcade_config.org2arc_escala @@ -345,8 +346,8 @@ function update_menu() surf.cls(16) -- text("C A C A U S", 42*o2aX, 8*o2aX, 15) - arc_textB("C A C A U S", 42*o2aX, 8*o2aX, 15) - + -- arc_textB("C A C A U S", 42*o2aX, 8*o2aX, 15) + draw_logo(14*o2aX, 0) menu_state() end diff --git a/data/intro.lua b/data/intro.lua index 96b329c..de1d33a 100644 --- a/data/intro.lua +++ b/data/intro.lua @@ -58,6 +58,8 @@ function draw_item_intro( name, flip ) draw.surf(112*o2aX,88*o2aX,cw,ch/2,76*o2aX,32*o2aX,cw,ch/2,flip) elseif (name == "marc" ) then draw.rect(15*o2aX,3*o2aX,99*o2aX,51*o2aX,2) + elseif (name == "pas porta" ) then + draw.rectf(73*o2aX,24*o2aX,7*o2aX,16*o2aX,16) end end @@ -80,8 +82,9 @@ function intro_update() view.origin(16*o2aX,4*o2aX) mapa_draw(10) - -- To do: revisar açò que no se que fa - draw.rectf(73*o2aX,24*o2aX,7*o2aX,16*o2aX,16) + -- Borrar la porta del mapa + -- draw.rectf(73*o2aX,24*o2aX,7*o2aX,16*o2aX,16) + draw_item_intro("pas porta") -- Abad -- draw.surf(0,0,16,16,44,24,16,16,true) @@ -98,7 +101,8 @@ function intro_update() -- view.origin(16,4) view.origin(16*o2aX,4*o2aX) mapa_draw(10) - draw.rectf(73,24,7,16,16) + -- draw.rectf(73,24,7,16,16) + draw_item_intro("pas porta") -- draw.surf(0,0,16,16,44,24,16,16,false) draw_item_intro("abad", false) view.origin(0,0) @@ -113,7 +117,8 @@ function intro_update() -- view.origin(16,4) view.origin(16*o2aX,4*o2aX) mapa_draw(10) - draw.rectf(73,24,7,16,16) + -- draw.rectf(73,24,7,16,16) + draw_item_intro("pas porta") -- draw.surf(0,0,16,16,44,24,16,16,false) draw_item_intro("abad", false) -- draw.surf(112,88,16,8,76,32,16,8,true) @@ -132,7 +137,8 @@ function intro_update() -- view.origin(16,4) view.origin(16*o2aX,4*o2aX) mapa_draw(10) - draw.rectf(73,24,7,16,16) + -- draw.rectf(73,24,7,16,16) + draw_item_intro("pas porta") -- draw.surf(0,0,16,16,44,24,16,16,false) draw_item_intro("abad", false) view.origin(0,0) diff --git a/data/logo.lua b/data/logo.lua new file mode 100644 index 0000000..8883825 --- /dev/null +++ b/data/logo.lua @@ -0,0 +1,66 @@ +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 +toff = arcade_config.tiles_offset +tw = arcade_config.tiles_width +th = arcade_config.tiles_height +-- posició en el gif +C_gif_col = 10 +C_gif_row = 3 +A_gif_col = 11 +A_gif_row = 3 +U_gif_col = 12 +U_gif_row = 3 +S_gif_col = 15 +S_gif_row = 4 +X_gif_col = 11 +X_gif_row = 7 +DOS_gif_col = 12 +DOS_gif_row = 7 + +function draw_logo (x, y) + + local ox, oy = view.origin() + local curr_surf_tgt = surf.target() + local curr_surf_src = surf.source() + local sw = arcade_config.org_resolucion.width + local sh = arcade_config.org_resolucion.height + local dw = arcade_config.resolucion.width + local dh = arcade_config.resolucion.height + surf.target(textsf) + view.origin(0,0) + surf.cls(0) + + local C_x = C_gif_col*tw + local C_y = C_gif_row*th+toff + local A_x = A_gif_col*tw + local A_y = A_gif_row*th+toff + local U_x = U_gif_col*tw + local U_y = U_gif_row*th+toff + local S_x = S_gif_col*tw + local S_y = S_gif_row*th+toff + local X_x = X_gif_col*tw + local X_y = X_gif_row*th+toff + local DOS_x = DOS_gif_col*tw + local DOS_y = DOS_gif_row*th+toff + + draw.surf(X_x,X_y,tw,th,0,0,tw,th) + draw.surf(DOS_x,DOS_y,tw,th,10,0,tw,th) + draw.surf(C_x,C_y,tw,th,24,0,tw,th) + draw.surf(A_x,A_y,tw,th,24+tw*1-4,0,tw,th) + draw.surf(C_x,C_y,tw,th,24+tw*2-7,0,tw,th) + draw.surf(A_x,A_y,tw,th,24+tw*3-11,0,tw,th) + draw.surf(U_x,U_y,tw,th,24+tw*4-14,0,tw,th) + draw.surf(S_x,S_y,tw,th,24+tw*5-15,0,tw,th) + + + surf.source(textsf) + surf.target(curr_surf_tgt) + view.origin(ox,oy) + draw.surf(0,0,sw,sh,x,y,dw,dh) + surf.source(curr_surf_src) + +end \ No newline at end of file diff --git a/data/score.lua b/data/score.lua index c70b6f6..b7bb4a2 100644 --- a/data/score.lua +++ b/data/score.lua @@ -20,7 +20,7 @@ function score.create() -- draw.text("2023",9*o2aX,89*o2aX,1) arc_text("jail",6*o2aX,77*o2aX,2) arc_text("games",8*o2aX, 82*o2aX,2) - arc_text("2023",9*o2aX,89*o2aX,1) + arc_text("2026",9*o2aX,89*o2aX,1) draw.rectf(06*o2aX,30*o2aX,2*o2aX,8*o2aX,03) draw.rectf(09*o2aX,30*o2aX,2*o2aX,8*o2aX,08) draw.rectf(12*o2aX,30*o2aX,2*o2aX,8*o2aX,08) diff --git a/data/tiles.gif b/data/tiles.gif index 6792394..1ba5b25 100644 Binary files a/data/tiles.gif and b/data/tiles.gif differ