athletic deck ban

athletic-check.js

@@ -45,7 +45,7 @@ class AthleticChecker {
         try {
             const athleticDecks = await this.getAthleticDecks();
             const deckType = await this.getDeckType(deck);
-            const athletic = athleticDecks.includes(deckType);
+            const athletic = athleticDecks.findIndex(d => d === deckType) + 1;
             return { success: true, athletic, message: null };
         }
         catch (e) {

athletic-check.ts

@@ -21,7 +21,7 @@ interface AthleticDecksReturnData {
 
 interface ReturnMessage {
 	success: boolean;
-	athletic?: boolean;
+	athletic?: number;
 	message: string;
 }
 
@@ -63,8 +63,8 @@ export class AthleticChecker {
 		try {
 			const athleticDecks = await this.getAthleticDecks();
 			const deckType = await this.getDeckType(deck);
-			const athletic = athleticDecks.includes(deckType);
-			return { success: true, athletic, message: null }
+			const athletic = athleticDecks.findIndex(d => d === deckType) + 1;
+			return { success: true, athletic, message: null };
 		} catch (e) {
 			return { success: false, message: e.toString() };
 		}

data/default_config.json

@@ -197,6 +197,7 @@
         "source": "mycard-athletic"
       },
       "rankCount": 10,
+      "banCount": 0,
       "ttl": 600
     },
     "test_mode": {

data/i18n.json

@@ -173,6 +173,8 @@
     "windbot_disable_random_room": "By adding the AI, this random game won't get any new player unless they enter the room name:",
     "refresh_success": "Refresh field succeeded.",
     "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.",
     "using_athletic_deck": " is using a competitive deck."
   },
   "es-es": {
@@ -495,6 +497,8 @@
     "windbot_disable_random_room": "因为添加了AI，本随机对战房间将只能通过房间名加入：",
     "refresh_success": "刷新场面成功。",
     "refresh_fail": "刷新场面失败。",
+    "banned_athletic_deck_part1": "娱乐匹配中禁止使用使用数前",
+    "banned_athletic_deck_part2": "的竞技卡组。请更换卡组。",
     "using_athletic_deck": " 正在使用竞技卡组。"
   },
  "ko-kr": {

ygopro-server.coffee

@@ -3321,7 +3321,20 @@ ygopro.ctos_follow 'UPDATE_DECK', true, (buffer, info, client, server, datas)->
       struct.set("sidec", 1)
       struct.set("deckbuf", [4392470, 4392470])
       ygopro.stoc_send_chat(client, "${deck_incorrect_reconnect}", ygopro.constants.COLORS.RED)
-  else if room.duel_stage == ygopro.constants.DUEL_STAGE.BEGIN and settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.deck_check and fs.readdirSync(settings.modules.tournament_mode.deck_path).length
+      return false
+  else
+    if settings.modules.athletic_check.enabled and settings.modules.athletic_check.banCount
+      athleticCheckResult = await athleticChecker.checkAthletic({main: buff_main, side: buff_side})
+      if athleticCheckResult.success
+        if athleticCheckResult.athletic and athleticCheckResult.athletic <= settings.modules.athletic_check.banCount
+          struct.set("mainc", 1)
+          struct.set("sidec", 1)
+          struct.set("deckbuf", [4392470, 4392470])
+          ygopro.stoc_send_chat(client, "${banned_athletic_deck_part1}#{settings.modules.athletic_check.banCount}${banned_athletic_deck_part2}", ygopro.constants.COLORS.RED)
+          return false
+      else
+        log.warn("GET ATHLETIC FAIL", client.name, athleticCheckResult.message)
+    if room.duel_stage == ygopro.constants.DUEL_STAGE.BEGIN and settings.modules.tournament_mode.enabled and settings.modules.tournament_mode.deck_check
       decks = await fs.promises.readdir(settings.modules.tournament_mode.deck_path)
       if decks.length
         struct.set("mainc", 1)

ygopro-server.js

@@ -4338,7 +4338,7 @@
   });
 
   ygopro.ctos_follow('UPDATE_DECK', true, async function(buffer, info, client, server, datas) {
-    var buff_main, buff_side, card, current_deck, deck, deck_array, deck_main, deck_side, deck_text, deckbuf, decks, found_deck, i, j, l, len, len1, line, oppo_pos, recover_player_data, recoveredDeck, room, struct, win_pos;
+    var athleticCheckResult, buff_main, buff_side, card, current_deck, deck, deck_array, deck_main, deck_side, deck_text, deckbuf, decks, found_deck, i, j, l, len, len1, line, oppo_pos, recover_player_data, recoveredDeck, room, struct, win_pos;
     if (settings.modules.reconnect.enabled && client.pre_reconnecting) {
       if (!CLIENT_is_able_to_reconnect(client) && !CLIENT_is_able_to_kick_reconnect(client)) {
         ygopro.stoc_send_chat(client, "${reconnect_failed}", ygopro.constants.COLORS.RED);
@@ -4433,8 +4433,27 @@
         struct.set("sidec", 1);
         struct.set("deckbuf", [4392470, 4392470]);
         ygopro.stoc_send_chat(client, "${deck_incorrect_reconnect}", ygopro.constants.COLORS.RED);
+        return false;
+      }
+    } else {
+      if (settings.modules.athletic_check.enabled && settings.modules.athletic_check.banCount) {
+        athleticCheckResult = (await athleticChecker.checkAthletic({
+          main: buff_main,
+          side: buff_side
+        }));
+        if (athleticCheckResult.success) {
+          if (athleticCheckResult.athletic && athleticCheckResult.athletic <= settings.modules.athletic_check.banCount) {
+            struct.set("mainc", 1);
+            struct.set("sidec", 1);
+            struct.set("deckbuf", [4392470, 4392470]);
+            ygopro.stoc_send_chat(client, `\${banned_athletic_deck_part1}${settings.modules.athletic_check.banCount}\${banned_athletic_deck_part2}`, ygopro.constants.COLORS.RED);
+            return false;
+          }
+        } else {
+          log.warn("GET ATHLETIC FAIL", client.name, athleticCheckResult.message);
+        }
       }
-    } else if (room.duel_stage === ygopro.constants.DUEL_STAGE.BEGIN && settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.deck_check && fs.readdirSync(settings.modules.tournament_mode.deck_path).length) {
+      if (room.duel_stage === ygopro.constants.DUEL_STAGE.BEGIN && settings.modules.tournament_mode.enabled && settings.modules.tournament_mode.deck_check) {
         decks = (await fs.promises.readdir(settings.modules.tournament_mode.deck_path));
         if (decks.length) {
           struct.set("mainc", 1);
@@ -4484,6 +4503,7 @@
           }
         }
       }
+    }
     return false;
   });