Removed duplicate executed code for the intface_redraw_ engine function.

Added additional resource files for the English and Russian versions.
Update mod party control script.

Author: FakelsHub

artifacts/ddraw.ini

@@ -716,7 +716,7 @@ AIDrugUsePerfFix=0
 
 ;Set to 1 to disables loading of all configuration settings of the game from the saved game, except the difficulty settings
 ;Set to 2 also disables load the game/combat difficulty settings
-SkipLoadingGameSetting=1
+SkipLoadingGameSettings=1
 
 ;Set to 1 to displays the electric stats of the armor in the player's inventory
 ;Set to 2 will replace the name of the player's character in the inventory by the health points
@@ -793,7 +793,7 @@ GlobalScriptPaths=scripts\gl*.int,scripts\sfall\gl*.int
 ;The maximum length of the specified path is 61 characters
 ;IniConfigFolder=IniConfig
 
-;Set to 1 for the hooks registration backward compatibility mode of the register_hook function, used in pre-4.2/3.8.20 versions
+;Set to 1 for the hooks registration backward compatibility mode of the register_hook function, used in pre-4.2 versions
 BackwardHooksRegistration=0;
 
 ;Set to 1 to enable the new arrays behavior

artifacts/mods/gl_partycontrol.ssl

@@ -71,13 +71,14 @@ procedure CombaTurn_Handler begin
       if (critter != real_dude_obj) then begin
          if not(npcControl) then obj_set_light_level(real_dude_obj, 0, 0); // dude off light
          npcControl := critter;
-         // set perks (worked on 4.1.8/3.8.18)
+         // set perks (worked on 4.1.8)
          foreach (perkID in perksList) begin
             level := has_trait(TRAIT_PERK, real_dude_obj, perkID);
             if (level) then begin
                critter_add_trait(critter, TRAIT_PERK, perkID, level);
             end
          end
+         intface_redraw;
          lightDist := get_object_data(critter, OBJ_DATA_LIGHT_DISTANCE);
          lightInt  := get_object_data(critter, OBJ_DATA_LIGHT_INTENSITY);
          obj_set_light_level(critter, 100, 4);
@@ -88,7 +89,8 @@ procedure CombaTurn_Handler begin
          npcControl := 0; // dude control
       end
       if inControl then begin
-         /*if (isOutline) then*/ set_outline(critter, OUTLINE_GREY);
+         // check preference setting _combat_highlight
+         if (read_byte(0x56D38C)) then set_outline(critter, OUTLINE_GREY);
          // center the screen on the controlled critter/dude and remove roof tiles
          move_to(dude_obj, dude_tile, dude_elevation);
          if (displayName and critter != real_dude_obj) then begin
@@ -115,10 +117,6 @@ procedure CombaTurn_Handler begin
 end
 
 procedure GameModeChange_Handler begin
-
-//   if (inControl == false and toggleControl and get_game_mode == COMBAT) then begin
-//      //isOutline := (get_light_level > 32768);
-//   end
    if (inControl and not(get_game_mode BWAND COMBAT)) then begin
       inControl := false;
       npcControl := 0;
@@ -158,7 +156,7 @@ procedure start begin
          displayName := GetConfig("CombatControl", "DisplayName", 0);
 
          if (displayName) then begin
-            variable nameTag := sfall_func0("add_iface_tag");
+            variable nameTag := add_iface_tag;
             debug_msg("NPC control - added new box: " + nameTag);
             if (nameTag <= 0) then begin // box added ?
                variable maxBoxCount := get_ini_setting("ddraw.ini|Misc|BoxBarCount");
@@ -227,4 +225,5 @@ procedure SetGlobalVar_Handler begin
          set_sfall_return(value);
       end
    end
-end
+end
+

artifacts/mods/gl_sfall-mods.ssl

@@ -146,7 +146,7 @@ procedure KeyPressHandler begin
       else if (keyDX == DIK_Z and (mode bwand PIPBOY)) then begin
          tap_key(DIK_ESCAPE);
       end
-      if (mode == (BARTER + DIALOG) and (keyDX == DIK_SPACE or keyDX == DIK_RETURN)) then begin
+      if ((mode bwand BARTER) and (keyDX == DIK_SPACE or keyDX == DIK_RETURN)) then begin
          tap_key(DIK_M);
       end
       else if (keyDX == pickupKey and (mode == 0)) then begin

artifacts/scripting/hookscripts.txt

@@ -637,9 +637,10 @@ int     ret2 - overrides the duration time for the current check
 
 HOOK_STDPROCEDURE (hs_stdprocedure.int)
 
-Runs every time before executed the standard procedure (handler) in script of an object.
+Runs before Fallout executes a standard procedure (handler) in script of objects.
+NOTE: this hook will not be executed for "start", critter_p_proc, timed_event_p_proc, and map_update_p_proc procedures.
 
-int     arg1 - number of the standard script handler (see define.h, except: start, map_update_p_proc, timed_event_proc and critter_p_proc)
+int     arg1 - number of the standard script handler (see define.h)
 Obj     arg2 - the object that owns the executed handler
 Obj     arg3 - the object that called this handler (can be 0)
 

artifacts/scripting/sfall function notes.txt

@@ -319,7 +319,8 @@ Some utility/math functions are available:
 - see "hookscripts.txt" for more details
 
 > void register_hook_proc_spec(int hook, procedure proc)
-- works just like "register_hook_proc", but allows to register a script at the end of the hook script execution chain (i.e. the hook will be executed after all previously registered hook scripts).
+- works just like "register_hook_proc", but allows to register a script at the end of the hook script execution chain (i.e. the hook will be executed after all previously registered hook scripts for the same hook, including the hs_*.int script).
+- to unregister hook script from current global script, use the register_hook_proc function
 
 > string message_str_game(int fileId, int messageId)
 - works exactly the same as message_str, except you get messages from files in "text\<current_lang>\game\" folder

artifacts/sfall.dat

@@ -2940,6 +2940,9 @@ void BugFixes::init()
 
 	// Place the player on a nearby empty tile if the entrance tile is blocked by another object when entering a map
 	HookCall(0x4836F8, map_check_state_hook);
+
+	// Remove dublicate code for intface_redraw_ function
+	BlockCall(0x45EBBF);
 }
 
 }

artifacts/sfall_ru.dat

@@ -804,7 +804,8 @@ void PartyMemberSkillPatch() {
 }
 
 void SkipLoadingGameSettingsPatch() {
-	int skipLoading = GetConfigInt("Misc", "SkipLoadingGameSetting", 0);
+	int skipLoading = GetConfigInt("Misc", "SkipLoadingGameSettings", -1);
+	if (skipLoading == -1) GetConfigInt("Misc", "SkipLoadingGameSetting", 0); // TODO: delete
 	if (skipLoading) {
 		dlog("Applying skip loading game settings from a saved game patch.", DL_INIT);
 		BlockCall(0x493421);