Skip to content

Commit 9532e81

Browse files
fenhlfenhl
committed
Merge branch 'release' into Dev
# Conflicts: # data/Hints/sgl2025.json
2 parents bc972f2 + 7e7b876 commit 9532e81

4 files changed

Lines changed: 86 additions & 82 deletions

File tree

‎Unittest.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,10 @@ def test_advanced_tricks_entrances(self):
866866
test_name = 'Glitched logic with entrances and all advanced tricks'
867867
settings.advanced_allowed_tricks = [trick['name'] for trick in advanced_logic_tricks.values()]
868868
with self.subTest(test_name, filename=filename):
869-
main(settings)
869+
try:
870+
main(settings)
871+
except EntranceShuffleError:
872+
self.skipTest("Entrance shuffle error, see https://github.com/OoTRandomizer/OoT-Randomizer/issues/2181 for a potential fix.")
870873
# settings.output_file contains the first part of the filename
871874
spoiler = load_spoiler('%s_Spoiler.json' % settings.output_file)
872875
self.verify_woth(spoiler)

‎data/Hints/sgl2025.json‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
11
{
2-
"name": "sgl2025",
3-
"gui_name": "SGL 2025",
4-
"description": "Hint distribution used for SGL 2025.",
5-
"add_locations": [
6-
{ "location": "Deku Theater Skull Mask", "types": ["always"] }
7-
],
8-
"remove_locations": [
9-
{"location": "Sheik in Crater", "types": ["sometimes"]},
10-
{"location": "Song from Royal Familys Tomb", "types": ["sometimes"]},
11-
{"location": "Sheik in Forest", "types": ["sometimes"]},
12-
{"location": "Sheik at Temple", "types": ["sometimes"]},
13-
{"location": "Sheik at Colossus", "types": ["sometimes"]},
14-
{"location": "LH Sun", "types": ["sometimes"]},
15-
{"location": "GF HBA 1500 Points", "types": ["sometimes"]},
16-
{"location": "GC Maze Left Chest", "types": ["sometimes"]},
17-
{"location": "GV Chest", "types": ["sometimes"]},
18-
{"location": "Graveyard Royal Familys Tomb Chest", "types": ["sometimes"]},
19-
{"location": "GC Pot Freestanding PoH", "types": ["sometimes"]},
20-
{"location": "LH Lab Dive", "types": ["sometimes"]},
21-
{"location": "Fire Temple Megaton Hammer Chest", "types": ["sometimes"]},
22-
{"location": "Water Temple Boss Key Chest", "types": ["sometimes"]},
23-
{"location": "Gerudo Training Ground Maze Path Final Chest", "types": ["sometimes"]},
24-
{"location": "Spirit Temple Silver Gauntlets Chest", "types": ["sometimes"]},
25-
{"location": "Spirit Temple Mirror Shield Chest", "types": ["sometimes"]},
26-
{"location": "Shadow Temple Freestanding Key", "types": ["sometimes"]},
27-
{"location": "Ice Cavern Iron Boots Chest", "types": ["sometimes"]},
28-
{"location": "DMT Biggoron", "types": ["sometimes"]},
29-
{"location": "Graveyard Dampe Race Rewards", "types": ["dual"]},
30-
{"location": "Graveyard Royal Family Tomb Contents", "types": ["dual"]},
31-
{"location": "Ice Cavern Final Room", "types": ["dual"]},
32-
{"location": "Fire Temple Lower Loop", "types": ["dual"]},
33-
{"location": "Spirit Temple Colossus Hands", "types": ["dual"]},
34-
{"location": "Spirit Temple Adult Lower", "types": ["dual"]},
35-
{"location": "Shadow Temple Invisible Blades Chests", "types": ["dual"]},
36-
{"location": "Shadow Temple Spike Walls Room", "types": ["dual"]},
37-
{"location": "Ganons Castle Spirit Trial Chests", "types": ["dual"]}
38-
],
39-
"add_items": [],
40-
"remove_items": [
41-
{ "item": "Zeldas Lullaby", "types": ["woth", "goal"] }
42-
],
43-
"excluded_goal_categories": ["ganon"],
44-
"dungeons_woth_limit": 2,
45-
"dungeons_barren_limit": 1,
46-
"one_hint_per_goal": true,
47-
"named_items_required": true,
48-
"vague_named_items": false,
49-
"distribution": {
50-
"trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 2},
51-
"entrance_always": {"order": 2, "weight": 0.0, "fixed": 0, "copies": 2},
52-
"always": {"order": 3, "weight": 0.0, "fixed": 0, "copies": 2, "remove_stones": [
53-
"ToT (Left)",
54-
"ToT (Left-Center)",
55-
"ToT (Right-Center)",
56-
"ToT (Right)",
57-
"HF (Cow Grotto)",
58-
"HC (Storms Grotto)"
59-
]},
60-
"junk": {"order": 4, "weight": 0.0, "fixed": 2, "copies": 1, "priority_stones": [
61-
"HF (Cow Grotto)",
62-
"HC (Storms Grotto)"
63-
]},
64-
"barren": {"order": 5, "weight": 0.0, "fixed": 4, "copies": 1, "priority_stones": [
65-
"ToT (Left)",
66-
"ToT (Left-Center)",
67-
"ToT (Right-Center)",
68-
"ToT (Right)"
69-
]},
70-
"goal": {"order": 6, "weight": 0.0, "fixed": 5, "copies": 2},
71-
"dual": {"order": 7, "weight": 0.0, "fixed": 3, "copies": 2},
72-
"sometimes": {"order": 8, "weight": 0.0, "fixed": 100, "copies": 2},
73-
"woth": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
74-
"entrance": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
75-
"random": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
76-
"item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
77-
"song": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
78-
"overworld": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
79-
"dungeon": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
80-
"named-item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}
81-
}
2+
"name": "sgl2025",
3+
"gui_name": "SGL 2025",
4+
"description": "Hint distribution used for SGL 2025.",
5+
"add_locations": [
6+
{ "location": "Deku Theater Skull Mask", "types": ["always"] }
7+
],
8+
"remove_locations": [
9+
{ "location": "Sheik in Crater", "types": ["sometimes"] },
10+
{ "location": "Song from Royal Familys Tomb", "types": ["sometimes"] },
11+
{ "location": "Sheik in Forest", "types": ["sometimes"] },
12+
{ "location": "Sheik at Temple", "types": ["sometimes"] },
13+
{ "location": "Sheik at Colossus", "types": ["sometimes"] },
14+
{ "location": "LH Sun", "types": ["sometimes"] },
15+
{ "location": "GF HBA 1500 Points", "types": ["sometimes"] },
16+
{ "location": "GC Maze Left Chest", "types": ["sometimes"] },
17+
{ "location": "GV Chest", "types": ["sometimes"] },
18+
{ "location": "Graveyard Royal Familys Tomb Chest", "types": ["sometimes"] },
19+
{ "location": "GC Pot Freestanding PoH", "types": ["sometimes"] },
20+
{ "location": "LH Lab Dive", "types": ["sometimes"] },
21+
{ "location": "Fire Temple Megaton Hammer Chest", "types": ["sometimes"] },
22+
{ "location": "Water Temple Boss Key Chest", "types": ["sometimes"] },
23+
{ "location": "Gerudo Training Ground Maze Path Final Chest", "types": ["sometimes"] },
24+
{ "location": "Spirit Temple Silver Gauntlets Chest", "types": ["sometimes"] },
25+
{ "location": "Spirit Temple Mirror Shield Chest", "types": ["sometimes"] },
26+
{ "location": "Shadow Temple Freestanding Key", "types": ["sometimes"] },
27+
{ "location": "Ice Cavern Iron Boots Chest", "types": ["sometimes"] },
28+
{ "location": "DMT Biggoron", "types": ["sometimes"] },
29+
{ "location": "Graveyard Dampe Race Rewards", "types": ["dual"] },
30+
{ "location": "Graveyard Royal Family Tomb Contents", "types": ["dual"] },
31+
{ "location": "Ice Cavern Final Room", "types": ["dual"] },
32+
{ "location": "Fire Temple Lower Loop", "types": ["dual"] },
33+
{ "location": "Spirit Temple Colossus Hands", "types": ["dual"] },
34+
{ "location": "Spirit Temple Adult Lower", "types": ["dual"] },
35+
{ "location": "Shadow Temple Invisible Blades Chests", "types": ["dual"] },
36+
{ "location": "Shadow Temple Spike Walls Room", "types": ["dual"] },
37+
{ "location": "Ganons Castle Spirit Trial Chests", "types": ["dual"] }
38+
],
39+
"add_items": [],
40+
"remove_items": [
41+
{ "item": "Zeldas Lullaby", "types": ["woth", "goal"] }
42+
],
43+
"excluded_goal_categories": ["ganon"],
44+
"dungeons_woth_limit": 2,
45+
"dungeons_barren_limit": 1,
46+
"one_hint_per_goal": true,
47+
"named_items_required": true,
48+
"vague_named_items": false,
49+
"distribution": {
50+
"trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 2},
51+
"entrance_always": {"order": 2, "weight": 0.0, "fixed": 0, "copies": 2},
52+
"always": {"order": 3, "weight": 0.0, "fixed": 0, "copies": 2, "remove_stones": [
53+
"ToT (Left)",
54+
"ToT (Left-Center)",
55+
"ToT (Right-Center)",
56+
"ToT (Right)",
57+
"HF (Cow Grotto)",
58+
"HC (Storms Grotto)"
59+
]},
60+
"junk": {"order": 4, "weight": 0.0, "fixed": 2, "copies": 1, "priority_stones": [
61+
"HF (Cow Grotto)",
62+
"HC (Storms Grotto)"
63+
]},
64+
"barren": {"order": 5, "weight": 0.0, "fixed": 4, "copies": 1, "priority_stones": [
65+
"ToT (Left)",
66+
"ToT (Left-Center)",
67+
"ToT (Right-Center)",
68+
"ToT (Right)"
69+
]},
70+
"goal": {"order": 6, "weight": 0.0, "fixed": 5, "copies": 2},
71+
"dual": {"order": 7, "weight": 0.0, "fixed": 3, "copies": 2},
72+
"sometimes": {"order": 8, "weight": 0.0, "fixed": 100, "copies": 2},
73+
"woth": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
74+
"entrance": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
75+
"random": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
76+
"item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
77+
"song": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
78+
"overworld": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
79+
"dungeon": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
80+
"named-item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}
81+
}
8282
}

‎data/presets_default.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,6 +1280,7 @@
12801280
},
12811281
"SGL 2025 Tournament": {
12821282
"aliases": [
1283+
"sgl",
12831284
"sgl2025"
12841285
],
12851286
"show_seed_info": true,

‎version.py‎

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

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

0 commit comments

Comments
 (0)