Skip to content

Commit 7dd020c

Browse files
ElagatuaElagatua
committed
Cross world wanderers
1 parent 2bcd7a5 commit 7dd020c

File tree

3 files changed

+95
-4
lines changed

3 files changed

+95
-4
lines changed

‎Hints.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -986,11 +986,12 @@ def get_wanderer_hint(spoiler, world, checked):
986986

987987
def get_playthrough_location_hint(spoiler, world, checked):
988988

989+
hinted_world = get_hinted_world(world, spoiler.worlds, 'playthrough-location')
989990
locations = dict(filter(lambda locations:
990-
locations[0].world.id == world.id,
991+
locations[0].world.id == hinted_world.id,
991992
spoiler.playthrough_locations.items()))
992993

993-
required_location_names = list(map(lambda location: location.name, spoiler.required_locations[world.id]))
994+
required_location_names = list(map(lambda location: location.name, spoiler.required_locations[hinted_world.id]))
994995

995996
locations = list(filter(lambda location:
996997
location.worldAndName not in checked
@@ -1007,7 +1008,7 @@ def get_playthrough_location_hint(spoiler, world, checked):
10071008
checked.add(location.worldAndName)
10081009

10091010
hint_area = HintArea.at(location)
1010-
location_text = hint_area.text(world.settings.clearer_hints)
1011+
location_text = hint_area.text(world.settings.clearer_hints, world=hinted_world.id + 1)
10111012

10121013
return (GossipText('%s is on the way of the #wanderer#.' % location_text, ['Light Blue', 'Yellow'], [location.name], [location.item.name]), [location])
10131014

‎data/Hints/triforce_blitz_s2_coop_wanderer.json

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"name": "triforce-blitz-s2-coop-wanderer",
3+
"gui_name": "Triforce Blitz S2 Co-op",
4+
"description": "Hint Distribution for Triforce Blitz S2 Co-op. 3 Path Count Hints, 10 Goal Hints, 4 Barren Hints, 3 Always hints.",
5+
"add_locations": [],
6+
"remove_locations": [],
7+
"add_items": [],
8+
"remove_items": [
9+
{ "item": "Zeldas Lullaby", "types": ["goal", "playthrough-location"]},
10+
{ "item": "Gerudo Membership Card", "types": ["playthrough-location", "unlock-playthrough"]}
11+
],
12+
"dungeons_woth_limit": 999,
13+
"dungeons_barren_limit": 999,
14+
"named_items_required": true,
15+
"vague_named_items": false,
16+
"use_default_goals": false,
17+
"prioritize_dungeons": true,
18+
"tfb_s4_coop_hints": true,
19+
"share_checked_locations_across_worlds": true,
20+
"custom_goals": [{
21+
"category": "triforce_hunt",
22+
"priority": 30,
23+
"minimum_goals": 3,
24+
"goals": [{
25+
"name": "power",
26+
"hint_text": "\u0023path of power\u0023",
27+
"color": "Red",
28+
"items": [{"name": "Triforce of Power", "quantity": 1, "minimum": 1, "hintable": false}]
29+
},
30+
{
31+
"name": "wisdom",
32+
"hint_text": "\u0023path of wisdom\u0023",
33+
"color": "Pink",
34+
"items": [{"name": "Triforce of Wisdom", "quantity": 1, "minimum": 1, "hintable": false}]
35+
},
36+
{
37+
"name": "courage",
38+
"hint_text": "\u0023path of courage\u0023",
39+
"color": "Green",
40+
"items": [{"name": "Triforce of Courage", "quantity": 1, "minimum": 1, "hintable": false}]
41+
}]
42+
}],
43+
"distribution": {
44+
"trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 2},
45+
"always": {"order": 2, "weight": 0.0, "fixed": 0, "copies": 2, "remove_stones": [
46+
"ToT (Left)",
47+
"ToT (Left-Center)",
48+
"ToT (Right-Center)",
49+
"ToT (Right)"
50+
]},
51+
"goal-count": {"order": 3, "weight": 0.0, "fixed": 3, "copies": 1, "priority_stones": [
52+
"ToT (Left)",
53+
"ToT (Left-Center)",
54+
"ToT (Right-Center)"
55+
]},
56+
"goal-legacy-single": {"order": 4, "weight": 0.0, "fixed": 1, "copies": 1, "priority_stones": [
57+
"ToT (Right)"
58+
]},
59+
"unlock-woth": {"order": 5, "weight": 0.0, "fixed": 3, "copies": 2},
60+
"goal-legacy": {"order": 6, "weight": 0.0, "fixed": 9, "copies": 2},
61+
"barren": {"order": 7, "weight": 0.0, "fixed": 4, "copies": 2},
62+
"wanderer": {"order": 8, "weight": 0.0, "fixed": 100, "copies": 2},
63+
"sometimes": {"order": 9, "weight": 0.0, "fixed": 100, "copies": 1},
64+
"entrance": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
65+
"random": {"order": 0, "weight": 9.0, "fixed": 0, "copies": 2},
66+
"item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
67+
"song": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
68+
"overworld": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
69+
"dungeon": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
70+
"junk": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
71+
"named-item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
72+
"woth": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
73+
"goal": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
74+
"entrance_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}
75+
},
76+
"remove_always_stones": [
77+
"ToT (Left)",
78+
"ToT (Left-Center)",
79+
"ToT (Right-Center)",
80+
"ToT (Right)"
81+
],
82+
"priority_stones": [
83+
"ToT (Left)",
84+
"ToT (Left-Center)",
85+
"ToT (Right-Center)",
86+
"ToT (Right)"
87+
],
88+
"groups": [],
89+
"disabled": []
90+
}

‎version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
__version__ = '8.2.64'
22

33
# This is a supplemental version number for branches based off of main dev.
4-
supplementary_version = 86
4+
supplementary_version = 87
55

66
# Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch.
77
# This will be 0x00 for main releases and 0x01 for main dev.

0 commit comments

Comments
 (0)