Merge branch 'feat/lp_update' into 'main'

Feat/lp update

See merge request !209

neos-protobuf @ 0993b418

-Subproject commit ee85cb1d1f71ad6b44f1daf1877b63fa2ac1991f
+Subproject commit 0993b418f4ae7be10af05ca5360315656bfe2690

src/api/ocgcore/idl/ocgcore.ts

 /**
  * Generated by the protoc-gen-ts.  DO NOT EDIT!
- * compiler version: 3.19.4
+ * compiler version: 3.21.5
  * source: idl/ocgcore.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
 import * as pb_1 from "google-protobuf";
@@ -5567,7 +5567,7 @@ export namespace ygopro {
       [
         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,
+        39, 40, 41, 42, 43, 44,
       ],
     ];
     constructor(
@@ -5618,6 +5618,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -5663,6 +5664,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -5708,6 +5710,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -5753,6 +5756,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -5798,6 +5802,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -5843,6 +5848,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -5888,6 +5894,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -5933,6 +5940,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -5978,6 +5986,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6023,6 +6032,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6068,6 +6078,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6113,6 +6124,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6158,6 +6170,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6203,6 +6216,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6248,6 +6262,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6293,6 +6308,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6338,6 +6354,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6383,6 +6400,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6428,6 +6446,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6473,6 +6492,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6518,6 +6538,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6563,6 +6584,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6608,6 +6630,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6653,6 +6676,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6698,6 +6722,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6743,6 +6768,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6788,6 +6814,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6833,6 +6860,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6878,6 +6906,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6923,6 +6952,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -6968,6 +6998,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7013,6 +7044,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7058,6 +7090,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7103,6 +7136,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7148,6 +7182,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7193,6 +7228,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7238,6 +7274,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7283,6 +7320,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7328,6 +7366,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7373,6 +7412,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7418,6 +7458,7 @@ export namespace ygopro {
                 chain_solved?: StocGameMessage.MsgChainSolved;
                 chain_end?: never;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7463,6 +7504,7 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: StocGameMessage.MsgChainEnd;
                 announce?: never;
+                lp_update?: never;
               }
             | {
                 start?: never;
@@ -7508,6 +7550,53 @@ export namespace ygopro {
                 chain_solved?: never;
                 chain_end?: never;
                 announce?: StocGameMessage.MsgAnnounce;
+                lp_update?: 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?: StocGameMessage.MsgLpUpdate;
               }
           ))
     ) {
@@ -7656,6 +7745,9 @@ export namespace ygopro {
         if ("announce" in data && data.announce != undefined) {
           this.announce = data.announce;
         }
+        if ("lp_update" in data && data.lp_update != undefined) {
+          this.lp_update = data.lp_update;
+        }
       }
     }
     get start() {
@@ -8217,6 +8309,19 @@ export namespace ygopro {
     get has_announce() {
       return pb_1.Message.getField(this, 43) != null;
     }
+    get lp_update() {
+      return pb_1.Message.getWrapperField(
+        this,
+        StocGameMessage.MsgLpUpdate,
+        44
+      ) as StocGameMessage.MsgLpUpdate;
+    }
+    set lp_update(value: StocGameMessage.MsgLpUpdate) {
+      pb_1.Message.setOneofWrapperField(this, 44, this.#one_of_decls[0], value);
+    }
+    get has_lp_update() {
+      return pb_1.Message.getField(this, 44) != null;
+    }
     get gameMsg() {
       const cases: {
         [index: number]:
@@ -8263,7 +8368,8 @@ export namespace ygopro {
           | "attack_disable"
           | "chain_solved"
           | "chain_end"
-          | "announce";
+          | "announce"
+          | "lp_update";
       } = {
         0: "none",
         1: "start",
@@ -8309,6 +8415,7 @@ export namespace ygopro {
         41: "chain_solved",
         42: "chain_end",
         43: "announce",
+        44: "lp_update",
       };
       return cases[
         pb_1.Message.computeOneofCase(
@@ -8316,7 +8423,7 @@ export namespace ygopro {
           [
             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,
+            37, 38, 39, 40, 41, 42, 43, 44,
           ]
         )
       ];
@@ -8433,6 +8540,9 @@ export namespace ygopro {
       announce?: ReturnType<
         typeof StocGameMessage.MsgAnnounce.prototype.toObject
       >;
+      lp_update?: ReturnType<
+        typeof StocGameMessage.MsgLpUpdate.prototype.toObject
+      >;
     }): StocGameMessage {
       const message = new StocGameMessage({});
       if (data.start != null) {
@@ -8630,6 +8740,11 @@ export namespace ygopro {
           data.announce
         );
       }
+      if (data.lp_update != null) {
+        message.lp_update = StocGameMessage.MsgLpUpdate.fromObject(
+          data.lp_update
+        );
+      }
       return message;
     }
     toObject() {
@@ -8747,6 +8862,9 @@ export namespace ygopro {
         announce?: ReturnType<
           typeof StocGameMessage.MsgAnnounce.prototype.toObject
         >;
+        lp_update?: ReturnType<
+          typeof StocGameMessage.MsgLpUpdate.prototype.toObject
+        >;
       } = {};
       if (this.start != null) {
         data.start = this.start.toObject();
@@ -8877,6 +8995,9 @@ export namespace ygopro {
       if (this.announce != null) {
         data.announce = this.announce.toObject();
       }
+      if (this.lp_update != null) {
+        data.lp_update = this.lp_update.toObject();
+      }
       return data;
     }
     serialize(): Uint8Array;
@@ -9039,6 +9160,10 @@ export namespace ygopro {
         writer.writeMessage(43, this.announce, () =>
           this.announce.serialize(writer)
         );
+      if (this.has_lp_update)
+        writer.writeMessage(44, this.lp_update, () =>
+          this.lp_update.serialize(writer)
+        );
       if (!w) return writer.getResultBuffer();
     }
     static deserialize(bytes: Uint8Array | pb_1.BinaryReader): StocGameMessage {
@@ -9378,6 +9503,14 @@ export namespace ygopro {
                   StocGameMessage.MsgAnnounce.deserialize(reader))
             );
             break;
+          case 44:
+            reader.readMessage(
+              message.lp_update,
+              () =>
+                (message.lp_update =
+                  StocGameMessage.MsgLpUpdate.deserialize(reader))
+            );
+            break;
           default:
             reader.skipField();
         }
@@ -17769,6 +17902,108 @@ export namespace ygopro {
         }
       }
     }
+    export class MsgLpUpdate extends pb_1.Message {
+      #one_of_decls: number[][] = [];
+      constructor(
+        data?:
+          | any[]
+          | {
+              player?: number;
+              new_lp?: number;
+            }
+      ) {
+        super();
+        pb_1.Message.initialize(
+          this,
+          Array.isArray(data) ? data : [],
+          0,
+          -1,
+          [],
+          this.#one_of_decls
+        );
+        if (!Array.isArray(data) && typeof data == "object") {
+          if ("player" in data && data.player != undefined) {
+            this.player = data.player;
+          }
+          if ("new_lp" in data && data.new_lp != undefined) {
+            this.new_lp = data.new_lp;
+          }
+        }
+      }
+      get player() {
+        return pb_1.Message.getFieldWithDefault(this, 1, 0) as number;
+      }
+      set player(value: number) {
+        pb_1.Message.setField(this, 1, value);
+      }
+      get new_lp() {
+        return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
+      }
+      set new_lp(value: number) {
+        pb_1.Message.setField(this, 2, value);
+      }
+      static fromObject(data: {
+        player?: number;
+        new_lp?: number;
+      }): MsgLpUpdate {
+        const message = new MsgLpUpdate({});
+        if (data.player != null) {
+          message.player = data.player;
+        }
+        if (data.new_lp != null) {
+          message.new_lp = data.new_lp;
+        }
+        return message;
+      }
+      toObject() {
+        const data: {
+          player?: number;
+          new_lp?: number;
+        } = {};
+        if (this.player != null) {
+          data.player = this.player;
+        }
+        if (this.new_lp != null) {
+          data.new_lp = this.new_lp;
+        }
+        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.player != 0) writer.writeInt32(1, this.player);
+        if (this.new_lp != 0) writer.writeInt32(2, this.new_lp);
+        if (!w) return writer.getResultBuffer();
+      }
+      static deserialize(bytes: Uint8Array | pb_1.BinaryReader): MsgLpUpdate {
+        const reader =
+            bytes instanceof pb_1.BinaryReader
+              ? bytes
+              : new pb_1.BinaryReader(bytes),
+          message = new MsgLpUpdate();
+        while (reader.nextField()) {
+          if (reader.isEndGroup()) break;
+          switch (reader.getFieldNumber()) {
+            case 1:
+              message.player = reader.readInt32();
+              break;
+            case 2:
+              message.new_lp = reader.readInt32();
+              break;
+            default:
+              reader.skipField();
+          }
+        }
+        return message;
+      }
+      serializeBinary(): Uint8Array {
+        return this.serialize();
+      }
+      static deserializeBinary(bytes: Uint8Array): MsgLpUpdate {
+        return MsgLpUpdate.deserialize(bytes);
+      }
+    }
     export class MsgReloadField extends pb_1.Message {
       #one_of_decls: number[][] = [];
       constructor(

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.json

@@ -125,5 +125,12 @@
   "76": {
     "protoType": "chain_solved",
     "fields": [{ "fieldName": "solved_index", "fieldType": "uint8"}]
+  },
+  "94": {
+    "protoType": "lp_update",
+    "fields": [
+      { "fieldName": "player", "fieldType": "uint8" },
+      { "fieldName": "new_lp", "fieldType": "uint32" }
+    ]
   }
 }

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

@@ -32,6 +32,7 @@ const MsgConstructorMap: Map<string, Constructor> = new Map([
   ["attack_disable", ygopro.StocGameMessage.MsgAttackDisabled],
   ["chain_solved", ygopro.StocGameMessage.MsgChainSolved],
   ["chain_end", ygopro.StocGameMessage.MsgChainEnd],
+  ["lp_update", ygopro.StocGameMessage.MsgLpUpdate],
 ]);
 
 export interface penetrateType {

src/service/duel/gameMsg.ts

@@ -11,6 +11,7 @@ import onMsgDraw from "./draw";
 import onMsgFilpSummoned from "./flipSummoned";
 import onMsgFlipSummoning from "./flipSummoning";
 import onMsgHint from "./hint";
+import onLpUpdate from "./lpUpdate";
 import onMsgMove from "./move";
 import onMsgNewPhase from "./newPhase";
 import onMsgNewTurn from "./newTurn";
@@ -276,6 +277,11 @@ export default async function handleGameMsg(pb: ygopro.YgoStocMsg) {
 
       break;
     }
+    case "lp_update": {
+      onLpUpdate(msg.lp_update);
+
+      break;
+    }
     case "unimplemented": {
       onUnimplemented(msg.unimplemented);
 

src/service/duel/lpUpdate.ts

+import { ygopro } from "@/api";
+import { matStore } from "@/stores";
+
+export default (lpUpdate: ygopro.StocGameMessage.MsgLpUpdate) => {
+  const player = lpUpdate.player;
+  const newLp = lpUpdate.new_lp;
+  matStore.initInfo.of(player).life = newLp;
+};