Merge branch 'OriginOverworldShuffle' into OverworldShuffle

This commit is contained in:
2024-02-28 16:53:09 -06:00
98 changed files with 9378 additions and 1273 deletions

View File

@@ -23,6 +23,7 @@
"noglitches",
"minorglitches",
"owglitches",
"hybridglitches",
"nologic"
]
},
@@ -184,8 +185,7 @@
"none",
"grouped",
"polar",
"limited",
"chaos"
"unrestricted"
]
},
"ow_keepsimilar": {
@@ -219,6 +219,7 @@
"full",
"lite",
"lean",
"district",
"swapped",
"crossed",
"insanity",
@@ -378,6 +379,14 @@
"action": "store_true",
"type": "bool"
},
"shuffle_sfxinstruments": {
"action": "store_true",
"type": "bool"
},
"shuffle_songinstruments": {
"action": "store_true",
"type": "bool"
},
"msu_resume": {
"action": "store_true",
"type": "bool"
@@ -603,11 +612,15 @@
"action": "store_true",
"type": "bool"
},
"saveonexit": {
"aga_randomness": {
"action": "store_false",
"type": "bool"
},
"settingsonload": {
"choices": [
"ask",
"always",
"never"
"default",
"saved",
"lastused"
]
},
"outputname": {},

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 Overworld Randomizer Version %s : --seed %s --code %s",
"version": "Version",
"seed": "Seed",
"player": "Player",
@@ -56,7 +56,8 @@
"building.collection.spheres": "Building up collection spheres",
"building.calculating.spheres": "Calculated sphere %i, containing %i of %i progress items.",
"building.final.spheres": "Calculated final sphere %i, containing %i of %i progress items.",
"old.python.version": "Door Rando may have issues with python versions earlier than 3.7. Detected version: %s"
"old.python.version": "Door Rando may have issues with python versions earlier than 3.7. Detected version: %s",
"hybridglitches.door.shuffle": "Hybrid Major Glitches is not currently compatible with Door Shuffle."
},
"help": {
"lang": [ "App Language, if available, defaults to English" ],
@@ -64,11 +65,13 @@
"bps": [ "Output BPS patches instead of ROMs"],
"logic": [
"Select Enforcement of Item Requirements. (default: %(default)s)",
"No Glitches: No Glitch knowledge required.",
"Minor Glitches: May require Fake Flippers, Bunny Revival",
" and Dark Room Navigation.",
"No Logic: Distribute items without regard for",
" item requirements."
"No Glitches: No Glitch knowledge required.",
"Minor Glitches: May require Fake Flippers, Bunny Revival",
" and Dark Room Navigation.",
"Overworld Glitches: May require overworld clips and teleports.",
"Hybrid Major Glitches: May require underworld clips.",
"No Logic: Distribute items without regard for",
" item requirements."
],
"mode": [
"Select game mode. (default: %(default)s)",
@@ -209,6 +212,7 @@
" item locations are shuffled in separate pools. Non-item",
" locations remain vanilla. Connectors are same-world.",
"Lean: Same as Lite, except connectors can travel cross worlds.",
"District: Entrances are shuffled within their overworld districts.",
"Crossed: Mix cave and dungeon entrances freely while allowing",
" caves to cross between worlds.",
"Swapped: Same as Crossed, but entrances switch places in pairs.",
@@ -239,9 +243,7 @@
" walk around and access the other plane version by walking.",
"Polar: Only used when Tile Flip is enabled. This retains original",
" connections even when overworld tiles are flipped.",
"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",
"Unrestricted: Every transition has a 50/50 chance to become a",
" crossworld connection."
],
"ow_keepsimilar": [
@@ -377,6 +379,7 @@
"Random: Take any caves can replace a random set of un-interesting caves. See documentation for full list",
"Fixed: Take any caves will replace certain location. See documentation for full list"
],
"collection_rate": [ "Display collection rate (default: %(default)s)" ],
"pseudoboots": [ " Start with pseudo boots that allow dashing but no item checks (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)" ],
@@ -426,8 +429,9 @@
],
"reduce_flashing": [ "Reduce some in-game flashing (default: %(default)s)" ],
"shuffle_sfx": [ "Shuffle sounds effects (default: %(default)s)" ],
"shuffle_sfxinstruments": [ "Shuffle sound instruments (default: %(default)s)" ],
"shuffle_songinstruments": [ "Shuffle song instruments (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": [

View File

@@ -4,7 +4,9 @@
"msu_resume": { "type": "checkbox" },
"quickswap": { "type": "checkbox" },
"reduce_flashing": {"type": "checkbox" },
"shuffle_sfx": {"type": "checkbox" }
"shuffle_sfx": {"type": "checkbox" },
"shuffle_sfxinstruments": {"type": "checkbox" },
"shuffle_songinstruments": {"type": "checkbox" }
},
"leftAdjustFrame": {
"heartcolor": {

View File

@@ -4,6 +4,8 @@
"adjust.quickswap": "L/R Quickswapping",
"adjust.reduce_flashing": "Reduce Flashing",
"adjust.shuffle_sfx": "Shuffle Sound Effects",
"adjust.shuffle_sfxinstruments": "Shuffle Sound Instruments",
"adjust.shuffle_songinstruments": "Shuffle Song Instruments",
"adjust.msu_resume": "MSU Resume",
"adjust.heartcolor": "Heart Color",
@@ -147,8 +149,7 @@
"randomizer.overworld.crossed.none": "None",
"randomizer.overworld.crossed.grouped": "Grouped",
"randomizer.overworld.crossed.polar": "Polar",
"randomizer.overworld.crossed.limited": "Limited",
"randomizer.overworld.crossed.chaos": "Chaos",
"randomizer.overworld.crossed.unrestricted": "Unrestricted",
"randomizer.overworld.keepsimilar": "Keep Similar Edges Together",
@@ -180,6 +181,7 @@
"randomizer.entrance.entranceshuffle.restricted": "Restricted",
"randomizer.entrance.entranceshuffle.full": "Full",
"randomizer.entrance.entranceshuffle.lean": "Lean",
"randomizer.entrance.entranceshuffle.district": "District",
"randomizer.entrance.entranceshuffle.swapped": "Swapped",
"randomizer.entrance.entranceshuffle.crossed": "Crossed",
"randomizer.entrance.entranceshuffle.insanity": "Insanity",
@@ -190,8 +192,9 @@
"randomizer.gameoptions.quickswap": "L/R Quickswapping",
"randomizer.gameoptions.reduce_flashing": "Reduce Flashing",
"randomizer.gameoptions.shuffle_sfx": "Shuffle Sound Effects",
"randomizer.gameoptions.shuffle_sfxinstruments": "Shuffle Sound Instruments",
"randomizer.gameoptions.shuffle_songinstruments": "Shuffle Song Instruments",
"randomizer.gameoptions.msu_resume": "MSU Resume",
"randomizer.gameoptions.collection_rate": "Display Collection Rate",
"randomizer.gameoptions.heartcolor": "Heart Color",
"randomizer.gameoptions.heartcolor.red": "Red",
@@ -235,10 +238,10 @@
"randomizer.generation.calcplaythrough": "Calculate Playthrough",
"randomizer.generation.print_custom_yaml": "Print Customizer File",
"randomizer.generation.saveonexit": "Save Settings on Exit",
"randomizer.generation.saveonexit.ask": "Ask Me",
"randomizer.generation.saveonexit.always": "Always",
"randomizer.generation.saveonexit.never": "Never",
"randomizer.generation.settingsonload": "Settings On Load",
"randomizer.generation.settingsonload.default": "Default",
"randomizer.generation.settingsonload.saved": "Saved",
"randomizer.generation.settingsonload.lastused": "Last Used",
"randomizer.generation.rom": "Base Rom: ",
"randomizer.generation.rom.button": "Select Rom",
@@ -249,6 +252,7 @@
"randomizer.item.race": "Generate \"Race\" ROM",
"randomizer.item.retro": "Retro mode",
"randomizer.item.pseudoboots": "Pseudoboots",
"randomizer.item.collection_rate": "Display Collection Rate",
"randomizer.item.worldstate": "World State",
"randomizer.item.worldstate.standard": "Standard",
@@ -261,6 +265,7 @@
"randomizer.item.logiclevel.noglitches": "No Glitches",
"randomizer.item.logiclevel.minorglitches": "Minor Glitches",
"randomizer.item.logiclevel.owglitches": "Overworld Glitches",
"randomizer.item.logiclevel.hybridglitches": "Hybrid Major Glitches",
"randomizer.item.logiclevel.nologic": "No Logic",
"randomizer.item.goal": "Goal",
@@ -408,11 +413,13 @@
"bottom.content.names": "Player names",
"bottom.content.seed": "Seed #",
"bottom.content.generationcount": "Count",
"bottom.content.go": "Generate Patched Rom",
"bottom.content.go": "Generate Game",
"bottom.content.exportyaml": "Export Yaml",
"bottom.content.dialog.error": "Error while creating seed",
"bottom.content.dialog.success": "Success",
"bottom.content.dialog.success.message": "Rom created successfully.",
"bottom.content.outputdir": "Open Output Directory",
"bottom.content.savesettings": "Save Settings",
"bottom.content.outputdir": "Select Destination",
"bottom.content.docs": "Open Documentation"
}
}

View File

@@ -9,6 +9,7 @@
"full",
"lite",
"lean",
"district",
"swapped",
"crossed",
"insanity",

View File

@@ -2,10 +2,11 @@
"checkboxes": {
"nobgm": { "type": "checkbox" },
"msu_resume": { "type": "checkbox" },
"collection_rate": {"type": "checkbox"},
"quickswap": { "type": "checkbox" },
"reduce_flashing": { "type": "checkbox" },
"shuffle_sfx": { "type": "checkbox" }
"shuffle_sfx": { "type": "checkbox" },
"shuffle_sfxinstruments": { "type": "checkbox" },
"shuffle_songinstruments": { "type": "checkbox" }
},
"leftRomOptionsFrame": {
"heartcolor": {

View File

@@ -1,11 +1,11 @@
{
"widgets": {
"saveonexit": {
"settingsonload": {
"type": "selectbox",
"options": [
"ask",
"always",
"never"
"default",
"saved",
"lastused"
]
}
}

View File

@@ -2,6 +2,7 @@
"checkboxes": {
"hints": { "type": "checkbox" },
"pseudoboots": { "type": "checkbox" },
"collection_rate": {"type": "checkbox"},
"race": { "type": "checkbox" }
},
"leftItemFrame": {
@@ -20,6 +21,7 @@
"noglitches",
"minorglitches",
"owglitches",
"hybridglitches",
"nologic"
]
},

View File

@@ -17,8 +17,7 @@
"none",
"grouped",
"polar",
"limited",
"chaos"
"unrestricted"
]
},
"mixed": {