From 175b4790d50d71c6d0ac98c04a686c51f9d738e2 Mon Sep 17 00:00:00 2001 From: duncathan <dunc@duncathan.com> Date: Sat, 29 Feb 2020 04:29:03 -0600 Subject: [PATCH] gives hp, locks arthur's front door --- pre-edited-cs/data/Stage/MazeW.tsc | 2 +- pre-edited-cs/data/Stage/Pens1.tsc | 2 +- pre-edited-cs/data/Stage/ScriptSource/MazeW.txt | 12 +++++++----- pre-edited-cs/data/Stage/ScriptSource/Pens1.txt | 7 +++++++ src/database/world_graph.lua | 6 +++--- src/randomizer.lua | 4 +++- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pre-edited-cs/data/Stage/MazeW.tsc b/pre-edited-cs/data/Stage/MazeW.tsc index df03473..b0364b2 100644 --- a/pre-edited-cs/data/Stage/MazeW.tsc +++ b/pre-edited-cs/data/Stage/MazeW.tsc @@ -1 +1 @@ -=:S``i`=:l}~qls}�``cglvqy````lu~t=:S``ia=:l}~qls}�``cglvqy```alu~t=:S``ib=:l}~qls}�``cglvqy```blu~t=:S``ic=:l}~qls}�``cglvqy```clu~t=:S``id=:l}~qls}�``cglvqy```dlu~t=:S`a``=:l��ylvq```bl��q``chj``ibj```ej```c=:S`a`a=:S`a`b=:l��yl��``aalt~�`a`blvq```dl��q``d`j``ibj```dj```e=:S`a`c=:lv|z`fhaj`a`e=:ly�z``agj`a`d=:l��yl}�w|�����^l~tlu~t=:S`a`d=:l��yl��``bblwy�a`aglv|[`fhaly�]``ag=:l}�wl�������P���Pms�����P{��m^l~tls|lu�u`a`e=:S`a`e=:l��yl��``aalt~�`a`clvq````l��q``daj``i`j``aej```i=:S`a`f=:l{u�l��``aalq~�`a`fj``0`j```blvq```dl��q``dbj``idj```ej```i=:S`aa`=:lu�u`aaa=:S`aaa=:l{u�l��``aalq~�`aa`j````j```blvq```bl��q``dcj``ibj```dj``ac=:S`ab`=:l{u�lvq```dl��q``d`j``idj``abj```b=:S`c``=:S`c`a=:lt~�`c`alrq```alv|]`fh`lu~t=:S`c`b=:lt~�`c`bls}�```glrq``a`ls~�`c``j``acj````lr�|````lu~t=:Sa```=:l{u�lvr````j``afl�qy`be`ls}�````=:l}�cl���ls}�``ae=:t�������P}������P�^lv}``afl�qy`af`lv|[fa`fl~tls|ls}�``cg=:ls~�`c``j````j````lv|[`fh`lu~t=:Sab``=:l{u�lq~�ab``j``b`j```b=:lv~ab``j``aflvqy```a=:l�qy`a``lvq```al��q``dgjab``j``chj``af \ No newline at end of file +>;Taaja>;m~rmt~�aadhmwrzaaaamw}{gcackaajfmvu>;Taajb>;m~rmt~�aadhmwrzaaabmw}{gcackaajfmvu>;Taajc>;m~rmt~�aadhmwrzaaacmw}{gcackaajfmvu>;Taajd>;m~rmt~�aadhmwrzaaadmw}{gcackaajfmvu>;Taaje>;m~rmt~�aadhmwrzaaaemw}{gcackaajfmvu>;Taajf>;mt~�aaiakaaagkaabgmvu>;Tabaa>;m��zmwr�aaacm��raadikaajckaaafkaaad>;Tabab>;Tabac>;m��zm���aabbmu�abacmwr�aaaem��raaeakaajckaaaekaaaf>;Tabad>;mw}{agibkabaf>;mz�{aabhkabae>;m��zm~�x}�����_m�umvu>;Tabae>;m��zm���aaccmxz�babhmw}\agibmz�^aabh>;m~�xm�������Q���Qnt�����Q|��n_m�umt}�mv�vabaf>;Tabaf>;m��zm���aabbmu�abadmwr�aaaam��raae1kaajakaabfkaaaj>;Tabag>;m|v�m���aabbmr�abagkaaaakaaacmwr�aaaem��raaeckaajekaaafkaaaj>;Tabba>;mv�vabbb>;Tabbb>;m|v�m���aabbmr�abbakaaaakaaacmwr�aaacm��raaedkaajckaaaekaabd>;Tabca>;m|v�mwr�aaaem��raaeakaajekaabckaaac>;Tadaa>;Tadab>;mu�adabms�raaabmw}^agiamvu>;Tadac>;mu�adacmt~�aaahms�raabamt�adaakaabdkaaaams�}aaaamvu>;Tbaaa>;m|v�mw�saaaakaabgm�rzacfamt~�aaaa>;m~�dm���mt~�aabf>;u�������Q~������Q�_mw�~aabgm�rzabgamw}\gbagm�umt}�mt~�aadh>;mt�adaakaaaakaaaamw}\agiamvu>;Tbcaa>;m|v�mr�bcaakaacakaaac>;mw�bcaakaabgmwrzaaab>;m�rzabaamwr�aaabm��raaehkbcaakaadikaabg \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/Pens1.tsc b/pre-edited-cs/data/Stage/Pens1.tsc index 3ecf584..99a48a5 100644 --- a/pre-edited-cs/data/Stage/Pens1.tsc +++ b/pre-edited-cs/data/Stage/Pens1.tsc @@ -1 +1 @@ -=:S``i`=:l}~qls}�```blvqy````lu~t=:S``ia=:l}~qls}�```blvqy```alu~t=:S``ib=:l}~qls}�```blvqy```blu~t=:S``ic=:l}~qls}�```blvqy```clu~t=:S``id=:l}~qlv|z`cdaj``iels}�```blvqy```dlu~t=:S``ie=:ls}�``adlvqy```dlu~t=:S``ih=:ls}�``ad=:lq~�`e``j```aj````lvqy```d=:ls~�`c`aj`aabj```bl�qy`a``=:lq~�`e``j````j````=:l}�t```bl�}slt~�`c`alu~t=:S``ii=:l{u�l}~qlv|z`cdaj``ihls}�```b=:lq~�`e``j```aj````lvqy```d=:ls~�`c`aj`aabj```bl�qy`a``=:lq~�`e``j````j````=:l}�t```bl�}slt~�`c`alu~t=:S`a``=:l��ylvq```dl��q``a`j``idj``ahj``cb=:S`a`a=:l��ylvq```dl��q``abj``idj``cgj``aa=:S`a`b=:l��yl��``aalt~�`a`blvq```dl��q``aaj``idj``afj``ec=:S`b``=:l{u�=:l�q�l}�wq�����W�Pq������jl~t=:lq}z```aj`b`a=:lq}z```cj`b`b=:lu�u`b`e=:S`b`a=:lv|zbh`bj`b`clu�u`b`e=:S`b`b=:lv|zbh`bj`b`dlu�u`b`e=:S`b`c=:l{u�l}�wlwy�```c�����P����P�����P���P�Pv�������ol�~z`b`el�q}```aj```cj````lu�u`b`e=:S`b`d=:l{u�l}�wlwy�```a�����P����Pv�������P���P�P�����ol�~z`b`el�q}```cj```aj````lu�u`b`e=:S`b`e=:lq}z```ij`b`f=:lq}z``abj`b`g=:lu�u`baa=:S`b`f=:lv|zbhaaj`b`hlu�u`baa=:S`b`g=:lv|zbhaaj`b`ilu�u`baa=:S`b`h=:l{u�l}�wlwy�``ab�����P����Pr����P���P�P~������ol�~z`baal�q}```ij``abj````lu�u`baa=:S`b`i=:l{u�l}�wlwy�```i�����P����P~������P���P�Pr����ol�~z`baal�q}``abj```ij````lu�u`baa=:S`ba`=:l{u�l}�wv������^^^ol~tlu~t=:S`baa=:lv|zbhb`j`bablu�u`bad=:S`bab=:lq}z```gj`bac=:l{u�l}�wlwy�```g����P��P����Pr������ol�~z`badlq}[```gj`a``lu�u`bad=:S`bac=:l{u�l}�wlwy�```gt���P���P����Pr������ol�~z`badlq}]```glu�u`bad=:S`bad=:l{u�l}�w~�P����P�������P��P�����^l~tlu~t=:S`c``=:S`c`a=:S`c`c=:S`e``=:l��[```ajf``al��[```bjf``bl��[```cjf``cl��[```djf``dl��[```ejf``e=:l{u�l�q�l}�wqP����������^l~tl�|�l~tlu~t=:S`f``=:lv|z`cbej`f`a=:l{u�l}�wlvqs```i�������P����^l~tls|����W�P����^l~t=:���W�P����P������P��P��=:���P����P�������^l~t=:����P���Pt�����W�P��������=:����\P��W��P�����P��P���=:��P���P������P����^l~t=:y�P��������P���P���\=:���P���^l~tls|�y�W�P���P����P����\PyP����\=:���P������P��P���P��P��^l~t=:����W�P����P���P���P����=:���P���P�����^l~tlu~t=:S`f`a=:l{u�l}�wlvqs```iyP����P������W�P����^^^l~tlu~t=:S`fb`=:l{u�ls}�````lv|[`aeflv|[`ddd=:lq~�`e``j```aj````=:l�qy```bls~�`fbbj``eej````l�qy``a`=:lvqy```d=:ls~�`fbaj`aacj````=:lq~�`fbaj``c`j````l�qy`a``=:l}�wlvqs``ah�����^^^l~tls|�lvqs``a`^^^q��P���P����ol~tls|lvqs````=:l�qy``c`lq~�`fbaj````j```b=:l}�wlvqs``ah^^^}��^l~tls|�}�P����P�������P������=:��P����^l~tls|�lvqs``a`^^^^^l~tls|lvqs````=:lq~�`e``j````j````l�qy``c`=:lq~�`a`bj````j```bl��``aa=:ls~�`fbej``dbj````=:l}�wlvqs```a{�����QQl~tlq~�`fbbj````j```bls|�q��P���������Pr������Ql~tls|�lvqs``ah�Ql~tls|lvqs````=:lq~�`fbaj```cj```bl�qy``h`=:lq~�`fbaj````j```b=:l}�wlvqs``ah���W��P���P�����\P����oQl~tls|�lvqs```a����\P����P��P����^l~tls|lvqs````=:ls~�`fbdj``faj````=:lq~�`fbej```cj````l�qy``af=:lq~�`fbdj```hj````l�qy``af=:lq~�`fbdj````j````=:l��``aalq~�`a`bj````j````l�qy``dh=:lq~�`fbej````j````=:l}�wlvqs```g^^^^^l~tls|�lvqs``ah���W�P����P}�����ol~tls|lvqs````=:l�qy``c`=:lq~�`fbej````j```bl�qy``c`=:lq~�`fbdj````j```bl�qy``e`=:lq~�`fbej````j````l�qy``b`=:l}�wlvqs```a����W�P{���^l~tls|�qP������P��P����P����P��=:���P�������^l~tls|������P����P��P��P����P��=:}������P����^l~t=:~�����P���P��P����\=:������\P����P����P���������=:��P���Pt�����W�P�����^l~tls|�u���P{���P���P����=:�������^^^l~tls|=:ls}�```b=:lq~�`e``j```aj````=:ls~�`c`aj`aabj```bl�qy`a``=:lq~�`e``j````j````=:l}�t```bl�}slt~�`c`alv|]`aeglu~t=:S`fba=:l{u�lv|z`aehj`fcal}�wlvqs``ah���Pt�����W�P�����P���=:����������P�������P��=:��������^^^l~t=:y�P��P���W�P��P���������=:����^^^l~tlu~t=:S`fbb=:l{u�lv|z`aehj`fcbl}�wlvqs``a`������P���P����P����^l~tls|���P��������������P����W�=:������P�������\P���P��=:�����P��P���^l~tlu~t=:S`fbd=:l{u�lv|z`aehj`fcdl}�wlvqs```g������P��P�P�����=:������^^^l~t=:~�QPyW��P�����P�����P��Ql~tlu~t=:S`fbe=:l{u�lv|z`aehj`fcel}�r````l�qy``c`l}�t````lq~�`fbej````j```bl}�w=:lvqs```a�������P����Ql~tls|�|����P����PyP���P���=:�������P���^l~t=:����P��P�������W�P����\l~t=:��P������P��P����P��P���=:������P���P��������P���=:����P���^l~tls|lvqs````=:lq~�`fbej```cj````l�qy```h=:lq~�`fbej````j````l}�wlvqs0``ar������Ql~tls|�s��P��P����P����P������=:���P����P��P����P��P��ol~tls|lvqs````=:lq~�`fbbj```cj```bl�qy``ae=:lq~�`fbbj```ej```b=:l}�wlvqs``ahls}�````^^^^^l~tls|�=:lvqs``a`���������^l~tls|�lvqs```aoool~tls|�lvqs``ah���\P��P����^^^l~t=:��P����P��P�������P���=:������^l~tls|����Pt�����P���P�������=:���P���P�������^l~tlq~�`fbdj````j````ls|�=:lvqs```gQQQl~tls|�lvqs```a����ol~tls|�lvqs``ah�����P��P���P���P���=:��������P����\P��P��P����=:�P������P��P����^l~t=:���P��������P��P���P����=:����^l~tls|����P�������P���P����������=:��P��P�����P���������P��=:���P����P����^l~tls|�=:lvqs```g���P����P����ol~tls|����P����\P����W�P�����=:��W��P����P���Pt�����ol~tls|�lvqs``ah����\l~tP����P������P���=:��P���P��������^l~t=:y�P��P���W�P�������P�����=:�������P������P����P���=:�����P�����P��P����^^^l~tls|�x������\P���P����P����P��=:�����������P���������^l~t=:u���P���������P��P����P���=:����\l~t=:�����W�P��P���������P����=:��P�����P������P�����^^^l~tls|�=:lvqs```g���W��P������P��ol~tls|�lvqs``ahq�������^^^l~tls|������W�P���P��P��P���W�=:�P�������P�����P���P����=:���^l~tls|lvqs````=:lq~�`fbaj```cj```blq~�`fbej```cj````l�qy``b`=:lq~�`fbaj````j```bl�qy```blq~�`fbej````j```b=:l}�wlvqs``ahy�W�P���^l~tls|�=:ls}�```blvqs``a`^^^���Py�P��ol~tls|�lvqs``ahy�P����^^^l~tls|�����P��P���P��P���P�����=:�����P������P����P����=:����������P��P����P������l~t=:a`P�����P���^l~tls|�lvqs``a`qP�����oQl~tls|�lvqs``ah}�P����������P���P����=:����P���P����P����������=:�����P���\lq~�`fbaj````j````l~t=:���PyP��P���P����P���=:�����������^l~t=:y�W�P��������P��������P����=:���P��P����P�����P����^^^l~tls|�lvqs``a`���������^l~t=:yW��P���������P��P���P����=:����^l~tls|�lvqs``ahyP���^l~tls|lvqs````=:lq~�`fbbj```cj````l�qy``ae=:lq~�`fbbj````j```b=:lq~�`fbaj````j```bl�qy``c`l}�wlvqs``ah���P���P���P����P������=:��P���������P����P������^l~tls|�������^Pw���P��P����P���^l~tlv|[`aehl��[```cjf``clu~t=:S`fca=:l{u�l}�wlvqs``ah���P���P�����P���P����=:����P���P���P����������^l~t=:v���P���P���P�������P���=:����P�����P������P���P��=:����^l~tlu~t=:S`fcb=:l{u�l}�wlvqs``a`��P���W��P���P��P���^^^l~tls|�yP����W�P����P�������^l~tls|�}�\P��\P���P���������P���=:����]�����^l~tlu~t=:S`fcd=:l{u�l}�wlvqs```g���P����P����^^^l~tlu~t=:S`fce=:l{u�l}�wlvqs```ay�P���P���P���P��P���=:�������\P��W��P��P����P��=:�������P���P���P���P���^l~tls|�y�W�P�P���P��������������^l~tlu~t=:S`fe`=:l{u�l}�wlvqs``ah����P���P����P���P���=:����P����P������^^^l~t=:yP���P���^^^l~tlu~t=:S`fea=:lt~�`feal{u�l}�t````=:lq~�`e``j```aj````l�qy``e`=:l}~�`fe`j```fj```gj```b=:ls~�`fe`j`aacj```b=:lq~�`fe`j``c`j```bl�qy`a``=:lq~�`fe`j````j```b=:lq~�`e``j````j````l�qy``e`=:lq~�`fe`j```cj```bl�qy``fd=:lq~�`fe`j````j````=:l�qy``a`=:lq~�`fe`j````j```bl�qy``e`=:lq~�`fe`j```cj```bl�qy``bb=:lq~�`fe`j```ej```b=:lv|[`gddlv|[`afb=:lq~�`fe`j````j```b=:lv|]`af`lv|[`afalv|[`gdalu�u`feb=:S`feb=:lu�u``gc=:S`ff`=:l{u�lv|za`b`j`ffal}�wlvqs``ah����P���P����P���P���=:����P����P������^^^l~t=:yP���P���^^^l~tlu~t=:S`ffa=:l{u�l}�wlvqs``ahyW�P�����P�����P���P���=:�����P����P���P��������=:����P������^l~tls|���P������P����P����P���=:�����^l~tlu~t=:S`g``=:l{u�ls}�````lvq```dl��q``bdj`g``j```bj````=:Sf``a=:l��yl}�wl���t�P���P����P��P��P��P���=:u��Ps�������ol�~z````ls|=:l{u�ls~�`c``j`aaaj```blx}sl�qy``f`lq~�`e``j```aj````=:l�qy`a``lv|z`aeijf`aalu�uf`a`=:Sf``b=:l��yl}�wl���t�P���P����P��P��P��Pw��������ol�~z````ls|=:l{u�ls~�`c``j`aaaj```blx}sl�qy``f`lq~�`e``j```aj````=:l�qy`a``lvq```dl��q```fj``ihj```dj``ah=:Sf``c=:l��yl}�wl���t�P���P����P��P��P��P���=:����P����ol�~z````ls|=:l{u�ls~�`c``j`aaaj```blx}sl�qy``f`lq~�`e``j```aj````=:l�qy`a``lvq```dl��q``a`j``iij``cfj``cc=:Sf``d=:l��yl}�wl���t�P���P����P��P��P��P���=:|��������ol�~z````ls|=:l{u�ls~�`c``j`aaaj```blx}sl�qy``f`lq~�`e``j```aj````=:l�qy`a``lvq```dl��q``dcj``iij``a`j``cd=:Sf``e=:l��yl}�wl���t�P���P����P��P��P��P���=:����������ol�~z````ls|=:l{u�ls~�`c``j`aaaj```blx}sl�qy``f`lq~�`e``j```aj````=:l�qy`a``lvq```dl��q``f`j``iij```ij```i=:Sf`a`=:l{u�lvq```dl��q```bj``iij```ej```f=:Sf`aa=:l{u�l}�wl���������ol�~zf`a`lvq```dl��q``dij``iij```gj```f=: \ No newline at end of file +0==F=IZ[NIPZb===?ISNV====IR[Q0==F>IZ[NIPZb===?ISNV===>IR[Q0==F?IZ[NIPZb===?ISNV===?IR[Q0==F@IZ[NIPZb===?ISNV===@IR[Q0==FAIZ[NISYW=@A>G==FBIPZb===?ISNV===AIR[Q0==FBIPZb==>AISNV===AIR[Q0==FEIPZb==>AIN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0==FFIXRfIZ[NISYW=@A>G==FEIPZb===?IN[]=B==G===>G====ISNV===AIP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>IR[Q0=>==I]_VISN\===AIa_N==>=G==FAG==>EG==@?0=>=>I]_VISN\===AIa_N==>?G==FAG==@DG==>>0=>=?I]_VISYW=@?AG=>=@IVaW===>G=>=>IZ`TY|pxrq;I[\QIR[Q0=>=@I`\b==??ITVa>==>ISY8=@?AISY8=AA>IZ`TIab_b�rq-JN�u�4�-Xr�J;I[\QIVa:===>ITVa====IPY\IRcR=>=A0=>=AI]_VI`\b==>>IQ[]=>=?ISN\===AIa_N==>>G==FAG==>CG==B@0=?==IXRfI`NaIZ`TN�u�4�-N�r{nyGI[\QINZW===>G=?=>INZW===@G=?=?IRcR=?=B0=?=>ISYW?E=?G=?=@IRcR=?=B0=?=?ISYW?E=?G=?=AIRcR=?=B0=?=@IXRfIZ`TITVa===@anqr-�|�-`{nxr-s|-n-SvronyyLIf[W=?=BIaNZ===>G===@G====IRcR=?=B0=?=AIXRfIZ`TITVa===>anqr-�|�-Svronyy-s|-n-`{nxrLIf[W=?=BIaNZ===@G===>G====IRcR=?=B0=?=BINZW===FG=?=CINZW==>?G=?=DIRcR=?>>0=?=CISYW?E>>G=?=EIRcR=?>>0=?=DISYW?E>>G=?=FIRcR=?>>0=?=EIXRfIZ`TITVa==>?anqr-�|�-Oynqr-s|-n-[rzr�v�LIf[W=?>>IaNZ===FG==>?G====IRcR=?>>0=?=FIXRfIZ`TITVa===Fanqr-�|�-[rzr�v�-s|-n-OynqrLIf[W=?>>IaNZ==>?G===FG====IRcR=?>>0=?>=IXRfIZ`TSy|�r�;;;LI[\QIR[Q0=?>>ISYW?E?=G=?>?IRcR=?>A0=?>?INZW===DG=?>@IXRfIZ`TITVa===D]vpx-�}-�|�-O�ooyrLIf[W=?>AINZ8===DG=>==IRcR=?>A0=?>@IXRfIZ`TITVa===DQ|}-|ss-�|�-O�ooyrLIf[W=?>AINZ:===DIRcR=?>A0=?>AIXRfIZ`T[|-z|r-�rn}|{�-�|-�nqr;I[\QIR[Q0=@==0=@=>0=@=@0=B==I]`8===>GC==>I]`8===?GC==?I]`8===@GC==@I]`8===AGC==AI]`8===BGC==BIXRfI`NaIZ`TN-�ryr}|�r;I[\QI`Y]I[\QIR[Q0=C==ISYW=@?BG=C=>IXRfIZ`TISNP===Fdryp|zr-onpx;I[\QIPY_`�r4�-onpx;I[\Q`ur4�-orr{-y|pxrq-�}-v{�ur-pntr-|���vqr;I[\Qdur{-�ur-Q|p�|4�-sy�{xvr�p|zr9-�r4r-t|v{t-�|-���|-tr�-a||x|-onpx;I[\QV{-r�pun{tr-s|-`�r9�|�-�rr;I[\QIPY_V�4�-{|�-�r�-{vpr9-V-x{|�9o��-a||x|-v�-|{r-|s-��;I[\Qaun�4�-�un�-�|�-tr�-�ur{�|�-np�-ny|{r;I[\QIR[Q0=C=>IXRfIZ`TISNP===FV-u|}r-a||x|4�-�nsr;;;I[\QIR[Q0=C?=IXRfIPZb====ISY8=>BCISY8=AAAIN[]=B==G===>G====IdNV===?IP[]=C??G==BBG====IdNV==>=ISNV===AIP[]=C?>G=>>@G====IN[]=C?>G==@=G====IdNV=>==IZ`TISNP==>E\|||uu;;;I[\QIPY_ISNP==>=;;;Nr-�|�-|xn�LI[\QIPY\ISNP====IdNV==@=IN[]=C?>G====G===?IZ`TISNP==>E;;;Zzz;I[\QIPY_Z�-yvsr-syn�urq-ors|rz�-r�r�;I[\QIPY_ISNP==>=;;;;;I[\QIPY\ISNP====IN[]=B==G====G====IdNV==@=IN[]=>=?G====G===?I`\b==>>IP[]=C?BG==A?G====IZ`TISNP===>Xn��zn..I[\QIN[]=C??G====G===?IPY_N{q-]|sr��|-O||��r.I[\QIPY_ISNP==>E\u.I[\QIPY\ISNP====IN[]=C?>G===@G===?IdNV==E=IN[]=C?>G====G===?IZ`TISNP==>Ef|�4r-nyy-vtu�9-�ur{L.I[\QIPY_ISNP===>dryy9-z|r-|-yr��;I[\QIPY\ISNP====IP[]=C?AG==C>G====IN[]=C?BG===@G====IdNV==>CIN[]=C?AG===EG====IdNV==>CIN[]=C?AG====G====I`\b==>>IN[]=>=?G====G====IdNV==AEIN[]=C?BG====G====IZ`TISNP===D;;;;;I[\QIPY_ISNP==>Edu|4�-�un�-ZvzvtnLI[\QIPY\ISNP====IdNV==@=IN[]=C?BG====G===?IdNV==@=IN[]=C?AG====G===?IdNV==B=IN[]=C?BG====G====IdNV==?=IZ`TISNP===>aun�4�-Xv{t;I[\QIPY_N-svr{q-|s-zv{r-urr-v{�ur-�vyyntr;I[\QIPY_aurr-��rq-�|-or-�|{�-|sZvzvtn�-urr;I[\Q[rny�-nyy-|s-�urz9�u|�tu9-un�r-orr{-xvq{n}}rqo�-�ur-Q|p�|4�-t||{�;I[\QIPY_R�r{-Xv{t-un�-y|��svr{q�;;;I[\QIPY\IPZb===?IN[]=B==G===>G====IP[]=@=>G=>>?G===?IdNV=>==IN[]=B==G====G====IZfQ===?I`ZPIQ[]=@=>ISY:=>BDIR[Q0=C?>IXRfISYW=>BEG=C@>IZ`TISNP==>Eaur-Q|p�|4�-}yn{�-nr}|prrqv{t-r�np�y�-|{�purq�yr;;;I[\QVs-�r-q|{4�-q|-�|zr�uv{t�||{;;;I[\QIR[Q0=C??IXRfISYW=>BEG=C@?IZ`TISNP==>=aun{x�-s|-�|�-ury};I[\QIPY_\�-�n{�}|�n�v|{-qvq{4�rnyy�-���v�r9-o��-n�yrn��-�r-qvq;I[\QIR[Q0=C?AIXRfISYW=>BEG=C@AIZ`TISNP===Da||x|-n�-n-qrn�u�rn}|{;;;I[\Q[|.-V4yy-{r�r-nyy|�-v�.I[\QIR[Q0=C?BIXRfISYW=>BEG=C@BIZfO====IdNV==@=IZfQ====IN[]=C?BG====G===?IZ`TISNP===>dryp|zr-onpx.I[\QIPY_Y||x�-yvxr-V-|�r-�|�n{|�ur-|{r;I[\Qdv�u-z�-o|�ur4�-ury}9I[\Q�r-�u|�yq-or-noyr-�|-tr�n|�{q-�ur-}n���|q-s| �un�-rtt;I[\QIPY\ISNP====IN[]=C?BG===@G====IdNV===EIN[]=C?BG====G====IZ`TISNP===>O||��r.I[\QIPY_Pn{-�r-�nxr-�uv�-yv��yrt��-�v�u-��-�ur{-�r-t|LI[\QIPY\ISNP====IN[]=C??G===@G===?IdNV==>BIN[]=C??G===BG===?IZ`TISNP==>EIPZb====;;;;;I[\QIPY_ISNP==>=]|sr��|;I[\QIPY_ISNP===>LLLI[\QIPY_ISNP==>E`�r9-z�-qrn;;;I[\Qdr-un�r-�|-���}r{q-|�r�pn}r;I[\QIPY_aur-Q|p�|-un�-y|pn�rq�ur-rq-sy|�r�;I[\QIN[]=C?AG====G====IPY_ISNP===D...I[\QIPY_ISNP===>dun�LI[\QIPY_ISNP==>Eduvyr-ur-un�-{|�-�r�np~�vrq-�urz9-v�-v�-|{y�n-zn��r-|s-�vzr;I[\Qaur-y|pn�v|{-v�-�ur-`n{qg|{r;I[\QIPY_aur-sy|�r�-nr-n}}nr{�y��|-or-s|�{q-�|zr�urr-v{�ur-`n{q-g|{r;I[\QIPY_ISNP===Daur-`n{q-g|{rLI[\QIPY_f|�-zrn{9-�un�4�-�urr�r4yy-sv{q-�ur-Q|p�|LI[\QIPY_ISNP==>Edryy9I[\Q-z|r-yvxry�-|{r|s-uv�-�r�n{��;I[\QVs-�r-q|{4�-qr��|�-�u|�rsy|�r�-ors|r-�ur�-tr��urv-un{q�-|{-�urz;;;I[\QIPY_U|�r�r9-�ur-`n{q-g|{r-v�r�prrqv{ty�-qn{tr|��;I[\QR�r{-��}}|�v{t-�r-znqr-�ur�v}9I[\Q�urr4�-{|-t�nn{�rr-�un��r-�|�yq-r��{-nyv�r;;;I[\QIPY_ISNP===Df|�4r-tv�v{t-�}LI[\QIPY_ISNP==>ENp��nyy�;;;I[\QIPY_aurr4�-|{r-|s-��-�u|4�n-}rsrp�-zn�pu-s|-�uv�w|o;I[\QIPY\ISNP====IN[]=C?>G===@G===?IN[]=C?BG===@G====IdNV==?=IN[]=C?>G====G===?IdNV===?IN[]=C?BG====G===?IZ`TISNP==>EV�4�-�|�;I[\QIPY_IPZb===?ISNP==>=;;;du|-V`-urLI[\QIPY_ISNP==>EV{-snp�;;;I[\QIPY_auv�-v�-|{r-|s-�ur-nzrq�p|��-|o|��-�un�-�rrqv�}n�purq-�|-�uv�-v�yn{qI[\Q>=-�rn�-nt|;I[\QIPY_ISNP==>=N-|o|�L.I[\QIPY_ISNP==>EZ�-vz}r��v|{-�n�-�un��ur�-unq-orr{-p|z}yr�ry��v}rq-|��9IN[]=C?>G====G====I[\Qo��-V-q|-{|�-x{|�-�ur}n�vp�yn�;I[\QV�4�-r{�vry�-}|��voyr-�un�|{r-|s-�urz-p|�yq-un�r;;;I[\QIPY_ISNP==>=]|sr��|;I[\QV4�r-p|{{rp�rq-�|-�ur-`n{qg|{r;I[\QIPY_ISNP==>EV-�rr;I[\QIPY\ISNP====IN[]=C??G===@G====IdNV==>BIN[]=C??G====G===?IN[]=C?>G====G===?IdNV==@=IZ`TISNP==>Ef|�-nr-�ur-z|��-��v�rq�|-r�}y|v{t-�uv�-v�yn{q;I[\QIPY_]yrn�r;-Tv�r-��-�|�-nvq;I[\QISY8=>BEI]`8===@GC==@IR[Q0=C@>IXRfIZ`TISNP==>Ef|�-pn{-rnpu-�ur-`n{qg|{r-�vn-�ur-�ryr}|�r;I[\QSv{q-�ur-rq-sy|�r�-n{qo�{-r�r�-�v{tyr-|{r-|s�urz;I[\QIR[Q0=C@?IXRfIZ`TISNP==>=`|-�|�4r-|{r-|s-�ur;;;I[\QIPY_V-unq{4�-r�r{-{|�vprq;I[\QIPY_Z�9-z�9-�|�-pr�nv{y�-nr�ryy:o�vy�;I[\QIR[Q0=C@AIXRfIZ`TISNP===Daur-`n{q-g|{r;;;I[\QIR[Q0=C@BIXRfIZ`TISNP===>Vs-�|�-tr�-vq-|s-�ursy|�r�9-�r4yy-or-noyr-�|}r�r{�-�ur-�n-s|-{|�;I[\QIPY_V�4�-n-ovt-r�}|{�vovyv��;I[\QIR[Q0=CB=IXRfIZ`TISNP==>Eanxr-`�r-�v�u-�|�-n{qsyrr-�uv�-v�yn{q;;;I[\QV-ort-�|�;;;I[\QIR[Q0=CB>IQ[]=CB>IXRfIZfQ====IN[]=B==G===>G====IdNV==B=IZ[]=CB=G===CG===DG===?IP[]=CB=G=>>@G===?IN[]=CB=G==@=G===?IdNV=>==IN[]=CB=G====G===?IN[]=B==G====G====IdNV==B=IN[]=CB=G===@G===?IdNV==CAIN[]=CB=G====G====IdNV==>=IN[]=CB=G====G===?IdNV==B=IN[]=CB=G===@G===?IdNV==??IN[]=CB=G===BG===?ISY8=DAAISY8=>C?IN[]=CB=G====G===?ISY:=>C=ISY8=>C>ISY8=DA>IRcR=CB?0=CB?IRcR==D@0=CC=IXRfISYW>=?=G=CC>IZ`TISNP==>Eanxr-`�r-�v�u-�|�-n{qsyrr-�uv�-v�yn{q;;;I[\QV-ort-�|�;;;I[\QIR[Q0=CC>IXRfIZ`TISNP==>EV4z-��y�-�|�-s|-�urpun|�-�un�-un�-orsnyyr{�|�-v�yn{q;I[\QIPY_dr-u�zn{�-z���-�nxr-�uroynzr;I[\QIR[Q0=D==IXRfIPZb====ISN\===AIa_N==?AG=D==G===?G====0C==>I]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-�urRtt-P|vq|LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISYW=>BFGC=>>IRcRC=>=0C==?I]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-Tn���|�{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N===CG==FEG===AG==>E0C==@I]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-�ur`n{q-g|{rLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==>=G==FFG==@CG==@@0C==AI]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-�urYno�v{�uLIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==A@G==FFG==>=G==@A0C==BI]_VIZ`TIab_Q|-�|�-�n{�-�|-t|-�|-�ur]yn{�n�v|{LIf[W====IPY\IXRfIP[]=@==G=>>>G===?IUZPIdNV==C=IN[]=B==G===>G====IdNV=>==ISN\===AIa_N==C=G==FFG===FG===F0C=>=IXRfISN\===AIa_N===?G==FFG===BG===C0C=>>IXRfIZ`TIab__�v{rqLIf[WC=>=ISN\===AIa_N==AFG==FFG===DG===C \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt b/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt index d36c54e..3c36035 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/MazeW.txt @@ -1,14 +1,16 @@ #0090 -<MNA<CMU0037<FAI0000<END +<MNA<CMU0037<FAI0000<FLJ6202:0095<END #0091 -<MNA<CMU0037<FAI0001<END +<MNA<CMU0037<FAI0001<FLJ6202:0095<END #0092 -<MNA<CMU0037<FAI0002<END +<MNA<CMU0037<FAI0002<FLJ6202:0095<END #0093 -<MNA<CMU0037<FAI0003<END +<MNA<CMU0037<FAI0003<FLJ6202:0095<END #0094 -<MNA<CMU0037<FAI0004<END +<MNA<CMU0037<FAI0004<FLJ6202:0095<END +#0095 +<CMP0080:0006:0016<END In Camp mode, make Camp chest accessible without flight or damage boost #0100 <PRI<FAO0002<TRA0038:0092:0005:0003 diff --git a/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt b/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt index 156c63e..93a2990 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/Pens1.txt @@ -28,6 +28,13 @@ #0101 <PRI<FAO0004<TRA0012:0094:0037:0011 #0102 +<PRI<FLJ0324:0103 +<ITJ0001:0101 +<MSGLocked.<NOD<END +#0103 +<SOU0022<GIT1001<FL+0324<FL+0441 +<MSG<TURUsed =Arthur's Key=.<NOD<IT-0001<GIT0000<CLO<EVE0104 +#0104 <PRI<SOU0011<DNP0102<FAO0004<TRA0011:0094:0016:0053 #0200 <KEY diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua index c22081a..9b42b5e 100644 --- a/src/database/world_graph.lua +++ b/src/database/world_graph.lua @@ -258,7 +258,7 @@ function labyrinthW:new(worldGraph) self.locations.turboChaba.requirements = function(self, items) return _has(items, "machineGun") end self.locations.snakeChaba.requirements = function(self, items) return _has(items, "fireball") end self.locations.whimChaba.requirements = function(self, items) return _count(items, "polarStar", 2) end - self.locations.campChest.requirements = function(self, items) return _has(items, "flight") end + self.locations.campChest.requirements = function(self, items) return _has(items, "flight") or self.world:Camp() end self.locations.puuBlack.requirements = function(self, items) return _has(items, "clinicKey") and _has(items, "weaponBoss") end end @@ -490,8 +490,8 @@ function worldGraph:getMALCO() return {self.regions.grasstownEast.locations.malco} end -function worldGraph:getDrGero() - return {self.regions.labyrinthW.locations.physician} +function worldGraph:getCamp() + return {self.regions.labyrinthW.locations.physician, self.regions.labyrinthW.locations.campChest} end function worldGraph:getPuppySpots() diff --git a/src/randomizer.lua b/src/randomizer.lua index cfe1f4f..d6db8f2 100644 --- a/src/randomizer.lua +++ b/src/randomizer.lua @@ -163,7 +163,9 @@ function C:_shuffleItems(tscFiles) _.shuffle(self.worldGraph:getFirstCaveSpots())[1]:setItem(shuffle(self.itemDeck:getItemsByAttribute("weaponSN"))[1]) elseif self.worldGraph:Camp() then -- give Dr. Gero a strong weapon... you'll need it - self.worldGraph:getDrGero()[1]:setItem(shuffle(self.itemDeck:getItemsByAttribute("weaponStrong"))[1]) + self.worldGraph:getCamp()[1]:setItem(shuffle(self.itemDeck:getItemsByAttribute("weaponStrong"))[1]) + -- and some HP once you fight your way past the first few enemies + self.worldGraph:getCamp()[2]:setItem(self.itemDeck:getByKey("capsule5G")) end -- place the bomb on MALCO for bad end