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

Fixed early rupee money balancing to make item free if <20 rupees available

Browse Source
This commit is contained in:
codemann8
2022-08-12 01:53:13 -05:00
parent 85fe7d1d04
commit 3aa97ee8bc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Fill.py
View File

@@ -750,12 +750,14 @@ def balance_multiworld_progression(world):
raise RuntimeError('Not all required items reachable. Something went terribly wrong here.') raise RuntimeError('Not all required items reachable. Something went terribly wrong here.')
def check_shop_swap(l): def check_shop_swap(l, make_item_free=False):
if l.parent_region.name in shop_to_location_table: if l.parent_region.name in shop_to_location_table:
if l.name in shop_to_location_table[l.parent_region.name]: if l.name in shop_to_location_table[l.parent_region.name]:
idx = shop_to_location_table[l.parent_region.name].index(l.name) idx = shop_to_location_table[l.parent_region.name].index(l.name)
inv_slot = l.parent_region.shop.inventory[idx] inv_slot = l.parent_region.shop.inventory[idx]
inv_slot['item'] = l.item.name inv_slot['item'] = l.item.name
if make_item_free:
inv_slot['price'] = 0
elif l.parent_region in retro_shops: elif l.parent_region in retro_shops:
idx = retro_shops[l.parent_region.name].index(l.name) idx = retro_shops[l.parent_region.name].index(l.name)
inv_slot = l.parent_region.shop.inventory[idx] inv_slot = l.parent_region.shop.inventory[idx]
@@ -921,12 +923,13 @@ def balance_money_progression(world):
if len(increase_targets) == 0: if len(increase_targets) == 0:
raise Exception('No early sphere swaps for rupees - money grind would be required - bailing for now') raise Exception('No early sphere swaps for rupees - money grind would be required - bailing for now')
best_target = min(increase_targets, key=lambda t: rupee_chart[t.item.name] if t.item.name in rupee_chart else 0) best_target = min(increase_targets, key=lambda t: rupee_chart[t.item.name] if t.item.name in rupee_chart else 0)
old_value = rupee_chart[best_target.item.name] if best_target.item.name in rupee_chart else 0 make_item_free = wallet[target_player] < 20
old_value = 0 if make_item_free else (rupee_chart[best_target.item.name] if best_target.item.name in rupee_chart else 0)
if best_swap is None: if best_swap is None:
logger.debug(f'Upgrading {best_target.item.name} @ {best_target.name} for 300 Rupees') logger.debug(f'Upgrading {best_target.item.name} @ {best_target.name} for 300 Rupees')
best_target.item = ItemFactory('Rupees (300)', best_target.item.player) best_target.item = ItemFactory('Rupees (300)', best_target.item.player)
best_target.item.location = best_target best_target.item.location = best_target
check_shop_swap(best_target.item.location) check_shop_swap(best_target.item.location, make_item_free)
else: else:
old_item = best_target.item old_item = best_target.item
logger.debug(f'Swapping {best_target.item.name} @ {best_target.name} for {best_swap.item.name} @ {best_swap.name}') logger.debug(f'Swapping {best_target.item.name} @ {best_target.name} for {best_swap.item.name} @ {best_swap.name}')
@@ -934,7 +937,7 @@ def balance_money_progression(world):
best_target.item.location = best_target best_target.item.location = best_target
best_swap.item = old_item best_swap.item = old_item
best_swap.item.location = best_swap best_swap.item.location = best_swap
check_shop_swap(best_target.item.location) check_shop_swap(best_target.item.location, make_item_free)
check_shop_swap(best_swap.item.location) check_shop_swap(best_swap.item.location)
increase = best_value - old_value increase = best_value - old_value
difference -= increase difference -= increase