diff --git a/.scripts/FreeDoom.sh b/.scripts/FreeDoom.sh index 8d21956..89b18e9 100755 --- a/.scripts/FreeDoom.sh +++ b/.scripts/FreeDoom.sh @@ -84,7 +84,7 @@ case ${buttonCode} in dialog --backtitle "Co-op" --clear --msgbox "No ip address or URL given." -1 -1 --stdout exit 1 fi - flags=('-join' "${ipAddress}") + flags=("${doomPath}/SiC_v1_01.pk3" '-join' "${ipAddress}") else # Get ip address yourIpAddress="$(curl -4s https://icanhazip.com)" @@ -101,11 +101,17 @@ case ${buttonCode} in --rangebox "Select difficulty. 1 easiest, 5 hardest." -1 -1 1 5 3 --stdout)" [[ $? -eq 1 ]] && exit 0 flags=( + "${doomPath}/SiC_v1_01.pk3" '-host' "${players}" '-skill' "${skillLevel}" '+set' 'sv_cheats' '1' '+set' 'sv_weaponsstay' '1' '+set' 'sv_respawnprotect' '1' + '+set' 'sv_itemrespawn' '1' + '+set' 'sv_respawnsuper' '1' + '+set' 'sv_SiC_AlwaysWeaponShare' '1' + '+set' 'sv_SiC_ShareKeys' '1' + '+set' 'alwaysapplydmflags' ''1 '-extratic' '-dup' '3' ) fi diff --git a/linux-game-manager.sh b/linux-game-manager.sh index 7d0c77d..a787116 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -81,7 +81,7 @@ check_architecture() { check_dependencies() { local dependencies for i in "${@}"; do - if [[ "$i" =~ ^python ]]; then + if [[ "$i" =~ ^python- ]]; then if ! python3 -c "import ${i#*:}" &> /dev/null ; then dependencies+=("${i%:*}") fi @@ -652,12 +652,14 @@ case "${game}" in fi doomPath="$(find /usr/share -type d -name "doom" 2> /dev/null | head -1)" get_installer "OperationMDK.zip" "https://www.dropbox.com/scl/fi/bac94s01bl31p6e73pbof/OperationMDK.zip?rlkey=6ufdqgyacakqz6ulr2cue6rtm&dl=0" + get_installer "SiC_v1_01.pk3" "https://forum.zdoom.org/download/file.php?id=36045" download "https://www.dropbox.com/s/uf01fx3vydua6zx/TobyAccessibilityMod_Version${tobyVersion}.zip?dl=0" echo "The next step may require your password." echo "It is necessary to places the extracted files in their proper place." alert sudo unzip -d "${doomPath}" "${cache}/TobyAccessibilityMod_Version${tobyVersion}.zip" sudo unzip -d "${doomPath}" "${cache}/OperationMDK.zip" + sudo cp -v "${cache}/SiC_v1_01.pk3" "${doomPath}" sudo rm -fv "${doomPath}/"*.lnk mkdir -p "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom" cp "${doomPath}/gzdoom.ini" "${XDG_CONFIG_HOME:-$HOME/.config}/gzdoom/" @@ -773,14 +775,15 @@ case "${game}" in add_launcher "${installPath}/slaythetext/main.py" ;; "SoundRTS") - check_dependencies pip3 + check_dependencies python3 mkdir -p "${installPath}" git -C "${installPath}" clone "https://github.com/soundmud/soundrts.git" - git -C "${installPath}/soundrts" checkout v1.3.6 + git -C "${installPath}/soundrts" checkout v1.3.7 sed -i 's;git+https://github.com/soundmud/accessible_output2;accessible_output2;' "${installPath}/soundrts/requirements.txt" - pip3 install --user -r "${installPath}/soundrts/requirements.txt" + python3 -m venv --system-site-packages "${installPath}/soundrts/.venv" + "${installPath}/soundrts/.venv/bin/"pip3 install -r "${installPath}/soundrts/requirements.txt" chmod +x "${installPath}/soundrts/soundrts.py" - sed -i '1c\#!/usr/bin/env python3' "${installPath}/soundrts/soundrts.py" + sed -i '1c\#!'"${installPath}/soundrts/.venv/bin/python3" "${installPath}/soundrts/soundrts.py" add_launcher "${installPath}/soundrts/soundrts.py" ;; "soundStrider")