Skip to content

Commit

Permalink
Add GTG Eye Statue Wonderitem trick and pass CI
Browse files Browse the repository at this point in the history
  • Loading branch information
rrealmuto committed Sep 2, 2023
1 parent 6e841c1 commit 643af82
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
8 changes: 8 additions & 0 deletions SettingsListTricks.py
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,14 @@
"Gerudo Training Ground Left Side Ceiling Silver Rupee
without Hookshot" is also enabled.
'''},
'Gerudo Training Ground Eye Statue Room Wonderitem with Jump Slash': {
'name' : 'logic_gtg_eye_statue_wonderitem',
'tags' : ("Gerudo Training Ground", "Gerudo Training Ground MQ", "Wonderitems", "Master Quest", "Vanilla Dungeons", "Adult",),
'tooltip' : '''\
The wonderitem on top of the eye statue can be reached
with a precise jump slash.
'''
},
'Gerudo Training Ground MQ Central Maze Right to Dinolfos Room with Hookshot': {
'name' : 'logic_gtg_mq_maze_right',
'tags' : ("Gerudo Training Ground MQ", "Silver Rupees", "Master Quest", "Adult",),
Expand Down
2 changes: 1 addition & 1 deletion data/World/Gerudo Training Ground MQ.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"Gerudo Training Ground MQ Eye Statue Chest": "Bow",
"Gerudo Training Ground MQ Second Iron Knuckle Chest": "True",
"Gerudo Training Ground MQ Flame Circle Chest": "Hookshot or Bow or has_explosives",
"Gerudo Training Ground MQ Eye Statue Proximity Wonderitem": "can_use(Hover_Boots) or can_use(Longshot)"
"Gerudo Training Ground MQ Eye Statue Proximity Wonderitem": "can_use(Hover_Boots) or can_use(Longshot) or logic_gtg_eye_statue_wonderitem"
},
"exits": {
"Gerudo Training Ground Central Maze Right": "Megaton_Hammer",
Expand Down
2 changes: 1 addition & 1 deletion data/World/Gerudo Training Ground.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"dungeon": "Gerudo Training Ground",
"locations": {
"Gerudo Training Ground Near Scarecrow Chest": "Bow",
"Gerudo Training Ground Eye Statue Wonderitem": "can_use(Hover_Boots)"
"Gerudo Training Ground Eye Statue Wonderitem": "can_use(Hover_Boots) or logic_gtg_eye_statue_wonderitem"
},
"exits": {
"Gerudo Training Ground Like Like Room": "Silver_Gauntlets",
Expand Down
2 changes: 1 addition & 1 deletion data/World/Overworld.json
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@
"Hideout Near Kitchen Crate 5": "can_break_crate",
"Hideout Kitchen Wonderitem": "can_use(Bow)",
"Hideout Kitchen Stove Wonderitem": "
(Gerudo_Membership_Card or can_use(Bow) or can_use(Hookshot) or logic_gerudo_kitchen) and
(Gerudo_Membership_Card or can_use(Bow) or can_use(Hookshot) or logic_gerudo_kitchen) and
(damage_multiplier != 'ohko' or can_use(Nayrus_Love) or can_use(Goron_Tunic))"
},
"exits": {
Expand Down
1 change: 1 addition & 0 deletions data/presets_default.json
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,7 @@
"logic_lens_gtg_mq",
"logic_gtg_mq_with_hookshot",
"logic_gtg_mq_eye_statue_jumpslash",
"logic_gtg_eye_statue_wonderitem",
"logic_gtg_mq_maze_right",
"logic_lens_castle",
"logic_fire_trial_slug_rupee",
Expand Down

0 comments on commit 643af82

Please sign in to comment.