From e2c423dffc5d3e46a8a12b8889473e20664f3393 Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 15 May 2020 06:11:06 +0200 Subject: [PATCH] added 7 more tricks --- .../images/logic_colossus_gs.png | Bin 0 -> 2522 bytes .../images/logic_dc_scarecrow_gs.png | Bin 0 -> 2584 bytes .../images/logic_forest_outdoors_ledge.png | Bin 0 -> 2342 bytes .../images/logic_kakariko_tower_gs.png | Bin 0 -> 2587 bytes .../images/logic_lab_wall_gs.png | Bin 0 -> 2712 bytes .../images/logic_spirit_map_chest.png | Bin 0 -> 2378 bytes .../images/logic_spirit_sun_chest.png | Bin 0 -> 2691 bytes .../items/tricks.json | 49 ++++++++++++++++++ .../layouts/options.json | 42 +++++++++++++++ .../locations/dung_mq.json | 2 +- .../locations/dung_reg.json | 34 ++++++++---- .../locations/overworld.json | 14 ++--- 12 files changed, 124 insertions(+), 17 deletions(-) create mode 100644 ootrando_overworldmap_hamsda/images/logic_colossus_gs.png create mode 100644 ootrando_overworldmap_hamsda/images/logic_dc_scarecrow_gs.png create mode 100644 ootrando_overworldmap_hamsda/images/logic_forest_outdoors_ledge.png create mode 100644 ootrando_overworldmap_hamsda/images/logic_kakariko_tower_gs.png create mode 100644 ootrando_overworldmap_hamsda/images/logic_lab_wall_gs.png create mode 100644 ootrando_overworldmap_hamsda/images/logic_spirit_map_chest.png create mode 100644 ootrando_overworldmap_hamsda/images/logic_spirit_sun_chest.png diff --git a/ootrando_overworldmap_hamsda/images/logic_colossus_gs.png b/ootrando_overworldmap_hamsda/images/logic_colossus_gs.png new file mode 100644 index 0000000000000000000000000000000000000000..b9b20b1874a254ac6b13882782ac3e7af5c31e02 GIT binary patch literal 2522 zcmd^A_ct317fy+-MyqPCBKF?m6)FTNO00@fQj{V!t7^oiNNi&7O)0IJ+O$@U)T+Iy zQB<{**ZV(wzkSa+&wb9lKiub>d+t3q+Q>lXCNϮkD3)3>b)`4p>P?BCp)NaTA zwcPMD*3ksijBspUCqPGy2O0oC9hTgwtc z2t-3eLsL`p{{8z}T3S#jR9jnHM@I(+gX!w(>gnm}>+8eea03GaBO@bYV`CE&69fWb zYHDg`W@c_~Zed|zX=!O?Wrai{t*xzXZEfxB?CkCBQ7F{Yr%xRm92^}Tot&JUot<4= zT%JFF?&|95=H}+^?v6&IU%YtX;o;%w>FMR=i^bw_xP*j+ z#Kgp;q@?8JqocF4v#YDCySuxmr>D2Kx390SzrTNAVBpiI zPoF=39vmDT8X6iN9v&GP866${^5x6e*x2~^_{7A-(tcL^z`)1%*^cU z?A+Ykw{PF(=jRs|78Vy5mzI{6mzP&pSJ&3o*4NiJHa0dlH@CL7wzs!;c6N4mcfWuC zzPGn`aBy&Vc=+STkE5fbl4Y)%D)~PvCpyUVMEg054+$lk2ws&j6VGq7b+qDis=L=?MVPb^pg3{qAKb0D#O~ zS4#r{)9+0=w@HRF^>IrxBplJjw3M-kMEo*?e&}kmeN=!*W@c&0b4t9cb=-naleq&W zHG#vV_#xrFW>Ci31L##@5qp{CqdTJ;o(&f72oRS zF)pT9Q)D}JV-P)oO2-edI43_*0FJszJSb%$9TogRUQ&X{!B%^7g%!vVi!PER--^|W ziA$4n<>t2M)PXK^aie-j>CLW{>Vs7_v)M@C zrAprZmUsoeJ6quiH6plC2oXaQ4wNBm;AR&uv!GthlOBrl5ms_+j}Y?qs-pzjYF80U@=j{2Jaqml3KFF zqFDDPgu~0>Ut$;9oCQngK!7nHaV?(X1{RFF43|aclrI{LE`(!HMRJ+=?LxLSRI8r5QJ; zoM)*p9&7sm$coJP&B zo3nV1#aJB4Gwj8?!lr4~#@X<^&vXuao&5Y|DJYZxhsoNkB!1Quto>l`#swG(Ci<;O z*xY61PP`{MP@SnZ(uyv@bU*$c)c8BJEJr4en=dwLmA&2W|v-Tjn@vtiB`KE^W!m;xWiF{YWxP#E(q4&AeAQ%3gWXej&kTBqg?f-A2S4X#1Qh zXns?K%CW2^A&6RdJfjZfnm&mm>MaDMgA=LrmC4LhS2-f|_Is#ISS3B)Ee(&V5<`fHR=znb9CX zSU1n#ors55KqcLY?{^m;6&G7xLLXV2rK>ur1-(nFYeXm2w6$tiE5+eKpPe0 literal 0 HcmV?d00001 diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_scarecrow_gs.png b/ootrando_overworldmap_hamsda/images/logic_dc_scarecrow_gs.png new file mode 100644 index 0000000000000000000000000000000000000000..0d3a56e7c76b873757c23ee638f5532b3e75f654 GIT binary patch literal 2584 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 v9S9|FYGN$92YnF=Q*9n5berreINb}T$-?D literal 0 HcmV?d00001 diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_sun_chest.png b/ootrando_overworldmap_hamsda/images/logic_spirit_sun_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..052c09d774c099dcc564be256ea91f200d74b893 GIT binary patch literal 2691 zcmd^A_ct4k*N&B1L2K9ETUF797O|CvMxu(Ukx+Y8OKq_!5w#Vysl95Cs@a61q*kri zqjnpk{rdb1@2~H3&U2shoO93p;huZX6Jre31<~H51pojbeLXGMl@4B!iJIc7BDcHu zu7u1RrmF#{8sXl&GL#OGM-Tv@Hj(bah6(_n02mv>wf}1(BO@m#r=Xyqq@)A_fz;I0 zG&D4{w6t_|boBJ}AP|Uwfq{{ck%@`v`t|EKZrosIW@cewVP$1yV`F1yXXoJH;N;}w z;^N}w=H}ty;pOG!4qobp%tE;D{r?0R7@Zm!P0|P@tLnst#WMpJ)Z2b7~ zV-ph-I2?{ZAWTh7pFDYDW@ct?Zf;>=VQFdk?AbFbE34U3S$0sHxzJLEd zIXO8sHANs0e*E|`Jv}`$Gc!9oJ2y8sKR^HT=g)i%?6(W(iy1Kf) zzP_=svAMaqwY9aqy}h%uv%9;yx3~A}*RTEk{ey#p!^6X)qod>F)6zkmPv z^M^ztot>SXpPye`TwGpW{{8#+-@kuXm;8SKVePW%>IDEVVNjE+A^)ENF!_B=H|426AUWx<&fB=0h2wcwqpL!XLM{x|ODa=-YGtH8p7Hfdli3s z&@R>YDa)nLH6%N9#y~D=6lsg!I?5rCJW%{!9 z=`pTs{2R`3Yn6b)FiHUdMz)H#rgmQop>eUNHFa-v1<#VpHrW~K+Y8MKo@G{t7LTmf z%Dx}|q~)^Kpc4@=LJsDOc&Pfq8hO@%B6L%`V>8m))zj)RXb+Ev(_PyT%yFI%y~*KNML^ws5dyt4bcvgh4;Z z$m;~ofpsW)Lbz+xVQqaC>na;thEBa|w{_36CQa2u5yOwzL=(&4OivKCO01!cDb$Af zDhVWtp=R2WNQ4CSO?=+RZVCR}=cRG=ki)dewJ33FN@RvaiFibPNjzv3xH#)b?iHe_ z%B1519ti>pZwN71rGwG8d?iY#qlul*P{m$<-kT^?%8{A1H_wF-hge1}kv0x_Afrt! zc@x<5Ap1xIJxJmj&i@)geV|lo3xUN^Qgii@U z=&oIrDKQUF$XF%EzmN+tjAPi|1hHY5O|4*Z{clJG@k$QQAohgEi#tDy}aKAk_s&Qvr%K{;DlWe@?D=JT7Lte0TWL$Rh z+%XzSMS(O)98^8*w1WQV0H;B!1O$dA$`eVakxoBiM>w%BW zT1#@@hN;!gv@rXUA@BN!eNJMyJBeWJ(_|)=CQbN~yv;m_IAm!Q@doo47o>2)@~+0UTxW4iu&NWB+BWzBW{= IO2azre@qjI4FCWD literal 0 HcmV?d00001 diff --git a/ootrando_overworldmap_hamsda/items/tricks.json b/ootrando_overworldmap_hamsda/items/tricks.json index df4c6493..277102a3 100644 --- a/ootrando_overworldmap_hamsda/items/tricks.json +++ b/ootrando_overworldmap_hamsda/items/tricks.json @@ -209,6 +209,55 @@ "img": "images/logic_wasteland_crossing.png", "codes": "logic_wasteland_crossing" }, + { + "name": "Desert Colossus Hill GS with Hookshot", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_colossus_gs.png", + "codes": "logic_colossus_gs" + }, + { + "name": "Dodongo's Cavern Scarecrow GS with Armos Statue", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_dc_scarecrow_gs.png", + "codes": "logic_dc_scarecrow_gs" + }, + { + "name": "Kakariko Tower GS with Jump Slash", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_kakariko_tower_gs.png", + "codes": "logic_kakariko_tower_gs" + }, + { + "name": "Lake Hylia Lab Wall GS with Jump Slash", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_lab_wall_gs.png", + "codes": "logic_lab_wall_gs" + }, + { + "name": "Spirit Temple Map Chest with Bow", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_spirit_map_chest.png", + "codes": "logic_spirit_map_chest" + }, + { + "name": "Spirit Temple Sun Block Room Chest with Bow", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_spirit_sun_chest.png", + "codes": "logic_spirit_sun_chest" + }, + { + "name": "Forest Temple NE Outdoors Ledge with Hover Boots", + "type": "toggle", + "initial_active_state": false, + "img": "images/logic_forest_outdoors_ledge.png", + "codes": "logic_forest_outdoors_ledge" + }, { "name": "Water Temple Boss Key Region with Hover Boots", "type": "toggle", diff --git a/ootrando_overworldmap_hamsda/layouts/options.json b/ootrando_overworldmap_hamsda/layouts/options.json index 9566eb2c..191c4bd0 100644 --- a/ootrando_overworldmap_hamsda/layouts/options.json +++ b/ootrando_overworldmap_hamsda/layouts/options.json @@ -257,6 +257,48 @@ "width": 200, "height": 16 }, + { + "type": "item", + "item": "logic_colossus_gs", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_dc_scarecrow_gs", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_kakariko_tower_gs", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_lab_wall_gs", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_spirit_map_chest", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_spirit_sun_chest", + "width": 200, + "height": 16 + }, + { + "type": "item", + "item": "logic_forest_outdoors_ledge", + "width": 200, + "height": 16 + }, { "type": "item", "item": "logic_water_boss_key_region", diff --git a/ootrando_overworldmap_hamsda/locations/dung_mq.json b/ootrando_overworldmap_hamsda/locations/dung_mq.json index 0b353923..67e25a61 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_mq.json +++ b/ootrando_overworldmap_hamsda/locations/dung_mq.json @@ -879,7 +879,7 @@ "name": "NE Outdoors Ledge", "access_rules": [ "@Forest Temple MQ/NE Outdoors,longshot", - "@Forest Temple MQ/Outdoors Top Ledges,hoverboots,[longshot]", + "@Forest Temple MQ/Outdoors Top Ledges,[logic_forest_outdoors_ledge],hoverboots", "@Forest Temple MQ/Bow Region,forest_small_keys:5,bow", "@Forest Temple MQ/Bow Region,forest_small_keys:5,dinsfire,magic" ], diff --git a/ootrando_overworldmap_hamsda/locations/dung_reg.json b/ootrando_overworldmap_hamsda/locations/dung_reg.json index 8556525b..5bcc65cd 100644 --- a/ootrando_overworldmap_hamsda/locations/dung_reg.json +++ b/ootrando_overworldmap_hamsda/locations/dung_reg.json @@ -209,9 +209,10 @@ "name": "GS42 - Scarecrow", "short_name": "Scarecrow", "access_rules": [ - "@Dodongos Cavern/Lobby,$has_age|adult,[ocarina],[scarecrow],[hookshot]", + "@Dodongos Cavern/Lobby,$has_age|adult,ocarina,scarecrow,hookshot", "@Dodongos Cavern/Lobby,$has_age|adult,longshot", - "@Dodongos Cavern/Lobby,$can_child_attack,[$has_age|adult],[longshot]" + "@Dodongos Cavern/Lobby,[logic_dc_scarecrow_gs],$has_age|adult", + "@Dodongos Cavern/Lobby,[logic_dc_scarecrow_gs],$can_child_attack" ], "visibility_rules": [ "setting_tokens_dungeons" @@ -827,7 +828,7 @@ "access_rules": [ "@Forest Temple/NE Outdoors,hookshot", "@Forest Temple/Falling Room", - "@Forest Temple/Outdoors High Balconies,hoverboots,[hookshot]" + "@Forest Temple/Outdoors High Balconies,[logic_forest_outdoors_ledge],hoverboots" ], "item_count": 1 }, @@ -2049,13 +2050,17 @@ "short_name": "Sun Block", "access_rules": [ "@Spirit Temple/Central Chamber,$has_explosives,dinsfire,magic", - "@Spirit Temple/Central Chamber,$has_explosives,sticks,bow,[firearrow],[magic]", + "@Spirit Temple/Central Chamber,$has_explosives,magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,$has_explosives,[logic_spirit_map_chest],bow,sticks", "@Spirit Temple/Central Chamber,[spirit_small_keys:3],dinsfire,magic", - "@Spirit Temple/Central Chamber,[spirit_small_keys:3],sticks,bow,[firearrow],[magic]", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_map_chest],bow,sticks", "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,dinsfire,magic", - "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,sticks,bow,[firearrow],[magic]", - "@Spirit Temple/Central Chamber,[spirit_small_keys:5],$child_colossus,$has_explosives,sticks", - "@Spirit Temple/Central Chamber,[spirit_small_keys:3],$has_age|adult,lift2,bow,[firearrow],[magic]" + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,[logic_spirit_map_chest],bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:5],$has_explosives,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,lift2", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_map_chest],bow,lift2" ], "chest_unopened_img": "images/chest_brown_small_key.png", "item_count": 1 @@ -2094,7 +2099,18 @@ "name": "Map Chest", "short_name": "Map", "access_rules": [ - "@Spirit Temple/Sun Block Room Chest" + "@Spirit Temple/Central Chamber,$has_explosives,dinsfire,magic", + "@Spirit Temple/Central Chamber,$has_explosives,magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,$has_explosives,[logic_spirit_sun_chest],bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],dinsfire,magic", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_sun_chest],bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,dinsfire,magic", + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,magic,firearrow,bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:2],setting_logic_chus_yes,[logic_spirit_sun_chest],bow,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:5],$has_explosives,sticks", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],magic,firearrow,bow,lift2", + "@Spirit Temple/Central Chamber,[spirit_small_keys:3],[logic_spirit_sun_chest],bow,lift2" ], "chest_unopened_img": "images/chest_brown_map.png", "item_count": 1 diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index df807199..da8941c1 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -1588,8 +1588,8 @@ "name": "GS56 (N)", "access_rules": [ "boomerang", - "[boomerang],sticks", - "[boomerang],sword1", + "[logic_lab_wall_gs],sticks", + "[logic_lab_wall_gs],sword1", "{sling}", "{$has_explosives}" ], @@ -2106,8 +2106,7 @@ "name": "Talk to him", "access_rules": [ "$has_age|adult,hookshot", - "[logic_man_on_roof],$has_age|adult", - "[logic_man_on_roof],$has_age|child" + "[logic_man_on_roof]" ], "item_count": 1 } @@ -2599,8 +2598,8 @@ "access_rules": [ "sling", "$has_bombchus", - "[sling],sticks,$damage_single_instance", //TODO: trick logic_kakariko_tower_gs - "[sling],sword1,$damage_single_instance" + "[logic_kakariko_tower_gs],sticks,$damage_single_instance", + "[logic_kakariko_tower_gs],sword1,$damage_single_instance" ], "visibility_rules": [ "setting_tokens_overworld" @@ -6093,7 +6092,8 @@ "access_rules": [ "$child_colossus,setting_plant_no,beans", "$child_colossus,bean_colossus_yes", - "$adult_colossus,hookshot,[longshot]", + "$adult_colossus,longshot", + "$adult_colossus,hookshot,[logic_colossus_gs]", "{$adult_colossus,bow}" ], "visibility_rules": [