Merge remote-tracking branch 'upstream/main' into megaball

ports/alephone-marathon/Marathon.sh

@@ -13,7 +13,6 @@ else
 fi
 
 source $controlfolder/control.txt
-source $controlfolder/device_info.txt
 [ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 
 get_controls
@@ -23,8 +22,7 @@ GAMEDIR="/$directory/ports/alephone-marathon"
 
 cd $GAMEDIR
 
-$ESUDO rm -rf ~/.alephone
-$ESUDO ln -s $GAMEDIR/conf/.alephone ~/
+bind_directories ~/.alephone $GAMEDIR/conf/.alephone
 
 export DEVICE_ARCH="${DEVICE_ARCH:-aarch64}"
 
@@ -39,9 +37,10 @@ export SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"
 
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
+
 $GPTOKEYB "alephone" &
 ./alephone $GAMEDIR"/gamedata/Marathon"
 
 $ESUDO kill -9 $(pidof gptokeyb)
 $ESUDO systemctl restart oga_events &
-printf "\033c" >> /dev/tty1
+printf "\033c" >> /dev/tty1

ports/alephone-marathon2/Marathon 2.sh

@@ -13,7 +13,6 @@ else
 fi
 
 source $controlfolder/control.txt
-source $controlfolder/device_info.txt
 [ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 
 get_controls
@@ -23,8 +22,7 @@ GAMEDIR="/$directory/ports/alephone-marathon2"
 
 cd $GAMEDIR
 
-$ESUDO rm -rf ~/.alephone
-$ESUDO ln -s $GAMEDIR/conf/.alephone ~/
+bind_directories ~/.alephone $GAMEDIR/conf/.alephone
 
 export DEVICE_ARCH="${DEVICE_ARCH:-aarch64}"
 
@@ -47,3 +45,4 @@ $ESUDO kill -9 $(pidof gptokeyb)
 $ESUDO systemctl restart oga_events &
 printf "\033c" >> /dev/tty1
 
+

ports/alephone-marathoninfinity/Marathon Infinity.sh

@@ -13,7 +13,6 @@ else
 fi
 
 source $controlfolder/control.txt
-source $controlfolder/device_info.txt
 [ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 
 get_controls
@@ -23,8 +22,7 @@ GAMEDIR="/$directory/ports/alephone-marathoninfinity"
 
 cd $GAMEDIR
 
-$ESUDO rm -rf ~/.alephone
-$ESUDO ln -s $GAMEDIR/conf/.alephone ~/
+bind_directories ~/.alephone $GAMEDIR/conf/.alephone
 
 export DEVICE_ARCH="${DEVICE_ARCH:-aarch64}"
 
@@ -45,4 +43,4 @@ $GPTOKEYB "alephone" &
 
 $ESUDO kill -9 $(pidof gptokeyb)
 $ESUDO systemctl restart oga_events &
-printf "\033c" >> /dev/tty1
+printf "\033c" >> /dev/tty1

ports/axiom.verge/Axiom Verge.sh

@@ -14,7 +14,7 @@ fi
 
 source $controlfolder/control.txt
 source $controlfolder/tasksetter
-
+[ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 get_controls
 
 GAMEDIR="/$directory/ports/axiom-verge"
@@ -32,9 +32,7 @@ $ESUDO umount "$monofile" || true
 $ESUDO mount "$monofile" "$monodir"
 
 # Setup savedir
-$ESUDO rm -rf ~/.local/share/AxiomVerge
-mkdir -p ~/.local/share
-ln -sfv "$GAMEDIR/savedata" ~/.local/share/AxiomVerge
+bind_directories ~/.local/share/AxiomVerge "$GAMEDIR/savedata"
 
 # Remove all the dependencies in favour of system libs - e.g. the included 
 # newer version of FNA with patcher included
@@ -68,3 +66,4 @@ unset LD_LIBRARY_PATH
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
 
+

ports/brotato/Brotato.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share}
+
+if [ -d "/opt/system/Tools/PortMaster/" ]; then
+  controlfolder="/opt/system/Tools/PortMaster"
+elif [ -d "/opt/tools/PortMaster/" ]; then
+  controlfolder="/opt/tools/PortMaster"
+elif [ -d "$XDG_DATA_HOME/PortMaster/" ]; then
+  controlfolder="$XDG_DATA_HOME/PortMaster"
+else
+  controlfolder="/roms/ports/PortMaster"
+fi
+
+source $controlfolder/control.txt
+
+[ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
+
+get_controls
+
+GAMEDIR=/$directory/ports/brotato/
+CONFDIR="$GAMEDIR/conf/"
+
+# Ensure the conf directory exists
+mkdir -p "$GAMEDIR/conf"
+
+# Set the XDG environment variables for config & savefiles
+export XDG_CONFIG_HOME="$CONFDIR"
+export XDG_DATA_HOME="$CONFDIR"
+export SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"
+
+cd $GAMEDIR
+> "$GAMEDIR/log.txt" && exec > >(tee "$GAMEDIR/log.txt") 2>&1
+
+runtime="frt_3.5.2"
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    pm_message "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info."
+    sleep 5
+    exit 1
+  fi
+
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Godot
+godot_dir="$HOME/godot"
+godot_file="$controlfolder/libs/${runtime}.squashfs"
+$ESUDO mkdir -p "$godot_dir"
+$ESUDO umount "$godot_file" || true
+$ESUDO mount "$godot_file" "$godot_dir"
+PATH="$godot_dir:$PATH"
+
+export FRT_NO_EXIT_SHORTCUTS=FRT_NO_EXIT_SHORTCUTS
+
+[ -f "./gamedata/Brotato.pck" ] && mv gamedata/Brotato.pck gamedata/brotato.pck
+
+$GPTOKEYB "$runtime" -c "./brotato.gptk" &
+pm_platform_helper "$godot_dir/$runtime"
+"$runtime" $GODOT_OPTS --main-pack "gamedata/brotato.pck"
+
+$ESUDO umount "$godot_dir"
+pm_finish

ports/brotato/README.md

@@ -0,0 +1,14 @@
+## Notes
+
+Thanks to [Blobfish Games](https://www.blobfish.dev/) for making this wonderful roguelite.
+
+The DLC from Steam are not compatible with the Epic version of the game that is used in this port.
+Brotato wont run good on anything lower than a rk3588
+
+## Controls
+
+| Button | Action |
+|--|--| 
+|DPad/Lstick|Movement|
+
+

ports/brotato/brotato/brotato.gptk

@@ -0,0 +1,15 @@
+start = escape
+guide = enter
+
+a = enter
+b = enter
+
+up = up
+down = down
+left = left
+right = right
+
+left_analog_up = up
+left_analog_down = down
+left_analog_left = left
+left_analog_right = right

ports/brotato/gameinfo.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gameList>
+  <game>
+    <path>./Brotato.sh</path>
+    <name>Brotato</name>
+    <desc>Brotato is a top-down arena shooter roguelite where you play as a potato wielding up to six weapons to fend off alien hordes. Customize traits and items to survive until help arrives.</desc>
+    <releasedate>20230723T000000</releasedate>
+    <developer>Blobfish Games</developer>
+    <genre>Rougelite/Shooter</genre>
+    <image>./brotato/cover.png</image>
+  </game>
+</gameList>

ports/brotato/port.json

@@ -0,0 +1,31 @@
+{
+  "version": 3,
+  "name": "brotato.zip",
+  "items": [
+    "Brotato.sh",
+    "brotato"
+  ],
+  "items_opt": [],
+  "attr": {
+    "title": "Brotato",
+    "porter": [
+      "Damian2809"
+    ],
+    "desc": "Brotato is a top-down arena shooter roguelite where you play as a potato wielding up to six weapons to fend off alien hordes. Customize traits and items to survive until help arrives.",
+    "desc_md": null,
+    "inst": "Buy and download the game of Epic https://store.epicgames.com/en-US/p/brotato-ed4097\nCopy the brotato.pck to brotato/gamedata folder",
+    "inst_md": null,
+    "genres": [
+      "action"
+    ],
+    "image": null,
+    "rtr": false,
+    "exp": false,
+    "runtime": "frt_3.5.2.squashfs",
+    "reqs": [
+      "ultra"
+    ],
+    "arch": [],
+    "min_glibc": ""
+  }
+}

ports/chasm/Chasm.sh

@@ -14,7 +14,7 @@ fi
 
 source $controlfolder/control.txt
 source $controlfolder/tasksetter
-
+[ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
 get_controls
 
 gameassembly="Chasm.exe"
@@ -34,8 +34,7 @@ $ESUDO umount "$monofile" || true
 $ESUDO mount "$monofile" "$monodir"
 
 # Setup savedir
-$ESUDO rm -rf ~/.local/share/Chasm
-ln -sfv "$gamedir/savedata" ~/.local/share/Chasm
+bind_directories ~/.local/share/Chasm "$gamedir/savedata"
 
 # Remove all the dependencies in favour of system libs - e.g. the included 
 # newer version of FNA with patcher included
@@ -60,3 +59,4 @@ $ESUDO umount "$monodir"
 # Disable console
 printf "\033c" >> /dev/tty1
 
+

ports/darkcrypt/Dark Crypt.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share}
+
+if [ -d "/opt/system/Tools/PortMaster/" ]; then
+  controlfolder="/opt/system/Tools/PortMaster"
+elif [ -d "/opt/tools/PortMaster/" ]; then
+  controlfolder="/opt/tools/PortMaster"
+elif [ -d "$XDG_DATA_HOME/PortMaster/" ]; then
+  controlfolder="$XDG_DATA_HOME/PortMaster"
+else
+  controlfolder="/roms/ports/PortMaster"
+fi
+
+source $controlfolder/control.txt
+
+[ -f "${controlfolder}/mod_${CFW_NAME}.txt" ] && source "${controlfolder}/mod_${CFW_NAME}.txt"
+
+get_controls
+
+GAMEDIR=/$directory/ports/darkcrypt/
+CONFDIR="$GAMEDIR/conf/"
+
+> "$GAMEDIR/log.txt" && exec > >(tee "$GAMEDIR/log.txt") 2>&1
+# Ensure the conf directory exists
+mkdir -p "$GAMEDIR/conf"
+
+# Set the XDG environment variables for config & savefiles
+export XDG_DATA_HOME="$CONFDIR"
+export SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"
+
+cd $GAMEDIR
+
+runtime="frt_3.5.2"
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    pm_message "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info."
+    sleep 5
+    exit 1
+  fi
+
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Godot
+godot_dir="$HOME/godot"
+godot_file="$controlfolder/libs/${runtime}.squashfs"
+$ESUDO mkdir -p "$godot_dir"
+$ESUDO umount "$godot_file" || true
+$ESUDO mount "$godot_file" "$godot_dir"
+PATH="$godot_dir:$PATH"
+
+export FRT_NO_EXIT_SHORTCUTS=FRT_NO_EXIT_SHORTCUTS
+
+$GPTOKEYB "$runtime" -c "darkcrypt.gptk" &
+pm_platform_helper "$godot_dir/$runtime"
+"$runtime" $GODOT_OPTS --main-pack "gamedata/DarkCrypt.pck"
+
+
+if [[ "$PM_CAN_MOUNT" != "N" ]]; then
+    $ESUDO umount "$godot_dir"
+fi
+pm_finish

ports/darkcrypt/README.md

@@ -0,0 +1,18 @@
+## Notes
+
+Thanks to Daisy Games for developing this game, check it on [Steam](https://store.steampowered.com/app/1706170/Dark_Crypt/) or [Itch.io](https://daisy-games.itch.io/dark-crypt)
+
+## Controls
+
+| Button | Action |
+|--|--| 
+|DPAD / LSTICK|Movement|
+|A|Confirm|
+|B|Undo|
+|X|Teleport|
+|Y|Restart|
+|Start|Pause|
+|R1|Journal|
+|R2|Tutorial|
+
+

ports/darkcrypt/darkcrypt/darkcrypt.gptk

@@ -0,0 +1,27 @@
+back = \"
+start = esc
+
+a = enter
+b = y
+x = space
+y = r
+
+r1 = j
+l1 = \"
+r2 = t
+l2 = \"
+
+
+up = up
+down = down
+left = left
+right = right
+left_analog_up = up
+left_analog_down = down
+left_analog_left = left
+left_analog_right = right
+
+right_analog_up = \"
+right_analog_down = \"
+right_analog_left = \"
+right_analog_right = \"