diff --git a/.efrocachemap b/.efrocachemap index 189b810b..5b3216ff 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4114,10 +4114,10 @@ "assets/build/windows/x64/python.exe": "https://files.ballistica.net/cache/ba1/25/a7/dc87c1be41605eb6fefd0145144c", "assets/build/windows/x64/python37.dll": "https://files.ballistica.net/cache/ba1/b9/e4/d912f56e42e9991bcbb4c804cfcb", "assets/build/windows/x64/pythonw.exe": "https://files.ballistica.net/cache/ba1/6c/bb/b6f52c306aa4e88061510e96cefe", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ff/6b/d0873927a179b2a85a3dea2da18a", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ac/48/72f261d7884a21cb79feef2d0a02", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e7/e8/6cb5ba8c688986b322dd998c0320", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/91/76/6037c47265319bcbf4e448307a57", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/43/23/d3e915b7c5222535ea723538d778", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/ce/98/72177f47655d61fedb069cb2e279" + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/62/db/3e52e59e335813b3c7bd7e4e19f5", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/c2/b7/109913f9ee56c9a0306b47392fd2", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/71/ea/7b890bbddbaa0d27e0db60a4318a", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d2/38/fca90505d90fb63beab3357fcbd4", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/81/54/42d2d1cb0215e764b397651e1c58", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/3a/4d/7b38001fbcd9bc39bc50133cea53" } \ No newline at end of file diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py index 8ad46bfd..73491b72 100644 --- a/assets/src/ba_data/python/_ba.py +++ b/assets/src/ba_data/python/_ba.py @@ -34,7 +34,7 @@ NOTE: This file was autogenerated by gendummymodule; do not edit by hand. """ # (hash we can use to see if this file is out of date) -# SOURCES_HASH=13501269283550798144571003636886602232 +# SOURCES_HASH=293498427545140555839175614948455855333 # I'm sorry Pylint. I know this file saddens you. Be strong. # pylint: disable=useless-suppression @@ -2183,12 +2183,12 @@ def get_package_texture(package: ba.AssetPackage, name: str) -> ba.Texture: return ba.Texture() -def get_price(item: str) -> str: - """get_price(item: str) -> str +def get_price(item: str) -> Optional[str]: + """get_price(item: str) -> Optional[str] (internal) """ - return str() + return "" def get_public_login_id() -> str: diff --git a/assets/src/ba_data/python/bastd/ui/specialoffer.py b/assets/src/ba_data/python/bastd/ui/specialoffer.py index 582316ea..f32432f0 100644 --- a/assets/src/ba_data/python/bastd/ui/specialoffer.py +++ b/assets/src/ba_data/python/bastd/ui/specialoffer.py @@ -209,8 +209,9 @@ class SpecialOfferWindow(ba.Window): # Total-value if they supplied it. total_worth_item = offer.get('valueItem', None) if total_worth_item is not None: - total_worth_price = get_clean_price( - _ba.get_price(total_worth_item)) + price = _ba.get_price(total_worth_item) + assert price is not None + total_worth_price = get_clean_price(price) if total_worth_price is not None: total_worth_text = ba.Lstr(resource='store.totalWorthText', subs=[('${TOTAL_WORTH}', diff --git a/assets/src/ba_data/python/bastd/ui/store/item.py b/assets/src/ba_data/python/bastd/ui/store/item.py index d7c506ed..994d2039 100644 --- a/assets/src/ba_data/python/bastd/ui/store/item.py +++ b/assets/src/ba_data/python/bastd/ui/store/item.py @@ -292,8 +292,9 @@ def instantiate_store_item_display(item_name: str, {}).get(item_name) total_worth_price: Optional[str] if total_worth_item is not None: - total_worth_price = get_clean_price( - _ba.get_price(total_worth_item)) + price = _ba.get_price(total_worth_item) + assert price is not None + total_worth_price = get_clean_price(price) else: total_worth_price = None