ynerant/squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merge branch 'master' into 'familiars'

Browse Source 
# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/logsdisplay.py
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/menus.py
This commit is contained in:
eichhornchen
2021-01-05 10:27:39 +01:00
parent 6341f39fb0 330d78702a
commit 7f63ab2357
15 changed files with 167 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
squirrelbattle/menus.py
View File

@ -144,7 +144,7 @@ class StoreMenu(Menu):
"""
A special instance of a menu : the menu for the inventory of a merchant.
"""
merchant: Merchant
merchant: Merchant = None
def update_merchant(self, merchant: Merchant) -> None:
"""
@ -157,4 +157,4 @@ class StoreMenu(Menu):
"""
Returns the values of the menu.
"""
return self.merchant.inventory
return self.merchant.inventory if self.merchant else []