From f176369ba89ab788229e7c1280cac61d42162031 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Wed, 8 Feb 2023 19:02:23 +0100
Subject: [PATCH] =?UTF-8?q?-=20Treballant=20en=20els=20mapes=20i=20escenes?=
 =?UTF-8?q?=20de=20totes=20les=20aules=20de=20pr=C3=A0ctiques?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/balloon.lua |  1 +
 data/game.ini    |  2 +-
 data/m_arq.lua   | 36 ++++++++++++++++++++
 data/m_prac1.lua | 73 ++++++++++++++++++++++++++++++++-------
 data/m_prac2.lua | 88 ++++++++++++++++++++++++++++++++++++++++++++++++
 data/prac1.map   | 38 ++++++++++-----------
 data/prac2.map   | 21 ++++++++++++
 data/prac3.map   | 21 ++++++++++++
 8 files changed, 248 insertions(+), 32 deletions(-)
 create mode 100644 data/m_prac2.lua
 create mode 100644 data/prac2.map
 create mode 100644 data/prac3.map

diff --git a/data/balloon.lua b/data/balloon.lua
index 085da6e..e870991 100644
--- a/data/balloon.lua
+++ b/data/balloon.lua
@@ -96,6 +96,7 @@ balloon={
         if anykey() then
             if balloon.pos<0 then
                 update=balloon.old_update
+                update()
                 scene.cont()
             else
                 balloon.quick=true
diff --git a/data/game.ini b/data/game.ini
index 9bd9da9..41da662 100644
--- a/data/game.ini
+++ b/data/game.ini
@@ -3,4 +3,4 @@ config=ja2
 width=160
 height=144
 zoom=5
-files=fade.lua,objects.lua,wait.lua,switches.lua,scene.lua,balloon.lua,actors.lua,game.lua,mapa.lua,editor.lua,textbox.lua,menu.lua,m_arq.lua,m_prac1.lua,m_jail1.lua,main.lua
+files=fade.lua,objects.lua,wait.lua,switches.lua,scene.lua,balloon.lua,actors.lua,game.lua,mapa.lua,editor.lua,textbox.lua,menu.lua,m_arq.lua,m_prac2.lua,m_prac1.lua,m_jail1.lua,main.lua
diff --git a/data/m_arq.lua b/data/m_arq.lua
index a7caedb..a47561e 100644
--- a/data/m_arq.lua
+++ b/data/m_arq.lua
@@ -23,6 +23,42 @@ levels["arq"]={
             end
         })
 
+        switches.add({x=20,y=25,w=1,h=1,action=
+            function()
+                local hero = actors.search(actors.main.name)
+                if hero.o=="u" then
+                    game.paused = true
+                    fade.fadeout()
+                    actors.main.x=12
+                    actors.main.y=16
+                    actors.main.o="u"
+                    actors.main.level="prac2"
+                    game.init("prac2")
+                    return true
+                else
+                    return false
+                end
+            end
+        })
+
+        switches.add({x=8,y=25,w=1,h=1,action=
+            function()
+                local hero = actors.search(actors.main.name)
+                if hero.o=="u" then
+                    game.paused = true
+                    fade.fadeout()
+                    actors.main.x=9
+                    actors.main.y=16
+                    actors.main.o="u"
+                    actors.main.level="prac3"
+                    game.init("prac3")
+                    return true
+                else
+                    return false
+                end
+            end
+        })
+
         switches.add({x=6,y=11,w=1,h=1,action=
             function()
                 local hero = actors.search(actors.main.name)
diff --git a/data/m_prac1.lua b/data/m_prac1.lua
index 7dc9f65..751c2e1 100644
--- a/data/m_prac1.lua
+++ b/data/m_prac1.lua
@@ -32,20 +32,69 @@ levels["prac1"]={
 
         --actors.add({name="usufondo",x=16,y=14,o="d",gfx={x=0,y=0}})
 
+        switches.add({x=9,y=16,w=1,h=1,action=
+            function()
+                local hero = actors.search(actors.main.name)
+                if hero.o=="d" then
+                    game.paused = true
+                    fade.fadeout()
+                    actors.main.x=32
+                    actors.main.y=25
+                    actors.main.o="d"
+                    actors.main.level="arq"
+                    game.init("arq")
+                    return true
+                else
+                    return false
+                end
+            end
+        })
+
         switches.add({x=4,y=14,w=10,h=1,action=
             function()
-                scene.start({
-                    --function() actors.add({name="usufondo",x=16,y=8,o="d",gfx={x=0,y=0}}) scene.cont() end,
-                    --function() wait.start(1) end,
-                    function() balloon.show("OYE TU!",9,"profe",false,{x=4,w=6,h=1}) end,
-                    function() actors.search("profe").path={pos=0,route='rrrdddddd'} end,
-                    function() balloon.show("TE PARECE HORA DE LLEGAR\nA LA PRÁCTICA?",9,"profe",false,{x=3,w=14,h=2}) end,
---                    function() actors.search("usufondo").path={pos=0,route='rrrrru'} end,
---                    function() wait.start(0.5) end,
---                    function() actors.remove("usufondo") scene.cont() end,
-                    function() wait.start(1) end,
-                    function() balloon.show("IMBÈSIL...",2,"jailer",true,{x=5,w=7,h=1}) end
-                })
+                flags.prac1=1
+                if not flags.prac1 then
+                    flags.prac1=1
+                    scene.start({
+                        function() balloon.show("OYE TU!",12,"profe",false,{x=4,w=6,h=1}) end,
+                        function() actors.search("profe").path={pos=0,route='rrrdddddd'} end,
+                        function() balloon.show("TE PARECE HORA DE LLEGAR\nA LA PRÁCTICA?",12,"profe",false,{x=3,w=14,h=2}) end,
+                        function() balloon.show("AL MENOS TENDRÁS\nLOS APUNTES\n¿NO?",12,"profe",false,{x=3,w=14,h=3}) end,
+                        function() balloon.show("PUES...\nNO",2,"jailer",false,{x=5,w=7,h=2}) end,
+                        function() balloon.show("¿¿QUÉ??\n¡ESTO ES EL COLMO!",12,"profe",false,{x=3,w=14,h=2}) end,
+                        function() balloon.show("¡LARGO!\n¡Y NO VUELVAS SIN\nLOS APUNTES!",12,"profe",false,{x=3,w=14,h=3}) end,
+                        function() actors.search("jailer").path={pos=0,route='dd'} end
+                    })
+                    return true
+                elseif flags.prac1==1 then
+                    if not objects.search("apuntes_1015") then
+                        scene.start({
+                            function() balloon.show("¿OTRA VEZ TU?",12,"profe",false,{x=4,w=9,h=1}) end,
+                            function() actors.search("profe").path={pos=0,route='rrrdddddd'} end,
+                            function() balloon.show("¿TRAES LOS APUNTES?",12,"profe",false,{x=3,w=12,h=1}) end,
+                            function() balloon.show("SI ES QUE NO SÉ\nQUINS SON!",2,"jailer",false,{x=5,w=10,h=2}) end,
+                            function() balloon.show("¡PUES TE BUSCAS LAS CASTAÑAS!\n¡HABER VENIDO A CLASE!",12,"profe",false,{x=3,w=16,h=2}) end,
+                            function() balloon.show("CAGUEN L'OU...",2,"jailer",false,{x=5,w=9,h=1}) end,
+                            function() actors.search("jailer").path={pos=0,route='dd'} end,
+                            function() wait.start(1.5) end,
+                            function() balloon.show("SI NO SÉ NI QUINA\nASSIGNATURA ES...",2,"jailer",false,{x=5,w=10,h=2}) end
+                        })
+                    else
+                        flags.prac1=2
+                        scene.start({
+                            function() balloon.show("¿OTRA VEZ TU?",12,"profe",false,{x=4,w=6,h=1}) end,
+                            function() actors.search("profe").path={pos=0,route='rrrdddddd'} end,
+                            function() balloon.show("¿TRAES LOS APUNTES?",12,"profe",false,{x=3,w=14,h=1}) end,
+                            function() balloon.show("¡ACÍ ESTÀN!",2,"jailer",false,{x=5,w=7,h=1}) end,
+                            function() balloon.show("¡AH!\n¡ASÍ ME GUSTA!",12,"profe",false,{x=3,w=14,h=2}) end,
+                            function() balloon.show("BUSCA UN ORDENADOR\nLIBRE Y EMPIEZA",12,"profe",false,{x=3,w=14,h=2}) end,
+                            function() actors.search("profe").path={pos=0,route='uuuuuullla'} end,
+                        })
+                    end
+                    return true
+                else
+                    return false
+                end
             end
         })
     end,
diff --git a/data/m_prac2.lua b/data/m_prac2.lua
new file mode 100644
index 0000000..a00f61b
--- /dev/null
+++ b/data/m_prac2.lua
@@ -0,0 +1,88 @@
+levels["prac2"]={
+    load=function()
+        mapa.load("prac2.map")
+
+        actors.add({name="profe",x=10,y=5,o="d",gfx={x=224,y=0}})
+
+        actors.add({name="comp_1_1",x=4,y=9,o="d",gfx={x=160,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_2_1",x=6,y=9,o="d",gfx={x=176,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_1_2",x=4,y=11,o="d",gfx={x=160,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_2_2",x=6,y=11,o="d",gfx={x=176,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_1_3",x=4,y=13,o="d",gfx={x=160,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_2_3",x=6,y=13,o="d",gfx={x=176,y=0},action=levels.prac2.comp_updating_action})
+
+        actors.add({name="comp_3_1",x=12,y=9,o="d",gfx={x=160,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_4_1",x=14,y=9,o="d",gfx={x=176,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_3_2",x=12,y=11,o="d",gfx={x=160,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_4_2",x=14,y=11,o="d",gfx={x=176,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_3_3",x=12,y=13,o="d",gfx={x=160,y=0},action=levels.prac2.comp_updating_action})
+        actors.add({name="comp_4_3",x=14,y=13,o="d",gfx={x=176,y=0},action=levels.prac2.comp_updating_action})
+
+        actors.add({name="comp_profe",x=10,y=6,o="d",gfx={x=96,y=0},action=levels.prac2.comp_profe_action})
+        actors.add({name="taula_profe",x=12,y=6,o="d",gfx={x=160,y=16}})
+
+        actors.add({name="alumne1",x=12,y=10,o="d",gfx={x=32,y=64}})
+        actors.add({name="alumne2",x=6,y=12,o="d",gfx={x=16,y=96}})
+        actors.add({name="alumne3",x=4,y=10,o="d",gfx={x=96,y=64}})
+        actors.add({name="alumne4",x=4,y=14,o="d",gfx={x=96,y=64}})
+        actors.add({name="alumne5",x=14,y=14,o="d",gfx={x=64,y=64}})
+        --actors.add({name="taza_usufondo",x=14,y=15,o="d",gfx={x=112,y=32},action=levels.jail1.taza_usufondo_action})
+        --if not objects.search("diskito_usufondo") then actors.add({name="disquito_usufondo",x=15,y=10,o="d",gfx={x=96,y=32},action=levels.jail1.disquito_usufondo_action}) end
+
+        --actors.add({name="usufondo",x=16,y=14,o="d",gfx={x=0,y=0}})
+
+        switches.add({x=12,y=16,w=1,h=1,action=
+            function()
+                local hero = actors.search(actors.main.name)
+                if hero.o=="d" then
+                    game.paused = true
+                    fade.fadeout()
+                    actors.main.x=20
+                    actors.main.y=25
+                    actors.main.o="d"
+                    actors.main.level="arq"
+                    game.init("arq")
+                    return true
+                else
+                    return false
+                end
+            end
+        })
+
+    end,
+
+    comp_updating_action=function()
+        local hero = actors.search(actors.main.name)
+        if hero.o~="d" then return end
+        scene.start({
+            function() balloon.show("NO VAN ELS COMPS\nESTAN TOTS ACTUALITZANT",2,"jailer",true,{x=1,w=15,h=2}) end
+        })
+    end,
+
+    comp_usufondo_action=function()
+        local hero = actors.search(actors.main.name)
+        if hero.o~="d" then return end
+        scene.start({
+            function() balloon.show("ESTÀ BLOQUEJAT,\nI NO ME SÉ LA CONTRASENYA.",2,"jailer",true,{x=1,w=15,h=2}) end
+        })
+    end,
+
+    taza_usufondo_action=function()
+        local hero = actors.search(actors.main.name)
+        if hero.o~="d" then return end
+        scene.start({
+            function() balloon.show("EL CAFÉ DE USUFONDO.\nESTÀ GELAT COM EL COR DEL DIMONI!",2,"jailer",true,{x=1,w=15,h=2}) end
+        })
+    end,
+
+    disquito_usufondo_action=function()
+        local hero = actors.search(actors.main.name)
+        --if hero.o~="d" then return end
+        scene.start({
+            function() balloon.show("NO ÉS EL MEU DISQUITO,\nPERÒ ME'L QUEDE!\nIGUAL ES IMPORTANT",2,"jailer",true,{x=1,w=15,h=3}) end,
+            function() actors.remove("disquito_usufondo") scene.cont() end,
+            function() objects.collect("diskito_usufondo") scene.cont() end,
+        })
+    end,
+
+}
\ No newline at end of file
diff --git a/data/prac1.map b/data/prac1.map
index 0e1d27f..bb60b1f 100644
--- a/data/prac1.map
+++ b/data/prac1.map
@@ -1,21 +1,21 @@
-30
+20
 18
 1
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,26,26,26,26,
-17,17,17,25,26,26,26,26,26,26,26,26,26,26,26,26,27,17,17,17,17,17,17,17,17,17,26,26,26,26,
-17,17,17,16,23,24,23,24,102,103,103,104,23,24,23,24,18,17,17,17,17,17,17,17,17,17,24,23,24,23,
-17,17,17,16,39,40,39,40,118,119,119,120,39,40,39,40,18,17,17,17,17,17,17,17,17,17,40,39,40,39,
-17,17,17,16,55,56,55,56,55,56,55,56,47,56,55,56,18,17,17,17,17,17,17,17,17,17,56,55,56,55,
-17,17,17,16,5,2,5,2,5,2,5,2,63,2,5,2,18,17,17,17,17,17,17,17,17,17,2,5,2,5,
-17,17,17,16,87,88,89,90,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,2,87,88,89,
-17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,2,5,2,5,
-17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,2,87,88,89,
-17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,17,17,17,17,17,17,2,5,2,5,
-17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,2,87,88,89,
-17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,17,17,17,17,17,17,2,5,2,5,
-17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,2,87,88,89,
-17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,17,17,17,17,17,17,2,5,2,5,
-17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,2,87,88,89,
-17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,2,5,2,5,
-17,17,17,32,33,33,33,33,48,2,5,49,33,33,33,33,34,17,17,17,17,17,17,17,17,17,33,33,33,33,
-17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,25,26,26,26,26,26,26,26,26,26,26,26,26,27,17,17,17,
+17,17,17,16,23,24,23,24,102,103,103,104,23,24,23,24,18,17,17,17,
+17,17,17,16,39,40,39,40,118,119,119,120,39,40,39,40,18,17,17,17,
+17,17,17,16,55,56,55,56,55,56,55,56,47,56,55,56,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,63,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,32,33,33,33,33,48,2,5,49,33,33,33,33,34,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
diff --git a/data/prac2.map b/data/prac2.map
new file mode 100644
index 0000000..48125b7
--- /dev/null
+++ b/data/prac2.map
@@ -0,0 +1,21 @@
+20
+18
+1
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,25,26,26,26,26,26,26,26,26,26,26,26,26,27,17,17,17,
+17,17,17,16,23,24,102,103,103,104,23,24,23,24,23,24,18,17,17,17,
+17,17,17,16,39,40,118,119,119,120,39,40,39,40,39,40,18,17,17,17,
+17,17,17,16,47,56,55,56,55,56,55,56,55,56,55,56,18,17,17,17,
+17,17,17,16,63,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,87,88,89,90,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,32,33,33,33,33,33,33,33,48,2,5,49,33,34,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
diff --git a/data/prac3.map b/data/prac3.map
new file mode 100644
index 0000000..bb60b1f
--- /dev/null
+++ b/data/prac3.map
@@ -0,0 +1,21 @@
+20
+18
+1
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
+17,17,17,25,26,26,26,26,26,26,26,26,26,26,26,26,27,17,17,17,
+17,17,17,16,23,24,23,24,102,103,103,104,23,24,23,24,18,17,17,17,
+17,17,17,16,39,40,39,40,118,119,119,120,39,40,39,40,18,17,17,17,
+17,17,17,16,55,56,55,56,55,56,55,56,47,56,55,56,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,63,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,87,88,89,90,5,2,5,2,87,88,89,90,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,
+17,17,17,32,33,33,33,33,48,2,5,49,33,33,33,33,34,17,17,17,
+17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,