From e4520b11a9e9b84cb655eea0c6a755d887fa17c8 Mon Sep 17 00:00:00 2001
From: JailDoctor <jaildoctor@gmail.com>
Date: Wed, 8 Feb 2023 20:09:00 +0100
Subject: [PATCH] =?UTF-8?q?-=20Les=20pr=C3=A0ctiques...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/game.ini    |   2 +-
 data/game.lua    |   2 +-
 data/m_arq.lua   |   2 +-
 data/m_prac3.lua | 103 +++++++++++++++++++++++++++++++++++++++++++++++
 data/prac3.map   |  12 +++---
 data/sprites.gif | Bin 4913 -> 5186 bytes
 data/test.map    |  18 ++++-----
 data/tiles.gif   | Bin 2136 -> 2158 bytes
 8 files changed, 121 insertions(+), 18 deletions(-)
 create mode 100644 data/m_prac3.lua

diff --git a/data/game.ini b/data/game.ini
index 41da662..d294666 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_prac2.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_prac3.lua,m_prac2.lua,m_prac1.lua,m_jail1.lua,main.lua
diff --git a/data/game.lua b/data/game.lua
index 47cb3ae..53606df 100644
--- a/data/game.lua
+++ b/data/game.lua
@@ -5,7 +5,7 @@ game={
     restart=function()
         flags={}
         objects.list={}
-        actors.main={name="jailer",x=40,y=26,o="r",gfx={x=32,y=0},level="arq"}
+        actors.main={name="jailer",x=10,y=26,o="r",gfx={x=32,y=0},level="arq"}
         game.init("arq")
     end,
 
diff --git a/data/m_arq.lua b/data/m_arq.lua
index a47561e..e04d723 100644
--- a/data/m_arq.lua
+++ b/data/m_arq.lua
@@ -47,7 +47,7 @@ levels["arq"]={
                 if hero.o=="u" then
                     game.paused = true
                     fade.fadeout()
-                    actors.main.x=9
+                    actors.main.x=6
                     actors.main.y=16
                     actors.main.o="u"
                     actors.main.level="prac3"
diff --git a/data/m_prac3.lua b/data/m_prac3.lua
new file mode 100644
index 0000000..cd6d0b2
--- /dev/null
+++ b/data/m_prac3.lua
@@ -0,0 +1,103 @@
+levels["prac3"]={
+    load=function()
+        mapa.load("prac3.map")
+
+        actors.add({name="profe",x=11,y=5,o="u",gfx={x=224,y=0}})
+
+        actors.add({name="comp_1_1",x=4,y=9,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_2_1",x=6,y=9,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_1_2",x=4,y=11,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_2_2",x=6,y=11,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_1_3",x=4,y=13,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_2_3",x=6,y=13,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action})
+
+        actors.add({name="comp_3_1",x=12,y=9,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_4_1",x=14,y=9,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_3_2",x=12,y=11,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_4_2",x=14,y=11,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_3_3",x=12,y=13,o="d",gfx={x=160,y=0},action=levels.prac3.comp_updating_action})
+        actors.add({name="comp_4_3",x=14,y=13,o="d",gfx={x=176,y=0},action=levels.prac3.comp_updating_action})
+
+        actors.add({name="comp_profe",x=6,y=6,o="d",gfx={x=96,y=0},action=levels.prac3.comp_profe_action})
+        actors.add({name="taula_profe",x=8,y=6,o="d",gfx={x=160,y=16}})
+
+        actors.add({name="alumne1",x=12,y=14,o="d",gfx={x=32,y=64}})
+        actors.add({name="alumne2",x=6,y=10,o="d",gfx={x=16,y=96}})
+        actors.add({name="alumne3",x=4,y=12,o="d",gfx={x=96,y=64}})
+        actors.add({name="alumne4",x=4,y=10,o="d",gfx={x=96,y=64}})
+        actors.add({name="alumne5",x=14,y=12,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=6,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=8
+                    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=6,y=15,w=1,h=1,action=
+            function()
+                local hero = actors.search(actors.main.name)
+                if hero.o=="u" then
+                    scene.start({
+                        function() balloon.show("...COMO IBA DICIENDO...",12,"profe",true,{x=4,w=13,h=1}) end,
+                        function() balloon.show("...BLAH BLAH BLAH...",12,"profe",true,{x=4,w=13,h=1}) end
+                    })
+                    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_profe_action=function()
+        local hero = actors.search(actors.main.name)
+        if hero.o~="d" then return end
+        scene.start({
+            function() balloon.show("PAREIX QUE NO FUNCIONA...",2,"jailer",true,{x=1,w=13,h=1}) 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/prac3.map b/data/prac3.map
index bb60b1f..2786a42 100644
--- a/data/prac3.map
+++ b/data/prac3.map
@@ -3,11 +3,11 @@
 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,23,24,23,24,23,24,102,103,103,104,23,24,18,17,17,17,
+17,17,17,16,39,40,39,40,39,40,118,119,119,120,39,40,18,17,17,17,
+17,17,17,16,55,56,55,56,55,56,55,56,55,56,55,47,18,17,17,17,
+17,17,17,16,5,2,5,2,5,2,5,2,5,2,5,63,18,17,17,17,
+17,17,17,16,5,2,87,88,89,90,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,5 +17,5 @@
 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,32,33,48,2,5,49,33,33,33,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/sprites.gif b/data/sprites.gif
index 33d17545dce2ddd53b6c6d03d4ca4264ffebb405..f3cc87cef8544f739fce9786df79e99721904d4e 100644
GIT binary patch
delta 2497
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
L-T*0tApih7Z#}NI

delta 2222
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

diff --git a/data/test.map b/data/test.map
index f626059..f774e41 100644
--- a/data/test.map
+++ b/data/test.map
@@ -4,15 +4,15 @@
 18,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,26,26,26,26,26,26,26,26,26,26,26,101,5,2,5,2,5,2,5,2,18,
 18,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,16,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,5,2,5,2,5,2,5,2,18,
 18,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,16,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,23,24,23,24,23,24,23,24,5,2,5,2,5,2,5,2,18,
-18,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,16,39,40,39,40,39,40,35,36,75,76,39,40,39,40,39,40,41,42,39,40,107,108,77,78,5,2,5,2,5,2,5,2,18,
-18,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,16,47,56,57,58,59,56,51,52,91,92,55,56,57,58,59,56,47,56,55,56,123,124,93,94,5,2,5,2,5,2,5,2,18,
-18,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,16,63,2,7,8,9,2,5,2,5,2,5,2,7,8,9,2,63,2,5,2,139,140,109,110,5,2,5,2,5,2,5,2,18,
+18,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,16,39,40,39,40,39,40,35,36,75,76,79,40,39,40,39,40,41,42,39,40,107,108,77,78,5,2,5,2,5,2,5,2,18,
+18,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,16,47,56,57,58,59,56,51,52,91,92,55,56,57,58,59,56,55,56,47,56,123,124,93,94,5,2,5,2,5,2,5,2,18,
+18,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,16,63,2,7,8,9,2,5,2,5,2,5,2,7,8,9,2,5,2,63,2,139,140,109,110,5,2,5,2,5,2,5,2,18,
 100,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,101,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,
 28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,
 23,24,23,24,19,20,21,22,23,24,19,20,21,22,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,23,24,19,20,21,22,23,24,23,24,5,2,5,2,5,2,5,2,84,86,86,86,86,86,86,86,86,86,86,86,86,86,86,85,5,2,5,2,5,2,5,2,18,
-39,40,41,42,35,36,37,38,41,42,35,36,37,38,39,40,39,40,39,40,35,36,75,76,39,40,39,40,39,40,39,40,35,36,37,38,41,42,39,40,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
-55,56,57,58,59,52,53,54,47,56,51,52,53,54,55,56,57,58,59,56,51,52,91,92,55,56,47,56,57,58,59,56,51,52,53,54,55,56,47,56,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
-5,2,7,8,9,2,5,2,63,2,5,2,5,2,5,2,7,8,9,2,5,2,5,2,5,2,63,2,7,8,9,2,5,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
+39,40,39,40,35,36,37,38,79,40,35,36,37,38,79,40,39,40,41,42,35,36,75,76,79,40,39,40,39,40,41,42,35,36,37,38,79,40,39,40,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
+55,56,57,58,59,52,53,54,55,56,51,52,53,54,55,56,47,56,55,56,51,52,91,92,55,56,57,58,59,47,55,56,51,52,53,54,55,56,47,56,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
+5,2,7,8,9,2,5,2,5,2,5,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,7,8,9,63,5,2,5,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
 5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
 5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
 84,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,85,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,17,17,17,17,16,5,2,5,2,5,2,5,2,18,
@@ -24,9 +24,9 @@
 100,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,101,5,2,5,2,5,2,5,2,100,26,26,26,26,26,26,26,26,26,26,26,26,26,26,101,5,2,5,2,5,2,5,2,18,
 28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,5,2,5,2,5,2,5,2,28,29,28,29,28,29,28,29,28,29,28,29,28,29,28,29,5,2,5,2,5,2,5,2,18,
 23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,5,2,5,2,5,2,5,2,23,24,23,24,23,24,19,20,21,22,23,24,23,24,23,24,5,2,5,2,5,2,5,2,18,
-39,40,39,40,39,40,35,36,75,76,41,42,39,40,39,40,39,40,35,36,75,76,41,42,39,40,39,40,39,40,35,36,75,76,41,42,39,40,39,40,5,2,5,2,5,2,5,2,39,40,39,40,39,40,35,36,75,76,41,42,39,40,39,40,5,2,5,2,5,2,5,2,18,
-55,56,55,56,55,56,51,52,91,92,47,56,55,56,57,58,59,56,51,52,91,92,55,56,55,56,57,58,59,56,51,52,91,92,47,56,55,56,55,56,5,2,5,2,5,2,5,2,55,56,47,56,57,58,59,52,91,92,47,56,57,58,59,56,5,2,5,2,5,2,5,2,18,
-5,2,5,2,5,2,5,2,5,2,63,2,5,2,7,8,9,2,5,2,5,2,5,2,5,2,7,8,9,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,63,2,7,8,9,2,5,2,63,2,7,8,9,2,5,2,5,2,5,2,5,2,18,
+39,40,39,40,41,42,35,36,75,76,79,40,39,40,39,40,39,40,35,36,75,76,79,40,41,42,39,40,39,40,35,36,75,76,79,40,41,42,39,40,5,2,5,2,5,2,5,2,39,40,39,40,41,42,35,36,75,76,79,40,39,40,39,40,5,2,5,2,5,2,5,2,18,
+55,56,55,56,55,56,51,52,91,92,55,56,47,56,57,58,59,56,51,52,91,92,55,56,55,56,57,58,59,56,51,52,91,92,55,56,55,56,47,56,5,2,5,2,5,2,5,2,57,58,59,56,55,56,47,52,91,92,55,56,57,58,59,56,5,2,5,2,5,2,5,2,18,
+5,2,5,2,5,2,5,2,5,2,5,2,63,2,7,8,9,2,5,2,5,2,5,2,5,2,7,8,9,2,5,2,5,2,5,2,5,2,63,2,5,2,5,2,5,2,5,2,7,8,9,2,5,2,63,2,5,2,5,2,7,8,9,2,5,2,5,2,5,2,5,2,18,
 5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,
 5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,18,
 33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,34,
diff --git a/data/tiles.gif b/data/tiles.gif
index 0d13621489c63236b8dc4d9dfbdc3b019516d79d..fd1dfabea9f20b2b868cf31ccc581e8cf242e52b 100644
GIT binary patch
delta 936
zcmV;Z16Tam5bhALgam({WfaaEnhZC#W!F8kYHayg?V<-1U=>zI^g1`Zo>2V^Bz7lm
zHr^ldHtnK*Bk(9nj|QHa*BDQ2IO2*cezt*)v(0zpl}e6)<z+~!TLJ_ecv$9!E8BVJ
zpXZJL@7|D~G`Z=h8$hLQinab3wCQS2HRo4FlDrVLJD_*llAnJ>K;;(i2z>B4!XEo9
z$UDXP5OFbuJl@XTzK4^0=>8f4s~DBz_1FivwGrEM55D)x<Ig<fe)fH6ljo}mz&-@O
z_!S0Ym|FzDD8|6cfzD5GIaC4;pa2S5a1Z3D-e(X~CE*>=S%TY8tll-apoN7bwiDU;
zCKwwG(!*lU;R%0eI7k4)AO?Xp3gI4%fCN6=Lk~R!1pn|A!D&sff=Kk=_vm0TOF3~R
zIP8uNOI8IRs)L9B`ka(nwL;mrFcJVOQF1_dLiJ>%ih1bA6RIdg1(uJC60~3vzc`05
zw*P62>FSkuF2{}?UQr4=e47^rSq3}6@o`?XLk3|KHaveOLXU1dTdj1V#z{Esl1;M%
zc@Wt`McSf$zG<XX<_AgD@G&A$<A^Hj(6m-6?Uk;9&yqX|#w@f3Y*Zsk8Lu@(xOJ{t
zHhP+C+A_-}O2U>;T7uzpc}kHOPiMv?8}9G~%hnLHHFRWR!V<B}y6jSq3uGV|qB*u{
zlBt@BB&UBrZmG;%db62td%ytZNzZ!P)1FEAB`4AMwA(C_oeB^q5}3K1Bi!?#2hFGA
z%!xh{ZswoKq{3|!K+pjh6rmWMr$Q4~ttYO;inxGiB6?_zBUDs`^2{hkH)^+zegYK#
z1(;_u{034yK)`6oFhCQ6m`alZCoLCMX+p^vjlO?XiwXh|KozUCN`#0sIRKrV=Ta)v
zd$P1{Z~^8cswLH0ZWF2z?W)~^TGe`9wQO09sZ8JVQksfYo3{jOBHmgyvX)h&M9mgW
zld4p<l!B{tl?F1;bCakBHX3%l>siT`)~f)PuIqe~T$gZI#8UOHc<o$T;{#KeKK8AV
zCG3B63|rYbB(|)J9a~!4QVLIeR;;0&EJaIeT7ix$ugasTV{vP@Rm4>)w`>A!O<Tfj
zmJJXd71eN;%iPK$H@UoRu5_nMgy#}~KJWP`b+^miPx?(IZ()meyGvf~TK9?3EsL*u
zVGFDEx_7zec&~gb%a8fm_pMD$$bI+A-~N;R2UQ%*;~x9?$3PCUkcUj<A{+V0NKUen
Kmpr>50029wc)+0m

delta 914
zcmV;D18w~75ZDl~gam&^V-(ICnhZC#W!F8kYHayg?V<-jLQffUTk8qc&-iWk;X|Bl
z;D@|TyQtxF7@?KdZ8$qM;gBP4x8ix@yZ7Vd0A7Zqx+OrsfrnvyIn|kKUN+~9v(0zw
zMTl<y0F}BacKT<~rn|b%hF=wl@Ir9zfZlD>WATo;>z<?Pge!lWxKpji#Z>TkJLmZx
zPVQm!@&GpPe1KaU5j`!zQ$M`=#p4}20(~Far1#2e^`ZFV7ltwAi||YF|Ecjp=S0T6
z1ROvC2TUOSA^|YeA*M>Z)1R|?HK16%D{w&z3rPmpsshSpfswP=b9e%p2NJ+Ah}oZw
zC>RJMAb}6}(8GTV0pUJB!R1f}M4%4iM>}a)%u+yHi3+>J!acaKV(Os63nf=MDRmHs
zAG8BGELNiAOi+XB$w(DoSdBbvk%s-#-V>*l!vrD_gmj={o2;0wUWq4w>@Z>yrC`Lj
zdH>;#q8nrPq*%YwgpG}faAO$HRx4ffBMwbVq|^359>;%0v4^Yh<8f+JK0&GmjuD9(
zM>bgpMJf_$@;d;0mc&N}W}!7;qZ(1Lc&#GNO>@<<(bHVh7E<=mAE;ac;Z})Bk^C-M
zJ>-ug$)q$#*0MEdl*B2Yq)S!Sg_Umf-~Yf6Oj~>oPsQBhEti>yT|TpyZ+pN1#!1d{
zn$w&~faQNMyZ5x)Ofg}Jm?jc<xtt@M^PcxiC*rP2%nNSjow=mKZ4^My3W^h-2py+B
z4_B=qu7r!Y04OsRu*5F9u%H{VXF?IWP`fqs6QC%-IGa&`YVqTHY-qv^HF<>7P(`Ev
z8_j1mBhfdLdO`pK*kZLfi4cjN=OzJl9pYdbQ*?jMbPjNd<s+&kR8zt;IYDh|-H2LL
za(1+CNfqfx-viQ;9<^?`d=gYAD%GhTw5sL2YT2@i)10!U6ihAaEuJcssLIuCXGN<*
zzdD4hUL~$_4eL**W7oS5FRyx4E7`IdpOA(Wuw@nOSQBAbyy`Wrd=)}g+foWoKvt@f
ztt)?7D|=XZl0kEJP^u$7+tgK{a<WYz?eH*|OtJyOp`wzlZg;EO+u}B}ybZ2!iQroT
z(C0l59j<bhYul2l<SlGTE_0_#-QorjxYW&VQ~gOi?Rs~&=J>97WqZ=`npdtoO?Ak5
o*UR4ay7#^Cjjw#?OW*q1_rCbeuYUK--~N;R2UQ0A;UEA2J4uAaYXATM