diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_0_settings.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_0_settings.ssl index 09f642c59..33559ba8c 100644 --- a/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_0_settings.ssl +++ b/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_0_settings.ssl @@ -64,6 +64,7 @@ procedure settings begin gvar_settings(GVAR_ENABLE_FO2_0800_RESTING); gvar_settings(GVAR_ENABLE_FO2_WORLDMAP); gvar_settings(GVAR_ENABLE_EXPANDED_WRECKS); + gvar_settings(GVAR_ENABLE_FO2_HITCHANCE); //gvar_settings(GVAR_ENABLE_SCRAPHEAP); diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_fo1mechanics.ssl b/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_fo1mechanics.ssl index cbdd6a78f..b3153244f 100644 --- a/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_fo1mechanics.ssl +++ b/Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_fo1mechanics.ssl @@ -96,6 +96,11 @@ procedure general begin // Fix dogmeat party member dialog VOODOO_dogmeat_pm_dialog; + // Revert nerfed Fo2 hit chance back to Fo1 + if not(fo1in2_fo2_hitchance_enabled) then begin + VOODOO_RevertToHitPlayerNerf; + end + // Change the skill bonus from Survivalist Perk to 0. VOODOO_survivalist_bonus; diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/headers/fo1.h b/Fallout2/Fallout1in2/Mapper/source/scripts/headers/fo1.h index 1325b1949..2eb047664 100644 --- a/Fallout2/Fallout1in2/Mapper/source/scripts/headers/fo1.h +++ b/Fallout2/Fallout1in2/Mapper/source/scripts/headers/fo1.h @@ -51,6 +51,7 @@ #define fo1in2_khan_art_fix_enabled (global_var(GVAR_ENABLE_KHAN_ART_FIX) > 0) #define fo1in2_0800_resting_enabled (global_var(GVAR_ENABLE_FO2_0800_RESTING) > 0) #define fo1in2_expanded_wrecks_enabled (global_var(GVAR_ENABLE_EXPANDED_WRECKS) > 0) +#define fo1in2_fo2_hitchance_enabled (global_var(GVAR_ENABLE_FO2_HITCHANCE) > 0) #define fixt_enabled (global_var(GVAR_FIXT_ENABLED) == 1) #define fixt_disabled not(fixt_enabled) diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/headers/global.h b/Fallout2/Fallout1in2/Mapper/source/scripts/headers/global.h index 566c53322..b3a995a5f 100644 --- a/Fallout2/Fallout1in2/Mapper/source/scripts/headers/global.h +++ b/Fallout2/Fallout1in2/Mapper/source/scripts/headers/global.h @@ -4043,8 +4043,8 @@ #define RESERVED_FOR_FALLOUT_FIXT (4901) #define RESERVED_FOR_FALLOUT_FIXT (4902) #define RESERVED_FOR_FALLOUT_FIXT (4903) -#define RESERVED_FOR_FALLOUT_FIXT (4904) -#define RESERVED_FOR_FALLOUT_FIXT (4905)*/ +#define RESERVED_FOR_FALLOUT_FIXT (4904)*/ +#define GVAR_ENABLE_FO2_HITCHANCE (4905) #define GVAR_ENABLE_AUTO_DOORS (4906) #define GVAR_ENABLE_EXPANDED_WRECKS (4907) #define GVAR_RAZOR_DEAD (4908) diff --git a/Fallout2/Fallout1in2/Mapper/source/scripts/headers/voodoo.h b/Fallout2/Fallout1in2/Mapper/source/scripts/headers/voodoo.h index 3d7bccbfd..4eafbdce1 100644 --- a/Fallout2/Fallout1in2/Mapper/source/scripts/headers/voodoo.h +++ b/Fallout2/Fallout1in2/Mapper/source/scripts/headers/voodoo.h @@ -24,6 +24,10 @@ variable $addr; #include "debug.h" #include "voodoo_lib.h" +// This will revert the nerfed player hit chance back to how it was in Fo1 +#define VOODOO_RevertToHitPlayerNerf \ + write_byte(0x4244ED, 0xEB) + // This will change the skill bonus from survivalist perk to 0. // The bonus for all perk ranks is applied via gl_survivalist.ssl script. #define VOODOO_survivalist_bonus \ diff --git a/Fallout2/Fallout1in2/config/fo1_settings.ini b/Fallout2/Fallout1in2/config/fo1_settings.ini index dad477103..7b069a21f 100644 --- a/Fallout2/Fallout1in2/config/fo1_settings.ini +++ b/Fallout2/Fallout1in2/config/fo1_settings.ini @@ -74,6 +74,9 @@ GVAR_ENABLE_FO2_SEASONAL_LIGHTING=0 ; Enable resting until 08:00 in the morning (Fo2-style)? GVAR_ENABLE_FO2_0800_RESTING=0 +; Enable nerfed hit chance calculation (Fo2-style)? +GVAR_ENABLE_FO2_HITCHANCE=1 + ; Enable tougher super mutants to make the endgame more of a challenge? ; OVERKILL NOTE: 0 is vanilla, 1 is tweaked. Every step above 1 will multiply the base hitpoints! GVAR_ENABLE_TOUGH_MUTANTS=1 diff --git a/Fallout2/Fallout1in2/mods/fo1_base/data/Vault13.gam b/Fallout2/Fallout1in2/mods/fo1_base/data/Vault13.gam index 7b0f29c92..e04085ebb 100644 --- a/Fallout2/Fallout1in2/mods/fo1_base/data/Vault13.gam +++ b/Fallout2/Fallout1in2/mods/fo1_base/data/Vault13.gam @@ -4913,7 +4913,7 @@ RESERVED_FOR_FALLOUT_FIXT :=0; // (4903) RESERVED_FOR_FALLOUT_FIXT :=0; // (4904) RESERVED_FOR_FALLOUT_FIXT :=0; // (4905) RESERVED_FOR_FALLOUT_FIXT :=0; // (4906) -GVAR_MERCHANT_MONEY_MODIFIER :=0; // (4907) +GVAR_ENABLE_FO2_HITCHANCE :=0; // (4907) GVAR_ENABLE_AUTO_DOORS :=0; // (4908) GVAR_VASQUEZ_HIRELING_STATUS :=0; // (4909) GVAR_GRIFFITH_HAS_KEY :=0; // (4910)