Merge remote-tracking branch 'origin' into OverworldShuffle

This commit is contained in:
2023-09-04 18:35:36 -05:00
76 changed files with 4251 additions and 2604 deletions

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" }

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",

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"
]
}
}
}

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" }
}
}

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]
}
}
}
}

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]
}
}
}
}