Merge remote-tracking branch 'origin/server' into server-develop

c5c8860e · wind2009 · 4e439b1a · ea760fbb · c5c8860e · c5c8860e
Commit c5c8860e authored Mar 30, 2025 by wind2009
19 changed files
--- a/.ci/exec-macos-platform.sh
+++ b/.ci/exec-macos-platform.sh
@@ -11,6 +11,7 @@ export IRRLICHT_LIB_DIR=$PWD/irrlicht

 ./.ci/libevent-prebuild.sh

+chmod +x ./premake5
 ./premake5 gmake --cc=clang --build-freetype --build-sqlite --no-use-irrklang

 cd build

--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
+name: Automated Test Build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-2019, windows-2022]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Checkout repository with submodules
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+        submodules: true
+
+    - name: Update submodules
+      run: |
+        cd ocgcore
+        git checkout master
+        git pull origin master
+        cd ..
+#        cd script
+#        git checkout master
+#        git pull origin master
+#        cd ..
+
+    - name: Download premake
+      id: premake
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/premake/premake-core/releases/download/v5.0.0-beta5/premake-5.0.0-beta5-windows.zip
+        filename: premake5.zip
+
+    - name: Extract premake
+      run: |
+        7z x ${{ steps.premake.outputs.filepath }}
+
+    - name: Download libevent
+      id: libevent
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz
+        filename: libevent.tar.gz
+
+    - name: Extract libevent
+      run: |
+        tar xf ${{ steps.libevent.outputs.filepath }}
+        move libevent-2.0.22-stable event
+        xcopy /E event\WIN32-Code event\include
+
+    - name: Download freetype
+      id: freetype
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: http://downloads.sourceforge.net/freetype/freetype-2.13.3.tar.gz
+
+    - name: Extract freetype
+      run: |
+        tar xf ${{ steps.freetype.outputs.filepath }}
+        move freetype-2.13.3 freetype
+
+    - name: Download lua
+      id: lua
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://www.lua.org/ftp/lua-5.4.7.tar.gz
+
+    - name: Extract lua
+      run: |
+        tar xf ${{ steps.lua.outputs.filepath }}
+        move lua-5.4.7 lua
+
+    - name: Download sqlite
+      id: sqlite
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://www.sqlite.org/2025/sqlite-amalgamation-3490100.zip
+
+    - name: Extract sqlite
+      run: |
+        7z x ${{ steps.sqlite.outputs.filepath }}
+        move sqlite-amalgamation-3490100 sqlite3
+
+    - name: Download irrKlang
+      id: irrKlang
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://www.ambiera.at/downloads/irrKlang-32bit-1.6.0.zip
+
+    - name: Extract irrKlang
+      run: |
+        7z x ${{ steps.irrKlang.outputs.filepath }}
+        move irrKlang-1.6.0 irrKlang
+
+    - name: Download irrlicht
+      run: |
+        git clone --depth=1 https://github.com/mercury233/irrlicht
+
+    - name: Check DirectX SDK
+      id: dxsdk
+      uses: actions/cache@v4
+      with:
+        key: dxsdk
+        path: DXSDK
+
+    - name: Download DirectX SDK
+      if: steps.dxsdk.outputs.cache-hit != 'true'
+      id: dxsdk-download
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://download.microsoft.com/download/a/e/7/ae743f1f-632b-4809-87a9-aa1bb3458e31/DXSDK_Jun10.exe
+
+    - name: Install DirectX SDK
+      if: steps.dxsdk.outputs.cache-hit != 'true'
+      run: |
+        7z x ${{ steps.dxsdk-download.outputs.filepath }} -aoa
+
+    - name: Set DirectX SDK environment variable
+      run: |
+        $dxsdkPath = Resolve-Path 'DXSDK'
+        "DXSDK_DIR=$($dxsdkPath.ProviderPath)\" | Out-File -FilePath $env:GITHUB_ENV -Append
+
+    - name: Copy premake files
+      run: |
+        xcopy /E premake\* .
+
+    - name: Use premake to generate Visual Studio solution (2019)
+      if: matrix.os == 'windows-2019'
+      run: |
+        .\premake5.exe vs2019 --winxp-support
+
+    - name: Use premake to generate Visual Studio solution (2022)
+      if: matrix.os == 'windows-2022'
+      run: |
+        .\premake5.exe vs2022
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Build solution
+      run: |
+        MSBuild.exe build\YGOPro.sln /m /p:Configuration=Release
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: YGOPro-${{ matrix.os }}
+        path: |
+          bin/release/YGOPro.exe
+
+  build-linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+#          - ubuntu-20.04
+          - ubuntu-22.04
+          - ubuntu-24.04
+        include:
+#          - os: ubuntu-20.04
+#            premake_version: 5.0.0-beta2
+          - os: ubuntu-22.04
+            premake_version: 5.0.0-beta4
+          - os: ubuntu-24.04
+            premake_version: 5.0.0-beta5
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Checkout repository with submodules
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+        submodules: true
+
+    - name: Update submodules
+      run: |
+        cd ocgcore
+        git checkout master
+        git pull origin master
+        cd ..
+#        cd script
+#        git checkout master
+#        git pull origin master
+#        cd ..
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libevent-dev libfreetype6-dev libgl1-mesa-dev libglu1-mesa-dev libsqlite3-dev libxxf86vm-dev
+
+    - name: Download premake
+      id: premake
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/premake/premake-core/releases/download/v${{ matrix.premake_version }}/premake-${{ matrix.premake_version }}-linux.tar.gz
+        filename: premake5.tar.gz
+
+    - name: Extract premake
+      run: |
+        tar xf ${{ steps.premake.outputs.filepath }}
+        chmod +x ./premake5
+
+    - name: Download lua
+      id: lua
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://www.lua.org/ftp/lua-5.4.7.tar.gz
+
+    - name: Extract lua
+      run: |
+        tar xf ${{ steps.lua.outputs.filepath }}
+        mv lua-5.4.7 lua
+
+    - name: Download irrlicht
+      run: |
+        git clone --depth=1 https://github.com/mercury233/irrlicht
+
+    - name: Copy premake files
+      run: |
+        cp -r premake/* .
+
+    - name: Use premake to generate make files
+      run: |
+        ./premake5 gmake \
+          --no-use-irrklang \
+          --freetype-include-dir="/usr/include/freetype2"
+
+    - name: Make
+      run: |
+        cd build
+        make -j 4 config=release
+        cd ..
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: YGOPro-${{ matrix.os }}
+        path: |
+          bin/release/YGOPro
+
+  build-macos:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-13
+          - macos-15
+        include:
+          - os: macos-13
+            premake_version: 5.0.0-beta5
+          - os: macos-15
+            premake_version: 5.0.0-beta5
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - name: Checkout repository with submodules
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+        submodules: true
+
+    - name: Update submodules
+      run: |
+        cd ocgcore
+        git checkout master
+        git pull origin master
+        cd ..
+#        cd script
+#        git checkout master
+#        git pull origin master
+#        cd ..
+
+#    - name: Install dependencies
+#      run: |
+#        brew install freetype libevent libx11 sqlite zlib
+
+    - name: Download premake
+      id: premake
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/premake/premake-core/releases/download/v${{ matrix.premake_version }}/premake-${{ matrix.premake_version }}-macosx.tar.gz
+        filename: premake5.tar.gz
+
+    - name: Extract premake
+      run: |
+        tar xf ${{ steps.premake.outputs.filepath }}
+        chmod +x ./premake5
+
+    - name: Download lua
+      id: lua
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://www.lua.org/ftp/lua-5.4.7.tar.gz
+
+    - name: Extract lua
+      run: |
+        tar xf ${{ steps.lua.outputs.filepath }}
+        mv lua-5.4.7 lua
+
+    - name: Download irrlicht
+      run: |
+        git clone --depth=1 https://github.com/mercury233/irrlicht
+
+    - name: Build irrlicht
+      run: |
+        cd irrlicht/source/Irrlicht/MacOSX
+        xcodebuild -project MacOSX.xcodeproj
+        cd ../../../..
+
+    - name: Copy premake files
+      run: |
+        cp -r premake/* .
+
+    - name: Use premake to generate make files (Intel)
+      if: runner.arch == 'X64'
+      run: |
+        ./premake5 gmake \
+          --cc=clang \
+          --no-use-irrklang \
+          --freetype-include-dir="/usr/local/include/freetype2" \
+          --irrlicht-include-dir="../irrlicht/include" \
+          --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
+
+    - name: Use premake to generate make files (ARM64)
+      if: runner.arch == 'ARM64'
+      run: |
+        ./premake5 gmake \
+          --cc=clang \
+          --no-use-irrklang \
+          --event-include-dir="/opt/homebrew/include" \
+          --event-lib-dir="/opt/homebrew/lib" \
+          --freetype-include-dir="/opt/homebrew/include/freetype2" \
+          --freetype-lib-dir="/opt/homebrew/lib" \
+          --sqlite-include-dir="/opt/homebrew/opt/sqlite/include" \
+          --sqlite-lib-dir="/opt/homebrew/opt/sqlite/lib" \
+          --irrlicht-include-dir="../irrlicht/include" \
+          --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
+
+    - name: Make
+      run: |
+        cd build
+        make -j 3 config=release
+        cd ..
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: YGOPro-${{ matrix.os }}
+        path: |
+          bin/*
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,13 +51,13 @@ mat_linux:
  script:
    - apt update; apt -y install git wget tar
    - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
-    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta2-linux.tar.gz | tar zfx -
-    - env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh
+    # - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta5-linux.tar.gz | tar zfx -
+    # - env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh
  artifacts:
    paths:
-      - premake5
+      # - premake5
      - irrlicht
-      - libevent-stable
+      # - libevent-stable
  image: git-registry.mycard.moe/mycard/docker-runner-base:debian11

 mat_windows:
@@ -67,8 +67,8 @@ mat_windows:
  script:
    - apt update; apt -y install wget tar patch p7zip-full
    # premake5.exe
-    - wget https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta2-windows.zip
-    - 7z x -y premake-5.0.0-beta2-windows.zip
+    - wget https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta5-windows.zip
+    - 7z x -y premake-5.0.0-beta5-windows.zip
    # event
    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
    - mv libevent-2.0.22-stable event
@@ -117,7 +117,7 @@ exec_linux:
    - mat_submodules
  script:
    - apt update; apt -y install git build-essential
-    - ./premake5 gmake --build-sqlite --server-zip-support
+    - premake5 gmake --build-sqlite --server-zip-support
    - cd build
    - make config=release -j$(nproc)
    - cd ..
@@ -126,7 +126,7 @@ exec_linux:
  artifacts:
    paths:
      - ygopro
-  image: git-registry.mycard.moe/mycard/docker-runner-base:debian11
+  image: git-registry.moenext.com/mycard/docker-ygopro-builder:latest

 exec_debian:
  extends: ._exec_build
@@ -138,7 +138,7 @@ exec_debian:
    - mat_submodules
  script:
    - apt update; apt -y install git build-essential liblua5.3-dev libsqlite3-dev libevent-dev
-    - ./premake5 gmake --lua-deb
+    - premake5 gmake --lua-deb
    - cd build
    - make config=release -j$(nproc)
    - cd ..
@@ -147,6 +147,7 @@ exec_debian:
  artifacts:
    paths:
      - ygopro
+  image: git-registry.moenext.com/mycard/docker-ygopro-builder:latest

 #win_server_pack:
 #  stage: pack

--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/config.h
+++ b/gframe/config.h
@@ -72,14 +72,8 @@ inline FILE* mywfopen(const wchar_t* filename, const char* mode) {
 	return fp;
 }

-#ifndef YGOPRO_SERVER_MODE
+#if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_ZIP_SUPPORT)
 #include <irrlicht.h>
-#endif //YGOPRO_SERVER_MODE
-
-#ifdef SERVER_ZIP_SUPPORT
-#include <irrlicht.h>
-using namespace irr;
-using namespace io;
 #endif

 extern const unsigned short PRO_VERSION;

--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -98,7 +98,7 @@ void Game::MainServerLoop() {
 	dataManager.LoadDB(L"cards.cdb");
 	LoadExpansions();
 #ifdef SERVER_PRO2_SUPPORT
-	DataManager::FileSystem->addFileArchive("data/script.zip", true, false, EFAT_ZIP);
+	DataManager::FileSystem->addFileArchive("data/script.zip", true, false, irr::io::EFAT_ZIP);
 #endif

 	server_port = NetServer::StartServer(server_port);

--- a/gframe/lzma/premake5.lua
+++ b/gframe/lzma/premake5.lua
 project "clzma"
    kind "StaticLib"
+    cdialect "C11"
    files { "*.c", "*.h" }
--- a/gframe/premake5.lua
+++ b/gframe/premake5.lua
@@ -34,6 +34,7 @@ if SERVER_MODE then
    end
 else
    kind "WindowedApp"
+    cppdialect "C++14"

    files { "*.cpp", "*.h" }
    includedirs { "../ocgcore" }
@@ -106,7 +107,7 @@ else
        links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
 end
    filter "not action:vs*"
-        buildoptions { "-std=c++14", "-fno-rtti" }
+        buildoptions { "-fno-rtti" }
    filter "not system:windows"
        links { "event_pthreads", "dl", "pthread" }
    filter "system:macosx"

--- a/gframe/spmemvfs/premake5.lua
+++ b/gframe/spmemvfs/premake5.lua
 project "cspmemvfs"
    kind "StaticLib"
+    cdialect "C11"
    files { "*.c", "*.h" }

    if BUILD_SQLITE then
        includedirs { "../../sqlite3" }
    end
+
+    filter "not action:vs*"
+    defines { "_POSIX_C_SOURCE=200809L" }
--- a/lflist.conf
+++ b/lflist.conf
-#[2025.1][2024.12 TCG][2024.10][2024.7][2024.4][2024.1][2023.10][2023.7][2023.4][2023.1][2022.10][2022.7][2022.4][2022.1][2021.10][2021.7][2021.4][2021.1][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2024.9 TCG][2024.4 TCG][2024.1 TCG][2023.9 TCG][2023.6 TCG][2023.2 TCG][2022.12 TCG][2022.10 TCG][2022.5 TCG][2022.2 TCG][2021.10 TCG][2021.7 TCG][2021.3 TCG][2020.12 TCG][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
+#[2025.4][2025.1][2024.12 TCG][2024.10][2024.7][2024.4][2024.1][2023.10][2023.7][2023.4][2023.1][2022.10][2022.7][2022.4][2022.1][2021.10][2021.7][2021.4][2021.1][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2024.9 TCG][2024.4 TCG][2024.1 TCG][2023.9 TCG][2023.6 TCG][2023.2 TCG][2022.12 TCG][2022.10 TCG][2022.5 TCG][2022.2 TCG][2021.10 TCG][2021.7 TCG][2021.3 TCG][2020.12 TCG][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
+!2025.4
+#forbidden
+20292186 0 --アーティファクト－デスサイズ
+91869203 0 --アマゾネスの射手
+20663556 0 --イレカエル
+44910027 0 --ヴィクトリー・ドラゴン
+27552504 0 --永遠の淑女 ベアトリーチェ
+51858306 0 --エクリプス・ワイバーン
+62242678 0 --琰魔竜王 レッド・デーモン・カラミティ
+34945480 0 --外神アザトート
+95727991 0 --カタパルト・タートル
+08903700 0 --儀式魔人リリーサー
+11384280 0 --キャノン・ソルジャー
+17412721 0 --旧神ノーデン
+32909498 0 --クシャトリラ・フェンリル
+50588353 0 --水晶機巧－ハリファイバー
+62320425 0 --古衛兵アギド
+25926710 0 --古尖兵ケルベク
+03040496 0 --混沌魔龍 カオス・ルーラー
+02563463 0 --流離のグリフォンライダー
+88071625 0 --The tyrant NEPTUNE
+52653092 0 --SNo.0 ホープ・ゼアル
+85115440 0 --十二獣ブルホーン
+59537380 0 --守護竜アガーペイン
+86148577 0 --守護竜エルピィ
+21044178 0 --深淵に潜む者
+88581108 0 --真竜皇V.F.D.
+27381364 0 --スプライト・エルフ
+16923472 0 --ゼンマイハンター
+15341821 0 --ダンディライオン
+77679716 0 --超重武者装留ブレイク・アーマー
+92731385 0 --ティアラメンツ・キトカロス
+69015963 0 --デビル・フランケン
+79875176 0 --トゥーン・キャノン・ソルジャー
+75732622 0 --トーチ・ゴーレム
+22593417 0 --トポロジック・ガンブラー・ドラゴン
+39064822 0 --トロイメア・ゴブリン
+03679218 0 --トロイメア・マーメイド
+54719828 0 --No.16 色の支配者ショック・ルーラー
+63504681 0 --No.86 H－C ロンゴミアント
+58820923 0 --No.95 ギャラクシーアイズ・ダークマター・ドラゴン
+78706415 0 --ファイバーポッド
+93369354 0 --フィッシュボーグ－ガンナー
+23558733 0 --フェニキシアン・クラスター・アマリリス
+09929398 0 --BF－朧影のゴウフウ
+70369116 0 --捕食植物ヴェルテ・アナコンダ
+63101919 0 --マジックテンペスター
+34206604 0 --魔導サイエンティスト
+14702066 0 --メガキャノン・ソルジャー
+96782886 0 --メンタルマスター
+90809975 0 --餅カエル
+83152482 0 --ユニオン・キャリアー
+34086406 0 --ラヴァルバル・チェイン
+85243784 0 --リンクロス
+73356503 0 --烈風の結界像
+57421866 0 --レベル・スティーラー
+41482598 0 --悪夢の蜃気楼
+44763025 0 --いたずら好きな双子悪魔
+17375316 0 --押収
+35059553 0 --カイザーコロシアム
+74191942 0 --苦渋の選択
+42829885 0 --強引な番兵
+55144522 0 --強欲な壺
+23557835 0 --次元融合
+31423101 0 --神剣－フェニックスブレード
+57953380 0 --生還の宝札
+54447022 0 --ソウル・チャージ
+60682203 0 --大寒波
+69243953 0 --蝶の短剣－エルマ
+79571449 0 --天使の施し
+63789924 0 --盗人の煙玉
+70828912 0 --早すぎた埋葬
+42703248 0 --ハリケーン
+76375976 0 --魔鍾洞
+34906152 0 --マスドライバー
+46411259 0 --突然変異
+85602018 0 --遺言状
+27174286 0 --異次元からの帰還
+05851097 0 --虚無空間
+93016201 0 --王宮の弾圧
+61740673 0 --王宮の勅命
+23516703 0 --サモンリミッター
+03280747 0 --第六感
+64697231 0 --ダスト・シュート
+80604091 0 --血の代償
+32723153 0 --マジカル・エクスプロージョン
+17178486 0 --ライフチェンジャー
+28566710 0 --ラストバトル！
+#limit
+76794549 1 --アストログラフ・マジシャン
+34022970 1 --エクス・ライゼオル
+29301450 1 --S：Pリトルナイト
+68304193 1 --クシャトリラ・ユニコーン
+72270339 1 --黒魔女ディアベルスター
+99937011 1 --剣神官ムドラ
+38814750 1 --PSYフレームギア・γ
+74586817 1 --PSYフレームロード・Ω
+32731036 1 --深淵の獣ルベリオン
+36521307 1 --斬機サーキュラー
+48905153 1 --十二獣ドランシア
+78872731 1 --十二獣モルモラット
+06602300 1 --重爆撃禽 ボム・フェネクス
+63542003 1 --宿神像ケルドウ
+09674034 1 --スネークアイ・エクセル
+90241276 1 --蛇眼の炎燐
+13533678 1 --スプライト・ジェット
+76145933 1 --スプライト・ブルー
+35844557 1 --ソード・ライゼオル
+90361010 1 --超重武者装留イワトオシ
+37818794 1 --超魔導竜騎士－ドラグーン・オブ・レッドアイズ
+04928565 1 --ティアラメンツ・クシャトリラ
+00572850 1 --ティアラメンツ・シェイレーン
+37961969 1 --ティアラメンツ・ハゥフニス
+74078255 1 --ティアラメンツ・メイルゥ
+73956664 1 --ティアラメンツ・レイノハート
+91800273 1 --ディメンション・アトラクター
+90953320 1 --TG ハイパー・ライブラリアン
+91810826 1 --天盃龍チュンドラ
+75433814 1 --No.40 ギミック・パペット－ヘブンズ・ストリングス
+17266660 1 --朱光の宣告者
+06637331 1 --深淵の獣ドルイドヴルム
+72656408 1 --深淵の獣バルドレイク
+33854624 1 --深淵の獣マグナムート
+80453041 1 --ファントム・オブ・ユベル
+33396948 1 --封印されしエクゾディア
+44519536 1 --封印されし者の左足
+07902349 1 --封印されし者の左腕
+08124921 1 --封印されし者の右足
+70903634 1 --封印されし者の右腕
+94689206 1 --ブロックドラゴン
+24094258 1 --ヘビーメタルフォーゼ・エレクトラム
+32061192 1 --M∀LICE＜P＞Dormouse
+60764609 1 --魔を刻むデモンスミス
+77103950 1 --壱世壊＝ペルレイノ
+33782437 1 --一時休戦
+01845204 1 --簡易融合
+61292243 1 --EMERGENCY！
+19613556 1 --大嵐
+81439173 1 --おろかな埋葬
+85106525 1 --篝火
+84211599 1 --金満で謙虚な壺
+23701465 1 --原初の種
+80845034 1 --“罪宝狩りの悪魔”
+30336082 1 --盃満ちる燦幻荘
+83764718 1 --死者蘇生
+15443125 1 --スプライト・スターター
+07477101 1 --時空の七皇
+52340444 1 --閃刀機－ホーネットビット
+32807846 1 --増援
+72892473 1 --手札抹殺
+98567237 1 --刻まれし魔の詠聖
+73628505 1 --テラ・フォーミング
+11110587 1 --隣の芝刈り
+18144506 1 --ハーピィの羽根帚
+75500286 1 --封印の黄金櫃
+07394770 1 --ブリリアント・フュージョン
+73468603 1 --盆回し
+93600443 1 --マスク・チェンジ・セカンド
+65681983 1 --抹殺の指名者
+71832012 1 --六世壊＝パライゾス
+01475311 1 --闇の誘惑
+44362883 1 --烙印融合
+92107604 1 --神碑の泉
+27970830 1 --六武の門
+02295440 1 --ワン・フォー・ワン
+90846359 1 --群雄割拠
+53334471 1 --御前試合
+82732705 1 --スキルドレイン
+24207889 1 --センサー万別
+21076084 1 --トリックスター・リンカーネイション
+23002292 1 --レッド・リブート
+#semi limit
+34124316 2 --サイバーポッド
+81275020 2 --SRベイゴマックス
+23434538 2 --増殖するG
+65734501 2 --R－ACEエアホイスター
+35726888 2 --おろかな副葬
+67723438 2 --緊急テレポート
+49238328 2 --強欲で金満な壺
+35261759 2 --強欲で貪欲な壺
+48130397 2 --超融合
+93729896 2 --ナイトメア・スローン
+24224830 2 --墓穴の指名者
+21347668 2 --ピュアリィ・スリーピィメモリー
+52947044 2 --フュージョン・デステニー
+92714517 2 --ビッグウェルカム・ラビュリンス
+
 !2025.1
 #forbidden
 91869203 0 --アマゾネスの射手

--- a/ocgcore @ 74c7c053
+++ b/ocgcore @ 74c7c053
-Subproject commit 84355e54a8ba30e9f397b0e453680006e4e54be8
+Subproject commit 74c7c053a393f397758c798e2860ab5972b56338
--- a/premake/event/premake5.lua
+++ b/premake/event/premake5.lua
 project "event"
    kind "StaticLib"
+    cdialect "C11"

    includedirs { "include", "compat" }


--- a/premake/freetype/premake5.lua
+++ b/premake/freetype/premake5.lua
 project "freetype"
    kind "StaticLib"
+    cdialect "C11"

    includedirs { "include" }
    defines { "FT2_BUILD_LIBRARY" }

--- a/premake/irrlicht/premake5.lua
+++ b/premake/irrlicht/premake5.lua
 project "irrlicht"
    kind "StaticLib"
+    cdialect "C11"

    includedirs { "include", "source/Irrlicht", "source/Irrlicht/jpeglib", "source/Irrlicht/libpng", "source/Irrlicht/zlib" }
    
@@ -318,7 +319,7 @@ project "irrlicht"

    filter { "system:windows" }
        defines { "_IRR_WCHAR_FILESYSTEM" }
-        includedirs { "$(DXSDK_DIR)include" }
+        includedirs { "$(DXSDK_DIR)Include" }
        libdirs { "$(DXSDK_DIR)Lib/x86" }
        links { "imm32" }


--- a/premake/lua/premake5.lua
+++ b/premake/lua/premake5.lua
 project "lua"
    kind "StaticLib"
+    compileas "C++"

-    files { "src/*.c", "src/*.h", "src/*.hpp" }
-    removefiles { "src/lua.c", "src/luac.c" }
-
-    filter "action:vs*"
-        buildoptions { "/TP" }
-
-    filter "not action:vs*"
-        buildoptions { "-x c++" }
+    files { "src/*.c", "src/*.h" }
+    removefiles { "src/lua.c", "src/luac.c", "src/linit.c", "src/onelua.c" }

    filter "configurations:Debug"
        defines { "LUA_USE_APICHECK" }

--- a/premake/sqlite3/premake5.lua
+++ b/premake/sqlite3/premake5.lua
 project "sqlite3"
    kind "StaticLib"
+    cdialect "C11"

    files { "sqlite3.c", "sqlite3.h" }
--- a/premake5.lua
+++ b/premake5.lua
@@ -56,7 +56,7 @@ newoption { trigger = "irrklang-pro-debug-lib-dir", category = "YGOPro - irrklan
 newoption { trigger = 'build-ikpmp3', category = "YGOPro - irrklang - ikpmp3", description = "" }

 newoption { trigger = "winxp-support", category = "YGOPro", description = "" }
-newoption { trigger = "mac-arm", category = "YGOPro", description = "M1" }
+newoption { trigger = "mac-arm", category = "YGOPro", description = "Cross compile for Apple Silicon" }

 newoption { trigger = "server-mode", category = "YGOPro - server", description = "" }
 newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" }
@@ -110,9 +110,9 @@ end
 if not BUILD_LUA then
    -- at most times you need to change this if you change BUILD_LUA to false
    -- make sure your lua lib is built with C++ and version >= 5.3
-    LUA_INCLUDE_DIR = GetParam("lua-include-dir") or "/usr/local/include/lua"
-    LUA_LIB_DIR = GetParam("lua-lib-dir") or "/usr/local/lib"
    LUA_LIB_NAME = GetParam("lua-lib-name")
+    LUA_INCLUDE_DIR = GetParam("lua-include-dir") or os.findheader(LUA_LIB_NAME)
+    LUA_LIB_DIR = GetParam("lua-lib-dir") or os.findlib(LUA_LIB_NAME)
 end

 if GetParam("lua-deb") then
@@ -128,8 +128,8 @@ elseif GetParam("no-build-event") then
    BUILD_EVENT = false
 end
 if not BUILD_EVENT then
-    EVENT_INCLUDE_DIR = GetParam("event-include-dir") or "/usr/local/include/event2"
-    EVENT_LIB_DIR = GetParam("event-lib-dir") or "/usr/local/lib"
+    EVENT_INCLUDE_DIR = GetParam("event-include-dir") or os.findheader("event")
+    EVENT_LIB_DIR = GetParam("event-lib-dir") or os.findlib("event")
 end

 if GetParam("build-freetype") then
@@ -138,13 +138,8 @@ elseif GetParam("no-build-freetype") then
    BUILD_FREETYPE = false
 end
 if not BUILD_FREETYPE then
-    if os.istarget("linux") then
-        FREETYPE_INCLUDE_DIR = "/usr/include/freetype2"
-    elseif os.istarget("macosx") then
-        FREETYPE_INCLUDE_DIR = "/usr/local/include/freetype2"
-    end
-    FREETYPE_INCLUDE_DIR = GetParam("freetype-include-dir") or FREETYPE_INCLUDE_DIR
-    FREETYPE_LIB_DIR = GetParam("freetype-lib-dir") or "/usr/local/lib"
+    FREETYPE_INCLUDE_DIR = GetParam("freetype-include-dir") or os.findheader("freetype")
+    FREETYPE_LIB_DIR = GetParam("freetype-lib-dir") or os.findlib("freetype")
 end

 if GetParam("build-sqlite") then
@@ -153,8 +148,8 @@ elseif GetParam("no-build-sqlite") then
    BUILD_SQLITE = false
 end
 if not BUILD_SQLITE then
-    SQLITE_INCLUDE_DIR = GetParam("sqlite-include-dir") or "/usr/local/include"
-    SQLITE_LIB_DIR = GetParam("sqlite-lib-dir") or "/usr/local/lib"
+    SQLITE_INCLUDE_DIR = GetParam("sqlite-include-dir") or os.findheader("sqlite3")
+    SQLITE_LIB_DIR = GetParam("sqlite-lib-dir") or os.findlib("sqlite3")
 end

 if GetParam("build-irrlicht") then
@@ -163,8 +158,8 @@ elseif GetParam("no-build-irrlicht") then
    BUILD_IRRLICHT = false
 end
 if not BUILD_IRRLICHT then
-    IRRLICHT_INCLUDE_DIR = GetParam("irrlicht-include-dir") or "/usr/local/include/irrlicht"
-    IRRLICHT_LIB_DIR = GetParam("irrlicht-lib-dir") or "/usr/local/lib"
+    IRRLICHT_INCLUDE_DIR = GetParam("irrlicht-include-dir") or os.findheader("irrlicht")
+    IRRLICHT_LIB_DIR = GetParam("irrlicht-lib-dir") or os.findlib("irrlicht")
 end

 if GetParam("use-irrklang") then
@@ -268,7 +263,11 @@ end
        targetdir "bin/debug"

    filter { "configurations:Release", "action:vs*" }
+        if linktimeoptimization then
+            linktimeoptimization "On"
+        else
            flags { "LinkTimeOptimization" }
+        end
        staticruntime "On"
        disablewarnings { "4244", "4267", "4838", "4577", "4018", "4996", "4477", "4091", "4800", "6011", "6031", "6054", "6262" }


--- a/script @ ce34d01b
+++ b/script @ ce34d01b
-Subproject commit 6aad5883a4d80738718da2a770b88411d312f876
+Subproject commit ce34d01b80d5ff553e8b43ba750dcf5c34592984
--- a/strings.conf
+++ b/strings.conf
@@ -1249,3 +1249,5 @@
 !setname 0x1c4 征龙	征竜
 !setname 0x1c5 再世	再世
 !setname 0x1c6 统王	ドミナス
+!setname 0x1c7 塞勒凯特	Serket
+!setname 0x1c8 阿匹卜	Apophis