Changed more RPU components to optional

phobos2077 · Oct 18, 2023 · 1342190 · 1342190
1 parent 6b5aae8
commit 1342190
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/extra/inno/components_ammo.iss b/extra/inno/components_ammo.iss
@@ -1,5 +1,4 @@
 Name: "ammo"; Description: "Ammo damage formula"; Types: "custom";
 Name: "ammo\default"; Description: "Default"; Flags: exclusive disablenouninstallwarning;
 Name: "ammo\glovz"; Description: "Glovz's"; Flags: exclusive disablenouninstallwarning;
-Name: "ammo\glovz_mult"; Description: "Glovz's with damage multiplier tweak"; Flags: exclusive disablenouninstallwarning;
 Name: "ammo\yaam"; Description: "YAAM"; Flags: exclusive disablenouninstallwarning;
diff --git a/extra/inno/ini_ammo.iss b/extra/inno/ini_ammo.iss
@@ -1,4 +1,3 @@
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "DamageFormula"; String: "0"; Components: ammo\default;
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "DamageFormula"; String: "1"; Components: ammo\glovz;
-FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "DamageFormula"; String: "2"; Components: ammo\glovz_mult;
 FileName: "{app}\ddraw.ini"; Section: "Misc"; Key: "DamageFormula"; String: "5"; Components: ammo\yaam;
diff --git a/extra/inno/inno.iss b/extra/inno/inno.iss
@@ -30,6 +30,13 @@ AlwaysShowDirOnReadyPage=yes
 [Files]
 Source: "release\*.*"; DestDir: "{app}"; Components: core; Flags: ignoreversion recursesubdirs overwritereadonly
 #include "files_translations.iss"
+Source: "optional\rpu_enhanced_worldmap.dat"; DestDir: "{#mods_dir}"; Components: worldmap; Flags: ignoreversion overwritereadonly
+Source: "optional\rpu_rifle_animations.dat"; DestDir: "{#mods_dir}"; Components: wpn_anims\rifle; Flags: ignoreversion overwritereadonly
+Source: "optional\rpu_wakizashi_animations.dat"; DestDir: "{#mods_dir}"; Components: wpn_anims\wakizashi; Flags: ignoreversion overwritereadonly
+Source: "optional\rpu_extended_flamer.dat"; DestDir: "{#mods_dir}"; Components: wpn_anims\ext_flamer; Flags: ignoreversion overwritereadonly
+Source: "optional\cassidy_head.dat"; DestDir: "{#mods_dir}"; Components: cassidy_head; Flags: ignoreversion overwritereadonly
+Source: "optional\cassidy_voice_joey_bracken_hq.dat"; DestDir: "{#mods_dir}"; Components: cassidy_head; Flags: ignoreversion overwritereadonly
+Source: "optional\rpu_improved_mysterious_stranger.dat"; DestDir: "{#mods_dir}"; Components: imp_stranger; Flags: ignoreversion overwritereadonly
 Source: "optional\walk_speed_fix_low_fps.dat"; DestDir: "{#mods_dir}"; Components: walk_speed\low_fps; Flags: ignoreversion overwritereadonly
 Source: "optional\goris_fast_derobing_low_fps.dat"; DestDir: "{#mods_dir}"; Components: goris\low_fps; Flags: ignoreversion overwritereadonly
 
@@ -38,7 +45,6 @@ Source: "optional\goris_fast_derobing_low_fps.dat"; DestDir: "{#mods_dir}"; Comp
 #include "ini_qol.iss"
 #include "ini_debug.iss"
 #include "ini_sound.iss"
-FileName: "{app}\mods\upu.ini"; Section: "Main"; Key: "goris_derobing_speed"; String: "0"; Components: goris\skip;
 #include "ini_ammo.iss"
 
 [Dirs]
@@ -51,19 +57,29 @@ Filename: "{app}\{#basename}-install.bat"; Parameters: "> {#backup_dir}\log.txt
 Name: "core"; Description: "Core"; Types: "custom"; Flags: fixed;
 Name: "qol"; Description: "Enable sfall QoL features"; Types: "custom";
 
+#include "components_ammo.iss"
+
+Name: "translation"; Description: "Language"; Types: "custom"; Flags: fixed;
+#include "components_translations.iss"
+
 Name: "walk_speed"; Description: "Walk speed fix"; Types: "custom";
 Name: "walk_speed\high_fps"; Description: "High FPS"; Flags: exclusive disablenouninstallwarning;
 Name: "walk_speed\low_fps"; Description: "Low FPS"; Flags: exclusive disablenouninstallwarning;
 
 Name: "goris"; Description: "Faster derobing for Goris"; Types: "custom";
 Name: "goris\high_fps"; Description: "High FPS"; Flags: exclusive disablenouninstallwarning;
 Name: "goris\low_fps"; Description: "Low FPS"; Flags: exclusive disablenouninstallwarning;
-Name: "goris\skip"; Description: "Skip"; Flags: exclusive disablenouninstallwarning;
 
-#include "components_ammo.iss"
+Name: "worldmap"; Description: "Visually enhanced world map"; Types: "custom";  Flags: disablenouninstallwarning
 
-Name: "translation"; Description: "Language"; Types: "custom"; Flags: fixed;
-#include "components_translations.iss"
+Name: "wpn_anims"; Description: "Weapon animations"; Types: "custom"
+Name: "wpn_anims\rifle"; Description: "New rifle animations"; Types: "custom"; Flags: disablenouninstallwarning;
+Name: "wpn_anims\wakizashi"; Description: "New wakizashi blade animations"; Types: "custom"; Flags: disablenouninstallwarning;
+Name: "wpn_anims\ext_flamer"; Description: "Extended flamer attack animations"; Types: "custom"; Flags: disablenouninstallwarning;
+
+Name: "cassidy_head"; Description: "Talking head and voice for Cassidy"; Types: "custom"; Flags: disablenouninstallwarning;
+
+Name: "imp_stranger"; Description: "Improved Mysterious Stranger"; Types: "custom";  Flags: disablenouninstallwarning
 
 [Types]
 Name: "custom"; Description: "Custom Selection"; Flags: iscustom

diff --git a/extra/package/inno.sh b/extra/package/inno.sh
@@ -20,6 +20,16 @@ cp -r $release_dir ./
 mkdir translations
 mv $trans_dir/*.dat translations/
 
+# move optional components
+mkdir optional
+mv ./release/mods/rpu_enhanced_worldmap.dat optional/
+mv ./release/mods/rpu_rifle_animations.dat optional/
+mv ./release/mods/rpu_wakizashi_animations.dat optional/
+mv ./release/mods/rpu_extended_flamer.dat optional/
+mv ./release/mods/cassidy_head.dat optional/
+mv ./release/mods/cassidy_voice_joey_bracken_hq.dat optional/
+mv ./release/mods/rpu_improved_mysterious_stranger.dat optional/
+
 # alternative animations, not included into manual install
 "$extra_dir"/package/animation_fixes.sh