From 24ee5ab44da2be3439bd7140324e390c02bbe791 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 24 Aug 2020 04:35:32 +0200 Subject: [PATCH] Fix palette shuffler json loading in compiled form --- Text.py | 16 ++++++++-------- setup.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Text.py b/Text.py index fee36047..97a3d4ba 100644 --- a/Text.py +++ b/Text.py @@ -84,13 +84,13 @@ Uncle_texts = [ "Gonna shuffle\nall the items\nreal quick.", ] Triforce_texts = [ - 'Product has Hole in center. Bad seller, 0 out of 5.', - 'Who stole the fourth triangle?', - 'Trifource?\nMore Like Tritrice, am I right?' - '\n Well Done!', - 'You just wasted 2 hours of your life.', - 'This was meant to be a trapezoid' - "\n Success!", #Contributed by caitsith2 + 'Product has Hole in center. Bad seller, 0 out of 5.', + 'Who stole the fourth triangle?', + 'Trifource?\nMore Like Tritrice, am I right?' + '\n Well Done!', + 'You just wasted 2 hours of your life.', + 'This was meant to be a trapezoid\n Success!', # Contributed by caitsith2 + 'This was meant to be a trapezoid', ] * 2 + [ "\n GG", "All your base\nare belong\nto us.", @@ -155,7 +155,7 @@ Blind_texts = [ "Archers give\ngifts tied\nwith a bow.", "A healed\ngambler is\nall better.", "Any old sword\nwill make the\ncut here.", - "Lazy wyrms\nkeep dragin'\ntheir feet.", + "Lazy wyrms\nkeep dragon\ntheir feet.", "Percussionist\nmasters drum\nup audiences.", "Retrievers\nlove fetch\nquests.", "Sausage is\nthe wurst.", diff --git a/setup.py b/setup.py index 58f17026..7a241565 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ if os.path.exists("X:/pw.txt"): print("Using signtool") with open("X:/pw.txt") as f: pw = f.read() - signtool = r'"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe" sign /f X:/_SITS_Zertifikat_.pfx /p '+ pw + r' /fd sha256 /tr http://timestamp.digicert.com/ ' + signtool = r'signtool sign /f X:/_SITS_Zertifikat_.pfx /p ' + pw + r' /fd sha256 /tr http://timestamp.digicert.com/ ' else: signtool = None @@ -78,9 +78,9 @@ cx_Freeze.setup( executables=exes, options={ "build_exe": { - "includes" : [], + "includes": [], "zip_include_packages": ["*"], - "zip_exclude_packages": [], + "zip_exclude_packages": ["maseya"], "include_files": [], "include_msvcr": True, "replace_paths": [("*", "")],