Merge branch 'develop' into server-develop

.github/workflows/build.yml

@@ -144,7 +144,7 @@ jobs:
       uses: mercury233/action-cache-download-file@v1.0.0
       with:
         url: https://github.com/xiph/opus/releases/download/v1.5.2/opus-1.5.2.tar.gz
-    
+
     - name: Extract opus
       if: matrix.audiolib == 'miniaudio'
       run: |
@@ -398,7 +398,7 @@ jobs:
       uses: mercury233/action-cache-download-file@v1.0.0
       with:
         url: https://github.com/xiph/opus/releases/download/v1.5.2/opus-1.5.2.tar.gz
-    
+
     - name: Extract opus
       if: matrix.static-link == true
       run: |
@@ -625,7 +625,7 @@ jobs:
       uses: mercury233/action-cache-download-file@v1.0.0
       with:
         url: https://github.com/xiph/opus/releases/download/v1.5.2/opus-1.5.2.tar.gz
-    
+
     - name: Extract opus
       if: matrix.static-link == true
       run: |
@@ -679,7 +679,7 @@ jobs:
           --build-event \
           --build-freetype \
           --build-sqlite \
-          --build-opus-vorbis 
+          --build-opus-vorbis
 
     - name: Make
       run: |

gframe/bufferio.h

@@ -162,7 +162,6 @@ public:
 		}
 		else
 			return 0;
-	
 	}
 };
 

gframe/client_card.cpp

@@ -35,8 +35,12 @@ void ClientCard::SetCode(unsigned int x) {
 	if((location == LOCATION_HAND) && (code != x)) {
 		code = x;
 		mainGame->dField.MoveCard(this, 5);
-	} else
+	} else {
+		if (x == 0 && code != 0) {
+			chain_code = code;
+		}
 		code = x;
+	}
 }
 void ClientCard::UpdateInfo(unsigned char* buf) {
 	int flag = BufferIO::Read<int32_t>(buf);
@@ -48,11 +52,7 @@ void ClientCard::UpdateInfo(unsigned char* buf) {
 		int pdata = BufferIO::Read<int32_t>(buf);
 		if (!pdata)
 			ClearData();
-		if((location == LOCATION_HAND) && ((unsigned int)pdata != code)) {
-			code = pdata;
-			mainGame->dField.MoveCard(this, 5);
-		} else
-			code = pdata;
+		SetCode(pdata);
 	}
 	if(flag & QUERY_POSITION) {
 		int pdata = (BufferIO::Read<int32_t>(buf) >> 24) & 0xff;

gframe/config.h

@@ -13,7 +13,7 @@
 #include <windows.h>
 #include <ws2tcpip.h>
 
-#if defined(_MSC_VER) or defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #define mywcsncasecmp _wcsnicmp
 #define mystrncasecmp _strnicmp
 #else
@@ -73,8 +73,12 @@ extern char** environ;
 #include "../ocgcore/ocgapi.h"
 
 template<size_t N, typename... TR>
-inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR... args) {
-	return std::swprintf(buf, N, fmt, args...);
+inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR&&... args) {
+	return std::swprintf(buf, N, fmt, std::forward<TR>(args)...);
+}
+template<size_t N, typename... TR>
+inline int mysnprintf(char(&buf)[N], const char* fmt, TR&&... args) {
+	return std::snprintf(buf, N, fmt, std::forward<TR>(args)...);
 }
 
 inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
@@ -91,20 +95,7 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
 	return fp;
 }
 
-#if !defined(_WIN32)
 #define myfopen std::fopen
-#elif defined(WDK_NTDDI_VERSION) && (WDK_NTDDI_VERSION >= 0x0A000005) // Redstone 4, Version 1803, Build 17134.
-#define FOPEN_WINDOWS_SUPPORT_UTF8
-#define myfopen std::fopen
-#else
-inline FILE* myfopen(const char* filename, const char* mode) {
-	wchar_t wfilename[256]{};
-	BufferIO::DecodeUTF8(filename, wfilename);
-	wchar_t wmode[20]{};
-	BufferIO::CopyCharArray(mode, wmode);
-	return _wfopen(wfilename, wmode);
-}
-#endif
 
 #if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_ZIP_SUPPORT)
 #include <irrlicht.h>

gframe/data_manager.cpp

@@ -14,7 +14,10 @@ irr::io::IFileSystem* DataManager::FileSystem = nullptr;
 DataManager dataManager;
 
 DataManager::DataManager() : _datas(32768), _strings(32768) {
-	extra_setcode = { {8512558u, {0x8f, 0x54, 0x59, 0x82, 0x13a}}, };
+	extra_setcode = { 
+		{8512558u, {0x8f, 0x54, 0x59, 0x82, 0x13a}},
+		{55088578u, {0x8f, 0x54, 0x59, 0x82, 0x13a}},
+	};
 }
 bool DataManager::ReadDB(sqlite3* pDB) {
 	sqlite3_stmt* pStmt = nullptr;
@@ -352,7 +355,7 @@ void DataManager::InsertServerList() {
 #endif //YGOPRO_SERVER_MODE
 bool DataManager::Error(sqlite3* pDB, sqlite3_stmt* pStmt) {
 	if (const char* msg = sqlite3_errmsg(pDB))
-		std::snprintf(errmsg, sizeof errmsg, "%s", msg);
+		mysnprintf(errmsg, "%s", msg);
 	else
 		errmsg[0] = '\0';
 	sqlite3_finalize(pStmt);
@@ -598,7 +601,7 @@ unsigned char* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
 }
 unsigned char* DataManager::ScriptReaderExSingle(const char* path, const char* script_name, int* slen, int pre_len, unsigned int use_irr) {
 	char sname[256];
-	std::snprintf(sname, sizeof sname, "%s%s", path, script_name + pre_len); //default script name: ./script/c%d.lua
+	mysnprintf(sname, "%s%s", path, script_name + pre_len); //default script name: ./script/c%d.lua
 #if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_ZIP_SUPPORT)
 	if (use_irr) {
 		return ReadScriptFromIrrFS(sname, slen);

gframe/deck_con.cpp

@@ -215,6 +215,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					mainGame->cbDBDecks->addItem(dname);
 					mainGame->cbDBDecks->setSelected(mainGame->cbDBDecks->getItemCount() - 1);
 				}
+				prev_deck = mainGame->cbDBDecks->getSelected();
 				int catesel = mainGame->cbDBCategory->getSelected();
 				wchar_t catepath[256];
 				DeckManager::GetCategoryPath(catepath, catesel, mainGame->cbDBCategory->getText());

gframe/drawing.cpp

@@ -371,6 +371,7 @@ void Game::DrawCard(ClientCard* pcard) {
 		if(pcard->aniFrame == 0) {
 			pcard->is_moving = false;
 			pcard->is_fading = false;
+			pcard->chain_code = 0;
 		}
 	}
 	matManager.mCard.AmbientColor = 0xffffffff;
@@ -378,7 +379,10 @@ void Game::DrawCard(ClientCard* pcard) {
 	driver->setTransform(irr::video::ETS_WORLD, pcard->mTransform);
 	auto m22 = pcard->mTransform(2, 2);
 	if(m22 > -0.99 || pcard->is_moving) {
-		matManager.mCard.setTexture(0, imageManager.GetTexture(pcard->code));
+		auto code = pcard->code;
+		if (code == 0 && pcard->is_moving)
+			code = pcard->chain_code;
+		matManager.mCard.setTexture(0, imageManager.GetTexture(code));
 		driver->setMaterial(matManager.mCard);
 		driver->drawVertexPrimitiveList(matManager.vCardFront, 4, matManager.iRectangle, 2);
 	}

gframe/duelclient.cpp

@@ -853,7 +853,6 @@ void DuelClient::HandleSTOCPacketLan(unsigned char* data, int len) {
 			starttime = new_replay.pheader.base.start_time;
 		else
 			starttime = new_replay.pheader.base.seed;
-		
 		wchar_t timetext[40];
 		std::wcsftime(timetext, sizeof timetext / sizeof timetext[0], L"%Y-%m-%d %H-%M-%S", std::localtime(&starttime));
 		mainGame->ebRSName->setText(timetext);

gframe/game.cpp

@@ -2194,7 +2194,7 @@ void Game::AddDebugMsg(const char* msg) {
 	}
 	if (enable_log & 0x2) {
 		char msgbuf[1040];
-		std::snprintf(msgbuf, sizeof msgbuf, "[Script Error]: %s", msg);
+		mysnprintf(msgbuf, "[Script Error]: %s", msg);
 		ErrorLog(msgbuf);
 	}
 #endif //YGOPRO_SERVER_MODE

gframe/gframe.cpp

@@ -16,6 +16,10 @@
 #include <sstream>
 #endif
 
+#if defined(_WIN32) && (!defined(WDK_NTDDI_VERSION) || (WDK_NTDDI_VERSION < 0x0A000005)) // Redstone 4, Version 1803, Build 17134.
+#error "This program requires the Windows 10 SDK version 1803 or above to compile on Windows. Otherwise, non-ASCII characters will not be displayed or processed correctly."
+#endif
+
 unsigned int enable_log = 0x3;
 bool expansions_specified = false;
 std::vector<std::wstring> expansions_list;
@@ -36,11 +40,11 @@ void ClickButton(irr::gui::IGUIElement* btn) {
 #endif //YGOPRO_SERVER_MODE
 
 int main(int argc, char* argv[]) {
-#if defined(FOPEN_WINDOWS_SUPPORT_UTF8)
+#if defined(_WIN32)
 	std::setlocale(LC_CTYPE, ".UTF-8");
 #elif defined(__APPLE__)
 	std::setlocale(LC_CTYPE, "UTF-8");
-#elif !defined(_WIN32)
+#else
 	std::setlocale(LC_CTYPE, "");
 #endif
 #if defined __APPLE__ && !defined YGOPRO_SERVER_MODE

gframe/menu_handler.cpp

@@ -365,9 +365,9 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					int flag = 0;
 					flag += (mainGame->chkBotHand->isChecked() ? 0x1 : 0);
 					char arg2[8];
-					std::snprintf(arg2, sizeof arg2, "%d", flag);
+					mysnprintf(arg2, "%d", flag);
 					char arg3[8];
-					std::snprintf(arg3, sizeof arg3, "%d", mainGame->gameConf.serverport);
+					mysnprintf(arg3, "%d", mainGame->gameConf.serverport);
 					execl("./bot", "bot", arg1, arg2, arg3, nullptr);
 					std::exit(0);
 				} else {

gframe/myfilesystem.h

@@ -182,7 +182,7 @@ public:
 		bool success = true;
 		TraversalDir(dir, [dir, &success](const char *name, bool isdir) {
 			char full_path[1024];
-			int len = std::snprintf(full_path, sizeof full_path, "%s/%s", dir, name);
+			int len = mysnprintf(full_path, "%s/%s", dir, name);
 			if (len < 0 || len >= (int)(sizeof full_path)) {
 				success = false;
 				return;
@@ -234,7 +234,7 @@ public:
 			file_unit funit;
 #endif
 			char fname[1024];
-			int len = std::snprintf(fname, sizeof fname, "%s/%s", path, dirp->d_name);
+			int len = mysnprintf(fname, "%s/%s", path, dirp->d_name);
 			if (len < 0 || len >= (int)(sizeof fname))
 				continue;
 			stat(fname, &fileStat);

gframe/premake5.lua

@@ -73,7 +73,7 @@ end
     end
 
     if BUILD_FREETYPE then
-        includedirs { "../freetype/include" }
+        includedirs { "../freetype/custom", "../freetype/include" }
     else
         includedirs { FREETYPE_INCLUDE_DIR }
         libdirs { FREETYPE_LIB_DIR }

gframe/replay.cpp

@@ -176,17 +176,12 @@ bool Replay::RenameReplay(const wchar_t* oldname, const wchar_t* newname) {
 	wchar_t newfname[256];
 	myswprintf(oldfname, L"./replay/%ls", oldname);
 	myswprintf(newfname, L"./replay/%ls", newname);
-#ifdef _WIN32
-	BOOL result = MoveFileW(oldfname, newfname);
-	return !!result;
-#else
-	char oldfilefn[256];
-	char newfilefn[256];
+	char oldfilefn[1024];
+	char newfilefn[1024];
 	BufferIO::EncodeUTF8(oldfname, oldfilefn);
 	BufferIO::EncodeUTF8(newfname, newfilefn);
-	int result = rename(oldfilefn, newfilefn);
+	int result = std::rename(oldfilefn, newfilefn);
 	return result == 0;
-#endif
 }
 bool Replay::ReadNextResponse(unsigned char resp[]) {
 	unsigned char len{};

gframe/replay_mode.cpp

@@ -228,7 +228,7 @@ bool ReplayMode::StartDuel() {
 		}
 	} else {
 		char filename[256]{};
-		std::snprintf(filename, sizeof filename, "./single/%s", cur_replay.script_name.c_str());
+		mysnprintf(filename, "./single/%s", cur_replay.script_name.c_str());
 		if(!preload_script(pduel, filename)) {
 			return false;
 		}

ocgcore @ 0c4898b2

-Subproject commit d2d3e31e382d71b460cd7f3842b4d332f3d5446c
+Subproject commit 0c4898b2d1da022aff1fcf766d87336327aebeaf

premake/event/premake5.lua

@@ -10,9 +10,6 @@ project "event"
     if EVENT_VERSION>=0x02020000 then
         print("Warning: Using libevent version 2.2.x is not supported, please use 2.1.x, otherwise you may encounter issues.")
     end
-    if EVENT_VERSION>=0x02010000 and WINXP_SUPPORT then
-        print("Warning: libevent 2.1 uses some new APIs which require Windows Vista or later, so WinXP support will be invalid.")
-    end
 
     includedirs { "include", "compat" }
 

premake/freetype/custom/ft2build.h

+/****************************************************************************
+ *
+ * ft2build.h
+ *
+ *   FreeType 2 build and setup macros.
+ *
+ * Use custom/ft2build.h instead of the default include/freetype/ft2build.h
+ * to customize the FreeType 2 build of YGOPro.
+ *
+ */
+
+#ifndef FT2_BUILD_MY_PLATFORM_H_
+#define FT2_BUILD_MY_PLATFORM_H_
+
+#define FT_CONFIG_OPTIONS_H  <ygopro/ftoption.h>
+#define FT_CONFIG_MODULES_H  <ygopro/ftmodule.h>
+
+#include <freetype/config/ftheader.h>
+
+#endif /* FT2_BUILD_MY_PLATFORM_H_ */

premake/freetype/custom/ygopro/ftmodule.h

+/*
+ * This file registers the FreeType modules compiled into the library.
+ *
+ * YGOPro only uses modules that are needed for TrueType and OpenType fonts.
+ *
+ */
+
+FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
+FT_USE_MODULE( FT_Module_Class, psaux_module_class )
+FT_USE_MODULE( FT_Module_Class, psnames_module_class )
+FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
+FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
+
+/* EOF */

premake/freetype/custom/ygopro/ftoption.h

+/****************************************************************************
+ *
+ * ftoption.h
+ *
+ *   User-selectable configuration macros (specification only).
+ *
+ * This file is customized for YGOPro to include only the necessary
+ * configuration options for the TrueType and OpenType font driver.
+ *
+ * See the original FreeType source code for more information.
+ * /include/freetype/config/ftoption.h
+ *
+ */
+
+#ifndef FTOPTION_H_
+#define FTOPTION_H_
+
+
+#include <ft2build.h>
+
+
+FT_BEGIN_HEADER
+
+#define FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES
+
+#undef FT_CONFIG_OPTION_FORCE_INT64
+
+#define FT_CONFIG_OPTION_INLINE_MULFIX
+
+#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
+
+#define FT_CONFIG_OPTION_INCREMENTAL
+
+#define FT_RENDER_POOL_SIZE  16384L
+
+#define FT_MAX_MODULES  32
+
+#undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
+
+#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+
+#define TT_CONFIG_OPTION_COLOR_LAYERS
+
+#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
+
+#define TT_CONFIG_CMAP_FORMAT_0
+#define TT_CONFIG_CMAP_FORMAT_2
+#define TT_CONFIG_CMAP_FORMAT_4
+#define TT_CONFIG_CMAP_FORMAT_6
+#define TT_CONFIG_CMAP_FORMAT_8
+#define TT_CONFIG_CMAP_FORMAT_10
+#define TT_CONFIG_CMAP_FORMAT_12
+#define TT_CONFIG_CMAP_FORMAT_13
+#define TT_CONFIG_CMAP_FORMAT_14
+
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+
+#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED
+
+#ifndef TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES
+#define TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES  1000000L
+#endif
+
+#define T1_MAX_SUBRS_CALLS  16
+
+#define T1_MAX_CHARSTRINGS_OPERANDS  256
+
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1   500
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1   400
+
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2  1000
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2   275
+
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3  1667
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3   275
+
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4  2333
+#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4     0
+
+
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define  TT_USE_BYTECODE_INTERPRETER
+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
+#define  TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+#endif
+#endif
+
+#ifdef TT_CONFIG_OPTION_COLOR_LAYERS
+#define  TT_SUPPORT_COLRV1
+#endif
+
+FT_END_HEADER
+
+#endif /* FTOPTION_H_ */
+
+
+/* END */

premake/freetype/premake5.lua

 project "freetype"
     kind "StaticLib"
 
-    includedirs { "include" }
+    includedirs { "custom", "include" }
     defines { "FT2_BUILD_LIBRARY" }
 
-    files { "src/autofit/autofit.c",
-            "src/base/ftbase.c",
-            "src/base/ftbbox.c",
-            "src/base/ftbdf.c",
-            "src/base/ftbitmap.c",
-            "src/base/ftcid.c",
-            "src/base/ftfstype.c",
-            "src/base/ftgasp.c",
-            "src/base/ftglyph.c",
-            "src/base/ftgxval.c",
-            "src/base/ftinit.c",
-            "src/base/ftmm.c",
-            "src/base/ftotval.c",
-            "src/base/ftpatent.c",
-            "src/base/ftpfr.c",
-            "src/base/ftstroke.c",
-            "src/base/ftsynth.c",
-            "src/base/fttype1.c",
-            "src/base/ftwinfnt.c",
-            "src/bdf/bdf.c",
-            "src/cache/ftcache.c",
-            "src/cff/cff.c",
-            "src/cid/type1cid.c",
-            "src/gzip/ftgzip.c",
-            "src/lzw/ftlzw.c",
-            "src/pcf/pcf.c",
-            "src/pfr/pfr.c",
-            "src/psaux/psaux.c",
-            "src/pshinter/pshinter.c",
-            "src/psnames/psmodule.c",
-            "src/raster/raster.c",
-            "src/sfnt/sfnt.c",
-            "src/sdf/sdf.c",
-            "src/smooth/smooth.c",
-            "src/truetype/truetype.c",
-            "src/type1/type1.c",
-            "src/type42/type42.c",
-            "src/winfonts/winfnt.c" }
-
-    if os.isfile("src/svg/svg.c") then
-        files { "src/svg/svg.c" }
-    end
+    files {
+        "src/base/ftinit.c",
+        "src/base/ftbase.c",
+        "src/base/ftbitmap.c",
+        "src/cff/cff.c",
+        "src/psaux/psaux.c",
+        "src/pshinter/pshinter.c",
+        "src/psnames/psnames.c",
+        "src/sfnt/sfnt.c",
+        "src/smooth/smooth.c",
+        "src/truetype/truetype.c",
+    }
 
     filter "system:windows"
         files { "builds/windows/ftsystem.c",

premake/sqlite3/premake5.lua

@@ -12,6 +12,7 @@ if not SERVER_PRO3_SUPPORT then
         "SQLITE_OMIT_DEPRECATED",
         "SQLITE_OMIT_PROGRESS_CALLBACK",
         "SQLITE_OMIT_SHARED_CACHE",
+        "SQLITE_TRUSTED_SCHEMA=0",
     }
 end
 

premake5.lua

@@ -90,7 +90,6 @@ newoption { trigger = "irrklang-pro-release-lib-dir", category = "YGOPro - irrkl
 newoption { trigger = "irrklang-pro-debug-lib-dir", category = "YGOPro - irrklang - pro", description = "", value = "PATH" }
 newoption { trigger = 'build-ikpmp3', category = "YGOPro - irrklang - ikpmp3", description = "" }
 
-newoption { trigger = "winxp-support", category = "YGOPro", description = "" }
 newoption { trigger = "mac-arm", category = "YGOPro", description = "Compile for Apple Silicon Mac" }
 newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile for Intel Mac" }
 
@@ -252,7 +251,7 @@ if GetParam("no-dxsdk") then
 end
 if USE_DXSDK and os.istarget("windows") then
     if not os.getenv("DXSDK_DIR") then
-        print("DXSDK_DIR environment variable not set, it seems you don't have the DirectX SDK installed. DirectX mode will be disabled.")
+        print("Warning: DXSDK_DIR environment variable not set, it seems you don't have the DirectX SDK installed. DirectX mode will be disabled.")
         USE_DXSDK = false
     end
 end
@@ -328,10 +327,6 @@ if USE_AUDIO and not SERVER_MODE then
     end
 end
 
-if GetParam("winxp-support") and os.istarget("windows") then
-    WINXP_SUPPORT = true
-end
-
 IS_ARM=false
 
 function spawn(cmd)
@@ -438,12 +433,7 @@ workspace "YGOPro"
     filter "system:windows"
         systemversion "latest"
         startproject "YGOPro"
-        if WINXP_SUPPORT then
-            defines { "WINVER=0x0501" }
-            toolset "v141_xp"
-        else
-            defines { "WINVER=0x0601" } -- WIN7
-        end
+        defines { "WINVER=0x0601" } -- WIN7
         platforms { "Win32", "x64" }
 
     filter { "system:windows", "platforms:Win32" }
@@ -501,9 +491,7 @@ workspace "YGOPro"
 
     filter "action:vs*"
         cdialect "C11"
-        if not WINXP_SUPPORT then
-           conformancemode "On" 
-        end
+        conformancemode "On" 
         vectorextensions "SSE2"
         buildoptions { "/utf-8" }
         defines { "_CRT_SECURE_NO_WARNINGS" }

strings.conf

@@ -676,6 +676,8 @@
 !counter 0x6c 访问指示物
 !counter 0x6d 祝台指示物
 !counter 0x6e 四季指示物
+!counter 0x6f 龋齿指示物
+!counter 0x70 盘子指示物
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1260,7 +1262,7 @@
 !setname 0x1c2 喷水引擎	アクア・ジェット
 !setname 0x1c3 巳剑	Mitsurugi
 !setname 0x1c4 征龙	征竜
-!setname 0x1c5 再世	再世
+!setname 0x1c5 再世	リジェネシス
 !setname 0x1c6 统王	ドミナス
 !setname 0x1c7 塞勒凯特	Serket
 !setname 0x1c8 阿匹卜	Apophis
@@ -1270,3 +1272,7 @@
 !setname 0x1cc 瞬间移动	テレポート
 !setname 0x1cd 神艺	アルトメギア
 !setname 0x1ce 狱神	獄神
+!setname 0x1cf 奏悦机组	R.B.
+!setname 0x1d0 死伟王	死偉王
+!setname 0x1d1 绚岚	絢嵐
+!setname 0x1d2 终刻	ドゥームズ