From 02d6905438c9a46782c620303331de546d5b8bde Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 15 Apr 2021 15:11:40 -0600 Subject: [PATCH 1/5] Fix for retro "shops" --- Rom.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index 392efbb7..63cdfb35 100644 --- a/Rom.py +++ b/Rom.py @@ -16,7 +16,7 @@ from BaseClasses import CollectionState, ShopType, Region, Location, Door, DoorT from DoorShuffle import compass_data, DROptions, boss_indicator from Dungeons import dungeon_music_addresses from KeyDoorShuffle import count_locations_exclude_logic -from Regions import location_table, shop_to_location_table +from Regions import location_table, shop_to_location_table, retro_shops from RoomData import DoorKind 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 @@ -1571,8 +1571,11 @@ def write_custom_shops(rom, world, player): break if world.shopsanity[player] or shop.type == ShopType.TakeAny: rom.write_byte(0x186560 + shop.sram_address + index, 1) - loc_item = world.get_location(shop_to_location_table[shop.region.name][index], player).item - if not loc_item: + if world.shopsanity[player] and shop.region.name in shop_to_location_table: + loc_item = world.get_location(shop_to_location_table[shop.region.name][index], player).item + elif world.shopsanity[player] and shop.region.name in retro_shops: + loc_item = world.get_location(retro_shops[shop.region.name][index], player).item + else: loc_item = ItemFactory(item['item'], player) item_id = loc_item.code price = int16_as_bytes(item['price']) From 7a74ba8999f1b1cc54fa7d56773019d2964445ee Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 27 Apr 2021 14:00:00 -0600 Subject: [PATCH 2/5] Shopsanity price re-work --- Fill.py | 36 ++++++++++++++++++++-- ItemList.py | 79 +++++++++++++++++++++++++++++++++++++++++++++++-- RELEASENOTES.md | 65 ++++++++++++++++++++++------------------ 3 files changed, 147 insertions(+), 33 deletions(-) diff --git a/Fill.py b/Fill.py index 3cdf8bf3..55c203a1 100644 --- a/Fill.py +++ b/Fill.py @@ -534,6 +534,30 @@ def balance_money_progression(world): 'TR Rupees': 270, 'PoD Dark Basement': 270} acceptable_balancers = ['Bombs (3)', 'Arrows (10)', 'Bombs (10)'] + base_value = sum(rupee_rooms.values()) + available_money = {player: base_value for player in range(1, world.players+1)} + for loc in world.get_locations(): + if loc.item.name in rupee_chart: + available_money[loc.item.player] += rupee_chart[loc.item.name] + + total_price = {player: 0 for player in range(1, world.players+1)} + for player in range(1, world.players+1): + for shop, loc_list in shop_to_location_table.items(): + for loc in loc_list: + loc = world.get_location(loc, player) + slot = shop_to_location_table[loc.parent_region.name].index(loc.name) + shop = loc.parent_region.shop + shop_item = shop.inventory[slot] + if shop_item: + total_price[player] += shop_item['price'] + total_price[player] += 110 + sum(pay_for_locations.values()) + # base needed: 830 + # base available: 765 + + for player in range(1, world.players+1): + logger.debug(f'Money balance for P{player}: Needed: {total_price[player]} Available: {available_money[player]}') + + def get_sphere_locations(sphere_state, locations): sphere_state.sweep_for_events(key_only=True, locations=locations) return [loc for loc in locations if sphere_state.can_reach(loc) and sphere_state.not_flooding_a_key(sphere_state.world, loc)] @@ -580,9 +604,15 @@ def balance_money_progression(world): shop = location.parent_region.shop shop_item = shop.inventory[slot] if interesting_item(location, location.item, world, location.item.player): - sphere_costs[loc_player] += shop_item['price'] - location_free = False - locked_by_money[loc_player].add(location) + if location.item.name.startswith('Rupee') and loc_player == location.item.player: + if shop_item['price'] < rupee_chart[location.item.name]: + wallet[loc_player] -= shop_item['price'] # will get picked up in the location_free block + else: + location_free = False + else: + location_free = False + sphere_costs[loc_player] += shop_item['price'] + locked_by_money[loc_player].add(location) elif location.name in pay_for_locations: sphere_costs[loc_player] += pay_for_locations[location.name] location_free = False diff --git a/ItemList.py b/ItemList.py index ccc10b28..27312851 100644 --- a/ItemList.py +++ b/ItemList.py @@ -3,12 +3,12 @@ import logging import math import random -from BaseClasses import Region, RegionType, Shop, ShopType, Location +from BaseClasses import Region, RegionType, Shop, ShopType, Location, CollectionState from Bosses import place_bosses from Dungeons import get_dungeon_item_pool from EntranceShuffle import connect_entrance from Regions import shop_to_location_table, retro_shops, shop_table_by_location -from Fill import FillError, fill_restrictive +from Fill import FillError, fill_restrictive, fast_fill from Items import ItemFactory import source.classes.constants as CONST @@ -574,6 +574,7 @@ def customize_shops(world, player): loc.item = upgrade upgrade.location = loc change_shop_items_to_rupees(world, player, shops_to_customize) + balance_prices(world, player) def randomize_price(price): @@ -606,6 +607,77 @@ def change_shop_items_to_rupees(world, player, shops): shop.add_inventory(slot, new_item.name, randomize_price(new_item.price), 1, player=new_item.player) +def balance_prices(world, player): + available_money = 765 # this base just counts the main rupee rooms. Could up it for houlihan by 225 + needed_money = 830 # this base is the pay for + for loc in world.get_filled_locations(player): + if loc.item.name in rupee_chart: + available_money += rupee_chart[loc.item.name] # rupee at locations + shop_locations = [] + for shop, loc_list in shop_to_location_table.items(): + for loc in loc_list: + loc = world.get_location(loc, player) + shop_locations.append(loc) + slot = shop_to_location_table[loc.parent_region.name].index(loc.name) + needed_money += loc.parent_region.shop.inventory[slot]['price'] + + target = available_money - needed_money + # remove the first set of shops from consideration (or used them for discounting) + state, done = CollectionState(world), False + unchecked_locations = world.get_locations().copy() + while not done: + state.sweep_for_events(key_only=True, locations=unchecked_locations) + sphere_loc = [l for l in unchecked_locations if state.can_reach(l) and state.not_flooding_a_key(state.world, l)] + if any(l in shop_locations for l in sphere_loc): + if target >= 0: + shop_locations = [l for l in shop_locations if l not in sphere_loc] + else: + shop_locations = [l for l in sphere_loc if l in shop_locations] + done = True + else: + for l in sphere_loc: + state.collect(l.item, True, l) + unchecked_locations.remove(l) + + while len(shop_locations) > 0: + adjustment = target // len(shop_locations) + adjustment = 5 * (adjustment // 5) + more_adjustment = [] + for loc in shop_locations: + slot = shop_to_location_table[loc.parent_region.name].index(loc.name) + price_max = loc.item.price * 2 + inventory = loc.parent_region.shop.inventory[slot] + flex = price_max - inventory['price'] + if flex <= adjustment: + inventory['price'] = price_max + target -= flex + elif adjustment <= 0: + old_price = inventory['price'] + new_price = max(0, inventory['price'] + adjustment) + inventory['price'] = new_price + target += (old_price - new_price) + else: + more_adjustment.append(loc) + if len(shop_locations) == len(more_adjustment): + for loc in shop_locations: + slot = shop_to_location_table[loc.parent_region.name].index(loc.name) + inventory = loc.parent_region.shop.inventory[slot] + new_price = inventory['price'] + adjustment + new_price = min(500, max(0, new_price)) # cap prices between 0--twice base price + inventory['price'] = new_price + target -= adjustment + more_adjustment = [] + shop_locations = more_adjustment + logging.getLogger('').debug(f'Price target is off by by {target} rupees') + + # for loc in shop_locations: + # slot = shop_to_location_table[loc.parent_region.name].index(loc.name) + # new_price = loc.parent_region.shop.inventory[slot]['price'] + adjustment + # + # new_price = min(500, max(0, new_price)) # cap prices between 0--twice base price + # loc.parent_region.shop.inventory[slot]['price'] = new_price + + repeatable_shop_items = ['Single Arrow', 'Arrows (10)', 'Bombs (3)', 'Bombs (10)', 'Red Potion', 'Small Heart', 'Blue Shield', 'Red Shield', 'Bee', 'Small Key (Universal)', 'Blue Potion', 'Green Potion'] @@ -621,6 +693,9 @@ shop_transfer = {'Red Potion': 'Rupees (50)', 'Bee': 'Rupees (5)', 'Blue Potion' # 'Blue Shield': 'Rupees (50)', 'Red Shield': 'Rupees (300)', } +rupee_chart = {'Rupee (1)': 1, 'Rupees (5)': 5, 'Rupees (20)': 20, 'Rupees (50)': 50, + 'Rupees (100)': 100, 'Rupees (300)': 300} + def get_pool_core(progressive, shuffle, difficulty, treasure_hunt_total, timer, goal, mode, swords, retro, door_shuffle): pool = [] diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 9b677253..214d470d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -44,38 +44,44 @@ All items in the general item pool may appear in shops. This includes normal pro #### Pricing Guide -All prices range approx. from half the base price to the base price in increments of 5, the exact price is chosen randomly within the range. +#### Sphere effects + +Design goal: Shops in early spheres may be discounted below the base price while shops in later spheres will likely exceed the base price range. This is an attempt to balance out the rupees in the item pool vs. the prices the shops charges. Poorer item pools like Triforce Hunt may have early shop prices be adjusted downward while rupee rich item pools will have prices increased, but later in the game. + +Detailed explanation: It is calculated how much money is available in the item pool and various rupee sources. If this amount exceeds the total amount of money needed for shop prices for items, then shops that are not in sphere 1 will raise their prices by a calculated amount to help balance out the money. Conversely, if the amount is below the money needed, then shops in sphere 1 will be discounted by a calculated amount to help ensure everything is purchase-able with minimal grinding. + +#### Base prices + +All prices range approx. from half the base price to twice the base price (as a max) in increments of 5, the exact price is chosen randomly within the range subject to adjustments by the sphere effects above. | Category | Items | Base Price | Typical Range | | ----------------- | ------- |:----------:|:-------------:| -| Major Progression | Hammer, Hookshot, Mirror, Ocarina, Boots, Somaria, Fire Rod, Ice Rod | 250 | 125-250 -| | Moon Pearl | 200 | 100-200 -| | Lamp, Progressive Bows, Gloves, & Swords | 150 | 75-150 -| | Triforce Piece | 100 | 50-100 -| Medallions | Bombos, Ether, Quake | 100 | 50-100 -| Safety/Fetch | Cape, Mushroom, Shovel, Powder, Bug Net, Byrna, Progressive Armor & Shields, Half Magic | 50 | 25-50 -| Bottles | Empty Bottle or Bee Bottle | 50 | 25-50 -| | Green Goo or Good Bee | 60 | 30-60 -| | Red Goo or Fairy | 70 | 35-70 -| | Blue Goo | 80 | 40-80 -| Health | Heart Container | 40 | 20-40 -| | Sanctuary Heart | 50 | 25-50 -| | Piece of Heart | 10 | 5-10 -| Dungeon | Big Keys | 60 | 30-60 -| | Small Keys | 40 | 20-40 -| | Info Maps | 20 | 10-20 -| | Other Maps & Compasses | 10 | 5-10 +| Major Progression | Hammer, Hookshot, Mirror, Ocarina, Boots, Somaria, Fire Rod, Ice Rod | 250 | 125-500 +| | Moon Pearl | 200 | 100-400 +| | Lamp, Progressive Bows, Gloves, & Swords | 150 | 75-300 +| | Triforce Piece | 100 | 50-200 +| Medallions | Bombos, Ether, Quake | 100 | 50-200 +| Safety/Fetch | Cape, Mushroom, Shovel, Powder, Bug Net, Byrna, Progressive Armor & Shields, Half Magic | 50 | 25-100 +| Bottles | Empty Bottle or Bee Bottle | 50 | 25-100 +| | Green Goo or Good Bee | 60 | 30-120 +| | Red Goo or Fairy | 70 | 35-140 +| | Blue Goo | 80 | 40-160 +| Health | Heart Container | 40 | 20-80 +| | Sanctuary Heart | 50 | 25-100 +| | Piece of Heart | 10 | 5-20 +| Dungeon | Big Keys | 60 | 30-120 +| | Small Keys | 40 | 20-80 +| | Info Maps | 20 | 10-40 +| | Other Maps & Compasses | 10 | 5-20 | Rupees | Green | Free | Free -| | Blue | 2 | 2 -| | Red | 10 | 5-10 -| | Fifty | 25 | 15-25 -| | One Hundred | 50 | 25-50 -| | Three Hundred | 150 | 75-150 -| Ammo | Three Bombs | 15 | 10-15 -| | Single Arrow | 3 | 3 -| Original Shop Items | Other Ammo, Refills, Non-Progressive Shields, Capacity Upgrades, Small Hearts, Retro Quiver, Universal Key | Original | Could be Discounted as Above - -~~In addition, 4-7 items are steeply discounted at random.~~ Sales are over. +| | Blue | 2 | 2-4 +| | Red | 10 | 5-20 +| | Fifty | 25 | 15-50 +| | One Hundred | 50 | 25-100 +| | Three Hundred | 150 | 75-300 +| Ammo | Three Bombs | 15 | 10-30 +| | Single Arrow | 3 | 3-6 +| Original Shop Items | Other Ammo, Refills, Non-Progressive Shields, Capacity Upgrades, Small Hearts, Retro Quiver, Universal Key | Original | .5 - 2 * Original #### Rupee Balancing Algorithm @@ -144,6 +150,9 @@ New item counter modified to show total # Bug Fixes and Notes. +* 0.3.1.8-u + * Fix for retro generation + * Shopsanity - rebalance pricing - later prices can be are higher * 0.3.1.7-u * TFH counter off in modes where it should be off * Fixed Big Bomb logic for inverted (bad merge) From ab5458cf1a17ef61f6f6eb0b4e8fedd271cbc6d0 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 27 Apr 2021 14:00:37 -0600 Subject: [PATCH 3/5] Version bump --- Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Main.py b/Main.py index 683ee0da..d83a7cf5 100644 --- a/Main.py +++ b/Main.py @@ -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 Utils import output_path, parse_player_names -__version__ = '0.3.1.7-u' +__version__ = '0.3.1.8-u' class EnemizerError(RuntimeError): From 817833d0fab06ecc830195c3ea7075d94e157c48 Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 29 Apr 2021 15:19:50 -0600 Subject: [PATCH 4/5] Standard generation bugs fixed --- DoorShuffle.py | 2 +- DungeonGenerator.py | 4 +++- RELEASENOTES.md | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index cfeab8ac..4e4d4d3b 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -555,7 +555,7 @@ def find_portal_candidates(door_list, dungeon, need_passage=False, dead_end_allo if not dead_end_allowed: ret = [x for x in ret if not x.deadEnd] if standard: - ret = [x for x in ret if not x.standard_restrict] + ret = [x for x in ret if not x.standard_restricted] return ret diff --git a/DungeonGenerator.py b/DungeonGenerator.py index e320bbaf..37f77e7d 100644 --- a/DungeonGenerator.py +++ b/DungeonGenerator.py @@ -1249,7 +1249,6 @@ def create_dungeon_builders(all_sectors, connections_tuple, world, player, for r_name in ['Hyrule Dungeon Cellblock', 'Sanctuary']: # need to deliver zelda assign_sector(find_sector(r_name, candidate_sectors), current_dungeon, candidate_sectors, global_pole) - standard_stair_check(dungeon_map, current_dungeon, candidate_sectors, global_pole) entrances_map, potentials, connections = connections_tuple accessible_sectors, reverse_d_map = set(), {} for key in dungeon_entrances.keys(): @@ -1265,6 +1264,9 @@ def create_dungeon_builders(all_sectors, connections_tuple, world, player, if not sector: sector = find_sector(r_name, all_sectors) reverse_d_map[sector] = key + if world.mode[player] == 'standard': + current_dungeon = dungeon_map['Hyrule Castle'] + standard_stair_check(world, dungeon_map, current_dungeon, candidate_sectors, global_pole) complete_dungeons = {x: y for x, y in dungeon_map.items() if sum(len(sector.outstanding_doors) for sector in y.sectors) <= 0} [dungeon_map.pop(key) for key in complete_dungeons.keys()] diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 214d470d..2c20660d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -150,6 +150,8 @@ New item counter modified to show total # Bug Fixes and Notes. +* 0.3.1.9-u + * Generation improvements for standard * 0.3.1.8-u * Fix for retro generation * Shopsanity - rebalance pricing - later prices can be are higher From 70a3f2e53ea04c9b2f7fee6b0cdd2cd7b602fdf7 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 30 Apr 2021 15:55:00 -0600 Subject: [PATCH 5/5] Remove link sprite. Updated bob sprite --- CLI.py | 2 +- RELEASENOTES.md | 1 + data/sprites/official/001.link.1.zspr | Bin 28862 -> 0 bytes .../official/{bob.1.zspr => bob.2.zspr} | Bin 28872 -> 28845 bytes 4 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 data/sprites/official/001.link.1.zspr rename data/sprites/official/{bob.1.zspr => bob.2.zspr} (81%) diff --git a/CLI.py b/CLI.py index 2dcbd809..29dce609 100644 --- a/CLI.py +++ b/CLI.py @@ -185,7 +185,7 @@ def parse_settings(): "quickswap": False, "heartcolor": "red", "heartbeep": "normal", - "sprite": os.path.join(".", "data", "sprites", "official", "001.link.1.zspr"), + "sprite": None, "fastmenu": "normal", "ow_palettes": "default", "uw_palettes": "default", diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2c20660d..2bc21111 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -152,6 +152,7 @@ New item counter modified to show total * 0.3.1.9-u * Generation improvements for standard + * Removed link sprite from repo * 0.3.1.8-u * Fix for retro generation * Shopsanity - rebalance pricing - later prices can be are higher diff --git a/data/sprites/official/001.link.1.zspr b/data/sprites/official/001.link.1.zspr deleted file mode 100644 index 4537afa84ba78f558056f2b91783708c5a22caa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28862 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 diff --git a/data/sprites/official/bob.1.zspr b/data/sprites/official/bob.2.zspr similarity index 81% rename from data/sprites/official/bob.1.zspr rename to data/sprites/official/bob.2.zspr index 25fc0410842412a00b47ef51149728e81ca7741a..5731ba7e20ee1bec8fc545ab2583ca0efe35fe9f 100644 GIT binary patch delta 48 zcmX@{ka6upMuDi{fFMQ@wbwTd8GxX`aH4=HcQ!*JLmrTqotU>-kZA$q=GTmO^8j-A B4)6c~ delta 75 zcmZ4cknzMrMuDi{fFQ