Skip to content

Commit b9e69dd

Browse files
fenhlfenhl
committed
Merge 'S9 preset' (OoTRandomizer#2495)
2 parents 7f9504b + f2cc8e3 commit b9e69dd

3 files changed

Lines changed: 37 additions & 42 deletions

File tree

‎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
@@ -202,13 +202,13 @@
202202
"custom_ice_trap_count": 100,
203203
"ice_trap_appearance": "junk_only"
204204
},
205-
"S8 Tournament": {
205+
"S9 Tournament": {
206206
"aliases": [
207-
"s8",
207+
"s9",
208208
"tournament"
209209
],
210210
"show_seed_info": true,
211-
"user_message": "S8 Tournament",
211+
"user_message": "S9 Tournament",
212212
"world_count": 1,
213213
"create_spoiler": true,
214214
"password_lock": false,
@@ -257,7 +257,7 @@
257257
"shuffle_hideout_entrances": false,
258258
"shuffle_gerudo_fortress_heart_piece": "remove",
259259
"shuffle_grotto_entrances": false,
260-
"shuffle_dungeon_entrances": "off",
260+
"shuffle_dungeon_entrances": "simple",
261261
"shuffle_bosses": "off",
262262
"shuffle_ganon_tower": false,
263263
"shuffle_overworld_entrances": false,
@@ -312,7 +312,10 @@
312312
"shuffle_silver_rupees": "vanilla",
313313
"silver_rupee_pouches_choice": "off",
314314
"silver_rupee_pouches": [],
315-
"enhance_map_compass": [],
315+
"enhance_map_compass": [
316+
"map_dungeon_location",
317+
"compass_reward"
318+
],
316319
"logic_no_night_tokens_without_suns_song": false,
317320
"disabled_locations": [
318321
"Deku Theater Mask of Truth"
@@ -333,7 +336,9 @@
333336
"logic_lens_bongo",
334337
"logic_lens_spirit",
335338
"logic_lens_gtg",
336-
"logic_lens_castle"
339+
"logic_lens_castle",
340+
"logic_deku_b1_webs_with_bow",
341+
"logic_dc_scarecrow_gs"
337342
],
338343
"advanced_allowed_tricks": [],
339344
"starting_equipment": [
@@ -344,9 +349,15 @@
344349
"zeldas_letter"
345350
],
346351
"starting_songs": [],
347-
"add_random_starting_items": false,
348-
"random_starting_items_exclude": [],
349-
"random_starting_items_count": 0,
352+
"add_random_starting_items": true,
353+
"random_starting_items_exclude": [
354+
"bombchus",
355+
"shields",
356+
"deku_upgrades",
357+
"health_upgrades",
358+
"junk"
359+
],
360+
"random_starting_items_count": 1,
350361
"start_with_consumables": true,
351362
"start_with_rupees": false,
352363
"starting_hearts": 3,
@@ -358,7 +369,7 @@
358369
"complete_mask_quest": false,
359370
"useful_cutscenes": false,
360371
"fast_chests": true,
361-
"scarecrow_behavior": "vanilla",
372+
"scarecrow_behavior": "fast",
362373
"fast_bunny_hood": true,
363374
"auto_equip_masks": false,
364375
"plant_beans": false,
@@ -380,6 +391,7 @@
380391
"altar",
381392
"ganondorf",
382393
"warp_songs_and_owls",
394+
"dampe_diary",
383395
"30_skulltulas",
384396
"40_skulltulas",
385397
"50_skulltulas"
@@ -406,7 +418,7 @@
406418
"starting_tod": "default",
407419
"blue_fire_arrows": true,
408420
"fix_broken_drops": false,
409-
"tcg_requires_lens": false,
421+
"tcg_requires_lens": true,
410422
"no_collectible_hearts": false,
411423
"one_item_per_dungeon": false,
412424
"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.64'
1+
__version__ = '8.3.65'
22

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

0 commit comments

Comments
 (0)