Merge branch 'server-develop' into server

.ci/build-opus.sh

+#!/bin/sh
+set -x
+set -o errexit
+
+cd miniaudio
+
+external_built_dir="$PWD/external-built"
+
+is_macos=false
+if [ "$(uname)" = "Darwin" ]; then
+  is_macos=true
+fi
+
+maybe_patch_configure() {
+  if $is_macos; then
+    sed -i.bak 's/-force_cpusubtype_ALL//g' configure*
+  fi
+}
+
+build_single_thing() {
+  lib_name="$1"
+  cd "external/$lib_name"
+  shift
+  maybe_patch_configure
+  PKG_CONFIG_PATH="$external_built_dir/lib/pkgconfig" ./configure --prefix="$external_built_dir" --enable-static=yes --enable-shared=no "$@"
+  make -j$(nproc)
+  make install
+  cd ../..
+}
+
+build_single_thing ogg
+build_single_thing opus
+build_single_thing opusfile --disable-examples --disable-http
+build_single_thing vorbis --with-ogg="$external_built_dir"
+
+cd ..

.ci/exec-macos-platform.sh

@@ -8,13 +8,20 @@ export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
 export EVENT_LIB_DIR=$PWD/libevent-stable/lib
 export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include
 export IRRLICHT_LIB_DIR=$PWD/irrlicht/lib/$(arch)
+export OPUS_INCLUDE_DIR=$PWD/miniaudio/external-built/include/opus
+export OPUS_LIB_DIR=$PWD/miniaudio/external-built/lib
+export VORBIS_INCLUDE_DIR=$PWD/miniaudio/external-built/include
+export VORBIS_LIB_DIR=$PWD/miniaudio/external-built/lib
+export OGG_INCLUDE_DIR=$PWD/miniaudio/external-built/include
+export OGG_LIB_DIR=$PWD/miniaudio/external-built/lib
 
 ./.ci/libevent-prebuild.sh
+./.ci/build-opus.sh
 
 ./premake5 gmake --cc=clang --build-freetype --build-sqlite
 
 cd build
-make config=release -j4
+make config=release -j$(nproc)
 cd ..
 
 mkdir ygopro-platforms

.ci/libevent-prebuild.sh

-#!/bin/bash
+#!/bin/sh
 set -x
 set -o errexit
 # PROCESSOR_COUNT=4
 
-wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+if [ -d "libevent-stable" ]; then
+  rm -rf libevent-stable
+fi
+
+if [ ! -d "libevent-2.0.22-stable" ]; then
+  wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
+fi
+
+install_path="$PWD/libevent-stable"
+
 cd libevent-2.0.22-stable
-./configure --prefix=$PWD/libevent-stable --disable-openssl --enable-static=yes --enable-shared=no
-make -j$PROCESSOR_COUNT
+./configure "--prefix=$install_path" --disable-openssl --enable-static=yes --enable-shared=no "$@"
+make -j$(nproc)
 make install
 cd ..
-mv libevent-2.0.22-stable/libevent-stable .
-rm -rf libevent-2.0.22-stable

.ci/pack-linux-dlc.sh

@@ -4,7 +4,13 @@ set -o errexit
 
 ARCHIVE_FILES=(ygopro cards.cdb locales fonts sound textures strings.conf system.conf pack)
 
-TARGET_PLATFORM=linux
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=linux
+fi
+
+if [[ "$TARGET_PLATFORM" != "linuxarm" ]]; then
+    ARCHIVE_FILES+=(sound)
+fi
 
 apt update && apt -y install tar zstd
 mkdir dist replay

.ci/pack-linux.sh

@@ -2,11 +2,17 @@
 set -x
 set -o errexit
 
-ARCHIVE_FILES=(ygopro LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound windbot bot bot.conf locales fonts pack)
+ARCHIVE_FILES=(ygopro LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay windbot bot bot.conf locales fonts pack)
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX
-TARGET_PLATFORM=linux
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=linux
+fi
+
+if [[ "$TARGET_PLATFORM" != "linuxarm" ]]; then
+    ARCHIVE_FILES+=(sound)
+fi
 
 apt update && apt -y install tar git zstd
 mkdir dist replay

.ci/pack-macos-dlc.sh

@@ -4,7 +4,9 @@ set -o errexit
 
 ARCHIVE_FILES=(ygopro.app cards.cdb locales fonts sound textures strings.conf system.conf pack)
 
-TARGET_PLATFORM=darwin
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=darwin
+fi
 
 apt update && apt -y install tar zstd
 mkdir dist replay

.ci/pack-macos.sh

@@ -6,7 +6,9 @@ ARCHIVE_FILES=(ygopro.app LICENSE README.md lflist.conf strings.conf system.conf
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX
-TARGET_PLATFORM=darwin
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=darwin
+fi
 
 apt update && apt -y install tar git zstd
 mkdir dist replay

.ci/pack-windows-7z.sh

@@ -9,7 +9,9 @@ if [[ "$TARGET_LOCALE" == "zh-CN" ]]; then
 fi
 
 # TARGET_LOCALE
-TARGET_PLATFORM=win32
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=win32
+fi
 
 apt update && apt -y install p7zip-full git
 mkdir dist replay

.ci/pack-windows-dlc.sh

@@ -4,7 +4,9 @@ set -o errexit
 
 ARCHIVE_FILES=(ygopro.exe cards.cdb locales fonts sound textures strings.conf system.conf skin pack)
 
-TARGET_PLATFORM=win32
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=win32
+fi
 
 apt update && apt -y install tar zstd
 mkdir dist replay

.ci/pack-windows.sh

@@ -10,7 +10,9 @@ fi
 
 # TARGET_LOCALE
 # ARCHIVE_SUFFIX
-TARGET_PLATFORM=win32
+if [[ -z "$TARGET_PLATFORM" ]]; then
+    TARGET_PLATFORM=win32
+fi
 
 apt update && apt -y install tar git zstd
 mkdir dist replay

.ci/prepare-miniaudio.sh

+#!/bin/sh
+set -x
+set -o errexit
+
+if [ ! -d "miniaudio" ]; then
+  git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+fi
+
+mkdir -p miniaudio/external
+
+install_external() {
+  dir="$1"
+  url="$2"
+  if [ ! -d "miniaudio/external/$dir" ]; then
+    mkdir -p "miniaudio/external/$dir"
+    # Download the external library and strip one level of directories from the archive
+    wget -O - "$url" | tar --strip-components=1 -C "miniaudio/external/$dir" -zxf -
+  fi
+}
+
+install_external "ogg" "https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.gz"
+install_external "opus" "https://github.com/xiph/opus/releases/download/v1.5.2/opus-1.5.2.tar.gz"
+install_external "opusfile" "https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz"
+install_external "vorbis" "https://github.com/xiph/vorbis/releases/download/v1.3.7/libvorbis-1.3.7.tar.gz"

.github/workflows/build.yml

@@ -12,6 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2019, windows-2022]
+        audiolib: [miniaudio, irrklang]
 
     runs-on: ${{ matrix.os }}
 
@@ -90,6 +91,76 @@ jobs:
         7z x ${{ steps.sqlite.outputs.filepath }}
         move sqlite-amalgamation-3490100 sqlite3
 
+    - name: Download miniaudio
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+
+    - name: Download ogg
+      if: matrix.audiolib == 'miniaudio'
+      id: ogg
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.gz
+
+    - name: Extract ogg
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        tar xf ${{ steps.ogg.outputs.filepath }}
+        move libogg-1.3.5 miniaudio/external/ogg
+
+    - name: Download opus
+      if: matrix.audiolib == 'miniaudio'
+      id: opus
+      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: |
+        tar xf ${{ steps.opus.outputs.filepath }}
+        move opus-1.5.2 miniaudio/external/opus
+
+    - name: Download opusfile
+      if: matrix.audiolib == 'miniaudio'
+      id: opusfile
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-0.12.tar.gz
+
+    - name: Extract opusfile
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        tar xf ${{ steps.opusfile.outputs.filepath }}
+        move opusfile-0.12 miniaudio/external/opusfile
+
+    - name: Download vorbis
+      if: matrix.audiolib == 'miniaudio'
+      id: vorbis
+      uses: mercury233/action-cache-download-file@v1.0.0
+      with:
+        url: https://github.com/xiph/vorbis/releases/download/v1.3.7/libvorbis-1.3.7.tar.gz
+
+    - name: Extract vorbis
+      if: matrix.audiolib == 'miniaudio'
+      run: |
+        tar xf ${{ steps.vorbis.outputs.filepath }}
+        move libvorbis-1.3.7 miniaudio/external/vorbis
+
+    - name: Download irrKlang
+      if: matrix.audiolib == '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
+      if: matrix.audiolib == '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
@@ -121,17 +192,28 @@ jobs:
     - name: Copy premake files
       run: |
         xcopy /E premake\* .
+        xcopy /E resource\* .
 
-    - name: Use premake to generate Visual Studio solution (2019)
-      if: matrix.os == 'windows-2019'
+    - name: Use premake to generate Visual Studio solution (2019, miniaudio)
+      if: matrix.os == 'windows-2019' && matrix.audiolib == 'miniaudio'
       run: |
         .\premake5.exe vs2019 --winxp-support
 
-    - name: Use premake to generate Visual Studio solution (2022)
-      if: matrix.os == 'windows-2022'
+    - name: Use premake to generate Visual Studio solution (2022, miniaudio)
+      if: matrix.os == 'windows-2022' && matrix.audiolib == 'miniaudio'
       run: |
         .\premake5.exe vs2022
 
+    - name: Use premake to generate Visual Studio solution (2019, irrKlang)
+      if: matrix.os == 'windows-2019' && matrix.audiolib == 'irrklang'
+      run: |
+        .\premake5.exe vs2019 --winxp-support --audio-lib=irrklang
+
+    - name: Use premake to generate Visual Studio solution (2022, irrKlang)
+      if: matrix.os == 'windows-2022' && matrix.audiolib == 'irrklang'
+      run: |
+        .\premake5.exe vs2022 --audio-lib=irrklang
+
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v2
 
@@ -142,7 +224,7 @@ jobs:
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: YGOPro-${{ matrix.os }}
+        name: YGOPro-${{ matrix.os }}-${{ matrix.audiolib }}
         path: |
           bin/release/YGOPro.exe
 
@@ -185,7 +267,7 @@ jobs:
     - 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
+        sudo apt-get install -y libevent-dev libfreetype6-dev libgl1-mesa-dev libglu1-mesa-dev libsqlite3-dev libxxf86vm-dev libopusfile-dev libvorbis-dev
 
     - name: Download premake
       id: premake
@@ -210,6 +292,10 @@ jobs:
         tar xf ${{ steps.lua.outputs.filepath }}
         mv lua-5.4.7 lua
 
+    - name: Download miniaudio
+      run: |
+        git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+
     - name: Download irrlicht
       run: |
         git clone --depth=1 https://github.com/mercury233/irrlicht
@@ -217,11 +303,13 @@ jobs:
     - name: Copy premake files
       run: |
         cp -r premake/* .
+        cp -r resource/* .
 
     - name: Use premake to generate make files
       run: |
         ./premake5 gmake \
-          --freetype-include-dir="/usr/include/freetype2"
+          --freetype-include-dir="/usr/include/freetype2" \
+          --opus-include-dir="/usr/include/opus"
 
     - name: Make
       run: |
@@ -269,9 +357,9 @@ jobs:
 #        git pull origin master
 #        cd ..
 
-#    - name: Install dependencies
-#      run: |
-#        brew install freetype libevent libx11 sqlite zlib
+    - name: Install dependencies
+      run: |
+        brew install freetype libevent libx11 sqlite opus opusfile libvorbis
 
     - name: Download premake
       id: premake
@@ -296,6 +384,10 @@ jobs:
         tar xf ${{ steps.lua.outputs.filepath }}
         mv lua-5.4.7 lua
 
+    - name: Download miniaudio
+      run: |
+        git clone --depth=1 --branch 0.11.22 https://github.com/mackron/miniaudio
+
     - name: Download irrlicht
       run: |
         git clone --depth=1 https://github.com/mercury233/irrlicht
@@ -309,6 +401,7 @@ jobs:
     - name: Copy premake files
       run: |
         cp -r premake/* .
+        cp -r resource/* .
 
     - name: Use premake to generate make files (Intel)
       if: runner.arch == 'X64'
@@ -316,6 +409,7 @@ jobs:
         ./premake5 gmake \
           --cc=clang \
           --freetype-include-dir="/usr/local/include/freetype2" \
+          --opus-include-dir="/usr/local/include/opus" \
           --irrlicht-include-dir="../irrlicht/include" \
           --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
 
@@ -330,6 +424,12 @@ jobs:
           --freetype-lib-dir="/opt/homebrew/lib" \
           --sqlite-include-dir="/opt/homebrew/opt/sqlite/include" \
           --sqlite-lib-dir="/opt/homebrew/opt/sqlite/lib" \
+          --miniaudio-include-dir="/opt/homebrew/include" \
+          --miniaudio-lib-dir="/opt/homebrew/lib" \
+          --opus-include-dir="/opt/homebrew/include/opus" \
+          --opus-lib-dir="/opt/homebrew/lib" \
+          --vorbis-include-dir="/opt/homebrew/include" \
+          --vorbis-lib-dir="/opt/homebrew/lib" \
           --irrlicht-include-dir="../irrlicht/include" \
           --irrlicht-lib-dir="../irrlicht/source/Irrlicht/MacOSX/build/Release"
 

.gitignore

@@ -16,6 +16,7 @@ build
 /irrklang
 /irrlicht*
 /lua
+/miniaudio
 
 # gframe additionals
 /gframe/ygopro.ico

.gitlab-ci.yml

@@ -22,6 +22,8 @@ mat_common:
     # freetype
     #- wget -O - https://cdn01.moecube.com/ygopro-build-materials/freetype-2.11.1.tar.gz | tar zfx -
     #- mv freetype-2.11.1 freetype
+    # miniaudio
+    #- ./.ci/prepare-miniaudio.sh
     # premake
     - cp -rf premake/* .;
   artifacts:
@@ -29,6 +31,7 @@ mat_common:
       - lua
       #- freetype
       - sqlite3
+      #- miniaudio
 
 mat_submodules:
   stage: prepare
@@ -56,6 +59,20 @@ mat_linux:
     paths:
       - irrlicht
 
+mat_macos:
+  stage: prepare
+  tags:
+    - linux
+  script:
+    - apt update; apt -y install wget tar git
+    - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta5-macosx.tar.gz | tar zfx -
+    - chmod +x premake5
+    - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
+  artifacts:
+    paths:
+      - premake5
+      - irrlicht
+
 mat_windows:
   stage: prepare
   tags:
@@ -69,12 +86,12 @@ mat_windows:
     - 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
     # irrlicht
-    # - git clone --depth=1 -b develop https://code.mycard.moe/mycard/irrlicht-new irrlicht
+    - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
   artifacts:
     paths:
       - premake5.exe
       - event
-      # - irrlicht
+      - irrlicht
 
 ._exec_build:
   stage: build
@@ -86,7 +103,7 @@ mat_windows:
       - bin/
       - obj/
 
-exec_windows:
+.exec_windows:
   extends: ._exec_build
   tags:
     - vs
@@ -94,17 +111,53 @@ exec_windows:
     - mat_common
     - mat_windows
     - mat_submodules
+  before_script:
+    - bash -c 'cp -rf premake/* . ; cp -rf resource/* .'
+  artifacts:
+    paths:
+      - dist
+
+exec_windows:
+  extends: .exec_windows
+  script:
+    - '.\premake5.exe vs2019 --server-zip-support'
+    - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release'
+    - mkdir dist
+    - mkdir dist\windows
+    - copy bin\release\ygopro.exe dist\windows\ygopro.exe
+
+exec_windows_pro3:
+  extends: .exec_windows
   script:
-    - bash -c 'cp -rf premake/* .'
-    - '.\premake5.exe vs2019'
+    - '.\premake5.exe vs2019 --server-pro3-support'
     - cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release'
-    - copy bin\release\ygopro.exe .
+    - mkdir dist
+    - mkdir dist\windows
+    - copy bin\release\ygoserver.dll dist\windows\ygoserver.dll
+
+.exec_unix_common:
+  extends: ._exec_build
+  variables:
+    RELEASE_DIR: ''
+    TARGET_FILE: ygopro
+    PREMAKE5_BIN: premake5
+  script:
+    - $PREMAKE5_BIN gmake
+    - cd build
+    - make config=release -j$(nproc)
+    - cd ..
+    - mkdir -p dist/$RELEASE_DIR
+    - mv bin/release/$TARGET_FILE dist/$RELEASE_DIR/$TARGET_FILE
+    - |
+      if [ "$TARGET_FILE" = "ygopro" ]; then
+        strip dist/$RELEASE_DIR/$TARGET_FILE
+      fi
   artifacts:
     paths:
-      - ygopro.exe
+      - dist
 
 .exec_linux_common:
-  extends: ._exec_build
+  extends: .exec_unix_common
   tags:
     - linux
   image: git-registry.moenext.com/mycard/docker-ygopro-builder
@@ -112,16 +165,6 @@ exec_windows:
     - mat_common
     - mat_linux
     - mat_submodules
-  script:
-    - premake5 gmake
-    - cd build
-    - make config=release -j$(nproc)
-    - cd ..
-    - mv bin/release/ygopro ./ygopro
-    - strip ygopro
-  artifacts:
-    paths:
-      - ygopro
 
 .exec_linux:
   extends: .exec_linux_common
@@ -130,11 +173,13 @@ exec_windows:
     SERVER_ZIP_SUPPORT: '1'
     EVENT_INCLUDE_DIR: /usr/share/libevent-stable/include
     EVENT_LIB_DIR: /usr/share/libevent-stable/lib
+    RELEASE_DIR: linux-x64
 
 .exec_debian:
   extends: .exec_linux_common
   variables:
     LUA_DEB: '1'
+    RELEASE_DIR: debian-x64
   before_script:
     - apt update; apt -y install git build-essential liblua5.3-dev libsqlite3-dev libevent-dev
 
@@ -142,9 +187,26 @@ exec_windows:
   tags:
     - arm
 
+.use_pro3:
+  image: git-registry.moenext.com/mycard/docker-ygopro-builder:fpic
+  variables:
+    SERVER_PRO3_SUPPORT: '1'
+    TARGET_FILE: libygoserver.so
+
+.use_pro3_macos:
+  variables:
+    SERVER_PRO3_SUPPORT: '1'
+    TARGET_FILE: libygoserver.dylib
+    LIBEVENT_PREBUILD_FLAGS: '-fPIC'
+
 exec_linux:
   extends: .exec_linux
 
+exec_linux_pro3:
+  extends:
+    - .exec_linux
+    - .use_pro3
+
 exec_debian:
   extends: .exec_debian
 
@@ -152,11 +214,89 @@ exec_linuxarm:
   extends:
     - .exec_linux
     - .use_arm
+  variables:
+    RELEASE_DIR: linux-arm64
+
+exec_linuxarm_pro3:
+  extends:
+    - .exec_linux
+    - .use_arm
+    - .use_pro3
+  variables:
+    RELEASE_DIR: linux-arm64
 
 exec_debianarm:
   extends:
     - .exec_debian
     - .use_arm
+  variables:
+    RELEASE_DIR: debian-arm
+
+
+.exec_macos_platform:
+  extends: .exec_unix_common
+  dependencies:
+    - mat_common
+    - mat_macos
+    - mat_submodules
+  before_script:
+    - env CFLAGS=$LIBEVENT_PREBUILD_FLAGS CXXFLAGS=$LIBEVENT_PREBUILD_FLAGS ./.ci/libevent-prebuild.sh
+  variables:
+    PREMAKE5_BIN: ./premake5
+    BUILD_SQLITE: '1'
+    SERVER_ZIP_SUPPORT: '1'
+    EVENT_INCLUDE_DIR: ../libevent-stable/include
+    EVENT_LIB_DIR: ../libevent-stable/lib
+
+exec_macos_x64:
+  extends: .exec_macos_platform
+  tags:
+    - macos
+  variables:
+    RELEASE_DIR: macos-x64
+
+exec_macos_arm64:
+  extends: .exec_macos_platform
+  tags:
+    - macos-m1
+  variables:
+    RELEASE_DIR: macos-arm64
+
+exec_macos_x64_pro3:
+  extends:
+    - .exec_macos_platform
+    - .use_pro3_macos
+  tags:
+    - macos
+  variables:
+    RELEASE_DIR: macos-x64
+
+exec_macos_arm64_pro3:
+  extends:
+    - .exec_macos_platform
+    - .use_pro3_macos
+  tags:
+    - macos-m1
+  variables:
+    RELEASE_DIR: macos-arm64
+
+exec_macos:
+  stage: combine
+  tags:
+    - macos
+  dependencies:
+    - exec_macos_x64
+    - exec_macos_arm64
+    - exec_macos_x64_pro3
+    - exec_macos_arm64_pro3
+  script:
+    - mkdir -p dist/macos
+    - lipo -create -output dist/macos/ygopro dist/macos-x64/ygopro dist/macos-arm64/ygopro
+    - lipo -create -output dist/macos/libygoserver.dylib dist/macos-x64/libygoserver.dylib dist/macos-arm64/libygoserver.dylib
+    - rm -rf dist/macos-x64 dist/macos-arm64
+  artifacts:
+    paths:
+      - dist
 
 #win_server_pack:
 #  stage: pack
@@ -172,9 +312,18 @@ upload_to_minio:
   stage: deploy
   dependencies:
     - exec_windows
+    - exec_linux
+    - exec_linuxarm
+    - exec_windows_pro3
+    - exec_linux_pro3
+    - exec_linuxarm_pro3
+    - exec_debian
+    - exec_debianarm
+    - exec_macos
   tags: 
     - linux
   script:
-    - aws s3 --endpoint=https://minio.mycard.moe:9000 cp ygopro.exe s3://mycard/koishipro/server/ygopro.exe
+    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete dist/ s3://mycard/koishipro/server
   only:
     - server
+    - tags

appveyor.yml

@@ -23,9 +23,11 @@ install:
   - 7z x sqlite-amalgamation-3470000.zip
   - move sqlite-amalgamation-3470000 sqlite3
 
+  - git clone --depth=1 https://github.com/mercury233/irrlicht irrlicht
+
 before_build:
   - xcopy /E premake\* .
-  - premake5 vs2019
+  - premake5 vs2019 --server-zip-support
   
 configuration: Release
 

gframe/data_manager.cpp

@@ -438,6 +438,11 @@ unsigned char* DataManager::ScriptReaderEx(const char* script_name, int* slen) {
 	buffer = ScriptReaderExSingle("expansions/", script_name, slen);
 	if(buffer)
 		return buffer;
+#if defined(SERVER_PRO3_SUPPORT) && !defined(_WIN32)
+	buffer = ScriptReaderExSingle("Expansions/", script_name, slen);
+	if(buffer)
+		return buffer;
+#endif
 #if !defined(YGOPRO_SERVER_MODE) || defined(SERVER_ZIP_SUPPORT)
 	buffer = ScriptReaderExSingle("", script_name, slen, 2, TRUE);
 	if(buffer)

gframe/deck_manager.cpp

@@ -48,6 +48,12 @@ void DeckManager::LoadLFListSingle(const char* path) {
 void DeckManager::LoadLFList() {
 #ifdef SERVER_PRO2_SUPPORT
 	LoadLFListSingle("config/lflist.conf");
+#endif
+#ifdef SERVER_PRO3_SUPPORT
+	LoadLFListSingle("Data/lflist.conf");
+#ifndef _WIN32
+	LoadLFListSingle("Expansions/lflist.conf");
+#endif
 #endif
 	LoadLFListSingle("expansions/lflist.conf");
 	LoadLFListSingle("lflist.conf");
@@ -83,7 +89,7 @@ static unsigned int checkAvail(unsigned int ot, unsigned int avail) {
 		return DECKERROR_TCGONLY;
 	return DECKERROR_NOTAVAIL;
 }
-unsigned int DeckManager::CheckDeck(Deck& deck, int lfhash, int rule) {
+unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int rule) {
 	std::unordered_map<int, int> ccount;
 	// rule
 	if(deck.main.size() < DECK_MIN_SIZE || deck.main.size() > DECK_MAX_SIZE)

gframe/deck_manager.h

@@ -64,7 +64,7 @@ public:
 	void LoadLFList();
 	const wchar_t* GetLFListName(unsigned int lfhash);
 	const LFList* GetLFList(unsigned int lfhash);
-	unsigned int CheckDeck(Deck& deck, int lfhash, int rule);
+	unsigned int CheckDeck(const Deck& deck, unsigned int lfhash, int rule);
 	int LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec, bool is_packlist = false);
 	bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);
 #ifndef YGOPRO_SERVER_MODE

gframe/game.cpp

@@ -114,8 +114,8 @@ void Game::MainServerLoop() {
 	deckManager.LoadLFList();
 	dataManager.LoadDB(L"cards.cdb");
 	LoadExpansions();
-#ifdef SERVER_PRO2_SUPPORT
-	DataManager::FileSystem->addFileArchive("data/script.zip", true, false, EFAT_ZIP);
+#if defined SERVER_PRO2_SUPPORT || defined SERVER_PRO3_SUPPORT
+	DataManager::FileSystem->addFileArchive("data/script.zip", true, false, irr::io::EFAT_ZIP);
 #endif
 
 	server_port = NetServer::StartServer(server_port);
@@ -1306,6 +1306,24 @@ void Game::LoadExpansions() {
 		}
 	});
 #endif // SERVER_PRO2_SUPPORT
+#ifdef SERVER_PRO3_SUPPORT
+	FileSystem::TraversalDir(L"./Data/locales/zh-CN", [](const wchar_t* name, bool isdir) {
+		wchar_t fpath[1024];
+		myswprintf(fpath, L"./Data/locales/zh-CN/%ls", name);
+		if(!isdir && IsExtension(name, L".cdb")) {
+			dataManager.LoadDB(fpath);
+		}
+	});
+#ifndef _WIN32
+	FileSystem::TraversalDir(L"./Expansions", [](const wchar_t* name, bool isdir) {
+		wchar_t fpath[1024];
+		myswprintf(fpath, L"./Expansions/%ls", name);
+		if(!isdir && IsExtension(name, L".cdb")) {
+			dataManager.LoadDB(fpath);
+		}
+	});
+#endif
+#endif // SERVER_PRO3_SUPPORT
 	FileSystem::TraversalDir(L"./expansions", [](const wchar_t* name, bool isdir) {
 		wchar_t fpath[1024];
 		myswprintf(fpath, L"./expansions/%ls", name);

gframe/gframe.h

+#include "config.h"
+#include "game.h"
+#include "data_manager.h"
+#include <event2/thread.h>
+#include <memory>
+#ifdef __APPLE__
+#import <CoreFoundation/CoreFoundation.h>
+#endif
+ 
+int main(int argc, char* argv[]);

gframe/miniaudio/premake5.lua

-project "cminiaudio"
-    kind "StaticLib"
-    files { "*.c", "*.h" }
-
-    filter "action:vs*"
-        forceincludes { "stb_vorbis.h" }
-
-    filter "not action:vs*"
-        forceincludes { "./stb_vorbis.h" }
-
-    filter "system:linux"
-        links { "dl", "pthread", "m" }

gframe/premake5.lua

@@ -2,13 +2,16 @@ include "lzma/."
 if (SERVER_ZIP_SUPPORT or not SERVER_MODE) then
 include "spmemvfs/."
 end
-if USE_AUDIO then
-include "miniaudio/."
-end
 
-project "ygopro"
 if SERVER_MODE then
+if SERVER_PRO3_SUPPORT then
+project "ygoserver"
+    kind "SharedLib"
+else
+project "ygopro"
     kind "ConsoleApp"
+end
+    cppdialect "C++14"
 
     defines { "YGOPRO_SERVER_MODE" }
 
@@ -20,6 +23,10 @@ if SERVER_MODE then
             "netserver.cpp", "netserver.h",
             "single_duel.cpp", "single_duel.h",
             "tag_duel.cpp", "tag_duel.h" }
+    if SERVER_PRO3_SUPPORT then
+        files { "gframe.h", "serverapi.cpp", "serverapi.h" }
+        defines { "SERVER_PRO3_SUPPORT" }
+    end
     includedirs { "../ocgcore" }
     links { "ocgcore", "clzma", LUA_LIB_NAME, "sqlite3", "event" }
     if SERVER_ZIP_SUPPORT then
@@ -36,8 +43,10 @@ if SERVER_MODE then
         defines { "SERVER_TAG_SURRENDER_CONFIRM" }
     end
 else
+project "ygopro"
     kind "WindowedApp"
     cppdialect "C++14"
+    rtti "Off"
 
     files { "*.cpp", "*.h" }
     includedirs { "../ocgcore" }
@@ -74,7 +83,29 @@ end
 
     if USE_AUDIO then
         defines { "YGOPRO_USE_AUDIO" }
-        links { "cminiaudio" }
+        if AUDIO_LIB == "miniaudio" then
+            defines { "YGOPRO_USE_MINIAUDIO" }
+            includedirs { "../miniaudio/extras/miniaudio_split" }
+            links { "miniaudio" }
+            if MINIAUDIO_SUPPORT_OPUS_VORBIS then
+                defines { "YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS" }
+                includedirs { "../miniaudio/extras/decoders/libopus", "../miniaudio/extras/decoders/libvorbis" }
+                if not MINIAUDIO_BUILD_OPUS_VORBIS then
+                    links { "opusfile", "vorbisfile", "opus", "vorbis", "ogg" }
+                    libdirs { OPUS_LIB_DIR, VORBIS_LIB_DIR, OGG_LIBDIR }
+                end
+            end
+        end
+        if AUDIO_LIB == "irrklang" then
+            defines { "YGOPRO_USE_IRRKLANG" }
+            includedirs { IRRKLANG_INCLUDE_DIR }
+            if not IRRKLANG_PRO then
+                libdirs { IRRKLANG_LIB_DIR }
+            end
+            if IRRKLANG_PRO_BUILD_IKPMP3 then
+                links { "ikpmp3" }
+            end
+        end
     end
 
     filter "system:windows"
@@ -91,8 +122,17 @@ if SERVER_MODE then
 else
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32", "Dnsapi" }
 end
-    filter "not action:vs*"
-        buildoptions { "-fno-rtti" }
+        if USE_AUDIO and AUDIO_LIB == "irrklang" then
+            links { "irrKlang" }
+            if IRRKLANG_PRO then
+                defines { "IRRKLANG_STATIC" }
+                filter { "not configurations:Debug" }
+                    libdirs { IRRKLANG_PRO_RELEASE_LIB_DIR }
+                filter { "configurations:Debug" }
+                    libdirs { IRRKLANG_PRO_DEBUG_LIB_DIR }
+                filter {}
+            end
+        end
     filter "not system:windows"
         links { "event_pthreads", "dl", "pthread", "resolv" }
     filter "system:macosx"
@@ -104,8 +144,15 @@ end
             buildoptions { "--target=arm64-apple-macos12" }
             linkoptions { "-arch arm64" }
         end
+        if USE_AUDIO and AUDIO_LIB == "irrklang" then
+            links { "irrklang" }
+        end
     filter "system:linux"
-    linkoptions { "-static-libstdc++", "-static-libgcc" }
+        linkoptions { "-static-libstdc++", "-static-libgcc" }
 if not SERVER_MODE then
         links { "GL", "X11", "Xxf86vm" }
 end
+        if USE_AUDIO and AUDIO_LIB == "irrklang" then
+            links { "IrrKlang" }
+            linkoptions{ IRRKLANG_LINK_RPATH }
+        end

gframe/serverapi.cpp

+#include "serverapi.h"
+
+namespace ygo {
+	extern "C" DECL_DLLEXPORT int start_server(const char* args) {
+		int argc = 1;
+		char** argv = new char* [13];
+		const char* server_name = "ygoserver";
+		argv[0] = new char[strlen(server_name) + 1];
+		strcpy(argv[0], server_name);
+		size_t argLength = strlen(args);
+		for (size_t i = 1, j = 0; j < argLength; ) {
+			while (args[j] == ' ' && j < argLength) { ++j; }
+			if (j < argLength) {
+				size_t tokenLength = 0;
+				while (args[j + tokenLength] != ' ' && args[j + tokenLength] != '\0') { ++tokenLength; }
+
+				char* currentToken = new char[tokenLength + 1];
+				strncpy(currentToken, args + j, tokenLength);
+				currentToken[tokenLength] = '\0';
+
+				argv[i] = currentToken;
+				i++;
+				j += tokenLength;
+				argc++;
+			}
+		}
+
+		int result = main(argc, argv);
+		for (int i = 1; i < argc; ++i) {
+			if (argv[i]) {
+				delete[] argv[i];
+				argv[i] = nullptr;
+			}
+		}
+		delete[] argv;
+
+		return result;
+	}
+	extern "C" DECL_DLLEXPORT void stop_server() {
+		NetServer::StopServer();
+	}
+}

gframe/serverapi.h

+#ifndef SERVERAPI_H
+#define SERVERAPI_H
+
+#include "game.h"
+#include "netserver.h"
+#include "network.h"
+#include "config.h"
+#include "data_manager.h"
+#include "gframe.h"
+#include <event2/thread.h>
+#include <memory>
+
+#ifdef WIN32
+#define DECL_DLLEXPORT __declspec(dllexport)
+#else
+#define DECL_DLLEXPORT
+#endif
+namespace ygo {
+	extern "C" DECL_DLLEXPORT int start_server(const char* args);
+	extern "C" DECL_DLLEXPORT void stop_server();
+}
+
+#endif // !SERVERAPI_H

gframe/sound_manager.cpp

 #include "sound_manager.h"
 #include "myfilesystem.h"
+#if defined(YGOPRO_USE_MINIAUDIO) && defined(YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS)
+#include <miniaudio_libopus.h>
+#include <miniaudio_libvorbis.h>
+#endif
+#ifdef IRRKLANG_STATIC
+#include "../ikpmp3/ikpMP3.h"
+#endif
 
 namespace ygo {
 
@@ -12,11 +19,41 @@ bool SoundManager::Init() {
 	RefreshBGMList();
 	bgm_process = false;
 	rnd.reset((unsigned int)std::time(nullptr));
-	if(ma_engine_init(nullptr, &engineSound) || ma_engine_init(nullptr, &engineMusic)) {
+#ifdef YGOPRO_USE_MINIAUDIO
+	engineConfig = ma_engine_config_init();
+#ifdef YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS
+	ma_decoding_backend_vtable* pCustomBackendVTables[] =
+	{
+		ma_decoding_backend_libvorbis,
+		ma_decoding_backend_libopus
+	};
+	resourceManagerConfig = ma_resource_manager_config_init();
+	resourceManagerConfig.ppCustomDecodingBackendVTables = pCustomBackendVTables;
+	resourceManagerConfig.customDecodingBackendCount = sizeof(pCustomBackendVTables) / sizeof(pCustomBackendVTables[0]);
+	resourceManagerConfig.pCustomDecodingBackendUserData = NULL;
+	if(ma_resource_manager_init(&resourceManagerConfig, &resourceManager) != MA_SUCCESS) {
+		return false;
+	}
+	engineConfig.pResourceManager = &resourceManager;
+#endif
+	if(ma_engine_init(&engineConfig, &engineSound) != MA_SUCCESS || ma_engine_init(&engineConfig, &engineMusic) != MA_SUCCESS) {
 		return false;
 	} else {
 		return true;
 	}
+#endif // YGOPRO_USE_MINIAUDIO
+#ifdef YGOPRO_USE_IRRKLANG
+	engineSound = irrklang::createIrrKlangDevice();
+	engineMusic = irrklang::createIrrKlangDevice();
+	if(!engineSound || !engineMusic) {
+		return false;
+	} else {
+#ifdef IRRKLANG_STATIC
+		irrklang::ikpMP3Init(engineMusic);
+#endif
+		return true;
+	}
+#endif // YGOPRO_USE_IRRKLANG
 #endif // YGOPRO_USE_AUDIO
 	return false;
 }
@@ -36,7 +73,12 @@ void SoundManager::RefreshBGMList() {
 void SoundManager::RefershBGMDir(std::wstring path, int scene) {
 	std::wstring search = L"./sound/BGM/" + path;
 	FileSystem::TraversalDir(search.c_str(), [this, &path, scene](const wchar_t* name, bool isdir) {
-		if(!isdir && (IsExtension(name, L".mp3") || IsExtension(name, L".ogg"))) {
+		if(!isdir && (
+			IsExtension(name, L".mp3")
+#if defined(YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS) || defined(YGOPRO_USE_IRRKLANG)
+			|| IsExtension(name, L".ogg")
+#endif
+			)) {
 			std::wstring filename = path + L"/" + name;
 			BGMList[BGM_ALL].push_back(filename);
 			BGMList[scene].push_back(filename);
@@ -44,6 +86,7 @@ void SoundManager::RefershBGMDir(std::wstring path, int scene) {
 	});
 }
 void SoundManager::PlaySoundEffect(int sound) {
+#ifdef YGOPRO_USE_AUDIO
 	if(!mainGame->chkEnableSound->isChecked())
 		return;
 	char soundName[32];
@@ -177,10 +220,15 @@ void SoundManager::PlaySoundEffect(int sound) {
 	}
 	char soundPath[40];
 	std::snprintf(soundPath, 40, "./sound/%s.wav", soundName);
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	ma_engine_set_volume(&engineSound, mainGame->gameConf.sound_volume);
-	auto res = ma_engine_play_sound(&engineSound, soundPath, nullptr);
+	ma_engine_play_sound(&engineSound, soundPath, nullptr);
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
+	engineSound->play2D(soundPath);
 #endif
+#endif // YGOPRO_USE_AUDIO
 }
 void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) {
 	if(element == mainGame->wMessage) {
@@ -206,8 +254,11 @@ void SoundManager::PlayDialogSound(irr::gui::IGUIElement * element) {
 	}
 }
 bool SoundManager::IsCurrentlyPlaying(char* song) {
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	return currentPlayingMusic[0] && strcmp(currentPlayingMusic, song) == 0 && ma_sound_is_playing(&soundBGM);
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+	return engineMusic->isCurrentlyPlaying(song);
 #endif
 	return false;
 }
@@ -217,16 +268,17 @@ void SoundManager::PlayMusic(char* song, bool loop) {
 		return;
 	if(!IsCurrentlyPlaying(song)) {
 		StopBGM();
+#ifdef YGOPRO_USE_MINIAUDIO
 		strcpy(currentPlayingMusic, song);
-#ifdef _WIN32
-		wchar_t song_w[1024];
-		BufferIO::DecodeUTF8(song, song_w);
-		ma_sound_init_from_file_w(&engineMusic, song_w, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
-#else
-		auto res = ma_sound_init_from_file(&engineMusic, song, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
-#endif
+		ma_sound_init_from_file(&engineMusic, song, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundBGM);
 		ma_sound_set_looping(&soundBGM, loop);
 		ma_sound_start(&soundBGM);
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+		engineMusic->stopAllSounds();
+		engineMusic->setSoundVolume(mainGame->gameConf.music_volume);
+		soundBGM = engineMusic->play2D(song, loop, false, true);
+#endif
 	}
 #endif
 }
@@ -237,7 +289,11 @@ void SoundManager::PlayBGM(int scene) {
 	if(!mainGame->chkMusicMode->isChecked())
 		scene = BGM_ALL;
 	char BGMName[1024];
-	if ((scene != bgm_scene) && (bgm_scene != BGM_CUSTOM) || (scene != previous_bgm_scene) && (bgm_scene == BGM_CUSTOM) || !IsCurrentlyPlaying(currentPlayingMusic)) {
+#if defined(YGOPRO_USE_MINIAUDIO)
+	if((scene != bgm_scene) && (bgm_scene != BGM_CUSTOM) || (scene != previous_bgm_scene) && (bgm_scene == BGM_CUSTOM) || !IsCurrentlyPlaying(currentPlayingMusic)) {
+#elif defined(YGOPRO_USE_IRRKLANG)
+	if((scene != bgm_scene) && (bgm_scene != BGM_CUSTOM) || (scene != previous_bgm_scene) && (bgm_scene == BGM_CUSTOM) || (soundBGM && soundBGM->isFinished())) {
+#endif
 		int count = BGMList[scene].size();
 		if(count <= 0)
 			return;
@@ -268,29 +324,44 @@ void SoundManager::PlayCustomSound(char* SoundName) {
 #ifdef YGOPRO_USE_AUDIO
 	if(!mainGame->chkEnableSound->isChecked())
 		return;
+#ifdef YGOPRO_USE_MINIAUDIO
 	ma_engine_set_volume(&engineSound, mainGame->gameConf.sound_volume);
 	ma_engine_play_sound(&engineSound, SoundName, nullptr);
 #endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineSound->setSoundVolume(mainGame->gameConf.sound_volume);
+	engineSound->play2D(SoundName);
+#endif
+#endif
 }
 void SoundManager::StopBGM() {
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	if(!currentPlayingMusic[0])
 		return;
 	memset(currentPlayingMusic, 0, sizeof(currentPlayingMusic));
 	ma_sound_uninit(&soundBGM);
 #endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineMusic->stopAllSounds();
+#endif
 }
 void SoundManager::StopSound() {
 	// TODO: stop all sounds
 }
 void SoundManager::SetSoundVolume(double volume) {
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	ma_engine_set_volume(&engineSound, volume);
 #endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineSound->setSoundVolume(volume);
+#endif
 }
 void SoundManager::SetMusicVolume(double volume) {
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
 	ma_engine_set_volume(&engineMusic, volume);
 #endif
+#ifdef YGOPRO_USE_IRRKLANG
+	engineMusic->setSoundVolume(volume);
+#endif
 }
 }

gframe/sound_manager.h

@@ -3,8 +3,11 @@
 
 #include "game.h"
 #include "../ocgcore/mtrandom.h"
-#ifdef YGOPRO_USE_AUDIO
-#include "miniaudio/miniaudio.h"
+#ifdef YGOPRO_USE_MINIAUDIO
+#include <miniaudio.h>
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+#include <irrKlang.h>
 #endif
 
 namespace ygo {
@@ -16,11 +19,21 @@ private:
 	int previous_bgm_scene;
 	bool bgm_process;
 	mt19937 rnd;
-#ifdef YGOPRO_USE_AUDIO
+#ifdef YGOPRO_USE_MINIAUDIO
+	ma_engine_config engineConfig;
+#ifdef YGOPRO_MINIAUDIO_SUPPORT_OPUS_VORBIS
+	ma_resource_manager_config resourceManagerConfig;
+	ma_resource_manager resourceManager;
+#endif
 	ma_engine engineSound;
 	ma_engine engineMusic;
 	ma_sound soundBGM;
 	char currentPlayingMusic[1024]{};
+#endif
+#ifdef YGOPRO_USE_IRRKLANG
+	irrklang::ISoundEngine* engineSound;
+	irrklang::ISoundEngine* engineMusic;
+	irrklang::ISound* soundBGM;
 #endif
 	void RefershBGMDir(std::wstring path, int scene);
 

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 --アマゾネスの射手
@@ -16037,4 +16224,4 @@
 29401950 2 --奈落の落とし穴
 15800838 2 --マインドクラッシュ
 62279055 2 --魔法の筒
-97077563 2 --リビングデッドの呼び声
+97077563 2 --リビングデッドの呼び声
\ No newline at end of file

ocgcore @ 59563d73

-Subproject commit b2d1a11ded55b3efca59065a63ef55133200a6fc
+Subproject commit 59563d732ecd7edf8a83d5547a3fbbf1dde2b44a

premake/event/premake5.lua

 project "event"
     kind "StaticLib"
-    cdialect "C11"
 
     includedirs { "include", "compat" }
 

premake/freetype/premake5.lua

 project "freetype"
     kind "StaticLib"
-    cdialect "C11"
 
     includedirs { "include" }
     defines { "FT2_BUILD_LIBRARY" }

premake/irrlicht/defines.lua

+defines {
+	"_IRR_STATIC_LIB_",
+	"NO_IRR_USE_NON_SYSTEM_BZLIB_",
+	"NO_IRR_COMPILE_WITH_BZIP2_",
+	"NO_IRR_COMPILE_WITH_CONSOLE_DEVICE_",
+	"NO_IRR_COMPILE_WITH_DIRECT3D_8_",
+	"NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_",
+	"NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_",
+	"NO_IRR_COMPILE_WITH_SOFTWARE_",
+	"NO_IRR_COMPILE_WITH_BURNINGSVIDEO_",
+	"NO_IRR_COMPILE_WITH_IRR_SCENE_LOADER_",
+	"NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_",
+	"NO_IRR_COMPILE_WITH_IRR_MESH_LOADER_",
+	"NO_IRR_COMPILE_WITH_HALFLIFE_LOADER_",
+	"NO_IRR_COMPILE_WITH_MD2_LOADER_",
+	"NO_IRR_COMPILE_WITH_MD3_LOADER_",
+	"NO_IRR_COMPILE_WITH_3DS_LOADER_",
+	"NO_IRR_COMPILE_WITH_COLLADA_LOADER_",
+	"NO_IRR_COMPILE_WITH_CSM_LOADER_",
+	"NO_IRR_COMPILE_WITH_BSP_LOADER_",
+	"NO_IRR_COMPILE_WITH_DMF_LOADER_",
+	"NO_IRR_COMPILE_WITH_LMTS_LOADER_",
+	"NO_IRR_COMPILE_WITH_MY3D_LOADER_",
+	"NO_IRR_COMPILE_WITH_OBJ_LOADER_",
+	"NO_IRR_COMPILE_WITH_OCT_LOADER_",
+	"NO_IRR_COMPILE_WITH_LWO_LOADER_",
+	"NO_IRR_COMPILE_WITH_STL_LOADER_",
+	"NO_IRR_COMPILE_WITH_PLY_LOADER_",
+	"NO_IRR_COMPILE_WITH_SMF_LOADER_",
+	"NO_IRR_COMPILE_WITH_IRR_WRITER_",
+	"NO_IRR_COMPILE_WITH_COLLADA_WRITER_",
+	"NO_IRR_COMPILE_WITH_STL_WRITER_",
+	"NO_IRR_COMPILE_WITH_OBJ_WRITER_",
+	"NO_IRR_COMPILE_WITH_PLY_WRITER_",
+	"NO_IRR_COMPILE_WITH_PCX_LOADER_",
+	"NO_IRR_COMPILE_WITH_PPM_LOADER_",
+	"NO_IRR_COMPILE_WITH_PSD_LOADER_",
+	"NO_IRR_COMPILE_WITH_TGA_LOADER_",
+	"NO_IRR_COMPILE_WITH_WAL_LOADER_",
+	"NO_IRR_COMPILE_WITH_LMP_LOADER_",
+	"NO_IRR_COMPILE_WITH_RGB_LOADER_",
+	"NO_IRR_COMPILE_WITH_PCX_WRITER_",
+	"NO_IRR_COMPILE_WITH_PPM_WRITER_",
+	"NO_IRR_COMPILE_WITH_PSD_WRITER_",
+	"NO_IRR_COMPILE_WITH_TGA_WRITER_",
+	"NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
+	"NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
+	"NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
+}

premake/miniaudio/premake5.lua

+project "miniaudio"
+    kind "StaticLib"
+    files { "extras/miniaudio_split/miniaudio.*" }
+    defines { "MA_NO_ENCODING", "MA_NO_GENERATION", "MA_NO_NEON" }
+
+    if MINIAUDIO_SUPPORT_OPUS_VORBIS then
+        files { "extras/decoders/libopus/*", "extras/decoders/libvorbis/*" }
+        if MINIAUDIO_BUILD_OPUS_VORBIS then
+            files {
+                "external/ogg/src/bitwise.c",
+                "external/ogg/src/framing.c",
+
+                "external/opus/src/opus.c",
+                "external/opus/src/opus_decoder.c",
+                "external/opus/src/opus_multistream.c",
+                "external/opus/src/opus_multistream_decoder.c",
+
+                "external/opus/celt/bands.c",
+                "external/opus/celt/celt.c",
+                "external/opus/celt/celt_decoder.c",
+                "external/opus/celt/celt_lpc.c",
+                "external/opus/celt/cwrs.c",
+                "external/opus/celt/entcode.c",
+                "external/opus/celt/entdec.c",
+                "external/opus/celt/entenc.c",
+                "external/opus/celt/kiss_fft.c",
+                "external/opus/celt/laplace.c",
+                "external/opus/celt/mathops.c",
+                "external/opus/celt/mdct.c",
+                "external/opus/celt/modes.c",
+                "external/opus/celt/pitch.c",
+                "external/opus/celt/quant_bands.c",
+                "external/opus/celt/rate.c",
+                "external/opus/celt/vq.c",
+
+                "external/opus/celt/x86/pitch_avx.c",
+                "external/opus/celt/x86/pitch_sse.c",
+                "external/opus/celt/x86/vq_sse2.c",
+                "external/opus/celt/x86/x86_celt_map.c",
+                "external/opus/celt/x86/x86cpu.c",
+
+                "external/opus/silk/bwexpander.c",
+                "external/opus/silk/bwexpander_32.c",
+                "external/opus/silk/CNG.c",
+                "external/opus/silk/code_signs.c",
+                "external/opus/silk/dec_API.c",
+                "external/opus/silk/decode_core.c",
+                "external/opus/silk/decode_frame.c",
+                "external/opus/silk/decode_indices.c",
+                "external/opus/silk/decode_parameters.c",
+                "external/opus/silk/decode_pitch.c",
+                "external/opus/silk/decode_pulses.c",
+                "external/opus/silk/decoder_set_fs.c",
+                "external/opus/silk/gain_quant.c",
+                "external/opus/silk/init_decoder.c",
+                "external/opus/silk/lin2log.c",
+                "external/opus/silk/log2lin.c",
+                "external/opus/silk/LPC_analysis_filter.c",
+                "external/opus/silk/LPC_fit.c",
+                "external/opus/silk/LPC_inv_pred_gain.c",
+                "external/opus/silk/NLSF_decode.c",
+                "external/opus/silk/NLSF_stabilize.c",
+                "external/opus/silk/NLSF_unpack.c",
+                "external/opus/silk/NLSF2A.c",
+                "external/opus/silk/pitch_est_tables.c",
+                "external/opus/silk/PLC.c",
+                "external/opus/silk/resampler.c",
+                "external/opus/silk/resampler_private_AR2.c",
+                "external/opus/silk/resampler_private_down_FIR.c",
+                "external/opus/silk/resampler_private_IIR_FIR.c",
+                "external/opus/silk/resampler_private_up2_HQ.c",
+                "external/opus/silk/resampler_rom.c",
+                "external/opus/silk/shell_coder.c",
+                "external/opus/silk/sort.c",
+                "external/opus/silk/stereo_decode_pred.c",
+                "external/opus/silk/stereo_MS_to_LR.c",
+                "external/opus/silk/sum_sqr_shift.c",
+                "external/opus/silk/table_LSF_cos.c",
+                "external/opus/silk/tables_gain.c",
+                "external/opus/silk/tables_LTP.c",
+                "external/opus/silk/tables_NLSF_CB_NB_MB.c",
+                "external/opus/silk/tables_NLSF_CB_WB.c",
+                "external/opus/silk/tables_other.c",
+                "external/opus/silk/tables_pitch_lag.c",
+                "external/opus/silk/tables_pulses_per_block.c",
+
+                "external/opusfile/src/info.c",
+                "external/opusfile/src/internal.c",
+                "external/opusfile/src/opusfile.c",
+                "external/opusfile/src/stream.c",
+
+                "external/vorbis/lib/bitrate.c",
+                "external/vorbis/lib/block.c",
+                "external/vorbis/lib/codebook.c",
+                "external/vorbis/lib/envelope.c",
+                "external/vorbis/lib/floor0.c",
+                "external/vorbis/lib/floor1.c",
+                "external/vorbis/lib/info.c",
+                "external/vorbis/lib/lpc.c",
+                "external/vorbis/lib/lsp.c",
+                "external/vorbis/lib/mapping0.c",
+                "external/vorbis/lib/mdct.c",
+                "external/vorbis/lib/psy.c",
+                "external/vorbis/lib/registry.c",
+                "external/vorbis/lib/res0.c",
+                "external/vorbis/lib/sharedbook.c",
+                "external/vorbis/lib/smallft.c",
+                "external/vorbis/lib/synthesis.c",
+                "external/vorbis/lib/vorbisfile.c",
+                "external/vorbis/lib/window.c",
+            }
+            includedirs {
+                "external/ogg/include",
+                "external/opus/include",
+                "external/opus/celt",
+                "external/opus/silk",
+                "external/opusfile/include",
+                "external/vorbis/include",
+            }
+            defines {
+                "OPUS_BUILD", "USE_ALLOCA",
+                "OPUS_X86_PRESUME_SSE", "OPUS_X86_PRESUME_SSE2",
+                "OPUS_HAVE_RTCD", "OPUS_X86_MAY_HAVE_SSE", "OPUS_X86_MAY_HAVE_SSE4_1", "OPUS_X86_MAY_HAVE_AVX2",
+            }
+        else
+            includedirs { OPUS_INCLUDE_DIR, VORBIS_INCLUDE_DIR, OGG_INCLUDE_DIR }
+        end
+    end
+
+    filter "system:linux"
+        links { "dl", "pthread", "m" }

premake/sqlite3/premake5.lua

 project "sqlite3"
     kind "StaticLib"
-    cdialect "C11"
 
     files { "sqlite3.c", "sqlite3.h" }

script @ 28782ebd

-Subproject commit 12e42e616bfef3a3e4309df389540e71c8a688d9
+Subproject commit 28782ebd949a70081a9f3c5c867d12cba80e756d