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

Add files via upload

Browse Source
This commit is contained in:
Fouton
2021-03-12 16:57:42 -05:00
committed by GitHub
parent 0865288581
commit 2e07fc2dd0
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Main.py
View File

@@ -26,7 +26,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc
from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
from Utils import output_path, parse_player_names from Utils import output_path, parse_player_names
__version__ = '0.3.1.4-u' __version__ = '0.3.1.5-u'
class EnemizerError(RuntimeError): class EnemizerError(RuntimeError):
@@ -167,6 +167,9 @@ def main(args, seed=None, fish=None):
sell_potions(world, player) sell_potions(world, player)
if world.retro[player]: if world.retro[player]:
sell_keys(world, player) sell_keys(world, player)
else:
lock_shop_locations(world, player)
logger.info(world.fish.translate("cli","cli","placing.dungeon.prizes")) logger.info(world.fish.translate("cli","cli","placing.dungeon.prizes"))

2
Mystery.py
View File

@@ -171,6 +171,7 @@ def roll_settings(weights):
ret.openpyramid = goal == 'fast_ganon' if ret.shuffle in ['vanilla', 'dungeonsfull', 'dungeonssimple'] else False ret.openpyramid = goal == 'fast_ganon' if ret.shuffle in ['vanilla', 'dungeonsfull', 'dungeonssimple'] else False
ret.crystals_gt = get_choice('tower_open') ret.crystals_gt = get_choice('tower_open')
ret.crystals_ganon = get_choice('ganon_open') ret.crystals_ganon = get_choice('ganon_open')
if ret.goal == 'triforcehunt': if ret.goal == 'triforcehunt':
@@ -216,7 +217,6 @@ def roll_settings(weights):
ret.beemizer = int(get_choice('beemizer')) if 'beemizer' in weights else 0 ret.beemizer = int(get_choice('beemizer')) if 'beemizer' in weights else 0
inventoryweights = weights.get('startinventory', {}) inventoryweights = weights.get('startinventory', {})
startitems = [] startitems = []
for item in inventoryweights.keys(): for item in inventoryweights.keys():

7
Rom.py
View File

@@ -16,7 +16,7 @@ from BaseClasses import CollectionState, ShopType, Region, Location, Door, DoorT
from DoorShuffle import compass_data, DROptions, boss_indicator from DoorShuffle import compass_data, DROptions, boss_indicator
from Dungeons import dungeon_music_addresses from Dungeons import dungeon_music_addresses
from KeyDoorShuffle import count_locations_exclude_logic from KeyDoorShuffle import count_locations_exclude_logic
from Regions import location_table from Regions import location_table, shop_to_location_table
from RoomData import DoorKind from RoomData import DoorKind
from Text import MultiByteTextMapper, CompressedTextMapper, text_addresses, Credits, TextTable from Text import MultiByteTextMapper, CompressedTextMapper, text_addresses, Credits, TextTable
from Text import Uncle_texts, Ganon1_texts, TavernMan_texts, Sahasrahla2_texts, Triforce_texts, Blind_texts, BombShop2_texts, junk_texts from Text import Uncle_texts, Ganon1_texts, TavernMan_texts, Sahasrahla2_texts, Triforce_texts, Blind_texts, BombShop2_texts, junk_texts
@@ -1568,7 +1568,10 @@ def write_custom_shops(rom, world, player):
break break
if world.shopsanity[player] or shop.type == ShopType.TakeAny: if world.shopsanity[player] or shop.type == ShopType.TakeAny:
rom.write_byte(0x186560 + shop.sram_address + index, 1) rom.write_byte(0x186560 + shop.sram_address + index, 1)
item_id = ItemFactory(item['item'], player).code loc_item = world.get_location(shop_to_location_table[shop.region.name][index], player).item
if not loc_item:
loc_item = ItemFactory(item['item'], player)
item_id = loc_item.code
price = int16_as_bytes(item['price']) price = int16_as_bytes(item['price'])
replace = ItemFactory(item['replacement'], player).code if item['replacement'] else 0xFF replace = ItemFactory(item['replacement'], player).code if item['replacement'] else 0xFF
replace_price = int16_as_bytes(item['replacement_price']) replace_price = int16_as_bytes(item['replacement_price'])