JailGamer/X2_cacaus
1
0
Fork 0
forked from JailDoctor/cacaus
Code Issues Pull Requests Activity

El joc ja quasi es jugable. Falten els cacaus, el dispar de l'imp i alguns ajustos de posicions d'elements

Browse Source
This commit is contained in:
JailGamer
2026-03-15 23:00:25 +01:00
parent 5f8e13706c
commit d890da0a47
7 changed files with 89 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data/abad.lua
View File

@@ -1,3 +1,9 @@
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
require "dead" require "dead"
@@ -19,7 +25,8 @@ function abad:draw()
flip=(((abad.x>>1)+(abad.y>>1))%2)==0 flip=(((abad.x>>1)+(abad.y>>1))%2)==0
end end
if (abad.respawning==0) or (math.floor(abad.respawning/15)%2==0) then if (abad.respawning==0) or (math.floor(abad.respawning/15)%2==0) then
draw.surf(abad.frame*16,0,16,16,abad.x,abad.y,16,16,flip) -- draw.surf(abad.frame*16,0,16,16,abad.x,abad.y,16,16,flip)
draw.surf(abad.frame*cw,0,cw,ch,abad.x*o2aX,abad.y*o2aX,cw,ch,flip)
end end
if abad.respawning > 0 then if abad.respawning > 0 then

12
data/bambolla.lua
View File

@@ -1,3 +1,12 @@
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
bambolla_gif_col = 7
bambolla_gif_row = 1
bambolla={hab=75,x=24,y=24,cx=0,dx=0,dy=0,flip=true,enabled=false,counter=800,wait=0,bb={x=4,y=4,w=8,h=8}} bambolla={hab=75,x=24,y=24,cx=0,dx=0,dy=0,flip=true,enabled=false,counter=800,wait=0,bb={x=4,y=4,w=8,h=8}}
function bambolla.reset() function bambolla.reset()
@@ -44,7 +53,8 @@ end
function bambolla.draw_normal() function bambolla.draw_normal()
if bambolla.enabled then if bambolla.enabled then
draw.surf(112,16,16,16,bambolla.x,bambolla.y,16,16) -- draw.surf(112,16,16,16,bambolla.x,bambolla.y,16,16)
draw.surf(bambolla_gif_col*cw,bambolla_gif_row*ch,cw,ch,bambolla.x*o2aX,bambolla.y*o2aX,cw,ch)
end end
end end

16
data/bol.lua
View File

@@ -1,3 +1,14 @@
local arcade_config = require("arcade_config")
o2aX = arcade_config.org2arc_escala
txr = arcade_config.tiles_per_row-1
txr2 = arcade_config.tiles_per_row_base2
toff = tiles_offset
tw = arcade_config.tiles_width
th = arcade_config.tiles_height
-- posició en el gif des de l'offset de tiles
bol_gif_col = 14
bol_gif_row = 3
bol={hab=39,x=28,y=25,bb={x=0,y=0,w=16,h=8}} bol={hab=39,x=28,y=25,bb={x=0,y=0,w=16,h=8}}
function bol.init() function bol.init()
@@ -6,7 +17,10 @@ function bol.init()
end end
function bol.draw() function bol.draw()
draw.surf(112,88,16,8,bol.x,bol.y,16,8) -- draw.surf(112,88,16,8,bol.x,bol.y,16,8)
local x = toff+bol_gif_col*tw
local y = bol_gif_row*th
draw.surf(x,y,tw*2,th,bol.x*o2aX,bol.y*o2aX,tw,th)
end end
function bol.update() function bol.update()

48
data/game.lua
View File

@@ -155,7 +155,7 @@ function game_init(menu)
end end
function draw_hab(hab,x,y,editing) function draw_hab(hab,x,y,editing)
view.origin(x,y) view.origin(x*o2aX,y*o2aX)
mapa_draw(hab) mapa_draw(hab)
if not editing then if not editing then
@@ -173,11 +173,11 @@ function draw_hab(hab,x,y,editing)
end end
function update_dialog() function update_dialog()
draw.rectf(16,16,97,35,12) draw.rectf(16*o2aX,16*o2aX,97*o2aX,35*o2aX,12)
draw.rect(15,15,99,37,16) draw.rect(15*o2aX,15*o2aX,99*o2aX,37*o2aX,16)
text("Save the map?",20,20,2) text("Save the map?",20*o2aX,20*o2aX,2)
text("This cannot be undone",20,27,2) text("This cannot be undone",20*o2aX,27*o2aX,2)
text("(Y)es (N)o",25,40,2) text("(Y)es (N)o",25*o2aX,40*o2aX,2)
if key.press(key.N) then if key.press(key.N) then
game_update=update_game game_update=update_game
@@ -193,13 +193,13 @@ function update_game()
if mode==modes.editing then if mode==modes.editing then
draw_hab(abad.hab,0,0,true) draw_hab(abad.hab,0,0,true)
text(abad.hab,120,1,2) text(abad.hab,120*o2aX,1*o2aX,2)
draw.surf(0,64+scroll*8,128,48,0,48) draw.surf(0,(64+scroll*8)*o2aX,128*o2aX,48*o2aX,0,48*o2aX)
local xx=(seltile&15)*8 local xx=(seltile&15)*8
local yy=48+(seltile>>4)*8 local yy=48+(seltile>>4)*8
draw.rect(xx,yy,9,9, 3) draw.rect(xx*o2aX,yy*o2aX,9*o2aX,9*o2aX, 3)
text("EDIT",100,1,3) text("EDIT",100*o2aX,1*o2aX,3)
local hx = abad.hab%10 local hx = abad.hab%10
local hy = math.floor(abad.hab/10) local hy = math.floor(abad.hab/10)
scroll=0 scroll=0
@@ -227,9 +227,9 @@ function update_game()
local mx,my=mouse.pos() local mx,my=mouse.pos()
if mx>>3 < 12 and my>>3 < 6 then if mx>>3 < 12 and my>>3 < 6 then
text(mx>>3,100,10,2) text(mx>>3,100*o2aX,10*o2aX,2)
text(my>>3,111,10,2) text(my>>3,111*o2aX,10*o2aX,2)
text((mx>>3)+(my>>3)*12,118,10,2) text(((mx>>3)+(my>>3)*12)*o2aX,118*o2aX,10*o2aX,2)
end end
if mouse.down(mouse.LEFT) then if mouse.down(mouse.LEFT) then
if my>=48 then if my>=48 then
@@ -244,25 +244,25 @@ function update_game()
end end
if mx>>3 < 12 and my>>3 < 6 then if mx>>3 < 12 and my>>3 < 6 then
local tx,ty=(mx>>3)<<3,(my>>3)<<3 local tx,ty=(mx>>3)<<3,(my>>3)<<3
draw.rect(tx,ty,9,9,3) draw.rect(tx*o2aX,ty*o2aX,9*o2aX,9*o2aX,3)
end end
else else
if abad.hurting == 0 then if abad.hurting == 0 then
draw_hab(abad.hab,0,0) draw_hab(abad.hab,0,0)
--text(abad.hab,1,1,2) --text(abad.hab,1,1,2)
draw_hab(cameras[current_camera].hab,0,48) draw_hab(cameras[current_camera].hab,0,48)
text(camera_names[current_camera],2,49,8) text(camera_names[current_camera],2*o2aX,49*o2aX,8)
score.draw() score.draw()
surf.source(tiles) surf.source(tiles)
draw.text("x"..abad.vides,114,13,2) draw.text("x"..abad.vides,114*o2aX,13*o2aX,2)
draw.rectf(102+(abad.energia>>1),30,21-(abad.energia>>1),8,16) draw.rectf((102+(abad.energia>>1))*o2aX,30*o2aX,(21-(abad.energia>>1))*o2aX,8*o2aX,16)
else else
draw.surf(0,0,16,9,50,40,16,9,true) draw.surf(0,0,16*o2aX,9*o2aX,50*o2aX,40*o2aX,16*o2aX,9*o2aX,true)
if abad.hurting > 40 then if abad.hurting > 40 then
draw.text("x"..abad.vides+1,63,43,3) draw.text("x"..abad.vides+1,63*o2aX,43*o2aX,3)
elseif abad.hurting < 20 then elseif abad.hurting < 20 then
draw.text("x"..abad.vides,63,43,2) draw.text("x"..abad.vides,63*o2aX,43*o2aX,2)
end end
end end
@@ -316,7 +316,7 @@ function update_game()
end end
function redraw_menu_hab() function redraw_menu_hab()
draw_hab(menu_room,16*o2aX,41*o2aX) draw_hab(menu_room,16,41)
draw.rectf(0,0,15*o2aX,97*o2aX,16) draw.rectf(0,0,15*o2aX,97*o2aX,16)
draw.rectf(114*o2aX,0,78*o2aX,97*o2aX,16) draw.rectf(114*o2aX,0,78*o2aX,97*o2aX,16)
draw.rect(15*o2aX,40*o2aX,99*o2aX,50*o2aX,2) draw.rect(15*o2aX,40*o2aX,99*o2aX,50*o2aX,2)
@@ -581,7 +581,7 @@ end
function pause() function pause()
surf.source(0) surf.source(0)
surf.target(back) surf.target(back)
draw.surf(0,0,128,96,0,0) draw.surf(0,0,128*o2aX,96*o2aX,0,0)
surf.target(0) surf.target(0)
surf.source(tiles) surf.source(tiles)
pausa_option=1 pausa_option=1
@@ -622,7 +622,7 @@ function update_pause()
if key.press(key.ESCAPE) then if key.press(key.ESCAPE) then
surf.source(back) surf.source(back)
draw.surf(0,0,128,96,0,0) draw.surf(0,0,128*o2aX,96*o2aX,0,0)
surf.source(tiles) surf.source(tiles)
game_update = pause_old_update game_update = pause_old_update
elseif key.press(keyDown) or pad.press(btnDown) then elseif key.press(keyDown) or pad.press(btnDown) then
@@ -634,7 +634,7 @@ function update_pause()
elseif key.press(keyShoot) or pad.press(btnShoot) then elseif key.press(keyShoot) or pad.press(btnShoot) then
if pausa_option==1 then if pausa_option==1 then
surf.source(back) surf.source(back)
draw.surf(0,0,128,96,0,0) draw.surf(0,0,128*o2aX,96*o2aX,0,0)
surf.source(tiles) surf.source(tiles)
game_update = pause_old_update game_update = pause_old_update
elseif pausa_option==2 then elseif pausa_option==2 then

2
data/mapa.lua
View File

@@ -179,5 +179,5 @@ function mapa_draw_minimap()
surf.source(minimap) surf.source(minimap)
surf.target(0) surf.target(0)
surf.cls(16) surf.cls(16)
draw.surf(0,0,128,96,0,0) draw.surf(0,0,128*o2aX,96*o2Ax,0,0)
end end

4
data/scenes.lua
View File

@@ -285,9 +285,9 @@ function update_scene()
end end
else else
if math.floor(sys.time()*2)%2==0 then if math.floor(sys.time()*2)%2==0 then
draw.surf(104,88,7,5,118,56) draw.surf(104*o2aX,88*o2aX,7*o2aX,5*o2aX,118*o2aX,56*o2aX)
else else
draw.rectf(118,56,8,6,12) draw.rectf(118*o2aX,56*o2aX,8*o2aX,6*o2aX,12)
end end
end end
end end

56
data/score.lua
View File

@@ -1,43 +1,43 @@
score={} score={}
function score.create() function score.create()
score.surf=surf.new(32,96) score.surf=surf.new(32*o2aX,96*o2aX)
surf.target(score.surf) surf.target(score.surf)
surf.cls(16) surf.cls(16)
draw.surf(0,0,16,9,5,9,16,9,true) draw.surf(0,0,16*o2aX,9*o2aX,5,9*o2aX,16*o2aX,9*o2aX,true)
draw.surf(32,64,8,8,0,0) draw.surf(48,72,8,8,8,0) draw.surf(48,72,8,8,16,0) draw.surf(40,64,8,8,24,0) draw.surf(32*o2aX,64*o2aX,8*o2aX,8*o2aX,0,0) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,8*o2aX,0) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,16*o2aX,0) draw.surf(40*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,0)
draw.surf(48,64,8,8,0,8) draw.surf(56,64,8,8,24,8) draw.surf(48,64,8,8,0,16) draw.surf(56,64,8,8,24,16) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,8*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,8*o2aX) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,16*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,16*o2aX)
draw.surf(32,64,8,8,0,24) draw.surf(48,72,8,8,8,24) draw.surf(48,72,8,8,16,24) draw.surf(40,64,8,8,24,24) draw.surf(32*o2aX,64*o2aX,8*o2aX,8*o2aX,0,24*o2aX) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,8*o2aX,24*o2aX) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,16*o2aX,24*o2aX) draw.surf(40*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,24*o2aX)
draw.surf(48,64,8,8,0,32) draw.surf(56,64,8,8,24,32) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,32*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,32*o2aX)
draw.surf(32,64,8,8,0,40) draw.surf(48,72,8,8,8,40) draw.surf(48,72,8,8,16,40) draw.surf(40,64,8,8,24,40) draw.surf(32*o2aX,64*o2aX,8*o2aX,8*o2aX,0,40*o2aX) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,8*o2aX,40*o2aX) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,16*o2aX,40*o2aX) draw.surf(40*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,40*o2aX)
draw.surf(48,64,8,8,0,48) draw.surf(56,64,8,8,24,48) draw.surf(48,64,8,8,0,56) draw.surf(56,64,8,8,24,56) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,48*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,48*o2aX) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,56*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,56*o2aX)
draw.surf(48,64,8,8,0,64) draw.surf(56,64,8,8,24,64) --draw.surf(48,64,8,8,0,72) draw.surf(56,64,8,8,24,72) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,64*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,64*o2aX) --draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,72*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,72*o2aX)
draw.surf(32,64,8,8,0,72) draw.surf(48,72,8,8,8,72) draw.surf(48,72,8,8,16,72) draw.surf(40,64,8,8,24,72) draw.surf(32*o2aX,64*o2aX,8*o2aX,8*o2aX,0,72*o2aX) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,8*o2aX,72*o2aX) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,16*o2aX,72*o2aX) draw.surf(40*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,72*o2aX)
draw.surf(48,64,8,8,0,80) draw.surf(56,64,8,8,24,80) draw.surf(48,64,8,8,0,88) draw.surf(56,64,8,8,24,88) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,80*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,80*o2aX) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,88*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,88*o2aX)
draw.text("jail",6,77,2) draw.text("jail",6*o2aX,77*o2aX,2)
draw.text("games",8, 82,2) draw.text("games",8*o2aX, 82*o2aX,2)
draw.text("2023",9,89,1) draw.text("2023",9*o2aX,89*o2aX,1)
draw.rectf(06,30,2,8,03) draw.rectf(06*o2aX,30*o2aX,2*o2aX,8*o2aX,03)
draw.rectf(09,30,2,8,08) draw.rectf(09*o2aX,30*o2aX,2*o2aX,8*o2aX,08)
draw.rectf(12,30,2,8,08) draw.rectf(12*o2aX,30*o2aX,2*o2aX,8*o2aX,08)
draw.rectf(15,30,2,8,10) draw.rectf(15*o2aX,30*o2aX,2*o2aX,8*o2aX,10)
draw.rectf(18,30,2,8,10) draw.rectf(18*o2aX,30*o2aX,2*o2aX,8*o2aX,10)
draw.rectf(21,30,2,8,10) draw.rectf(21*o2aX,30*o2aX,2*o2aX,8*o2aX,10)
draw.rectf(24,30,2,8,10) draw.rectf(24*o2aX,30*o2aX,2*o2aX,8*o2aX,10)
surf.target(0) surf.target(0)
end end
function score.draw() function score.draw()
surf.source(score.surf) surf.source(score.surf)
draw.surf(0,0,32,96,96,0) draw.surf(0,0,32*o2aX,96*o2aX,96*o2aX,0)
surf.source(tiles) surf.source(tiles)
if abad.objects.gorro~=nil then draw.surf(96,32,16,16,99,44) end if abad.objects.gorro~=nil then draw.surf(96*o2aX,32*o2aX,16*o2aX,16*o2aX,99*o2aX,44*o2aX) end
if abad.objects.peu~=nil then draw.surf(112,32,16,16,109,44) end if abad.objects.peu~=nil then draw.surf(112*o2aX,32*o2aX,16*o2aX,16*o2aX,109*o2aX,44*o2aX) end
if abad.objects.gps~=nil then draw.surf(112,48,16,16,100,55) end if abad.objects.gps~=nil then draw.surf(112*o2aX,48*o2aX,16*o2aX,16*o2aX,100*o2aX,55*o2aX) end
if abad.objects.clau_premiere~=nil then draw.surf(112,8,8,8,104,48) end if abad.objects.clau_premiere~=nil then draw.surf(112*o2aX,8*o2aX,8*o2aX,8*o2aX,104*o2aX,48*o2aX) end
if abad.objects.clau_elalien~=nil then draw.surf(120,8,8,8,112,48) end if abad.objects.clau_elalien~=nil then draw.surf(120*o2aX,8*o2aX,8*o2aX,8*o2aX,112*o2aX,48*o2aX) end
if abad.objects.bol~=nil then draw.surf(112,88,16,8,104,46) end if abad.objects.bol~=nil then draw.surf(112*o2aX,88*o2aX,16*o2aX,8*o2aX,104*o2aX,46*o2aX) end
end end