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

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

Browse Source
This commit is contained in:
karafruit
2021-09-21 12:37:57 -07:00
parent 3b72626f23 4656dee601
commit d733eca0f8
43 changed files with 2615 additions and 1704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,17 +119,23 @@
"full"
]
},
"ow_swap": {
"ow_crossed": {
"choices": [
"vanilla",
"mixed",
"crossed"
"none",
"polar",
"grouped",
"limited",
"chaos"
]
},
"ow_keepsimilar": {
"action": "store_true",
"type": "bool"
},
"ow_mixed": {
"action": "store_true",
"type": "bool"
},
"ow_fluteshuffle": {
"choices": [
"vanilla",
@@ -145,10 +151,6 @@
"full",
"crossed",
"insanity",
"restricted_legacy",
"full_legacy",
"madness_legacy",
"insanity_legacy",
"dungeonsfull",
"dungeonssimple"
]
@@ -266,6 +268,10 @@
"action": "store_true",
"type": "bool"
},
"shuffle_sfx": {
"action": "store_true",
"type": "bool"
},
"mapshuffle": {
"action": "store_true",
"type": "bool"
@@ -287,7 +293,7 @@
"type": "bool",
"help": "suppress"
},
"bomblogic": {
"bombbag": {
"action": "store_true",
"type": "bool"
},

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

@@ -2,7 +2,7 @@
"cli": {
"yes": "Yes",
"no": "No",
"app.title": "ALttP Door Randomizer Version %s - Seed: %s, Code: %s",
"app.title": "ALttP Door Randomizer Version %s : --seed %s --code %s",
"version": "Version",
"seed": "Seed",
"player": "Player",
@@ -194,10 +194,8 @@
" which they are entered.",
"Vanilla: All entrances are in the same locations they were",
" in the base game.",
"Legacy shuffles preserve behavior from older versions of the",
"entrance randomizer including significant technical limitations.",
"The dungeon variants only mix up dungeons and keep the rest of",
"the overworld vanilla."
"the entrances vanilla."
],
"ow_shuffle": [
"This shuffles the layout of the overworld.",
@@ -208,22 +206,27 @@
"Full: Overworld transitions are shuffled, but both worlds",
" will have an independent map shape."
],
"ow_swap": [
"This swaps the tiles of the overworld from one world to the other.",
"Vanilla: All overworld tiles remain in their original world as",
" they were in the base game.",
"Mixed: Overworld tiles are randomly chosen to become part of",
" the opposite world.",
"Crossed: Overworld tiles remain in their original world, but",
" the transitions are shuffled cross world."
"ow_crossed": [
"This allows cross-world connections to occur on the overworld.",
"None: No transitions are cross-world connections.",
"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",
" cross-world connections (to emulate the nine portals).",
"Chaos: Every transition has a 50/50 chance to become a",
" crossworld connection."
],
"ow_keepsimilar": [
"This keeps similar edge transitions together. ie. the two west edges on",
"Potion Shop will be paired with another similar pair." ],
"ow_mixed": [
"Overworld tiles are randomly chosen to become part of the opposite world."
],
"ow_fluteshuffle": [
"This randomizes the flute spot destinations.",
"Vanilla: All flute spots remain unchanged.",
"Balanced: New flute spots will be generated but prevents flute spots from being on any adjacent screen.",
"Balanced: New flute spots will be generated but prevents flute",
" spots from being on any adjacent screen.",
"Random: New flute spots will be generated with minimal bias."
],
"door_shuffle": [
@@ -304,7 +307,7 @@
"and a few other little things make this more like Zelda-1. (default: %(default)s)"
],
"pseudoboots": [ " Players starts with pseudo boots that allow dashing but no item checks (default: %(default)s"],
"bomblogic": ["Start with 0 bomb capacity. Two capacity upgrades (+10) are added to the pool (default: %(default)s)" ],
"bombbag": ["Start with 0 bomb capacity. Two capacity upgrades (+10) are added to the pool (default: %(default)s)" ],
"startinventory": [ "Specifies a list of items that will be in your starting inventory (separated by commas). (default: %(default)s)" ],
"usestartinventory": [ "Toggle usage of Starting Inventory." ],
"custom": [ "Not supported." ],
@@ -337,6 +340,7 @@
"sprite that will be extracted."
],
"reduce_flashing": [ "Reduce some in-game flashing (default: %(default)s)" ],
"shuffle_sfx": [ "Shuffle sounds effects (default: %(default)s)" ],
"create_rom": [ "Create an output rom file. (default: %(default)s)" ],
"gui": [ "Launch the GUI. (default: %(default)s)" ],
"jsonout": [

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

@@ -2,7 +2,8 @@
"checkboxes": {
"nobgm": { "type": "checkbox" },
"quickswap": { "type": "checkbox" },
"reduce_flashing": {"type": "checkbox"}
"reduce_flashing": {"type": "checkbox" },
"shuffle_sfx": {"type": "checkbox" }
},
"leftAdjustFrame": {
"heartcolor": {

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

@@ -3,6 +3,7 @@
"adjust.nobgm": "Disable Music & MSU-1",
"adjust.quickswap": "L/R Quickswapping",
"adjust.reduce_flashing": "Reduce Flashing",
"adjust.shuffle_sfx": "Shuffle Sound Effects",
"adjust.heartcolor": "Heart Color",
"adjust.heartcolor.red": "Red",
@@ -116,12 +117,14 @@
"randomizer.overworld.overworldshuffle.parallel": "Parallel",
"randomizer.overworld.overworldshuffle.full": "Full",
"randomizer.overworld.overworldswap": "Tile Swap",
"randomizer.overworld.overworldswap.vanilla": "Vanilla",
"randomizer.overworld.overworldswap.mixed": "Mixed",
"randomizer.overworld.overworldswap.crossed": "Crossed",
"randomizer.overworld.crossed": "Crossed",
"randomizer.overworld.crossed.none": "None",
"randomizer.overworld.crossed.polar": "Polar",
"randomizer.overworld.crossed.grouped": "Grouped",
"randomizer.overworld.crossed.limited": "Limited",
"randomizer.overworld.crossed.chaos": "Chaos",
"randomizer.overworld.keepsimilar": "Keep Similar Edges Together",
"randomizer.overworld.mixed": "Tile Swap (Mixed)",
"randomizer.overworld.overworldflute": "Flute Shuffle",
"randomizer.overworld.overworldflute.vanilla": "Vanilla",
@@ -151,6 +154,7 @@
"randomizer.gameoptions.nobgm": "Disable Music & MSU-1",
"randomizer.gameoptions.quickswap": "L/R Quickswapping",
"randomizer.gameoptions.reduce_flashing": "Reduce Flashing",
"randomizer.gameoptions.shuffle_sfx": "Shuffle Sound Effects",
"randomizer.gameoptions.heartcolor": "Heart Color",
"randomizer.gameoptions.heartcolor.red": "Red",
@@ -207,7 +211,7 @@
"randomizer.item.hints": "Include Helpful Hints",
"randomizer.item.retro": "Retro mode (universal keys)",
"randomizer.item.pseudoboots": "Start with Pseudo Boots",
"randomizer.item.bomblogic": "Bomblogic",
"randomizer.item.bombbag": "Bombbag",
"randomizer.item.worldstate": "World State",
"randomizer.item.worldstate.standard": "Standard",

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

@@ -12,10 +12,6 @@
"full",
"crossed",
"insanity",
"restricted_legacy",
"full_legacy",
"madness_legacy",
"insanity_legacy",
"dungeonsfull",
"dungeonssimple"
]

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

@@ -2,7 +2,8 @@
"checkboxes": {
"nobgm": { "type": "checkbox" },
"quickswap": { "type": "checkbox" },
"reduce_flashing": { "type": "checkbox" }
"reduce_flashing": { "type": "checkbox" },
"shuffle_sfx": { "type": "checkbox" }
},
"leftRomOptionsFrame": {
"heartcolor": {

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

@@ -1,7 +1,7 @@
{
"checkboxes": {
"retro": { "type": "checkbox" },
"bomblogic": { "type": "checkbox" },
"bombbag": { "type": "checkbox" },
"shopsanity": { "type": "checkbox" },
"hints": {
"type": "checkbox"

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

@@ -9,15 +9,21 @@
"full"
]
},
"overworldswap": {
"crossed": {
"type": "selectbox",
"default": "mixed",
"default": "vanilla",
"options": [
"vanilla",
"mixed",
"crossed"
"none",
"polar",
"grouped",
"limited",
"chaos"
]
},
"mixed": {
"type": "checkbox",
"default": true
},
"overworldflute": {
"type": "selectbox",
"default": "vanilla",