Merge pull request #1 from SleepyLili/2022-edits

2022 edits

assistant.py

@@ -302,49 +302,63 @@ def game_loop():
     print("Basic commands are:")
     print("(S)tart, (N)ext, (H)elp, (C)heck, (E)xit")
     while True:
-        print("Waiting for your input:")
-        command = input()
-        command = command.lower()
-        if command in ("a", "abort", "(a)bort"):
-            abort_game(game, hint_giver, flag_checker)
-        elif command in ("e", "exit"):
-            abort_game(game, hint_giver, flag_checker)
-            print("Exiting...")
-            return
-        elif command in ("s", "start", "(s)tart"):
-            start_game(game, level_selector)
-        elif command in ("n", "next", "(n)ext"):
-            try:
-                if game.level == 0:
-                    print("Can't continue, (S)tart the game first!")
-                elif game.level == 5:
-                    print("Can't continue, you are on the last level!")
-                    print("Make sure to run (F)inish and (L)og your progress before exiting.")
+        try:
+            print("Waiting for your input:")
+            command = input()
+            command = command.lower()
+            if command in ("a", "abort", "(a)bort"):
+                abort_game(game, hint_giver, flag_checker)
+            elif command in ("e", "exit"):
+                abort_game(game, hint_giver, flag_checker)
+                print("Exiting...")
+                return
+            elif command in ("s", "start", "(s)tart"):
+                start_game(game, level_selector)
+            elif command in ("n", "next", "(n)ext"):
+                try:
+                    if game.level == 0:
+                        print("Can't continue, (S)tart the game first!")
+                    elif game.level == 5:
+                        print("Can't continue, you are on the last level!")
+                        print("Make sure to run (F)inish and (L)og your progress before exiting.")
+                    else:
+                        if check_flag(game.level, flag_checker):
+                            try_next_level(game, level_selector)
+                except NoLevelFoundError as err:
+                    print("Error encountered: {}".format(err))
+            elif command in ("f", "finish", "(f)inish"):
+                if (not game.game_in_progress and not game.game_finished):
+                    print("Can't finish game, game was not started yet.")
+                elif (not game.game_in_progress and game.game_finished):
+                    print("Can't finish game, game was already finished earlier.")
                 else:
                     if check_flag(game.level, flag_checker):
-                        try_next_level(game, level_selector)
-            except NoLevelFoundError as err:
-                print("Error encountered: {}".format(err))
-        elif command in ("f", "finish", "(f)inish"):
-            if (not game.game_in_progress and not game.game_finished):
-                print("Can't finish game, game was not started yet.")
-            elif (not game.game_in_progress and game.game_finished):
-                print("Can't finish game, game was already finished earlier.")
+                        finish_game(game)
+            elif command in ("i", "info", "information", "(i)nfo", "(i)nformation"):
+                game.print_info()
+            elif command in ("h", "help", "(h)elp"):
+                print_help()
+            elif command in ("c", "check", "(c)heck"):
+                check_prerequisites()
+            elif command in ("l", "log", "(l)og"):
+                player_logging(game, hint_giver, flag_checker)
+            elif command in ("t", "hint", "hin(t)"):
+                give_hint(game, hint_giver)
             else:
-                if check_flag(game.level, flag_checker):
-                    finish_game(game)
-        elif command in ("i", "info", "information", "(i)nfo", "(i)nformation"):
-            game.print_info()
-        elif command in ("h", "help", "(h)elp"):
-            print_help()
-        elif command in ("c", "check", "(c)heck"):
-            check_prerequisites()
-        elif command in ("l", "log", "(l)og"):
-            player_logging(game, hint_giver, flag_checker)
-        elif command in ("t", "hint", "hin(t)"):
-            give_hint(game, hint_giver)
-        else:
+                print("Unknown command. Enter another command or try (H)elp.")
+        except EOFError:
             print("Unknown command. Enter another command or try (H)elp.")
+            print("If you want to exit the assistant, please use the `exit` command.")
+        except KeyboardInterrupt:
+            print("You sent a keyboard interrupt to the program.")
+            print("Would you like to exit?")
+            print("This will NOT save your log or end the game. yes/no")
+            confirmation = input()
+            confirmation = confirmation.lower()
+            if confirmation in ("y", "yes"):
+                return
+            else:
+                print("Not exiting. Continuing normal operation.")
 
 
 if __name__ == "__main__":

resources/hints.yml

@@ -31,7 +31,7 @@ level4:
     "Password cracking": "The password appears to be encrypted with a simple MD5 hash. A tool like John the Ripper, which is already installed on the computer, could be used to crack the password."
     "Command line options": 'The arguments you will need to crack the password are "--format=" and "--wordlist="'
     "Database interaction": "Use the [SQL] button in the web shell to interact with log into local databases and interact with them using SQL queries."
-    "Solution": "Place to hash in to_crack.txt. Run `john --format=raw-md5 --wordlist=passwords.txt to_crack.txt` to get the password."
+    "Solution": "Place the hash in to_crack.txt. Run `john --format=raw-md5 --wordlist=passwords.txt to_crack.txt` to get the password."
 level5:
   level5:
     "Database interaction": "You can communicate with local databases using SQL queries."