From 9f9bacb06ae9a07f97e33d06c58f90e16044a3fe Mon Sep 17 00:00:00 2001 From: JailGamer Date: Sun, 10 May 2026 19:37:01 +0200 Subject: [PATCH] [FIX] Llevades llunes duplicades --- data/abad.lua | 6 +++--- data/main.lua | 2 +- data/stage1.lua | 2 +- data/stage1_maps.lua | 6 ++++-- data/trigger.lua | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/data/abad.lua b/data/abad.lua index 095727a..50dcc82 100644 --- a/data/abad.lua +++ b/data/abad.lua @@ -38,7 +38,7 @@ function abad_init() respawning=0, hab=10, vides=3, - energia=3, + energia=6, max_energia=6, falling=0, step=0, @@ -128,7 +128,7 @@ function abad:draw() abad.respawning=abad.respawning-1 end - draw.rect(x+abad.bb.x,y+abad.bb.y,abad.bb.w,abad.bb.h,3) + -- draw.rect(x+abad.bb.x,y+abad.bb.y,abad.bb.w,abad.bb.h,3) end function abad_make_safe( force ) @@ -149,7 +149,7 @@ function abad_heal(howmuch) end function abad_hurt(howmuch) - howmuch = 0 + -- howmuch = 0 if abad.hurting == 0 and abad.respawning==0 then sound.play(audio_abad_hit) abad.energia=abad.energia-howmuch diff --git a/data/main.lua b/data/main.lua index a42b1e0..290ef61 100644 --- a/data/main.lua +++ b/data/main.lua @@ -88,7 +88,7 @@ function mini.init() logo_config(font_sf) surf.target(0) surf.cls(16) - states:executar("game") + states:executar("logo") end function mini.update() diff --git a/data/stage1.lua b/data/stage1.lua index b6e6ab3..59e4660 100644 --- a/data/stage1.lua +++ b/data/stage1.lua @@ -174,7 +174,7 @@ function stages.stage1_init() tiles_layer2.new(78,6,2,128,208,16,16, tiles_layer2.update_aranya, tiles_layer2.draw_aranya) local abad_x, abad_y = coords.room_to_world ( 10, 4, 3 ) - local abad_x, abad_y = coords.room_to_world ( 54, 8, 3 ) + -- local abad_x, abad_y = coords.room_to_world ( 54, 8, 3 ) -- table.insert( actors, trigger.new(8,4,3,triggers.escena_stage1_ending,"stage1 ending","TR09") ) -- local abad_x, abad_y = coords.room_to_world ( 8, 9, 3 ) diff --git a/data/stage1_maps.lua b/data/stage1_maps.lua index 2647747..96f57d3 100644 --- a/data/stage1_maps.lua +++ b/data/stage1_maps.lua @@ -54,7 +54,8 @@ stage1_mapa={ { 256,66,256,41,44,45,44,45,44,45,44,45, 64,256,256,41,256,256,256,256,256,256,256,256, - 68,256,66,256,256,256,96,97,256,256,256,256, + -- 68,256,66,256,256,256,96,97,256,256,256,256, + 256,256,66,256,256,256,96,97,256,256,256,256, 256,67,256,41,256,256,99,100,256,256,256,256, 65,256,256,41,95,256,256,256,10,11,256,256, 256,65,42,43,44,45,44,45,10,11,44,45, @@ -163,7 +164,8 @@ stage1_mapa={ -- 16 { 64,256,26,27,28,29,28,29,10,11,28,29, - 68,256,66,25,256,256,256,256,10,11,256,256, + -- 68,256,66,25,256,256,256,256,10,11,256,256, + 256,256,66,25,256,256,256,256,10,11,256,256, 256,67,256,256,256,107,108,256,10,11,256,256, 65,256,256,25,256,109,110,256,10,11,256,256, 256,65,256,25,256,256,256,256,10,11,256,256, diff --git a/data/trigger.lua b/data/trigger.lua index 4b1b82f..16cabd3 100644 --- a/data/trigger.lua +++ b/data/trigger.lua @@ -64,7 +64,7 @@ function trigger:draw() end -- debug rect - draw.rect(scr_x,scr_y,self.bb.w,self.bb.h,3) + -- draw.rect(scr_x,scr_y,self.bb.w,self.bb.h,3) end --function trigger:do_touched()