diff --git a/artifacts/config_files/Tweaks.ini b/artifacts/config_files/Tweaks.ini index 44f5609b..da1b3189 100644 --- a/artifacts/config_files/Tweaks.ini +++ b/artifacts/config_files/Tweaks.ini @@ -10,4 +10,4 @@ ;in the proto for other items, so AI will use them for healing in combat as well STIMPAK=40 SUPER_STIMPAK=144 -HEALING_POWDER=237 +HEALING_POWDER=273 diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index c9b043b8..82e7e9e8 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -108,7 +108,7 @@ NumSoundBuffers=8 AllowSoundForFloats=0 ;Set to 1 to automatically search for alternative formats (mp3/wma/wav) when Fallout tries to play an ACM -;Set to 2 to play alternative music files even if original ACM files are not present in the music folder +;Alternative music files will play even if original ACM files are not present in the music folder ;This does not effect the play_sfall_sound and stop_sfall_sound script functions AllowDShowSound=0 @@ -443,7 +443,8 @@ NPCsTryToSpendExtraAP=0 AllowLargeTiles=0 ;Set to 1 to boost the maximum number of tile FRMs from 4096 to 16383 -MoreTiles=0 +;This option is always enabled in 4.3.6.1/3.8.36.1 or later. The information is left for reference only +MoreTiles=1 ;Change the Skilldex cursor FRM numbers ;Default is 293 for all skills diff --git a/artifacts/scripting/compiler/sslc_readme.md b/artifacts/scripting/compiler/sslc_readme.md index 6a649830..d87c68f6 100644 --- a/artifacts/scripting/compiler/sslc_readme.md +++ b/artifacts/scripting/compiler/sslc_readme.md @@ -79,7 +79,7 @@ Syntax which requires sfall for compiled scripts to be interpreted is marked by - Conditional expressions (Python-inspired), also known as ternary operator: - new: ``` - X := value1 if condition else value2 + X := value1 if (condition) else value2 ``` - old: ``` diff --git a/sfall/Modules/Sound.cpp b/sfall/Modules/Sound.cpp index 8f3deb05..60332f37 100644 --- a/sfall/Modules/Sound.cpp +++ b/sfall/Modules/Sound.cpp @@ -1008,15 +1008,12 @@ void Sound::init() { void* soundLoad_func = soundLoad_hook_B; - int allowDShowSound = IniReader::GetConfigInt("Sound", "AllowDShowSound", 0); - if (allowDShowSound > 0) { + if (IniReader::GetConfigInt("Sound", "AllowDShowSound", 0)) { soundLoad_func = soundLoad_hook_A; // main hook const DWORD gmoviePlayStopAddr[] = {0x44E80A, 0x445280}; HookCalls(gmovie_play_hook_stop, gmoviePlayStopAddr); // only play looping music - if (allowDShowSound > 1) { - HookCall(0x450851, gsound_background_play_hook); - } + HookCall(0x450851, gsound_background_play_hook); HookCall(0x4813EE, main_death_scene_hook); MakeCall(0x451038, gsound_speech_stop_hack, 1); diff --git a/sfall/Modules/Tiles.cpp b/sfall/Modules/Tiles.cpp index 98266df0..7678f635 100644 --- a/sfall/Modules/Tiles.cpp +++ b/sfall/Modules/Tiles.cpp @@ -314,7 +314,7 @@ void Tiles::init() { dlogr(" Done", DL_INIT); } - if (IniReader::GetConfigInt("Misc", "MoreTiles", 0)) { + //if (IniReader::GetConfigInt("Misc", "MoreTiles", 1)) { dlog("Applying tile FRM limit patch.", DL_INIT); MakeCall(0x419D46, art_id_hack); MakeCall(0x419479, art_get_name_hack); @@ -327,7 +327,7 @@ void Tiles::init() { SafeWrite8(HRPAddress(0x1000E1DA), 0x3F); // and esi, 0x3FFF } dlogr(" Done", DL_INIT); - } + //} } void Tiles::exit() {