diff --git a/.efrocachemap b/.efrocachemap index b44b4c4c..a9db2874 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3992,26 +3992,26 @@ "assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e", "assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34", "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a", - "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b7/ef/345a246867d4c5412e0e3718c03c", - "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/89/ee/f1c9f908d215f44265a7423ecbe2", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/34/04/a147000e92e7925af0171dd94267", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/30/01/a422633f578387874ff46291aa03", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/70/82/10ff470d09119f9ee92330678d9b", - "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/65/09/6b558c6144c1f3bd2c9ff5375611", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e6/56/4d2d62711b571a2485b963281493", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/06/03/d04ccded4c97a5442bdb29319b5e", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a2/9a/78ecff4fce357c335d3ab4e93bb3", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/c0/41/e157bafa6c4327273e01dc07e5f9", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/00/26/f96504e8bf3dd93277f092033fd4", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cc/86/c1def727f2840e88d11ae94a9c55", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c2/9f/48599246e156de9a8b03c6070c83", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/8c/ff/56fabf2f4bd28dd5d791d4c24790", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7d/0f/65c0e5d9313e3a8c52bdedae18ea", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2c/03/2cc494f1d14b2d9e541804cef092", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/39/27/9acfbf07e2b1a220920d243429de", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/ad/2e/831cc07bd66f938b0b8aabb58b0a", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/ea/76/a9e6ee7d278eaf7c6ce8db085f9d", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/b9/3e/67324f2051a7130cf061a7bf34a3", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/91/42/40d3d68a023907931bd0607bda85", + "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/32/63/c4e986eabc1ea23c5c1cdd6461ab", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7d/ae/75e71403860e67cbc3b0facf0667", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ee/37/67886cc96bb5685d74c25dfd1861", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c5/ab/3bf790e91bb62f0813eb36068b23", + "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/42/a2/912b3d7c1c3dd5962c21c6308707", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7b/a5/5312559793a768b3112145f921cd", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9e/dc/6b4b77c9719790a1b7b13613bcb7", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/38/b9/75578e6253c76427aba48f7c9461", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a0/17/837cd62e5cc754326483feeee145", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/21/d8/6f84847e9424d5b3489d14006c66", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f6/e1/af0184b03b3ce6277f08d6f96a96", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/24/24/a416cb3fe644e5f53a2702181825", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/06/32/361440b616c5af4edc44ed059d92", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/42/b8/17ddac009bd9f0f3eb1ce42f1ce2", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/74/0e/e3f9c2c7c8762e1e1b0b78b04233", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/63/82/09449fd08d92207fda96c3a2d5a9", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/44/72/315724c56d93b17cc4bd742c7a82", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/f8/3d/c36a8b70012ddc1ba72b406ae2f6", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/be/b2/e7d007f93d89865f46d3107800ec", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6d/55/43cb804fe2b6b591e8c4713a1f4f", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/fe/61/9eaaa15072167c2928db497e8d36", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/99/f1/ac4818ad69cfe75f7091ee08231b", diff --git a/CHANGELOG.md b/CHANGELOG.md index c598c3cc..593d8ea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ -### 1.7.4 (20636, 2022-07-06) +### 1.7.4 (20637, 2022-07-07) +- Fixed the trophies list showing an incorrect total (Thanks itsre3!) ### 1.7.3 (20634, 2022-07-06) - Fixed an issue with King of the Hill flag regions not working when players entered them (Thanks itsre3!) diff --git a/assets/src/ba_data/python/bastd/ui/trophies.py b/assets/src/ba_data/python/bastd/ui/trophies.py index 140fea59..ec17007d 100644 --- a/assets/src/ba_data/python/bastd/ui/trophies.py +++ b/assets/src/ba_data/python/bastd/ui/trophies.py @@ -112,7 +112,7 @@ class TrophiesWindow(popup.PopupWindow): sub_width: int, trophy_types: list[list[str]]) -> int: from ba.internal import get_trophy_string - pts = 0 + total_pts = 0 for i, trophy_type in enumerate(trophy_types): t_count = self._data['t' + trophy_type[0]] t_mult = self._data['t' + trophy_type[0] + 'm'] @@ -157,7 +157,7 @@ class TrophiesWindow(popup.PopupWindow): h_align='center', v_align='center') - pts = t_count * t_mult + this_pts = t_count * t_mult ba.textwidget(parent=self._subcontainer, position=(sub_width * 0.88, sub_height - 20 - incr * i), @@ -167,12 +167,12 @@ class TrophiesWindow(popup.PopupWindow): flatness=1.0, shadow=0.0, scale=0.5, - text=eq_text.replace('${NUMBER}', str(pts)), + text=eq_text.replace('${NUMBER}', str(this_pts)), size=(0, 0), h_align='center', v_align='center') - pts += pts - return pts + total_pts += this_pts + return total_pts def _on_cancel_press(self) -> None: self._transition_out() diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 155042c5..ae5023f5 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -21,7 +21,7 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20636; +const int kAppBuildNumber = 20637; const char* kAppVersion = "1.7.4"; // Our standalone globals.