diff --git a/.efrocachemap b/.efrocachemap index 5789cc14..b62c0dc1 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,8 +421,8 @@ "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", - "build/assets/ba_data/data/langdata.json": "b83c9445922f68152c5d0efa1f0fe608", - "build/assets/ba_data/data/languages/arabic.json": "05040616cb7585e3cce2e9acba96aa75", + "build/assets/ba_data/data/langdata.json": "e6331203538a066bb79a755ab3a2ddd7", + "build/assets/ba_data/data/languages/arabic.json": "c62b3037ef3364b84d4f8dd6610854f8", "build/assets/ba_data/data/languages/belarussian.json": "3d5523d0004293aa2df02f3f6f3b84f8", "build/assets/ba_data/data/languages/chinese.json": "2f67c6b127ae85492ac552af1a91e95a", "build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39", @@ -430,34 +430,34 @@ "build/assets/ba_data/data/languages/czech.json": "74219f9b06ff098387b40f85a5b0124e", "build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7", "build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343", - "build/assets/ba_data/data/languages/english.json": "9754e816d3bc3214b7e809950d642309", + "build/assets/ba_data/data/languages/english.json": "d8aabdfb3c00c0a6b35a8a1f53a02394", "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", - "build/assets/ba_data/data/languages/filipino.json": "aa8c94a49dec96d050be2329c3b6dcba", + "build/assets/ba_data/data/languages/filipino.json": "b53910af2d3946d5ff81386e8c1d35a7", "build/assets/ba_data/data/languages/french.json": "b7d11199756f0eb4f1a745ceee652b2a", "build/assets/ba_data/data/languages/german.json": "198b9860c5b9df7b8e3e30b03d8755cb", - "build/assets/ba_data/data/languages/gibberish.json": "3e68d809bd6ede3b9e2c57c147737e42", + "build/assets/ba_data/data/languages/gibberish.json": "99db538eeed34be968166075346155cf", "build/assets/ba_data/data/languages/greek.json": "ad3c0d38f34d809824892d6f22808dbf", - "build/assets/ba_data/data/languages/hindi.json": "bb3548531daf7bc7fee4a28d48228c32", + "build/assets/ba_data/data/languages/hindi.json": "e56f0ffb57321660aa415e97c2dacfc2", "build/assets/ba_data/data/languages/hungarian.json": "6b08fea24b72cc805ed0dc59e11c4cd6", "build/assets/ba_data/data/languages/indonesian.json": "ed9038bf4b9216f93eb73e753e162706", "build/assets/ba_data/data/languages/italian.json": "e1d69eb1eec31442bf981121c7cfaf17", "build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597", "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f", - "build/assets/ba_data/data/languages/persian.json": "c209f8f6d3b3dd40d5ca9d36fe0721fe", - "build/assets/ba_data/data/languages/polish.json": "59ff98adfb4f515f00769d1ec229c232", + "build/assets/ba_data/data/languages/persian.json": "64f162aed6f711d816c844e3fa1d2dcb", + "build/assets/ba_data/data/languages/polish.json": "6585f57b1a389b8331b06f610bd8cc6f", "build/assets/ba_data/data/languages/portuguese.json": "615a59bd03f84659158d9f2608a4ab21", "build/assets/ba_data/data/languages/romanian.json": "ef68520f749cf3641d4e4225a6166349", - "build/assets/ba_data/data/languages/russian.json": "41e06eda170fb5960393dd6b58d046e1", + "build/assets/ba_data/data/languages/russian.json": "4cb481af9d4e2611e0033235a045aa33", "build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69", "build/assets/ba_data/data/languages/slovak.json": "3c08c748c96c71bd9e1d7291fb8817b6", - "build/assets/ba_data/data/languages/spanish.json": "6d41c60539072d2dd9608579954403b0", + "build/assets/ba_data/data/languages/spanish.json": "fe339007d6e631d601bf826f949828e3", "build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac", "build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a", "build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945", - "build/assets/ba_data/data/languages/turkish.json": "fe4c7354ca6e657c2645969325af574a", + "build/assets/ba_data/data/languages/turkish.json": "babd1ea2ac160cc9253e836c41674fff", "build/assets/ba_data/data/languages/ukrainian.json": "3f9ee9567a068b760bbf25433177db89", - "build/assets/ba_data/data/languages/venetian.json": "96e7607b0aa79b7eb48cac8df77e8e65", - "build/assets/ba_data/data/languages/vietnamese.json": "b175cd0f01d0433355f144aeaa333409", + "build/assets/ba_data/data/languages/venetian.json": "9bb01eea11d1627c0ceb876d26d86d0c", + "build/assets/ba_data/data/languages/vietnamese.json": "0b3bcd0be6d0a138316ad1a1d2553962", "build/assets/ba_data/data/maps/big_g.json": "1dd301d490643088a435ce75df971054", "build/assets/ba_data/data/maps/bridgit.json": "6aea74805f4880cc11237c5734a24422", "build/assets/ba_data/data/maps/courtyard.json": "4b836554c8949bcd2ae382f5e3c1a9cc", @@ -4062,50 +4062,50 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "9698e65459797b5a87072643f548f4ab", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "e02eb31d2e4065e0436fc96232248fc5", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "c79f227c4164afcd09ea70f8828c2f22", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "6d4f68f726a373fdc179230a72a92324", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "c285dfc219ba755f5abfbbe09b9aa9b8", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "dd0b580b172574f14ef51789acfcc8f2", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "69619ebd570b57f59ab3648aa6d3590a", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "916f649191e81cc23e35818016e220df", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "c2c725f438afe35aaade8b007d812e46", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "6da83421d80c824fe9fe6f13b5f7991e", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "f621b7c2e34f55dc8af7ca41bc4dc4ed", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "2aa7d4c4008d6be2fc172a2375d47fed", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "c51e187921cff4b389a345a0f87f364b", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "5a74d47d994cbdf24da77462ef66ab55", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "f25707a21481e3c45e7dbefc46b544f0", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "9ace2a7c76cc66b8f9eab4d689a6ea49", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6e40b5fb42a16bfeeebf71aabeab1007", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "8505048dfc05e7c02328bfbc359e23b3", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "a73f6abea43df032adb422ad5be2f486", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "cba67113f21cca2a51772ca92fc3f113", - "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "61badc0ac176ef98abeba3ffa7a0c6d6", - "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "79862c15f8121428281bb328b3d19e08", - "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "61badc0ac176ef98abeba3ffa7a0c6d6", - "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "79862c15f8121428281bb328b3d19e08", - "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "b47a86a58800dadefce197ee923c07c7", - "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "7d5c7f92343fa4c0690995a0335afed8", - "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "b47a86a58800dadefce197ee923c07c7", - "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "7d5c7f92343fa4c0690995a0335afed8", - "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "bb72cb9f98d48a5f572733db4095c449", - "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "cc8aea2f632599441196a35fd1dc927a", - "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "bb72cb9f98d48a5f572733db4095c449", - "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "cc8aea2f632599441196a35fd1dc927a", - "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "60b7e716cd73097cd29654a1787dcc5d", - "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c1c40ab7f37c200b366dc6d4dbceb2a6", - "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "f4cf12b15ecca349357f6fa68541b8e5", - "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c1c40ab7f37c200b366dc6d4dbceb2a6", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "3d9473e959782490836d1e76f20dc5ad", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "2887132d17a9909f02e6a12110e747a1", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "7fc343bf0a59b0b77496c5a32e53ae4a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "2d32ced3489090b4331f690ed6e43c22", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "0380d3daa1497385764b2bb190430567", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "a4c2a736cc9f100a1115defa962448a7", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "bfb0fcd3fc53dcfed5022c9880df6033", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a648e37862105c638c05c2e833470764", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "b825e0ae40e1caeaf036244e635bb78d", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "5068c42c3b7defafbf4bb1ba01c67a53", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "411349ebe46b5a4bcda7211adba5fcf8", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "b719d818a8098da1f1a034ef7a7c2150", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "0273ef65559ac5f39147b875adc79c68", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "a3d46a432dd0bb890d657185a4ad5dea", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "9625783e60e3875d66299b0479432391", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "9dc64227710e2d9d3dd04dbe70a0a994", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f37e40f0b5447a51cafa3c7dcdd8cf91", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "20e35f51e0fb5f97245741ee6167bfbc", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "0a2d8f1ec1fa12ce13eb5c3893753b9e", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "e0939ffb5eaf75c1ee5ca5f8b6ad9a17", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "6e80134a263106a1a982a07857b77436", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "fa100352069f1eada6a23747d52ec625", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "df2dad13b9b6014a5b7c031daade4833", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "29abf332ae82d899f3d9bf6ac7c01171", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "de0fe26430c34f2935e66d7a8200d5ff", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "11462b669e43541ec9b97efce0540751", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "c96b92af111f9415301073de1d11c816", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "c778f347ac0b71f6730254a40aacbb17", + "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "1e87ade9bea8c12ac6cb5e531205bae5", + "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "6c92725a224d085b1d426cc03272ebea", + "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "1e87ade9bea8c12ac6cb5e531205bae5", + "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "6c92725a224d085b1d426cc03272ebea", + "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "16783ffe62e14a64331027989da5001b", + "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "2db28554169b53a560f2f824c1176dfa", + "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "16783ffe62e14a64331027989da5001b", + "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "2db28554169b53a560f2f824c1176dfa", + "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "73dffd26ad8f5caad5be0659cb50df6d", + "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "2852099ec1365025c290f9d7f9c4a01e", + "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "73dffd26ad8f5caad5be0659cb50df6d", + "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "2852099ec1365025c290f9d7f9c4a01e", + "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "0e39192fedf0bb0926e409a1cb409833", + "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "ef6ce2f4ed73d411423d6171f5d31100", + "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "356af38c464e969d04ee4a2889e9f67a", + "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "ef6ce2f4ed73d411423d6171f5d31100", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "4f53df80210601028bdec3f22b297c18", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "d5fa0bf70723c976f0b4481429022bbc", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "54257c1026e4296f855d2deee42ba9cb", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "492f317391fdf2a69ab65347fbc5cc53", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "8bc3320036ca1911a8f6c85d40a59172", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "9e137f7c83e37f9b7b43bca9319f9752", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "e9c8975e57c0cfde5dc70e2a5547441c", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "d81182adb2c250030d38f8fda682a610", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "cb299985623bbcc86015cb103a424ae6", "src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d", diff --git a/CHANGELOG.md b/CHANGELOG.md index e027ca08..5ab2d812 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.36 (build 21928, api 8, 2024-07-22) +### 1.7.36 (build 21936, api 8, 2024-07-24) - Wired up Tokens, BombSquad's new purchasable currency. The first thing these can be used for is storage packs on ballistica.net, but this will expand to other places in the game soon. For a full explanation on why these were added, diff --git a/src/assets/ba_data/python/babase/__init__.py b/src/assets/ba_data/python/babase/__init__.py index 8b4cce36..61b75aed 100644 --- a/src/assets/ba_data/python/babase/__init__.py +++ b/src/assets/ba_data/python/babase/__init__.py @@ -27,6 +27,7 @@ from _babase import ( apptime, apptimer, AppTimer, + asset_loads_allowed, fullscreen_control_available, fullscreen_control_get, fullscreen_control_key_shortcut, @@ -207,6 +208,7 @@ __all__ = [ 'apptime', 'apptimer', 'AppTimer', + 'asset_loads_allowed', 'Call', 'fullscreen_control_available', 'fullscreen_control_get', diff --git a/src/assets/ba_data/python/baclassic/_accountv1.py b/src/assets/ba_data/python/baclassic/_accountv1.py index d0df1f64..47b7daed 100644 --- a/src/assets/ba_data/python/baclassic/_accountv1.py +++ b/src/assets/ba_data/python/baclassic/_accountv1.py @@ -271,7 +271,10 @@ class AccountV1Subsystem: ), color=(0, 1, 0), ) - babase.getsimplesound('click01').play() + # Ick; this can get called early in the bootstrapping process + # before we're allowed to load assets. Guard against that. + if babase.asset_loads_allowed(): + babase.getsimplesound('click01').play() def on_account_state_changed(self) -> None: """(internal)""" diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index fd70d381..46f260b0 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21928 +TARGET_BALLISTICA_BUILD = 21936 TARGET_BALLISTICA_VERSION = '1.7.36' diff --git a/src/assets/ba_data/python/bauiv1lib/gettickets.py b/src/assets/ba_data/python/bauiv1lib/gettickets.py index 266b3b1a..09cbf139 100644 --- a/src/assets/ba_data/python/bauiv1lib/gettickets.py +++ b/src/assets/ba_data/python/bauiv1lib/gettickets.py @@ -116,14 +116,14 @@ class GetTicketsWindow(bui.Window): textcolor=bui.app.ui_v1.title_color, size=(190, 50), autoselect=True, - label='Get Tokens', + label=bui.Lstr(resource='tokens.getTokensText'), on_activate_call=self._get_tokens_press, ) # 'New!' by tokens button bui.textwidget( parent=self._root_widget, - text='New!', + text=bui.Lstr(resource='newExclaimText'), position=(self._width * 0.5 + 25, self._height - 32), size=(0, 0), color=(1, 1, 0, 1.0), diff --git a/src/assets/ba_data/python/bauiv1lib/gettokens.py b/src/assets/ba_data/python/bauiv1lib/gettokens.py index e5348c39..501c0bf4 100644 --- a/src/assets/ba_data/python/bauiv1lib/gettokens.py +++ b/src/assets/ba_data/python/bauiv1lib/gettokens.py @@ -46,7 +46,7 @@ class TextContents(Enum): @dataclass class _TxtDef: - text: str | TextContents + text: str | TextContents | bui.Lstr pos: tuple[float, float] maxwidth: float | None scale: float = 1.0 @@ -105,7 +105,10 @@ class GetTokensWindow(bui.Window): ], txtdefs=[ _TxtDef( - '50 Tokens', + bui.Lstr( + resource='tokens.numTokensText', + subs=[('${COUNT}', '50')], + ), pos=(bwidthstd * 0.5, pos1), color=(1.1, 1.05, 1.0), scale=titlescale, @@ -142,7 +145,10 @@ class GetTokensWindow(bui.Window): ], txtdefs=[ _TxtDef( - '500 Tokens', + bui.Lstr( + resource='tokens.numTokensText', + subs=[('${COUNT}', '500')], + ), pos=(bwidthstd * 0.5, pos1), color=(1.1, 1.05, 1.0), scale=titlescale, @@ -179,7 +185,10 @@ class GetTokensWindow(bui.Window): ], txtdefs=[ _TxtDef( - '1200 Tokens', + bui.Lstr( + resource='tokens.numTokensText', + subs=[('${COUNT}', '1200')], + ), pos=(bwidthstd * 0.5, pos1), color=(1.1, 1.05, 1.0), scale=titlescale, @@ -216,7 +225,10 @@ class GetTokensWindow(bui.Window): ], txtdefs=[ _TxtDef( - '2600 Tokens', + bui.Lstr( + resource='tokens.numTokensText', + subs=[('${COUNT}', '2600')], + ), pos=(bwidthstd * 0.5, pos1), color=(1.1, 1.05, 1.0), scale=titlescale, @@ -252,28 +264,28 @@ class GetTokensWindow(bui.Window): ], txtdefs=[ _TxtDef( - 'Gold Pass', + bui.Lstr(resource='goldPass.goldPassText'), pos=(bwidthwide * 0.5, pos1 + 27), color=(1.1, 1.05, 1.0), scale=titlescale, maxwidth=bwidthwide * 0.8, ), _TxtDef( - 'Infinite tokens.', + bui.Lstr(resource='goldPass.desc1InfTokensText'), pos=(bwidthwide * 0.5, pos1 + 6), color=(1.1, 1.05, 1.0), scale=0.4, maxwidth=bwidthwide * 0.8, ), _TxtDef( - 'No ads.', + bui.Lstr(resource='goldPass.desc2NoAdsText'), pos=(bwidthwide * 0.5, pos1 + 6 - 13 * 1), color=(1.1, 1.05, 1.0), scale=0.4, maxwidth=bwidthwide * 0.8, ), _TxtDef( - 'Forever.', + bui.Lstr(resource='goldPass.desc3ForeverText'), pos=(bwidthwide * 0.5, pos1 + 6 - 13 * 2), color=(1.1, 1.05, 1.0), scale=0.4, @@ -370,7 +382,7 @@ class GetTokensWindow(bui.Window): scale=1.2, h_align='center', v_align='center', - text='Get Tokens', + text=bui.Lstr(resource='tokens.getTokensText'), maxwidth=260, ) @@ -382,7 +394,7 @@ class GetTokensWindow(bui.Window): v_align='center', color=(0.6, 0.6, 0.6), scale=0.75, - text='Loading...', + text=bui.Lstr(resource='store.loadingText'), ) self._core_widgets = [ @@ -481,11 +493,7 @@ class GetTokensWindow(bui.Window): bui.textwidget( edit=self._status_text, color=(0, 1, 0), - text=( - 'You have a Gold Pass.\n' - 'All token purchases are free.\n' - 'Enjoy!' - ), + text=bui.Lstr(resource='tokens.youHaveGoldPassText'), ) elif state is self.State.SHOWING_STORE: assert self._last_query_response is not None @@ -552,7 +560,7 @@ class GetTokensWindow(bui.Window): tinfobtn = bui.buttonwidget( parent=self._root_widget, autoselect=True, - label='Learn More', + label=bui.Lstr(resource='learnMoreText'), position=(self._width * 0.5 - 75, self._height * 0.703), size=(180, 43), scale=0.8, @@ -644,7 +652,7 @@ class GetTokensWindow(bui.Window): size=(0, 0), h_align='center', v_align='center', - text='BombSquad\'s shiny new currency.', + text=bui.Lstr(resource='tokens.shinyNewCurrencyText'), ) self._token_count_widget = bui.textwidget( parent=self._root_widget, @@ -678,14 +686,10 @@ class GetTokensWindow(bui.Window): if price is None: if plus is not None and plus.supports_purchases(): # Looks like internet is down or something temporary. - errmsg = 'This purchase is not available.' + errmsg = bui.Lstr(resource='purchaseNotAvailableText') else: # Looks like purchases will never work here. - errmsg = ( - 'Sorry, purchases are not available on this build.\n' - 'Try signing into your account on another platform' - ' and making purchases from there.' - ) + errmsg = bui.Lstr(resource='purchaseNeverAvailableText') bui.screenmessage(errmsg, color=(1, 0.5, 0)) bui.getsound('error').play() diff --git a/src/ballistica/base/platform/apple/base_platform_apple.cc b/src/ballistica/base/platform/apple/base_platform_apple.cc index 11311fc2..30eada99 100644 --- a/src/ballistica/base/platform/apple/base_platform_apple.cc +++ b/src/ballistica/base/platform/apple/base_platform_apple.cc @@ -41,12 +41,11 @@ void BasePlatformApple::RestorePurchases() { } void BasePlatformApple::PurchaseAck(const std::string& purchase, - const std::string& order_id, bool valid) { + const std::string& order_id) { #if BA_USE_STORE_KIT BallisticaKit::StoreKitContext::purchaseAck(purchase, order_id); - // AppleUtils::PurchaseAck(purchase, order_id); #else - BasePlatform::PurchaseAck(purchase, order_id, valid); + BasePlatform::PurchaseAck(purchase, order_id); #endif } diff --git a/src/ballistica/base/platform/apple/base_platform_apple.h b/src/ballistica/base/platform/apple/base_platform_apple.h index de99262d..7d8c8864 100644 --- a/src/ballistica/base/platform/apple/base_platform_apple.h +++ b/src/ballistica/base/platform/apple/base_platform_apple.h @@ -13,8 +13,8 @@ class BasePlatformApple : public BasePlatform { BasePlatformApple(); void DoPurchase(const std::string& item) override; void RestorePurchases() override; - void PurchaseAck(const std::string& purchase, const std::string& order_id, - bool valid) override; + void PurchaseAck(const std::string& purchase, + const std::string& order_id) override; void DoOpenURL(const std::string& url) override; auto OverlayWebBrowserIsSupported() -> bool override; void DoOverlayWebBrowserOpenURL(const std::string& url) override; diff --git a/src/ballistica/base/platform/base_platform.cc b/src/ballistica/base/platform/base_platform.cc index e5dd0e4d..7c226efb 100644 --- a/src/ballistica/base/platform/base_platform.cc +++ b/src/ballistica/base/platform/base_platform.cc @@ -106,7 +106,7 @@ void BasePlatform::RestorePurchases() { } void BasePlatform::PurchaseAck(const std::string& purchase, - const std::string& order_id, bool valid) { + const std::string& order_id) { Log(LogLevel::kError, "PurchaseAck() unimplemented"); } diff --git a/src/ballistica/base/platform/base_platform.h b/src/ballistica/base/platform/base_platform.h index 58aee1cb..def25e98 100644 --- a/src/ballistica/base/platform/base_platform.h +++ b/src/ballistica/base/platform/base_platform.h @@ -52,9 +52,10 @@ class BasePlatform { /// Restore purchases (currently only relevant on Apple platforms). virtual void RestorePurchases(); - /// Purchase was ack'ed by the master-server (so can consume or cancel). + /// Purchase was processed by the master-server and should now be completed + /// locally. virtual void PurchaseAck(const std::string& purchase, - const std::string& order_id, bool valid); + const std::string& order_id); #pragma mark ENVIRONMENT ------------------------------------------------------- diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index b5e76fca..eb4499e3 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21928; +const int kEngineBuildNumber = 21936; const char* kEngineVersion = "1.7.36"; const int kEngineApiVersion = 8;