From a7d7ef061cea0872c7c6f9b6a01ca127e8352c5f Mon Sep 17 00:00:00 2001
From: JailGamer <jailgamer@gmail.com>
Date: Sat, 9 May 2026 12:31:14 +0200
Subject: [PATCH] [WIP] S1 Ending

---
 data/batvio.lua  | 2 +-
 data/bol.lua     | 2 +-
 data/scenes.lua  | 6 ++++++
 data/trigger.lua | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/data/batvio.lua b/data/batvio.lua
index a859059..d89353b 100644
--- a/data/batvio.lua
+++ b/data/batvio.lua
@@ -2,7 +2,7 @@
 batvio={
     name="batvio",
     hab=7,
-    x=7,
+    x=9,
     y=2,
     w=112,
     h=32,
diff --git a/data/bol.lua b/data/bol.lua
index fb04bb8..de557cc 100644
--- a/data/bol.lua
+++ b/data/bol.lua
@@ -64,7 +64,7 @@ function bol.update()
             -- abad.objects.bol=true
             start_scene(scenes.bol_trobat)
             bol.scene_trobat = true
-            -- remove_actor(bol)
+            remove_actor(bol)
             -- crear el trigger per a disparar el final de fase
             table.insert( actors, trigger.new(8,4,3,triggers.escena_stage1_ending,"stage1 ending","TR09") )
         end
diff --git a/data/scenes.lua b/data/scenes.lua
index 323f751..9ff25d0 100644
--- a/data/scenes.lua
+++ b/data/scenes.lua
@@ -158,6 +158,12 @@ scenes={
         {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?","Ve de dalt!"}}
     },
+    stage1_ending={
+        {x=avatar_batman_x,y=avatar_batman_y,flip=true,audio="batman",musica=audio_song_batman,text={"Te pensaves que anaves", "a recuperar-los tan fàcil","moniato!"},die=20},
+        {x=avatar_abad_x,y=avatar_abad_y,flip=false,audio="abad",text={"Torna'm els meus cacaus","lladre!","Com t'agarre..."},die=20},
+        {x=avatar_batman_x,y=avatar_batman_y,flip=true,audio="batman",text={"Si vols els cacaus","hauràs d'agarrar-me", ""},die=20},
+        {x=avatar_batman_x,y=avatar_batman_y,flip=true,audio="batman",text={"I mes te val no tardar","perque estan bonissims", "Torradets en el seu punt"},die=20},
+    },
     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},
         {x=avatar_abad_x,y=avatar_abad_y,flip=false,audio="abad",text={"Aixó per furtar-me","el bol de cacaus,","imbèsil"},die=20},
diff --git a/data/trigger.lua b/data/trigger.lua
index 7902e6e..d0d024b 100644
--- a/data/trigger.lua
+++ b/data/trigger.lua
@@ -144,7 +144,9 @@ end
 
 function triggers:escena_stage1_ending()
     print("STAGE 1 ENDING")
+    abad.update = abad_nop
     remove_actor(self)
+    start_scene(scenes.stage1_ending, nil, false)
 end
 
 function triggers:escena_lluita_imp()