From 470e63678bc79db6ae13e1940022d03f1a9ecd2f Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 9 Mar 2021 07:04:51 +0000 Subject: [PATCH] OpenDingux/RetroFW Hellfire support --- Packaging/OpenDingux/diablo.ini | 3 --- Packaging/OpenDingux/gkd350h-hellfire.desktop | 11 +++++++++++ Packaging/OpenDingux/gkd350h-manual.txt | 5 +++-- Packaging/OpenDingux/gkd350h.desktop | 2 +- Packaging/OpenDingux/package-opk.sh | 6 ++++-- Packaging/OpenDingux/retrofw-hellfire.desktop | 12 ++++++++++++ Packaging/OpenDingux/retrofw-manual.txt | 5 ++++- Packaging/OpenDingux/retrofw.desktop | 2 +- Packaging/OpenDingux/rg350-hellfire.desktop | 12 ++++++++++++ Packaging/OpenDingux/rg350-manual.txt | 5 +++-- Packaging/OpenDingux/rg350.desktop | 2 +- 11 files changed, 52 insertions(+), 13 deletions(-) delete mode 100644 Packaging/OpenDingux/diablo.ini create mode 100644 Packaging/OpenDingux/gkd350h-hellfire.desktop create mode 100644 Packaging/OpenDingux/retrofw-hellfire.desktop create mode 100644 Packaging/OpenDingux/rg350-hellfire.desktop diff --git a/Packaging/OpenDingux/diablo.ini b/Packaging/OpenDingux/diablo.ini deleted file mode 100644 index 1c89f0ce9..000000000 --- a/Packaging/OpenDingux/diablo.ini +++ /dev/null @@ -1,3 +0,0 @@ -[devilutionx] -upscale=0 -fullscreen=0 diff --git a/Packaging/OpenDingux/gkd350h-hellfire.desktop b/Packaging/OpenDingux/gkd350h-hellfire.desktop new file mode 100644 index 000000000..9af3e1ab5 --- /dev/null +++ b/Packaging/OpenDingux/gkd350h-hellfire.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=DevilutionX Hellfire +Comment=Diablo 1: Hellfire for GKD350h +Exec=devilutionx +Terminal=false +Type=Application +StartupNotify=true +Icon=hellfire_32 +Categories=games; +X-OD-Manual=readme.gcw0.txt +X-OD-NeedsDownscaling=true diff --git a/Packaging/OpenDingux/gkd350h-manual.txt b/Packaging/OpenDingux/gkd350h-manual.txt index ce9c72771..77c4e6b10 100644 --- a/Packaging/OpenDingux/gkd350h-manual.txt +++ b/Packaging/OpenDingux/gkd350h-manual.txt @@ -1,7 +1,8 @@ Copy diabdat.mpq from your CD (or GoG install folder) to: -/usr/local/home/.local/share/diasurgical/devilution/diabdat.mpq +/usr/local/home/.local/share/diasurgical/devilution/ -diabdat.mpq filename must be lowercase. +For Hellfire, also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, and hfvoice.mpq. +All mpq filenames must be lowercase. Game saves and diablo.ini are located at: /usr/local/home/.local/share/diasurgical/devilution/ diff --git a/Packaging/OpenDingux/gkd350h.desktop b/Packaging/OpenDingux/gkd350h.desktop index ec8ce43c1..d38e6e305 100644 --- a/Packaging/OpenDingux/gkd350h.desktop +++ b/Packaging/OpenDingux/gkd350h.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=DevilutionX Comment=Diablo 1 for GKD350h -Exec=devilutionx +Exec=devilutionx --diablo Terminal=false Type=Application StartupNotify=true diff --git a/Packaging/OpenDingux/package-opk.sh b/Packaging/OpenDingux/package-opk.sh index 31701a80f..120255bae 100755 --- a/Packaging/OpenDingux/package-opk.sh +++ b/Packaging/OpenDingux/package-opk.sh @@ -12,10 +12,12 @@ package_opk() { rm -rf "$tmp" mkdir -p "$tmp" cp "Packaging/OpenDingux/${TARGET}.desktop" "${tmp}/default.${ext}.desktop" + cp "Packaging/OpenDingux/${TARGET}-hellfire.desktop" "${tmp}/hellfire.${ext}.desktop" cp "Packaging/OpenDingux/${TARGET}-manual.txt" "${tmp}/readme.${ext}.txt" mksquashfs "${BUILD_DIR}/devilutionx" \ - "${tmp}/default.${ext}.desktop" "${tmp}/readme.${ext}.txt" \ - Packaging/resources/icon_32.png Packaging/resources/CharisSILB.ttf \ + "${tmp}/default.${ext}.desktop" "${tmp}/hellfire.${ext}.desktop" \ + "${tmp}/readme.${ext}.txt" Packaging/resources/icon_32.png \ + Packaging/resources/hellfire_32.png Packaging/resources/CharisSILB.ttf \ "${BUILD_DIR}/devilutionx-${TARGET}.opk" \ -all-root -no-xattrs -noappend -no-exports -no-progress } diff --git a/Packaging/OpenDingux/retrofw-hellfire.desktop b/Packaging/OpenDingux/retrofw-hellfire.desktop new file mode 100644 index 000000000..2c61e056d --- /dev/null +++ b/Packaging/OpenDingux/retrofw-hellfire.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=DevilutionX Hellfire +Comment=Diablo 1: Hellfire for RetroFW +Exec=devilutionx +Terminal=false +Type=Application +StartupNotify=true +Icon=hellfire_32 +Categories=games; +X-OD-Manual=readme.retrofw.txt +X-OD-NeedsDownscaling=true +X-OD-NeedsJoystick=true diff --git a/Packaging/OpenDingux/retrofw-manual.txt b/Packaging/OpenDingux/retrofw-manual.txt index 862ff9bd6..3666342ed 100644 --- a/Packaging/OpenDingux/retrofw-manual.txt +++ b/Packaging/OpenDingux/retrofw-manual.txt @@ -1,5 +1,8 @@ Copy diabdat.mpq from your CD (or GoG install folder) to: -~/.local/share/diasurgical/diabdat.mpq +~/.local/share/diasurgical/ + +For Hellfire, also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, and hfvoice.mpq. +All mpq filenames must be lowercase. Game saves and diablo.ini are located at: ~/.local/share/diasurgical/devilution diff --git a/Packaging/OpenDingux/retrofw.desktop b/Packaging/OpenDingux/retrofw.desktop index 84c92ae56..0bb0c3711 100644 --- a/Packaging/OpenDingux/retrofw.desktop +++ b/Packaging/OpenDingux/retrofw.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=DevilutionX Comment=Diablo 1 for RetroFW -Exec=devilutionx +Exec=devilutionx --diablo Terminal=false Type=Application StartupNotify=true diff --git a/Packaging/OpenDingux/rg350-hellfire.desktop b/Packaging/OpenDingux/rg350-hellfire.desktop new file mode 100644 index 000000000..2846c103b --- /dev/null +++ b/Packaging/OpenDingux/rg350-hellfire.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=DevilutionX Hellfire +Comment=Diablo 1: Hellfire for RG350 +Exec=devilutionx +Terminal=false +Type=Application +StartupNotify=true +Icon=hellfire_32 +Categories=games; +X-OD-Manual=readme.gcw0.txt +X-OD-NeedsDownscaling=true +X-OD-NeedsJoystick=true diff --git a/Packaging/OpenDingux/rg350-manual.txt b/Packaging/OpenDingux/rg350-manual.txt index eef971c37..ca58c748f 100644 --- a/Packaging/OpenDingux/rg350-manual.txt +++ b/Packaging/OpenDingux/rg350-manual.txt @@ -1,7 +1,8 @@ Copy diabdat.mpq from your CD (or GoG install folder) to: -/media/home/.local/share/diasurgical/devilution/diabdat.mpq +/media/home/.local/share/diasurgical/devilution/ -diabdat.mpq filename must be lowercase. +For Hellfire, also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, and hfvoice.mpq. +All mpq filenames must be lowercase. Game saves and diablo.ini are located at: /media/home/.local/share/diasurgical/devilution/ diff --git a/Packaging/OpenDingux/rg350.desktop b/Packaging/OpenDingux/rg350.desktop index 26f4b82fa..bd843165c 100644 --- a/Packaging/OpenDingux/rg350.desktop +++ b/Packaging/OpenDingux/rg350.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=DevilutionX Comment=Diablo 1 for RG350 -Exec=devilutionx +Exec=devilutionx --diablo Terminal=false Type=Application StartupNotify=true