Merge branch 'master' of ../srvpro

Dockerfile.lite

@@ -38,7 +38,7 @@ RUN git clone --branch=server --recursive --depth=1 https://code.mycard.moe/nana
     strip ygopro && \
     mkdir replay expansions && \
     rm -rf .git* bin obj build ocgcore cmake lua premake* sound textures .travis.yml *.txt appveyor.yml LICENSE README.md *.lua strings.conf system.conf && \
-    ls gframe | sed '/game.cpp/d' | xargs -I {} rm -rf gframe/{}
+    ls gframe | sed '/config.h/d' | xargs -I {} rm -rf gframe/{}
 
 # infos
 WORKDIR /ygopro-server

data/default_config.json

@@ -119,7 +119,8 @@
         "TMR": true
       },
       "ready_time": 20,
-      "hang_timeout": 90
+      "hang_timeout": 90,
+      "extra_modes": {}
     },
     "mysql": {
       "enabled": false,

ygopro-server.coffee

@@ -512,7 +512,7 @@ loadLFList = (path) ->
     catch
   try
     log.info("Reading YGOPro version.")
-    cppversion = parseInt((await fs.promises.readFile(path.resolve(settings.modules.ygopro_path, 'gframe', 'game.cpp'), 'utf8')).match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16')
+    cppversion = parseInt((await fs.promises.readFile(path.resolve(settings.modules.ygopro_path, 'gframe', 'config.h'), 'utf8')).match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16')
     await setting_change(settings, "version", cppversion)
     log.info "ygopro version 0x"+settings.version.toString(16), "(from source code)"
   catch
@@ -853,7 +853,7 @@ ROOM_find_or_create_by_name = global.ROOM_find_or_create_by_name = (name, player
   uname=name.toUpperCase()
   if settings.modules.windbot.enabled and (uname[0...2] == 'AI' or (!settings.modules.random_duel.enabled and uname == ''))
     return ROOM_find_or_create_ai(name)
-  if settings.modules.random_duel.enabled and (uname == '' or uname == 'S' or uname == 'M' or uname == 'T' or uname == 'TOR' or uname == 'TR' or uname == 'OOR' or uname == 'OR' or uname == 'TOMR' or uname == 'TMR' or uname == 'OOMR' or uname == 'OMR' or uname == 'CR' or uname == 'CMR')
+  if settings.modules.random_duel.enabled and (uname == '' or uname == 'S' or uname == 'M' or uname == 'T' or uname == 'TOR' or uname == 'TR' or uname == 'OOR' or uname == 'OR' or uname == 'TOMR' or uname == 'TMR' or uname == 'OOMR' or uname == 'OMR' or uname == 'CR' or uname == 'CMR' or settings.modules.random_duel.extra_modes[uname] != undefined)
     return await ROOM_find_or_create_random(uname, player_ip)
   if room = ROOM_find_by_name(name)
     return room
@@ -911,8 +911,9 @@ ROOM_find_or_create_random = global.ROOM_find_or_create_random = (type, player_i
   else
     return null
   if result.random_type=='S' then result.welcome2 = '${random_duel_enter_room_single}'
-  if result.random_type=='M' then result.welcome2 = '${random_duel_enter_room_match}'
-  if result.random_type=='T' then result.welcome2 = '${random_duel_enter_room_tag}'
+  else if result.random_type=='M' then result.welcome2 = '${random_duel_enter_room_match}'
+  else if result.random_type=='T' then result.welcome2 = '${random_duel_enter_room_tag}'
+  else result.welcome2 = settings.modules.random_duel.extra_modes[type]?.welcome ? ''
   return result
 
 ROOM_find_or_create_ai = global.ROOM_find_or_create_ai = (name)->

ygopro-server.js

-// Generated by CoffeeScript 2.7.0
+// Generated by CoffeeScript 2.6.1
 (function() {
   // 标准库
   var Aragami, CLIENT_check_vip, CLIENT_get_absolute_pos, CLIENT_get_authorize_key, CLIENT_get_kick_reconnect_target, CLIENT_get_partner, CLIENT_get_save_data, CLIENT_heartbeat_register, CLIENT_heartbeat_unregister, CLIENT_import_data, CLIENT_is_able_to_kick_reconnect, CLIENT_is_able_to_reconnect, CLIENT_is_banned_by_mc, CLIENT_is_player, CLIENT_kick, CLIENT_kick_reconnect, CLIENT_pre_reconnect, CLIENT_reconnect, CLIENT_reconnect_register, CLIENT_reconnect_unregister, CLIENT_send_pre_reconnect_info, CLIENT_send_reconnect_info, CLIENT_send_replays, CLIENT_send_replays_and_kick, CLIENT_send_vip_status, CLIENT_set_ip, CLIENT_use_cdkey, PQueue, Q, ROOM_all, ROOM_bad_ip, ROOM_ban_player, ROOM_clear_disconnect, ROOM_connected_ip, ROOM_find_by_name, ROOM_find_by_pid, ROOM_find_by_port, ROOM_find_by_title, ROOM_find_or_create_ai, ROOM_find_or_create_by_name, ROOM_find_or_create_random, ROOM_kick, ROOM_player_flee, ROOM_player_get_score, ROOM_player_lose, ROOM_player_win, ROOM_players_oppentlist, ROOM_unwelcome, ROOM_validate, ReplayParser, ResolveData, Room, SERVER_clear_disconnect, SERVER_kick, SOCKET_flush_data, VIP_generate_cdkeys, YGOProDeck, _, _async, addCallback, aragami, aragami_classes, athleticChecker, auth, axios, badwordR, badwords, ban_user, bunyan, challonge, checkFileExists, concat_name, createDirectoryIfNotExists, crypto, dataManager, deck_name_match, dialogues, disconnect_list, exec, execFile, extra_mode_list, fs, geoip, getDuelLogQueryFromQs, getRealIp, get_memory_usage, gpt_tokenizer, http, httpRequestListener, importOldConfig, import_datas, init, ip6addr, isTrustedProxy, lflists, loadJSON, loadJSONAsync, loadLFList, loadRemoteData, load_dialogues, load_dialogues_custom, load_tips, load_tips_zh, load_words, log, long_resolve_cards, memory_usage, merge, moment, moment_long_ago_string, moment_now, moment_now_string, msg_polyfill, mustache, neosRequestListener, net, netRequestHandler, os, osu, path, qs, real_windbot_server_ip, release_disconnect, report_to_big_brother, request, roomlist, rooms_count, setting_change, setting_get, setting_save, settings, spawn, spawnSync, spawn_windbot, tips, toIpv4, toIpv6, url, users_cache, util, utility, wait_room_start, wait_room_start_arena, windbot_looplimit, windbot_process, windbots, words, ygopro, zlib;
@@ -656,7 +656,11 @@
     }
     try {
       log.info("Reading YGOPro version.");
+<<<<<<< HEAD
       cppversion = parseInt(((await fs.promises.readFile(path.resolve(settings.modules.ygopro_path, 'gframe', 'game.cpp'), 'utf8'))).match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16');
+=======
+      cppversion = parseInt(((await fs.promises.readFile('ygopro/gframe/config.h', 'utf8'))).match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16');
+>>>>>>> b465b5e3d63eea64c8e08e07cf1069549b3bc0ad
       await setting_change(settings, "version", cppversion);
       log.info("ygopro version 0x" + settings.version.toString(16), "(from source code)");
     } catch (error1) {
@@ -1095,7 +1099,11 @@
     if (settings.modules.windbot.enabled && (uname.slice(0, 2) === 'AI' || (!settings.modules.random_duel.enabled && uname === ''))) {
       return ROOM_find_or_create_ai(name);
     }
+<<<<<<< HEAD
     if (settings.modules.random_duel.enabled && (uname === '' || uname === 'S' || uname === 'M' || uname === 'T' || uname === 'TOR' || uname === 'TR' || uname === 'OOR' || uname === 'OR' || uname === 'TOMR' || uname === 'TMR' || uname === 'OOMR' || uname === 'OMR' || uname === 'CR' || uname === 'CMR')) {
+=======
+    if (settings.modules.random_duel.enabled && (uname === '' || uname === 'S' || uname === 'M' || uname === 'T' || settings.modules.random_duel.extra_modes[uname] !== void 0)) {
+>>>>>>> b465b5e3d63eea64c8e08e07cf1069549b3bc0ad
       return (await ROOM_find_or_create_random(uname, player_ip));
     }
     if (room = ROOM_find_by_name(name)) {
@@ -1117,7 +1125,7 @@
   };
 
   ROOM_find_or_create_random = global.ROOM_find_or_create_random = async function(type, player_ip) {
-    var max_player, name, playerbanned, randomDuelBanRecord, result;
+    var max_player, name, playerbanned, randomDuelBanRecord, ref, ref1, result;
     if (settings.modules.mysql.enabled) {
       randomDuelBanRecord = (await dataManager.getRandomDuelBan(player_ip));
       if (randomDuelBanRecord) {
@@ -1167,12 +1175,12 @@
     }
     if (result.random_type === 'S') {
       result.welcome2 = '${random_duel_enter_room_single}';
-    }
-    if (result.random_type === 'M') {
+    } else if (result.random_type === 'M') {
       result.welcome2 = '${random_duel_enter_room_match}';
-    }
-    if (result.random_type === 'T') {
+    } else if (result.random_type === 'T') {
       result.welcome2 = '${random_duel_enter_room_tag}';
+    } else {
+      result.welcome2 = (ref = (ref1 = settings.modules.random_duel.extra_modes[type]) != null ? ref1.welcome : void 0) != null ? ref : '';
     }
     return result;
   };