Merge branch 'feat/confirm_cards' into 'main'

Feat/confirm cards

See merge request !211

neos-protobuf @ ee60c75c

-Subproject commit e7729f2ca07b8d4704806e37d05f896d5cefafdd
+Subproject commit ee60c75c921a82e6592d119a21339361d3723258

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.json

@@ -134,7 +134,21 @@
     ]
   },
   "30": {
-    "protoType": "confirm_desktop",
+    "protoType": "confirm_cards",
+    "fields": [
+      {
+        "fieldName": "player",
+        "fieldType": "uint8"
+      },
+      {
+        "fieldName": "cards",
+        "fieldType": "repeated",
+        "repeatedType": "CardInfo"
+      }
+    ]
+  },
+  "31": {
+    "protoType": "confirm_cards",
     "fields": [
       {
         "fieldName": "player",

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.ts

@@ -33,7 +33,7 @@ const MsgConstructorMap: Map<string, Constructor> = new Map([
   ["chain_solved", ygopro.StocGameMessage.MsgChainSolved],
   ["chain_end", ygopro.StocGameMessage.MsgChainEnd],
   ["lp_update", ygopro.StocGameMessage.MsgLpUpdate],
-  ["confirm_desktop", ygopro.StocGameMessage.MsgConfirmDeskTop],
+  ["confirm_cards", ygopro.StocGameMessage.MsgConfirmCards],
 ]);
 
 export interface penetrateType {

src/service/duel/confirmDeskTop.ts → src/service/duel/confirmCards.ts

@@ -2,10 +2,8 @@ import { fetchCard, ygopro } from "@/api";
 import { sleep } from "@/infra";
 import { matStore } from "@/stores";
 
-export default async (
-  confirmDeskTop: ygopro.StocGameMessage.MsgConfirmDeskTop
-) => {
-  const cards = confirmDeskTop.cards;
+export default async (confirmCards: ygopro.StocGameMessage.MsgConfirmCards) => {
+  const cards = confirmCards.cards;
 
   for (const card of cards) {
     const target = matStore

src/service/duel/gameMsg.ts

@@ -7,7 +7,7 @@ import onMsgAttackDisable from "./attackDisable";
 import onMsgChainEnd from "./chainEnd";
 import onMsgChaining from "./chaining";
 import onMsgChainSolved from "./chainSolved";
-import onConfirmDeskTop from "./confirmDeskTop";
+import onConfirmCards from "./confirmCards";
 import onMsgDraw from "./draw";
 import onMsgFilpSummoned from "./flipSummoned";
 import onMsgFlipSummoning from "./flipSummoning";
@@ -283,8 +283,8 @@ export default async function handleGameMsg(pb: ygopro.YgoStocMsg) {
 
       break;
     }
-    case "confirm_desktop": {
-      await onConfirmDeskTop(msg.confirm_desktop);
+    case "confirm_cards": {
+      await onConfirmCards(msg.confirm_cards);
 
       break;
     }