Skip to content

Commit

Permalink
added 3 more tricks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hamsda
Hamsda committed May 18, 2020
1 parent 185cc40 commit 78ddbc5
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 19 deletions.
Binary file added ootrando_overworldmap_hamsda/images/logic_trail_gs_lower_bean.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ootrando_overworldmap_hamsda/images/logic_trail_gs_lower_hookshot.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ootrando_overworldmap_hamsda/images/logic_trail_gs_upper.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions ootrando_overworldmap_hamsda/items/tricks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,27 @@
"img": "images/logic_water_hookshot_entry.png",
"codes": "logic_water_hookshot_entry"
},
{
"name": "Death Mountain Trail Upper Red Rock GS without Hammer",
"type": "toggle",
"initial_active_state": false,
"img": "images/logic_trail_gs_upper.png",
"codes": "logic_trail_gs_upper"
},
{
"name": "Death Mountain Trail Lower Red Rock GS with Hookshot",
"type": "toggle",
"initial_active_state": false,
"img": "images/logic_trail_gs_lower_hookshot.png",
"codes": "logic_trail_gs_lower_hookshot"
},
{
"name": "Death Mountain Trail Lower Red Rock GS with Magic Bean",
"type": "toggle",
"initial_active_state": false,
"img": "images/logic_trail_gs_lower_bean.png",
"codes": "logic_trail_gs_lower_bean"
},
{
"name": "Reverse Wasteland",
"type": "toggle",
Expand Down
18 changes: 18 additions & 0 deletions ootrando_overworldmap_hamsda/layouts/options.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,24 @@
"width": 200,
"height": 16
},
{
"type": "item",
"item": "logic_trail_gs_upper",
"width": 200,
"height": 16
},
{
"type": "item",
"item": "logic_trail_gs_lower_hookshot",
"width": 200,
"height": 16
},
{
"type": "item",
"item": "logic_trail_gs_lower_bean",
"width": 200,
"height": 16
},
{
"type": "item",
"item": "logic_reverse_wasteland",
Expand Down
12 changes: 6 additions & 6 deletions ootrando_overworldmap_hamsda/locations/dung_mq.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@
"name": "Lower Right Side",
"access_rules": [
"@Dodongos Cavern MQ/Lobby,$can_blast",
"@Dodongos Cavern MQ/Lobby,$has_age|child,sticks,$damage_single_instance",
"@Dodongos Cavern MQ/Lobby,dinsfire,magic,$damage_single_instance"
"@Dodongos Cavern MQ/Lobby,$has_age|child,sticks,$damage_single_instance_ohko",
"@Dodongos Cavern MQ/Lobby,dinsfire,magic,$damage_single_instance_ohko"
],
"visibility_rules": [
"hidden_region"
Expand All @@ -244,8 +244,8 @@
"name": "Bomb Bag Area",
"access_rules": [
"@Dodongos Cavern MQ/Lobby,$has_age|adult",
"@Dodongos Cavern MQ/Lobby,[$has_age|adult],$has_age|child,sword1,$damage_single_instance", //TODO: trick logic_dc_mq_child_bombs
"@Dodongos Cavern MQ/Lobby,[$has_age|adult],$has_age|child,sticks,$damage_single_instance", //TODO: trick logic_dc_mq_child_bombs
"@Dodongos Cavern MQ/Lobby,[$has_age|adult],$has_age|child,sword1,$damage_single_instance_ohko", //TODO: trick logic_dc_mq_child_bombs
"@Dodongos Cavern MQ/Lobby,[$has_age|adult],$has_age|child,sticks,$damage_single_instance_ohko", //TODO: trick logic_dc_mq_child_bombs
"@Dodongos Cavern MQ/Lower Right Side,$has_age|child,sling,$has_age|adult,bow",
"@Dodongos Cavern MQ/Lower Right Side,$has_age|child,sling,lift1",
"@Dodongos Cavern MQ/Lower Right Side,$has_age|child,sling,dinsfire,magic",
Expand Down Expand Up @@ -2545,7 +2545,7 @@
"short_name": "Light Trial",
"access_rules": [
"lift3,$can_LA,gc_small_keys:2,[gc_small_keys:3],$can_see_with_lens,hookshot",
"lift3,$can_LA,gc_small_keys:2,[gc_small_keys:3],$can_see_with_lens,[hookshot],$damage_single_instance" //TODO: trick logic_light_trial_mq
"lift3,$can_LA,gc_small_keys:2,[gc_small_keys:3],$can_see_with_lens,[hookshot],$damage_single_instance_ohko" //TODO: trick logic_light_trial_mq
],
"visibility_rules": [
"setting_trials:1"
Expand Down Expand Up @@ -2776,7 +2776,7 @@
"name": "Underwater Silver Rupee Chest",
"short_name": "Toilet",
"access_rules": [
"@Gerudo Training Grounds MQ/Underwater,$has_fire,ironboots,$FTR_or_zora,$damage_single_instance",
"@Gerudo Training Grounds MQ/Underwater,$has_fire,ironboots,$FTR_or_zora,$damage_single_instance_ohko",
"{$hintable}"
],
"capture_item": true,
Expand Down
10 changes: 5 additions & 5 deletions ootrando_overworldmap_hamsda/locations/dung_reg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2029,14 +2029,14 @@
"access_rules": [
"@Spirit Temple/Child Climb,$has_projectile|both",
"@Spirit Temple/Child Climb,dinsfire,magic",
"@Spirit Temple/Child Climb,$damage_single_instance,sticks",
"@Spirit Temple/Child Climb,$damage_single_instance,sword1",
"@Spirit Temple/Child Climb,$damage_single_instance,$has_projectile|child",
"@Spirit Temple/Child Climb,$damage_single_instance_ohko,sticks",
"@Spirit Temple/Child Climb,$damage_single_instance_ohko,sword1",
"@Spirit Temple/Child Climb,$damage_single_instance_ohko,$has_projectile|child",
"@Spirit Temple/Child Climb,$child_colossus,[spirit_small_keys:5],$has_projectile|child",
"@Spirit Temple/Child Climb,lift2,$has_projectile|adult,[spirit_small_keys:3]",
"@Spirit Temple/Child Climb,lift2,$has_projectile|adult,[spirit_small_keys:2],setting_logic_chus_yes",
"@Spirit Temple/Child Climb,lift2,$damage_single_instance,[spirit_small_keys:3]",
"@Spirit Temple/Child Climb,lift2,$damage_single_instance,[spirit_small_keys:2],setting_logic_chus_yes"
"@Spirit Temple/Child Climb,lift2,$damage_single_instance_ohko,[spirit_small_keys:3]",
"@Spirit Temple/Child Climb,lift2,$damage_single_instance_ohko,[spirit_small_keys:2],setting_logic_chus_yes"
],
"visibility_rules": [
"setting_tokens_dungeons"
Expand Down
16 changes: 10 additions & 6 deletions ootrando_overworldmap_hamsda/locations/overworld.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2598,8 +2598,8 @@
"access_rules": [
"sling",
"$has_bombchus",
"[logic_kakariko_tower_gs],sticks,$damage_single_instance",
"[logic_kakariko_tower_gs],sword1,$damage_single_instance"
"[logic_kakariko_tower_gs],sticks,$damage_single_instance_ohko",
"[logic_kakariko_tower_gs],sword1,$damage_single_instance_ohko"
],
"visibility_rules": [
"setting_tokens_overworld"
Expand Down Expand Up @@ -3469,7 +3469,10 @@
"name": "GS32 (N)",
"access_rules": [
"$has_age|adult,$night_gs,hammer",
"$has_age|adult,$night_gs,[hammer],hookshot"
"$has_age|adult,$night_gs,[logic_trail_gs_lower_hookshot],hookshot",
"$has_age|both,$night_gs,[logic_trail_gs_lower_bean],setting_plant_no,beans,$has_explosives",
"$has_age|both,$night_gs,[logic_trail_gs_lower_bean],setting_plant_no,beans,lift1",
"$has_age|both,$night_gs,[logic_trail_gs_lower_bean],bean_trail_yes"
],
"visibility_rules": [
"setting_tokens_overworld"
Expand All @@ -3494,7 +3497,8 @@
{
"name": "GS33 (N)",
"access_rules": [
"$has_age|adult,$night_gs,[hammer]"
"$has_age|adult,$night_gs,hammer",
"$has_age|adult,$night_gs,[logic_trail_gs_upper]"
],
"visibility_rules": [
"setting_tokens_overworld"
Expand Down Expand Up @@ -3767,7 +3771,7 @@
"ocarina,bolero,setting_plant_no,beans",
"ocarina,bolero,bean_crater_yes",
"hoverboots",
"[]"
"[logic_crater_upper_to_lower]"
],
"item_count": 1
}
Expand Down Expand Up @@ -3795,7 +3799,7 @@
"ocarina,bolero,setting_plant_no,beans",
"ocarina,bolero,bean_crater_yes",
"hoverboots",
"[]"
"[logic_crater_upper_to_lower]"
],
"visibility_rules": [
"setting_scrub_shuffle_yes"
Expand Down
14 changes: 12 additions & 2 deletions ootrando_overworldmap_hamsda/scripts/logic.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,8 +513,18 @@ function damage_below_ohko()
end
end

function damage_single_instance()
if has("setting_damage_ohko", 0)
function damage_single_instance_quadruple()
if damage_below_quadruple() > 0
or has("nayrus") and has("magic")
then
return 1
else
return has_bottle()
end
end

function damage_single_instance_ohko()
if damage_below_ohko() > 0
or has("nayrus") and has("magic")
then
return 1
Expand Down

0 comments on commit 78ddbc5

Please sign in to comment.