sync inno with rpu, ref BGforgeNet/Fallout2_Restoration_Project#245

NovaRain · Oct 17, 2023 · 9e11fda · 9e11fda
1 parent d7b56e3
commit 9e11fda
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 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
@@ -38,7 +38,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 +50,18 @@ 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: "translation"; Description: "Language"; Types: "custom"; Flags: fixed;
-#include "components_translations.iss"
 
 [Types]
 Name: "custom"; Description: "Custom Selection"; Flags: iscustom