diff --git a/.gitignore b/.gitignore index 6f18554..c24f0fc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ dist/** __pycache__/** __pycache__ build -build/** \ No newline at end of file +build/** +Release.zip \ No newline at end of file diff --git a/Engine_Class_File.py b/Engine.py similarity index 100% rename from Engine_Class_File.py rename to Engine.py diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d0112e8 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +Release.zip: clean Scrambler.py Engine.py Themes.py Assets + pyinstaller Scrambler.py -w -F -i Assets/favi.ico + 7z a Release.zip ./dist/* Assets + +clean: + rm -rf __pycache__ dist build *.spec *.exe Release.zip \ No newline at end of file diff --git a/New Stuff.txt b/New Stuff.txt deleted file mode 100644 index cb18641..0000000 --- a/New Stuff.txt +++ /dev/null @@ -1,12 +0,0 @@ -The 1.2 update of the Scares Scrambler has been the longest update to make so far, mostly because of some huge behind-the-scenes code overhauls. Here's a list of new features that may interest you: - -Corrupt & Repeat: Generate multiple corrupted files at once! - -New Dubby Theme: Don't ask. - -New Folder Selector: For getting exact paths for the corrupted file. - -Two New Algorithms: Smoother and Blender; they're pretty fun. - -UI Update: Just some small quality-of-life improvements. - -Corruption Progress Bar: Blink and you'll miss it. - -Mixer Algorithm: You'll never know. - -Bugfixes: Because hey, why not? - -Probably Other Stuff I'm Forgetting - -Hope you have fun with all the new stuff! \ No newline at end of file diff --git a/README.md b/README.md index fee7bb0..1e1eb25 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,72 @@ -# Scares-Scrambler-Class-Rebuild +# Scares Scrambler -The place where all current/future Scares Scrambler stuff will happen -(at least, in it's current form). +The place where all current/future Scares Scrambler stuff will +happen (at least, in it's current form). Current Release Build: 20 -Current Beta Build: 9+10 +Current Beta Build: 22 -Currently Planned Features: A bunch, but Scare'm not writing them right now. +Currently Planned Features: A bunch, but Scare'm not writing them +right now. # What need? -- Python3 +- [Python >=3.5][1] - Tkinter (comes with all prebuilt versions of Python) -- Pyinstaller (optional, for building) +- [Pyinstaller][2] (optional, for building) +- Some form of 7-zip (optional, for building) +- GNU make (optional, for building on Linux) -`pip3 install pyinstaller` +[1]: https://www.python.org/ +[2]: https://www.pyinstaller.org/ -If you're running Python 3.8, as of now you need to install the -*development* version of Pyinstaller for the build to work at all: +```bash +# Install Pyinstaller (not system dependent): +pip3 install pyinstaller -`pip3 install https://github.com/pyinstaller/pyinstaller/archive/develop.tar.gz` +# Install p7zip (Arch/Manjaro Linux): +sudo pacman -Sy p7zip + +# Install p7zip (Debian/Ubuntu Linux): +sudo apt-get update +sudo apt-get install p7zip-full p7zip-rar +``` # How run without build? ``` -python3 Scares_Scrambler_Class_Rebuild.py +python3 Scrambler.py ``` # How build? -``` -pyinstaller Scares_Scrambler_Class_Rebuild.py -w -F -i Assets/favi.ico -``` +## Linux + +Open the console of your choice, and navigate to where you +have extracted a source .zip file or whereever you have +cloned the repository. + +Running `make` will create a `Release.zip` file that contains +a binary and `Assets`. + +## Windows + +Using GNU make is a bit harder on Windows, so Scott've included +a `build.cmd` file. + +Install [7-Zip][3] and add it to the `PATH`: + +- Press Windows+R, type `sysdm.cpl`, and press enter. +- Click on the `Advanced` tab. +- Click on the `Environment Variables...` button. +- Add or edit the `PATH` variable **for your user** + (under "User variables") to include + `C:\Program Files\7-Zip` or `C:\Program Files (x86)\7-Zip`. + +(this only has to be done once per system.) + +[3]: https://7-zip.org/download.html + +Double-clicking `build.cmd` will now create a `Release.zip` +file that contains a binary and `Assets`. \ No newline at end of file diff --git a/Scares_Scrambler_Class_Rebuild.py b/Scrambler.py similarity index 99% rename from Scares_Scrambler_Class_Rebuild.py rename to Scrambler.py index caa816e..f9dff03 100644 --- a/Scares_Scrambler_Class_Rebuild.py +++ b/Scrambler.py @@ -8,14 +8,14 @@ from tkinter import (Tk, messagebox, ttk) from tkinter.filedialog import askopenfilename -from Engine_Class_File import * #Import all the important classes I made haha -from Theme_Class_File import * +from Engine import * #Import all the important classes I made haha +from Themes import * '''Hello, anyone reading this! Don't mind the disgusting code in some places; I'm not that good at coding, so don't expect it to work perfectly and/or look pretty! Anyways, hopefully you'll find some enjoyment messing around with this corrupter. Have fun!''' -buildNumber = "9+10" -versionNumber = "v1.2121" +buildNumber = "22" +versionNumber = "v1.22" goodIcon = "Assets/favi.ico" #os.getcwd() to get working directory diff --git a/Theme_Class_File.py b/Themes.py similarity index 100% rename from Theme_Class_File.py rename to Themes.py diff --git a/build.cmd b/build.cmd new file mode 100644 index 0000000..1624e44 --- /dev/null +++ b/build.cmd @@ -0,0 +1,3 @@ +@echo off +pyinstaller Scrambler.py -w -F -i Assets/favi.ico +7z a Release.zip ./dist/* Assets \ No newline at end of file