diff --git a/data/save.py b/data/save.py index 699bb09..92ec8f0 100644 --- a/data/save.py +++ b/data/save.py @@ -73,7 +73,7 @@ def handle_uuid_stuff(cat: Cat): def save(cat: Cat, dont_save=False): if os.path.exists("WEB_VERSION") and not dont_save: print( - "Under this message, in quotes, will be a long string of text, this is your savefile, please copy this somewhere safe (WITHOUT THE QUOTES) and make sure to copy the whole thing, you will paste it back to load your game. You SHOULD be able to use CTRL+C and CTRL+V." + "Under this message, in quotes, will be a long string of text, this is your savefile, please copy this somewhere safe and make sure to copy the whole thing, you will paste it back to load your game. You SHOULD be able to use CTRL+C+." ) print('"' + base64.b64encode(json.dumps(cat.to_dict()).encode()).decode() + '"') handle_uuid_stuff(cat) diff --git a/game.py b/game.py index 16741fb..0a4ff69 100644 --- a/game.py +++ b/game.py @@ -102,7 +102,7 @@ class Game: def load_game(self): if os.path.exists("WEB_VERSION"): print( - "Please paste your savefile on the next line, DO NOT USE CTRL+V, instead, right click and click paste. Make sure to not paste the quotes surrounding it if you copied those. Press enter to cancel." + "Please paste your savefile on the next line, you can PROBABLY use CTRL+V. Press enter to cancel." ) savetext = ui.text("Enter here:") if savetext: @@ -139,11 +139,9 @@ class Game: f"This is a web version of {data.text.GAME_NAME}, here is some important info. To anyone outside of Germany, this game is running on a cheap VPS I got, the company didn't have any US locations available, so I had to get a Germany one, sorry for the high ping (I also have to deal with it, I'm in the US)\nPls don't hack this" ) print( - "Just a recommendation, don't press any keys with CTRL, it will probably break something. If something weird happens, reload." - ) - print( - "By weird, I mean, skipped dialog, crashes, skipping stuff, and breaking a ton, don't click CTRL+C (CTRL+A also seems to end the game for some reason. IDK why. Some other keys might also.)" + "Update: You can now use CTRL+C and CTRL+V, and most other CTRL keys shouldn't crash the game (CTRL+R) will reload still, so any web browser stuff that could break it still will. To anyone that didn't know about this, CTRL keys used to crash the game." ) + if os.path.exists("debug.json"): bypass_tamper_check = False debug_config = None @@ -212,7 +210,7 @@ if __name__ == "__main__": print("Developer stuff incoming, if you can, tell me what this says:") traceback.print_exc() print( - "Welp, seems that the game crashed, idk why. A common cause of this is pressing CTRL+C, which will cancel some UI stuff and just break the game. If you're on the desktop version, reopen it, if you're on the web version, reload, and don't use CTRL+C.\nOtherwise, great job! You found an issue in the game! If you can, please tell me." + "Welp, seems that the game crashed, idk why. A common cause of this is, as of now, IDK, because I fixed the CTRL issue (tell me if it crashed from CTRL+something). If you're on the desktop version, reopen it, if you're on the web version, reload.\nOtherwise, great job! You found an issue in the game! If you can, please tell me." ) print( "Take a moment to screenshot the error or write it down or something if you can send it to me, and:" @@ -223,5 +221,27 @@ if __name__ == "__main__": else: if not result: print( - "I think you did CTRL+C? I said not to I think. Well, here you are! Great job, not following instructions, I said it for a reason." + "So, it seems the game managed to exit, without it meaning to exit, you found a bug! Great job! If you can, please tell me what happened. If you know my Gitea server link, create an issue on the Whiskerbound repository. Sorry, you gotta reload." ) + if os.path.exists("WEB_VERSION"): + print( + "I could try to give you your savefile, though it might not appear, here's what should be your current savefile:" + ) + print( + '"' + + base64.b64encode(json.dumps(game.cat.to_dict()).encode()).decode() + + '"' + ) + print( + "It's above this message, if theres nothing, the game broke too much, sorry." + ) + print( + "Copy it if you can, you paste it into the Load Game menu option when you select it BTW." + ) + print( + "I'm gonna try to do some other stuff to save RN, if there's a bunch of errors under here, it's PROBABLY fine :)" + ) + data.save.handle_uuid_stuff(game.cat) + print( + "If there's no errors above this, yay." + ) # TODO: add crash saving for a exception crash.