Skip to content

Commit 1454e17

Browse files
cjohnson57cjohnson57
committed
Merge 'Update MW Tournament files' (OoTRandomizer#2124)
2 parents 068f85e + 6f55d18 commit 1454e17

File tree

7 files changed

+127
-144
lines changed

7 files changed

+127
-144
lines changed

‎Hints.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
'ddr.json',
5454
'important_checks.json',
5555
'league.json',
56-
'mw3.json',
57-
'mw3_woth.json',
56+
'mw_path.json',
57+
'mw_woth.json',
5858
'scrubs.json',
5959
'strong.json',
6060
'tournament.json',

‎data/Hints/mw3.json

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎data/Hints/mw3_woth.json

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎data/Hints/mw_path.json

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"name": "mw_path",
3+
"gui_name": "MW Season 4",
4+
"description": "Hints used for the Multiworld Tournament Season 4.",
5+
"add_locations": [
6+
{ "location": "Sheik in Kakariko", "types": ["always"] },
7+
{ "location": "Song from Ocarina of Time", "types": ["always"] },
8+
{ "location": "Deku Theater Skull Mask", "types": ["always"] },
9+
{ "location": "DMC Deku Scrub", "types": ["always"] },
10+
{ "location": "Deku Tree GS Basement Back Room", "types": ["sometimes"] },
11+
{ "location": "Water Temple GS River", "types": ["sometimes"] },
12+
{ "location": "Spirit Temple GS Hall After Sun Block Room", "types": ["sometimes"] }
13+
],
14+
"remove_locations": [
15+
{ "location": "Sheik in Crater", "types": ["sometimes"] },
16+
{ "location": "Song from Royal Familys Tomb", "types": ["sometimes"] },
17+
{ "location": "Sheik in Forest", "types": ["sometimes"] },
18+
{ "location": "Sheik at Temple", "types": ["sometimes"] },
19+
{ "location": "Sheik at Colossus", "types": ["sometimes"] },
20+
{ "location": "Graveyard Royal Familys Tomb Chest", "types": ["sometimes"] },
21+
{ "location": "Ganons Castle Shadow Trial Golden Gauntlets Chest", "types": ["sometimes"] }
22+
],
23+
"add_items": [],
24+
"remove_items": [
25+
{ "item": "Zeldas Lullaby", "types": ["woth", "goal"] }
26+
],
27+
"dungeons_woth_limit": 40,
28+
"dungeons_barren_limit": 40,
29+
"named_items_required": true,
30+
"vague_named_items": false,
31+
"use_default_goals": true,
32+
"upgrade_hints": "on",
33+
"distribution": {
34+
"trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 2},
35+
"always": {"order": 2, "weight": 0.0, "fixed": 0, "copies": 2},
36+
"entrance": {"order": 3, "weight": 0.0, "fixed": 2, "copies": 2},
37+
"goal": {"order": 4, "weight": 0.0, "fixed": 7, "copies": 2},
38+
"sometimes": {"order": 5, "weight": 1.0, "fixed": 0, "copies": 2},
39+
"important_check": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
40+
"item": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
41+
"dual": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
42+
"dual_always": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
43+
"woth": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
44+
"barren": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
45+
"random": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
46+
"song": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
47+
"overworld": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
48+
"dungeon": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
49+
"junk": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
50+
"named-item": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
51+
"entrance_always": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2}
52+
}
53+
}

‎data/Hints/mw_woth.json

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"name": "mw_woth",
3+
"gui_name": "MW Season 4 (WotH)",
4+
"description": "Hints used for the Multiworld Tournament Season 4. WotH replacing goal hints.",
5+
"add_locations": [
6+
{ "location": "Sheik in Kakariko", "types": ["always"] },
7+
{ "location": "Song from Ocarina of Time", "types": ["always"] },
8+
{ "location": "Deku Theater Skull Mask", "types": ["always"] },
9+
{ "location": "DMC Deku Scrub", "types": ["always"] },
10+
{ "location": "Deku Tree GS Basement Back Room", "types": ["sometimes"] },
11+
{ "location": "Water Temple GS River", "types": ["sometimes"] },
12+
{ "location": "Spirit Temple GS Hall After Sun Block Room", "types": ["sometimes"] }
13+
],
14+
"remove_locations": [
15+
{ "location": "Sheik in Crater", "types": ["sometimes"] },
16+
{ "location": "Song from Royal Familys Tomb", "types": ["sometimes"] },
17+
{ "location": "Sheik in Forest", "types": ["sometimes"] },
18+
{ "location": "Sheik at Temple", "types": ["sometimes"] },
19+
{ "location": "Sheik at Colossus", "types": ["sometimes"] },
20+
{ "location": "Graveyard Royal Familys Tomb Chest", "types": ["sometimes"] },
21+
{ "location": "Ganons Castle Shadow Trial Golden Gauntlets Chest", "types": ["sometimes"] }
22+
],
23+
"add_items": [],
24+
"remove_items": [
25+
{ "item": "Zeldas Lullaby", "types": ["woth", "goal"] }
26+
],
27+
"dungeons_woth_limit": 40,
28+
"dungeons_barren_limit": 40,
29+
"named_items_required": true,
30+
"vague_named_items": false,
31+
"use_default_goals": true,
32+
"upgrade_hints": "on",
33+
"distribution": {
34+
"trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 2},
35+
"always": {"order": 2, "weight": 0.0, "fixed": 0, "copies": 2},
36+
"entrance": {"order": 3, "weight": 0.0, "fixed": 2, "copies": 2},
37+
"woth": {"order": 4, "weight": 0.0, "fixed": 7, "copies": 2},
38+
"sometimes": {"order": 5, "weight": 1.0, "fixed": 0, "copies": 2},
39+
"important_check": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
40+
"item": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
41+
"dual": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
42+
"dual_always": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
43+
"goal": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
44+
"barren": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
45+
"random": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
46+
"song": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
47+
"overworld": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
48+
"dungeon": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
49+
"junk": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
50+
"named-item": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2},
51+
"entrance_always": {"order": 0, "weight": 1.0, "fixed": 0, "copies": 2}
52+
}
53+
}

‎data/presets_default.json

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -878,9 +878,9 @@
878878
"Claim Check"
879879
]
880880
},
881-
"Multiworld Tournament Season 3": {
881+
"Multiworld Tournament Season 4": {
882882
"show_seed_info": true,
883-
"user_message": "Multiworld Tournament Season 3",
883+
"user_message": "Multiworld Tournament Season 4",
884884
"world_count": 3,
885885
"create_spoiler": true,
886886
"randomize_settings": false,
@@ -898,12 +898,12 @@
898898
"bridge": "medallions",
899899
"bridge_medallions": 6,
900900
"bridge_stones": 3,
901-
"bridge_rewards": 4,
901+
"bridge_rewards": 7,
902902
"bridge_tokens": 100,
903903
"bridge_hearts": 20,
904904
"trials_random": false,
905905
"trials": 0,
906-
"shuffle_ganon_bosskey": "remove",
906+
"shuffle_ganon_bosskey": "medallions",
907907
"ganon_bosskey_medallions": 6,
908908
"ganon_bosskey_stones": 3,
909909
"ganon_bosskey_rewards": 9,
@@ -989,7 +989,9 @@
989989
"logic_lens_shadow_platform",
990990
"logic_lens_bongo",
991991
"logic_lens_spirit",
992-
"logic_dc_scarecrow_gs"
992+
"logic_visible_collisions",
993+
"logic_dc_scarecrow_gs",
994+
"logic_deku_b1_webs_with_bow"
993995
],
994996
"starting_equipment": [],
995997
"starting_songs": [],
@@ -1014,34 +1016,38 @@
10141016
"auto_equip_masks": false,
10151017
"plant_beans": false,
10161018
"chicken_count_random": false,
1017-
"chicken_count": 7,
1019+
"chicken_count": 3,
10181020
"big_poe_count_random": false,
10191021
"big_poe_count": 1,
10201022
"easier_fire_arrow_entry": false,
10211023
"fae_torch_count": 3,
1022-
"ruto_already_f1_jabu": false,
1024+
"ruto_already_f1_jabu": true,
10231025
"ocarina_songs": "off",
1024-
"correct_chest_appearances": "both",
1026+
"correct_chest_appearances": "textures",
10251027
"minor_items_as_major_chest": false,
10261028
"invisible_chests": false,
10271029
"correct_potcrate_appearances": "textures_content",
1028-
"key_appearance_match_dungeon": false,
1030+
"key_appearance_match_dungeon": true,
10291031
"clearer_hints": true,
10301032
"hints": "always",
1031-
"hint_dist": "mw3",
1033+
"hint_dist": "mw_path",
10321034
"item_hints": [],
10331035
"hint_dist_user": {},
10341036
"misc_hints": [
10351037
"altar",
10361038
"ganondorf",
1037-
"warp_songs_and_owls"
1039+
"warp_songs_and_owls",
1040+
"20_skulltulas",
1041+
"30_skulltulas",
1042+
"unique_merchants",
1043+
"frogs2"
10381044
],
10391045
"text_shuffle": "none",
10401046
"damage_multiplier": "normal",
10411047
"deadly_bonks": "none",
10421048
"no_collectible_hearts": false,
10431049
"starting_tod": "default",
1044-
"blue_fire_arrows": false,
1050+
"blue_fire_arrows": true,
10451051
"fix_broken_drops": false,
10461052
"item_pool_value": "balanced",
10471053
"junk_ice_traps": "off",

‎version.py

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

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

0 commit comments

Comments
 (0)