Skip to content

Commit

Permalink
Merge pull request #2 from ETR-BTF/spoiler-log-cleanup
Browse files Browse the repository at this point in the history 
am I doing this right? lol2
  • Loading branch information
@Darkunov
Darkunov authored Apr 20, 2020
2 parents 79dcccb + dfae110 commit 1567387
Show file tree
Hide file tree
Showing 38 changed files with 1,454 additions and 1,454 deletions.
2 changes: 1 addition & 1 deletion ASM/src/hacks.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ skip_GS_BGS_text:
.orga 0xD35EFC
nop

; Fix Goron City Adult Rolling Goron to always work
; Fix GC Rolling Goron as Adult to always work
.orga 0xED2FAC
lb t6, 0x0F18(v1)

Expand Down
68 changes: 34 additions & 34 deletions HintList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def getHintGroup(group, world):

# Some hints have a confusing text in the scope of grotto entrance shuffle so we exclude them
if world.shuffle_grotto_entrances:
if name == 'Hyrule Castle GS Grotto' or name == 'Hyrule Field GS Cow Grotto':
if name == 'HC GS Grotto' or name == 'HF GS Cow Grotto':
continue

hint = getHint(name, world.clearer_hints)
Expand All @@ -62,12 +62,12 @@ def getRequiredHints(world):
'Market 10 Big Poes': lambda world: world.big_poe_count > 3,
'Deku Theater Skull Mask': lambda world: world.hint_dist == 'tournament',
'Song from Ocarina of Time': lambda world: world.bridge not in ('stones', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_stones', 'lacs_dungeons'),
'Hyrule Field Ocarina of Time Item': lambda world: world.bridge not in ('stones', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_stones', 'lacs_dungeons'),
'HF Ocarina of Time Item': lambda world: world.bridge not in ('stones', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_stones', 'lacs_dungeons'),
'Sheik in Kakariko': lambda world: world.bridge not in ('medallions', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_medallions', 'lacs_dungeons'),
'Biggoron': lambda world: world.logic_earliest_adult_trade != 'claim_check' or world.logic_latest_adult_trade != 'claim_check',
'Kakariko Village 50 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 50,
'Kakariko Village 40 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 40,
'Kakariko Village 30 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 30,
'DMT Biggoron': lambda world: world.logic_earliest_adult_trade != 'claim_check' or world.logic_latest_adult_trade != 'claim_check',
'Kak 50 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 50,
'Kak 40 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 40,
'Kak 30 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 30,
}


Expand Down Expand Up @@ -185,7 +185,7 @@ def getRequiredHints(world):
'Gold Skulltula Token': (["proof of destruction", "an arachnid chip", "spider remains", "one percent of a curse"], "a Gold Skulltula Token", 'item'),

'Deku Theater Mask of Truth': ("the #Mask of Truth# yields", None, 'always'),
'Frogs Ocarina Game': (["an #amphibian feast# yields", "the #croaking choir's magnum opus# awards", "the #froggy finale# yields"], "the final reward from the #Frogs of Zora's River# is", 'always'),
'ZR Frogs Ocarina Game': (["an #amphibian feast# yields", "the #croaking choir's magnum opus# awards", "the #froggy finale# yields"], "the final reward from the #Frogs of Zora's River# is", 'always'),

'Song from Ocarina of Time': ("the #Ocarina of Time# teaches", None, ['song', 'sometimes']),
'Song from Composers Grave': (["in the #Composers' Grave#, ReDead guard", "the #Composer Brothers# wrote"], None, ['song', 'sometimes']),
Expand All @@ -196,41 +196,41 @@ def getRequiredHints(world):
'Sheik in Kakariko': ("a #ravaged village# mourns with", None, ['song', 'sometimes']),
'Sheik at Colossus': ("a hero ventures beyond #the Wasteland# to learn", None, ['song', 'sometimes']),

'Lake Hylia Child Fishing': ("#fishing in youth# bestows", None, 'minigame'),
'Lake Hylia Adult Fishing': ("#fishing in maturity# bestows", None, 'minigame'),
'LH Child Fishing': ("#fishing in youth# bestows", None, 'minigame'),
'LH Adult Fishing': ("#fishing in maturity# bestows", None, 'minigame'),
'Market Shooting Gallery': ("#shooting in youth# grants", None, 'minigame'),
'Kakariko Village Shooting Gallery': ("#shooting in maturity# grants", None, ['minigame', 'sometimes']),
'Kak Shooting Gallery': ("#shooting in maturity# grants", None, ['minigame', 'sometimes']),
'Market Bombchu Bowling First Prize': ("the #first explosive prize# is", None, 'minigame'),
'Market Bombchu Bowling Second Prize': ("the #second explosive prize# is", None, 'minigame'),
'Treasure Chest Game': (["#gambling# grants", "there is a #1/32 chance# to win"], "the #treasure chest game# grants", ['minigame', 'sometimes']),
'Gerudo Fortress Horseback Archery 1500 Points': ("mastery of #horseback archery# grants", "scoring 1500 in #horseback archery# grants", ['minigame', 'sometimes']),
'Kokiri Forest Links House Cow': ("the #bovine bounty of a horseback hustle# gifts", None, ['minigame', 'sometimes']),
'Market Treasure Chest Game': (["#gambling# grants", "there is a #1/32 chance# to win"], "the #treasure chest game# grants", ['minigame', 'sometimes']),
'GF HBA 1500 Points': ("mastery of #horseback archery# grants", "scoring 1500 in #horseback archery# grants", ['minigame', 'sometimes']),
'KF Links House Cow': ("the #bovine bounty of a horseback hustle# gifts", None, ['minigame', 'sometimes']),

'Market 10 Big Poes': (["#Big Poes# leads to", "#ghost hunters# will be rewarded with"], None, ['overworld', 'sometimes']),
'Deku Theater Skull Mask': ("the #Skull Mask# yields", None, ['overworld', 'sometimes']),
'Hyrule Field Ocarina of Time Item': ("the #treasure thrown by Princess Zelda# is", None, ['overworld', 'sometimes']),
'Biggoron': ("#Biggoron# crafts", None, ['overworld', 'sometimes']),
'Kakariko Village 50 Gold Skulltula Reward': ("slaying #50 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']),
'Kakariko Village 40 Gold Skulltula Reward': ("slaying #40 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']),
'Kakariko Village 30 Gold Skulltula Reward': ("slaying #30 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']),
'Kakariko Village 20 Gold Skulltula Reward': ("slaying #20 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']),
'Kakariko Village Anjus Chickens': ("#collecting cuccos# rewards", None, 'sometimes'),
'Goron City Darunias Joy': ("#Darunia's dance# leads to", None, ['overworld', 'sometimes']),
'Lost Woods Skull Kid': ("the #Lost Woods Skull Kid# grants", None, ['overworld', 'sometimes']),
'Lake Hylia Sun': ("staring into #the sun# grants", "shooting #the sun# grants", ['overworld', 'sometimes']),
'HF Ocarina of Time Item': ("the #treasure thrown by Princess Zelda# is", None, ['overworld', 'sometimes']),
'DMT Biggoron': ("#Biggoron# crafts", None, ['overworld', 'sometimes']),
'Kak 50 Gold Skulltula Reward': ("slaying #50 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']),
'Kak 40 Gold Skulltula Reward': ("slaying #40 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']),
'Kak 30 Gold Skulltula Reward': ("slaying #30 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']),
'Kak 20 Gold Skulltula Reward': ("slaying #20 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']),
'Kak Anjus Chickens': ("#collecting cuccos# rewards", None, 'sometimes'),
'GC Darunias Joy': ("#Darunia's dance# leads to", None, ['overworld', 'sometimes']),
'LW Skull Kid': ("the #Lost Woods Skull Kid# grants", None, ['overworld', 'sometimes']),
'LH Sun': ("staring into #the sun# grants", "shooting #the sun# grants", ['overworld', 'sometimes']),
'Graveyard Heart Piece Grave Chest': ("playing #Sun's Song# in a grave spawns", None, ['overworld', 'sometimes']),
'Goron City Maze Left Chest': ("in #Goron City# the hammer unlocks", None, ['overworld', 'sometimes']),
'Gerudo Valley Chest': ("in #Gerudo Valley# the hammer unlocks", None, ['overworld', 'sometimes']),
'Hyrule Castle GS Grotto': ("a #storm near the castle# reveals", None, ['overworld', 'sometimes']),
'Hyrule Field GS Cow Grotto': ("buried near #the valley# a spider holds", None, ['overworld', 'sometimes']),
'Zoras Fountain GS Hidden Cave': ("a spider high above the #icy waters# holds", None, ['overworld', 'sometimes']),
'Haunted Wasteland Chest': (["deep in the #Wasteland# is", "beneath #the sands#, flames reveal"], None, ['overworld', 'sometimes']),
'Haunted Wasteland GS': ("a #spider in the Wasteland# hold", None, ['overworld', 'sometimes']),
'GC Maze Left Chest': ("in #Goron City# the hammer unlocks", None, ['overworld', 'sometimes']),
'GV Chest': ("in #Gerudo Valley# the hammer unlocks", None, ['overworld', 'sometimes']),
'HC GS Grotto': ("a #storm near the castle# reveals", None, ['overworld', 'sometimes']),
'HF GS Cow Grotto': ("buried near #the valley# a spider holds", None, ['overworld', 'sometimes']),
'ZF GS Hidden Cave': ("a spider high above the #icy waters# holds", None, ['overworld', 'sometimes']),
'Wasteland Chest': (["deep in the #Wasteland# is", "beneath #the sands#, flames reveal"], None, ['overworld', 'sometimes']),
'Wasteland GS': ("a #spider in the Wasteland# hold", None, ['overworld', 'sometimes']),
'Graveyard Composers Grave Chest': (["in the #Composers' Grave#, darkness hides", "the #Composer Brothers# hid"], None, ['overworld', 'sometimes']),
'Zoras Fountain Bottom Freestanding PoH': ("under the #icy waters# lies", None, ['overworld', 'sometimes']),
'Goron City Pot Freestanding PoH': ("spinning #Goron pottery# contains", None, ['overworld', 'sometimes']),
'Zoras Domain King Zora Thawed': ("unfreezing #King Zora# grants", None, ['overworld', 'sometimes']),
'Death Mountain Crater Deku Scrub': ("in the Crater a #scrub# sells", None, ['overworld', 'sometimes']),
'ZF Bottom Freestanding PoH': ("under the #icy waters# lies", None, ['overworld', 'sometimes']),
'GC Pot Freestanding PoH': ("spinning #Goron pottery# contains", None, ['overworld', 'sometimes']),
'ZD King Zora Thawed': ("unfreezing #King Zora# grants", None, ['overworld', 'sometimes']),
'DMC Deku Scrub': ("in the Crater a #scrub# sells", None, ['overworld', 'sometimes']),

'Deku Tree MQ After Spinning Log Chest': ("within #a tree#, a temporal stone contains", None, ['dungeon', 'sometimes']),
'Deku Tree MQ GS Basement Graves Room': ("within #a tree#, a spider on the ceiling holds", None, ['dungeon', 'sometimes']),
Expand Down
Loading

0 comments on commit 1567387

Please sign in to comment.