diff --git a/install.command b/install.command index 6a73f88..573d113 100755 --- a/install.command +++ b/install.command @@ -14,18 +14,6 @@ color_reset="\033[0m" # Reset Colors ONESHOT_PATH=$HOME/Library/Application\ Support/Steam/steamapps/common/OneShot -# echo "-> ${cyan}Extracting images from EXE...${color_reset}" -# ./patches/mac/bin/upx -d -o ./uncompressed.exe "$ONESHOT_PATH/_______.exe" -# ./patches/mac/bin/extract-bmp - -# echo "-> ${cyan}Converting bitmap images to PNG...${color_reset}" -# for bmp in ./images/*.bmp; do -# ./patches/mac/bin/convert "$bmp" -alpha on -transparent "#00ff00" "./images/$(basename "$bmp" .bmp).png" -# done - -# echo "-> ${cyan}Copy images to application...${color_reset}" -# cp -rf ./images ./_______.app/Contents/Resources/ - echo "-> ${cyan}Removing old OneShot apps...${color_reset}" rm -rf "$ONESHOT_PATH/OneShot.app" rm -rf "$ONESHOT_PATH/_______.app" @@ -37,8 +25,5 @@ cp -rf "./OneShot.app" "$ONESHOT_PATH" cp -rf "./_______.app" "$ONESHOT_PATH" ln -sfh "$ONESHOT_PATH/OneShot.app" "$HOME/Applications/OneShot.app" -# echo "-> ${cyan}Cleaning up...${color_reset}" -# rm ./images/*.bmp - echo "\n${green}Complete! ${white}Please report any issues to https://github.com/vinyldarkscratch/synglechance/issues${color_reset}" open "$ONESHOT_PATH" \ No newline at end of file diff --git a/journal/mac/README.md b/journal/mac/README.md deleted file mode 100644 index 417cb5b..0000000 --- a/journal/mac/README.md +++ /dev/null @@ -1,40 +0,0 @@ -OneShot Journal -=============== - -This is a Linux- and macOS-compatible reimplementation of the Author's Journal, a element in the game [OneShot](http://oneshot-game.com). - -Usage ------ - -This journal requires Python 3.x and PyQt5 to run. On macOS or Debian/Ubuntu-based systems, install via one of the following commands: - - brew install pyqt5 # macOS (Homebrew) - port install pyqt5 # macOS (MacPorts) - sudo apt-get install python3-pyqt5 # Ubuntu/Debian - -This will install PyQt5 and all necessary files. Next, extract the images from the original OneShot journal program using the instructions in the following section, then use the following command to start the journal: - - python3 journal.py - -Start OneShot and play normally. - -Building the app bundle ------------------------ - -To create the macOS app bundle, PyInstaller is required. Install via one of the following commands: - - brew install pyinstaller # macOS (Homebrew) - port install pyinstaller # macOS (MacPorts) - -*Note: If you plan to use Python 3.6, at the time of this writing, the stable release (3.2.1) of PyInstaller only supports up to Python 3.5, however the [development build](http://www.pyinstaller.org/downloads.html) implements Python 3.6 support.* - -Now that everything is installed, let's create our app bundle: - - pyinstaller journal.spec --onefile --windowed - -This should collect all the required runtime files and create the bundle in `dist/_______.app`. - -Extracting the images ---------------------- - -First, aquire a copy of the Windows-version journal executable. Next, download [ResourcesExtract](http://www.nirsoft.net/utils/resources_extract.html) and run it, either via Wine or from a Windows install. Set the filename to the journal executable and the destination to the images directory in your local copy of this repo. Set the program to extract only bitmaps, then press Start. Once extraction completes run the included Python script `renameandconvert.py` (requires ImageMagick), which will create the required PNGs. diff --git a/journal/mac/renameandconvert.py b/journal/mac/renameandconvert.py deleted file mode 100644 index 7047053..0000000 --- a/journal/mac/renameandconvert.py +++ /dev/null @@ -1,3 +0,0 @@ -import os -for filename in os.listdir('images'): - if filename[-4:] == '.bmp': os.system("convert images/{} -alpha on -transparent '#00ff00' images/{}.png".format(filename, filename.strip('_')[:-4].lower())) diff --git a/patches/mac/bin/LICENSE b/patches/mac/bin/LICENSE deleted file mode 100644 index 3dd2ad3..0000000 --- a/patches/mac/bin/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -bin/upx: https://github.com/upx/upx -The Ultimate Packer for eXecutables Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser. Licensed under GPL with exceptions. - -bin/convert: https://github.com/ImageMagick/ImageMagick -ImageMagick, Copyright 1999-2018 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available. \ No newline at end of file diff --git a/patches/mac/bin/convert b/patches/mac/bin/convert deleted file mode 100755 index 2201560..0000000 Binary files a/patches/mac/bin/convert and /dev/null differ diff --git a/patches/mac/bin/extract-bmp b/patches/mac/bin/extract-bmp deleted file mode 100755 index dd77390..0000000 Binary files a/patches/mac/bin/extract-bmp and /dev/null differ diff --git a/patches/mac/bin/upx b/patches/mac/bin/upx deleted file mode 100755 index 667e425..0000000 Binary files a/patches/mac/bin/upx and /dev/null differ