Fix blackjack values and use new card to calculate

Author: CodeDoctorDE

api/pubspec.lock

@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: a40a0cee526a7e1f387c6847bd8a5ccbf510a75952ef8a28338e989558072cb0
+      sha256: f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08
       url: "https://pub.dev"
     source: hosted
-    version: "8.4.0"
+    version: "8.4.1"
   ansicolor:
     dependency: transitive
     description:

app/pack/scripts/blackjack.luau

@@ -17,7 +17,6 @@ local Colors = {
   "spade"
 }
 local Values = {
-  "1",
   "2",
   "3",
   "4",
@@ -87,7 +86,6 @@ function RemoveStack()
   }, true)
 end
 local VariationsScores : {[string]: {number}} = {
-  ["1"] = {1},
   ["2"] = {2},
   ["3"] = {3},
   ["4"] = {4},
@@ -122,16 +120,19 @@ function GetCellObjects(position)
   end
   return cell.objects or {}
 end
-function CalculateStack() : number
+function CalculateStack(optionalCardId : string?) : number
   -- Gather identifiers of cards currently in the stack cell.
   -- Assuming an API like GetCellObjects(cell) -> { { identifier = "..." }, ... }
   local objects = GetCellObjects(StackPosition)
+  if optionalCardId then
+    table.insert(objects, { identifier = optionalCardId })
+  end
 
   -- Start with a single possible sum: 0
   local sums = {0}
 
   for _, obj in pairs(objects) do
-    local id = obj.identifier or obj.id or obj.cardId
+    local id = obj.identifier
     if id then
       local values = CalculateCard(id) or {0}
       local newSums = {}
@@ -211,8 +212,16 @@ function FinishRound()
   end
   Reset()
 end
-function OnNewCard()
-  local score = CalculateStack()
+function GetTopCardFromDeck() : string?
+  local cell = State.Table.cells["("..DeckPosition.x..", "..DeckPosition.y..")"]
+  if not cell or not cell.objects or #cell.objects == 0 then
+    return nil
+  end
+  return cell.objects[1].identifier
+end
+function OnNewCard(from, objectId)
+  local topCardId = GetTopCardFromDeck()
+  local score = CalculateStack(topCardId)
   print("Current score: "..score)
   if score > MaxScore then
     print("Player "..CurrentPlayer.." busted!")
@@ -234,7 +243,8 @@ end)
 Events.ObjectMoved.Connect(function(event, details)
   local isFromDeck = event.from.table == DeckPosition.table and event.from.x == DeckPosition.x and event.from.y == DeckPosition.y
   local isToStack = event.to.table == StackPosition.table and event.to.x == StackPosition.x and event.to.y == StackPosition.y
-  if(not isFromDeck or not isToStack) then
+  local isOneObject = #event.objects == 1 and event.objects[1] == 0
+  if(not isFromDeck or not isToStack or not isOneObject) then
     details.cancelled = true
     return
   end

app/pubspec.lock

@@ -564,10 +564,10 @@ packages:
     dependency: transitive
     description:
       name: get_it
-      sha256: a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b
+      sha256: ae78de7c3f2304b8d81f2bb6e320833e5e81de942188542328f074978cc0efa9
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.3.0"
   glob:
     dependency: transitive
     description:
@@ -1240,14 +1240,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.1"
-  sprintf:
-    dependency: transitive
-    description:
-      name: sprintf
-      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.0"
   stack_trace:
     dependency: transitive
     description:
@@ -1413,10 +1405,10 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.1"
+    version: "4.5.2"
   vector_graphics:
     dependency: transitive
     description:

docs/package.json

@@ -11,12 +11,12 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.9.5",
-    "@astrojs/react": "^4.4.0",
-    "@astrojs/starlight": "^0.36.1",
+    "@astrojs/react": "^4.4.1",
+    "@astrojs/starlight": "^0.36.2",
     "@phosphor-icons/react": "^2.1.10",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.2.2",
-    "astro": "^5.15.1",
+    "astro": "^5.15.3",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "remark-gemoji": "^8.0.0",
@@ -26,7 +26,7 @@
   "packageManager": "[email protected]",
   "devDependencies": {
     "@vite-pwa/astro": "^1.1.1",
-    "sass": "^1.93.2",
+    "sass": "^1.93.3",
     "sharp": "^0.34.4",
     "vite-plugin-pwa": "^1.1.0",
     "workbox-window": "^7.3.0"