Merge branch 'master' into koishi

data-manager/DataManager.js

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

data-manager/DataManager.ts

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

data-manager/entities/RandomDuelScore.js

@@ -33,7 +33,7 @@ let RandomDuelScore = class RandomDuelScore extends CreateAndUpdateTimeBase_1.Cr
         ++this.fleeCount;
         this.lose();
     }
-    getScoreText(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,7 +40,7 @@ export class RandomDuelScore extends CreateAndUpdateTimeBase {
         this.lose();
     }
 
-    getScoreText(displayName = this.getDisplayName()) {
+    getScoreText(displayName: string) {
         const total = this.winCount + this.loseCount;
         if (this.winCount < 2 && total < 3) {
             return `${displayName} \${random_score_not_enough}`;

ygopro-server.coffee

@@ -2642,9 +2642,8 @@ ygopro.stoc_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
       return
   if settings.modules.random_duel.record_match_scores and room.random_type == 'M'
     ygopro.stoc_send_chat_to_room(room, await ROOM_player_get_score(client, client.name), ygopro.constants.COLORS.GREEN)
-    if not settings.modules.hide_name
-      for player in room.players when player.pos != 7 and player != client
-        ygopro.stoc_send_chat(client, await ROOM_player_get_score(player, room.getMaskedPlayerName(player, client)), ygopro.constants.COLORS.GREEN)
+    for player in room.players when player.pos != 7 and player != client
+      ygopro.stoc_send_chat(client, await ROOM_player_get_score(player, room.getMaskedPlayerName(player, client)), ygopro.constants.COLORS.GREEN)
   if !room.recorder
     room.recorder = recorder = net.connect room.port, ->
       ygopro.ctos_send recorder, 'PLAYER_INFO', {

ygopro-server.js

@@ -3463,13 +3463,11 @@
     //client.score_shown = true
     if (settings.modules.random_duel.record_match_scores && room.random_type === 'M') {
       ygopro.stoc_send_chat_to_room(room, (await ROOM_player_get_score(client, client.name)), ygopro.constants.COLORS.GREEN);
-      if (!settings.modules.hide_name) {
-        ref = room.players;
-        for (j = 0, len = ref.length; j < len; j++) {
-          player = ref[j];
-          if (player.pos !== 7 && player !== client) {
-            ygopro.stoc_send_chat(client, (await ROOM_player_get_score(player, room.getMaskedPlayerName(player, client))), ygopro.constants.COLORS.GREEN);
-          }
+      ref = room.players;
+      for (j = 0, len = ref.length; j < len; j++) {
+        player = ref[j];
+        if (player.pos !== 7 && player !== client) {
+          ygopro.stoc_send_chat(client, (await ROOM_player_get_score(player, room.getMaskedPlayerName(player, client))), ygopro.constants.COLORS.GREEN);
         }
       }
     }