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

Merge remote-tracking branch 'origin' into OverworldShuffle

Browse Source
This commit is contained in:
karafruit
2023-09-04 18:35:36 -05:00
parent 679cecbe28 196279b65f
commit 4459704252
76 changed files with 4251 additions and 2604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/app/gui/custom/overview/widgets.json
View File

@@ -1,4 +1,22 @@
{
"startHeader": {
"usestartinventory": {
"type": "checkbox",
"config": {
"padx": [10,0],
"pady": [10,10]
}
}
},
"customHeader": {
"usecustompool": {
"type": "checkbox",
"config": {
"padx": [10,0],
"pady": [10,10]
}
}
},
"itemList1": {
"bow": {
"type": "textbox",

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

@@ -57,25 +57,13 @@
"randomizer.dungeon.smallkeyshuffle.wild": "Randomized",
"randomizer.dungeon.smallkeyshuffle.universal": "Universal",
"randomizer.dungeon.bigkeyshuffle": "Big Keys",
"randomizer.dungeon.keydropshuffle": "Key Drop Shuffle (Legacy)",
"randomizer.dungeon.decoupledoors": "Decouple Doors",
"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.door_self_loops": "Allow Self-Looping Spiral Stairs",
"randomizer.dungeon.dungeondoorshuffle": "Dungeon Door Shuffle",
"randomizer.dungeon.dungeondoorshuffle.vanilla": "Vanilla",
"randomizer.dungeon.dungeondoorshuffle.basic": "Basic",
"randomizer.dungeon.dungeondoorshuffle.paired": "Paired",
"randomizer.dungeon.dungeondoorshuffle.partitioned": "Partitioned",
"randomizer.dungeon.dungeondoorshuffle.crossed": "Crossed",
@@ -123,7 +111,7 @@
"randomizer.enemizer.enemyshuffle.none": "None",
"randomizer.enemizer.enemyshuffle.shuffled": "Shuffled",
"randomizer.enemizer.enemyshuffle.random": "Random",
"randomizer.enemizer.enemyshuffle.legacy": "Random (including Thieves)",
"randomizer.enemizer.enemyshuffle.legacy": "Random (50/50 Thieves)",
"randomizer.enemizer.bossshuffle": "Boss Shuffle",
"randomizer.enemizer.bossshuffle.none": "None",
@@ -168,8 +156,6 @@
"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",
@@ -194,16 +180,12 @@
"randomizer.entrance.entranceshuffle.restricted": "Restricted",
"randomizer.entrance.entranceshuffle.full": "Full",
"randomizer.entrance.entranceshuffle.lean": "Lean",
"randomizer.entrance.entranceshuffle.swapped": "Swapped",
"randomizer.entrance.entranceshuffle.crossed": "Crossed",
"randomizer.entrance.entranceshuffle.insanity": "Insanity",
"randomizer.entrance.entranceshuffle.dungeonsfull": "Dungeons + Full",
"randomizer.entrance.entranceshuffle.dungeonssimple": "Dungeons + Simple",
"randomizer.entrance.take_any": "Take Any Caves",
"randomizer.entrance.take_any.none": "None",
"randomizer.entrance.take_any.random": "Random",
"randomizer.entrance.take_any.fixed": "Fixed",
"randomizer.gameoptions.nobgm": "Disable Music & MSU-1",
"randomizer.gameoptions.quickswap": "L/R Quickswapping",
"randomizer.gameoptions.reduce_flashing": "Reduce Flashing",
@@ -252,9 +234,6 @@
"randomizer.generation.createrom": "Create Patched ROM",
"randomizer.generation.calcplaythrough": "Calculate Playthrough",
"randomizer.generation.print_custom_yaml": "Print Customizer File",
"randomizer.generation.usestartinventory": "Use Starting Inventory",
"randomizer.generation.usecustompool": "Use Custom Item Pool",
"randomizer.generation.race": "Generate \"Race\" ROM",
"randomizer.generation.saveonexit": "Save Settings on Exit",
"randomizer.generation.saveonexit.ask": "Ask Me",
@@ -266,16 +245,17 @@
"randomizer.generation.rom.dialog.romfiles": "Rom Files",
"randomizer.generation.rom.dialog.allfiles": "All Files",
"randomizer.item.hints": "Include Helpful Hints",
"randomizer.item.hints": "Hints",
"randomizer.item.race": "Generate \"Race\" ROM",
"randomizer.item.retro": "Retro mode",
"randomizer.item.pseudoboots": "Start with Pseudo Boots",
"randomizer.item.bombbag": "Bombbag",
"randomizer.item.pseudoboots": "Pseudoboots",
"randomizer.item.worldstate": "World State",
"randomizer.item.worldstate.standard": "Standard",
"randomizer.item.worldstate.open": "Open",
"randomizer.item.worldstate.inverted": "Inverted",
"randomizer.item.worldstate.retro": "Retro",
"randomizer.item.retro": "Enable Retro",
"randomizer.item.logiclevel": "Logic Level",
"randomizer.item.logiclevel.noglitches": "No Glitches",
@@ -290,7 +270,7 @@
"randomizer.item.goal.triforcehunt": "Triforce Hunt",
"randomizer.item.goal.trinity": "Trinity",
"randomizer.item.goal.crystals": "Crystals",
"randomizer.item.goal.ganonhunt": "Triforce Hunt + Ganon",
"randomizer.item.goal.ganonhunt": "Ganonhunt",
"randomizer.item.goal.completionist": "Completionist",
"randomizer.item.crystals_gt": "Crystals to open GT",
@@ -342,25 +322,66 @@
"randomizer.item.weapons.bombs": "Bomb-Only",
"randomizer.item.weapons.vanilla": "Vanilla",
"randomizer.item.beemizer": "Beemizer",
"randomizer.item.beemizer.0": "No Bee Traps",
"randomizer.item.beemizer.1": "25% Bee Traps",
"randomizer.item.beemizer.2": "40% Traps, 20% Refills",
"randomizer.item.beemizer.3": "50% Traps, 50% Refills",
"randomizer.item.beemizer.4": "100% Bee Traps",
"randomizer.item.sortingalgo": "Item Fill",
"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.itempool": "Item Pool",
"randomizer.item.itempool.normal": "Normal",
"randomizer.item.itempool.hard": "Hard",
"randomizer.item.itempool.expert": "Expert",
"randomizer.item.accessibility": "Accessibility",
"randomizer.item.accessibility.items": "100% Inventory",
"randomizer.item.accessibility.locations": "100% Locations",
"randomizer.item.accessibility.none": "Beatable",
"randomizer.item.shopsanity": "Shopsanity",
"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",
"randomizer.item.itemfunction": "Item Functionality",
"randomizer.item.itemfunction.normal": "Normal",
"randomizer.item.itemfunction.hard": "Hard",
"randomizer.item.itemfunction.expert": "Expert",
"randomizer.item.timer": "Timer Setting",
"randomizer.item.timer.none": "No Timer",
"randomizer.item.timer.display": "Stopwatch",
"randomizer.item.timer.timed": "Timed",
"randomizer.item.timer.timed-ohko": "Timed OHKO",
"randomizer.item.timer.ohko": "OHKO",
"randomizer.item.timer.timed-countdown": "Timed Countdown",
"randomizer.item.shopsanity": "Shopsanity",
"randomizer.item.bonk_drops": "Bonk Drops",
"randomizer.item.pottery": "Pottery",
"randomizer.item.pottery.none": "None",
"randomizer.item.pottery.keys": "Key Pots",
"randomizer.item.pottery.cave": "Cave Pots",
"randomizer.item.pottery.cavekeys": "Cave+Key Pots",
"randomizer.item.pottery.reduced": "Reduced Dungeon Pots (Dynamic)",
"randomizer.item.pottery.clustered": "Clustered Dungeon Pots (Dynamic)",
"randomizer.item.pottery.nonempty": "Excludes Empty Pots",
"randomizer.item.pottery.dungeon": "Dungeon Pots",
"randomizer.item.pottery.lottery": "Lottery (All Pots and Large Blocks)",
"randomizer.item.colorizepots": "Colorize Randomized Pots",
"randomizer.item.potshuffle": "Pot Shuffle (Legacy)",
"randomizer.item.dropshuffle": "Shuffle Enemy Key Drops",
"randomizer.item.keydropshuffle": "Enable Key Drop Shuffle (Legacy)",
"randomizer.item.take_any": "Take Any Caves",
"randomizer.item.take_any.none": "None",
"randomizer.item.take_any.random": "Random",
"randomizer.item.take_any.fixed": "Fixed",
"randomizer.item.itempool": "Item Pool",
"randomizer.item.itempool.normal": "Normal",
"randomizer.item.itempool.hard": "Hard",
"randomizer.item.itempool.expert": "Expert",
"randomizer.item.flute_mode": "Flute Mode",
"randomizer.item.flute_mode.normal": "Normal",
"randomizer.item.flute_mode.active": "Pre-Activated",
@@ -371,30 +392,17 @@
"randomizer.item.bow_mode.retro": "Retro (Progressive)",
"randomizer.item.bow_mode.retro_silvers": "Retro + Silvers",
"randomizer.item.timer": "Timer Setting",
"randomizer.item.timer.none": "No Timer",
"randomizer.item.timer.display": "Stopwatch",
"randomizer.item.timer.timed": "Timed",
"randomizer.item.timer.timed-ohko": "Timed OHKO",
"randomizer.item.timer.ohko": "OHKO",
"randomizer.item.timer.timed-countdown": "Timed Countdown",
"randomizer.item.beemizer": "Beemizer",
"randomizer.item.beemizer.0": "No Bee Traps",
"randomizer.item.beemizer.1": "25% Bee Traps",
"randomizer.item.beemizer.2": "40% Traps, 20% Refills",
"randomizer.item.beemizer.3": "50% Traps, 50% Refills",
"randomizer.item.beemizer.4": "100% Bee Traps",
"randomizer.item.accessibility": "Accessibility",
"randomizer.item.accessibility.items": "100% Inventory",
"randomizer.item.accessibility.locations": "100% Locations",
"randomizer.item.accessibility.none": "Beatable",
"randomizer.item.bombbag": "Bombbag",
"randomizer.item.sortingalgo": "Item Sorting",
"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",
"startinventory.usestartinventory": "Use Starting Inventory",
"custom.usecustompool": "Use Custom Item Pool",
"bottom.content.worlds": "Worlds",
"bottom.content.names": "Player names",

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

@@ -1,5 +1,16 @@
{
"keysanity": {
"smallkeyshuffle": {
"type": "selectbox",
"options": [
"none",
"wild",
"universal"
],
"config": {
"padx": [20,0]
}
},
"mapshuffle": { "type": "checkbox" },
"compassshuffle": { "type": "checkbox" },
"bigkeyshuffle": { "type": "checkbox" }

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

@@ -1,12 +1,17 @@
{
"widgets": {
"smallkeyshuffle": {
"key_logic_algorithm": {
"type": "selectbox",
"default": "default",
"options": [
"none",
"wild",
"universal"
]
"default",
"partial",
"strict"
],
"config": {
"padx": [20,0],
"pady": [0,20]
}
},
"dungeondoorshuffle": {
"type": "selectbox",
@@ -28,7 +33,8 @@
"random"
],
"config": {
"width": 45
"width": 45,
"padx": [20,0]
}
},
"door_type_mode": {
@@ -41,7 +47,8 @@
"chaos"
],
"config": {
"width": 45
"width": 45,
"padx": [20,0]
}
},
"trap_door_mode": {
@@ -54,41 +61,23 @@
"oneway"
],
"config": {
"width": 30
"width": 30,
"padx": [20,0]
}
},
"key_logic_algorithm": {
"type": "selectbox",
"default": "default",
"options": [
"default",
"partial",
"strict"
]
},
"decoupledoors": { "type": "checkbox" },
"keydropshuffle": { "type": "checkbox" },
"pottery": {
"type": "selectbox",
"default": "none",
"options": [
"none",
"keys",
"cave",
"cavekeys",
"reduced",
"clustered",
"nonempty",
"dungeon",
"lottery"
],
"decoupledoors": {
"type": "checkbox",
"config": {
"width": 35
"padx": [20,0]
}
},
"door_self_loops": {
"type": "checkbox",
"config": {
"padx": [20,0],
"pady": [0,20]
}
},
"colorizepots": { "type": "checkbox" },
"dropshuffle": { "type": "checkbox" },
"potshuffle": { "type": "checkbox" },
"experimental": { "type": "checkbox" },
"dungeon_counters": {
"type": "selectbox",

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

@@ -1,6 +1,40 @@
{
"widgets": {
"openpyramid": {
"entranceshuffle": {
"type": "selectbox",
"options": [
"vanilla",
"simple",
"restricted",
"full",
"lite",
"lean",
"swapped",
"crossed",
"insanity",
"dungeonsfull",
"dungeonssimple"
]
},
"shuffleganon": {
"type": "checkbox",
"config": {
"padx": [20,0]
}
},
"shufflelinks": {
"type": "checkbox",
"config": {
"padx": [20,0]
}
},
"shuffletavern": {
"type": "checkbox",
"config": {
"padx": [20,0]
}
},
"openpyramid": {
"type": "selectbox",
"options": [
"auto",
@@ -8,20 +42,10 @@
"no"
],
"config": {
"width": 10
"width": 6,
"pady": [20,0]
}
},
"take_any": {
"type": "selectbox",
"options": [
"none",
"random",
"fixed"
]
},
"shuffleganon": { "type": "checkbox" },
"shufflelinks": { "type": "checkbox" },
"shuffletavern": { "type": "checkbox" },
"overworld_map": {
"type": "selectbox",
"options": [
@@ -32,21 +56,6 @@
"config": {
"width": 45
}
},
"entranceshuffle": {
"type": "selectbox",
"options": [
"vanilla",
"simple",
"restricted",
"full",
"lite",
"lean",
"crossed",
"insanity",
"dungeonsfull",
"dungeonssimple"
]
}
}
}

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

@@ -4,9 +4,6 @@
"bps": { "type": "checkbox" },
"createspoiler": { "type": "checkbox" },
"calcplaythrough": { "type": "checkbox" },
"print_custom_yaml": { "type": "checkbox" },
"usestartinventory": { "type": "checkbox" },
"usecustompool": { "type": "checkbox" },
"race": { "type": "checkbox" }
"print_custom_yaml": { "type": "checkbox" }
}
}

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

@@ -1,12 +1,8 @@
{
"checkboxes": {
"retro": { "type": "checkbox" },
"bombbag": { "type": "checkbox" },
"shopsanity": { "type": "checkbox" },
"hints": {
"type": "checkbox"
},
"pseudoboots": { "type": "checkbox" }
"hints": { "type": "checkbox" },
"pseudoboots": { "type": "checkbox" },
"race": { "type": "checkbox" }
},
"leftItemFrame": {
"worldstate": {
@@ -15,8 +11,7 @@
"options": [
"standard",
"open",
"inverted",
"retro"
"inverted"
]
},
"logiclevel": {
@@ -75,20 +70,44 @@
"somaria",
"byrna"
]
},
"weapons": {
"type": "selectbox",
"options": [
"random",
"assured",
"swordless",
"bombs",
"vanilla"
]
}
},
"rightItemFrame": {
"itempool": {
"retro": {
"type": "button",
"config": {
"command": "retro"
}
},
"sortingalgo": {
"type": "selectbox",
"default": "balanced",
"options": [
"balanced",
"vanilla_fill",
"major_only",
"dungeon_only",
"district"
]
},
"accessibility": {
"type": "selectbox",
"options": [
"items",
"locations",
"none"
]
},
"restrict_boss_items": {
"type": "selectbox",
"default": "none",
"options": [
"none",
"mapcompass",
"dungeon"
]
},
"itemfunction": {
"type": "selectbox",
"options": [
"normal",
@@ -96,7 +115,80 @@
"expert"
]
},
"itemfunction": {
"timer": {
"type": "selectbox",
"options": [
"none",
"display",
"timed",
"timed-ohko",
"ohko",
"timed-countdown"
]
}
},
"leftPoolHeader": {
"shopsanity": {
"type": "checkbox"
},
"bonk_drops": {
"type": "checkbox",
"default": false
}
},
"leftPoolFrame": {
"pottery": {
"type": "selectbox",
"default": "none",
"options": [
"none",
"keys",
"cave",
"cavekeys",
"reduced",
"clustered",
"nonempty",
"dungeon",
"lottery"
],
"config": {
"width": 35
}
},
"colorizepots": {
"type": "checkbox",
"config": {
"padx": [50,0]
}
},
"potshuffle": {
"type": "checkbox",
"config": {
"padx": [50,0]
}
},
"dropshuffle": {
"type": "checkbox"
}
},
"leftPoolFrame2": {
"keydropshuffle": {
"type": "button",
"config": {
"command": "keydropshuffle"
}
},
"take_any": {
"type": "selectbox",
"options": [
"none",
"random",
"fixed"
]
}
},
"rightPoolFrame": {
"itempool": {
"type": "selectbox",
"options": [
"normal",
@@ -120,50 +212,17 @@
"retro_silvers"
]
},
"timer": {
"type": "selectbox",
"options": [
"none",
"display",
"timed",
"timed-ohko",
"ohko",
"timed-countdown"
]
},
"accessibility": {
"type": "selectbox",
"options": [
"items",
"locations",
"none"
]
},
"sortingalgo": {
"type": "selectbox",
"default": "balanced",
"options": [
"balanced",
"vanilla_fill",
"major_only",
"dungeon_only",
"district"
]
},
"restrict_boss_items": {
"type": "selectbox",
"default": "none",
"options": [
"none",
"mapcompass",
"dungeon"
]
},
"beemizer": {
"type": "selectbox",
"options": [
"0", "1", "2", "3", "4"
]
},
"bombbag": {
"type": "checkbox",
"config": {
"padx": [64,0]
}
}
}
}

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

@@ -1,10 +1,5 @@
{
"topOverworldFrame": {
"bonk_drops": {
"type": "checkbox",
"default": false
}
},
"topOverworldFrame": {},
"leftOverworldFrame": {
"overworldshuffle": {
"type": "selectbox",
@@ -28,11 +23,17 @@
},
"mixed": {
"type": "checkbox",
"default": false
"default": false,
"config": {
"padx": [79,0]
}
},
"whirlpool": {
"type": "checkbox",
"default": false
"default": false,
"config": {
"padx": [79,0]
}
},
"overworldflute": {
"type": "selectbox",
@@ -41,17 +42,26 @@
"vanilla",
"balanced",
"random"
]
],
"config": {
"pady": [20,0]
}
}
},
"rightOverworldFrame": {
"terrain": {
"type": "checkbox",
"default": false
"default": false,
"config": {
"pady": [3,0]
}
},
"keepsimilar": {
"type": "checkbox",
"default": false
"default": false,
"config": {
"pady": [6,0]
}
}
}
}