Skip to content

Commit

Permalink
fix score report
Browse files Browse the repository at this point in the history
  • Loading branch information
@iclyxcly
iclyxcly committed Dec 11, 2021
1 parent f1d0113 commit 74b74b4
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 73 deletions.
75 changes: 18 additions & 57 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,34 @@
# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod

# Compiled Static libraries
*.lai
*.la
*.a

# Executables
*.exe
*.out
*.app
tetris_ai/.vs/Tspin/v16/.suo
tetris_ai/.vs/Tspin/v16/Browse.VC.db
tetris_ai/.vs/Tspin/v16/Browse.VC.db-shm
tetris_ai/.vs/Tspin/v16/Browse.VC.db-wal
tetris_ai/.vs/Tspin/v16/Browse.VC.opendb
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/5a21b58093a371dd/TETRIS_AI.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/5b2ed26e83f5d850/GENMOVE.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/7251ddfa10929a89/AI.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/84487fe1ff537300/MAIN.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/8a80f1e92767b41/PSO.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/8f4af0b8038d9465/DLLAI.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/cbe7a72c3073c0ea/GENMOVE.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/e2cd41612cbe9962/TETRIS_CORE.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/e4d10b1627c1e1cd/PSO.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/e6af150c6b28961a/TETRIS_CORE.ipch
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/ec7d831bfbab0d4d/GAMEPOOL.ipch
tetris_ai/.vs/Tspin/v16/Solution.VC.db
tetris_ai/.vs/Tspin/v16/Solution.VC.db-shm
tetris_ai/.vs/Tspin/v16/Solution.VC.db-wal
tetris_ai/tetris_ai.aps
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/358e969746c4e65c/PSO.ipch
tetris_ai/XP_Release/tetris_ai.log
tetris_ai/XP_Release/tetris_ai.res
tetris_ai/XP_Release/Tspin.exe.intermediate.manifest
tetris_ai/XP_Release/Tspin.exe.recipe
tetris_ai/XP_Release/Tspin.iobj
tetris_ai/XP_Release/Tspin.ipdb
tetris_ai/XP_Release/Tspin.tlog/CL.command.1.tlog
tetris_ai/XP_Release/Tspin.tlog/CL.read.1.tlog
tetris_ai/XP_Release/Tspin.tlog/CL.write.1.tlog
tetris_ai/XP_Release/Tspin.tlog/link.command.1.tlog
tetris_ai/XP_Release/Tspin.tlog/link.read.1.tlog
tetris_ai/XP_Release/Tspin.tlog/link.write.1.tlog
tetris_ai/XP_Release/Tspin.tlog/mt.command.1.tlog
tetris_ai/XP_Release/Tspin.tlog/mt.read.1.tlog
tetris_ai/XP_Release/Tspin.tlog/mt.write.1.tlog
tetris_ai/XP_Release/Tspin.tlog/rc.command.1.tlog
tetris_ai/XP_Release/Tspin.tlog/rc.read.1.tlog
tetris_ai/XP_Release/Tspin.tlog/rc.write.1.tlog
tetris_ai/XP_Release/Tspin.tlog/Tspin.lastbuildstate
tetris_ai/XP_Release/vc142.pdb
tetris_ai/.vs/Tspin/v16/ipch/AutoPCH/4d96ffa77eaffcd3/MAIN.ipch
tetris_ai/bin/misamino.cfg
tetris_ai/bin/misamino_update.zip
tetris_ai/bin/Tspin.exe.manifest
tetris_ai/bin/Tspin.pdb
*.ipch
*.db
*.db-shm
*.db-wal
*.opendb
*.pdb
*.ipdb
*.iobj
*.log
*.txt
*.tlog
*.suo
*.manifest
*.cfg
*.zip
*.recipe
*.res
*.aps
6 changes: 3 additions & 3 deletions dllai/dllai.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP_Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down
24 changes: 14 additions & 10 deletions tetris_ai/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ int enable_autostart = 0;
int autostart_interval = 0;
int count = 0;
int next = 0;
bool done_pupu = false;

PIMAGE colorCell( int w, int h, color_t normal, color_t lt, color_t rb ) {
PIMAGE img;
Expand Down Expand Up @@ -1116,6 +1117,7 @@ void mainscene() {
lastGameState = 0;
} else {
if ( lastGameState == 0 ) {
done_pupu = true;
if ( tetris[1].alive() ) {
tetris[0].ko();
tetris[1].n_win++;
Expand All @@ -1125,16 +1127,6 @@ void mainscene() {
}
//GameSound::ins().stopBGM();
if ( player.sound_bgm ) GameSound::ins().loadBGM_wait( rnd );
if (enable_autostart == 1) {
Sleep(autostart_interval);
int seed = (unsigned)time(0), pass = rnd.randint(1024);
for (int i = 0; i < players_num; ++i) {
tetris[i].reset(seed ^ ((!rule.samesequence) * i * 255), pass);
onGameStart(tetris[i], rnd, i);
tetris[i].acceptAttack(player_begin_attack);
}
if (player.sound_bgm) GameSound::ins().loadBGM(rnd);
}
}
lastGameState = -1;
}
Expand Down Expand Up @@ -1222,6 +1214,18 @@ void mainscene() {
tetris[0].trySpin180();
player_key_state[7] = 1;
}
if (done_pupu == true) {
if (!tetris[0].alive() || !tetris[1].alive() && enable_autostart == 1) {
Sleep(autostart_interval);
int seed = (unsigned)time(0), pass = rnd.randint(1024);
for (int i = 0; i < players_num; ++i) {
tetris[i].reset(seed ^ ((!rule.samesequence) * i * 255), pass);
onGameStart(tetris[i], rnd, i);
tetris[i].acceptAttack(player_begin_attack);
}
if (player.sound_bgm) GameSound::ins().loadBGM(rnd);
}
}
if ( k.key == key_f2 ) {
if ( !tetris[0].alive() || !tetris[1].alive() || tetris[0].n_pieces <= 20 ) {
int seed = (unsigned)time(0), pass = rnd.randint(1024);
Expand Down
6 changes: 3 additions & 3 deletions tetris_ai/tetris_ai.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand All @@ -40,7 +40,7 @@
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down

0 comments on commit 74b74b4

Please sign in to comment.