Adding saiyuuki world

README.md

@@ -28,7 +28,7 @@ Credits
 - The latest version of the code is maintained by Libretro's community [here](https://github.com/libretro/QuickNES_Core)
 - For the interactive player, this project uses a modified version of [HeadlessQuickNES (HQN)](https://github.com/Bindernews/HeadlessQuickNes) by Drew (Binder News)
 - We use some of the [NES test rom set](https://github.com/christopherpow/nes-test-roms) made by multiple authors and gathered by Christopher Pow et al.
-- We also use some movies from the (TASVideos)[tasvideos.org] website for testing. These movies are copied into this repository with authorization under the Creative Commons Attribution 2.0 license.
+- We also use some movies from the [TASVideos](tasvideos.org) website for testing. These movies are copied into this repository with authorization under the Creative Commons Attribution 2.0 license.
 
 All base code for this project was found under open source licenses, which I preserved in their corresponding files/folders. Any non-credited work is unintentional and shall be immediately rectfied.
 

source/tester.cpp

@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
   // Printing test information
   printf("[] -----------------------------------------\n");
   printf("[] Running Script:          '%s'\n", scriptFilePath.c_str());
-  printf("[] Cycle Type:              '%s'\n", isFullCycle ? "Load / Advance / Save / Advance" : "Advance Only");
+  printf("[] Cycle Type:              '%s'\n", isFullCycle ? "Advance / Load / Advance / Save" : "Advance Only");
   printf("[] Emulation Core:          '%s'\n", emulationCoreName.c_str());
   printf("[] ROM File:                '%s'\n", romFilePath.c_str());
   printf("[] ROM SHA1:                '%s'\n", romSHA1.c_str());
@@ -137,10 +137,10 @@ int main(int argc, char *argv[])
   auto t0 = std::chrono::high_resolution_clock::now();
   for (const std::string& input : sequence)
   {
+    if (isFullCycle == true) e.advanceState(input);
     if (isFullCycle == true) e.deserializeState(currentState);
     e.advanceState(input);
     if (isFullCycle == true) e.serializeState(currentState);
-    if (isFullCycle == true) e.advanceState(input);
   } 
   auto tf = std::chrono::high_resolution_clock::now();
 
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
 
   // Printing time information
   printf("[] Elapsed time:            %3.3fs\n", (double)dt * 1.0e-9);
-  printf("[] Performance:             %.3f steps / s\n", (double)sequenceLength / elapsedTimeSeconds);
+  printf("[] Performance:             %.3f inputs / s\n", (double)sequenceLength / elapsedTimeSeconds);
   printf("[] Final State Hash:        %s\n", hashStringBuffer);
 
   // If saving hash, do it now

tests/games/castlevania1/meson.build

@@ -1,9 +1,7 @@
 game = 'castlevania1'
 
 goal = 'anyPercent'
-test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
-test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
+test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
 
 goal = 'pacifist'
-test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
-test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
+test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(),timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )

tests/games/meson.build

@@ -17,4 +17,5 @@ subdir('nigelMansell')
 subdir('galaga')
 subdir('saintSeiyaOugonDensetsu')
 subdir('saintSeiyaKanketsuHen')
-subdir('superMarioBros')
+subdir('superMarioBros')
+subdir('saiyuukiWorld')

tests/games/saiyuukiWorld/anyPercent.test

@@ -0,0 +1,7 @@
+{
+  "Rom File": "Saiyuuki World (J).nes",
+  "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770",
+  "Initial State File": "",
+  "Sequence File": "anyPercent.sol",
+  "Credits": "https://tasvideos.org/4422M by aiqiyou & J.Y"
+}

tests/games/saiyuukiWorld/lastHalf.test

@@ -0,0 +1,7 @@
+{
+  "Rom File": "Saiyuuki World (J).nes",
+  "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770",
+  "Initial State File": "lastHalf.state",
+  "Sequence File": "anyPercent.sol",
+  "Credits": "https://tasvideos.org/4422M by aiqiyou & J.Y"
+}

tests/games/saiyuukiWorld/meson.build

@@ -0,0 +1,9 @@
+game = 'saiyuukiWorld'
+
+bash = find_program('bash')
+
+goal = 'anyPercent'
+test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
+
+goal = 'lastHalf'
+test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )