ygopro-msg-encode 1.1.28 → 1.1.30

package/dist/index.mjs

@@ -977,7 +977,8 @@ var CardQuery = class {
       offset += 4;
     }
     if (this.flags & OcgcoreCommonConstants.QUERY_POSITION) {
-      const pdata = view.getInt32(offset, true);
+      const pdata = view.getUint32(offset, true);
+      this.positionData = pdata;
       this.position = (pdata >>> 24 & 255) >>> 0;
       offset += 4;
     }
@@ -1026,9 +1027,12 @@ var CardQuery = class {
       offset += 4;
     }
     if (this.flags & OcgcoreCommonConstants.QUERY_REASON_CARD) {
+      this.reasonCardData = view.getUint32(offset, true);
       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),
@@ -1040,7 +1044,9 @@ var CardQuery = class {
       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),
@@ -1144,8 +1150,8 @@ function serializeCardQuery(card) {
     offset += 4;
   }
   if (flags & OcgcoreCommonConstants.QUERY_POSITION) {
-    const pdata = (source.position || 0) << 24 >>> 0;
-    view.setInt32(offset, pdata, true);
+    const pdata = source.positionData !== void 0 ? source.positionData >>> 0 : (source.position || 0) << 24 >>> 0;
+    view.setUint32(offset, pdata, true);
     offset += 4;
   }
   if (flags & OcgcoreCommonConstants.QUERY_ALIAS) {
@@ -1193,30 +1199,41 @@ function serializeCardQuery(card) {
     offset += 4;
   }
   if (flags & OcgcoreCommonConstants.QUERY_REASON_CARD) {
-    view.setInt32(offset, 0, true);
+    view.setUint32(offset, (source.reasonCardData || 0) >>> 0, true);
     offset += 4;
   }
   if (flags & OcgcoreCommonConstants.QUERY_EQUIP_CARD) {
-    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;
+    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;
+    }
   }
   if (flags & OcgcoreCommonConstants.QUERY_TARGET_CARD) {
     const targets = source.targetCards || [];
     view.setInt32(offset, targets.length, true);
     offset += 4;
-    for (const target of targets) {
-      view.setUint8(offset, target.controller);
-      view.setUint8(offset + 1, target.location);
-      view.setUint8(offset + 2, target.sequence);
-      view.setUint8(offset + 3, 0);
+    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);
+      }
       offset += 4;
     }
   }
@@ -3847,16 +3864,7 @@ var YGOProMsgMove = class extends YGOProMsgBase {
     return view;
   }
   teammateView() {
-    const view = this.copy();
-    const cl = view.current.location;
-    const cp = view.current.position;
-    if (cl & (OcgcoreScriptConstants.LOCATION_GRAVE | OcgcoreScriptConstants.LOCATION_OVERLAY)) {
-      return view;
-    }
-    if (cl & (OcgcoreScriptConstants.LOCATION_DECK | OcgcoreScriptConstants.LOCATION_HAND)) {
-      view.code = 0;
-    }
-    return view;
+    return this.opponentView();
   }
   playerView(playerId) {
     if (playerId === 7 /* OBSERVER */) {