From 16840aafa84ed79b6b1d35f853bec1bb2c22dc29 Mon Sep 17 00:00:00 2001 From: duncathan Date: Thu, 28 Mar 2019 08:31:37 -0600 Subject: [PATCH 1/7] fixes #4, teleporter room softlock droll will attack if you either have the key in your inventory or have unlocked the door --- pre-edited-cs/data/Stage/CentW.tsc | 2 +- pre-edited-cs/data/Stage/ScriptSource/CentW.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pre-edited-cs/data/Stage/CentW.tsc b/pre-edited-cs/data/Stage/CentW.tsc index 582a624..ba735e7 100644 --- a/pre-edited-cs/data/Stage/CentW.tsc +++ b/pre-edited-cs/data/Stage/CentW.tsc @@ -1 +1 @@ -IF_llulIFx}xllllx}llllxIF_llumIFx}xllllx}lllmxIF_llunIFx}xllllx}lllnxIF_lluoIFx}xllllx}llloxIF_llupIFx}xllllx}lllpxIF_lluqIF_lluuIFxx}xllllIFx}lmqlvlllmvllllx}lllpIFxlolmvlmmnvlllnx}lmllIFx}lmqlvllllvllllIFxlllnxlolmxxIF_lmllIFxIFxmlnovlmlnIFxllnqvlmlmIFxc\jxxIF_lmlmIFxllnnxxmlnq\\y\\yjxxxillnqIFxllllxgmlnoxlmlnIF_lmlnIFxxllmmx}lmllvllllvlllnx}lllnx}llqrvllunvlllmvlmloIF_lmqlIFx<}xmmplvlmqnxllnqvlmqmxlmqnIF_lmqmIFxx\\\\\\}cIF{xllllxIFxgmltnxgmmplxglllqvrllqIFx}llqlxIF\~]xxIFxlllnIFx}lnqlvllmlvllllx}llrlIFxlnrlvlmqlvllllxIFx}lnrlvllmlvllllx}llqlIFx}lllox}lmllxxmmpmvlmqnxgmmpmx}llqsvlnnlvllmmvllmpIF_lmqnIFxx\\\\\\}cIF{xllllxxglllqvrllqIFxxlollvlmmmvlllnxx}llrlx}lmqlvlllmvllllIFx}lmllx}lllpx}lllmvlluuvlllqvllltIF_lnqlIFxxjjjjjxxIF_lnrlIF_lollIF_lolm \ No newline at end of file +IF_llulIFx}xllllx}llllxIF_llumIFx}xllllx}lllmxIF_llunIFx}xllllx}lllnxIF_lluoIFx}xllllx}llloxIF_llupIFx}xllllx}lllpxIF_lluqIF_lluuIFxx}xllllIFx}lmqlvlllmvllllx}lllpIFxlolmvlmmnvlllnx}lmllIFx}lmqlvllllvllllIFxlllnxlolmxxIF_lmllIFxx}IFxmlnovlmlnIFxllnqvlmlmIFxc\jxxIF_lmlmIFxllnnxxmlnq\\y\\yjxxxillnqIFxllllxgmlnoxlmlnIF_lmlnIFxxllmmx}lmllvllllvlllnx}lllnx}llqrvllunvlllmvlmloIF_lmqlIFxx} Date: Thu, 28 Mar 2019 08:32:53 -0600 Subject: [PATCH 2/7] fixes #10, mr little logic softlock --- src/database/world_graph.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua index 5cd85b8..f4e4790 100644 --- a/src/database/world_graph.lua +++ b/src/database/world_graph.lua @@ -335,7 +335,7 @@ function outerWall:new(worldGraph) return false end - self.locations.littleHouse.requirements = function(self, items) return _has(items, "flight") and _has(items, "blade") end + self.locations.littleHouse.requirements = function(self, items) return _has(items, "flight") and _has(items, "blade") and _has(items, "mrLittle") end end local plantation = Region:extend() From 0c65ea93ae72aa4e0c2703db84a45f14df99886a Mon Sep 17 00:00:00 2001 From: duncathan Date: Thu, 28 Mar 2019 08:34:13 -0600 Subject: [PATCH 3/7] fixes #12, disappearing curly softlock might wanna do this better later - add a chest? --- pre-edited-cs/data/Stage/Curly.pxe | Bin 248 -> 248 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pre-edited-cs/data/Stage/Curly.pxe b/pre-edited-cs/data/Stage/Curly.pxe index 8c372735b62bbf8cf3306aece5a1bcea15ab8e67..86de1a225e9749ee219d4ac4931486ecfaf4bd2f 100644 GIT binary patch delta 11 Scmeyt_=9mmF{8o6k`@3S0|c-D delta 11 Scmeyt_=9mmF=N5Rk`@3T0|f8@ From 0ff62b449510da587a037da321f7ea44c0cc3adf Mon Sep 17 00:00:00 2001 From: duncathan Date: Thu, 28 Mar 2019 08:36:03 -0600 Subject: [PATCH 4/7] fixes #6, labyrinth M softlock --- pre-edited-cs/data/Stage/MazeM.pxm | Bin 10728 -> 10728 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pre-edited-cs/data/Stage/MazeM.pxm b/pre-edited-cs/data/Stage/MazeM.pxm index cdda7710c72fe5631d07c0b2af96347d6864b7ce..c486f44a3fa49ece251a4ea62467712af15eaa0e 100644 GIT binary patch delta 14 VcmaD6{33Wmi~wW)=2(GlNdPkS1;+pY delta 14 VcmaD6{33Wmi~ytk=2(GlNdPg`1(yH- From b09dc32685c50e52559f8a31d7958bb8745e0418 Mon Sep 17 00:00:00 2001 From: duncathan Date: Thu, 28 Mar 2019 08:40:17 -0600 Subject: [PATCH 5/7] fixes #27, upper sand zone softlock --- pre-edited-cs/data/Stage/Sand.pxm | Bin 12008 -> 12008 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pre-edited-cs/data/Stage/Sand.pxm b/pre-edited-cs/data/Stage/Sand.pxm index 4a2265d4c1ea0eea96b479f067a359c724f1daab..14cbc51c493454c94d32635e61479142b676e469 100644 GIT binary patch delta 46 xcmaD6`yzJ36lTWQ$y1r%GcrtWW%&Rk%UFTz&1r1wSeO_XCW~={cx*h6lmMQy50(G` delta 46 xcmaD6`yzJ36lO+-$y1r%Gb&GRW%&Rk%UFTz&1r1wSeTTRCyQ}|cx*h6lmMU15DNeR From af7f320336a2e8e2ac39a9f962790adfc54e0b58 Mon Sep 17 00:00:00 2001 From: duncathan Date: Thu, 28 Mar 2019 08:51:57 -0600 Subject: [PATCH 6/7] fixes #29, first cave softlock also makes a minor improvement to gunsmith item pickup --- pre-edited-cs/data/Stage/Cave.tsc | 2 +- pre-edited-cs/data/Stage/Pole.tsc | 3 ++- pre-edited-cs/data/Stage/ScriptSource/Cave.txt | 9 +++++++-- pre-edited-cs/data/Stage/ScriptSource/Pole.txt | 8 ++++---- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pre-edited-cs/data/Stage/Cave.tsc b/pre-edited-cs/data/Stage/Cave.tsc index afe8efe..6080687 100644 --- a/pre-edited-cs/data/Stage/Cave.tsc +++ b/pre-edited-cs/data/Stage/Cave.tsc @@ -1 +1 @@ -@=Vcclc@=otovccckoyt|ccccoxw@=Vccld@=otovccckoyt|cccdoxw@=Vccle@=otovccckoyt|ccceoxw@=Vcclf@=otovccckoyt|cccfoxw@=Vcclg@=otovccckoyt|cccgoxw@=Vccll@=ovccckoyt|cccgoxw@=Vcdcd@=o|ovcdcdmccccmccccoccddoytcccfotccdfmcclfmccdcmcccf@=Vcdce@=o|oy}cfcemcdcgoy}cfcdmcdcfozrTowoxw@=Vcdcf@=o|oytccce@=oy^c3ceoy^digdoy^dige@=owccceotccddmcfcemccckmccci@=Vcdcg@=o~xoytccceotccddmcclgmccckmccci@=Vcddc@=o~xoytcccgotcclcmcclemcccjmcccl@=Vcdhc@=o~xowccccovccckoyt|cccg@=ot|ccfc@=occdeovcchcmccfhmccijot|ccec@=occdeovcchcmccfimccijot|ccec@=oxw@=Vcecc@=oxw@=Vcecd@=oxw@=Vcgcc@=o|occeeowcgccoxxcgcd@=Vcgcd@=oxxccde \ No newline at end of file +SPivvvSPvvv~vvvvSPivvwSPvvv~vvvwSPivvxSPvvv~vvvxSPivvySPvvv~vvvySPivvzSPvvv~vvvzSPivvSPvvv~vvvzSPivwvwSPvwvwvvvvvvvvvvwwvvvyvvwyvvyvvwvvvvySPivwvxSPvyvxvwvzvyvwvwvygSPivwvySPvvvxSPvyvzvwv{fSPivwvzSPFvvvxvvwwvvzvvv~vvv|SPivwv{SPw|zvvwv|fSPivwv|SPqvyvxqw|zwqw|zxSPvvvxvvwwvyvxvvv~vvv|SPivwwvSPvvvzvvvvvxvvv}vvvSPivw{vSPvvvvvvv~vvvzSPvvyvSPvvwxvv{vvvy{vv|}vvxvSPvvwxvv{vvvy|vv|}vvxvSPSPivxvvSPSPivxvwSPSPivzvvSPvvxxvzvvvzvwSPivzvwSPvvwx \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/Pole.tsc b/pre-edited-cs/data/Stage/Pole.tsc index e6daa57..ff4173f 100644 --- a/pre-edited-cs/data/Stage/Pole.tsc +++ b/pre-edited-cs/data/Stage/Pole.tsc @@ -1 +1,2 @@ -S``i`=:l}~qls}```hlvqy````lu~t=:S``ia=:l}~qls}```hlvqy```alu~t=:S``ib=:l}~qls}```hlvqy```blu~t=:S``ic=:l}~qls}```hlvqy```clu~t=:S``id=:l}~qls}```hlvqy```dlu~t=:S``ie=:ls}```hlvqy```alu~t=:S`a``=:lylvq````lq``abj``idj``ecj``cf=:S`b``=:l{ulv|zafd`j`b`alv|[afd`ls~`b``j``baj````l``bbluu`b`b=:S`b`a=:lyl}wlu^l~tlu~t=:S`b`b=:luu```b=:S`ba`=:S`c``=:l{ul}wZZl~tlu~t=:S`c`a=:lv|zafddj`c`d=:l{ul}wPWPPPPyP\=:Pol~tlq}z```bj`c`blq}z``acj0c`blu~t=:S`c`b=:l{ulv|qlqy``e`lv|[afddlv|[`c`cluu`c`c=:S`c`c=:luu```b=:S`c`d=:l{ul}wyPP\PPP=:PPPP=:PPPPP^l~tls|yPP\PP\P=:PPPPPP=:PP^l~t=:vPP\PyPPP=:PPPPP^l~t=:PPPP=:PyPPPPP=:PPPPPP^l~tlu~t=:S`ca`=:l{ul}wl=:R^Rl~tlu~t \ No newline at end of file +-::C:FWXKFMW_:::BFPKS::::FOXN-::C;FWXKFMW_:::BFPKS:::;FOXN-::C<FWXKFMW_:::BFPKS:::FWXKFMW_:::BFPKS:::>FOXN-::C?FMW_:::BFPKS:::;FOXN-:;::FZ\SFPKY::::F^\K::;D::?=D::=@-:<::FUOcFPVT;@>:D:<:;FPV5;@>:FMXZ:<::D::<;D::::F]Y_::<>D:=:>FKWT:::>FPV5:=:=FO`O:=:=-:=:=FO`O:::<-:=:>FUOcFW]QSx*~rs}*y|vn6*~ro|o*os}~}*klkvkxmo*lo~oox*~ry}o*ry*k|om|ok~y|}*kxn*~ry}o*ry*k|o*}o|}8FXYNFMV\S*uxo*~rk~6*yp*my|}o6*l~s~*~yyu*y|*rovz*py|*wo*~yozo|soxmo*~rs}*ps|}~rkxn8FXYNP|yw*xy*yx6*S*y*~y*nonsmk~ow}ovp*~y*~ro*}sno*yp*m|ok~syx8FXYN^ro*vkly|*sxyvon*lomywo}*tyrox*S*uxy*~ro|o*k|o*~ry}o*rysvv*oxty*w*y|u*~y*~ro*~wy}~8FXYNFOXN-:=;:FUOcFW]QF^_\,Y~8,FXYNFOXN \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/Cave.txt b/pre-edited-cs/data/Stage/ScriptSource/Cave.txt index f457ad6..b5fdad0 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/Cave.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/Cave.txt @@ -21,10 +21,15 @@ Date: Thu, 28 Mar 2019 09:03:50 -0600 Subject: [PATCH 7/7] fixes #33, jellies softlock also improves some text in chaco's house --- pre-edited-cs/data/Stage/Chako.tsc | 2 +- .../data/Stage/ScriptSource/Chako.txt | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pre-edited-cs/data/Stage/Chako.tsc b/pre-edited-cs/data/Stage/Chako.tsc index 1f56387..8c14ef4 100644 --- a/pre-edited-cs/data/Stage/Chako.tsc +++ b/pre-edited-cs/data/Stage/Chako.tsc @@ -1 +1 @@ ->;Taaja>;m~rmw}^acgdmt~aaacmwrzaaaamvu>;Taajb>;m~rmw}^acgdmt~aaacmwrzaaabmvu>;Taajc>;m~rmw}^acgdmt~aaacmwrzaaacmvu>;Taajd>;m~rmw}^acgdmt~aaacmwrzaaadmvu>;Taaje>;m~rmw}^acgdmt~aaacmwrzaaaemvu>;Taajj>;mt~aacimwrzaaaemvu>;Tabaa>;mzmaabbmuabaamwraaaemraaagkaajekabbjkaabh>;Tacaa>;mz{aaaikacac>;m|vm~xmsQQQ]>;QQQ_mumw}{acebkacabmvu>;Tacab>;mt}m~xmQQQQQQ>;QXQQ___mumt}>;mw}\acgbmw}\acgdmvvadab>;Tacac>;m|vmw}\acbdmracaakaabakaaaamrzaadamwraaaemraaagkaajjkabcekaab1>;Tacba>;mzmw}{ceadkaabjmw}{acebkacbbmvvaabj>;Tacbb>;m|vmw}\ceadmwraaaemt~aaaamrzaacam~adaakaabckaaagkaaaamradaakaabakaaaa>;mrzaafam}z\baaamaacam~uaaacm~mwrzaaaemvvacbc>;Tacbc>;mvvaaih>;Tadaa>;mz{aaaikadac>;mw}{acgbkadab>;mw}{acebkadad>;m|vm~xmyQR>;yQQQ]>;Q^pmumvu>;Tadab>;m|vm~xmQQQQ]Q>;Qn{Q{n_mumvu>;Tadac>;m|vm~xmQQQn{Q{npR>;rRmumvu>;Tadad>;m|vm~xmx]QXQQ>;QXQQ_>;rQQQpmumvu \ No newline at end of file +=:S``i`=:l}~qlv|]`bfcls}```blvqy````lu~t=:S``ia=:l}~qlv|]`bfcls}```blvqy```alu~t=:S``ib=:l}~qlv|]`bfcls}```blvqy```blu~t=:S``ic=:l}~qlv|]`bfcls}```blvqy```clu~t=:S``id=:l}~qlv|]`bfcls}```blvqy```dlu~t=:S``ii=:ls}``bhlvqy```dlu~t=:S`a``=:lyl``aalt~`a``lvq```dlq```fj``idj`aaij``ag=:S`b``=:lq=:lyz```hj`b`b=:l{ul}wrPPP\=:PPP^l~tlv|z`bdaj`b`alu~t=:S`b`a=:ls|l}wPPPPPP=:PWPP^^^l~tls|=:lv|[`bfalv|[`bfcluu`c`a=:S`b`b=:l{ulv|[`baclq~`b``j``a`j````lqy``c`lvq```dlq```fj``iij`abdj`0aa=:S`ba`=:lylv|zbd`cj``ailv|z`bdaj`baaluu``ai=:S`baa=:l{ulv|[bd`clvq```dls}````lqy``b`l}~`c``j``abj```fj````lq~`c``j``a`j````=:lqy``e`l|y[a```l``b`l}t```bl}lvqy```dluu`bab=:S`bab=:luu``hg=:S`c``=:lq=:lv|zbdc`j`c`b=:lv|z`bdaj`c`c=:l{ul}wxPQ=:xPPP\=:P]ol~tlu~t=:S`c`a=:l{ul}wlwya``hPPPP\P=:PmzPzm^l~tlu~t=:S`c`b=:l{ul}wPPPPoQ=:qQl~tlu~t=:S`c`c=:lv|[`bfalv|[`bfc=:l{ul}ww\PyPPPP=:PPPPP^^^l~tlu~t \ No newline at end of file diff --git a/pre-edited-cs/data/Stage/ScriptSource/Chako.txt b/pre-edited-cs/data/Stage/ScriptSource/Chako.txt index 06bffeb..d4061c8 100644 --- a/pre-edited-cs/data/Stage/ScriptSource/Chako.txt +++ b/pre-edited-cs/data/Stage/ScriptSource/Chako.txt @@ -19,11 +19,12 @@ #0200 +