Skip to content

Commit 8af447e

Browse files
fenhlfenhl
committed
Merge branch 'Dev' into dev-fenhl
# Conflicts: # data/presets_default.json
2 parents 51e0d5b + b9e69dd commit 8af447e

File tree

5 files changed

+39
-45
lines changed

5 files changed

+39
-45
lines changed

‎Hints.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,6 @@ def get_important_check_hint(spoiler: Spoiler, world: World, checked: dict[HintA
14681468
and not location.item.name == 'Triforce Piece'
14691469
and not (location.name == 'Song from Impa' and 'Zeldas Letter' in world.settings.starting_items and 'Zeldas Letter' not in world.settings.shuffle_child_trade)
14701470
# Special cases where the item is only considered major for important checks hints
1471-
or location.item.name == 'Biggoron Sword'
14721471
or location.item.name == 'Double Defense'
14731472
# Handle make keys not in own dungeon major items
14741473
or (location.item.type in ('SmallKey', 'SmallKeyRing') and not (world.settings.shuffle_smallkeys == 'dungeon' or world.settings.shuffle_smallkeys == 'vanilla'))

‎ItemList.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ class GetItemId(IntEnum):
409409
'Eyedrops': ('Item', True, GetItemId.GI_EYE_DROPS, {'trade': True}),
410410
'Claim Check': ('Item', True, GetItemId.GI_CLAIM_CHECK, {'trade': True}),
411411
'Kokiri Sword': ('Item', True, GetItemId.GI_SWORD_KOKIRI, None),
412-
'Giants Knife': ('Item', None, GetItemId.GI_SWORD_KNIFE, None),
412+
'Giants Knife': ('Item', True, GetItemId.GI_SWORD_KNIFE, None),
413413
'Deku Shield': ('Item', None, GetItemId.GI_SHIELD_DEKU, None),
414414
'Hylian Shield': ('Item', None, GetItemId.GI_SHIELD_HYLIAN, None),
415415
'Mirror Shield': ('Item', True, GetItemId.GI_SHIELD_MIRROR, None),
@@ -440,7 +440,7 @@ class GetItemId(IntEnum):
440440
'Gerudo Mask': ('Item', None, GetItemId.GI_MASK_GERUDO, {'trade': True, 'object': 0x0152}),
441441
'Rupees (50)': ('Item', None, GetItemId.GI_RUPEE_PURPLE, {'junk': 1}),
442442
'Rupees (200)': ('Item', None, GetItemId.GI_RUPEE_GOLD, {'junk': 0}),
443-
'Biggoron Sword': ('Item', None, GetItemId.GI_SWORD_BIGGORON, None),
443+
'Biggoron Sword': ('Item', True, GetItemId.GI_SWORD_BIGGORON, None),
444444
'Fire Arrows': ('Item', True, GetItemId.GI_ARROW_FIRE, None),
445445
'Ice Arrows': ('Item', True, GetItemId.GI_ARROW_ICE, None),
446446
'Blue Fire Arrows': ('Item', True, GetItemId.GI_ARROW_BLUE_FIRE, None),

‎data/Hints/tournament.json‎

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tournament",
33
"gui_name": "Tournament",
4-
"description": "Hint Distribution for the S8 Tournament: 5 Always, 5 Goal, 3 Barren (ToT), 1 Song (ToT), 2 Dual, 6 Sometimes; House of Skulltula (30/40/50).",
4+
"description": "Hint Distribution for the S9 Tournament: 5 Always, 5 Goal, 2 Barren, 2 Important Check, 1 Song, 2 Dual, 3 Sometimes; House of Skulltula (30/40/50), Light Arrows at Dampe Diary.",
55
"add_locations": [
66
{ "location": "Sheik in Kakariko", "types": ["always"] },
77
{ "location": "Deku Theater Skull Mask", "types": ["always"] }
@@ -30,40 +30,23 @@
3030
"remove_items": [
3131
{ "item": "Zeldas Lullaby", "types": ["goal"] }
3232
],
33+
"misc_hint_items": {
34+
"dampe_diary": "Light Arrows"
35+
},
3336
"dungeons_barren_limit": 1,
3437
"one_hint_per_goal": true,
3538
"named_items_required": true,
3639
"vague_named_items": false,
3740
"use_default_goals": true,
3841
"distribution": {
39-
"trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 0, "remove_stones": [
40-
"ToT (Left)",
41-
"ToT (Left-Center)",
42-
"ToT (Right-Center)",
43-
"ToT (Right)"
44-
]},
45-
"always": {"order": 2, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [
46-
"ToT (Left)",
47-
"ToT (Left-Center)",
48-
"ToT (Right-Center)",
49-
"ToT (Right)"
50-
]},
51-
"goal": {"order": 3, "weight": 0.0, "fixed": 5, "copies": 2, "remove_stones": [
52-
"ToT (Left)",
53-
"ToT (Left-Center)",
54-
"ToT (Right-Center)",
55-
"ToT (Right)"
56-
]},
57-
"barren": {"order": 4, "weight": 0.0, "fixed": 3, "copies": 1, "priority_stones": [
58-
"ToT (Left)",
59-
"ToT (Left-Center)",
60-
"ToT (Right-Center)"
61-
]},
62-
"song": {"order": 5, "weight": 0.0, "fixed": 1, "copies": 1, "priority_stones": [
63-
"ToT (Right)"
64-
]},
65-
"dual": {"order": 6, "weight": 0.0, "fixed": 2, "copies": 2},
66-
"sometimes": {"order": 7, "weight": 0.0, "fixed": 6, "copies": 2},
67-
"junk": {"order": 8, "weight": 1.0, "fixed": 0, "copies": 1}
42+
"trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 0},
43+
"always": {"order": 2, "weight": 0.0, "fixed": 5, "copies": 2},
44+
"goal": {"order": 3, "weight": 0.0, "fixed": 5, "copies": 2},
45+
"barren": {"order": 4, "weight": 0.0, "fixed": 2, "copies": 2},
46+
"important_check": {"order": 5, "weight": 0.0, "fixed": 2, "copies": 2},
47+
"song": {"order": 6, "weight": 0.0, "fixed": 1, "copies": 2},
48+
"dual": {"order": 7, "weight": 0.0, "fixed": 2, "copies": 2},
49+
"sometimes": {"order": 8, "weight": 0.0, "fixed": 3, "copies": 2},
50+
"junk": {"order": 9, "weight": 1.0, "fixed": 0, "copies": 1}
6851
}
6952
}

‎data/presets_default.json‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3559,14 +3559,14 @@
35593559
"custom_ice_trap_count": 100,
35603560
"ice_trap_appearance": "junk_only"
35613561
},
3562-
"S8 Tournament": {
3562+
"S9 Tournament": {
35633563
"aliases": [
3564-
"s8",
3564+
"s9",
35653565
"tournament"
35663566
],
35673567
"language": "english",
35683568
"show_seed_info": true,
3569-
"user_message": "S8 Tournament",
3569+
"user_message": "S9 Tournament",
35703570
"world_count": 1,
35713571
"create_spoiler": true,
35723572
"password_lock": false,
@@ -3621,7 +3621,7 @@
36213621
"shuffle_hideout_entrances": "off",
36223622
"shuffle_gerudo_fortress_heart_piece": "remove",
36233623
"shuffle_grotto_entrances": false,
3624-
"shuffle_dungeon_entrances": "off",
3624+
"shuffle_dungeon_entrances": "simple",
36253625
"shuffle_bosses": "off",
36263626
"shuffle_ganon_tower": false,
36273627
"shuffle_overworld_entrances": false,
@@ -3681,7 +3681,10 @@
36813681
"shuffle_silver_rupees": "vanilla",
36823682
"silver_rupee_pouches_choice": "off",
36833683
"silver_rupee_pouches": [],
3684-
"enhance_map_compass": [],
3684+
"enhance_map_compass": [
3685+
"map_dungeon_location",
3686+
"compass_reward"
3687+
],
36853688
"triforce_hunt_mode": "normal",
36863689
"free_bombchu_drops": false,
36873690
"logic_no_night_tokens_without_suns_song": false,
@@ -3705,7 +3708,9 @@
37053708
"logic_lens_bongo",
37063709
"logic_lens_spirit",
37073710
"logic_lens_gtg",
3708-
"logic_lens_castle"
3711+
"logic_lens_castle",
3712+
"logic_deku_b1_webs_with_bow",
3713+
"logic_dc_scarecrow_gs"
37093714
],
37103715
"advanced_allowed_tricks": [],
37113716
"starting_equipment": [
@@ -3716,9 +3721,15 @@
37163721
"zeldas_letter"
37173722
],
37183723
"starting_songs": [],
3719-
"add_random_starting_items": false,
3720-
"random_starting_items_exclude": [],
3721-
"random_starting_items_count": 0,
3724+
"add_random_starting_items": true,
3725+
"random_starting_items_exclude": [
3726+
"bombchus",
3727+
"shields",
3728+
"deku_upgrades",
3729+
"health_upgrades",
3730+
"junk"
3731+
],
3732+
"random_starting_items_count": 1,
37223733
"start_with_consumables": true,
37233734
"start_with_rupees": false,
37243735
"starting_hearts": 3,
@@ -3730,7 +3741,7 @@
37303741
"complete_mask_quest": false,
37313742
"useful_cutscenes": false,
37323743
"fast_chests": true,
3733-
"scarecrow_behavior": "vanilla",
3744+
"scarecrow_behavior": "fast",
37343745
"fast_bunny_hood": true,
37353746
"auto_equip_masks": false,
37363747
"plant_beans": false,
@@ -3752,6 +3763,7 @@
37523763
"altar",
37533764
"ganondorf",
37543765
"warp_songs_and_owls",
3766+
"dampe_diary",
37553767
"30_skulltulas",
37563768
"40_skulltulas",
37573769
"50_skulltulas"
@@ -3783,7 +3795,7 @@
37833795
"starting_tod": "default",
37843796
"blue_fire_arrows": true,
37853797
"fix_broken_drops": false,
3786-
"tcg_requires_lens": false,
3798+
"tcg_requires_lens": true,
37873799
"no_collectible_hearts": false,
37883800
"one_item_per_dungeon": false,
37893801
"item_pool_value": "balanced",

‎version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '8.3.63'
1+
__version__ = '8.3.65'
22

33
# This is a supplemental version number for branches based off of main dev.
44
supplementary_version = 1

0 commit comments

Comments
 (0)