fixes #29, first cave softlock

also makes a minor improvement to gunsmith item pickup
This commit is contained in:
duncathan 2019-03-28 08:51:57 -06:00
parent b09dc32685
commit af7f320336
4 changed files with 14 additions and 8 deletions

View file

@ -1 +1 @@
@=Vcclc@=o€<6F>tov€<76>ccckoyt|ccccox<6F>w@=Vccld@=o€<6F>tov€<76>ccckoyt|cccdox<6F>w@=Vccle@=o€<6F>tov€<76>ccckoyt|ccceox<6F>w@=Vcclf@=o€<6F>tov€<76>ccckoyt|cccfox<6F>w@=Vcclg@=o€<6F>tov€<76>ccckoyt|cccgox<6F>w@=Vccll@=ov€<76>ccckoyt|cccgox<6F>w@=Vcdcd@=o<>…|ov<6F><76>cdcdmccccmcccco†<E280A0>ccddoytcccfo‡…tccdfmcclfmccdcmcccf@=Vcdce@=o<>…|oy}cfcemcdcgoy}cfcdmcdcfo€†zrTo<54>wox<6F>w@=Vcdcf@=o<>…|oytccce@=oy^c3ceoy^digdoy^dige@=o€Śwccceo‡…tccddmcfcemccckmccci@=Vcdcg@=o~xŚoytccceo‡…tccddmcclgmccckmccci@=Vcddc@=o~xŚoytcccgo‡…tcclcmcclemcccjmcccl@=Vcdhc@=o~xŚo€Śwccccov€<76>ccckoyt|cccg@=oŠt|ccfc@=o†<E280A0>ccdeov€<76>cchcmccfhmccijoŠt|ccec@=o†<E280A0>ccdeov€<76>cchcmccfimccijoŠt|ccec@=ox<6F>w@=Vcecc@=ox<6F>w@=Vcecd@=ox<6F>w@=Vcgcc@=o<>…|o†<E280A0>cceeow<6F><77>cgccox‰xcgcd@=Vcgcd@=ox‰xccde
SPivvvSP筒vvv~㍼vvvv矧SPivvwSP筒vvv~㍼vvvw矧SPivvxSP筒vvv~㍼vvvx矧SPivvySP筒vvv~㍼vvvy矧SPivvzSP筒vvv~㍼vvvz矧SPivvSP筒vvv~㍼vvvz矧SPivwvwSP<50>薄vwvw€vvvv€vvvv副vvww√vvvy<79>vvwy€vvy€vvwv€vvvySPivwvxSP<50>註vyvx€vwvz註vyvw€vwvy<EFBD93>矧SPivwvySP<50>√vvvxSP註vyvz€vwv{尨厳クュォココッエュfケオウォコョッエュ<EFBDB4>舶鰍渠慨PivwvzSP<EFBD91>√vvvx<78>vvww€vvz€vvv~€vvv|SPivwv{SP註w|zv€vwv|尨厳クュォココッエュfケオウォコョッエュ<EFBDB4>舶鰍渠慨Pivwv|SP智vyvx智w|zw智w|zxSP汪vvvx<78>vvww€vyvx€vvv~€vvv|SPivwwvSP√vvvz<7A>vvv€vvx€vvv}€vvvSPivw{vSP汪vvvv筒vvv~㍼vvvzSP<53>㍼vvyvSP副vvwx当vv{v€vvy{€vv|}<7D>㍼vvxvSP副vvwx当vv{v€vvy|€vv|}<7D>㍼vvxvSP矧SPivxvvSP矧SPivxvwSP矧SPivzvvSP<50>副vvxx薄vzvv恚vzvwSPivzvwSP恚vvwx

View file

@ -1 +1,2 @@
S``i`=:l}~qls}<7D>``hlvqy````lu~t=:S``ia=:l}~qls}<7D>``hlvqy```alu~t=:S``ib=:l}~qls}<7D>``hlvqy```blu~t=:S``ic=:l}~qls}<7D>``hlvqy```clu~t=:S``id=:l}~qls}<7D>``hlvqy```dlu~t=:S``ie=:ls}<7D>``hlvqy```alu~t=:S`a``=:l<><6C>lvq````l<>q``abj``idj``ecj``cf=:S`b``=:l{u炼v|zafd`j`b`alv|[afd`ls~<7E>`b``j``baj````l<><6C>`bblu<6C>`b`b=:S`b`a=:l<><6C>l}<7D>l<EFBFBD><6C><EFBFBD>予^l~tlu~t=:S`b`b=:lu<6C>```b=:S`ba`=:S`c``=:l{u炼}<7D>Z<EFBFBD>叚㧢l~tlu~t=:S`c`a=:lv|zafddj`c`d=:l{u炼}<7D><><EFBFBD><E4BB99>唞匕<E5949E><E58C95>P<EFBFBD>𠠬𠯫鱲yP<79><50>\=:<3A><>P<EFBFBD>叨l~tlq}z```bj`c`blq}z``acj0c`blu~t=:S`c`b=:l{u炼v|ql𩺰y``e`lv|[afddlv|[`c`clu<6C>`c`c=:S`c`c=:lu<6C>```b=:S`c`d=:l{u炼}<7D>y鱲<79>腼P<E885BC><50>𠗫P<F0A097AB>佅𠠬𥚃腼不P<E4B88D>=:<3A><><EFBFBD>𠠬<EFBFBD><EFBFBD><EFBFBD>鰊𠠬<E9B08A>𡼏𢅛<F0A1BC8F>=:𤙥<><F0A499A5>╯P<E295AF><EFBFBD>鰊𠠬<E9B08A>𡼏𢅛𠠬奴佅γl~tls|<7C>P<EFBFBD>襍P<E8A58D>𪈠\P<>P<EFBFBD><EFBFBD>\P𤨎<50>=:膄P<E88684><50>P<EFBFBD>失P<E5A4B1><50>P<EFBFBD><EFBFBD>P<EFBFBD>=:𥚃<><F0A59A83><EFBFBD><EFBFBD>P<EFBFBD>腼P<E885BC><EFBFBD><E295AF>𣻸l~t=:v<>𨧧<EFBFBD><EFBFBD>\PyP<79><EFBFBD>P<EFBFBD><50><EFBFBD><EFBFBD>=:仪<><E4BBAA>P<EFBFBD>P<EFBFBD>𠠬<EFBFBD><F0A0A0AC>P<EFBFBD>P𤙥<50><F0A499A5><EFBFBD>^l~t=:<3A>𠠬<EFBFBD><F0A0A0AC><EFBFBD><E38E9C>𧊀<EFBFBD>P<EFBFBD><50><EFBFBD>Ν<EFBFBD><CE9D>=:<3A><>PyP<79>榀P<E6A680>佅𠠬𢅛𠠬<F0A2859B>鰊𠠬<E9B08A><F0A0A0AC>=:<3A><>P<EFBFBD><50>周仪P<E4BBAA><50>P<EFBFBD>P<EFBFBD>𠠬奶<F0A0A0AC>ㄓ^l~tlu~t=:S`ca`=:l{u炼}<7D>l<EFBFBD><6C>=:R奶^Rl~tlu~t
-::C:FWXKFMW_:::BFPKS::::FOXN-::C;FWXKFMW_:::BFPKS:::;FOXN-::C<FWXKFMW_:::BFPKS:::<FOXN-::C=FWXKFMW_:::BFPKS:::=FOXN-::C>FWXKFMW_:::BFPKS:::>FOXN-::C?FMW_:::BFPKS:::;FOXN-:;::FZ\SFPKY::::F^\K::;<D::C>D::?=D::=@-:<::FUOcFPVT;@>:D:<:;FPV5;@>:FMXZ:<::D::<;D::::F]Y_::<<FO`O:<:<-:<:;FZ\SFW]QF^_\Owz~<7E>8FXYNFOXN-:<:<FO`O:::<-:<;:-:=::FUOcFW]QF^_\4}xy|o4FXYNFOXN-:=:;F]K^FPVT;@>>D:=:>FKWT:::<D:=:<FKWT::;=D:=:<FUOcFW]Qcy*rk€ox1~*}oox*~ro*qx*S*wkno6
rk€o*<2A>yIFXYNFOXN-:=:<FUOcFPV5;@>>FPV5:=:=FO`O:=:=-:=:=FO`O:::<-:=:>FUOcFW]QSx*~rs}*<2A>y|vn6*~ro|o*os}~}*klkvkxmo*lo~<7E>oox*~ry}o*<2A>ry*k|om|ok~y|}*kxn*~ry}o*<2A>ry*k|o*}o|}8FXYNFMV\S*uxo<78>*~rk~6*yp*my|}o6*l~s~*~yyu*<2A>y|*rovz*py|*wo*~yozo|soxmo*~rs}*ps|}~rkxn8FXYNP|yw*xy<78>*yx6*S*€y<E282AC>*~y*nonsmk~ow<>}ovp*~y*~ro*}sno*yp*m|ok~syx8FXYN^ro*vkly|*sx€yv€on*lomywo}*ty<74><14>rox*S*uxy<78>*~ro|o*k|o*~ry}o*<2A>ry<14>svv*oxty<74>*w<>*<2A>y|u*~y*~ro*~wy}~8FXYNFOXN-:=;:FUOcFW]QF^_\,Y~8,FXYNFOXN

View file

@ -21,10 +21,15 @@
<PRI<FLJ0302:0104<FLJ0301:0103<MSG?!<NOD<END
#0103
<PRI<FAO0002
<FL+0302<FL+1641<FL+1642
<MYD0002<TRA0011:0302:0008:0006
<FLJ0304:0105<MSG<TURForgetting something?<NOD<END
#0104
<KEY<FAO0002<TRA0011:0094:0008:0006
#0105
<FLJ1640:0106<MSG<TURForgetting something?<NOD<END
#0106
<FL+0302<FL+1641<FL+1642
<MYD0002<TRA0011:0302:0008:0006
#0110
<KEY<FAO0004<TRA0090:0092:0007:0009

View file

@ -30,15 +30,15 @@
#0300
<KEY<MSG*snore*<NOD<END
<KEY<MSG<TUR*snore*<NOD<END
#0301
<FLJ1644:0304
<SAT<FLJ1644:0304<AMJ0002:0302<AMJ0013:0302
<KEY<MSGYou haven't seen the gun I made,
have you?<NOD<AMJ0002:0302<AMJ0013:0302<END -- double arms jumps rn because i'd like polar star/spur to be progressive
have you?<NOD<END -- double arms jumps rn because i'd like polar star/spur to be progressive
#0302
<KEY<FLA<WAI0050<FL+1644<FL+0303<EVE0303
<KEY<FL+1644<FL+0303<EVE0303
#0303
<EVE0002