From 889d24606f6e72ad1e4d9b50b2708b1aaf80fbb1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 30 Jan 2021 19:03:54 -0500 Subject: [PATCH] Updated weighted settings to reflect new beemizer documentation and include pyramid_open options --- .../static/static/weightedSettings.json | 42 ++++++++++++++++--- .../static/static/weightedSettings.yaml | 13 ++++-- playerSettings.yaml | 12 +++--- 3 files changed, 52 insertions(+), 15 deletions(-) diff --git a/WebHostLib/static/static/weightedSettings.json b/WebHostLib/static/static/weightedSettings.json index 83e01d7f..0bcf9dd1 100644 --- a/WebHostLib/static/static/weightedSettings.json +++ b/WebHostLib/static/static/weightedSettings.json @@ -406,6 +406,38 @@ } } }, + "pyramid_open": { + "keyString": "pyramid_open", + "friendlyName": "Pyramid Open", + "description": "", + "inputType": "range", + "subOptions": { + "goal": { + "keyString": "pyramid_open.goal", + "friendlyName": "Goal", + "description": "Opens the pyramid if the goal requires you to kill Ganon, unless the goal is Slow Ganon or All Dungeons.", + "defaultValue": 50 + }, + "auto": { + "keyString": "pyramid_open.auto", + "friendlyName": "Auto", + "description": "Same as Goal, but also opens when any non-dungeon entrance shuffle is used.", + "defaultValue": 0 + }, + "yes": { + "keyString": "pyramid_open.yes", + "friendlyName": "Always Open", + "description": "Pyramid hole is always open. Ganon's vulnerable condition is still required before he can he hurt.", + "defaultValue": 0 + }, + "no": { + "keyString": "pyramid_open.no", + "friendlyName": "Always Closed", + "description": "Pyramid hole is always closed until you defeat Agahnim atop Ganon's Tower.", + "defaultValue": 0 + } + } + }, "triforce_pieces_required": { "keyString": "triforce_pieces_required", "friendlyName": "Triforce Pieces Required", @@ -1135,7 +1167,7 @@ "beemizer": { "keyString": "beemizer", "friendlyName": "Beemizer", - "description": "Remove items from the global item pool and replace them with single bees and bee traps.", + "description": "Remove non-health items from the global item pool and replace them with single bees and bee traps.", "inputType": "range", "subOptions": { "0": { @@ -1147,25 +1179,25 @@ "1": { "keyString": "beemizer.1", "friendlyName": "Level 1", - "description": "25% of the non-essential item pool is replaced with bee traps.", + "description": "25% of rupees, bombs and arrows are replaced with bees, of which 60% are traps and 40% single bees", "defaultValue": 1 }, "2": { "keyString": "beemizer.2", "friendlyName": "Level 2", - "description": "60% of the non-essential item pool is replaced with bee traps, of which 20% could be single bees.", + "description": "50% of rupees, bombs and arrows are replaced with bees, of which 70% are traps and 30% single bees", "defaultValue": 2 }, "3": { "keyString": "beemizer.3", "friendlyName": "Level 3", - "description": "100% of the non-essential item pool is replaced with bee traps, of which 50% could be single bees.", + "description": "75% of rupees, bombs and arrows are replaced with bees, of which 80% are traps and 20% single bees", "defaultValue": 3 }, "4": { "keyString": "beemizer.4", "friendlyName": "Level 4", - "description": "100% of the non-essential item pool is replaced with bee traps.", + "description": "100% of rupees, bombs and arrows are replaced with bees, of which 90% are traps and 10% single bees", "defaultValue": 4 } } diff --git a/WebHostLib/static/static/weightedSettings.yaml b/WebHostLib/static/static/weightedSettings.yaml index fd067077..140d1fb7 100644 --- a/WebHostLib/static/static/weightedSettings.yaml +++ b/WebHostLib/static/static/weightedSettings.yaml @@ -97,6 +97,11 @@ goals: ganon_triforce_hunt: 0 # Collect 20 of 30 Triforce pieces spread throughout the worlds, then kill Ganon local_ganon_triforce_hunt: 0 # Collect 20 of 30 Triforce pieces spread throughout your world, then kill Ganon ice_rod_hunt: 0 # You start with everything needed to 216 the seed. Find the Ice rod, then kill Trinexx at Turtle rock. +pyramid_open: + goal: 50 # Opens the pyramid if the goal requires you to kill Ganon, unless the goal is Slow Ganon or All Dungeons + auto: 0 # Same as Goal, but also opens when any non-dungeon entrance shuffle is used + yes: 0 # Pyramid hole is always open. Ganon's vulnerable condition is still required before he can he hurt + no: 0 # Pyramid hole is always closed until you defeat Agahnim atop Ganon's Tower triforce_pieces_mode: #Determine how to calculate the extra available triforce pieces. extra: 0 # available = triforce_pieces_extra + triforce_pieces_required percentage: 0 # available = (triforce_pieces_percentage /100) * triforce_pieces_required @@ -218,10 +223,10 @@ pot_shuffle: ### End of Enemizer Section ### beemizer: # Remove items from the global item pool and replace them with single bees and bee traps 0: 50 # No bee traps are placed - 1: 0 # 25% of the non-essential item pool is replaced with bee traps - 2: 0 # 60% of the non-essential item pool is replaced with bee traps, of which 20% could be single bees - 3: 0 # 100% of the non-essential item pool is replaced with bee traps, of which 50% could be single bees - 4: 0 # 100% of the non-essential item pool is replaced with bee traps + 1: 0 # 25% of rupees, bombs and arrows are replaced with bees, of which 60% are traps and 40% single bees + 2: 0 # 50% of rupees, bombs and arrows are replaced with bees, of which 70% are traps and 30% single bees + 3: 0 # 75% of rupees, bombs and arrows are replaced with bees, of which 80% are traps and 20% single bees + 4: 0 # 100% of rupees, bombs and arrows are replaced with bees, of which 90% are traps and 10% single bees ### Shop Settings ### shop_shuffle_slots: # Maximum amount of shop slots to be filled with regular item pool items (such as Moon Pearl) 0: 50 diff --git a/playerSettings.yaml b/playerSettings.yaml index d08e1af0..47728117 100644 --- a/playerSettings.yaml +++ b/playerSettings.yaml @@ -98,15 +98,15 @@ goals: local_ganon_triforce_hunt: 0 # Collect 20 of 30 Triforce pieces spread throughout your world, then kill Ganon ice_rod_hunt: 0 # You start with everything needed to 216 the seed. Find the Ice rod, then kill Trinexx at Turtle rock. pyramid_open: - goal: 50 # Opens pyrymid if goal is fast_ganon, ganon_pedestal, ganon_triforce_hunt, or local_ganon_triforce_hunt - auto: 0 # Opens pyramid same as goal, except when an entrance shuffle other than vanilla, dungeonssimple or dungeonsfull is in effect. - yes: 0 # pyramid is opened unconditionally. You still have to beat agahnim 2 for ganon and dungeons. - no: 0 # access to pyramid requires beating agahnim 2. + goal: 50 # Opens the pyramid if the goal requires you to kill Ganon, unless the goal is Slow Ganon or All Dungeons + auto: 0 # Same as Goal, but also opens when any non-dungeon entrance shuffle is used + yes: 0 # Pyramid hole is always open. Ganon's vulnerable condition is still required before he can he hurt + no: 0 # Pyramid hole is always closed until you defeat Agahnim atop Ganon's Tower triforce_pieces_mode: #Determine how to calculate the extra available triforce pieces. extra: 0 # available = triforce_pieces_extra + triforce_pieces_required percentage: 0 # available = (triforce_pieces_percentage /100) * triforce_pieces_required available: 50 # available = triforce_pieces_available -triforce_pieces_extra: # Set to how many extra triforces pieces are available to collect in the world. +triforce_pieces_extra: # Set to how many extra triforces pieces are available to collect in the world. # Format "pieces: chance" 0: 0 5: 50 @@ -461,4 +461,4 @@ rom: classic: 0 dizzy: 0 sick: 0 - puke: 0 \ No newline at end of file + puke: 0