From a030983b61cda94adf81b0c334c768e48dcf1b8c Mon Sep 17 00:00:00 2001
From: James Osborne <incentive@circlewithadot.net>
Date: Sun, 31 May 2026 08:42:39 -0400
Subject: [PATCH] Fix BB EP4 solo quest unlocks and ship-state marking

---
 src/Client.cc          | 14 ++++++++++++++
 src/ReceiveCommands.cc |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/src/Client.cc b/src/Client.cc
index 9ea84de9..d1575ce5 100644
--- a/src/Client.cc
+++ b/src/Client.cc
@@ -405,6 +405,13 @@ bool Client::can_see_quest(
   if (!q->has_version_any_language(this->version())) {
     return false;
   }
+  if ((this->version() == Version::BB_V4) &&
+      game &&
+      (game->mode == GameMode::SOLO) &&
+      (game->episode == Episode::EP4) &&
+      (q->meta.episode == Episode::EP4)) {
+    return true;
+  }
   return this->evaluate_quest_availability_expression(
       q->meta.available_expression, game, event, difficulty, num_players, v1_present);
 }
@@ -422,6 +429,13 @@ bool Client::can_play_quest(
   if ((q->meta.max_players > 0) && (num_players > q->meta.max_players)) {
     return false;
   }
+  if ((this->version() == Version::BB_V4) &&
+      game &&
+      (game->mode == GameMode::SOLO) &&
+      (game->episode == Episode::EP4) &&
+      (q->meta.episode == Episode::EP4)) {
+    return true;
+  }
   return this->evaluate_quest_availability_expression(
       q->meta.enabled_expression, game, event, difficulty, num_players, v1_present);
 }
diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index 41281dce..b959160b 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -4409,6 +4409,13 @@ static asio::awaitable<void> on_E5_BB(shared_ptr<Client> c, Channel::Message& ms
         }
         c->log.info_f("Marked BB character as Test: {}", c->character_filename());
       }
+      if (!enforce_bb_test_ship_lock(c, s->enable_test_mode)) {
+        c->unload_character(false);
+        should_send_approve = false;
+      } else if (!enforce_bb_hardcore_ship_lock(c, s->enable_hardcore_mode)) {
+        c->unload_character(false);
+        should_send_approve = false;
+      }
     } catch (const exception& e) {
       send_message_box(c, std::format("$C6New character could not be created:\n{}", e.what()));
       should_send_approve = false;