alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle

Browse Source
This commit is contained in:
Kara Alexandra
2022-09-18 18:57:25 -07:00
parent 8934f90bb8 0c8f71a87b
commit d34169b498
78 changed files with 8114 additions and 2984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
resources/app/cli/args.json
View File

@@ -13,6 +13,11 @@
"suppress_spoiler": {
"action": "store_true"
},
"mystery": {
"action": "store_true",
"type": "bool",
"help": "suppress"
},
"logic": {
"choices": [
"noglitches",
@@ -49,8 +54,8 @@
"pedestal",
"dungeons",
"triforcehunt",
"crystals",
"trinity"
"trinity",
"crystals"
]
},
"difficulty": {
@@ -75,7 +80,32 @@
"action": "store_true",
"type": "bool"
},
"mixed_travel": {
"dropshuffle" : {
"action": "store_true",
"type": "bool"
},
"pottery" : {
"choices" : [
"none",
"keys",
"dungeon",
"cave",
"cavekeys",
"reduced",
"clustered",
"nonempty",
"lottery"
]
},
"colorizepots" : {
"action": "store_true",
"type": "bool"
},
"shufflepots": {
"action": "store_true",
"type": "bool"
},
"mixed_travel" : {
"choices": [
"prevent",
"allow",
@@ -108,12 +138,10 @@
"algorithm": {
"choices": [
"balanced",
"freshness",
"flood",
"vt21",
"vt22",
"vt25",
"vt26"
"vanilla_fill",
"major_only",
"dungeon_only",
"district"
]
},
"ow_shuffle": {
@@ -126,7 +154,6 @@
"ow_crossed": {
"choices": [
"none",
"allowed",
"polar",
"grouped",
"limited",
@@ -145,6 +172,10 @@
"action": "store_true",
"type": "bool"
},
"bonk_drops": {
"action": "store_true",
"type": "bool"
},
"ow_fluteshuffle": {
"choices": [
"vanilla",
@@ -245,8 +276,11 @@
]
},
"openpyramid": {
"action": "store_true",
"type": "bool"
"choices": [
"auto",
"yes",
"no"
]
},
"rom": {},
"loglevel": {
@@ -283,6 +317,14 @@
"action": "store_true",
"type": "bool"
},
"msu_resume": {
"action": "store_true",
"type": "bool"
},
"collection_rate": {
"action": "store_true",
"type": "bool"
},
"mapshuffle": {
"action": "store_true",
"type": "bool"
@@ -334,6 +376,13 @@
"none"
]
},
"restrict_boss_items": {
"choices": [
"none",
"mapcompass",
"dungeon"
]
},
"hints": {
"action": "store_true",
"type": "bool"
@@ -385,6 +434,10 @@
"dest": "create_rom",
"help": "suppress"
},
"suppress_meta": {
"action": "store_true",
"type": "bool"
},
"shuffleganon": {
"action": "store_true",
"type": "bool",
@@ -398,6 +451,13 @@
"action": "store_true",
"type": "bool"
},
"overworld_map": {
"choices": [
"default",
"compass",
"map"
]
},
"pseudoboots": {
"action": "store_true",
"type": "bool"
@@ -417,6 +477,9 @@
"jsonout": {
"action": "store_true"
},
"bps": {
"action": "store_true"
},
"enemizercli": {
"setting": "enemizercli"
},
@@ -424,6 +487,7 @@
"choices": [
"none",
"simple",
"unique",
"full",
"random"
]
@@ -452,10 +516,6 @@
"random"
]
},
"shufflepots": {
"action": "store_true",
"type": "bool"
},
"remote_items": {
"action": "store_true",
"type": "bool"

71
resources/app/cli/lang/en.json
View File

@@ -8,6 +8,7 @@
"player": "Player",
"shuffling.overworld": "Shuffling overworld",
"shuffling.world": "Shuffling entrances",
"shuffling.prep": "Dungeon and Item prep",
"shuffling.dungeons": "Shuffling dungeons",
"shuffling.pots": "Shuffling pots",
"basic.traversal": "--Basic Traversal",
@@ -38,6 +39,7 @@
"cannot.reach.required": "Not all required items reachable. Something went terribly wrong here.",
"patching.rom": "Patching ROM",
"patching.spoiler": "Creating Spoiler",
"create.meta": "Creating Meta Info",
"calc.playthrough": "Calculating Playthrough",
"made.rom": "Patched ROM: %s",
"made.playthrough": "Printed Playthrough: %s",
@@ -59,6 +61,7 @@
"help": {
"lang": [ "App Language, if available, defaults to English" ],
"create_spoiler": [ "Output a Spoiler File" ],
"bps": [ "Output BPS patches instead of ROMs"],
"logic": [
"Select Enforcement of Item Requirements. (default: %(default)s)",
"No Glitches: No Glitch knowledge required.",
@@ -161,22 +164,26 @@
"balanced: vt26 derivative that aims to strike a balance between",
" the overworld heavy vt25 and the dungeon heavy vt26",
" algorithm.",
"vt26: Shuffle items and place them in a random location",
" that it is not impossible to be in. This includes",
" dungeon keys and items.",
"vt25: Shuffle items and place them in a random location",
" that it is not impossible to be in.",
"vt21: Unbiased in its selection, but has tendency to put",
" Ice Rod in Turtle Rock.",
"vt22: Drops off stale locations after 1/3 of progress",
" items were placed to try to circumvent vt21\\'s",
" shortcomings.",
"Freshness: Keep track of stale locations (ones that cannot be",
" reached yet) and decrease likeliness of selecting",
" them the more often they were found unreachable.",
"Flood: Push out items starting from Link\\'s House and",
" slightly biased to placing progression items with",
" less restrictions."
"restricted placements: these consider all major items to be special and attempts",
"to place items from fixed to semi-random locations. For purposes of these shuffles, all",
"Y items, A items, swords (unless vanilla swords), mails, shields, heart containers and",
"1/2 magic are considered to be part of a major items pool. Big Keys are added to the pool",
"if shuffled. Same for small keys, compasses, maps, keydrops (if small keys are also shuffled),",
"1 of each capacity upgrade for shopsanity, the quiver item for retro+shopsanity, and",
"triforce pieces for Triforce Hunt. Future modes will add to these as appropriate.",
"vanilla_fill As above, but attempts to place items in their vanilla",
" location first. Major items that cannot be placed that way",
" will attempt to be placed in other failed locations first.",
" Also attempts to place all items in vanilla locations",
"major_only As above, but uses the major items' location preferentially",
" major item location are defined as the group of location where",
" the items are found in the vanilla game.",
"dungeon_only As above, but major items are preferentially placed",
" in dungeons locations first",
"district As above, but groups of locations are chosen randomly",
" from a pool of fixed locations designed to be interesting",
" and give major clues about the location of other",
" advancement items. These fixed groups will be documented."
],
"shuffle": [
"Select Entrance Shuffling Algorithm. (default: %(default)s)",
@@ -215,7 +222,6 @@
"ow_crossed": [
"This allows cross-world connections to occur on the overworld.",
"None: No transitions are cross-world connections.",
"Allowed: Only entrances/whirlpools can end up cross-world.",
"Polar: Only used when Mixed is enabled. This retains original",
" connections even when overworld tiles are swapped.",
"Limited: Exactly nine transitions are randomly chosen as",
@@ -232,6 +238,9 @@
"ow_whirlpool": [
"Whirlpools will be shuffled and paired together."
],
"bonk_drops": [
"Bonk drops from trees, rocks, and statues are shuffled with the item pool."
],
"ow_fluteshuffle": [
"This randomizes the flute spot destinations.",
"Vanilla: All flute spots remain unchanged.",
@@ -300,7 +309,21 @@
"keyshuffle": [ "Small Keys are no longer restricted to their dungeons, but can be anywhere. (default: %(default)s)" ],
"bigkeyshuffle": [ "Big Keys are no longer restricted to their dungeons, but can be anywhere. (default: %(default)s)" ],
"shopsanity": ["Shop contents are shuffle in the main item pool and other items can take their place. (default: %(default)s)"],
"keydropshuffle": [ "Key Drops (Pots and Enemies) are shuffled and other items can take their place (default: %(default)s)" ],
"dropshuffle": [ "Keys dropped by enemies are shuffled and other items can take their place. (default: %(default)s)"],
"pottery": [ "Controls how items under pots are shuffled and if other items can take their place:",
"None: No pots are changed",
"Keys: Key pots are included in the location pool and other items can take their place",
"Cave: Only pots in houses and caves are included in the location pool",
"CaveKeys: Both pots in houses and caves and keys pots are included in the location pool",
"Reduced: Same as KeyCaves + 25%% of Pots in dungeons (dynamic mode)",
"Clustered: Same as KeyCaves + 50%% of Pots in dungeons, chosen by logical group (dynamic mode)",
"NonEmpty: All pots that are not originally empty are included in the location pool",
"Dungeon: Only pots in dungeons are included in the location pool",
"Lottery: All pots are part of the location pool"
],
"colorizepots": ["All pots chosen to be in location pool by the pottery setting are different.",
"Forced on in dynamic modes. Forced off in lottery"],
"shufflepots": [ "Pots and switches are shuffled on the supertile (legacy potshuffle) (default: %(default)s)"],
"mixed_travel": [
"How to handle potential traversal between dungeon in Crossed door shuffle",
"Prevent: Rails are placed to prevent bombs jump and hovering from changing dungeon except with glitched logic settings",
@@ -329,6 +352,13 @@
"Locations: You will be able to reach every location in the game.",
"None: You will be able to reach enough locations to beat the game."
],
"restrict_boss_items": [
"Select which dungeon are not allowed on bosses (default: %(default)s)",
"None: All items allowed",
"Mapcompass: Map and Compass are required before you defeat the boss.",
"Dungeon: Same as above and keys too cannot be on the boss. Small key shuffle",
" and big key shuffle override this behavior"
],
"hints": [ "Make telepathic tiles and storytellers give helpful hints. (default: %(default)s)" ],
"no_shuffleganon": [
"Don't include the Ganon's Tower and Pyramid Hole in the",
@@ -337,6 +367,9 @@
"shufflelinks": [
"Include Link's House in the entrance shuffle pool. (default: %(default)s)"
],
"overworld_map": [
"Control if and how the overworld map indicators show the locations of dungeons (default: %(default)s)"
],
"heartbeep": [
"Select the rate at which the heart beep sound is played at",
"low health. (default: %(default)s)"
@@ -351,6 +384,8 @@
],
"reduce_flashing": [ "Reduce some in-game flashing (default: %(default)s)" ],
"shuffle_sfx": [ "Shuffle sounds effects (default: %(default)s)" ],
"msu_resume": [ "Enable MSU Resume (default: %(default)s)" ],
"collection_rate": [ "Display collection rate (default: %(default)s)" ],
"create_rom": [ "Create an output rom file. (default: %(default)s)" ],
"gui": [ "Launch the GUI. (default: %(default)s)" ],
"jsonout": [

1
resources/app/gui/adjust/overview/widgets.json
View File

@@ -1,6 +1,7 @@
{
"checkboxes": {
"nobgm": { "type": "checkbox" },
"msu_resume": { "type": "checkbox" },
"quickswap": { "type": "checkbox" },
"reduce_flashing": {"type": "checkbox" },
"shuffle_sfx": {"type": "checkbox" }

45
resources/app/gui/lang/en.json
View File

@@ -4,6 +4,7 @@
"adjust.quickswap": "L/R Quickswapping",
"adjust.reduce_flashing": "Reduce Flashing",
"adjust.shuffle_sfx": "Shuffle Sound Effects",
"adjust.msu_resume": "MSU Resume",
"adjust.heartcolor": "Heart Color",
"adjust.heartcolor.red": "Red",
@@ -53,7 +54,20 @@
"randomizer.dungeon.compassshuffle": "Compasses",
"randomizer.dungeon.smallkeyshuffle": "Small Keys",
"randomizer.dungeon.bigkeyshuffle": "Big Keys",
"randomizer.dungeon.keydropshuffle": "Key Drops (pots and enemies)",
"randomizer.dungeon.keydropshuffle": "Key Drop Shuffle (Legacy)",
"randomizer.dungeon.dropshuffle": "Shuffle Enemy Key Drops",
"randomizer.dungeon.potshuffle": "Pot Shuffle (Legacy)",
"randomizer.dungeon.pottery": "Pottery",
"randomizer.dungeon.pottery.none": "None",
"randomizer.dungeon.pottery.keys": "Key Pots",
"randomizer.dungeon.pottery.cave": "Cave Pots",
"randomizer.dungeon.pottery.cavekeys": "Cave+Key Pots",
"randomizer.dungeon.pottery.reduced": "Reduced Dungeon Pots (Dynamic)",
"randomizer.dungeon.pottery.clustered": "Clustered Dungeon Pots (Dynamic)",
"randomizer.dungeon.pottery.nonempty": "Excludes Empty Pots",
"randomizer.dungeon.pottery.dungeon": "Dungeon Pots",
"randomizer.dungeon.pottery.lottery": "Lottery (All Pots and Large Blocks)",
"randomizer.dungeon.colorizepots": "Colorize Randomized Pots",
"randomizer.dungeon.dungeondoorshuffle": "Dungeon Door Shuffle",
"randomizer.dungeon.dungeondoorshuffle.vanilla": "Vanilla",
@@ -66,7 +80,6 @@
"randomizer.dungeon.dungeonintensity.3": "3: Dungeon Lobbies",
"randomizer.dungeon.dungeonintensity.random": "Random",
"randomizer.dungeon.potshuffle": "Pot Shuffle",
"randomizer.dungeon.experimental": "Enable Experimental Features",
"randomizer.dungeon.dungeon_counters": "Dungeon Chest Counters",
@@ -93,6 +106,7 @@
"randomizer.enemizer.bossshuffle": "Boss Shuffle",
"randomizer.enemizer.bossshuffle.none": "None",
"randomizer.enemizer.bossshuffle.simple": "Simple",
"randomizer.enemizer.bossshuffle.unique": "Unique",
"randomizer.enemizer.bossshuffle.full": "Full",
"randomizer.enemizer.bossshuffle.random": "Random",
@@ -119,7 +133,6 @@
"randomizer.overworld.crossed": "Crossed",
"randomizer.overworld.crossed.none": "None",
"randomizer.overworld.crossed.allowed": "None (Allowed)",
"randomizer.overworld.crossed.polar": "Polar",
"randomizer.overworld.crossed.grouped": "Grouped",
"randomizer.overworld.crossed.limited": "Limited",
@@ -131,14 +144,23 @@
"randomizer.overworld.whirlpool": "Whirlpool Shuffle",
"randomizer.overworld.bonk_drops": "Bonk Drops",
"randomizer.overworld.overworldflute": "Flute Shuffle",
"randomizer.overworld.overworldflute.vanilla": "Vanilla",
"randomizer.overworld.overworldflute.balanced": "Balanced",
"randomizer.overworld.overworldflute.random": "Random",
"randomizer.entrance.openpyramid": "Pre-open Pyramid Hole",
"randomizer.entrance.openpyramid.auto": "Auto",
"randomizer.entrance.openpyramid.yes": "Yes",
"randomizer.entrance.openpyramid.no": "No",
"randomizer.entrance.shuffleganon": "Include Ganon's Tower and Pyramid Hole in shuffle pool",
"randomizer.entrance.shufflelinks": "Include Link's House in the shuffle pool",
"randomizer.entrance.overworld_map": "Overworld Map",
"randomizer.entrance.overworld_map.default": "Default (no location display)",
"randomizer.entrance.overworld_map.compass": "Compass indicates location",
"randomizer.entrance.overworld_map.map": "Map indicates location",
"randomizer.entrance.entranceshuffle": "Entrance Shuffle",
"randomizer.entrance.entranceshuffle.vanilla": "Vanilla",
@@ -162,6 +184,8 @@
"randomizer.gameoptions.quickswap": "L/R Quickswapping",
"randomizer.gameoptions.reduce_flashing": "Reduce Flashing",
"randomizer.gameoptions.shuffle_sfx": "Shuffle Sound Effects",
"randomizer.gameoptions.msu_resume": "MSU Resume",
"randomizer.gameoptions.collection_rate": "Display Collection Rate",
"randomizer.gameoptions.heartcolor": "Heart Color",
"randomizer.gameoptions.heartcolor.red": "Red",
@@ -199,6 +223,7 @@
"randomizer.gameoptions.sprite.unchanged": "(unchanged)",
"randomizer.generation.bps": "Create BPS Patches",
"randomizer.generation.createspoiler": "Create Spoiler Log",
"randomizer.generation.createrom": "Create Patched ROM",
"randomizer.generation.calcplaythrough": "Calculate Playthrough",
@@ -327,14 +352,16 @@
"randomizer.item.accessibility.none": "Beatable",
"randomizer.item.sortingalgo": "Item Sorting",
"randomizer.item.sortingalgo.freshness": "Freshness",
"randomizer.item.sortingalgo.flood": "Flood",
"randomizer.item.sortingalgo.vt21": "VT8.21",
"randomizer.item.sortingalgo.vt22": "VT8.22",
"randomizer.item.sortingalgo.vt25": "VT8.25",
"randomizer.item.sortingalgo.vt26": "VT8.26",
"randomizer.item.sortingalgo.balanced": "Balanced",
"randomizer.item.sortingalgo.vanilla_fill": "Vanilla Fill",
"randomizer.item.sortingalgo.major_only": "Major Location Restriction",
"randomizer.item.sortingalgo.dungeon_only": "Dungeon Restriction",
"randomizer.item.sortingalgo.district": "District Restriction",
"randomizer.item.restrict_boss_items": "Forbidden Boss Items",
"randomizer.item.restrict_boss_items.none": "None",
"randomizer.item.restrict_boss_items.mapcompass": "Map & Compass",
"randomizer.item.restrict_boss_items.dungeon": "Map & Compass & Keys",
"bottom.content.worlds": "Worlds",
"bottom.content.names": "Player names",

3
resources/app/gui/randomize/dungeon/keysanity.json
View File

@@ -3,7 +3,6 @@
"mapshuffle": { "type": "checkbox" },
"compassshuffle": { "type": "checkbox" },
"smallkeyshuffle": { "type": "checkbox" },
"bigkeyshuffle": { "type": "checkbox" },
"keydropshuffle": { "type": "checkbox" }
"bigkeyshuffle": { "type": "checkbox" }
}
}

21
resources/app/gui/randomize/dungeon/widgets.json
View File

@@ -22,6 +22,27 @@
"width": 45
}
},
"keydropshuffle": { "type": "checkbox" },
"pottery": {
"type": "selectbox",
"default": "none",
"options": [
"none",
"keys",
"cave",
"cavekeys",
"reduced",
"clustered",
"nonempty",
"dungeon",
"lottery"
],
"config": {
"width": 35
}
},
"colorizepots": { "type": "checkbox" },
"dropshuffle": { "type": "checkbox" },
"potshuffle": { "type": "checkbox" },
"experimental": { "type": "checkbox" },
"dungeon_counters": {

1
resources/app/gui/randomize/enemizer/widgets.json
View File

@@ -15,6 +15,7 @@
"none",
"simple",
"full",
"unique",
"random"
]
}

23
resources/app/gui/randomize/entrando/widgets.json
View File

@@ -1,8 +1,29 @@
{
"widgets": {
"openpyramid": { "type": "checkbox" },
"openpyramid": {
"type": "selectbox",
"options": [
"auto",
"yes",
"no"
],
"config": {
"width": 10
}
},
"shuffleganon": { "type": "checkbox" },
"shufflelinks": { "type": "checkbox" },
"overworld_map": {
"type": "selectbox",
"options": [
"default",
"compass",
"map"
],
"config": {
"width": 45
}
},
"entranceshuffle": {
"type": "selectbox",
"options": [

2
resources/app/gui/randomize/gameoptions/widgets.json
View File

@@ -1,6 +1,8 @@
{
"checkboxes": {
"nobgm": { "type": "checkbox" },
"msu_resume": { "type": "checkbox" },
"collection_rate": {"type": "checkbox"},
"quickswap": { "type": "checkbox" },
"reduce_flashing": { "type": "checkbox" },
"shuffle_sfx": { "type": "checkbox" }

3
resources/app/gui/randomize/generation/checkboxes.json
View File

@@ -1,7 +1,8 @@
{
"checkboxes": {
"createspoiler": { "type": "checkbox" },
"createrom": { "type": "checkbox" },
"bps": { "type": "checkbox" },
"createspoiler": { "type": "checkbox" },
"calcplaythrough": { "type": "checkbox" },
"usestartinventory": { "type": "checkbox" },
"usecustompool": { "type": "checkbox" }

21
resources/app/gui/randomize/item/widgets.json
View File

@@ -133,13 +133,20 @@
"type": "selectbox",
"default": "balanced",
"options": [
"freshness",
"flood",
"vt21",
"vt22",
"vt25",
"vt26",
"balanced"
"balanced",
"vanilla_fill",
"major_only",
"dungeon_only",
"district"
]
},
"restrict_boss_items": {
"type": "selectbox",
"default": "none",
"options": [
"none",
"mapcompass",
"dungeon"
]
},
"beemizer": {

7
resources/app/gui/randomize/overworld/widgets.json
View File

@@ -1,4 +1,10 @@
{
"topOverworldFrame": {
"bonk_drops": {
"type": "checkbox",
"default": false
}
},
"leftOverworldFrame": {
"overworldshuffle": {
"type": "selectbox",
@@ -14,7 +20,6 @@
"default": "vanilla",
"options": [
"none",
"allowed",
"polar",
"grouped",
"limited",