From 1e5fd7fd13a377a0b78c8f55587a964c97ff98cf Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Mon, 8 Aug 2022 09:08:05 +0800
Subject: [PATCH] Combined AllowDShowSound=2 with mode 1

Removed MoreTiles from ddraw.ini (always enabled)
Minor edits to documents.
---
 artifacts/config_files/Tweaks.ini           | 2 +-
 artifacts/ddraw.ini                         | 5 +++--
 artifacts/scripting/compiler/sslc_readme.md | 2 +-
 docs/sslc.md                                | 2 +-
 sfall/Modules/Sound.cpp                     | 7 ++-----
 sfall/Modules/Tiles.cpp                     | 4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)

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 64145e48..eaba7185 100644
--- a/artifacts/ddraw.ini
+++ b/artifacts/ddraw.ini
@@ -139,7 +139,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
 
@@ -453,7 +453,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/docs/sslc.md b/docs/sslc.md
index 2e0a1617..e148dc09 100644
--- a/docs/sslc.md
+++ b/docs/sslc.md
@@ -87,7 +87,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 29abf410..95f1ad9e 100644
--- a/sfall/Modules/Sound.cpp
+++ b/sfall/Modules/Sound.cpp
@@ -1000,14 +1000,11 @@ 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
 
 		HookCalls(gmovie_play_hook_stop, {0x44E80A, 0x445280}); // 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 f6397aed..220b1da4 100644
--- a/sfall/Modules/Tiles.cpp
+++ b/sfall/Modules/Tiles.cpp
@@ -306,7 +306,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);
@@ -319,7 +319,7 @@ void Tiles::init() {
 			SafeWrite8(HRP::Setting::GetAddress(0x1000E1DA), 0x3F); // and esi, 0x3FFF
 		}
 		dlogr(" Done", DL_INIT);
-	}
+	//}
 }
 
 void Tiles::exit() {