- Reestructuració

- [FIX] No shot sound if walking

.gitignore

@@ -0,0 +1 @@
+.DS_STORE

bin/Info.plist

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>19H2</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>cacaus</string>
+	<key>CFBundleExecutable</key>
+	<string>cacaus</string>
+	<key>CFBundleIconFile</key>
+	<string>cacaus</string>
+	<key>CFBundleIconName</key>
+	<string>cacaus</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.jailers.cacaus</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>cacaus</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.8</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.8</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.12</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2023 JailDoctor</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
+</dict>
+</plist>

data/abad.lua

@@ -43,14 +43,17 @@ function abad_hurt(howmuch)
             if abad.vides==0 then
                 --final de la partida
                 dead.start()
-                playmus(audio_game_over)
+                playmus(audio_game_over,0)
             else
-                playmus(audio_life_lost)
+                playmus(audio_life_lost,0)
                 abad.energia=40
                 abad.hab=abad.safe.hab
                 abad.x=abad.safe.x
                 abad.y=abad.safe.y
                 abad.hurting=60
+                abad.update=abad_state_normal
+                abad.bb.y=0
+                abad.bb.h=16
                 abad.respawning=240
                 cls(3)
             end
@@ -195,6 +198,7 @@ function abad_state_walking()
     elseif btn(KEY_DOWN) then
         abad.update=abad_state_crouch
     elseif btn(KEY_SPACE) and cacau.hab==-1 then
+        playsnd(audio_abad_shot)
         abad.update=abad_state_fire
         abad.wait=0
         cacau.init(abad.hab,abad.x+8,abad.y+8,abad.flip)

data/final.lua

@@ -151,6 +151,7 @@ function update_final2()
     end
     final_count=final_count+1
     if final_count==200 or btnp(KEY_SPACE) or btnp(KEY_RETURN) then
+        game_exit()
         game_init(true)
         fade.fadeoutin()
     end

data/game.lua

@@ -20,16 +20,16 @@ function remove_actor(actor)
     end
 end
 
-function playmus(song,volume)
+function playmus(song,loop)
     if not mute then
-        playmusic(song,volume)
+        playmusic(song,loop)
     end
 end
 
 function playsnd(sound,volume)
     if not mute then
         --print(sound)
-        playsound(sound,volume)
+        return playsound(sound,volume)
     end
 end
 
@@ -115,8 +115,13 @@ function game_init(menu)
     table.insert(actors,trigger.new(56,32,32,triggers.escena_abad_porta_batman))
 
     table.insert(actors,trigger.new(19,32,32,triggers.escena_habitacio_batman))
-    score.create()
 
+    table.insert(actors,trigger.new(14,40,32,triggers.teleport_a))
+    table.insert(actors,trigger.new(67,8,32,triggers.teleport_b))
+    table.insert(actors,trigger.new(29,40,32,triggers.teleport_c))
+    table.insert(actors,trigger.new(61,8,32,triggers.teleport_d))
+    score.create()
+    
     cameras[0]=gps
     table.insert(cameras,gorro)
     table.insert(cameras,peu)
@@ -286,22 +291,25 @@ function update_game()
         fireball.update()
         switches.update()
         
-        local hx = abad.hab%10
-        local hy = flr(abad.hab/10)
-        if btnp(KEY_RETURN) then
-            mode=modes.editing
-            mapa_restore_backup()
-        elseif btn(KEY_LSHIFT) and btnp(KEY_RIGHT) and hx<9 then
-            abad.hab=abad.hab+1
-        elseif btn(KEY_LSHIFT) and btnp(KEY_LEFT) and hx>0 then
-            abad.hab=abad.hab-1
-        elseif btn(KEY_LSHIFT) and btnp(KEY_DOWN) and hy<7 then
-            abad.hab=abad.hab+10
-        elseif btn(KEY_LSHIFT) and btnp(KEY_UP) and hy>0 then
-            abad.hab=abad.hab-10
-        elseif btnp(KEY_M) then
-            mute = not mute
-        elseif btnp(KEY_ESCAPE) then
+        --local hx = abad.hab%10
+        --local hy = flr(abad.hab/10)
+        --if btnp(KEY_RETURN) then
+        --    mode=modes.editing
+        --    mapa_restore_backup()
+        --elseif btn(KEY_LSHIFT) and btnp(KEY_RIGHT) and hx<9 then
+        --    abad.hab=abad.hab+1
+        --elseif btn(KEY_LSHIFT) and btnp(KEY_LEFT) and hx>0 then
+        --    abad.hab=abad.hab-1
+        --elseif btn(KEY_LSHIFT) and btnp(KEY_DOWN) and hy<7 then
+        --    abad.hab=abad.hab+10
+        --elseif btn(KEY_LSHIFT) and btnp(KEY_UP) and hy>0 then
+        --    abad.hab=abad.hab-10
+        --elseif btnp(KEY_M) then
+        --    mute = not mute
+        --elseif btnp(KEY_ESCAPE) then
+        --    pause()
+        --end
+        if btnp(KEY_ESCAPE) then
             pause()
         end
         if abad.objects.gps~=nil then

data/scenes.lua

@@ -1,15 +1,15 @@
 scenes={
     intro_01= {
-        {x=3,y=0,flip=false,audio="abad",text={"Ah!, que bo!","Nit de Netflix amb","un bon bol de cacaus!"},die=20},
+        {x=3,y=0,flip=false,audio="abad",text={"Ah!, què bo!","Nit de Netflix amb","un bon bol de cacaus!"},die=20},
     },
     intro_02= {
         {x=3,y=0,flip=false,audio="abad",text={"Eh! On està el","bol de cacaus???",""},die=20},
     },
     intro_03= {
-        {x=4,y=48,flip=true,audio="batman",musica=audio_song_batman,text={"ME'L HE ENDUT JO!!!", "S'HAN ACABAT ELS","CACAUS PA TU!"},die=20},
-        {x=3,y=0,flip=false,audio="abad",text={"Qué??","Però perqué???",""},die=20},
-        {x=4,y=48,flip=true,audio="batman",text={"Estás com una vaca!","Has de deixar de menjar", "eixes gorrinades"},die=20},
-        {x=4,y=48,flip=true,audio="batman",text={"Mira'm a mí. Estic","tot buenorro i faig", "esport"},die=20},
+        {x=4,y=48,flip=true,audio="batman",musica=audio_song_batman,text={"ME L'HE ENDUT JO!!!", "S'HAN ACABAT ELS","CACAUS PA TU!"},die=20},
+        {x=3,y=0,flip=false,audio="abad",text={"Què??","Però perquè???",""},die=20},
+        {x=4,y=48,flip=true,audio="batman",text={"Estàs com una vaca!","Has de deixar de menjar", "eixes gorrinades"},die=20},
+        {x=4,y=48,flip=true,audio="batman",text={"Mira'm a mi. Estic","tot buenorro i faig", "esport"},die=20},
         {x=3,y=0,flip=false,audio="abad",text={"Esport?????","I una merda!!","He de cuidar la panxa!"},die=20},
         {x=4,y=48,flip=true,audio="batman",text={"Pos t'aguantes.","Ja pots despedir-te", "dels cacaus..."},die=20},
     },
@@ -40,7 +40,7 @@ scenes={
     },
     gps_trobat={
         {x=4,y=0,flip=false,audio="abad",text={"Ale, ja tinc el GPS.","Ara puc trobar tot","el que necessite..."}},
-        {x=4,y=0,flip=false,audio="abad",text={"polsant les tecles","del 1 al 5",""}},
+        {x=4,y=0,flip=false,audio="abad",text={"polsant les tecles","de l'1 al 5",""}},
     },
     premiere_intro={
         {x=4,y=0,flip=false,audio="abad",musica=audio_song_premiere,text={"Premiere??","Qué fas per ma casa?",""}},
@@ -141,7 +141,7 @@ function start_scene(scene,offset)
     scenes.die=scenes.current_scene[scenes.dnum].die or 0
     if scene[1].musica then
         --print(scene[1].musica)
-        playmus(scenes.current_scene[scenes.dnum].musica, 64)
+        playmus(scenes.current_scene[scenes.dnum].musica)
     end
     if offset then scenes.offset=offset end
     old_update=_update
@@ -243,34 +243,47 @@ function update_scene()
     if scenes.wait==6 then
         scenes.wait=0
         draw_scene()
-        if scenes.step>8 and scenes.die>0 then
-            scenes.die=scenes.die-1
-            if scenes.die==0 then
-                if scenes.dnum==#scenes.current_scene then
-                    stopmusic()
-                    if batman.endgame then
-                        final_init()
-                        fade.fadeoutin()
+        if scenes.step>8 then
+            --print(scenes.die)
+            if scenes.die>0 then
+                scenes.die=scenes.die-1
+                if scenes.die==0 then
+                    if scenes.dnum==#scenes.current_scene then
+                        stopmusic()
+                        if batman.endgame then
+                            final_init()
+                            fade.fadeoutin()
+                        else
+                            _update=old_update
+                        end
                     else
-                        _update=old_update
+                        scenes.dnum=scenes.dnum+1
+                        scenes.die=scenes.current_scene[scenes.dnum].die or 0
+                        scenes.step=2
                     end
+                end
+            else
+                if flr(time()*2)%2==0 then
+                    sspr(104,88,7,5,118,56)
                 else
-                    scenes.dnum=scenes.dnum+1
-                    scenes.die=scenes.current_scene[scenes.dnum].die or 0
-                    scenes.step=2
+                    rectfill(118,56,125,61,12)
                 end
             end
         end
     end
 
-    if btnp(KEY_ESCAPE) then
+    if btnp(KEY_ESCAPE) and (scenes.current_scene~=scenes.final) then
         if scenes.current_scene[scenes.dnum].die then
             game_init(true)
         else
             pause()
         end
-    elseif btnp(KEY_SPACE) then
-        if scenes.step>8 then
+    elseif btnp(KEY_M) then
+        mute = not mute
+    end
+
+    if scenes.step>8 then
+        if btnp(KEY_SPACE) or btnp(KEY_DOWN) or btnp(KEY_UP) or btnp(KEY_LEFT) or btnp(KEY_RIGHT) or btnp(KEY_RETURN) then
             if scenes.dnum==#scenes.current_scene then
                 stopmusic()
                 if batman.endgame then
@@ -283,10 +296,8 @@ function update_scene()
                 scenes.dnum=scenes.dnum+1
                 scenes.step=2
             end
-        else
-            scenes.step=8
         end
-    elseif btnp(KEY_M) then
-        mute = not mute
+    elseif btnp(KEY_SPACE) then
+        scenes.step=8
     end
 end

data/trigger.lua

@@ -68,3 +68,41 @@ function triggers:escena_habitacio_batman()
         end
     end
 end
+
+function triggers:teleport_a()
+    abad.teleport=true
+    playsnd(audio_hit)
+    cls(14)
+    imp.reset()
+    abad.hab=67
+    abad.x=24
+end
+
+function triggers:teleport_b()
+    if abad.teleport then
+        playsnd(audio_hit)
+        cls(14)
+        imp.reset()
+        abad.hab=14
+        abad.x=16
+    end
+end
+
+function triggers:teleport_c()
+    abad.teleport2=true
+    playsnd(audio_hit)
+    cls(14)
+    imp.reset()
+    abad.hab=61
+    abad.x=24
+end
+
+function triggers:teleport_d()
+    if abad.teleport2 then
+        playsnd(audio_hit)
+        cls(14)
+        imp.reset()
+        abad.hab=29
+        abad.x=24
+    end
+end