ygopro-msg-encode 1.1.30 → 1.2.0-0

package/dist/index.cjs

@@ -236,6 +236,7 @@ __export(index_exports, {
   createClearedCardQuery: () => createClearedCardQuery,
   createCodeHiddenCardQuery: () => createCodeHiddenCardQuery,
   fillBinaryFields: () => fillBinaryFields,
+  getCardQueryPosition: () => getCardQueryPosition,
   isIndexResponse: () => isIndexResponse,
   parseCardQueryChunk: () => parseCardQueryChunk,
   serializeCardQuery: () => serializeCardQuery,
@@ -974,23 +975,24 @@ var OcgcoreCommonConstants = {
 };
 
 // src/protos/common/card-data.ts
-var CARD_ARTWORK_VERSIONS_OFFSET = 20;
-var CARD_BLACK_LUSTER_SOLDIER2 = 5405695;
-var CARD_MARINE_DOLPHIN = 78734254;
-var CARD_TWINKLE_MOSS = 13857930;
+var SECOND_CODE_CARDS = /* @__PURE__ */ new Set([
+  78734254,
+  // CARD_MARINE_DOLPHIN
+  13857930,
+  // CARD_TWINKLE_MOSS
+  1784686,
+  // CARD_TIMAEUS
+  11082056,
+  // CARD_CRITIAS
+  46232525
+  // CARD_HERMOS
+]);
 function checkSetcode(setcode, value) {
   const settype = value & 4095;
   const setsubtype = value & 61440;
-  return setcode && (setcode & 4095) === settype && (setcode & setsubtype) === setsubtype;
+  return !!setcode && (setcode & 4095) === settype && (setcode & setsubtype) === setsubtype;
 }
 __name(checkSetcode, "checkSetcode");
-function isAlternative(code, alias) {
-  if (code === CARD_BLACK_LUSTER_SOLDIER2) {
-    return false;
-  }
-  return alias && alias < code + CARD_ARTWORK_VERSIONS_OFFSET && code < alias + CARD_ARTWORK_VERSIONS_OFFSET;
-}
-__name(isAlternative, "isAlternative");
 var _CardData = class _CardData extends PayloadBase {
   /**
    * Check if this card belongs to a specific setcode
@@ -1008,12 +1010,11 @@ var _CardData = class _CardData extends PayloadBase {
     }
     return false;
   }
-  /**
-   * Get the original code of this card (handles alternate artworks)
-   * @returns The original card code
-   */
   getOriginalCode() {
-    return isAlternative(this.code, this.alias) ? this.alias : this.code;
+    return this.alias ? this.alias : this.code;
+  }
+  getDuelCode() {
+    return this.ruleCode ? this.ruleCode : this.getOriginalCode();
   }
   /**
    * Check if this card can be declared with the given opcode filter
@@ -1021,6 +1022,9 @@ var _CardData = class _CardData extends PayloadBase {
    * @returns true if the card can be declared
    */
   isDeclarable(opcode) {
+    if (this.alias) {
+      return false;
+    }
     const stack = [];
     for (const it of opcode) {
       switch (it) {
@@ -1052,7 +1056,7 @@ var _CardData = class _CardData extends PayloadBase {
           if (stack.length >= 2) {
             const rhs = stack.pop();
             const lhs = stack.pop();
-            stack.push(Math.floor(lhs / rhs));
+            stack.push(rhs !== 0 ? Math.floor(lhs / rhs) : 0);
           }
           break;
         }
@@ -1131,7 +1135,10 @@ var _CardData = class _CardData extends PayloadBase {
     if (stack.length !== 1 || stack[0] === 0) {
       return false;
     }
-    return this.code === CARD_MARINE_DOLPHIN || this.code === CARD_TWINKLE_MOSS || !this.alias && (this.type & (OcgcoreCommonConstants.TYPE_MONSTER | OcgcoreCommonConstants.TYPE_TOKEN)) !== (OcgcoreCommonConstants.TYPE_MONSTER | OcgcoreCommonConstants.TYPE_TOKEN);
+    if (!SECOND_CODE_CARDS.has(this.code) && (this.ruleCode || this.type & OcgcoreCommonConstants.TYPE_TOKEN)) {
+      return false;
+    }
+    return true;
   }
 };
 __name(_CardData, "CardData");
@@ -1171,6 +1178,9 @@ __decorateClass([
 __decorateClass([
   BinaryField("u32", 72)
 ], _CardData.prototype, "linkMarker", 2);
+__decorateClass([
+  BinaryField("u32", 76)
+], _CardData.prototype, "ruleCode", 2);
 var CardData = _CardData;
 
 // src/protos/common/card-query.ts
@@ -1202,7 +1212,9 @@ var _CardQuery = class _CardQuery {
     }
     if (this.flags & OcgcoreCommonConstants.QUERY_POSITION) {
       const pdata = view.getUint32(offset, true);
-      this.positionData = pdata;
+      this.controller = pdata & 255;
+      this.location = pdata >>> 8 & 255;
+      this.sequence = pdata >>> 16 & 255;
       this.position = (pdata >>> 24 & 255) >>> 0;
       offset += 4;
     }
@@ -1251,16 +1263,20 @@ var _CardQuery = class _CardQuery {
       offset += 4;
     }
     if (this.flags & OcgcoreCommonConstants.QUERY_REASON_CARD) {
-      this.reasonCardData = view.getUint32(offset, true);
+      this.reasonCard = {
+        controller: view.getUint8(offset),
+        location: view.getUint8(offset + 1),
+        sequence: view.getUint8(offset + 2),
+        position: view.getUint8(offset + 3)
+      };
       offset += 4;
     }
     if (this.flags & OcgcoreCommonConstants.QUERY_EQUIP_CARD) {
-      const pdata = view.getUint32(offset, true);
-      this.equipCardData = pdata;
       this.equipCard = {
         controller: view.getUint8(offset),
         location: view.getUint8(offset + 1),
-        sequence: view.getUint8(offset + 2)
+        sequence: view.getUint8(offset + 2),
+        position: view.getUint8(offset + 3)
       };
       offset += 4;
     }
@@ -1268,13 +1284,12 @@ var _CardQuery = class _CardQuery {
       const count = view.getInt32(offset, true);
       offset += 4;
       this.targetCards = [];
-      this.targetCardData = [];
       for (let i = 0; i < count; i++) {
-        this.targetCardData.push(view.getUint32(offset, true));
         this.targetCards.push({
           controller: view.getUint8(offset),
           location: view.getUint8(offset + 1),
-          sequence: view.getUint8(offset + 2)
+          sequence: view.getUint8(offset + 2),
+          position: view.getUint8(offset + 3)
         });
         offset += 4;
       }
@@ -1376,7 +1391,7 @@ function serializeCardQuery(card) {
     offset += 4;
   }
   if (flags & OcgcoreCommonConstants.QUERY_POSITION) {
-    const pdata = source.positionData !== void 0 ? source.positionData >>> 0 : (source.position || 0) << 24 >>> 0;
+    const pdata = (source.controller || 0) & 255 | ((source.location || 0) & 255) << 8 | ((source.sequence || 0) & 255) << 16 | ((source.position || 0) & 255) << 24;
     view.setUint32(offset, pdata, true);
     offset += 4;
   }
@@ -1425,25 +1440,30 @@ function serializeCardQuery(card) {
     offset += 4;
   }
   if (flags & OcgcoreCommonConstants.QUERY_REASON_CARD) {
-    view.setUint32(offset, (source.reasonCardData || 0) >>> 0, true);
+    const reasonCard = source.reasonCard || {
+      controller: 0,
+      location: 0,
+      sequence: 0,
+      position: 0
+    };
+    view.setUint8(offset, reasonCard.controller);
+    view.setUint8(offset + 1, reasonCard.location);
+    view.setUint8(offset + 2, reasonCard.sequence);
+    view.setUint8(offset + 3, reasonCard.position || 0);
     offset += 4;
   }
   if (flags & OcgcoreCommonConstants.QUERY_EQUIP_CARD) {
-    if (source.equipCardData !== void 0) {
-      view.setUint32(offset, source.equipCardData >>> 0, true);
-      offset += 4;
-    } else {
-      const equipCard = source.equipCard || {
-        controller: 0,
-        location: 0,
-        sequence: 0
-      };
-      view.setUint8(offset, equipCard.controller);
-      view.setUint8(offset + 1, equipCard.location);
-      view.setUint8(offset + 2, equipCard.sequence);
-      view.setUint8(offset + 3, 0);
-      offset += 4;
-    }
+    const equipCard = source.equipCard || {
+      controller: 0,
+      location: 0,
+      sequence: 0,
+      position: 0
+    };
+    view.setUint8(offset, equipCard.controller);
+    view.setUint8(offset + 1, equipCard.location);
+    view.setUint8(offset + 2, equipCard.sequence);
+    view.setUint8(offset + 3, equipCard.position || 0);
+    offset += 4;
   }
   if (flags & OcgcoreCommonConstants.QUERY_TARGET_CARD) {
     const targets = source.targetCards || [];
@@ -1451,15 +1471,10 @@ function serializeCardQuery(card) {
     offset += 4;
     for (let i = 0; i < targets.length; i++) {
       const target = targets[i];
-      const rawTarget = source.targetCardData?.[i];
-      if (rawTarget !== void 0) {
-        view.setUint32(offset, rawTarget >>> 0, true);
-      } else {
-        view.setUint8(offset, target.controller);
-        view.setUint8(offset + 1, target.location);
-        view.setUint8(offset + 2, target.sequence);
-        view.setUint8(offset + 3, 0);
-      }
+      view.setUint8(offset, target.controller);
+      view.setUint8(offset + 1, target.location);
+      view.setUint8(offset + 2, target.sequence);
+      view.setUint8(offset + 3, target.position || 0);
       offset += 4;
     }
   }
@@ -1582,6 +1597,13 @@ function createCodeHiddenCardQuery(source) {
   return card;
 }
 __name(createCodeHiddenCardQuery, "createCodeHiddenCardQuery");
+function getCardQueryPosition(card) {
+  if (!card) {
+    return void 0;
+  }
+  return typeof card.position === "number" ? card.position : void 0;
+}
+__name(getCardQueryPosition, "getCardQueryPosition");
 
 // src/proto-base/ygopro-proto-base.ts
 var _YGOProProtoBase = class _YGOProProtoBase extends PayloadBase {
@@ -6006,7 +6028,8 @@ var YGOProMsgUnequip = _YGOProMsgUnequip;
 var _YGOProMsgUpdateCard = class _YGOProMsgUpdateCard extends YGOProMsgBase {
   opponentView() {
     const copy = this.copy();
-    if (copy.card?.position && copy.card.position & OcgcoreCommonConstants.POS_FACEDOWN) {
+    const position = getCardQueryPosition(copy.card);
+    if (position && position & OcgcoreCommonConstants.POS_FACEDOWN) {
       copy.card = createCodeHiddenCardQuery(copy.card);
     }
     return copy;
@@ -6088,23 +6111,25 @@ var _YGOProMsgUpdateData = class _YGOProMsgUpdateData extends YGOProMsgBase {
     return void 0;
   }
   shouldHideForOpponent(card) {
+    const position = getCardQueryPosition(card);
     if (this.location === OcgcoreScriptConstants.LOCATION_GRAVE) {
       return false;
     }
     if (this.location === OcgcoreScriptConstants.LOCATION_HAND) {
-      return !card.position || !(card.position & OcgcoreCommonConstants.POS_FACEUP);
+      return !position || !(position & OcgcoreCommonConstants.POS_FACEUP);
     }
-    return !!(card.position && card.position & OcgcoreCommonConstants.POS_FACEDOWN);
+    return !!(position && position & OcgcoreCommonConstants.POS_FACEDOWN);
   }
   shouldHideForTeammate(card) {
+    const position = getCardQueryPosition(card);
     if (this.location === OcgcoreScriptConstants.LOCATION_MZONE || this.location === OcgcoreScriptConstants.LOCATION_SZONE || this.location === OcgcoreScriptConstants.LOCATION_REMOVED || this.location === OcgcoreScriptConstants.LOCATION_GRAVE) {
       return false;
     }
     if (this.location === OcgcoreScriptConstants.LOCATION_HAND) {
-      return !card.position || !(card.position & OcgcoreCommonConstants.POS_FACEUP);
+      return !position || !(position & OcgcoreCommonConstants.POS_FACEUP);
     }
     if (this.location === OcgcoreScriptConstants.LOCATION_EXTRA) {
-      return !!(card.position && card.position & OcgcoreCommonConstants.POS_FACEDOWN);
+      return !!(position && position & OcgcoreCommonConstants.POS_FACEDOWN);
     }
     return false;
   }
@@ -6936,6 +6961,7 @@ YGOProStoc.register(YGOProStocSrvproRoomlist);
   createClearedCardQuery,
   createCodeHiddenCardQuery,
   fillBinaryFields,
+  getCardQueryPosition,
   isIndexResponse,
   parseCardQueryChunk,
   serializeCardQuery,