Merge branch 'server' into full-view

.ci/pack-linux-dlc.sh

+#!/bin/bash
+set -x
+set -o errexit
+
+ARCHIVE_FILES=(ygopro lib cards.cdb locales fonts sound textures strings.conf system.conf)
+
+TARGET_PLATFORM=linux
+
+apt update && apt -y install tar zstd
+mkdir dist replay
+
+cp -rf locales/$TARGET_LOCALE/* .
+
+tar -acf "dist/KoishiPro-dlc-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"

.ci/pack-macos-dlc.sh

+#!/bin/bash
+set -x
+set -o errexit
+
+ARCHIVE_FILES=(ygopro.app cards.cdb locales fonts sound textures strings.conf system.conf)
+
+TARGET_PLATFORM=darwin
+
+apt update && apt -y install tar zstd
+mkdir dist replay
+
+cp -rf locales/$TARGET_LOCALE/* .
+
+tar -acf "dist/KoishiPro-dlc-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"

.ci/pack-windows-dlc.sh

+#!/bin/bash
+set -x
+set -o errexit
+
+ARCHIVE_FILES=(ygopro.exe cards.cdb locales fonts sound textures strings.conf system.conf)
+
+TARGET_PLATFORM=win32
+
+apt update && apt -y install tar zstd
+mkdir dist replay
+
+cp -rf locales/$TARGET_LOCALE/* .
+
+tar -acf "dist/KoishiPro-dlc-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"

.ci/upload-packager.sh

@@ -25,7 +25,7 @@ handleErrorMessage() {
 runForDepot() {
   platform=$1
   locale=$2
-  archivePath="./dist/KoishiPro-$appVersion-$platform-$locale.tar.zst"
+  archivePath="./dist/KoishiPro-dlc-$appVersion-$platform-$locale.tar.zst"
   suffix="?platform=$platform&locale=$locale&arch=generic"
   echo "Uploading $archivePath"
   result=$(curl -H "$header" -X POST "$apiRoot/release/api/build/$appName/${appVersion}${suffix}" -F file=@$archivePath)

gframe/deck_manager.cpp

@@ -73,7 +73,7 @@ const std::unordered_map<int, int>* DeckManager::GetLFListContent(int lfhash) {
 	return nullptr;
 }
 int DeckManager::IsGameRuleDisallowed(unsigned char hostInfoRule, unsigned int cardOt) {
-	bool allow_ocg = hostInfoRule == 0 || hostInfoRule == 2; // OCG can be used in OCG and OT duels
+	bool allow_ocg = hostInfoRule == 0 || hostInfoRule == 4 || hostInfoRule == 2; // OCG can be used in OCG and OT duels
 	bool allow_tcg = hostInfoRule == 1 || hostInfoRule == 2; // TCG can be used in TCG and OT duels
 	bool allow_ccg = hostInfoRule == 0 || hostInfoRule == 4 || hostInfoRule == 2; // CCG can be used in OCG, CCG and OT duels
 	if(!allow_ocg && ((cardOt & 0x3) == 0x1))