From b3f3b432ae2dda30e8a8d11b9be4e2bdcb5a4dc1 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Tue, 5 May 2020 18:24:01 -0700 Subject: [PATCH] Fixed unowned-character warnings --- .efrocachemap | 24 ++++++++++++------------ assets/src/ba_data/python/_ba.py | 2 +- assets/src/ba_data/python/ba/_account.py | 4 +++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 20e10897..c51747d2 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4132,16 +4132,16 @@ "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-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b8/70/d087e1b445f7d19c02e9ff22d6ba", - "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9c/5b/258ebaafc23ffafdee40992f4422", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/d6/e4/0c24f8930d7952fdf667b3046dac", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/7a/a4/648b4505563f6f870c80df784dd2", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b2/60/a67366b88128c1743f0e4bdc7844", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/db/89/4ea43a8120df7d3d60aab0902a7a", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/60/1a/1463ba7cddddd3796c27a8250875", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/0c/ae/b4500e7fc1dd9f2e515dfc6d7b2f", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/26/36/dd35f9f8ba7708ecaa3176e38dd8", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/37/cc/4fb23e54b6058cb3a9fbf8862387", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/06/5a/40efd122998130779a70bcc7aa68", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/3f/15/f046cab19964f6e60159ee7eaba2" + "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c4/f0/cb3af7a3fa02f7c1b3e54e20683b", + "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3c/ba/89bd9412e2135d27cc453fd46468", + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/28/4d/3a87860937b9f1ca10a83059df49", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/49/b6/29845aba5751453418959eaa1f8f", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/42/a8/c62b10953a9a5c1108e4422df7f3", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ea/ba/647189d4a98d97a12f6ebb1da86b", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ce/6b/0a76ff71b67b5de3e20308700709", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/4c/f4/da86c0c5c0cdfe5d7bf14dd60e00", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/57/0b/e0aeb2c3538114bc4d93fdc76f21", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/7f/06/922ac6ebf93586c3b743165a7d72", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/16/75/cad275443b1c9b181a1bdd976dee", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/0b/7b/103cbcf0f05b7cd67ff9b43fe4a3" } \ 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 b00a1f50..6b787470 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=46017893405708946031504998063019866722 +# SOURCES_HASH=171068487782712697710052472999562586311 # I'm sorry Pylint. I know this file saddens you. Be strong. # pylint: disable=useless-suppression diff --git a/assets/src/ba_data/python/ba/_account.py b/assets/src/ba_data/python/ba/_account.py index f94a0330..65143a64 100644 --- a/assets/src/ba_data/python/ba/_account.py +++ b/assets/src/ba_data/python/ba/_account.py @@ -159,9 +159,11 @@ def have_pro() -> bool: """Return whether pro is currently unlocked.""" # Check our tickets-based pro upgrade and our two real-IAP based upgrades. + # Also unlock this stuff in ballistica-core builds. return bool( _ba.get_purchased('upgrades.pro') or _ba.get_purchased('static.pro') - or _ba.get_purchased('static.pro_sale')) + or _ba.get_purchased('static.pro_sale') + or 'ballistica' + 'core' == 'ballisticacore') def have_pro_options() -> bool: