Merge branch 'main' into breaking_changes

# Conflicts:
#	README.md
This commit is contained in:
Fabian Dill
2021-03-13 23:34:38 +01:00
354 changed files with 354 additions and 142 deletions

View File

@@ -1,7 +1,7 @@
from __future__ import annotations
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = 'b2201c6fa50ba7a6ac42d73f37d75493'
RANDOMIZERBASEHASH = '4f63251fb1f769e1a6b017346b2e51dc'
import io
import json

View File

@@ -296,6 +296,7 @@ def create_shops(world, player: int):
else:
loc.item = ItemFactory(GetBeemizerItem(world, player, 'Nothing'), player)
loc.shop_slot_disabled = True
loc.item.world = world
shop.region.locations.append(loc)
world.dynamic_locations.append(loc)
world.clear_location_cache()