v1.7.50

Author: efroemling

.efrocachemap

@@ -1,7 +1,9 @@
-### 1.7.50 (build 22525, api 9, 2025-09-04)
+### 1.7.50 (build 22528, api 9, 2025-09-05)
 - Cleaned up cursor handling on Mac build. Fixes an issue where the cursor could
   sometimes revert to the system cursor for a few seconds after moving the
   cursor to the top of a fullscreen window.
+- Chest prize odds now show with most valuable stuff at the top instead of
+  bottom (feels more intuitive to me).
 
 ### 1.7.49 (build 22524, api 9, 2025-09-04)
 - Fixes an issue where `bascenev1.reload_hooks()` and `bauiv1.reload_hooks()`

CHANGELOG.md

@@ -9,7 +9,7 @@ pbxproj==4.3.0
 pur==7.3.3
 pylint==3.3.8
 pylsp-mypy==0.7.0
-pytest==8.4.1
+pytest==8.4.2
 python-daemon==3.1.2
 python-lsp-black==2.0.0
 python-lsp-server==1.13.1

config/requirements.txt

@@ -33,6 +33,7 @@ class ClassicAppMode(babase.AppMode):
     """AppMode for the classic BombSquad experience."""
 
     _ACCOUNT_STATE_CONFIG_KEY = 'ClassicAccountState'
+    _ASKED_FOR_REVIEW_CONFIG_KEY = 'AskedForReview'
 
     def __init__(self) -> None:
         self._on_primary_account_changed_callback: (
@@ -529,6 +530,18 @@ def _on_classic_account_data_change(
 
         self._target_purchases_state = val.purchases_state
 
+        # If they want us to ask for a review (and we haven't yet), do
+        # so.
+        if val.Flag.ASK_FOR_REVIEW in val.flags:
+            cfg = babase.app.config
+            if (
+                not cfg.get(self._ASKED_FOR_REVIEW_CONFIG_KEY, False)
+                and babase.native_review_request_supported()
+            ):
+                cfg[self._ASKED_FOR_REVIEW_CONFIG_KEY] = True
+                cfg.commit()
+                babase.native_review_request()
+
         # If someone replaced our purchases in the classic subsystem,
         # fix it.
         if (

src/assets/ba_data/python/baclassic/_appmode.py

@@ -56,7 +56,7 @@
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 22525
+TARGET_BALLISTICA_BUILD = 22528
 TARGET_BALLISTICA_VERSION = '1.7.50'
 
 

src/assets/ba_data/python/baenv.py

@@ -327,10 +327,11 @@ def _show_chest_actions(
         )
 
         # Store the prize-sets so we can display odds/etc. Sort them
-        # with largest weights first.
-        self._prizesets = sorted(
-            chest.prizesets, key=lambda s: s.weight, reverse=True
-        )
+        # with smallest weights first (higher visually == better).
+        # self._prizesets = sorted(
+        #     chest.prizesets, key=lambda s: s.weight, reverse=True
+        # )
+        self._prizesets = chest.prizesets
 
         if chest.unlock_tokens > 0:
             lsize = 30
@@ -746,11 +747,15 @@ def _mktxt(txt: str, advance: bool = True) -> None:
         self._prizesettxts = {}
         self._prizesetimgs = {}
 
+        basey = y
+
         for i, p in enumerate(self._prizesets):
             prizesettxts = self._prizesettxts.setdefault(i, [])
             prizesetimgs = self._prizesetimgs.setdefault(i, [])
             x = self._width * 0.5 + xoffs
-            y -= rowheight
+
+            # Display from bottom up.
+            y = basey - (len(self._prizesets) - i) * rowheight
             percent = 100.0 * p.weight / totalweight
 
             # Show decimals only if we get very small percentages (looks

src/assets/ba_data/python/bauiv1lib/chest.py

@@ -180,8 +180,9 @@ def __init__(
         )
 
         # Add some blotches so our contents fades out as it approaches
-        # the bottom toolbar.
-        if uiscale is bui.UIScale.SMALL:
+        # the bottom toolbar (but only in the main menu when there's
+        # something down there).
+        if uiscale is bui.UIScale.SMALL and bui.in_main_menu():
             blotchwidth = 500.0
             blotchheight = 200.0
             bimg = bui.imagewidget(

src/assets/ba_data/python/bauiv1lib/settings/advanced.py

@@ -1141,10 +1141,19 @@ void Graphics::DrawCursor(FrameDef* frame_def) {
       new_cursor_visibility = true;
     }
 
+    // As of macOS 15.6.1 there seems to be a bug where moving the cursor down
+    // from the top portion of a fullscreen window flips it back to the arrow
+    // cursor. Should submit a bug to Apple if this is still the case in macOS
+    // 16, but for now am just forcing cursor resets at a higher frequency there
+    // to hide that.
+    seconds_t fudge_secs =
+        (g_buildconfig.platform_macos() && g_buildconfig.xcode_build()) ? 0.235
+                                                                        : 2.345;
+
     // Ship this state when it changes and also every now and then just in
     // case things go wonky.
     if (new_cursor_visibility != hardware_cursor_visible_
-        || app_time - last_cursor_visibility_event_time_ > 2.137) {
+        || app_time - last_cursor_visibility_event_time_ > fudge_secs) {
       hardware_cursor_visible_ = new_cursor_visibility;
       last_cursor_visibility_event_time_ = app_time;
       g_base->app_adapter->PushMainThreadCall([this] {

src/ballistica/base/graphics/graphics.cc

@@ -2,8 +2,11 @@
 
 #include "ballistica/shared/ballistica.h"
 
+#include <chrono>
 #include <cstdio>
+#include <memory>
 #include <string>
+#include <thread>
 
 #include "ballistica/core/logging/logging.h"
 #include "ballistica/core/platform/core_platform.h"
@@ -41,7 +44,7 @@ auto main(int argc, char** argv) -> int {
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kEngineBuildNumber = 22525;
+const int kEngineBuildNumber = 22528;
 const char* kEngineVersion = "1.7.50";
 const int kEngineApiVersion = 9;
 
@@ -228,11 +231,30 @@ class IncrementalInitRunner_ {
           last_step_time_ = core::CorePlatform::TimeMonotonicSeconds();
           return false;
 
-        case 1:
+        case 1: {
           core_->python->WarmStart1();
+
+          // Launch a thread which spins and waits for the Python bg stuff
+          // we just launched to complete. We do this in a separate thread
+          // because even acquiring the GIL to make the check in the main
+          // thread can be enough to trigger ANRs on slower hardware.
+          thread_ = std::make_unique<std::thread>([this] {
+            while (explicit_bool(true)) {
+              {
+                Python::ScopedInterpreterLock gil_acquire;
+                if (core_->python->WarmStart1Completed()) {
+                  warm_start_completed_ = true;
+                  break;
+                }
+              }
+              std::this_thread::sleep_for(std::chrono::milliseconds(1));
+            }
+          });
+
           LogStepTime_(step_);
           step_++;
           return false;
+        }
 
         case 2: {
           // This step is a special case; the previous step kicked off a
@@ -246,7 +268,11 @@ class IncrementalInitRunner_ {
               LogStepTime_(step_);
               return false;
             }
-            if (core_->python->WarmStart1Completed()) {
+            // if (core_->python->WarmStart1Completed()) {
+            if (warm_start_completed_) {
+              // Our thread that set this should be done.
+              thread_->join();
+
               // We finished this step.
               LogStepTime_(step_);
               step_++;
@@ -349,6 +375,8 @@ class IncrementalInitRunner_ {
   int step_{};
   seconds_t last_step_time_{};
   bool zombie_{};
+  bool warm_start_completed_{};
+  std::unique_ptr<std::thread> thread_{};
   core::CoreConfig config_;
   core::CoreFeatureSet* core_{};
   core::BaseSoftInterface* base_{};

src/ballistica/shared/ballistica.cc

@@ -153,6 +153,11 @@ class LeagueType(Enum):
         GOLD = 'g'
         DIAMOND = 'd'
 
+    class Flag(Enum):
+        """Flags set for our account."""
+
+        ASK_FOR_REVIEW = 'r'
+
     tickets: Annotated[int, IOAttrs('ti')]
 
     tokens: Annotated[int, IOAttrs('to')]
@@ -179,6 +184,8 @@ class LeagueType(Enum):
     # State id of our purchases for builds 22459+.
     purchases_state: Annotated[str | None, IOAttrs('p')]
 
+    flags: Annotated[set[Flag], IOAttrs('f', soft_default_factory=set)]
+
 
 class DisplayItemTypeID(Enum):
     """Type ID for each of our subclasses."""