update ci

.travis.yml

@@ -56,8 +56,11 @@ before_deploy:
   - mkdir pics
   - curl --location --retry 5 --output 'ygopro-images-zh-CN.zip' https://github.com/mycard/ygopro-images/releases/download/latest/ygopro-images-zh-CN.zip
   - unzip -q -d pics ygopro-images-zh-CN.zip
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then tar -zcf ygopro-$TRAVIS_TAG-$TRAVIS_OS_NAME.tar.gz --exclude='.git*' ygopro.app LICENSE README.md lflist.conf script strings.conf system.conf textures deck cards.cdb pics replay; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then tar -zcf ygopro-$TRAVIS_TAG-$TRAVIS_OS_NAME.tar.gz --exclude='.git*' ygopro LICENSE README.md lflist.conf script strings.conf system.conf textures deck cards.cdb pics replay; fi
+  - curl --location --retry 5 --output 'ygopro-starter-pack-master.zip' https://github.com/mycard/ygopro-starter-pack/archive/master.zip
+  - unzip -q ygopro-starter-pack-master.zip
+  - cp ygopro-starter-pack-master/* .
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then tar -zcf ygopro-$TRAVIS_TAG-$TRAVIS_OS_NAME.tar.gz --exclude='.git*' ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then tar -zcf ygopro-$TRAVIS_TAG-$TRAVIS_OS_NAME.tar.gz --exclude='.git*' ygopro LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay; fi
 deploy:
   provider: releases
   file:

appveyor.yml

 version: '{build}'
+
 install:
   # fix tar xz
   - set PATH=%PATH%;C:\MinGW\msys\1.0\bin 
@@ -7,42 +8,47 @@ install:
   - git submodule update --init --recursive
   
   # environment and system dependency
-  - curl --location --retry 5 --output 'premake-5.0.0-alpha9-windows.zip' 'https://github.com/premake/premake-core/releases/download/v5.0.0-alpha9/premake-5.0.0-alpha9-windows.zip'
-  - 7z x premake-5.0.0-alpha9-windows.zip
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/premake/premake-core/releases/download/v5.0.0-alpha10/premake-5.0.0-alpha10-windows.zip ; exit 0"
+  - 7z x premake-5.0.0-alpha10-windows.zip
   
-  - curl --location --retry 5 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' | tar zxf -
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz ; exit 0"
+  - tar xf libevent-2.0.22-stable.tar.gz
   - move libevent-2.0.22-stable event
   - xcopy /E event\WIN32-Code event\include
   
-  - curl --location --retry 5 'http://downloads.sourceforge.net/freetype/freetype-2.7.tar.bz2' | tar jxf -
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://downloads.sourceforge.net/freetype/freetype-2.7.tar.bz2 ; exit 0"
+  - tar xf freetype-2.7.tar.bz2
   - move freetype-2.7 freetype
   
-  - curl --location --retry 5 --output 'irrlicht-1.8.4.zip' 'http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.4.zip'
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.4.zip ; exit 0"
   - 7z x irrlicht-1.8.4.zip
   - md irrlicht
   - move irrlicht-1.8.4\source\Irrlicht irrlicht\src
   - move irrlicht-1.8.4\include irrlicht\include
   
-  - curl --location --retry 5 'https://www.lua.org/ftp/lua-5.2.4.tar.gz' | tar zxf -
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.lua.org/ftp/lua-5.2.4.tar.gz ; exit 0"
+  - tar xf lua-5.2.4.tar.gz
   - move lua-5.2.4\src lua
   
-  - curl --location --retry 5 --output 'sqlite-amalgamation-3140200.zip' 'https://www.sqlite.org/2016/sqlite-amalgamation-3140200.zip'
-  - 7z x sqlite-amalgamation-3140200.zip
-  - move sqlite-amalgamation-3140200 sqlite3
-  
+  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.sqlite.org/2016/sqlite-amalgamation-3150200.zip ; exit 0"
+  - 7z x sqlite-amalgamation-3150200.zip
+  - move sqlite-amalgamation-3150200 sqlite3
+
   # let premake happy
   - xcopy /E premake\* .
   
   # patch irrlicht
-  - patch -p0 < irrlicht\irrlicht.patch
+  - patch -p1 < irrlicht\irrlicht.patch
   
   # premake
   - premake5 vs2015
   
 configuration: Release
-build: 
+
+build:
     project: build/ygo.sln
     parallel: true
+
 after_build:
   - mv bin\release\ygopro.exe .
   - curl --location --retry 5 'https://github.com/mycard/ygopro-database/archive/master.tar.gz' | tar --strip-components=1 -zxf - ygopro-database-master/locales
@@ -51,7 +57,10 @@ after_build:
   - mkdir pics
   - curl --location --retry 5 --output 'ygopro-images-zh-CN.zip' https://github.com/mycard/ygopro-images/releases/download/latest/ygopro-images-zh-CN.zip
   - unzip -q -d pics ygopro-images-zh-CN.zip
-  - tar -zcf ygopro-%APPVEYOR_REPO_TAG_NAME%-win32.tar.gz --exclude='.git*' ygopro.exe LICENSE README.md lflist.conf script strings.conf system.conf textures deck cards.cdb pics replay
+  - curl --location --retry 5 --output 'ygopro-starter-pack-master.zip' https://github.com/mycard/ygopro-starter-pack/archive/master.zip
+  - unzip -q ygopro-starter-pack-master.zip
+  - xcopy /E ygopro-starter-pack-master\* .
+  - tar -zcf ygopro-%APPVEYOR_REPO_TAG_NAME%-win32.tar.gz --exclude='.git*' ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay
   # 语言包
   - cd locales/en-US
   - mkdir pics # 下载那个语言的卡图
@@ -65,6 +74,9 @@ after_build:
   - unzip -q -d pics ygopro-images-ja-JP.zip
   - tar -zcf ../../ygopro-lang-ja-JP-%APPVEYOR_REPO_TAG_NAME%.tar.gz --exclude='.git*' cards.cdb strings.conf pics
   - cd ../..
+
+test: off
+
 artifacts:
   - path: ygopro-$(APPVEYOR_REPO_TAG_NAME)-win32.tar.gz
     name: ygopro
@@ -72,6 +84,7 @@ artifacts:
     name: ygopro-lang-en-US
   - path: ygopro-lang-ja-JP-$(APPVEYOR_REPO_TAG_NAME).tar.gz
     name: ygopro-lang-ja-JP
+
 deploy:
   description: 'Automatic build'
   provider: GitHub
@@ -79,7 +92,16 @@ deploy:
     secure: itZ9Z1dxEpfPJLdTs/PiY98pVZ3GCLNWfid7eAu7SL88Jl9AIrf/3rviKFEbsnoY # your encrypted token from GitHub
   on:
     appveyor_repo_tag: true        # deploy on tag push only
+
 branches:
   only:
     - master
     - /\d+\..+/
+
+cache:
+  - premake-5.0.0-alpha10-windows.zip
+  - libevent-2.0.22-stable.tar.gz
+  - freetype-2.7.tar.bz2
+  - irrlicht-1.8.4.zip
+  - lua-5.2.4.tar.gz
+  - sqlite-amalgamation-3150200.zip

deck/sample.ydk

-#created by ...
-#main
-89631139
-89631139
-89631139
-38517737
-38517737
-38517737
-45467446
-8240199
-8240199
-8240199
-45644898
-45644898
-71039903
-71039903
-71039903
-79814787
-97268402
-97268402
-23434538
-23434538
-48800175
-48800175
-48800175
-41620959
-41620959
-41620959
-6853254
-6853254
-6853254
-39701395
-39701395
-39701395
-38120068
-38120068
-38120068
-43898403
-43898403
-54447022
-63356631
-63356631
-5851097
-84749824
-#extra
-59822133
-59822133
-40908371
-40908371
-50954680
-83994433
-33698022
-58820923
-39030163
-31801517
-63767246
-2978414
-10406322
-64332231
-10443957
-!side
-8233522
-8233522
-56399890
-25789292
-25789292
-43898403
-53129443
-43455065
-43455065
-11109820
-11109820
-11109820
-29549364
-29549364
-29549364

premake/gframe/ygopro.rc

@@ -16,8 +16,8 @@ VALUE "InternalName", "YGOPro"
 VALUE "LegalCopyright", "Copyright (C) 2016 Fluorohydride"
 VALUE "OriginalFilename", "ygopro.exe"
 VALUE "ProductName", "YGOPro"
-VALUE "FileVersion", "1.033.C.8"
-VALUE "ProductVersion", "1.033.C.8"
+VALUE "FileVersion", "1.033.C"
+VALUE "ProductVersion", "1.033.C"
 END
 END
 BLOCK "VarFileInfo"

premake/irrlicht/premake5.lua

@@ -317,7 +317,6 @@ project "Irrlicht"
             "src/CGUIWindow.cpp" }
 
     configuration { "vs*" }
-        defines { "UNICODE", "_UNICODE" }
             includedirs { "$(DXSDK_DIR)include" }
         libdirs { "$(DXSDK_DIR)Lib/x86" }
 

premake/lua/premake4.lua

@@ -2,3 +2,4 @@ project "lua"
     kind "StaticLib"
 
     files { "*.c", "*.h" }
+    removefiles { "luac.c" }