Merge pull request #967 from t0b10-r3tr0/apoc_runner

Updated 'Apoc Runner' port to aarch64, ready-to-run.

ports/apocrunner/Apoc Runner.sh

@@ -13,45 +13,33 @@ else
 fi
 
 source $controlfolder/control.txt
-export PORT_32BIT="Y"
-
-
+[ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 get_controls
 
-$ESUDO chmod 666 /dev/tty0
-$ESUDO chmod 666 /dev/tty1
-printf "\033c" > /dev/tty0
-printf "\033c" > /dev/tty1
-
+# Variables
 GAMEDIR="/$directory/ports/apocrunner"
+SPLASHFILE="splash.png"
 
-[ -f "/etc/os-release" ] && source "/etc/os-release"
-
-cd "$GAMEDIR"
+# CD and set permissions
+cd "$GAMEDIR" 
+> "$GAMEDIR/log.txt" && exec > >(tee "$GAMEDIR/log.txt") 2>&1
+$ESUDO chmod +x "$GAMEDIR/gmloadernext.aarch64"
+$ESUDO chmod +x "$GAMEDIR/tools/splash"
 
-exec > >(tee "$GAMEDIR/log.txt") 2>&1
+# Exports
+export LD_LIBRARY_PATH="$GAMEDIR/libs.${DEVICE_ARCH}:$GAMEDIR/lib:$LD_LIBRARY_PATH"
+export SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"
 
-if [ "$OS_NAME" == "JELOS" ]; then
-  export SPA_PLUGIN_DIR="/usr/lib32/spa-0.2"
-  export PIPEWIRE_MODULE_DIR="/usr/lib32/pipewire-0.3/"
+# Display loading splash -  note: Due to bug in muOS, we call twice else not displayed
+if [ "$CFW_NAME" == "muOS" ]; then
+  $ESUDO ./tools/splash $SPLASHFILE 1 
 fi
+$ESUDO ./tools/splash $SPLASHFILE 5000
 
-export GMLOADER_DEPTH_DISABLE=1
-export GMLOADER_SAVEDIR="$GAMEDIR/gamedata/"
-export LD_LIBRARY_PATH="/usr/lib:/usr/lib32:/$directory/ports/apocrunner/libs:$LD_LIBRARY_PATH"
-
-[ -f "./gamedata/data.win" ] && mv gamedata/data.win gamedata/game.droid
-[ -f "./gamedata/game.win" ] && mv gamedata/game.win gamedata/game.droid
-
-$ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "gmloader" textinput &
-echo "Loading, please wait... " > /dev/tty0
-
-$ESUDO chmod +x "$GAMEDIR/gmloader"
-
-./gmloader apocrunner.apk
+# Assign configs and load the game
+$GPTOKEYB "gmloadernext.aarch64" &
+pm_platform_helper "$GAMEDIR/gmloadernext.aarch64"
+./gmloadernext.aarch64 -c gmloader.json
 
-$ESUDO kill -9 "$(pidof gptokeyb)"
-$ESUDO systemctl restart oga_events &
-printf "\033c" >> /dev/tty1
-printf "\033c" > /dev/tty0
+# Cleanup
+pm_finish

ports/apocrunner/README.md

@@ -1,7 +1,7 @@
 
 ## Notes
 
-Thanks to https://omnitron-studios.itch.io for creating the game
+Thanks to https://omnitron-studios.itch.io for creating the game and thank you to [Justin Bohemier](https://justinbohemier.wixsite.com/portfolio/game-design) for providing the permission to include the game files with the port, making it 'Ready to Run'.
 
 ## Controls
 
@@ -10,3 +10,11 @@ Thanks to https://omnitron-studios.itch.io for creating the game
 | Select | Pause  |
 | up/A| Jump|
 | down| Slide |
+
+
+## Special Thanks
+
+* [Omnitron Studios](https://omnitron-studios.itch.io) - The game
+* [Justin Bohemier](https://justinbohemier.wixsite.com/portfolio/game-design) - The developer and provider or distribution permission
+* [JohnnyOnFlame](https://portmaster.games/profile.html?porter=Johnny%20on%20Flame), PortMaster Team - GMLoader
+* [mattyj513](https://portmaster.games/profile.html?porter=mattyj513) - Creator of the original version of this port

ports/apocrunner/apocrunner/gmloader.json

@@ -0,0 +1,7 @@
+{
+    "save_dir" : "savedata",
+    "apk_path" : "apocrunner.port",
+    "show_cursor" : false,
+    "disable_controller" : false,
+    "force_platform" : "os_windows"
+}