Merge branch '2pick' of ../ygopro-7210srv

.gitignore

@@ -26,14 +26,14 @@
 # git repos
 /pics
 /script
-/WindBot
 
-# ygopro main program
-/ygopro
-/ygopro.exe
-/ygopro_*.exe
-/premake5
-/premake5.exe
+# windbot related files
+/[Bb]ot.conf
+/[Bb]ot.exe
+/[Ww]ind[Bb]ot
+
+# ygopro config file
+/system_user.conf
 
 # ygopro folders
 /deck
@@ -43,9 +43,15 @@
 /sound
 /update
 
+# ygopro main program
+/ygopro
+/ygopro.exe
+/ygopro_*.exe
+/premake5
+/premake5.exe
+
 # others
 /.vscode
 /bak/
 /card_list.txt
 /ygopro_*.bat
-

appveyor.yml

@@ -69,7 +69,6 @@ after_build:
   - rm -rf ygopro-scripts-master ygopro-scripts-master.zip
 
   - mkdir replay
-  - mv -f ../../expansions .
   - mv -f ../../gframe .
   - mv -f ../../ocgcore .
   - mv -f ../../premake .
@@ -85,7 +84,6 @@ after_build:
   - mv -f ../../system.conf .
   - cp -rf ../../ygopro.exe .
   - mv -f ../../premake5.exe .
-  - mv -f ../../bats/build.bat .
   - cd ..
   
   - mkdir redis
@@ -106,9 +104,9 @@ after_build:
   - npm install pm2@latest -g
   - npm install ws
   - npm install redis
+  - 7z a -mx9 -xr!.git* ../ygopro-server.7z ./*
   - cd ..
-  - mv -f bats/start.bat .
-  - 7z a -mx9 -xr!.git* ygopro-server.7z ygopro-server start.bat
+
 
 test: off
 

bats/build.bat

-@echo off
-set irrklang_pro=1
-premake5 vs2015
-msbuild build\ygo.sln /m /property:Configuration=Release
-del /f ygopro.exe
-move bin\release\ygopro.exe .
-pause
\ No newline at end of file

bats/start.bat

-@echo off
-
-cd ygopro-server/redis
-
-start redis-server.exe
-
-cd ../windbot
-
-start windbot.exe servermode=true serverport=2399
-cd ..
-
-node.exe ygopro-server.js
-
-pause
\ No newline at end of file

expansions/.gitkeep

--

system.conf

 #config file
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
+use_image_scale = 1
+pro_version = 4930
 antialias = 2
 errorlog = 2
 nickname = Komeiji Koishi