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

Baserom update (colletion rate counter for mystery)

Browse Source 
Minor issue with customizer/mystery yamls and booleans
This commit is contained in:
aerinon
2023-09-26 13:40:22 -06:00
parent 915e7dc416
commit f4c465f5c3
5 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main.py
View File

@@ -37,7 +37,7 @@ from source.enemizer.DamageTables import DamageTable
from source.enemizer.Enemizer import randomize_enemies
from source.rom.DataTables import init_data_tables
version_number = '1.3.0.2'
version_number = '1.3.0.3'
version_branch = '-v'
__version__ = f'{version_number}{version_branch}'

9
RELEASENOTES.md
View File

@@ -141,6 +141,15 @@ These are now independent of retro mode and have three options: None, Random, an
# Bug Fixes and Notes
* 1.3.0.3v
* Faeries now part of the enemy shuffle pool. Take note, this will increase enemy drop locations to include fairy pools both in dungeons and in caves.
* Enemy drop indicator (blue square) now works in caves based on entrance used
* Fixes:
* Collection rate counter is properly hidden in mystery seeds
* Sprite limit lowered where possible to allow for lifting of pots
* Hovers in Swamp Waterway properly do not drop items anymore
* Lots more bans (thanks to jsd in particular but also thanks to all the reports)
* Minor issue with customizer/mystery files not allowing "true" for booleans
* 1.3.0.2v
* Fix for multiworld received keys not counting correctly
* Fix for multiworld lamps incorrect graphics

2
Rom.py
View File

@@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '6fbf895bae14a0c74ec8dc782d3b9a95'
RANDOMIZERBASEHASH = '8f9863c742096d16cae181fe314be3d7'
class JsonRom(object):

BIN
data/base2current.bps
View File

Binary file not shown.

36
source/tools/MysteryUtils.py
View File

@@ -86,25 +86,25 @@ def roll_settings(weights):
ret.door_type_mode = get_choice('door_type_mode')
ret.trap_door_mode = get_choice('trap_door_mode')
ret.key_logic_algorithm = get_choice('key_logic_algorithm')
ret.decoupledoors = get_choice('decoupledoors') == 'on'
ret.experimental = get_choice('experimental') == 'on'
ret.collection_rate = get_choice('collection_rate') == 'on'
ret.decoupledoors = get_choice('decoupledoors')
ret.experimental = get_choice('experimental')
ret.collection_rate = get_choice('collection_rate')
ret.dungeon_counters = get_choice('dungeon_counters') if 'dungeon_counters' in weights else 'default'
if ret.dungeon_counters == 'default':
ret.dungeon_counters = 'pickup' if ret.door_shuffle != 'vanilla' or ret.compassshuffle == 'on' else 'off'
ret.shufflelinks = get_choice('shufflelinks') == 'on'
ret.shuffletavern = get_choice('shuffletavern') == 'on'
ret.pseudoboots = get_choice('pseudoboots') == 'on'
ret.shopsanity = get_choice('shopsanity') == 'on'
keydropshuffle = get_choice('keydropshuffle') == 'on'
ret.shufflelinks = get_choice('shufflelinks')
ret.shuffletavern = get_choice('shuffletavern')
ret.pseudoboots = get_choice('pseudoboots')
ret.shopsanity = get_choice('shopsanity')
keydropshuffle = get_choice('keydropshuffle')
ret.dropshuffle = get_choice('dropshuffle') if 'dropshuffle' in weights else 'none'
ret.dropshuffle = 'keys' if ret.dropshuffle == 'none' and keydropshuffle else ret.dropshuffle
ret.pottery = get_choice('pottery') if 'pottery' in weights else 'none'
ret.pottery = 'keys' if ret.pottery == 'none' and keydropshuffle else ret.pottery
ret.colorizepots = get_choice_default('colorizepots', default='on') == 'on'
ret.shufflepots = get_choice('pot_shuffle') == 'on'
ret.colorizepots = get_choice_default('colorizepots', default=True)
ret.shufflepots = get_choice('pot_shuffle')
ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent'
ret.standardize_palettes = (get_choice('standardize_palettes') if 'standardize_palettes' in weights
else 'standardize')
@@ -139,12 +139,12 @@ def roll_settings(weights):
if ret.mode == 'retro':
ret.mode = 'open'
ret.retro = True
ret.retro = get_choice('retro') == 'on' # this overrides world_state if used
ret.retro = get_choice('retro') # this overrides world_state if used
ret.take_any = get_choice_default('take_any', default='none')
ret.bombbag = get_choice('bombbag') == 'on'
ret.bombbag = get_choice('bombbag')
ret.hints = get_choice('hints') == 'on'
ret.hints = get_choice('hints')
swords = get_choice('weapons')
if swords is not None:
@@ -197,15 +197,15 @@ def roll_settings(weights):
if 'rom' in weights:
romweights = weights['rom']
ret.sprite = get_choice('sprite', romweights)
ret.disablemusic = get_choice('disablemusic', romweights) == 'on'
ret.quickswap = get_choice('quickswap', romweights) == 'on'
ret.reduce_flashing = get_choice('reduce_flashing', romweights) == 'on'
ret.disablemusic = get_choice('disablemusic', romweights)
ret.quickswap = get_choice('quickswap', romweights)
ret.reduce_flashing = get_choice('reduce_flashing', romweights)
ret.fastmenu = get_choice('menuspeed', romweights)
ret.heartcolor = get_choice('heartcolor', romweights)
ret.heartbeep = get_choice('heartbeep', romweights)
ret.ow_palettes = get_choice('ow_palettes', romweights)
ret.uw_palettes = get_choice('uw_palettes', romweights)
ret.shuffle_sfx = get_choice('shuffle_sfx', romweights) == 'on'
ret.msu_resume = get_choice('msu_resume', romweights) == 'on'
ret.shuffle_sfx = get_choice('shuffle_sfx', romweights)
ret.msu_resume = get_choice('msu_resume', romweights)
return ret