Merge branch 'village' into 'master'

Village

Closes #41, #38, #37, #36, and #18

See merge request ynerant/squirrel-battle!44
This commit is contained in:
eichhornchen
2020-12-11 18:23:10 +01:00
17 changed files with 860 additions and 120 deletions

View File

@ -6,6 +6,7 @@ from typing import Any, Optional
from .display.texturepack import TexturePack
from .entities.player import Player
from .entities.friendly import Merchant
from .enums import GameMode, KeyValues, DisplayActions
from .settings import Settings
from .translations import gettext as _, Translator
@ -128,3 +129,14 @@ class InventoryMenu(Menu):
@property
def values(self) -> list:
return self.player.inventory
class StoreMenu(Menu):
merchant: Merchant
def update_merchant(self, merchant: Merchant) -> None:
self.merchant = merchant
@property
def values(self) -> list:
return self.merchant.inventory