hand to 4

.gitlab-ci.yml

@@ -120,576 +120,4 @@ exec_windows:
       - ygopro.exe
       - vcomp140.dll
 
-.exec_unix:
-  extends: ._exec_build
-  variables:
-    BUILD_FREETYPE: '1'
-    BUILD_SQLITE: '1'
-    BUILD_IRRLICHT: '1'
-    BUILD_EVENT: '1'
-    BUILD_OPUS_VORBIS: '1'
-    AUDIO_LIB: 'miniaudio'
-    MINIAUDIO_SUPPORT_OPUS_VORBIS: '1'
-    BUILD_OPUS_VORBIS: '1'
-  before_script:
-    - ./.ci/configure-libevent.sh
-
-.exec_linux:
-  extends: .exec_unix
-  tags:
-    - linux
-  image: git-registry.moenext.com/mycard/docker-ygopro-builder
-  dependencies:
-    - mat_common
-    #- mat_linux
-    - mat_submodules
-  script:
-    - ./.ci/configure-audio.sh
-    - 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
-  tags:
-    - avx2
-
-exec_linuxarm:
-  extends: .exec_linux
-  tags:
-    - arm
-  variables:
-    OPUS_FLAGS: '-fPIC' # force position independent code for arm
-    NO_AUDIO: '1'
-
-._exec_macos_platform:
-  extends: .exec_unix
-  dependencies:
-    - mat_macos
-    - mat_common
-    - mat_submodules
-  script:
-    - ./.ci/exec-macos-platform.sh
-  artifacts:
-    paths:
-      - ygopro-platforms
-
-exec_macos_platform_x86:
-  extends: ._exec_macos_platform
-  tags:
-    - macos
-
-      
-exec_macos_platform_m1:
-  extends: ._exec_macos_platform
-  tags:
-    - macos-m1
-  #variables:
-  #  MAC_ARM: 1
-
-exec_macos:
-  stage: combine
-  tags:
-    - macos
-  dependencies:
-    - exec_macos_platform_x86
-    - exec_macos_platform_m1
-  script:
-    - mkdir -p ygopro.app/Contents/MacOS ygopro.app/Contents/Frameworks;
-    - lipo -create -output ygopro.app/Contents/MacOS/ygopro $(ls -1 ygopro-platforms/ygopro-platform-*);
-    - mkdir ygopro.app/Contents/Resources;
-    - mv resource/gframe/ygopro.icns ygopro.app/Contents/Resources/Icon.icns;
-    - defaults write "$PWD/ygopro.app/Contents/Info.plist" "CFBundleIconFile" "Icon.icns";
-    - defaults write "$PWD/ygopro.app/Contents/Info.plist" "CFBundleIdentifier" "moe.mycard.ygopro";
-
-  artifacts:
-    paths:
-      - ygopro.app
-
-#exec_macos_sign:
-#  stage: sign
-#  tags:
-#    - macos
-#  dependencies:
-#    - exec_macos
-#  script: ./.ci/sign-macos.sh
-#  artifacts:
-#    paths:
-#      - ygopro.app
-#  only:
-#    - tags
-#    - master
-
-assets:
-  stage: prepare
-  tags:
-    - linux
-  script:
-    - apt update; apt -y install tar wget git
-    # starter pack
-    - wget -O - https://code.moenext.com/mycard/ygopro-starter-pack/-/archive/master/ygopro-starter-pack-master.tar.gz | tar zfx -
-    - mv ygopro-starter-pack-master/* .
-    # sound
-    - wget -O - https://code.moenext.com/mycard/ygopro-sounds/-/archive/master/ygopro-sounds-master.tar.gz | tar zfx -
-    - mv ygopro-sounds-master/sound/* sound
-    # fonts
-    - git clone --depth=1 https://code.moenext.com/mycard/ygopro-fonts
-    - mv ygopro-fonts/fonts .
-    # pack
-    - git clone --depth=1 https://code.moenext.com/mycard/ygopro-card-list
-    - mv ygopro-card-list/pack .
-    # locales
-    - git clone --depth=1 https://code.moenext.com/nanahira/ygopro-database
-    - mv ygopro-database/locales .
-  artifacts:
-    paths:
-      - deck
-      - single
-      - sound
-      - fonts
-      - pack
-      - locales
-  only:
-    - tags
-    - master
 
-assets_nonwindows:
-  stage: prepare
-  tags:
-    - linux
-  script:
-    - apt update; apt -y install tar wget
-    - wget -O - https://cdn02.moecube.com:444/windbot/windbot.tar.gz | tar zfx -
-  artifacts:
-    paths:
-      - bot.conf
-      - windbot
-      - bot
-  only:
-    - tags
-    - master
-
-assets_windows:
-  stage: prepare
-  tags:
-    - linux
-  script:
-    - wget https://cdn02.moecube.com:444/windbot/WindBot.7z
-    - 7z x -y WindBot.7z
-    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync s3://mycard/koishipro/contents/update-koishipro/ ./update-koishipro
-    - rm -rf update-koishipro/.git || true
-  artifacts:
-    paths:
-      - bot.conf
-      - WindBot
-      - Bot.exe
-      - update-koishipro
-  only:
-    - tags
-    - master
-
-._locale_zh-CN:
-  variables:
-    TARGET_LOCALE: zh-CN
-
-._locale_en-US:
-  variables:
-    TARGET_LOCALE: en-US
-
-._assets_locale:
-  stage: build
-  tags:
-    - linux
-  script: ./.ci/assets-locale.sh
-  artifacts:
-    paths:
-      - pics
-      - cards.cdb
-      - strings.conf
-      - bot.conf
-      - servers.conf
-  only:
-    - tags
-    - master
-
-assets_zh-CN:
-  extends: 
-    - ._assets_locale
-    - ._locale_zh-CN
-
-assets_en-US:
-  extends: 
-    - ._assets_locale
-    - ._locale_en-US
-
-._pack:
-  stage: pack
-  tags:
-    - linux
-  artifacts:
-    paths:
-      - dist
-  only:
-    - tags
-    - master
-
-
-._pack_format_gz:
-  extends: ._pack
-  variables:
-    ARCHIVE_SUFFIX: gz
-
-._pack_format_zst:
-  extends: ._pack
-  variables:
-    ARCHIVE_SUFFIX: zst
-
-._pack_dlc:
-  extends: ._pack_format_zst
-  only:
-    - tags
-
-._pack_script_windows_non7z:
-  extends: ._pack
-  script: ./.ci/pack-windows.sh
-
-._pack_script_windows_7z:
-  extends: ._pack
-  script: ./.ci/pack-windows-7z.sh
-
-._pack_script_linux:
-  extends: ._pack
-  script: ./.ci/pack-linux.sh
-
-._pack_script_macos:
-  extends: ._pack
-  script: ./.ci/pack-macos.sh
-
-._pack_script_windows_dlc:
-  extends: ._pack_dlc
-  script: ./.ci/pack-windows-dlc.sh
-
-._pack_script_linux_dlc:
-  extends: ._pack_dlc
-  script: ./.ci/pack-linux-dlc.sh
-
-._pack_script_macos_dlc:
-  extends: ._pack_dlc
-  script: ./.ci/pack-macos-dlc.sh
-
-._pack_assets_windows_zh-CN:
-  extends: ._pack
-  dependencies:
-    - assets
-    - assets_windows
-    - exec_windows
-    - assets_zh-CN
-    - mat_submodules
-
-._pack_assets_linux_zh-CN:
-  extends: ._pack
-  dependencies:
-    - assets
-    - assets_nonwindows
-    - exec_linux
-    - assets_zh-CN
-    - mat_submodules
-
-._pack_assets_linuxarm_zh-CN:
-  extends: ._pack
-  dependencies:
-    - assets
-    - assets_nonwindows
-    - exec_linuxarm
-    - assets_zh-CN
-    - mat_submodules
-
-._pack_assets_macos_zh-CN:
-  extends: ._pack
-  dependencies:
-    - assets
-    - assets_nonwindows
-    - exec_macos
-    - assets_zh-CN
-    - mat_submodules
-
-._pack_assets_windows_en-US:
-  extends: ._pack
-  dependencies:
-    - assets
-    - assets_windows
-    - exec_windows
-    - assets_en-US
-    - mat_submodules
-
-._pack_assets_linux_en-US:
-  extends: ._pack
-  dependencies:
-    - assets
-    - assets_nonwindows
-    - exec_linux
-    - assets_en-US
-    - mat_submodules
-
-._pack_assets_linuxarm_en-US:
-  extends: ._pack
-  dependencies:
-    - assets
-    - assets_nonwindows
-    - exec_linuxarm
-    - assets_en-US
-    - mat_submodules
-
-._pack_assets_macos_en-US:
-  extends: ._pack
-  dependencies:
-    - assets
-    - assets_nonwindows
-    - exec_macos
-    - assets_en-US
-    - mat_submodules
-
-._pack_assets_windows_dlc:
-  extends: ._pack
-  dependencies:
-    - assets
-    - exec_windows
-    - mat_submodules
-
-._pack_assets_linux_dlc:
-  extends: ._pack
-  dependencies:
-    - assets
-    - exec_linux
-    - mat_submodules
-
-._pack_assets_macos_dlc:
-  extends: ._pack
-  dependencies:
-    - assets
-    - exec_macos
-    - mat_submodules
-
-pack_windows_dlc_zh-CN:
-  extends:
-    - ._pack_assets_windows_dlc
-    - ._pack_script_windows_dlc
-    - ._locale_zh-CN
-
-pack_linux_dlc_zh-CN:
-  extends:
-    - ._pack_assets_linux_dlc
-    - ._pack_script_linux_dlc
-    - ._locale_zh-CN
-
-pack_macos_dlc_zh-CN:
-  extends:
-    - ._pack_assets_macos_dlc
-    - ._pack_script_macos_dlc
-    - ._locale_zh-CN
-
-pack_windows_dlc_en-US:
-  extends:
-    - ._pack_assets_windows_dlc
-    - ._pack_script_windows_dlc
-    - ._locale_en-US
-
-pack_linux_dlc_en-US:
-  extends:
-    - ._pack_assets_linux_dlc
-    - ._pack_script_linux_dlc
-    - ._locale_en-US
-
-pack_macos_dlc_en-US:
-  extends:
-    - ._pack_assets_macos_dlc
-    - ._pack_script_macos_dlc
-    - ._locale_en-US
-
-pack_windows_zh-CN_7z:
-  extends:
-    - ._pack_assets_windows_zh-CN
-    - ._pack_script_windows_7z
-    - ._locale_zh-CN
-
-#pack_windows_zh-CN_gz:
-#  extends:
-#    - ._pack_assets_windows_zh-CN
-#    - ._pack_script_windows_non7z
-#    - ._pack_format_gz
-#    - ._locale_zh-CN
-
-#pack_windows_zh-CN_zst:
-#  extends:
-#    - ._pack_assets_windows_zh-CN
-#    - ._pack_script_windows_non7z
-#    - ._pack_format_zst
-#    - ._locale_zh-CN
-
-pack_linux_zh-CN_gz:
-  extends:
-    - ._pack_assets_linux_zh-CN
-    - ._pack_script_linux
-    - ._pack_format_gz
-    - ._locale_zh-CN
-
-pack_linuxarm_zh-CN_gz:
-  extends:
-    - ._pack_assets_linuxarm_zh-CN
-    - ._pack_script_linux
-    - ._pack_format_gz
-    - ._locale_zh-CN
-  variables:
-    TARGET_PLATFORM: linuxarm
-
-#pack_linux_zh-CN_zst:
-#  extends:
-#    - ._pack_assets_linux_zh-CN
-#    - ._pack_script_linux
-#    - ._pack_format_zst
-#    - ._locale_zh-CN
-
-
-pack_macos_zh-CN_gz:
-  extends:
-    - ._pack_assets_macos_zh-CN
-    - ._pack_script_macos
-    - ._pack_format_gz
-    - ._locale_zh-CN
-
-#pack_macos_zh-CN_zst:
-#  extends:
-#    - ._pack_assets_macos_zh-CN
-#    - ._pack_script_macos
-#    - ._pack_format_zst
-#    - ._locale_zh-CN
-
-pack_windows_en-US_7z:
-  extends:
-    - ._pack_assets_windows_en-US
-    - ._pack_script_windows_7z
-    - ._locale_en-US
-
-#pack_windows_en-US_gz:
-#  extends:
-#    - ._pack_assets_windows_en-US
-#    - ._pack_script_windows_non7z
-#    - ._pack_format_gz
-#    - ._locale_en-US
-
-#pack_windows_en-US_zst:
-#  extends:
-#    - ._pack_assets_windows_en-US
-#    - ._pack_script_windows_non7z
-#    - ._pack_format_zst
-#    - ._locale_en-US
-
-pack_linux_en-US_gz:
-  extends:
-    - ._pack_assets_linux_en-US
-    - ._pack_script_linux
-    - ._pack_format_gz
-    - ._locale_en-US
-
-pack_linuxarm_en-US_gz:
-  extends:
-    - ._pack_assets_linuxarm_en-US
-    - ._pack_script_linux
-    - ._pack_format_gz
-    - ._locale_en-US
-  variables:
-    TARGET_PLATFORM: linuxarm
-
-#pack_linux_en-US_zst:
-#  extends:
-#    - ._pack_assets_linux_en-US
-#    - ._pack_script_linux
-#    - ._pack_format_zst
-#    - ._locale_en-US
-
-pack_macos_en-US_gz:
-  extends:
-    - ._pack_assets_macos_en-US
-    - ._pack_script_macos
-    - ._pack_format_gz
-    - ._locale_en-US
-
-#pack_macos_en-US_zst:
-#  extends:
-#    - ._pack_assets_macos_en-US
-#    - ._pack_script_macos
-#    - ._pack_format_zst
-#    - ._locale_en-US
-
-upload_contents:
-  stage: deploy
-  dependencies:
-    - pack_windows_zh-CN_7z
-  tags: 
-    - linux
-  script:
-    - 7z x -y -ocontents dist/KoishiPro-$CI_COMMIT_REF_NAME-win32-zh-CN.7z
-    - cd contents/update-koishipro
-    - chmod +x *.sh
-    - mono update.exe -ci
-    - sed -i "/git/d" filelist.txt
-    - cd ../..
-    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete contents/ s3://mycard/koishipro/contents/
-  only:
-    - master
-
-upload_to_minio:
-  stage: deploy
-  dependencies:
-    - pack_windows_zh-CN_7z
-    #- pack_windows_zh-CN_gz
-    #- pack_windows_zh-CN_zst
-    - pack_linux_zh-CN_gz
-    - pack_linuxarm_zh-CN_gz
-    #- pack_linux_zh-CN_zst
-    - pack_macos_zh-CN_gz
-    #- pack_macos_zh-CN_zst
-    - pack_windows_en-US_7z
-    #- pack_windows_en-US_gz
-    #- pack_windows_en-US_zst
-    - pack_linux_en-US_gz
-    - pack_linuxarm_en-US_gz
-    #- pack_linux_en-US_zst
-    - pack_macos_en-US_gz
-    #- pack_macos_en-US_zst
-    - pack_windows_dlc_zh-CN
-    - pack_linux_dlc_zh-CN
-    - pack_macos_dlc_zh-CN
-    - pack_windows_dlc_en-US
-    - pack_linux_dlc_en-US
-    - pack_macos_dlc_en-US
-  tags: 
-    - linux
-  script:
-    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync dist/ s3://mycard/koishipro/archive
-  only:
-    - tags
-    - master
-
-upload_mycard:
-  stage: deploy
-  dependencies:
-    - pack_windows_dlc_zh-CN
-    - pack_linux_dlc_zh-CN
-    - pack_macos_dlc_zh-CN
-    - pack_windows_dlc_en-US
-    - pack_linux_dlc_en-US
-    - pack_macos_dlc_en-US
-  tags: 
-    - linux
-  variables:
-    appVersion: $CI_COMMIT_TAG
-  script: ./.ci/upload-packager.sh
-  only:
-    - tags

gframe/duelclient.cpp

@@ -149,7 +149,7 @@ void DuelClient::ClientEvent(bufferevent* bev, short events, void* ctx) {
 				BufferIO::CopyCharArray(L"", cscg.pass);
 				cscg.info.rule = 5;
 				cscg.info.mode = 0;
-				cscg.info.start_hand = 5;
+				cscg.info.start_hand = 4;
 				cscg.info.start_lp = 8000;
 				cscg.info.draw_count = 1;
 				cscg.info.time_limit = 0;

gframe/single_mode.cpp

@@ -31,7 +31,7 @@ void SingleMode::SetResponse(unsigned char* resp, unsigned int len) {
 }
 int SingleMode::SinglePlayThread() {
 	const int start_lp = 8000;
-	const int start_hand = 5;
+	const int start_hand = 4;
 	const int draw_count = 1;
 	mainGame->dInfo.Clear();
 	int opt = 0;