Merge branch 'master' into ai-play

data-manager/DataManager.js

@@ -726,12 +726,12 @@ class DataManager {
         newScore.name = name;
         return await this.saveRandomDuelScore(newScore);
     }
-    async getRandomDuelScoreDisplay(name) {
+    async getRandomDuelScoreDisplay(name, displayName) {
         const score = await this.getRandomDuelScore(name);
         if (!score) {
-            return `${name.split("$")[0]} \${random_score_blank}`;
+            return `${displayName} \${random_score_blank}`;
         }
-        return score.getScoreText();
+        return score.getScoreText(displayName);
     }
     async randomDuelPlayerWin(name) {
         const score = await this.getOrCreateRandomDuelScore(name);

data-manager/DataManager.ts

@@ -723,12 +723,12 @@ export class DataManager {
 		newScore.name = name;
 		return await this.saveRandomDuelScore(newScore);
 	}
-	async getRandomDuelScoreDisplay(name: string) {
+	async getRandomDuelScoreDisplay(name: string, displayName: string) {
 		const score = await this.getRandomDuelScore(name);
 		if(!score) {
-			return `${name.split("$")[0]} \${random_score_blank}`;
+			return `${displayName} \${random_score_blank}`;
 		}
-		return score.getScoreText();
+		return score.getScoreText(displayName);
 	}
 	async randomDuelPlayerWin(name: string) {
 		const score = await this.getOrCreateRandomDuelScore(name);

data-manager/DeckEncoder.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeDeck = exports.encodeDeck = void 0;
 const assert_1 = __importDefault(require("assert"));
 function encodeDeck(deck) {
+    deck.main ??= [];
+    deck.side ??= [];
     let pointer = 0;
     const bufferSize = (2 + deck.main.length + deck.side.length) * 4;
     const buffer = Buffer.allocUnsafe(bufferSize);

data-manager/DeckEncoder.ts

@@ -6,6 +6,8 @@ export interface Deck {
 }
 
 export function encodeDeck(deck: Deck) {
+  deck.main ??= [];
+  deck.side ??= [];
     let pointer = 0;
     const bufferSize = (2 + deck.main.length + deck.side.length) * 4;
     const buffer = Buffer.allocUnsafe(bufferSize);
@@ -40,4 +42,4 @@ export function decodeDeck(buffer: Buffer): Deck {
         pointer += 4;
     }
     return {main, side};
-}
+}
\ No newline at end of file

data-manager/entities/RandomDuelScore.js

@@ -33,8 +33,7 @@ let RandomDuelScore = class RandomDuelScore extends CreateAndUpdateTimeBase_1.Cr
         ++this.fleeCount;
         this.lose();
     }
-    getScoreText() {
-        const displayName = this.getDisplayName();
+    getScoreText(displayName) {
         const total = this.winCount + this.loseCount;
         if (this.winCount < 2 && total < 3) {
             return `${displayName} \${random_score_not_enough}`;

data-manager/entities/RandomDuelScore.ts

@@ -40,8 +40,7 @@ export class RandomDuelScore extends CreateAndUpdateTimeBase {
         this.lose();
     }
 
-    getScoreText() {
-        const displayName = this.getDisplayName();
+    getScoreText(displayName: string) {
         const total = this.winCount + this.loseCount;
         if (this.winCount < 2 && total < 3) {
             return `${displayName} \${random_score_not_enough}`;
@@ -53,4 +52,4 @@ export class RandomDuelScore extends CreateAndUpdateTimeBase {
             return `\${random_score_part1}${displayName} \${random_score_part2} ${Math.ceil(this.winCount / total * 100)}\${random_score_part3} ${Math.ceil(this.fleeCount / total * 100)}\${random_score_part4}`;
         }
     }
-}
+}
\ No newline at end of file

data/default_config.json

@@ -16,7 +16,9 @@
     "draw_count": 1,
     "time_limit": 180,
     "no_watch": false,
-    "auto_death": false
+    "auto_death": false,
+    "bo5": false,
+    "sideins": false
   },
   "modules": {
     "welcome": "MyCard YGOPro Server",
@@ -90,6 +92,7 @@
       "record_match_scores": false,
       "post_match_scores": false,
       "post_match_accesskey": "123456",
+      "disable_chat": false,
       "blank_pass_modes": {
         "S": true,
         "M": true,

data/i18n.json

@@ -211,6 +211,7 @@
     "refresh_failed": "Refresh field failed.",
     "banned_athletic_deck_part1": "Entertainment Mode does not allow top ",
     "banned_athletic_deck_part2": " popular meta decks. Please change your deck.",
+    "chat_disabled": "Chat is disabled in this room.",
     "using_athletic_deck": " is using a competitive deck."
   },
   "es-es": {
@@ -571,6 +572,7 @@
     "refresh_fail": "刷新场面失败。",
     "banned_athletic_deck_part1": "娱乐匹配中禁止使用使用数前",
     "banned_athletic_deck_part2": "的竞技卡组。请更换卡组。",
+    "chat_disabled": "本房间禁止聊天。",
     "using_athletic_deck": " 正在使用竞技卡组。"
   },
  "ko-kr": {

data/structs.json

@@ -78,7 +78,8 @@
     ],
     "STOC_HS_PlayerEnter": [
         {"name": "name", "type": "unsigned short", "length": 20, "encoding": "UTF-16LE"},
-        {"name": "pos", "type": "unsigned char"}
+        {"name": "pos", "type": "unsigned char"},
+        {"name": "padding", "type": "unsigned char"}
     ],
     "STOC_HS_PlayerChange": [
         {"name": "status", "type": "unsigned char"}