Updated baserom for crystal custscene and hera music fix
Updated a couple of error messages and when they are displayed Updated Ganonhunt goal text to be more consistent across randomizers
This commit is contained in:
@@ -1287,7 +1287,8 @@ def make_customizer_pool(world, player):
|
|||||||
bow_found = next((i for i in pool if i in {'Bow', 'Progressive Bow'}), None)
|
bow_found = next((i for i in pool if i in {'Bow', 'Progressive Bow'}), None)
|
||||||
if not bow_found:
|
if not bow_found:
|
||||||
missing_items.append('Progressive Bow')
|
missing_items.append('Progressive Bow')
|
||||||
logging.getLogger('').warning(f'The following items are not in the custom item pool {", ".join(missing_items)}')
|
if missing_items:
|
||||||
|
logging.getLogger('').warning(f'The following items are not in the custom item pool {", ".join(missing_items)}')
|
||||||
|
|
||||||
g, t = set_default_triforce(world.goal[player], world.treasure_hunt_count[player],
|
g, t = set_default_triforce(world.goal[player], world.treasure_hunt_count[player],
|
||||||
world.treasure_hunt_total[player])
|
world.treasure_hunt_total[player])
|
||||||
|
|||||||
4
Main.py
4
Main.py
@@ -628,7 +628,9 @@ def create_playthrough(world):
|
|||||||
|
|
||||||
logging.getLogger('').debug(world.fish.translate("cli", "cli", "building.calculating.spheres"), len(collection_spheres), len(sphere), len(prog_locations))
|
logging.getLogger('').debug(world.fish.translate("cli", "cli", "building.calculating.spheres"), len(collection_spheres), len(sphere), len(prog_locations))
|
||||||
if not sphere:
|
if not sphere:
|
||||||
logging.getLogger('').error(world.fish.translate("cli", "cli", "cannot.reach.items"), [world.fish.translate("cli","cli","cannot.reach.item") % (location.item.name, location.item.player, location.name, location.player) for location in sphere_candidates])
|
if world.accessibility[location.item.player] != 'none':
|
||||||
|
logging.getLogger('').error(world.fish.translate("cli", "cli", "cannot.reach.items"),
|
||||||
|
[world.fish.translate("cli","cli","cannot.reach.item") % (location.item.name, location.item.player, location.name, location.player) for location in sphere_candidates])
|
||||||
if any([location.name not in optional_locations and world.accessibility[location.item.player] != 'none' for location in sphere_candidates]):
|
if any([location.name not in optional_locations and world.accessibility[location.item.player] != 'none' for location in sphere_candidates]):
|
||||||
raise RuntimeError(world.fish.translate("cli", "cli", "cannot.reach.progression"))
|
raise RuntimeError(world.fish.translate("cli", "cli", "cannot.reach.progression"))
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -404,7 +404,7 @@ CLI: `--logic owglitches`
|
|||||||
New supported goals:
|
New supported goals:
|
||||||
|
|
||||||
* Trinity: Find one of 3 triforces to win. One is at pedestal. One is with Ganon. One is with Murahdahla who wants you to find 8 of 10 triforce pieces to complete.
|
* Trinity: Find one of 3 triforces to win. One is at pedestal. One is with Ganon. One is with Murahdahla who wants you to find 8 of 10 triforce pieces to complete.
|
||||||
* Triforce Hunt + Ganon: Collect the requisite triforce pieces, then defeat Ganon. (Aga2 not required). Use `ganonhunt` on CLI
|
* Ganonhunt: Collect the requisite triforce pieces, then defeat Ganon. (Aga2 not required). Use `ganonhunt` on CLI
|
||||||
* Completionist: All dungeons not enough for you? You have to obtain every item in the game too. This option turns on the collection rate counter and forces accessibility to be 100% locations. Finish by defeating Ganon.
|
* Completionist: All dungeons not enough for you? You have to obtain every item in the game too. This option turns on the collection rate counter and forces accessibility to be 100% locations. Finish by defeating Ganon.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ Please see [Customizer documentation](docs/Customizer.md) on how to create custo
|
|||||||
|
|
||||||
## New Goals
|
## New Goals
|
||||||
|
|
||||||
### Triforce Hunt + Ganon
|
### Ganonhunt
|
||||||
Collect the requisite triforce pieces, then defeat Ganon. (Aga2 not required). Use `ganonhunt` on CLI
|
Collect the requisite triforce pieces, then defeat Ganon. (Aga2 not required). Use `ganonhunt` on CLI
|
||||||
|
|
||||||
### Completionist
|
### Completionist
|
||||||
@@ -111,7 +111,10 @@ These are now independent of retro mode and have three options: None, Random, an
|
|||||||
|
|
||||||
* 1.2.0.18u
|
* 1.2.0.18u
|
||||||
* Fixed an issue with pyramid hole being in logic when it is not opened.
|
* Fixed an issue with pyramid hole being in logic when it is not opened.
|
||||||
*
|
* Crystal cutscene at GT use new symmetrical layouts (thanks Codemann)
|
||||||
|
* Fix for Hera Boss music (thanks Codemann)
|
||||||
|
* Fixed accessibility: none using a spoiling message
|
||||||
|
* Fixed warning message about custom item pool when it is fine
|
||||||
* 1.2.0.17u
|
* 1.2.0.17u
|
||||||
* Fixed logic bug that allowed Pearl to be behind Graveyard Cave or King's Tomb entrances with only Mirror and West Dark World access (cross world shuffles only)
|
* Fixed logic bug that allowed Pearl to be behind Graveyard Cave or King's Tomb entrances with only Mirror and West Dark World access (cross world shuffles only)
|
||||||
* Removed backup locations for Dungeon Only and Major Only algorithms. If item cannot be placed in the appropriate location, the seed will fail to generate instead
|
* Removed backup locations for Dungeon Only and Major Only algorithms. If item cannot be placed in the appropriate location, the seed will fail to generate instead
|
||||||
|
|||||||
2
Rom.py
2
Rom.py
@@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127
|
|||||||
|
|
||||||
|
|
||||||
JAP10HASH = '03a63945398191337e896e5771f77173'
|
JAP10HASH = '03a63945398191337e896e5771f77173'
|
||||||
RANDOMIZERBASEHASH = '9903cdfc3fc69112919ec49fb63e09ab'
|
RANDOMIZERBASEHASH = '467681d6160233f7af2761c631e26985'
|
||||||
|
|
||||||
|
|
||||||
class JsonRom(object):
|
class JsonRom(object):
|
||||||
|
|||||||
Binary file not shown.
@@ -241,7 +241,7 @@
|
|||||||
"randomizer.item.goal.triforcehunt": "Triforce Hunt",
|
"randomizer.item.goal.triforcehunt": "Triforce Hunt",
|
||||||
"randomizer.item.goal.trinity": "Trinity",
|
"randomizer.item.goal.trinity": "Trinity",
|
||||||
"randomizer.item.goal.crystals": "Crystals",
|
"randomizer.item.goal.crystals": "Crystals",
|
||||||
"randomizer.item.goal.ganonhunt": "Triforce Hunt + Ganon",
|
"randomizer.item.goal.ganonhunt": "Ganonhunt",
|
||||||
"randomizer.item.goal.completionist": "Completionist",
|
"randomizer.item.goal.completionist": "Completionist",
|
||||||
|
|
||||||
"randomizer.item.crystals_gt": "Crystals to open GT",
|
"randomizer.item.crystals_gt": "Crystals to open GT",
|
||||||
|
|||||||
Reference in New Issue
Block a user