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

Merge branch 'DoorDevUnstable' into Sandbox

Browse Source 
# 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
This commit is contained in:
aerinon
2023-04-05 16:26:26 -06:00
parent a0b781521f abb11558d8
commit 187478eb24
47 changed files with 2813 additions and 4065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

170
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": {
@@ -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]
}
}
}
}