Merge branch 'fix/announce' into 'main'

Fix/announce

See merge request !216

src/service/duel/announce.ts

@@ -38,14 +38,15 @@ export default async (announce: MsgAnnounce) => {
     }
     case MsgAnnounce.AnnounceType.Card: {
       announceModal.title = fetchStrings("!system", 564);
-      announceModal.options = await Promise.all(
-        announce.options.map(async (option) => ({
-          info: await fetchCard(option.code).then(
-            (meta) => meta.text.name ?? "[?]"
-          ),
-          response: option.response,
-        }))
-      );
+      for (const option of announce.options) {
+        const meta = await fetchCard(option.code);
+        if (meta.text.name) {
+          announceModal.options.push({
+            info: meta.text.name,
+            response: option.response,
+          });
+        }
+      }
       announceModal.isOpen = true;
 
       break;

src/service/duel/gameMsg.ts

@@ -136,7 +136,7 @@ async function _handleGameMsg(pb: ygopro.YgoStocMsg) {
       break;
     }
     case "select_option": {
-      onMsgSelectOption(msg.select_option);
+      await onMsgSelectOption(msg.select_option);
 
       break;
     }

src/ui/Duel/PlayMat/Card/index.tsx

@@ -157,6 +157,7 @@ const onCardClick = (card: CardType) => {
     (interactivity) => ({
       desc: interactTypeToString(interactivity.interactType),
       response: interactivity.response,
+      effectCode: interactivity.activateIndex,
     })
   );
   messageStore.cardModal.counters = card.counters;