polishing

Author: efroemling

.efrocachemap

@@ -1,4 +1,4 @@
-### 1.7.37 (build 22117, api 9, 2024-11-27)
+### 1.7.37 (build 22118, api 9, 2024-11-30)
 - Bumping api version to 9. As you'll see below, there's some UI changes that
   will require a bit of work for any UI mods to adapt to. If your mods don't
   touch UI stuff at all you can simply bump your api version and call it a day.

CHANGELOG.md

@@ -455,14 +455,14 @@ def copy_dev_console_history() -> None:
         )
         return
 
-    # Just dump everything in the log-handler's cache.
+    # Just dump everything that's in the log-handler's cache.
     archive = envconfig.log_handler.get_cached()
     lines: list[str] = []
     stdnames = ('stdout', 'stderr')
     for entry in archive.entries:
         reltime = entry.time.timestamp() - envconfig.launch_time
         level_ex = '' if entry.name in stdnames else f' {entry.level.name}'
-        lines.append(f'{reltime:.3f} {entry.name}{level_ex}: {entry.message}')
+        lines.append(f'{reltime:.3f}{level_ex} {entry.name}: {entry.message}')
 
     _babase.clipboard_set_text('\n'.join(lines))
     _babase.screenmessage(Lstr(resource='copyConfirmText'), color=(0, 1, 0))

src/assets/ba_data/python/babase/_hooks.py

@@ -53,7 +53,7 @@
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 22117
+TARGET_BALLISTICA_BUILD = 22118
 TARGET_BALLISTICA_VERSION = '1.7.37'
 
 

src/assets/ba_data/python/baenv.py

@@ -377,6 +377,11 @@ def _refresh(self) -> None:
         )
         link_accounts_button_space = 70.0
 
+        show_v1_obsolete_note = self._v1_signed_in and (
+            primary_v2_account is None
+        )
+        v1_obsolete_note_space = 80.0
+
         show_unlink_accounts_button = show_link_accounts_button
         unlink_accounts_button_space = 90.0
 
@@ -434,6 +439,8 @@ def _refresh(self) -> None:
             self._sub_height += manage_account_button_space
         if show_link_accounts_button:
             self._sub_height += link_accounts_button_space
+        if show_v1_obsolete_note:
+            self._sub_height += v1_obsolete_note_space
         if show_unlink_accounts_button:
             self._sub_height += unlink_accounts_button_space
         if show_v2_link_info:
@@ -800,6 +807,26 @@ def _refresh(self) -> None:
             bui.widget(edit=btn, show_buffer_bottom=40, show_buffer_top=100)
             self._sign_in_text = None
 
+        if show_v1_obsolete_note:
+            v -= v1_obsolete_note_space
+            bui.textwidget(
+                parent=self._subcontainer,
+                h_align='center',
+                v_align='center',
+                size=(0, 0),
+                position=(self._sub_width * 0.5, v + 35.0),
+                text=(
+                    'YOU ARE SIGNED IN WITH A V1 ACCOUNT.\n'
+                    'THESE ARE NO LONGER SUPPORTED AND MANY\n'
+                    'FEATURES WILL NOT WORK. PLEASE SWITCH TO\n'
+                    'A V2 ACCOUNT OR UPGRADE THIS ONE.'
+                ),
+                maxwidth=self._sub_width * 0.8,
+                color=(1, 0, 0),
+                shadow=1.0,
+                flatness=1.0,
+            )
+
         if show_manage_account_button:
             button_width = 300
             v -= manage_account_button_space
@@ -1233,8 +1260,8 @@ def _have_unlinkable_v1_accounts(self) -> bool:
         plus = bui.app.plus
         assert plus is not None
 
-        # if this is not present, we haven't had contact from the server so
-        # let's not proceed..
+        # If this is not present, we haven't had contact from the server
+        # so let's not proceed.
         if plus.get_v1_account_public_login_id() is None:
             return False
         accounts = plus.get_v1_account_misc_read_val_2('linkedAccounts', [])
@@ -1251,7 +1278,8 @@ def _update_unlink_accounts_button(self) -> None:
 
     def _should_show_legacy_unlink_button(self) -> bool:
         plus = bui.app.plus
-        assert plus is not None
+        if plus is None:
+            return False
 
         # Only show this when fully signed in to a v2 account.
         if not self._v1_signed_in or plus.accounts.primary is None:

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

@@ -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 = 22117;
+const int kEngineBuildNumber = 22118;
 const char* kEngineVersion = "1.7.37";
 const int kEngineApiVersion = 9;
 

src/ballistica/shared/ballistica.cc

@@ -84,21 +84,12 @@ bool UIV1FeatureSet::PartyIconVisible() {
 
 void UIV1FeatureSet::SetAccountState(bool signed_in, const std::string& name) {
   assert(root_widget_.Exists());
-  // Store the value and plug it in if we've got a live widget.
-  // account_signed_in_ = signed_in;
-  // account_name_ = name;
-  // if (auto* r = root_widget()) {
   root_widget_->SetAccountState(signed_in, name);
-  // }
 }
 
 void UIV1FeatureSet::SetSquadSizeLabel(int num) {
   assert(root_widget_.Exists());
-  // Store the value and plug it in if we've got a live widget.
-  // party_icon_number_ = num;
-  // if (auto* r = root_widget()) {
   root_widget_->SetSquadSizeLabel(num);
-  // }
 }
 
 void UIV1FeatureSet::ActivatePartyIcon() {

src/ballistica/ui_v1/ui_v1.cc

@@ -1289,7 +1289,7 @@ void RootWidget::SetAccountState(bool signed_in, const std::string& name) {
     assert(wb);
 
     if (signed_in) {
-      w->SetText(name);
+      w->SetText(g_base->assets->CharStr(SpecialChar::kV2Logo) + name);
       w->set_color(0.0f, 0.4f, 0.1f, 1.0f);
       w->set_shadow(0.2f);
       w->set_flatness(1.0f);
@@ -1336,15 +1336,15 @@ void RootWidget::SetLeagueType(const std::string& val) {
   Vector3f color{};
 
   if (val == "") {
-    color = {0.5f, 0.5f, 0.5f};
+    color = {0.4f, 0.4f, 0.4f};
   } else if (val == "b") {
     color = {1.0f, 0.7f, 0.5f};
   } else if (val == "s") {
-    color = {1.0f, 1.0f, 1.0f};
+    color = {1.0f, 1.0f, 1.4f};
   } else if (val == "g") {
-    color = {1.4f, 0.8f, 0.2f};
+    color = {1.4f, 1.0f, 0.4f};
   } else if (val == "d") {
-    color = {1.2f, 0.8f, 1.5f};
+    color = {1.0f, 0.8f, 2.0f};
   } else {
     g_core->Log(LogName::kBa, LogLevel::kError,
                 "RootWidget: Invalid league type '" + val + "'.");