morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes

Browse Source
This commit is contained in:
pepperpow
2021-02-22 22:44:43 -06:00
parent d0d5ad4fe0 4c1033a91d
commit 222784dbb6
57 changed files with 11762 additions and 7233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
WebHostLib/static/static/weightedSettings.json
View File

@@ -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
}
}
@@ -1250,19 +1282,19 @@
"description": "No items are moved",
"defaultValue": 50
},
"1": {
"10": {
"keyString": "shop_shuffle_slots.10",
"friendlyName": "Level 1",
"description": "10 Items are moved into shops.",
"defaultValue": 0
},
"2": {
"20": {
"keyString": "shop_shuffle_slots.20",
"friendlyName": "Level 2",
"description": "20 Items are moved into shops.",
"defaultValue": 0
},
"3": {
"30": {
"keyString": "shop_shuffle_slots.30",
"friendlyName": "Level 3",
"description": "30 Items are moved into shops.",
@@ -1600,6 +1632,25 @@
"description": "Hide both of the above options",
"defaultValue": 0
}
},
"reduceflashing": {
"keyString": "rom.reduceflashing",
"friendlyName": "Full-Screen Flashing Effects",
"description": "Enable or disable full-screen flashing effects in game.",
"inputType": "range",
"subOptions": {
"on": {
"keyString": "rom.reduceflashing.on",
"friendlyName": "Disabled",
"description": "Disables flashing.",
"defaultValue": 50
},
"off": {
"keyString": "rom.reduceflashing.off",
"friendlyName": "Enabled",
"description": "Enables flashing.",
"defaultValue": 0
}
}
},
"quickswap": {
@@ -1797,7 +1848,7 @@
"defaultValue": 0
},
"puke": {
"keyString": "rom.ow_palettes.Puke",
"keyString": "rom.ow_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
"defaultValue": 0
@@ -1859,7 +1910,7 @@
"defaultValue": 0
},
"puke": {
"keyString": "rom.uw_palettes.Puke",
"keyString": "rom.uw_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
"defaultValue": 0
@@ -1921,7 +1972,7 @@
"defaultValue": 0
},
"puke": {
"keyString": "rom.hud_palettes.Puke",
"keyString": "rom.hud_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
"defaultValue": 0
@@ -1983,7 +2034,7 @@
"defaultValue": 0
},
"puke": {
"keyString": "rom.shield_palettes.Puke",
"keyString": "rom.shield_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
"defaultValue": 0
@@ -2045,7 +2096,7 @@
"defaultValue": 0
},
"puke": {
"keyString": "rom.sword_palettes.Puke",
"keyString": "rom.sword_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
"defaultValue": 0

21
WebHostLib/static/static/weightedSettings.yaml
View File

@@ -17,6 +17,11 @@
# To test if your yaml is valid or not, you can use this website:
# http://www.yamllint.com/
# For use with the weighted-settings page on the website. Changing this value will cause all users to be prompted
# to update their settings. The version number should match the current released version number, and the revision
# should be updated manually by whoever edits this file.
ws_version: 4.0.1 rev1
description: Template Name # Used to describe your yaml. Useful if you have multiple files
name: YourName # Your name in-game. Spaces will be replaced with underscores and there is a 16 character limit
### Logic Section ###
@@ -97,6 +102,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 +228,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
@@ -353,6 +363,9 @@ rom:
quickswap: # Enable switching items by pressing the L+R shoulder buttons
on: 50
off: 0
reduceflashing: # Reduces instances of flashing such as lightning attacks, weather, ether and more.
on: 50
off: 0
menuspeed: # Controls how fast the item menu opens and closes
normal: 50
instant: 0