Change number of monsters default and test load-save

feddersen_jacob.assignment-1.04/util.c

@@ -28,7 +28,7 @@ void parse_args(int argc, char *argv[], args_t *args) {
   args->dbg = 0;
   args->load = 0;
   args->save = 0;
-  args->nummon = 10;
+  args->nummon = 5;
   args->seed = time(NULL);
 	args->sleeptime = 250000;
   
@@ -71,7 +71,7 @@ void parse_args(int argc, char *argv[], args_t *args) {
     fprintf(stderr, "    --load:  \tInstead of generating a random dungeon, loads the saved dungeon\n\t\tfile from ~/.rlg327/dungeon\n");
     fprintf(stderr, "    --save:  \tSaves the dungeon to ~/.rlg327/dungeon\n");
     fprintf(stderr, "    --seed:  \tSeeds the random number generator to the given value. If not\n\t\tspecified, time(NULL) is used as the seed\n");
-    fprintf(stderr, "    --nummon:\tSets the number of monsters to generate in the dungeon. If not\n\t\tspecified, the default is 10. Automatically capped at the number\n\t\tof empty spaces in the dungeon\n");
+    fprintf(stderr, "    --nummon:\tSets the number of monsters to generate in the dungeon. If not\n\t\tspecified, the default is 5. Automatically capped at the number\n\t\tof empty spaces in the dungeon\n");
 		fprintf(stderr, "    --step:  \tSets the time to sleep between each game player turn step. Default is 250000 us.\n");
     fprintf(stderr, "    --dbg:   \tEnables debug output\n");
     fprintf(stderr, "    -h:      \tPrints this help information and exits\n");

saved_dungeons/Test_Saved_Files.py

+import glob, subprocess, os
+
+def run_sync(command):
+	return subprocess.run(command.split(' '), stdout=subprocess.PIPE).stdout.decode('utf-8')
+
+for file in glob.glob("*.rlg327"):
+    print(file)
+    
+    run_sync('cp ' + file + ' ' + os.environ['HOME'] + '/.rlg327/dungeon')
+    run_sync('cp ' + file + ' ' + os.environ['HOME'] + '/.rlg327/dungeon_untouched')
+    
+    result = run_sync('../feddersen_jacob.assignment-1.04/rlg327 --load --save --step=0')
+    diff = run_sync('diff ' + os.environ['HOME'] + '/.rlg327/dungeon ' + os.environ['HOME'] + '/.rlg327/dungeon_untouched');
+    
+    if (diff != ""):
+      print("ERROR!");
+      
\ No newline at end of file

saved_dungeons/test.sh

+set -e
+
 cp 00.rlg327 ~/.rlg327/dungeon
 cp 00.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 01.rlg327 ~/.rlg327/dungeon
 cp 01.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 02.rlg327 ~/.rlg327/dungeon
 cp 02.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 03.rlg327 ~/.rlg327/dungeon
 cp 03.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 04.rlg327 ~/.rlg327/dungeon
 cp 04.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 05.rlg327 ~/.rlg327/dungeon
 cp 05.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 06.rlg327 ~/.rlg327/dungeon
 cp 06.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 07.rlg327 ~/.rlg327/dungeon
 cp 07.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 08.rlg327 ~/.rlg327/dungeon
 cp 08.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp 09.rlg327 ~/.rlg327/dungeon
 cp 09.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp adventure.rlg327 ~/.rlg327/dungeon
 cp adventure.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp welldone.rlg327 ~/.rlg327/dungeon
 cp welldone.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)
 
 cp hello.rlg327 ~/.rlg327/dungeon
 cp hello.rlg327 ~/.rlg327/dungeon_untouched
-../feddersen_jacob.assignment-1.02/generate_dungeon --load --save
+../feddersen_jacob.assignment-1.04/rlg327 --load --save
 echo $(diff ~/.rlg327/dungeon ~/.rlg327/dungeon_untouched)