ygopro-msg-encode 1.1.25 → 1.1.27

package/dist/index.cjs

@@ -199,6 +199,8 @@ __export(index_exports, {
   YGOProMsgTagSwap: () => YGOProMsgTagSwap,
   YGOProMsgTossCoin: () => YGOProMsgTossCoin,
   YGOProMsgTossDice: () => YGOProMsgTossDice,
+  YGOProMsgUnequip: () => YGOProMsgUnequip,
+  YGOProMsgUnequip_CardLocation: () => YGOProMsgUnequip_CardLocation,
   YGOProMsgUpdateCard: () => YGOProMsgUpdateCard,
   YGOProMsgUpdateData: () => YGOProMsgUpdateData,
   YGOProMsgWaiting: () => YGOProMsgWaiting,
@@ -231,9 +233,13 @@ __export(index_exports, {
   YGOProStocTpResult: () => YGOProStocTpResult,
   YGOProStocTypeChange: () => YGOProStocTypeChange,
   YGOProStocWaitingSide: () => YGOProStocWaitingSide,
+  createClearedCardQuery: () => createClearedCardQuery,
+  createCodeHiddenCardQuery: () => createCodeHiddenCardQuery,
   fillBinaryFields: () => fillBinaryFields,
   isIndexResponse: () => isIndexResponse,
+  parseCardQueryChunk: () => parseCardQueryChunk,
   serializeCardQuery: () => serializeCardQuery,
+  serializeCardQueryChunk: () => serializeCardQueryChunk,
   toBinaryFields: () => toBinaryFields
 });
 module.exports = __toCommonJS(index_exports);
@@ -1484,6 +1490,60 @@ function serializeCardQuery(card) {
   return new Uint8Array(view.buffer, view.byteOffset, offset);
 }
 __name(serializeCardQuery, "serializeCardQuery");
+function parseCardQueryChunk(data, offset = 0, context = "CardQuery") {
+  if (offset + 4 > data.length) {
+    throw new Error(`${context} chunk header truncated`);
+  }
+  const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+  const length = view.getInt32(offset, true);
+  if (length < 4) {
+    throw new Error(`${context} invalid chunk length: ${length}`);
+  }
+  if (offset + length > data.length) {
+    throw new Error(`${context} chunk payload truncated`);
+  }
+  const card = new CardQuery();
+  card.queryLength = length;
+  if (length === 4) {
+    card.flags = 0;
+    card.empty = true;
+    return { card, length };
+  }
+  const payload = data.slice(offset + 4, offset + length);
+  card.fromPayload(payload);
+  return { card, length };
+}
+__name(parseCardQueryChunk, "parseCardQueryChunk");
+function serializeCardQueryChunk(card) {
+  const flags = card?.flags ?? 0;
+  const queryLength = card?.queryLength;
+  if (flags === 0 && card?.empty && (!queryLength || queryLength <= 4)) {
+    return { length: 4, payload: new Uint8Array(0) };
+  }
+  if (flags === 0 && queryLength && queryLength > 4) {
+    return { length: queryLength, payload: new Uint8Array(queryLength - 4) };
+  }
+  const payload = serializeCardQuery(card);
+  return { length: 4 + payload.length, payload };
+}
+__name(serializeCardQueryChunk, "serializeCardQueryChunk");
+function createClearedCardQuery(source) {
+  const card = new CardQuery();
+  card.flags = 0;
+  card.empty = true;
+  card.queryLength = source?.queryLength;
+  return card;
+}
+__name(createClearedCardQuery, "createClearedCardQuery");
+function createCodeHiddenCardQuery(source) {
+  const card = new CardQuery();
+  card.flags = OcgcoreCommonConstants.QUERY_CODE;
+  card.code = 0;
+  card.empty = false;
+  card.queryLength = source?.queryLength;
+  return card;
+}
+__name(createCodeHiddenCardQuery, "createCodeHiddenCardQuery");
 
 // src/proto-base/ygopro-proto-base.ts
 var _YGOProProtoBase = class _YGOProProtoBase extends PayloadBase {
@@ -2362,6 +2422,9 @@ __decorateClass([
 __decorateClass([
   BinaryField("u8", 2)
 ], _YGOProMsgCancelTarget_CardLocation.prototype, "sequence", 2);
+__decorateClass([
+  BinaryField("u8", 3)
+], _YGOProMsgCancelTarget_CardLocation.prototype, "position", 2);
 var YGOProMsgCancelTarget_CardLocation = _YGOProMsgCancelTarget_CardLocation;
 var _YGOProMsgCancelTarget = class _YGOProMsgCancelTarget extends YGOProMsgBase {
 };
@@ -2371,7 +2434,7 @@ __decorateClass([
   BinaryField(() => YGOProMsgCancelTarget_CardLocation, 0)
 ], _YGOProMsgCancelTarget.prototype, "card1", 2);
 __decorateClass([
-  BinaryField(() => YGOProMsgCancelTarget_CardLocation, 3)
+  BinaryField(() => YGOProMsgCancelTarget_CardLocation, 4)
 ], _YGOProMsgCancelTarget.prototype, "card2", 2);
 var YGOProMsgCancelTarget = _YGOProMsgCancelTarget;
 
@@ -2413,6 +2476,9 @@ __decorateClass([
 __decorateClass([
   BinaryField("u8", 2)
 ], _YGOProMsgCardTarget_CardLocation.prototype, "sequence", 2);
+__decorateClass([
+  BinaryField("u8", 3)
+], _YGOProMsgCardTarget_CardLocation.prototype, "position", 2);
 var YGOProMsgCardTarget_CardLocation = _YGOProMsgCardTarget_CardLocation;
 var _YGOProMsgCardTarget = class _YGOProMsgCardTarget extends YGOProMsgBase {
 };
@@ -2422,7 +2488,7 @@ __decorateClass([
   BinaryField(() => YGOProMsgCardTarget_CardLocation, 0)
 ], _YGOProMsgCardTarget.prototype, "card1", 2);
 __decorateClass([
-  BinaryField(() => YGOProMsgCardTarget_CardLocation, 3)
+  BinaryField(() => YGOProMsgCardTarget_CardLocation, 4)
 ], _YGOProMsgCardTarget.prototype, "card2", 2);
 var YGOProMsgCardTarget = _YGOProMsgCardTarget;
 
@@ -3598,6 +3664,9 @@ __decorateClass([
 __decorateClass([
   BinaryField("u8", 2)
 ], _YGOProMsgEquip_CardLocation.prototype, "sequence", 2);
+__decorateClass([
+  BinaryField("u8", 3)
+], _YGOProMsgEquip_CardLocation.prototype, "position", 2);
 var YGOProMsgEquip_CardLocation = _YGOProMsgEquip_CardLocation;
 var _YGOProMsgEquip = class _YGOProMsgEquip extends YGOProMsgBase {
 };
@@ -3607,11 +3676,8 @@ __decorateClass([
   BinaryField(() => YGOProMsgEquip_CardLocation, 0)
 ], _YGOProMsgEquip.prototype, "equip", 2);
 __decorateClass([
-  BinaryField(() => YGOProMsgEquip_CardLocation, 3)
+  BinaryField(() => YGOProMsgEquip_CardLocation, 4)
 ], _YGOProMsgEquip.prototype, "target", 2);
-__decorateClass([
-  BinaryField("u8", 6)
-], _YGOProMsgEquip.prototype, "position", 2);
 var YGOProMsgEquip = _YGOProMsgEquip;
 
 // src/protos/msg/proto/field-disabled.ts
@@ -5768,10 +5834,16 @@ var _YGOProMsgSwap = class _YGOProMsgSwap extends YGOProMsgBase {
 __name(_YGOProMsgSwap, "YGOProMsgSwap");
 _YGOProMsgSwap.identifier = OcgcoreCommonConstants.MSG_SWAP;
 __decorateClass([
-  BinaryField(() => YGOProMsgSwap_CardLocation, 0)
-], _YGOProMsgSwap.prototype, "card1", 2);
+  BinaryField("i32", 0)
+], _YGOProMsgSwap.prototype, "code1", 2);
 __decorateClass([
   BinaryField(() => YGOProMsgSwap_CardLocation, 4)
+], _YGOProMsgSwap.prototype, "card1", 2);
+__decorateClass([
+  BinaryField("i32", 8)
+], _YGOProMsgSwap.prototype, "code2", 2);
+__decorateClass([
+  BinaryField(() => YGOProMsgSwap_CardLocation, 12)
 ], _YGOProMsgSwap.prototype, "card2", 2);
 var YGOProMsgSwap = _YGOProMsgSwap;
 
@@ -5875,16 +5947,38 @@ __decorateClass([
 ], _YGOProMsgTossDice.prototype, "results", 2);
 var YGOProMsgTossDice = _YGOProMsgTossDice;
 
+// src/protos/msg/proto/unequip.ts
+var _YGOProMsgUnequip_CardLocation = class _YGOProMsgUnequip_CardLocation {
+};
+__name(_YGOProMsgUnequip_CardLocation, "YGOProMsgUnequip_CardLocation");
+__decorateClass([
+  BinaryField("u8", 0)
+], _YGOProMsgUnequip_CardLocation.prototype, "controller", 2);
+__decorateClass([
+  BinaryField("u8", 1)
+], _YGOProMsgUnequip_CardLocation.prototype, "location", 2);
+__decorateClass([
+  BinaryField("u8", 2)
+], _YGOProMsgUnequip_CardLocation.prototype, "sequence", 2);
+__decorateClass([
+  BinaryField("u8", 3)
+], _YGOProMsgUnequip_CardLocation.prototype, "position", 2);
+var YGOProMsgUnequip_CardLocation = _YGOProMsgUnequip_CardLocation;
+var _YGOProMsgUnequip = class _YGOProMsgUnequip extends YGOProMsgBase {
+};
+__name(_YGOProMsgUnequip, "YGOProMsgUnequip");
+_YGOProMsgUnequip.identifier = 95;
+__decorateClass([
+  BinaryField(() => YGOProMsgUnequip_CardLocation, 0)
+], _YGOProMsgUnequip.prototype, "card", 2);
+var YGOProMsgUnequip = _YGOProMsgUnequip;
+
 // src/protos/msg/proto/update-card.ts
 var _YGOProMsgUpdateCard = class _YGOProMsgUpdateCard extends YGOProMsgBase {
   opponentView() {
     const copy = this.copy();
     if (copy.card?.position && copy.card.position & OcgcoreCommonConstants.POS_FACEDOWN) {
-      const clearedCard = new CardQuery();
-      clearedCard.flags = OcgcoreCommonConstants.QUERY_CODE;
-      clearedCard.code = 0;
-      clearedCard.empty = false;
-      copy.card = clearedCard;
+      copy.card = createCodeHiddenCardQuery(copy.card);
     }
     return copy;
   }
@@ -5917,31 +6011,26 @@ var _YGOProMsgUpdateCard = class _YGOProMsgUpdateCard extends YGOProMsgBase {
     this.location = data[2];
     this.sequence = data[3];
     const queryDataWithLength = data.slice(4);
-    if (queryDataWithLength.length < 8) {
-      throw new Error("Query data too short");
-    }
-    const view = new DataView(
-      queryDataWithLength.buffer,
-      queryDataWithLength.byteOffset,
-      queryDataWithLength.byteLength
+    const { card } = parseCardQueryChunk(
+      queryDataWithLength,
+      0,
+      "MSG_UPDATE_CARD"
     );
-    const length = view.getInt32(0, true);
-    const cardQueryData = queryDataWithLength.slice(4, length);
-    this.card = new CardQuery();
-    this.card.fromPayload(cardQueryData);
+    this.card = card;
     return this;
   }
   toPayload() {
-    const cardPayload = serializeCardQuery(this.card);
-    const length = 4 + cardPayload.length;
-    const result = new Uint8Array(4 + length);
+    const chunk = serializeCardQueryChunk(this.card);
+    const result = new Uint8Array(4 + chunk.length);
     const view = new DataView(result.buffer);
     result[0] = this.identifier;
     result[1] = this.controller;
     result[2] = this.location;
     result[3] = this.sequence;
-    view.setInt32(4, length, true);
-    result.set(cardPayload, 8);
+    view.setInt32(4, chunk.length, true);
+    if (chunk.payload.length > 0) {
+      result.set(chunk.payload, 8);
+    }
     return result;
   }
   getRequireRefreshCards() {
@@ -5960,15 +6049,42 @@ var YGOProMsgUpdateCard = _YGOProMsgUpdateCard;
 
 // src/protos/msg/proto/update-data.ts
 var _YGOProMsgUpdateData = class _YGOProMsgUpdateData extends YGOProMsgBase {
+  getFixedSlotCount() {
+    if (this.location === OcgcoreScriptConstants.LOCATION_MZONE) {
+      return 7;
+    }
+    if (this.location === OcgcoreScriptConstants.LOCATION_SZONE) {
+      return 8;
+    }
+    return void 0;
+  }
+  shouldHideForOpponent(card) {
+    if (this.location === OcgcoreScriptConstants.LOCATION_GRAVE) {
+      return false;
+    }
+    if (this.location === OcgcoreScriptConstants.LOCATION_HAND) {
+      return !card.position || !(card.position & OcgcoreCommonConstants.POS_FACEUP);
+    }
+    return !!(card.position && card.position & OcgcoreCommonConstants.POS_FACEDOWN);
+  }
+  shouldHideForTeammate(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);
+    }
+    if (this.location === OcgcoreScriptConstants.LOCATION_EXTRA) {
+      return !!(card.position && card.position & OcgcoreCommonConstants.POS_FACEDOWN);
+    }
+    return false;
+  }
   opponentView() {
     const copy = this.copy();
     if (copy.cards) {
       copy.cards = copy.cards.map((card) => {
-        if (card.position && card.position & OcgcoreCommonConstants.POS_FACEDOWN) {
-          const clearedCard = new CardQuery();
-          clearedCard.flags = 0;
-          clearedCard.empty = true;
-          return clearedCard;
+        if (this.shouldHideForOpponent(card)) {
+          return createClearedCardQuery(card);
         }
         return card;
       });
@@ -5976,25 +6092,16 @@ var _YGOProMsgUpdateData = class _YGOProMsgUpdateData extends YGOProMsgBase {
     return copy;
   }
   teammateView() {
-    if (this.location === OcgcoreScriptConstants.LOCATION_MZONE || this.location === OcgcoreScriptConstants.LOCATION_SZONE) {
-      return this.copy();
-    } else if (this.location === OcgcoreScriptConstants.LOCATION_HAND) {
-      const copy = this.copy();
-      if (copy.cards) {
-        copy.cards = copy.cards.map((card) => {
-          if (!card.position || !(card.position & OcgcoreCommonConstants.POS_FACEUP)) {
-            const clearedCard = new CardQuery();
-            clearedCard.flags = 0;
-            clearedCard.empty = true;
-            return clearedCard;
-          }
-          return card;
-        });
-      }
-      return copy;
-    } else {
-      return this.copy();
+    const copy = this.copy();
+    if (copy.cards) {
+      copy.cards = copy.cards.map((card) => {
+        if (this.shouldHideForTeammate(card)) {
+          return createClearedCardQuery(card);
+        }
+        return card;
+      });
     }
+    return copy;
   }
   fromPayload(data) {
     if (data.length < 1) {
@@ -6013,35 +6120,40 @@ var _YGOProMsgUpdateData = class _YGOProMsgUpdateData extends YGOProMsgBase {
     this.location = data[2];
     this.cards = [];
     let offset = 3;
-    const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
-    while (offset + 4 <= data.length) {
-      const chunkLen = view.getInt32(offset, true);
-      if (chunkLen <= 0) {
-        break;
-      }
-      const end = Math.min(data.length, offset + chunkLen);
-      if (chunkLen <= 4) {
-        const card = new CardQuery();
-        card.flags = 0;
-        card.empty = true;
-        this.cards.push(card);
-      } else {
-        const cardQueryData = data.slice(offset + 4, end);
-        const card = new CardQuery();
-        card.fromPayload(cardQueryData);
-        this.cards.push(card);
-      }
-      offset += chunkLen;
+    while (offset < data.length) {
+      const { card, length } = parseCardQueryChunk(
+        data,
+        offset,
+        "MSG_UPDATE_DATA"
+      );
+      this.cards.push(card);
+      offset += length;
     }
     return this;
   }
   toPayload() {
+    const inputCards = this.cards || [];
+    const fixedSlotCount = this.getFixedSlotCount();
+    let cardsToEncode = inputCards;
+    if (fixedSlotCount !== void 0) {
+      if (inputCards.length > fixedSlotCount) {
+        throw new Error(
+          `MSG_UPDATE_DATA location ${this.location} expects at most ${fixedSlotCount} chunks, got ${inputCards.length}`
+        );
+      }
+      if (inputCards.length < fixedSlotCount) {
+        cardsToEncode = inputCards.slice();
+        for (let i = inputCards.length; i < fixedSlotCount; i++) {
+          cardsToEncode.push(createClearedCardQuery());
+        }
+      }
+    }
     let totalSize = 3;
-    const cardPayloads = [];
-    for (const card of this.cards || []) {
-      const payload = serializeCardQuery(card);
-      cardPayloads.push(payload);
-      totalSize += 4 + payload.length;
+    const chunks = [];
+    for (const card of cardsToEncode) {
+      const chunk = serializeCardQueryChunk(card);
+      chunks.push(chunk);
+      totalSize += chunk.length;
     }
     const result = new Uint8Array(totalSize);
     const view = new DataView(result.buffer);
@@ -6049,12 +6161,13 @@ var _YGOProMsgUpdateData = class _YGOProMsgUpdateData extends YGOProMsgBase {
     result[offset++] = this.identifier;
     result[offset++] = this.player;
     result[offset++] = this.location;
-    for (const payload of cardPayloads) {
-      const length = 4 + payload.length;
-      view.setInt32(offset, length, true);
+    for (const chunk of chunks) {
+      view.setInt32(offset, chunk.length, true);
       offset += 4;
-      result.set(payload, offset);
-      offset += payload.length;
+      if (chunk.payload.length > 0) {
+        result.set(chunk.payload, offset);
+        offset += chunk.payload.length;
+      }
     }
     return result;
   }
@@ -6143,6 +6256,7 @@ YGOProMessages.register(YGOProMsgDraw);
 YGOProMessages.register(YGOProMsgDamage);
 YGOProMessages.register(YGOProMsgRecover);
 YGOProMessages.register(YGOProMsgEquip);
+YGOProMessages.register(YGOProMsgUnequip);
 YGOProMessages.register(YGOProMsgLpUpdate);
 YGOProMessages.register(YGOProMsgCardTarget);
 YGOProMessages.register(YGOProMsgCancelTarget);
@@ -6756,6 +6870,8 @@ YGOProStoc.register(YGOProStocSrvproRoomlist);
   YGOProMsgTagSwap,
   YGOProMsgTossCoin,
   YGOProMsgTossDice,
+  YGOProMsgUnequip,
+  YGOProMsgUnequip_CardLocation,
   YGOProMsgUpdateCard,
   YGOProMsgUpdateData,
   YGOProMsgWaiting,
@@ -6788,9 +6904,13 @@ YGOProStoc.register(YGOProStocSrvproRoomlist);
   YGOProStocTpResult,
   YGOProStocTypeChange,
   YGOProStocWaitingSide,
+  createClearedCardQuery,
+  createCodeHiddenCardQuery,
   fillBinaryFields,
   isIndexResponse,
+  parseCardQueryChunk,
   serializeCardQuery,
+  serializeCardQueryChunk,
   toBinaryFields
 });
 //# sourceMappingURL=index.cjs.map