From 772c9b1f99c81d10a5aebc18eb33f98ab26c71c3 Mon Sep 17 00:00:00 2001 From: Magus Date: Mon, 20 Jul 2020 01:58:03 +0700 Subject: [PATCH] preserve sfall scripts, ref https://github.com/BGforgeNet/Fallout2_Restoration_Project/issues/59 --- extra/publish/sfall.sh | 12 +++++++++++- release/upu-install.bat | 7 +++++++ release/upu-install.sh | 11 +++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/extra/publish/sfall.sh b/extra/publish/sfall.sh index c7db520ac..c0d4f21b3 100755 --- a/extra/publish/sfall.sh +++ b/extra/publish/sfall.sh @@ -9,7 +9,17 @@ sfall_url="https://sourceforge.net/projects/sfall/files/sfall/sfall_$sfall_versi cd "$release_dir" wget -nv "$sfall_url" -O sfall.7z -7zr x sfall.7z +files=" +ddraw.dll +ddraw.ini +sfall.dat +sfall-mods.ini +translations +" +for f in $files; do + 7zr x sfall.7z "$f" +done +7zr e sfall.7z data/scripts rm -f sfall.7z # uncomment ini settings to preserve options' placement in ddraw.ini diff --git a/release/upu-install.bat b/release/upu-install.bat index f5726ed2e..62bf89205 100644 --- a/release/upu-install.bat +++ b/release/upu-install.bat @@ -1,4 +1,5 @@ set "bdir=backup\upu" +set "scripts_dir=data\scripts" if not exist %bdir% mkdir %bdir% @@ -14,6 +15,12 @@ move /y %bdir%\data\*.txt data\ move /y %bdir%\data\*.gcd data\ move /y %bdir%\data\sound\music data\sound\ +:: sfall scripts +mkdir %scripts_dir% +move /y gl_ammomod.int %scripts_dir%\ +move /y gl_highlighting.int %scripts_dir%\ +move /y gl_partycontrol.int %scripts_dir%\ + :: sound path fix initool.exe s fallout2.cfg sound music_path1 data\sound\music\ > tmp.cfg initool.exe s tmp.cfg sound music_path2 sound\music\ > tmp2.cfg diff --git a/release/upu-install.sh b/release/upu-install.sh index a9eccd039..6622009ca 100755 --- a/release/upu-install.sh +++ b/release/upu-install.sh @@ -30,6 +30,17 @@ for i in $(ls data/sound | grep -vi "^music$"); do mv data/sound/"$i" "$bdir"/data/sound/ done +# sfall mods +mkdir -p data/scripts +scripts=" +gl_ammomod.int +gl_highlighting.int +gl_partycontrol.int +" +for f in $scripts; do + mv "$f" data/scripts/ +done + # sound path fix rm -f camlrt.dll initool.exe cp fallout2.cfg "$bdir"/