Finish blackjack implementation

Author: CodeDoctorDE

.gitignore

@@ -3,3 +3,4 @@
 *.iws
 .idea/
 .vscode/
+target/

api/lib/src/event/process/client.dart

@@ -96,21 +96,21 @@ class KickServerResponse extends ServerResponse {
 }
 
 class UpdateServerResponse extends ServerResponse {
-  final NetworkerPacket<ServerWorldEvent> main;
+  final NetworkerPacket<ServerWorldEvent>? main;
   final Set<Channel> needsUpdate;
 
   UpdateServerResponse(this.main, [this.needsUpdate = const {}]);
   UpdateServerResponse.builder(
-    ServerWorldEvent event, [
+    ServerWorldEvent? event, [
     Channel channel = kAnyChannel,
     this.needsUpdate = const {},
-  ]) : main = NetworkerPacket(event, channel);
+  ]) : main = event == null ? null : NetworkerPacket(event, channel);
 
   List<NetworkerPacket<ServerWorldEvent>> buildPackets(
     WorldState state,
     Iterable<Channel> connected,
   ) {
-    return [main, ...buildUpdatePackets(state, connected)];
+    return [?main, ...buildUpdatePackets(state, connected)];
   }
 
   List<NetworkerPacket<WorldInitialized>> buildUpdatePackets(
@@ -419,6 +419,6 @@ Future<ServerResponse?> processClientEvent(
       }
       return UpdateServerResponse.builder(buildInitialize(), channel);
     case ToolbarActionRequest():
-      return null;
+      return UpdateServerResponse.builder(null);
   }
 }

app/lib/bloc/world/bloc.dart

@@ -216,7 +216,8 @@ class WorldBloc extends Bloc<PlayableWorldEvent, ClientWorldState> {
             allowServerEvents: true,
           );
           if (event is! UpdateServerResponse) break;
-          add(event.main.data);
+          final result = event.main?.data;
+          if (result != null) add(result);
           final updatePacket = event.buildUpdatePackets(state.world, {
             kAuthorityChannel,
           }).firstOrNull;

app/pack/scripts/blackjack.luau

@@ -10,7 +10,7 @@ local StackPosition = {
   y="1"
 }
 local StackPositionLocation = "("..StackPosition.x..", "..StackPosition.y..")"
-local CurrentPlayer = 1
+local CurrentPlayer = nil
 local PlayerScores : {[number]: number} = {}
 local Colors = {
   "heart",
@@ -79,7 +79,7 @@ end
 function Reset()
   ResetWorld()
   PlayerScores = {}
-  CurrentPlayer = 1
+  CurrentPlayer = nil
   Setup()
 end
 function Setup()
@@ -180,26 +180,34 @@ function CalculateStack(optionalCard : any) : number
   end
   return lowestOver or 0
 end
-function GetNextPlayer() : number?
-  local index = table.find(State.Players, CurrentPlayer)
-  if not index then
-    return nil
-  end
-  index = index + 1
-  if index > #State.Players then
-    index = 1
+function FinishTurn(score)
+  if not score then
+    score = CalculateStack()
   end
-  return State.Players[index]
-end
-function NextRound()
-  PlayerScores[CurrentPlayer] = CalculateStack()
+  PlayerScores[CurrentPlayer] = score
+  Server:Send({
+    type="MessageSent",
+    user=0,
+    message="Player "..CurrentPlayer.." finished with "..score.." points."
+  }, nil)
   RemoveStack()
-  CurrentPlayer = GetNextPlayer() or CurrentPlayer
-  if CurrentPlayer == 1 then
-    -- All players had their turn, round is over.
+  
+  local allPlayed = true
+  if State.Players then
+    for _, player in ipairs(State.Players) do
+      if not PlayerScores[player] then
+        allPlayed = false
+        break
+      end
+    end
+  end
+
+  CurrentPlayer = nil
+  if allPlayed then
     FinishRound()
+  else
+    print("Waiting for next player to take a card.")
   end
-  print("Player "..CurrentPlayer.."'s turn")
 end
 function FinishRound()
   -- Determine winner(s)
@@ -242,7 +250,12 @@ function OnNewCard()
   }, nil)
   if score > MaxScore then
     print("Player "..CurrentPlayer.." busted!")
-    NextRound()
+    Server:Send({
+      type="MessageSent",
+      user=0,
+      message="Player "..CurrentPlayer.." busted with "..score.." points!"
+    }, nil)
+    FinishTurn(score)
   end
 end
 
@@ -268,6 +281,16 @@ Events.ObjectsMoved.Connect(function(event, details)
     details.cancelled = true
     return
   end
+
+  if CurrentPlayer == nil then
+    CurrentPlayer = details.source
+    print("Player "..CurrentPlayer.." started turn.")
+  elseif CurrentPlayer ~= details.source then
+    print("It's not your turn! Current player: "..tostring(CurrentPlayer))
+    details.cancelled = true
+    return
+  end
+
   OnNewCard()
   details:ScheduleEvent({
     type="CellHideChanged",
@@ -279,7 +302,7 @@ Events.MessageRequest.Connect(function(event, details)
   local message = event.message:lower()
   if message == "!stand" or message == "!stay" then
     if details.source == CurrentPlayer then
-      NextRound()
+      FinishTurn()
     else
       print("It's not your turn!")
     end
@@ -292,11 +315,6 @@ Events.UserJoined.Connect(function(event, details)
     toolbar={
       editable=false,
       actions={
-        {
-          id="blackjack_hit",
-          label="Hit",
-          enabled=true,
-        },
         {
           id="blackjack_stand",
           label="Stand",
@@ -306,5 +324,23 @@ Events.UserJoined.Connect(function(event, details)
     }
   }, details.source)
 end)
+Events.ToolbarActionRequest.Connect(function(event, details)
+  print("Toolbar action requested: "..event.actionId)
+  if event.actionId == "blackjack_hit" then
+    if details.source == CurrentPlayer then
+      OnNewCard()
+    else
+      print("It's not your turn!")
+    end
+    details.cancelled = true
+  elseif event.actionId == "blackjack_stand" then
+    if details.source == CurrentPlayer then
+      FinishTurn()
+    else
+      print("It's not your turn!")
+    end
+    details.cancelled = true
+  end
+end)
 
 Setup()

app/pubspec.lock

@@ -278,10 +278,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: dd0e8e02186b2196c7848c9d394a5fd6e5b57a43a546082c5820b1ec72317e33
+      sha256: "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c"
       url: "https://pub.dev"
     source: hosted
-    version: "12.2.0"
+    version: "12.3.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -493,18 +493,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: f7eceb0bc6f4fd0441e29d43cab9ac2a1c5ffd7ea7b64075136b718c46954874
+      sha256: "79d53f3393ac2b73bcba45317b6c1a29002f89c680225cdea0bd6770a1682ce0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0-beta.4"
+    version: "10.0.0-beta.5"
   flutter_secure_storage_darwin:
     dependency: transitive
     description:
       name: flutter_secure_storage_darwin
-      sha256: f226f2a572bed96bc6542198ebaec227150786e34311d455a7e2d3d06d951845
+      sha256: "81ef5abfb9cbeb78110d8043ba29f0b36cd7ffa989baa1b2d9482542b2200051"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0"
+    version: "0.1.1"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
@@ -937,10 +937,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "97390a0719146c7c3e71b6866c34f1cde92685933165c1c671984390d2aca776"
+      sha256: "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.5.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1159,10 +1159,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "46a46fd64659eff15f4638bbe19de43f9483f0e0bf024a9fb6b3582064bacc7b"
+      sha256: "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.17"
+    version: "2.4.18"
   shared_preferences_foundation:
     dependency: transitive
     description:

docs/package.json

@@ -10,25 +10,25 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/check": "^0.9.5",
+    "@astrojs/check": "^0.9.6",
     "@astrojs/react": "^4.4.2",
-    "@astrojs/starlight": "^0.36.3",
+    "@astrojs/starlight": "^0.37.0",
     "@phosphor-icons/react": "^2.1.10",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "astro": "^5.16.0",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "astro": "^5.16.4",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
     "remark-gemoji": "^8.0.0",
     "remark-heading-id": "^1.0.1",
     "typescript": "^5.9.3"
   },
   "packageManager": "[email protected]",
   "devDependencies": {
-    "@vite-pwa/astro": "^1.1.1",
+    "@vite-pwa/astro": "^1.2.0",
     "sass": "^1.94.2",
     "sharp": "^0.34.5",
-    "vite-plugin-pwa": "^1.1.0",
+    "vite-plugin-pwa": "^1.2.0",
     "workbox-window": "^7.4.0"
   }
 }