Fixed party control script. Release v4.1.9.

Author: FakelsHub

artifacts/config_files/sfall-mods.ini

@@ -82,7 +82,7 @@ DisplayNameColor=2
 ;Messages
 MsgControlOn=NPC combat control: ON
 MsgControlOff=NPC combat control: OFF
-MsgControl=It is not possible to enable/disable control while controlling NPC.
+MsgControl=It is not possible to disable control while controlling NPC.
 
 [Misc]
 ;Set to 1 to enable mod keys for combat mode

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v4.1.8 - Extended version
+;v4.1.9 - Extended version
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -628,7 +628,7 @@ StackEmptyWeapons=0
 ;If the amount of ammo boxes in the inventory is less than or equal to the reserve, only one box will be used
 ReloadReserve=-1
 
-;Set to 1 to change the counter in the 'Move Items' window to start at the maximum number of items
+;Set to 1 to change the counter in the 'Move Items' window to start at the maximum number of items, except in the barter screen
 ItemCounterDefaultMax=0
 
 ;Set to 1 to leave the music playing in dialogue with talking heads

artifacts/mods/gl_partycontrol.ssl

@@ -12,13 +12,15 @@
 */
 
 #define SFALL_SC_EVALUATION   (true) // ScriptEditor 4.0: Automatic script compilation with -s option
+#define DEBUG                 (false)
 
 #include "..\headers\define.h"
 #include "..\headers\command.h"
 #include "main.h"
 
 #define OBJ_DATA_LIGHT_DISTANCE     (0x6C)
 #define OBJ_DATA_LIGHT_INTENSITY    (0x70)
+#define PID_PLAYER                  (16777216)
 
 procedure start;
 procedure AllowControl(variable pid);
@@ -35,14 +37,13 @@ variable
    noCheckArray,
    pidList,
    lightInt, lightDist, npcControl,
-   displayName, displayNameColor, //isOutline := false,
+   displayName, displayNameColor, isShowTag, //isOutline := false,
    inControl := false,
    hasAwareness := false,
    hasGeckoSkinning := false;
 
 
 procedure AllowControl(variable pid) begin
-
    if (noCheckArray or scan_array(pidList, pid bwand 0xFFFFFF) != -1) and (party_member_obj(pid)) then return true;
    return false;
 end
@@ -51,20 +52,25 @@ procedure CombaTurn_Handler begin
    variable
       status := get_sfall_arg,
       critter := get_sfall_arg,
-      //arg3 := get_sfall_arg,
       pid;
-   //display_msg("Combat Turn: " + status + ", by "  + obj_name(critter) + ", arg3: " + arg3);
 
    if (not(toggleControl)) then return;
 
+   if DEBUG then begin
+      display_msg("Combat Turn: " + status + ", by "  + obj_name(critter)+ "/" + critter + ", arg3: " + get_sfall_arg);
+   end
+
    if (npcControl) then begin
       if (lightInt) then lightInt := round((lightInt / 65536.0) * 100); // calc percent of intensity
-      obj_set_light_level(npcControl, lightInt, lightDist);             // restore/off light for npc
+      obj_set_light_level(npcControl, lightInt, lightDist);             // restore light for prev. controlled npc
    end
 
    pid := obj_pid(critter);
    if (status == 1 and (AllowControl(pid) or controlMode == 1)) then begin
       set_dude_obj(critter);
+      if DEBUG then begin
+         display_msg("Set control to: " + obj_name(critter));
+      end
       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;
@@ -75,44 +81,48 @@ procedure CombaTurn_Handler begin
          if hasGeckoSkinning then critter_add_trait(critter, TRAIT_PERK, PERK_gecko_skinning_perk, 1);
          if hasAwareness then critter_add_trait(critter, TRAIT_PERK, PERK_bonus_awareness, 1);
          inControl := true;
-      end else if (npcControl) then begin
-         obj_set_light_level(dude_obj, 100, 4); // set default light
-         npcControl := 0;
+      end
+      else if (npcControl) then begin
+         obj_set_light_level(dude_obj, 100, 4); // set dude default light
+         npcControl := 0; // dude control
       end
       if inControl then begin
          /*if (isOutline) then*/ set_outline(critter, OUTLINE_GREY);
-         // center the screen on the controlled critter and remove roof tiles
+         // 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
             set_iface_tag_text(displayName, obj_name(critter), displayNameColor);
             show_iface_tag(displayName);
+            isShowTag := true;
          end
       end
-   end else if (inControl) then begin
-      if (displayName) then hide_iface_tag(displayName);
-      if (status == -1 or AllowControl(pid) == false) then begin
-         set_dude_obj(real_dude_obj);
-         obj_set_light_level(dude_obj, 100, 4);
-         npcControl := 0;
+   end
+   else if (inControl) then begin
+      if (isShowTag) then begin
+         hide_iface_tag(displayName);
+         isShowTag := false;
+      end
+      if (status < 0 or AllowControl(pid) == false) then begin
+         if (dude_obj != real_dude_obj) then begin
+            set_dude_obj(real_dude_obj);
+            obj_set_light_level(dude_obj, 100, 4);
+            npcControl := 0;
+         end
       end
    end
+
 end
 
 procedure GameModeChange_Handler begin
 
-   if (not(inControl) and toggleControl and get_game_mode == COMBAT) then begin
+   if (inControl == false and toggleControl and get_game_mode == COMBAT) then begin
       hasGeckoSkinning := has_trait(TRAIT_PERK, dude_obj, PERK_gecko_skinning_perk);
       hasAwareness := has_trait(TRAIT_PERK, dude_obj, PERK_bonus_awareness);
       //isOutline := (get_light_level > 32768);
    end
-
    if (inControl and not(get_game_mode BWAND COMBAT)) then begin
       inControl := false;
-      if (dude_obj != real_dude_obj) then begin
-         set_dude_obj(real_dude_obj);
-         obj_set_light_level(dude_obj, 100, 4);
-         npcControl := 0;
-      end
+      npcControl := 0;
       move_to(dude_obj, dude_tile, dude_elevation);
    end
 end
@@ -125,7 +135,7 @@ procedure InventoryMove_Handler begin
 
    int     ret1 - Override setting (-1 - use engine handler, any other value - prevent relocation of item/reloading weapon)
 */
-   if (inControl and get_sfall_arg == 3) then begin // armor slot
+   if (npcControl and get_sfall_arg == 3) then begin // armor slot
       if (obj_pid(dude_obj) == PID_MARCUS or proto_data(obj_pid(dude_obj), cr_body_type) != CR_BODY_BIPED) then begin
          display_msg(message_str_game(GAME_MSG_PROTO, 675));
          set_sfall_return(true);
@@ -208,7 +218,7 @@ procedure InvenWield_Handler begin
 end
 
 procedure SetGlobalVar_Handler begin
-   if (inControl and get_sfall_arg == GVAR_PLAYER_REPUTATION) then begin
+   if (npcControl and get_sfall_arg == GVAR_PLAYER_REPUTATION and obj_pid(dude_obj) != PID_PLAYER) then begin
       variable value := global_var(GVAR_PLAYER_REPUTATION);
       if (get_sfall_arg > value) then begin
          set_sfall_return(value);

sfall/Modules/Interface.cpp

@@ -65,7 +65,7 @@ static void ActionPointsBarPatch() {
 	dlog("Applying expanded action points bar patch.", DL_INIT);
 	if (hrpIsEnabled) {
 		// check valid data
-		if (!stricmp((const char*)0x10039358, "HR_IFACE_%i.frm")) {
+		if (!_stricmp((const char*)0x10039358, "HR_IFACE_%i.frm")) {
 			SafeWriteStr(0x10039363, "E.frm"); // patching HRP
 		} else {
 			dlog(" Incorrect HRP version!", DL_INIT);