Merge branch 'DoorDevUnstable' into Sandbox

# Conflicts: # Gui.py # Main.py # Rom.py # Rules.py # data/base2current.bps # resources/app/gui/lang/en.json # resources/app/gui/randomize/dungeon/widgets.json
2023-04-05 16:26:26 -06:00
parent a0b781521f abb11558d8
commit 187478eb24
47 changed files with 2813 additions and 4065 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -243,8 +243,11 @@
    ]
  },
  "openpyramid": {
-    "action": "store_true",
-    "type": "bool"
+    "choices": [
+      "auto",
+      "yes",
+      "no"
+    ]
  },
  "rom": {},
  "loglevel": {
--- a/resources/app/gui/custom/overview/widgets.json
+++ b/resources/app/gui/custom/overview/widgets.json
@@ -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",
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -57,24 +57,7 @@
    "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 Drops",
-    "randomizer.dungeon.none": "None",
-    "randomizer.dungeon.keys": "Small Key Enemies",
-    "randomizer.dungeon.underworld": "Underworld Enemies",
-    "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",
@@ -126,7 +109,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",
@@ -150,8 +133,10 @@
    "randomizer.enemizer.enemizercli": "EnemizerCLI path: ",
    "randomizer.enemizer.enemizercli.online": "(get online)",

-
    "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.shuffletavern": "Include the back of the tavern in the entrance shuffle pool",
@@ -172,11 +157,6 @@
    "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",
@@ -225,9 +205,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",
@@ -239,10 +216,10 @@
    "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",
@@ -294,20 +271,70 @@
    "randomizer.item.weapons.swordless": "Swordless",
    "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.accessibility": "Accessibility",
+    "randomizer.item.accessibility.items": "100% Inventory",
+    "randomizer.item.accessibility.locations": "100% Locations",
+    "randomizer.item.accessibility.none": "Beatable",
+
+    "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 Drops",
+    "randomizer.item.dropshuffle.none": "None",
+    "randomizer.item.dropshuffle.keys": "Small Key Enemies",
+    "randomizer.item.dropshuffle.underworld": "Underworld Enemies",
+    "randomizer.item.keydropshuffle": "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.shopsanity": "Shopsanity",
-
    "randomizer.item.flute_mode": "Flute Mode",
    "randomizer.item.flute_mode.normal": "Normal",
    "randomizer.item.flute_mode.active": "Pre-Activated",
@@ -318,30 +345,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",
--- a/resources/app/gui/randomize/dungeon/keysanity.json
+++ b/resources/app/gui/randomize/dungeon/keysanity.json
@@ -1,5 +1,13 @@
 {
  "keysanity": {
+    "smallkeyshuffle": {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "wild",
+        "universal"
+      ]
+    },
    "mapshuffle":       { "type": "checkbox" },
    "compassshuffle":   { "type": "checkbox" },
    "bigkeyshuffle":    { "type": "checkbox" }
--- a/resources/app/gui/randomize/dungeon/widgets.json
+++ b/resources/app/gui/randomize/dungeon/widgets.json
@@ -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,48 +61,17 @@
        "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],
+        "pady": [0,20]
      }
    },
-    "colorizepots": { "type": "checkbox" },
-    "dropshuffle": {
-      "type": "selectbox",
-      "default": "none",
-      "options": [
-        "none",
-        "keys",
-        "underworld"
-      ]},
-    "potshuffle": { "type": "checkbox" },
    "experimental": { "type": "checkbox" },
    "dungeon_counters": {
      "type": "selectbox",
--- a/resources/app/gui/randomize/entrando/widgets.json
+++ b/resources/app/gui/randomize/entrando/widgets.json
@@ -1,24 +1,50 @@
 {
  "widgets": {
-    "openpyramid":      { "type": "checkbox" },
-    "shuffleganon":     { "type": "checkbox" },
    "entranceshuffle":  {
      "type": "selectbox",
      "options": [
        "vanilla",
-        "lite",
-        "lean",
        "simple",
        "restricted",
        "full",
+        "lite",
+        "lean",
        "crossed",
        "insanity",
        "dungeonsfull",
        "dungeonssimple"
      ]
    },
-    "shufflelinks":     { "type": "checkbox" },
-    "shuffletavern":     { "type": "checkbox" },
+    "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",
+        "yes",
+        "no"
+      ],
+      "config": {
+        "width": 6,
+        "pady": [20,0]
+      }
+    },
    "overworld_map": {
      "type": "selectbox",
      "options": [
@@ -29,14 +55,6 @@
      "config": {
        "width": 45
      }
-    },
-    "take_any":  {
-      "type": "selectbox",
-      "options": [
-        "none",
-        "random",
-        "fixed"
-      ]
    }
  }
 }
--- a/resources/app/gui/randomize/generation/checkboxes.json
+++ b/resources/app/gui/randomize/generation/checkboxes.json
@@ -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" }
  }
 }
--- a/resources/app/gui/randomize/item/widgets.json
+++ b/resources/app/gui/randomize/item/widgets.json
@@ -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": {
@@ -17,7 +13,10 @@
        "open",
        "inverted",
        "retro"
-      ]
+      ],
+      "config": {
+        "command": "worldstate"
+      }
    },
    "logiclevel": {
      "type": "selectbox",
@@ -63,15 +62,117 @@
        "swordless",
        "vanilla"
      ]
-    },
-    "beemizer": {
-      "type": "selectbox",
-      "options": [
-        "0", "1", "2", "3", "4"
-      ]
    }
  },
  "rightItemFrame": {
+    "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",
+        "hard",
+        "expert"
+      ]
+    },
+    "timer": {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "display",
+        "timed",
+        "timed-ohko",
+        "ohko",
+        "timed-countdown"
+      ]
+    }
+  },
+  "leftPoolHeader": {
+    "shopsanity": {
+      "type": "checkbox"
+    }
+  },
+  "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": "selectbox",
+      "default": "none",
+      "options": [
+        "none",
+        "keys",
+        "underworld"
+    ]},
+    "keydropshuffle": {
+      "type": "checkbox",
+      "config": {
+        "command": "keydropshuffle"
+      }
+    },
+    "take_any":  {
+      "type": "selectbox",
+      "options": [
+        "none",
+        "random",
+        "fixed"
+      ]
+    }
+  },
+  "rightPoolFrame": {
    "itempool": {
      "type": "selectbox",
      "options": [
@@ -96,44 +197,17 @@
        "retro_silvers"
      ]
    },
-    "timer": {
+    "beemizer": {
      "type": "selectbox",
      "options": [
-        "none",
-        "display",
-        "timed",
-        "timed-ohko",
-        "ohko",
-        "timed-countdown"
+        "0", "1", "2", "3", "4"
      ]
    },
-    "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"
-      ]
+    "bombbag": {
+      "type": "checkbox",
+      "config": {
+        "padx": [64,0]
+      }
    }
  }
 }