From f651874e6b4d3239c288f5f06d6846cf3acff22b Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Fri, 3 Feb 2023 19:06:49 +0100
Subject: [PATCH] =?UTF-8?q?-=20cls()=20per=20a=20quan=20no=20hi=20ha=20map?=
 =?UTF-8?q?a=20-=20Scroll=20restringit=20-=20Treballant=20en=20les=20jails?=
 =?UTF-8?q?=20-=20Mes=20gr=C3=A0fics?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/game.lua    |   5 +++-
 data/jail.map    |  38 +++++++++++++++---------------
 data/m_jail1.lua |  59 +++++++++++++++++++++++++++++++++++++++++++++--
 data/sprites.gif | Bin 1523 -> 3897 bytes
 data/tiles.gif   | Bin 2223 -> 2304 bytes
 5 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/data/game.lua b/data/game.lua
index 40c134a..050dc85 100644
--- a/data/game.lua
+++ b/data/game.lua
@@ -103,10 +103,13 @@ game={
         local hero = actors.search("jailer")
         if hero then
             game.cam.x = hero.x*8 + hero.dx*2 - 80
+            if game.cam.x+160 > mapa.w*8 then game.cam.x = mapa.w*8-160 end
             if game.cam.x < 0 then game.cam.x=0 end
             game.cam.y = hero.y*8 + hero.dy*2 - 72
+            if game.cam.y+144 > mapa.h*8 then game.cam.y = mapa.h*8-144 end
             if game.cam.y < 0 then game.cam.y=0 end
         end
+        cls(6)
         camera(game.cam.x, game.cam.y)
         setsource(tiles)
         setmap(mapa.surface)
@@ -120,7 +123,7 @@ game={
         end
         setmap(mapa.surface)
         camera(0,0)
-
+        text(tostring(game.cam.x)..","..tostring(game.cam.y),1,1,8)
         if not scene.script and hero and not hero.path and hero.dx+hero.dy==0 then
             if btn(KEY_DOWN) then
                 hero.path={pos=0,route='d',keys=true}
diff --git a/data/jail.map b/data/jail.map
index 40efa67..3a8320c 100644
--- a/data/jail.map
+++ b/data/jail.map
@@ -1,21 +1,21 @@
-40
+30
 18
 1
-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,26,26,26,26,27,17,17,17,17,17,17,17,17,17,17,
-17,16,23,24,23,24,23,24,23,24,23,24,23,24,23,24,23,24,30,23,24,23,24,23,24,23,24,23,24,18,17,17,17,17,17,17,17,17,17,17,
-17,16,39,40,39,40,39,40,39,40,39,40,39,40,39,40,39,40,46,39,40,39,40,39,40,39,40,39,40,18,17,17,17,17,17,17,17,17,17,17,
-17,16,55,56,55,56,55,56,55,56,55,56,55,56,55,56,55,56,62,55,56,55,56,55,56,55,56,55,56,18,17,17,17,17,17,17,17,17,17,17,
-17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,60,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,
-17,16,87,88,89,90,5,2,87,88,89,90,5,2,87,88,89,90,60,87,88,89,90,5,2,87,88,89,90,18,17,17,17,17,17,17,17,17,17,17,
-17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,60,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,
-17,16,87,88,89,90,5,2,87,88,89,90,5,2,60,65,66,65,60,87,88,89,90,5,2,87,88,89,90,18,17,17,17,17,17,17,17,17,17,17,
-17,16,5,2,5,2,5,2,5,2,5,2,5,2,60,81,82,81,60,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,
-17,16,87,88,89,90,5,2,87,88,89,90,5,2,60,97,97,98,60,87,88,89,90,5,2,87,88,89,90,18,17,17,17,17,17,17,17,17,17,17,
-17,16,5,2,5,2,5,2,5,2,5,2,5,2,60,2,5,3,60,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,
-17,16,87,88,89,90,5,2,87,88,89,90,5,2,5,2,5,2,5,5,2,5,2,5,2,87,88,89,90,18,17,17,17,17,17,17,17,17,17,17,
-17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,
-17,16,87,88,89,90,5,2,87,88,89,90,5,2,60,2,5,2,60,5,2,5,2,5,2,87,88,89,90,18,17,17,17,17,17,17,17,17,17,17,
-17,16,5,2,5,2,5,2,5,2,5,2,5,2,60,15,12,13,60,5,2,5,2,5,2,5,2,5,2,18,17,17,17,17,17,17,17,17,17,17,
-17,32,33,33,33,48,5,2,49,33,33,48,5,2,49,33,33,33,33,33,48,5,2,49,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,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,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,26,26,26,26,27,
+17,16,23,24,23,24,23,24,23,24,23,24,23,24,23,24,23,24,30,23,24,23,24,23,24,23,24,23,24,18,
+17,16,39,40,39,40,39,40,39,40,39,40,39,40,39,40,39,40,46,39,40,39,40,39,40,39,40,39,40,18,
+17,16,55,56,55,56,55,56,55,56,55,56,55,56,55,56,55,56,62,55,56,55,56,55,56,55,56,55,56,18,
+17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,60,5,2,5,2,5,2,5,2,5,2,18,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,87,88,89,90,60,87,88,89,90,5,2,87,88,89,90,18,
+17,16,5,2,5,2,5,2,5,2,5,2,5,2,5,2,5,2,60,5,2,5,2,5,2,5,2,5,2,18,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,64,65,66,65,67,87,88,89,90,5,2,87,88,89,90,18,
+17,16,5,2,5,2,5,2,5,2,5,2,5,2,80,81,82,81,83,5,2,5,2,5,2,5,2,5,2,18,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,112,68,69,70,113,87,88,89,90,5,2,87,88,89,90,18,
+17,16,5,2,5,2,5,2,5,2,5,2,5,2,96,87,89,90,96,5,2,5,2,5,2,5,2,5,2,18,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,5,2,5,2,5,5,2,5,2,5,2,87,88,89,90,18,
+17,16,5,2,5,2,5,2,5,2,5,2,5,2,61,2,5,2,61,5,2,5,2,5,2,5,2,5,2,18,
+17,16,87,88,89,90,5,2,87,88,89,90,5,2,60,2,5,2,60,5,2,5,2,5,2,87,88,89,90,18,
+17,16,5,2,5,2,5,2,5,2,5,2,5,2,60,2,5,2,60,5,2,5,2,5,2,5,2,5,2,18,
+17,32,33,33,33,48,5,2,49,33,33,48,5,2,49,33,33,33,33,33,48,5,2,49,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,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,
diff --git a/data/m_jail1.lua b/data/m_jail1.lua
index 8a29775..31a6f0b 100644
--- a/data/m_jail1.lua
+++ b/data/m_jail1.lua
@@ -2,7 +2,7 @@ levels["jail1"]={
     load=function()
         mapa.load("jail.map")
 
-        actors.add({name="estudiant",x=12,y=8,o="d",gfx={x=64,y=0}})
+        actors.add({name="estudiant",x=12,y=8,o="r",gfx={x=64,y=48}})
         actors.add({name="comp_1_1",x=2,y=5,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
         actors.add({name="comp_2_1",x=4,y=5,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
         actors.add({name="comp_1_2",x=2,y=7,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
@@ -25,6 +25,35 @@ levels["jail1"]={
         actors.add({name="comp_3_5",x=8,y=13,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
         actors.add({name="comp_4_5",x=10,y=13,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
 
+        actors.add({name="comp_5_1",x=14,y=5,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_6_1",x=16,y=5,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_5_2",x=14,y=7,o="d",gfx={x=96,y=16},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp_6_2",x=16,y=7,o="d",gfx={x=112,y=16},action=levels.jail1.comp_updating_action})
+
+        actors.add({name="comp2_1_1",x=19,y=5,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_2_1",x=21,y=5,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_1_2",x=19,y=7,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_2_2",x=21,y=7,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_1_3",x=19,y=9,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_2_3",x=21,y=9,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+
+        actors.add({name="comp2_3_1",x=25,y=5,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_4_1",x=27,y=5,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_3_2",x=25,y=7,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_4_2",x=27,y=7,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_3_3",x=25,y=9,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_4_3",x=27,y=9,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_3_4",x=25,y=11,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_4_4",x=27,y=11,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_3_5",x=25,y=13,o="d",gfx={x=96,y=0},action=levels.jail1.comp_updating_action})
+        actors.add({name="comp2_4_5",x=27,y=13,o="d",gfx={x=112,y=0},action=levels.jail1.comp_updating_action})
+
+        actors.add({name="comp_usufondo",x=16,y=15,o="d",gfx={x=112,y=16},action=levels.jail1.comp_usufondo_action})
+        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=8,y=8,w=1,h=3,action=
             function()
                 if not flags.usu1 then
@@ -34,7 +63,7 @@ levels["jail1"]={
                         function() wait.start(1) end,
                         function() actors.search("usufondo").path={pos=0,route='dlllll'} end,
                         function() balloon.show("HOY NO HAY JAIL!\nTU MISMO!!",10,"usufondo",false,{x=7,w=10,h=2}) end,
-                        function() objects.collect("diskito_usufondo") end,
+                        --function() objects.collect("diskito_usufondo") end,
                         function() actors.search("usufondo").path={pos=0,route='rrrrru'} end,
                         function() wait.start(0.5) end,
                         function() actors.remove("usufondo") scene.cont() end,
@@ -57,4 +86,30 @@ levels["jail1"]={
         })
     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/sprites.gif b/data/sprites.gif
index 9f45870666b0f07247fce125cb6430f4662f3a24..084965595a65fcb8a9cd068fd65bb150ce352fb9 100644
GIT binary patch
delta 3821
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

delta 1429
zcmV;G1#0@a9`g$bM@dFFH(`JPkqB~sfB=9100sXbAc{t5j%cc`fO)bo>y~kC-?dTf
zyaCTX88Em4{v608QDt25o;(#4%AD?&BOMe=8q%1<Vsh-@w#a2CV$EI`r0w=Qr9<xQ
zT<tXP<$IZB21q4obZCQcac+r<b6Ix}kq-`6bOm;olvsT)S$&3rfrEuvqM}@X1q6x&
zjw7k7tu2s}lm$y#4w93Vo}q++x17O9x`Vf6#-l+`s&TAV&27&+Ef0b_k#`2xkC(-~
z)uF{@++DusMB9S8k>u&(w1Fa-sR#D=tZ4Q3_W6|64j43Oz(63uTtU>;%63T|iAfI-
zY_o;{VnS=g;yJ8Va9~G*49Y2gWH-qnJp%mt|79ApkDtFeB_0fnH1i8UgC7|n^b~QT
zfr>V_<&qfbr$wGKWj3&u?m<qRA$^=odB7h_lqp|!+k?V{QkqL`b|ER&D^ZF}=}gpB
zHfGYA%aRnJx{}P?lq+HC!DK6487rMysGE_NL?E(lnYt)^CMLTVb*CJEk_(09nZH{Q
zb>V?$<7EQ`LW}n0iNKI@pCPDTO}Yz&({U%uo^7X^wP*-T7wxLYmga}IrTOG7+VpSR
z1|TR{uHf}<Ppe=5E<m!n_3L^$fmw{&+$Xg^&u$X7efjWt1(sV`&tAPF0}B?oh;IhI
zd>2K`n=qeW!HoVc@W+IIet`i%-2<`U;7b2CynTUR5n@5;V1d2l@WO-J!Ej)L3L3~D
zcocTnV2C1m7h#DgD!2|UW|-KbU`<F!;$>sJ7-Nbe;?fQ{UFE`}j5qf3A0UU+hsKLI
z{;*yiv((~87$62oBN=&2hGdeKu(!#QQ9>zXkfB&<NRe3L&>L5OTLCuWA76So<&izg
zc4e9BEQ#8gTV$aaY;DG<P?2}eHYb)s;knL5cwQk=Nki-uP9KXRL#3mC9@$-)GCqM}
zp?f$A<97gg;i(HXc2ek(o?<FPXfCk2rltjMW10yBbSF%N+q`B11h$f@#Eh!8U|Mmk
znpO&Evz9O`9X$zu;H&^f`Snw>KjHd-|9|`#pg^G7>RN(-gA!UsXwn$>4zi>DCP=jc
zL;|fuq`2@bwCa}OUqJ<FyRMMg9v5s^!8zlZV7Q(4r~&hO6%4}e8a$W*_%fhygAp72
zZ<kVn>SD$SKN~A~YE^vV#aYm20)0i89D}yte(PU;Lk`$~GRyVN9ImPlVhEmv6OIfc
z&k2zTEXiHs95bOu6P@Ilq--}Mn?TwKrw}?T9p@9NrrA)`Rc~CM2~>&^w$+9p_{61`
zVU0G(eNq@^nEv{z1lc_@q-ohuTnaYSUdQSq+)dL6_{~e#f@Udp_t4<4I`8e~8Ir)g
z$=_qs4Y5ameerk(mpw*%G}y*eeL4R@pidrojdWjDQ&D-~l({XS0L3~WKLO+S>WpQ9
zQ|YP8qBgEb;C|wY?V#P5?716OjPZg9Pk7;mhsbpDz_D)R@-42Vm>AgiPC^gJ8X3LM
zpLSdyTjbAR&-sy)Pc#q`6#>4o*-I1?v{ajbKg=b6<ePs92Y4Qx5E4J98Haj^Gv9XB
za44x+!++p04?+YeuI<smWQ4GWd>}NzJm?2r)_55hIw-Sm9ZH0~gHH)In6mqvjD=m%
z4+`l(AeVU%Tr-TJ%><Oft~H1^QCnGCg7||WdhduxOrjE($iyZ(@rh83q7<h{#VT6y
zidf8lq87Kv#V&gBi(m|+7{^G)a59?ljA%@w8rR6iHoEbRaEzlI=Saso+VPHf%%dLn
z$j3hV@sEHEq#y@L$U++OkcdpAA{WWXMmqA5kc^}xCrQalTJn;Z%%mna$;nQ7@{^zp
jr6@;9%2Jy0l&DOlDp$$MR=V<)u#BZFXF13O5C8x>km0X3

diff --git a/data/tiles.gif b/data/tiles.gif
index 2e28bad3049bc7658c2067a77f3d37ce8ac42ad1..b3335770d1a36579a6973c2ca2dde47ed4f0dde9 100644
GIT binary patch
delta 761
zcmV<V0tWrB5r7h~`~`nLWZptVYFMOXLIoPs)Z1EJB)m0gEhE<lgXi5@V1FpK-U^ie
z{o&bprCsSyY%A+F%yJ_@x4avD<Tyxq54gAFeKTM-184`OHc*8Ze7M0eZyj^8jX!RB
zLXjIVx$2c)E}6g;&(`^#pT8`x=%X81`st2`6t+XZ`#m7wQNe%i=In3RzWCd7=dSx$
zUW?>A->H*r`QMl~eR1rEWge9BqciEXa(63MJ@9;gsD1&jZ-0DV*45<G{DjeOKVaBh
zXSa7`DWKtV|JzCc(e?mcsfl%1vXW#L$iN0V@PP|l-}s!ux(Nyef*8!81{r9O!CBBw
zohjd4*tfwFnh<}29bA(E)mA|fj_`yqjA2w#I3TV)Dggxe5|VzmzwVGwhCn<a4gU==
zv_~x|hhVxM<$AcBA6_UbPYhxPQx`8I9uZqSbfIDfBBTHOkc$lZq7)t25Dj6=idQsN
z0GW6kFnSS+VH_g{sc0lLrqM{hli}`o$H#=ov4M0vlAeE*g+x5^O^?v~piZRsM-KY$
zZw+u%n2^K(0tj-4hm4^?5V8}?@T4MSY2*S^ceGNrCy$y0<!W-mNd<^9HIMXF0*``9
z7;X}E!ucd8WAe%w#<EniWJxWBxX4xJq$aNHrA$)SEn#NTmV9ZAWt1tCGWsc)Tl!E#
zWT>5P=5K$S)Rc<<(t^P9h4Y+p1RFUQB0_Y!6Nu_O0PEWM&U%_Kp7S)PJ@+}?#c|4W
zA${ZsKL`3ie8NUi$t0*kdE-ykwbGL!dB8#^T223rry;xi=0PaR(aAJanCnbvM@Ooc
z*a0&@Atk9wJ!(>r{!^qYr6@jK%DR}2bf#NMsZAC+ic|dPbf**TDN0`oREn07oHPYz
zQIm}b9adlst60ZM*0P%QtY}TETGz_fwz~DLaE+^6=StVQ+V!q@&8uGb%GbX7^{;>p
rtY8OA*uon2u!v2pVi(KU#ya+~kd3TlCrjDNTK2M-&8%kK84v(FNgH<0

delta 680
zcmV;Z0$2Tj60Z@k`~`n5G&KVn7Acuffd)0UvQ`%fZ%tau$o0YCd3P4rABvq9k!3Ug
zaCT5>1GRR+ZNnTl0&~l|(MODfg!h1YN5%JtX6J==r9Tb6XW<6NymidUF5dX)2|aE=
z<T6b@VC7K>T=8t0yUqE_@_r7wk)o5%ct~L@Fm~UPx$b7{OU{3uxZ85yj{8_%i^O~0
zzVA&o<$gDP@#}~E9hC8)GwHQ*b}ME&>I8jgegVN>KYU)+)#TIrguyRAVAx$(w|8VI
zpkYJJ>Hi`BQPY)q2C@<!p-(0SWXb_0!@veQ@PQC)Am+ZOluS8AL`_*>1UJaR4%$dn
z0t}RAW|J7ve1?BCh0&k~SI9yKlE(mCdsG4l5U&)TP%d{F4Gz!J!XEk%N&_0&qyLsf
z!({#Nh)7JLKwcQHArdiOO0?WlqH>`qMv#fda^e%SXhj4vNQD59(SN|$MIge^NLt)t
zp2|qTFH+HsY-Au7kEADM6_Jh&C}Zw)$H#=k(Tt5UNtl21M1Vk+gn|@w9wL9@yg#C8
zKu3$Dd+rxL@l|9emf^`IW8%nxys%qGp=2eKV-SR3ay6HXUMB(YNrm~RjHN7{a5QO3
zPOkEWi>wJOb+Vd_@N$()9MC9H)5X5D#xlTUr7(wSmNIJRne_wUEtkp6WLndQFJxvj
zugOghW>bHg-3;djH)H^9?na#Glw*MU*tm4M(?-%#<kx8O&U$(>K(Ra}X7Xu_OMAML
zocxStD*Z{&f*SOo2u-L$7s}9vI`p9sji^K?O3{j1^r9Hes75!+(T;lbqaY2bNJmQ2
zlA83SC{3wKSIW|sy7Z+mjj2p$O4FL!^rkq?sZJJm%F~|u^rt`#s!)eY)S?>os7Ot!
OQj?7c9R)uP2mm|rNJ~Ee