diff --git a/data/game.lua b/data/game.lua index a40ef4b..472c167 100644 --- a/data/game.lua +++ b/data/game.lua @@ -284,9 +284,9 @@ function update_game() score.draw() + if DEBUG then special_keys() debug_info() - if DEBUG then end end diff --git a/data/main.lua b/data/main.lua index cb9719d..7bf4ae4 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) - flow:executar("game") + flow:executar("logo") end function mini.update() @@ -107,7 +107,7 @@ function mini.update() -- Pausa per a que vaja be en mini 1.5.1 -- local t0 = os.clock() -- while os.clock()-t0<0.01 do end - draw.text(sys.fps(),0,15,2) + -- draw.text(sys.fps(),0,15,2) end function mini.close() diff --git a/data/scenes.lua b/data/scenes.lua index 67328f9..323f751 100644 --- a/data/scenes.lua +++ b/data/scenes.lua @@ -156,7 +156,7 @@ scenes={ bol_trobat={ {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"EH! ON ESTAN","ELS MEUS CACAUS!!?",""}}, {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Se va a enterar","Batman en quan","el pille..."}}, - {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"...","I eixe soroll?","..."}} + {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"...","I eixe soroll?","Ve de dalt!"}} }, final= { {x=avatar_batman_x,y=avatar_batman_y,flip=true,audio="batman",musica=audio_song_batman,text={"AI!", "M'has fet mal!!!",""},die=20}, diff --git a/data/trigger.lua b/data/trigger.lua index 7202113..36284b8 100644 --- a/data/trigger.lua +++ b/data/trigger.lua @@ -124,8 +124,8 @@ function triggers:escena_abad_porta_batman() end function triggers:escena_habitacio_batman() - if abad.objects.clau_premiere==nil and - abad.objects.clau_elalien==nil + if abad.objects.clau_premiere~=nil and + abad.objects.clau_elalien~=nil then -- switches.start(0,0) local trigger_porta = trigger.new(abad.hab,1,1,triggers.open_door,"switch","porta acces cacaus","",{20, 53,41}) diff --git a/data/trigger_event.lua b/data/trigger_event.lua index 183c94d..a63c144 100644 --- a/data/trigger_event.lua +++ b/data/trigger_event.lua @@ -42,7 +42,7 @@ end -- PREMIERE HEALER - BOSS 1 TRIGGER function trigger_ev:premiere_boss1_trigger( ) if stages.boss_loaded and - --abad.objects.clau_premiere~=nil and + abad.objects.clau_premiere~=nil and abad.energia<=abad.max_energia/2 then self:init()