Merge remote-tracking branch 'github/master' into objectives

pre-edited-cs/data/Stage/Gard.tsc

@@ -1 +1 @@
->;Taaja>;m~rmt~<7E>aaamwrzaaaamvu>;Taajb>;m~rmt~<7E>aaamwrzaaabmvu>;Taajc>;m~rmt~<7E>aaamwrzaaacmvu>;Taajd>;m~rmt~<7E>aaamwrzaaadmvu>;Taaje>;m~rmt~<7E>aaamwrzaaaemvu>;Tabaa>;m＜zmw}{agcbkababmw}{agcckabad>;mv<6D>abac>;Tabab>;m＜zm~з刈ｦQ白盜･Q摶挑乏m€umvu>;Tabac>;mwr€aaaem<65>raabakaajekaccfkaadg>;Tabad>;mwr€aaaem<65>raadhkagaakaaddkaabe>;Tafaa>;m|v確v<E7A2BA>afab>;Tafab>;m|v確в<E7A2BA>v<EFBFBD>afac>;Tafac>;m~隔aaac>;mw}\afjgmw}\afjemz<6D>aabemw}^ache>;mw}\agcamw}\agcbm~rmt~<7E>abhmy~tmw€afadkaabgmwrzaaae>;m<>zaafa>;mr∥fackaaaakaaaam<61>zaada>;mr∥fackaaaakaaac>;m~зmwrtaacb}箕Qｦ､Q･巳･Q･剿Q｣亦櫨國櫺<E59C8B><E6ABBA>>;嘆~圉囗胆m€umt}ノwrtaabg竃､]Q棯Q擒｣廟m€umwrtaaaamt}€>;mr∥fackaadakaaaam<61>zaafa>;mt∥fadkabeekaaaam<61>zabba>;m<>zaaca>;mt∥fadkaagakaaaam<61>zaada>;mr∥fadkaaaakaaac>;m~зmwrtaaai<61>貯Rm€umwrtaaaamt}€>;mr∥fadkaaagkaaaamt∥faekaaajkaaacm<63>zabaa>;mt∥faekaabckaaacmr∥fadkaabakaaac>;mr∥faekaadakaaac>;m~зmwrtaabeyｦｫｫ貯Rm<52>zaabam€umw€afagkaabgmt}€>;mr∥faekaadakaaacm<63>zaaba>;mr∥faekaagakaaacm<63>zaadc>;mr∥faekaafakaaacm<63>zaafa>;mt~<7E>aaa>;mw€afafkaabgm<67>zaadamt~<7E>abi>;mt∥fafkaag1kaaacmr∥fafkaacakaaacm<63>zaafam~隔aafa>;mr∥fafkaabakaaacm<63>zaace>;mr∥fafkaagakaaacm<63>zaacf>;mr∥faekaacakaaaam<61>zaafa>;mr∥fafkaaaakaacam<61>zacaa>;m~зmwrtaaah<61>｣<EFBFBD>悛Rm€umt}€>;mw€afabkaabg>;m<>zaafa>;m~зmwrtaaahzX撈Q悁撈Qｪ<51>ｦRm€umwrtaaaamt}€>;mr∥fafkaabakaaacm<63>zaaea>;mr∥fackaacakaaaam<61>zaabf>;mr∥fabkaabakaaaa>;mt∥fahkabegkaaacm<63>zaabf>;mr∥fafkaadakaaaamw€afafkaabg>;murabefmt~<7E>aaam<61>zabda>;m<>zaadamнtm<74>zaada>;mw€afabkaabgmr∥fabkaacakaaaa>;m~зmwrtaacby挑鵬率欒m€umt}€>;mr∥fabkaadakaaaam<61>zabaamt~<7E>aae>;mt∥fadkabeakaaacmsмafad>;mw€~aabgmvu>;>;Tafab>;Tafac>;Tafad>;m|v確w}\agcdmurabebmurabec>;mw€afadkaabgmr∥fadkabaakaaaf>;m<>zaeaamt~<7E>aaa>;m~зm<D0B7><6D>>;u沫亦･抹Qw｣漫ｫ囑媛<E59B91>｣<EFBFBD>悛_mw}\gbafm<66>zaafam€umt}€>;mr∥fadkabeakaaafm<66>zabfamw€~aabgmvu>;Tafae>;Tafaf>;mw}{agcckagab>;mw}{agcdkagaa>;m＜zm~з<>___m€u<C280>｣<EFBFBD>悛___m€umvu>;Tafag>;Tafah>;Tagaa>;m|v確в<E7A2BA>w}\agccm~зm<D0B7>ノwrtaaahv｣<76>___m€umt}ホ･X､Q･<51><EFBDA5>Q搨･鵬裏｣Q椁_m€u>;<3B>撈Qｪ<51>ｦ___挑漫<E68C91>Q椁___pm€umt}€>;mr∥fafkaaeakaaafm~郭aaaam<61>zabaamvu>;Tagab>;m|v確w}^agcbmu∥fafmv<6D>agac>;Tagac>;mv<6D>aaaj
+=:S``i`=:l}~qls}…````lvqy````lu~t=:S``ia=:l}~qls}…````lvqy```alu~t=:S``ib=:l}~qls}…````lvqy```blu~t=:S``ic=:l}~qls}…````lvqy```clu~t=:S``id=:l}~qls}…````lvqy```dlu~t=:S`a``=:l€‚ylv|z`fbaj`a`alv|z`fbbj`a`c=:lu†u`a`b=:S`a`a=:l€‚yl}ƒwl„…‚‰Ÿ¥P“‘žW¤Pœ•‘¦•Ql~tlu~t=:S`a`b=:lvq```dl„‚q``a`j``idj`bbej``cf=:S`a`c=:lvq```dl„‚q``cgj`f``j``ccj``ad=:S`e``=:l{u‰lu†u`e`a=:S`e`a=:l{u‰lƒq„lu†u`e`b=:S`e`b=:l}‰t```b=:lv|[`eiflv|[`eidly„]``adlv|]`bgd=:lv|[`fb`lv|[`fbal}~qls}…``aglx}slv~`e`cj``aflvqy```d=:l‡qy``e`=:lq~€`e`bj````j````l‡qy``c`=:lq~€`e`bj````j```b=:l}ƒwlvqs``ba|•¤P¥£P¤•£¤P¤˜•P¢•‘“¤™ŸžPŸž=:‘P}™<>™—‘^l~tls|‚lvqs``af‰•£\P<>©PœŸ¢”^l~tlvqs````ls|=:lq~€`e`bj``c`j````l‡qy``e`=:ls~€`e`cj`addj````l‡qy`aa`=:l‡qy``b`=:ls~€`e`cj``f`j````l‡qy``c`=:lq~€`e`cj````j```b=:l}ƒwlvqs```h‡‘‘˜Ql~tlvqs````ls|=:lq~€`e`cj```fj````ls~€`e`dj```ij```bl‡qy`a``=:ls~€`e`dj``abj```blq~€`e`cj``a`j```b=:lq~€`e`dj``c`j```b=:l}ƒwlvqs``adx¥ªª‘˜Ql‡qy``a`l~tlv~`e`fj``afls|=:lq~€`e`dj``c`j```bl‡qy``a`=:lq~€`e`dj``f`j```bl‡qy``cb=:lq~€`e`dj``e`j```bl‡qy``e`=:ls}…````=:lv~`e`ej``afl‡qy``c`ls}…``ah=:ls~€`e`ej`0faj```blq~€`e`ej``b`j```bl‡qy``e`l}‰t``e`=:lq~€`e`ej``a`j```bl‡qy``bd=:lq~€`e`ej``f`j```bl‡qy``be=:lq~€`e`dj``b`j````l‡qy``e`=:lq~€`e`ej````j``b`l‡qy`b``=:l}ƒwlvqs```g„Ÿ¢Ÿ›ŸQl~tls|=:lv~`e`aj``af=:l‡qy``e`=:l}ƒwlvqs```gyWœœP›™œœP©Ÿ¥Ql~tlvqs````ls|=:lq~€`e`ej``a`j```bl‡qy``d`=:lq~€`e`bj``b`j````l‡qy``ae=:lq~€`e`aj``a`j````=:ls~€`e`gj`adfj```bl‡qy``ae=:lq~€`e`ej``c`j````lv~`e`ej``af=:lt~q`adels}…````l‡qy`ac`=:l‡qy``c`lƒ}sl‡qy``c`=:lv~`e`aj``aflq~€`e`aj``b`j````=:l}ƒwlvqs``bax‘¦•P–¥žQl~tls|=:lq~€`e`aj``c`j````l‡qy`a``ls}…```d=:ls~€`e`cj`ad`j```blrƒ|`e`c=:lv}``aflu~t=:=:S`e`a=:S`e`b=:S`e`c=:l{u‰lv|[`fbclt~q`adalt~q`adb=:lv~`e`cj``aflq~€`e`cj`a``j```e=:l‡qy`d``ls}…````=:l}ƒwl„…‚=:t•–•‘¤•”Pv¢•žª™•”P„Ÿ¢Ÿ›Ÿ^lv|[fa`el‡qy``e`l~tls|=:lq~€`e`cj`ad`j```el‡qy`ae`lv}``aflu~t=:S`e`d=:S`e`e=:lv|z`fbbj`f`a=:lv|z`fbcj`f``=:l€‚yl}ƒw„Ÿ^^^l~t„Ÿ¢Ÿ›Ÿ^^^l~tlu~t=:S`e`f=:S`e`g=:S`f``=:l{u‰lƒq„lv|[`fbbl}ƒwl„…‚lvqs```gu¢—˜^^^l~tls|‚y¤W£P¤ŸŸPœ‘¤•P–Ÿ¢P<C2A2>•^l~t=:‡™œœP©Ÿ¥^^^‘¦•ž—•P<E280A2>•^^^ol~tls|=:lq~€`e`ej``d`j```el}‰r````l‡qy`a``lu~t=:S`f`a=:l{u‰lv|]`fbalt~€`e`elu†u`f`b=:S`f`b=:lu†u```i

pre-edited-cs/data/Stage/MazeI.tsc

@@ -1 +1 @@
-]Zs€€墍]Z対瀾寭潵€€亯寲憴€€€€寱灁]Zs€€墎]Z対瀾寭潵€€亯寲憴€€€亴暈擼Zs€€墏]Z対瀾寭潵€€亯寲湚€唲€妧€墔寯灎€厐亴枩}€唲€寱<E282AC>€€墔]Zs€€墐]Z対瀾寭潵€€亯寲憴€€€儗暈擼Zs€€墑]Z対瀾寭潵€€亯寲憴€€€剬暈擼Zs€€墔]Z寲憴€€€倢暈擼Zs€亐€]Z尃<5A>寲憻€€€剬あ憖€亐妧€墑妧倐倞€€儌]Zs€個俔Z寲湚€唲亰€個儗牏檶潱棛膒强緒膒坷稻~~~尀煍寱灁]Zs€個僝Z尃<5A>寲憻€€€€尋<E282AC>€€儓妧€墍妧€儏妧€亙]Zs€個刔Zs€個匽Zs€儉€]Z尃<5A>專煡€€倐寯灎€儉€寱<E282AC>€儉乚Zs€儉乚Z寱<5A>€€亜]Zs€剙€]Z寷暕寫灎€厐亰€€亐妧€€倢摑<E580A2>€€€導憴€€剙]Z対⿺€€€俔Z対瀾寲憴€€€亴敒爛厐亴<E58E90>搶<EFBFBD>檧€噣寭潵€€亯寲渰倓亙寱灁]Zs€剙俔Z寷暕寲湚€唲亰€剙儗潱棇ぅ<E6A387>縫煽舙潜灸p目p坷稻p母祊纯柯弻<E69FAF>殌€€€寭湡]Z寲渰€唲乚Z寲煘€個倞€€唲導憴€亝€專煡€€剝]Z寫灎€個剨€€亐妧€€€導憴€€€垖憺爛厐倞€€€€妧€€俔Z寫灎€個厞€€亐妧€€倢<E282AC>檧€倛]Z寫灎€厐€妧€€€妧€€€導憴€亐€]Z寯灎€個剬敒爛個匽Z寲煗€€儌導憴€亐€]Z寲煗€€亞]Z寯濸€厐€寯灎€厐倢潻攢€€€寱灁]Zs€剙僝Z寷暕対<E69A95>じ祊纯柯p姑p坷稻~尀煍寱灁]Zs€剚€]Zs€厐€]Z尃<5A>対<EFBFBD>檖驳膒澒玫律p目妹荡p煽臸Z纯蔷p傅碌~尀煍]Z┛舙揽柯p母咕穨~~尀煍]Zじ姑p姑p母祊姑急敬w胮穆泵竝傅崩~尀煍]Z熅车p煽舙返膒咕|]Z煽舙镜频聀返膒颗膥~~尀煍寱灁]Zs€厐乚Zs€厐俔Z尃<5A>対<EFBFBD>じ祊们鼓掣p母蹦p坷稻胮母姑]Z纯柯p姑p门览棵荡p目p驳p爬p目繻Z每降歉德祣尀煍]Z捙膒母祊犊磕咕穡胮穆钩簧p爬]Z母德祣尀煍]Z檖兜技p科德p本磒科德p狈惫綸Z啪墓紁檖猜炕祊缴p嫉访~尀煍寱灁]Zs€厐僝Z尃<5A>対<EFBFBD>じ德祊姑p究p碌兰蓗尀煍寱灁]Zs€唨€]Zs€唨乚Z寷暕寲湚€唲€妧唨儗暒晙唨俔Zs€唨俔Z寯灎€厐亴枩}€唲€寱<E282AC>€唨僝Zs€唨僝Z寷暕対瀾寭潵€€亯]Z寫灎€唩€妧€€亰€€€€寲憴€€€刔Z寭灎€唨亰€亖倞€€€€導憴€亐€]Z寫灎€唩€妧€€€妧€€€]Z対⿺€€€€寯灎€唨亴<E594A8>搶暈擼Zs€唩€]Z寷暕寲渰€倓僝Z寭灎€唨€妧亖亰€€€倢槤搶<E6A7A4>檧€唨寫灎€唩€妧€€亰€€€€]Z導憴€亐€寲憻€€€剬あ憖€亐妧唨亰€們亰€€儐]Z]Z]Z]Z
+0==F=IZ[NIPZb==>FISNV====IR[Q0==F>IZ[NIPZb==>FISNV===>IR[Q0==F?IZ[NIPZb==>FISNV===?IR[Q0==F@IZ[NIPZb==>FISNV===@IR[Q0==FAIZ[NIPZb==>FISNV===AIR[Q0=>==I]_VISN\===AIa_N==>=G==FAG=???G==@?0=?=?ISYW=CA>G=?=@I]_VIZ`TV<54>-„|{4<>-|}r{;;;I[\QIR[Q0=?=@I]_VISN\====Ia_N==@EG==F=G==@BG==>@0=?=A0=?=B0=@==I]_VI`\b==??IQ[]=@==IRcR=@=>0=@=>IRcR==>A0=A==IXRfIN[]=B=>G==>=G===?IPZb====IdNV==A=IZfQ===?IZ[NISNV===>IQ[]=B=>ISY:=CA=I`ZPIdNV==D=IPZb==>FISY8?A>@IR[Q0=A=?IXRfISYW=CA>G=A=@IZ`TIab_Q|-†|‚-„n{<7B>-<2D>|-|}r{-<2D>ur-q||LIf[W====IPY\ISY8=CA>IS\[=?=?G==CAIdNV=>B=I`\b==A@IN[]=?=AG==>=G====IdNV===EIN[]=B=?G====G===?IN[]=?=BG==>=G===?IdNV==?EIN[]=B==G====G====IdNV=>==IQ[]=?=AIQ[]=?=BIS\Z==@?IdNV=>==
IS\Z==>CIQ[]=B==IQ[]=B=?IZfQ====IR[Q0=A=@IXRfIZ`Taur-q||-v€-|}r{;I[\QIR[Q0=A>=0=B==I]_VIZ`TV-or<6F>-Zv€r†-<2D>|€€rq-†|‚q|„{-urr;I[\Qf|‚-}||-<2D>uv{t;;;I[\Qauv€-v€-<2D>ur-v€yn{q4€-<2D>n€u-urn};I[\Q\{pr-†|‚-tr<74>-v{9†|‚-{rƒr-tr<74>-|‚<>;;;I[\QIR[Q0=B=>0=B=?I]_VIZ`Taur-€„v<E2809E>pu-<2D>un<75>-|}r{€-<2D>uv€q||-v€-€‚}}|€rq-<2D>|-or-‚}-<2D>|}€|zr„urr;I[\QO‚<4F>-<2D>ur-s||<7C>v{t4€-<2D>vpx†-‚}<17>urr;I[\QV-sryy-|ƒr-n{q-|ƒr-ntnv{‚{<7B>vy-V-o|xr-z†-yrt€;I[\QIR[Q0=B=@I]_VIZ`Taurr-v€-{|-r}y†;I[\QIR[Q0=C==0=C=>IXRfIZ[NIPZb==>FIN[]=C>=G===>G====ISNV===AIP[]=C=>G=>>?G====IdNV=>==IN[]=C>=G====G====IZfQ====IQ[]=C=>I`ZPIR[Q0=C>=IXRfISY8=?A@IP[]=C==G=>>>G===?IUZPIdNV==C=IN[]=C>=G===>G====IdNV=>==ISN\===AIa_N==>=G=C=>G=?@>G==@C

pre-edited-cs/data/Stage/SandE.tsc

@@ -1 +1 @@
-0==F=IZ[NIPZb===CISNV====IR[Q0==F>IZ[NIPZb===CISNV===>IR[Q0==F?IZ[NIPZb===CISNV===?IR[Q0==F@IZ[NIPZb===CISNV===@IR[Q0==FAIZ[NIPZb===CISNV===AIR[Q0=C==I`NaIZ[NIXRfIUZPIdNV==>=IP[]=C=@G=>B=G====IS\[=C=@G==>CIPZb===CISNV===AIZ`TU‚‡‡nu.I[\QIPY\IP[]=C=?G===FG===?IdNV==A=IN[]=C=@G===?G====IdNV==@=IN[]=C=@G==>=G===?IdNV==@=IPZb====IP[]=C=?G==>?G===?IdNV==E=IN[]=C=?G==@=G===?IPZb==>>IZ`TISNP==>A`|†.-Urr:urr:urr;I[\QISNP====IPY\
IP[]=C=>G==CDG====IdNV=>==IN[]=C=>G==>@G====IdNV==B=IP[]=C=>G==E?G====IZ`TISNP==>Ca|-<2D>ur-Yno†v{<7B>u-„v<E2809E>u-†|‚;I[\QISNP====IPY\IN[]=C=>G==@=G====IdNV==B=IN[]=C=@G==?=G===?IdNV==B=IN[]=C=?G==@=G===?IdNV==B=IN[]=C=>G==@=G====IdNV==B=IN[]=C=?G==D=G===?IdNV=>==IZ`TISNP==>CU|:u|:u|;;;I[\QUrnƒr{€9-<2D>un<75>-sry<72>-t||q;I[\QIPY\I]_VISN\===AIS\Z==>CISY:=>BCISY8=BCBISY8=?A@ISY8=?C?ISY:=AAAISY:=C??ISY:B==CIa_N===FG=A==G==>DG==CA0=C=>0=C=?0=C=@
+[Xq~~㍻[X鴨恟椛屮~~~ш拍欲~~~鞄恍[Xq~~<7E>[X鴨恟椛屮~~~ш拍欲~~鞄恍[Xq~~〝[X鴨恟椛屮~~~ш拍欲~~€鞄恍[Xq~~〟[X鴨恟椛屮~~~ш拍欲~~♀糖端Xq~~№[X鴨恟椛屮~~~ш拍欲~~ｊ糖端Xq~н~[X苅召鴨恟鎌透竃尅冠女~~~椛悚~н∴~ミ<7F>~~~株撩~н∴~~ш騒｣~~~ш拍欲~~ｊ孱楓ﾃﾈﾈｯｶo栢搨椛圄[X椛悚~н€<D0BD>~~㊧~~~€冠女~~<7E>鰹悚~н∴~~~€<>~~~冠女~~×鰹悚~н∴~~~<7E>~~€冠女~~×[X椛屮~~~~椛悚~н€<D0BD>~€<7F>~~€冠女~~<7E>鰹悚~н€<D0BD>~×<>~~€椛屮~~[X鴨｡賦拍掻~ぃｽﾀﾀﾇon無ｳ{ｶｳｳ{ｶｳｳ|栢搨株書~~~~椛圄[X椛N桎н<D0BD>~у<>~~~冠女~~~[X鰹悚~н<D0BD>~∴~~~~冠女~~ミ椛悚~н<D0BD>~<7E><>~~~[X鴨｡賦拍掻~┐ｽnﾂｶｳn埀ｰﾇﾀｷｼﾂｶnﾅｷﾂｶnﾇｽﾃ|栢搨株書~~~~椛圄[X鰹悚~н<D0BD>~×<>~~~冠女~~ミ鰹悚~н∴~~€~<7E>~~€冠女~~ミ[X鰹悚~н€<D0BD>~×<>~~€冠女~~ミ[X鰹悚~н<D0BD>~×<>~~~冠女~~ミ鰹悚~н€<D0BD>~<7E><>~~€冠女~~~[X鴨｡賦拍掻~<>ｽ{ｶｽ{ｶｽ|||栢搨[X無ｯﾄｳｼﾁznﾂｶｯﾂnｴｳｺﾂnｵｽｽｲ|栢搨椛圄[X萱<58>頼拍捫~~ｊ駁宀~ЪX株嘴~ヤ株噐~ヤリ爆y~€ａ株噐~€о株嘴~ｂｊ爆{~о€株嘴ミ~ш爆y~р~[X瓦<58>淳~~㊧~<7E>~<7E>~<>~~р[Xq~н[Xq~н€[Xq~н<>

pre-edited-cs/data/Stage/ScriptSource/Gard.txt

@@ -14,7 +14,7 @@
 <PRI<FLJ0621:0101<FLJ0622:0103
 <EVE0102
 #0101
-<PRI<MSGYou can't leave!<NOD<END
+<PRI<MSG<TURYou can't leave!<NOD<END
 #0102
 <FAO0004<TRA0010:0094:0225:0036
 #0103

pre-edited-cs/data/Stage/ScriptSource/MazeI.txt

@@ -4,15 +4,12 @@
 #0091
 <MNA<CMU0019<FAI0001<END
 #0092
-<MNA<CMU0019<FLJ0640:0095<DNP0501<FL-0640<EVE0095
+<MNA<CMU0019<FAI0002<END
 #0093
 <MNA<CMU0019<FAI0003<END
 #0094
 <MNA<CMU0019<FAI0004<END
 
-#0095
-<FAI0002<END
-
 #0100
 <PRI<FAO0004<TRA0010:0094:0222:0032
 
@@ -33,7 +30,7 @@
 #0400
 <KEY<ANP0501:0010:0002<CMU0000<WAI0040
 <MYD0002
-<MNA<FAI0001<DNP0501<SMC<WAI0070<CMU0019<FL+2413<END
+<MNA<FAI0001<DNP0501<FL-0640<SMC<WAI0070<CMU0019<FL+2413<END
 
 #0402
 <KEY<FLJ0641:0403<MSG<TURDo you want to open the door?<YNJ0000<CLO
@@ -77,10 +74,6 @@ until I broke my legs.<NOD<END
 
 #0600
 #0601
-<KEY<FLJ0640:0603<EVE0602
-#0602
-<DNP0501<FL-0640<EVE0603
-#0603
 <KEY<MNA<CMU0019
 <ANP0610:0001:0000<FAI0004
 <CNP0601:0112:0000<WAI0100

pre-edited-cs/data/Stage/ScriptSource/SandE.txt

@@ -26,7 +26,7 @@
 <MSG<FAC0016Ho-ho-ho...<NOD
 Heavens, that felt good.<NOD<CLO
 <PRI<FAO0004<FOM0016
-<FL-0156<FL+0565<FL+0243<FL+0262<FL-0444<FL-0622<FL-5006
+<FL-0156<FL+0565<FL+0243<FL+0262<FL-0444<FL-0622<FL-5006<FL+0640
 <TRA0009:0400:0017:0064
 #0601
 #0602

src/randomizer.lua

@@ -136,29 +136,37 @@ end
 function C:_shuffleItems(tscFiles)
   -- place the objective scripts in Start Point
   self:_fastFillItems(self:getObjective(), self.worldGraph:getObjectiveSpot())
+  
+  -- first, fill one of the first cave spots with a weapon that can break blocks
+  _.shuffle(self.worldGraph:getFirstCaveSpots())[1]:setItem(_.shuffle(self.itemDeck:getItemsByAttribute("weaponSN"))[1])
 
   local mandatory = _.compact(_.shuffle(self.itemDeck:getMandatoryItems(true)))
   local optional = _.compact(_.shuffle(self.itemDeck:getOptionalItems(true)))
   local puppies = _.compact(_.shuffle(self.itemDeck:getItemsByAttribute("puppy")))
 
   if not self.puppy then
-    -- first fill puppies
+    -- then fill puppies, for normal gameplay
     self:_fastFillItems(puppies, _.shuffle(self.worldGraph:getPuppySpots()))
   else
     -- for puppysanity, shuffle puppies in with the mandatory items
     mandatory = _.shuffle(_.append(mandatory, puppies))
+    puppies = {}
   end
-
-    -- then fill one of the first cave spots with a weapon that can break blocks
-  _.shuffle(self.worldGraph:getFirstCaveSpots())[1]:setItem(_.shuffle(self.itemDeck:getItemsByAttribute("weaponSN"))[1])
   
   -- next fill hell chests, which cannot have mandatory items
   self:_fastFillItems(optional, _.shuffle(self.worldGraph:getHellSpots()))
 
+  -- place mandatory items with assume fill
   self:_fillItems(mandatory, _.shuffle(_.reverse(self.worldGraph:getEmptyLocations())))
+
+  -- place optional items with a simple random fill
+  local opt = #optional
+  local loc = #self.worldGraph:getEmptyLocations()
+  if opt > loc then
+    logWarning(("Trying to fill more optional items than there are locations! Items: %d Locations: %d"):format(opt, loc))
+  end
   self:_fastFillItems(optional, _.shuffle(self.worldGraph:getEmptyLocations()))
 
-  --assert(#self.worldGraph:getEmptyLocations() == 0, self.worldGraph:emptyString() .. "\r\n" .. self.itemDeck:unplacedString())
   self.worldGraph:writeItems(tscFiles)
   self.worldGraph:logLocations()
 end