ygopro-msg-encode 1.1.31 → 1.2.0-0

package/dist/index.cjs

@@ -975,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
@@ -1009,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
@@ -1022,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) {
@@ -1053,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;
         }
@@ -1132,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");
@@ -1172,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