diff --git a/ports/pixeldescent/Pixel Descent.sh b/ports/pixeldescent/Pixel Descent.sh index 9e14650b47..18a641035e 100644 --- a/ports/pixeldescent/Pixel Descent.sh +++ b/ports/pixeldescent/Pixel Descent.sh @@ -26,31 +26,36 @@ $ESUDO chmod +x $GAMEDIR/gmloadernext.aarch64 $ESUDO chmod +x $GAMEDIR/tools/splash # Exports -export LD_LIBRARY_PATH="/usr/lib:$GAMEDIR/lib:$GAMEDIR/libs.aarch64:$LD_LIBRARY_PATH" -export SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig" - -# Pack audiogroups into apk -if [ -n "$(ls ./gamedata/*.dat 2>/dev/null)" ]; then - mkdir -p ./assets - mv ./gamedata/*.dat ./assets/ 2>/dev/null - pm_message "Moving .dat files from ./gamedata to ./assets/" - zip -r -0 ./voidbreach.port ./assets/ - pm_message "Zipping contents to ./voidbreach.port" - rm -Rf ./assets/ - pm_message "Packing audiogroups complete" +export LD_LIBRARY_PATH="/usr/lib:$GAMEDIR/lib:$LD_LIBRARY_PATH" + +# Zip data if necessary +zip_archive() { + if [ -f "assets/data.win" ]; then + mv "assets/data.win" "assets/game.droid" + else + pm_message "No assets in assets dir!" + sleep 2 + exit 1 + fi + rm -rf assets/*.exe assets/*.dll assets/.gitkeep + echo "Removed unnecessary files" + zip -r -0 pixeldescent.port ./assets/ + mkdir -p saves + rm -rf assets +} + +if [ -d assets ]; then + zip_archive fi -# Prepare files -[ -f "./gamedata/data.win" ] && mv gamedata/data.win gamedata/game.droid -[ -f "./gamedata/*.exe" ] && rm -f ./gamedata/*.exe - # Display loading splash -$ESUDO ./tools/splash "splash.png" 2000 & +[ "$CFW_NAME" == "muOS" ] && $ESUDO ./tools/splash "splash.png" 1 +$ESUDO ./tools/splash "splash.png" 5000 & -# Assign configs and load the game +# Assign gptokeyb and load the game $GPTOKEYB "gmloadernext.aarch64" -c "pixeldescent.gptk" & -pm_platform_helper "$GAMEDIR/gmloadernext.aarch64" +pm_platform_helper "$GAMEDIR/gmloadernext.aarch64" >/dev/null ./gmloadernext.aarch64 -c gmloader.json -# Cleanup +# Kill processes pm_finish diff --git a/ports/pixeldescent/cover.png b/ports/pixeldescent/cover.png new file mode 100644 index 0000000000..8ba08c945a Binary files /dev/null and b/ports/pixeldescent/cover.png differ diff --git a/ports/pixeldescent/gameinfo.xml b/ports/pixeldescent/gameinfo.xml index 2372db401e..c4766d865b 100644 --- a/ports/pixeldescent/gameinfo.xml +++ b/ports/pixeldescent/gameinfo.xml @@ -8,6 +8,6 @@ JC Bailey Moonskull Games Roguelike - ./pixeldescent/screenshot.png + ./pixeldescent/cover.png diff --git a/ports/pixeldescent/pixeldescent/gamedata/place game files here b/ports/pixeldescent/pixeldescent/assets/.gitkeep similarity index 100% rename from ports/pixeldescent/pixeldescent/gamedata/place game files here rename to ports/pixeldescent/pixeldescent/assets/.gitkeep diff --git a/ports/pixeldescent/pixeldescent/gmloader.json b/ports/pixeldescent/pixeldescent/gmloader.json index 69a08c54ae..80f5298ff7 100644 --- a/ports/pixeldescent/pixeldescent/gmloader.json +++ b/ports/pixeldescent/pixeldescent/gmloader.json @@ -1,7 +1,8 @@ { - "save_dir" : "gamedata", - "apk_path" : "pixeldescent.port", - "show_cursor" : false, - "disable_controller" : false, - "force_platform" : "os_windows" -} + "save_dir" : "saves", + "apk_path" : "pixeldescent.port", + "show_cursor" : false, + "disable_controller" : false, + "disable_depth" : false, + "force_platform" : "os_windows" +} \ No newline at end of file diff --git a/ports/pixeldescent/pixeldescent/gmloadernext.aarch64 b/ports/pixeldescent/pixeldescent/gmloadernext.aarch64 index 5742f8d7b9..97cad5b7db 100644 Binary files a/ports/pixeldescent/pixeldescent/gmloadernext.aarch64 and b/ports/pixeldescent/pixeldescent/gmloadernext.aarch64 differ diff --git a/ports/pixeldescent/pixeldescent/libs.aarch64/libcrypto.so.1.1 b/ports/pixeldescent/pixeldescent/lib/libcrypto.so.1.1 similarity index 100% rename from ports/pixeldescent/pixeldescent/libs.aarch64/libcrypto.so.1.1 rename to ports/pixeldescent/pixeldescent/lib/libcrypto.so.1.1 diff --git a/ports/pixeldescent/pixeldescent/libs.aarch64/libopenal.so.1 b/ports/pixeldescent/pixeldescent/lib/libopenal.so.1 similarity index 100% rename from ports/pixeldescent/pixeldescent/libs.aarch64/libopenal.so.1 rename to ports/pixeldescent/pixeldescent/lib/libopenal.so.1 diff --git a/ports/pixeldescent/pixeldescent/libs.aarch64/libzip.so.5 b/ports/pixeldescent/pixeldescent/lib/libzip.so.4 similarity index 100% rename from ports/pixeldescent/pixeldescent/libs.aarch64/libzip.so.5 rename to ports/pixeldescent/pixeldescent/lib/libzip.so.4 diff --git a/ports/pixeldescent/pixeldescent/licence/LICENSE.gmloader.txt b/ports/pixeldescent/pixeldescent/license/LICENSE.gmloader.txt similarity index 100% rename from ports/pixeldescent/pixeldescent/licence/LICENSE.gmloader.txt rename to ports/pixeldescent/pixeldescent/license/LICENSE.gmloader.txt diff --git a/ports/pixeldescent/pixeldescent/licence/LICENSE.libcrypto.txt b/ports/pixeldescent/pixeldescent/license/LICENSE.libcrypto.txt similarity index 100% rename from ports/pixeldescent/pixeldescent/licence/LICENSE.libcrypto.txt rename to ports/pixeldescent/pixeldescent/license/LICENSE.libcrypto.txt diff --git a/ports/pixeldescent/pixeldescent/licence/LICENSE.libopenal.txt b/ports/pixeldescent/pixeldescent/license/LICENSE.libopenal.txt similarity index 99% rename from ports/pixeldescent/pixeldescent/licence/LICENSE.libopenal.txt rename to ports/pixeldescent/pixeldescent/license/LICENSE.libopenal.txt index 10cd77205b..d99858a286 100644 --- a/ports/pixeldescent/pixeldescent/licence/LICENSE.libopenal.txt +++ b/ports/pixeldescent/pixeldescent/license/LICENSE.libopenal.txt @@ -1,9 +1,9 @@ -MIT - -Copyright 2018 Andre von Houck - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +MIT + +Copyright 2018 Andre von Houck + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/ports/pixeldescent/pixeldescent/licence/LICENSE.libzip.txt b/ports/pixeldescent/pixeldescent/license/LICENSE.libzip.txt similarity index 98% rename from ports/pixeldescent/pixeldescent/licence/LICENSE.libzip.txt rename to ports/pixeldescent/pixeldescent/license/LICENSE.libzip.txt index d5c637c767..3f4f4213b9 100644 --- a/ports/pixeldescent/pixeldescent/licence/LICENSE.libzip.txt +++ b/ports/pixeldescent/pixeldescent/license/LICENSE.libzip.txt @@ -1,18 +1,18 @@ -LICENSE - -libzip is released under a 3-clause BSD license: - -Copyright (C) 1999-2022 Dieter Baron and Thomas Klausner - -The authors can be contacted at info@libzip.org - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - - The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS’’ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +LICENSE + +libzip is released under a 3-clause BSD license: + +Copyright (C) 1999-2022 Dieter Baron and Thomas Klausner + +The authors can be contacted at info@libzip.org + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + + The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS’’ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/ports/pixeldescent/pixeldescent/pixeldescent.port b/ports/pixeldescent/pixeldescent/pixeldescent.port index f87fb22466..979cd9ce03 100644 Binary files a/ports/pixeldescent/pixeldescent/pixeldescent.port and b/ports/pixeldescent/pixeldescent/pixeldescent.port differ diff --git a/ports/pixeldescent/pixeldescent/splash.png b/ports/pixeldescent/pixeldescent/splash.png index fc3ce6b207..8a43f0afff 100644 Binary files a/ports/pixeldescent/pixeldescent/splash.png and b/ports/pixeldescent/pixeldescent/splash.png differ