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

Merge branch 'DoorDevUnstable' into Sandbox

Browse Source 
# Conflicts:
#	ItemList.py
#	Items.py
#	Main.py
#	Rom.py
#	data/base2current.bps
This commit is contained in:
aerinon
2023-03-10 13:43:38 -07:00
parent 57c479e1c2 c48c89f65b
commit 4aae603462
63 changed files with 4599 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resources/app/cli/args.json
View File

@@ -34,6 +34,10 @@
"retro"
]
},
"boots_hint": {
"action": "store_true",
"type": "bool"
},
"swords": {
"choices": [
"random",
@@ -63,7 +67,9 @@
"dungeons",
"triforcehunt",
"trinity",
"crystals"
"crystals",
"ganonhunt",
"completionist"
]
},
"difficulty": {
@@ -190,6 +196,21 @@
"chaos"
]
},
"trap_door_mode": {
"choices": [
"vanilla",
"optional",
"boss",
"oneway"
]
},
"key_logic_algorithm": {
"choices": [
"default",
"partial",
"strict"
]
},
"decoupledoors": {
"action": "store_true",
"type": "bool"

18
resources/app/cli/lang/en.json
View File

@@ -107,7 +107,10 @@
"Triforce Hunt: Places 30 Triforce Pieces in the world, collect",
" 20 of them to beat the game.",
"Trinity: Can beat the game by defeating Ganon, pulling",
" Pedestal, or delivering Triforce Pieces."
" Pedestal, or delivering Triforce Pieces.",
"Ganon Hunt: Places 30 Triforce Pieces in the world, collect",
" 20 of them then defeat Ganon.",
"Completionist: Find everything then defeat Ganon."
],
"difficulty": [
"Select game difficulty. Affects available itempool. (default: %(default)s)",
@@ -236,6 +239,19 @@
"all: Adds traps doors (and any future supported door types)",
"chaos: Increases the number of door types in all dungeon pools"
],
"trap_door_mode" : [
"Trap Door Removal (default: %(default)s)",
"vanilla: No trap door removal",
"optional: Trap doors removed if blocking",
"boss: Also remove boss traps",
"oneway: Remove all annoying trap doors"
],
"key_logic_algorithm": [
"Key Logic Algorithm (default: %(default)s)",
"default: Balance between safety and randomization",
"partial: Partial protection when using certain minor glitches",
"strict: Ensure small keys are available"
],
"decoupledoors" : [ "Door entrances and exits are decoupled" ],
"experimental": [ "Enable experimental features. (default: %(default)s)" ],
"dungeon_counters": [ "Enable dungeon chest counters. (default: %(default)s)" ],

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

@@ -94,6 +94,17 @@
"randomizer.dungeon.door_type_mode.all": "Adds Trap Doors",
"randomizer.dungeon.door_type_mode.chaos": "Increases all door types",
"randomizer.dungeon.trap_door_mode": "Trap Door Removal",
"randomizer.dungeon.trap_door_mode.vanilla": "No Removal",
"randomizer.dungeon.trap_door_mode.optional": "Removed If Blocking Path",
"randomizer.dungeon.trap_door_mode.boss": "Also Remove Boss Traps",
"randomizer.dungeon.trap_door_mode.oneway": "Remove All Annoying Traps",
"randomizer.dungeon.key_logic_algorithm": "Key Logic Algorithm",
"randomizer.dungeon.key_logic_algorithm.default": "Default",
"randomizer.dungeon.key_logic_algorithm.partial": "Partial Protection",
"randomizer.dungeon.key_logic_algorithm.strict": "Strict",
"randomizer.dungeon.experimental": "Enable Experimental Features",
"randomizer.dungeon.dungeon_counters": "Dungeon Chest Counters",
@@ -216,6 +227,7 @@
"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",
@@ -251,6 +263,8 @@
"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.completionist": "Completionist",
"randomizer.item.crystals_gt": "Crystals to open GT",
"randomizer.item.crystals_gt.0": "0",

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

@@ -1,6 +1,6 @@
{
"widgets": {
"keyshuffle": {
"smallkeyshuffle": {
"type": "selectbox",
"options": [
"none",
@@ -33,7 +33,7 @@
},
"door_type_mode": {
"type": "selectbox",
"default": "basic",
"default": "original",
"options": [
"original",
"big",
@@ -44,6 +44,28 @@
"width": 45
}
},
"trap_door_mode": {
"type": "selectbox",
"default": "optional",
"options": [
"vanilla",
"optional",
"boss",
"oneway"
],
"config": {
"width": 30
}
},
"key_logic_algorithm": {
"type": "selectbox",
"default": "default",
"options": [
"default",
"partial",
"strict"
]
},
"decoupledoors": { "type": "checkbox" },
"keydropshuffle": { "type": "checkbox" },
"pottery": {

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

@@ -6,6 +6,7 @@
"calcplaythrough": { "type": "checkbox" },
"print_custom_yaml": { "type": "checkbox" },
"usestartinventory": { "type": "checkbox" },
"usecustompool": { "type": "checkbox" }
"usecustompool": { "type": "checkbox" },
"race": { "type": "checkbox" }
}
}

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

@@ -36,7 +36,9 @@
"dungeons",
"triforcehunt",
"trinity",
"crystals"
"crystals",
"ganonhunt",
"completionist"
]
},
"crystals_gt": {

2
resources/ci/common/install.py
View File

@@ -6,7 +6,7 @@ import subprocess # do stuff at the shell level
env = common.prepare_env()
pip_requirements = os.path.join("..","resources","app","meta","manifests","pip_requirements.txt")
pip_requirements = os.path.join(".","resources","app","meta","manifests","pip_requirements.txt")
if not os.path.isfile(pip_requirements):
pip_requirements = os.path.join("..","..","..","resources","app","meta","manifests","pip_requirements.txt")