Merge branch 'feat/shuffle_set_card' into 'main'

Feat/shuffle set card

See merge request !230

neos-protobuf @ cd10e6a5

-Subproject commit b67b483ce9db064611619a2e1a8b8767b100d035
+Subproject commit cd10e6a5f76cfda5ada5a39a9a7a526ca9c5e881

src/api/ocgcore/idl/ocgcore.ts

 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.21.5
+ * compiler version: 3.21.9
  * source: idl/ocgcore.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";
@@ -4511,7 +4511,7 @@ export namespace ygopro {
         }
     }
     export class StocGameMessage extends pb_1.Message {
-        #one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47]];
+        #one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48]];
         constructor(data?: any[] | ({} & (({
             start?: StocGameMessage.MsgStart;
             draw?: never;
@@ -4560,6 +4560,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: StocGameMessage.MsgDraw;
@@ -4608,6 +4609,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -4656,6 +4658,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -4704,6 +4707,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -4752,6 +4756,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -4800,6 +4805,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -4848,6 +4854,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -4896,6 +4903,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -4944,6 +4952,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -4992,6 +5001,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5040,6 +5050,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5088,6 +5099,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5136,6 +5148,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5184,6 +5197,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5232,6 +5246,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5280,6 +5295,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5328,6 +5344,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5376,6 +5393,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5424,6 +5442,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5472,6 +5491,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5520,6 +5540,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5568,6 +5589,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5616,6 +5638,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5664,6 +5687,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5712,6 +5736,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5760,6 +5785,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5808,6 +5834,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5856,6 +5883,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5904,6 +5932,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -5952,6 +5981,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6000,6 +6030,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6048,6 +6079,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6096,6 +6128,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6144,6 +6177,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6192,6 +6226,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6240,6 +6275,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6288,6 +6324,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6336,6 +6373,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6384,6 +6422,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6432,6 +6471,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6480,6 +6520,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6528,6 +6569,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6576,6 +6618,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6624,6 +6667,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6672,6 +6716,7 @@ export namespace ygopro {
             confirm_cards?: StocGameMessage.MsgConfirmCards;
             become_target?: never;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6720,6 +6765,7 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: StocGameMessage.MsgBecomeTarget;
             toss?: never;
+            shuffle_set_card?: never;
         } | {
             start?: never;
             draw?: never;
@@ -6768,6 +6814,56 @@ export namespace ygopro {
             confirm_cards?: never;
             become_target?: never;
             toss?: StocGameMessage.MsgToss;
+            shuffle_set_card?: never;
+        } | {
+            start?: never;
+            draw?: never;
+            new_turn?: never;
+            new_phase?: never;
+            hint?: never;
+            select_idle_cmd?: never;
+            select_place?: never;
+            move?: never;
+            select_card?: never;
+            select_chain?: never;
+            select_effect_yn?: never;
+            select_position?: never;
+            select_option?: never;
+            shuffle_hand?: never;
+            select_battle_cmd?: never;
+            pos_change?: never;
+            select_unselect_card?: never;
+            select_yes_no?: never;
+            update_hp?: never;
+            win?: never;
+            wait?: never;
+            unimplemented?: never;
+            update_data?: never;
+            reload_field?: never;
+            select_sum?: never;
+            select_tribute?: never;
+            update_counter?: never;
+            select_counter?: never;
+            sort_card?: never;
+            set?: never;
+            swap?: never;
+            summoning?: never;
+            summoned?: never;
+            flip_summoning?: never;
+            flip_summoned?: never;
+            sp_summoning?: never;
+            sp_summoned?: never;
+            chaining?: never;
+            attack?: never;
+            attack_disable?: never;
+            chain_solved?: never;
+            chain_end?: never;
+            announce?: never;
+            lp_update?: never;
+            confirm_cards?: never;
+            become_target?: never;
+            toss?: never;
+            shuffle_set_card?: StocGameMessage.MsgShuffleSetCard;
         })))) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -6913,6 +7009,9 @@ export namespace ygopro {
                 if ("toss" in data && data.toss != undefined) {
                     this.toss = data.toss;
                 }
+                if ("shuffle_set_card" in data && data.shuffle_set_card != undefined) {
+                    this.shuffle_set_card = data.shuffle_set_card;
+                }
             }
         }
         get start() {
@@ -7338,9 +7437,18 @@ export namespace ygopro {
         get has_toss() {
             return pb_1.Message.getField(this, 47) != null;
         }
+        get shuffle_set_card() {
+            return pb_1.Message.getWrapperField(this, StocGameMessage.MsgShuffleSetCard, 48) as StocGameMessage.MsgShuffleSetCard;
+        }
+        set shuffle_set_card(value: StocGameMessage.MsgShuffleSetCard) {
+            pb_1.Message.setOneofWrapperField(this, 48, this.#one_of_decls[0], value);
+        }
+        get has_shuffle_set_card() {
+            return pb_1.Message.getField(this, 48) != null;
+        }
         get gameMsg() {
             const cases: {
-                [index: number]: "none" | "start" | "draw" | "new_turn" | "new_phase" | "hint" | "select_idle_cmd" | "select_place" | "move" | "select_card" | "select_chain" | "select_effect_yn" | "select_position" | "select_option" | "shuffle_hand" | "select_battle_cmd" | "pos_change" | "select_unselect_card" | "select_yes_no" | "update_hp" | "win" | "wait" | "unimplemented" | "update_data" | "reload_field" | "select_sum" | "select_tribute" | "update_counter" | "select_counter" | "sort_card" | "set" | "swap" | "summoning" | "summoned" | "flip_summoning" | "flip_summoned" | "sp_summoning" | "sp_summoned" | "chaining" | "attack" | "attack_disable" | "chain_solved" | "chain_end" | "announce" | "lp_update" | "confirm_cards" | "become_target" | "toss";
+                [index: number]: "none" | "start" | "draw" | "new_turn" | "new_phase" | "hint" | "select_idle_cmd" | "select_place" | "move" | "select_card" | "select_chain" | "select_effect_yn" | "select_position" | "select_option" | "shuffle_hand" | "select_battle_cmd" | "pos_change" | "select_unselect_card" | "select_yes_no" | "update_hp" | "win" | "wait" | "unimplemented" | "update_data" | "reload_field" | "select_sum" | "select_tribute" | "update_counter" | "select_counter" | "sort_card" | "set" | "swap" | "summoning" | "summoned" | "flip_summoning" | "flip_summoned" | "sp_summoning" | "sp_summoned" | "chaining" | "attack" | "attack_disable" | "chain_solved" | "chain_end" | "announce" | "lp_update" | "confirm_cards" | "become_target" | "toss" | "shuffle_set_card";
             } = {
                 0: "none",
                 1: "start",
@@ -7389,9 +7497,10 @@ export namespace ygopro {
                 44: "lp_update",
                 45: "confirm_cards",
                 46: "become_target",
-                47: "toss"
+                47: "toss",
+                48: "shuffle_set_card"
             };
-            return cases[pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47])];
+            return cases[pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48])];
         }
         static fromObject(data: {
             start?: ReturnType<typeof StocGameMessage.MsgStart.prototype.toObject>;
@@ -7441,6 +7550,7 @@ export namespace ygopro {
             confirm_cards?: ReturnType<typeof StocGameMessage.MsgConfirmCards.prototype.toObject>;
             become_target?: ReturnType<typeof StocGameMessage.MsgBecomeTarget.prototype.toObject>;
             toss?: ReturnType<typeof StocGameMessage.MsgToss.prototype.toObject>;
+            shuffle_set_card?: ReturnType<typeof StocGameMessage.MsgShuffleSetCard.prototype.toObject>;
         }): StocGameMessage {
             const message = new StocGameMessage({});
             if (data.start != null) {
@@ -7584,6 +7694,9 @@ export namespace ygopro {
             if (data.toss != null) {
                 message.toss = StocGameMessage.MsgToss.fromObject(data.toss);
             }
+            if (data.shuffle_set_card != null) {
+                message.shuffle_set_card = StocGameMessage.MsgShuffleSetCard.fromObject(data.shuffle_set_card);
+            }
             return message;
         }
         toObject() {
@@ -7635,6 +7748,7 @@ export namespace ygopro {
                 confirm_cards?: ReturnType<typeof StocGameMessage.MsgConfirmCards.prototype.toObject>;
                 become_target?: ReturnType<typeof StocGameMessage.MsgBecomeTarget.prototype.toObject>;
                 toss?: ReturnType<typeof StocGameMessage.MsgToss.prototype.toObject>;
+                shuffle_set_card?: ReturnType<typeof StocGameMessage.MsgShuffleSetCard.prototype.toObject>;
             } = {};
             if (this.start != null) {
                 data.start = this.start.toObject();
@@ -7777,6 +7891,9 @@ export namespace ygopro {
             if (this.toss != null) {
                 data.toss = this.toss.toObject();
             }
+            if (this.shuffle_set_card != null) {
+                data.shuffle_set_card = this.shuffle_set_card.toObject();
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -7877,6 +7994,8 @@ export namespace ygopro {
                 writer.writeMessage(46, this.become_target, () => this.become_target.serialize(writer));
             if (this.has_toss)
                 writer.writeMessage(47, this.toss, () => this.toss.serialize(writer));
+            if (this.has_shuffle_set_card)
+                writer.writeMessage(48, this.shuffle_set_card, () => this.shuffle_set_card.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -8027,6 +8146,9 @@ export namespace ygopro {
                     case 47:
                         reader.readMessage(message.toss, () => message.toss = StocGameMessage.MsgToss.deserialize(reader));
                         break;
+                    case 48:
+                        reader.readMessage(message.shuffle_set_card, () => message.shuffle_set_card = StocGameMessage.MsgShuffleSetCard.deserialize(reader));
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -10639,6 +10761,119 @@ export namespace ygopro {
                 return MsgShuffleHand.deserialize(bytes);
             }
         }
+        export class MsgShuffleSetCard extends pb_1.Message {
+            #one_of_decls: number[][] = [];
+            constructor(data?: any[] | {
+                zone?: CardZone;
+                from_locations?: CardLocation[];
+                to_locations?: CardLocation[];
+            }) {
+                super();
+                pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 3], this.#one_of_decls);
+                if (!Array.isArray(data) && typeof data == "object") {
+                    if ("zone" in data && data.zone != undefined) {
+                        this.zone = data.zone;
+                    }
+                    if ("from_locations" in data && data.from_locations != undefined) {
+                        this.from_locations = data.from_locations;
+                    }
+                    if ("to_locations" in data && data.to_locations != undefined) {
+                        this.to_locations = data.to_locations;
+                    }
+                }
+            }
+            get zone() {
+                return pb_1.Message.getFieldWithDefault(this, 1, CardZone.DECK) as CardZone;
+            }
+            set zone(value: CardZone) {
+                pb_1.Message.setField(this, 1, value);
+            }
+            get from_locations() {
+                return pb_1.Message.getRepeatedWrapperField(this, CardLocation, 2) as CardLocation[];
+            }
+            set from_locations(value: CardLocation[]) {
+                pb_1.Message.setRepeatedWrapperField(this, 2, value);
+            }
+            get to_locations() {
+                return pb_1.Message.getRepeatedWrapperField(this, CardLocation, 3) as CardLocation[];
+            }
+            set to_locations(value: CardLocation[]) {
+                pb_1.Message.setRepeatedWrapperField(this, 3, value);
+            }
+            static fromObject(data: {
+                zone?: CardZone;
+                from_locations?: ReturnType<typeof CardLocation.prototype.toObject>[];
+                to_locations?: ReturnType<typeof CardLocation.prototype.toObject>[];
+            }): MsgShuffleSetCard {
+                const message = new MsgShuffleSetCard({});
+                if (data.zone != null) {
+                    message.zone = data.zone;
+                }
+                if (data.from_locations != null) {
+                    message.from_locations = data.from_locations.map(item => CardLocation.fromObject(item));
+                }
+                if (data.to_locations != null) {
+                    message.to_locations = data.to_locations.map(item => CardLocation.fromObject(item));
+                }
+                return message;
+            }
+            toObject() {
+                const data: {
+                    zone?: CardZone;
+                    from_locations?: ReturnType<typeof CardLocation.prototype.toObject>[];
+                    to_locations?: ReturnType<typeof CardLocation.prototype.toObject>[];
+                } = {};
+                if (this.zone != null) {
+                    data.zone = this.zone;
+                }
+                if (this.from_locations != null) {
+                    data.from_locations = this.from_locations.map((item: CardLocation) => item.toObject());
+                }
+                if (this.to_locations != null) {
+                    data.to_locations = this.to_locations.map((item: CardLocation) => item.toObject());
+                }
+                return data;
+            }
+            serialize(): Uint8Array;
+            serialize(w: pb_1.BinaryWriter): void;
+            serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+                const writer = w || new pb_1.BinaryWriter();
+                if (this.zone != CardZone.DECK)
+                    writer.writeEnum(1, this.zone);
+                if (this.from_locations.length)
+                    writer.writeRepeatedMessage(2, this.from_locations, (item: CardLocation) => item.serialize(writer));
+                if (this.to_locations.length)
+                    writer.writeRepeatedMessage(3, this.to_locations, (item: CardLocation) => item.serialize(writer));
+                if (!w)
+                    return writer.getResultBuffer();
+            }
+            static deserialize(bytes: Uint8Array | pb_1.BinaryReader): MsgShuffleSetCard {
+                const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new MsgShuffleSetCard();
+                while (reader.nextField()) {
+                    if (reader.isEndGroup())
+                        break;
+                    switch (reader.getFieldNumber()) {
+                        case 1:
+                            message.zone = reader.readEnum();
+                            break;
+                        case 2:
+                            reader.readMessage(message.from_locations, () => pb_1.Message.addToRepeatedWrapperField(message, 2, CardLocation.deserialize(reader), CardLocation));
+                            break;
+                        case 3:
+                            reader.readMessage(message.to_locations, () => pb_1.Message.addToRepeatedWrapperField(message, 3, CardLocation.deserialize(reader), CardLocation));
+                            break;
+                        default: reader.skipField();
+                    }
+                }
+                return message;
+            }
+            serializeBinary(): Uint8Array {
+                return this.serialize();
+            }
+            static deserializeBinary(bytes: Uint8Array): MsgShuffleSetCard {
+                return MsgShuffleSetCard.deserialize(bytes);
+            }
+        }
         export class MsgSelectBattleCmd extends pb_1.Message {
             #one_of_decls: number[][] = [];
             constructor(data?: any[] | {

src/api/ocgcore/ocgAdapter/protoDecl.ts

@@ -64,3 +64,4 @@ export const MSG_ANNOUNCE_CARD = 142;
 export const MSG_ANNOUNCE_NUMBER = 143;
 export const MSG_TOSS_COIN = 130;
 export const MSG_TOSS_DICE = 131;
+export const MSG_SHUFFLE_SET_CARD = 36;

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts

@@ -33,6 +33,7 @@ import MsgSelectPositionAdapter from "./selectPosition";
 import MsgSelectSum from "./selectSum";
 import MsgSelectTributeAdapter from "./selectTribute";
 import MsgSelectUnselectCardAdapter from "./selectUnselectCard";
+import MsgShuffleSetCard from "./shuffle_set_card";
 import MsgSortCard from "./sortCard";
 import MsgStartAdapter from "./start";
 import MsgTossAdapter from "./toss";
@@ -238,6 +239,11 @@ export default class GameMsgAdapter implements StocAdapter {
 
           break;
         }
+        case GAME_MSG.MSG_SHUFFLE_SET_CARD: {
+          gameMsg.shuffle_set_card = MsgShuffleSetCard(gameData);
+
+          break;
+        }
         default: {
           gameMsg.unimplemented = new ygopro.StocGameMessage.MsgUnimplemented({
             command: func,

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/shuffle_set_card.ts

+import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+
+import { BufferReaderExt } from "../../bufferIO";
+import { numberToCardZone } from "../../util";
+import MsgShuffleSetCard = ygopro.StocGameMessage.MsgShuffleSetCard;
+
+/*
+ * Msg Shuffle Set Card
+ * @param - TODO
+ *
+ * @usage - 盖卡切洗
+ * */
+export default (data: Uint8Array) => {
+  const reader = new BufferReaderExt(data);
+
+  const zone = numberToCardZone(reader.inner.readUint8());
+  const count = reader.inner.readUint8();
+  const from_locations = [];
+  const to_locations = [];
+  for (let i = 0; i < count; i++) {
+    from_locations.push(reader.readCardLocation());
+  }
+  for (let i = 0; i < count; i++) {
+    to_locations.push(reader.readCardLocation());
+  }
+
+  return new MsgShuffleSetCard({
+    zone,
+    from_locations,
+    to_locations,
+  });
+};

src/service/duel/gameMsg.ts

@@ -35,6 +35,7 @@ import onMsgSelectUnselectCard from "./selectUnselectCard";
 import onMsgSelectYesNo from "./selectYesNo";
 import onMsgSet from "./set";
 import onMsgShuffleHand from "./shuffleHand";
+import onMsgShuffleSetCard from "./shuffleSetCard";
 import onMsgSortCard from "./sortCard";
 import onMsgSpSummoned from "./spSummoned";
 import onMsgSpSummoning from "./spSummoning";
@@ -309,6 +310,11 @@ async function _handleGameMsg(pb: ygopro.YgoStocMsg) {
 
       break;
     }
+    case "shuffle_set_card": {
+      await onMsgShuffleSetCard(msg.shuffle_set_card);
+
+      break;
+    }
     case "unimplemented": {
       onUnimplemented(msg.unimplemented);
 

src/service/duel/shuffleSetCard.ts

+import { ygopro } from "@/api";
+import { eventbus, Task } from "@/infra";
+import { cardStore } from "@/stores";
+import MsgShuffleSetCard = ygopro.StocGameMessage.MsgShuffleSetCard;
+
+export default async (shuffleSetCard: MsgShuffleSetCard) => {
+  const from_locations = shuffleSetCard.from_locations;
+  const to_locations = shuffleSetCard.to_locations;
+  if (from_locations.length != to_locations.length) {
+    console.error(
+      "<ShuffleSetCard>length of from_locations and to_locations not matched"
+    );
+    return;
+  }
+  const count = from_locations.length;
+  for (let i = 0; i < count; i++) {
+    const from = from_locations[i];
+    const to = to_locations[i];
+
+    // TODO: 需要考虑超量么
+    const target = cardStore.at(from.zone, from.controller, from.sequence);
+    if (target) {
+      // 更新位置
+      target.location = to;
+      // 渲染动画
+      await eventbus.call(Task.Move, target.uuid);
+    } else {
+      console.warn(`<ShuffleSetCard>target from ${from} is null`);
+    }
+  }
+};