From 08b5e3a7694159336b9bba2ddb975baac3dca0f6 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Tue, 10 Jul 2018 12:05:15 +0800
Subject: [PATCH] Improved the functionality of NPC combat control mod (#179)

* centers the screen on controlled critter.

* removes roof tiles to show controlled critter properly.

* additional options to display the name of controller critter.
---
 artifacts/config_files/sfall-mods.ini |  14 ++++++++++++++
 artifacts/mods/gl_partycontrol.int    | Bin 1760 -> 2140 bytes
 artifacts/mods/gl_partycontrol.ssl    |  13 +++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/artifacts/config_files/sfall-mods.ini b/artifacts/config_files/sfall-mods.ini
index 90e051a4..15bd5934 100644
--- a/artifacts/config_files/sfall-mods.ini
+++ b/artifacts/config_files/sfall-mods.ini
@@ -38,3 +38,17 @@ MotionScanner=0
 ;If you want to control only specific critters, uncomment the PIDList line and set a comma delimited list of PIDs
 Mode=0
 ;PIDList=62,89,97,107,160,161
+
+;Displays the name of controlled critter in an extra interface box. Must be between 5 and 9
+;Set to 0 to disable
+DisplayName=0
+
+;Set the color of display name, available colors:
+;0 - green
+;1 - red
+;2 - white
+;3 - yellow
+;4 - dark yellow
+;5 - blue
+;6 - purple
+DisplayNameColor=0
diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int
index 6f4dc8a0fa7b38278950c35a6e2b6fe54a85efa4..ade765f113183c2f57cc3f84fd8bac40e128b209 100644
GIT binary patch
delta 787
zcmaFBdq+T^f$0Dv0|SFl122eXS~5|<u>J}I1V}(A7|8?@XJ%kvP=Sd+XyzaW1_mYu
z1_l!dA4al(#6Wl&Oawx+?1In?YoIigV(Wk~m>AYgJQS_Klag6nkds*HmzbN%z#xRg
zbI#AnFJhQ1&1lKQs4+Q=@w~4{acW6?W?Eu$YJ5pzdVEQ0MF|4~17A^UVorQYX-aB*
zeo__#1DkJtN-6^b1CI-e$w)k~$&;;^v?j+fu}zL+;$dRzn4H7p#Kdedc>_}|<Ace1
z%;JnkCc80bFtM0T-oUKOxM1=<<_IPhm&q0^SyF5|pipFBXfOiPj19&O(jXRV&g4BT
z@{Bo?@30s$E}6{7D$BTJvJR`Z>o<@r15<-ggZ>0iJY0eC!8BuoQNt22i@8Clsj@)|
z%w}p3YP<ttv8jMa2A0WjtZHs-9t|vDBaVQ{S50M2<wzRtHtcWM-*Ba2f5V%GZBX$X
zkO<fa1_;^kaPkaR1s)EU#uSLV*;Y+H!fMR_p@A1{=oT>fYcd;~LK3?IvLGWQ89~fp
z2Ajs%zzU|B8iYYKdjN`h0gxC2HucO<^>vdq*i<~&kAM|2H3)%e)&_Hk%h<OxNHn-M
z=tI2%ljm%(XwV0%gcuFAoWo_ZADfr}`#%&ns7x+lQ(@vTn>>q6mXT%h4mJ${@N}+I

delta 509
zcmca3@PJpKf$0Dv0|SFl122eX@|q}MSf9rL0TK`jMlylKnHd-uRA3?yn&}M#0|OHS
z1A_^K4<ni9K*dX7A`qG-1VS@(L1`$(x(UKyV(6K8D0;Fzqd619hshO;=O@Q9Nlc#3
zq|VX6400svrpcF>oS2v{O%`LWm8=2@F)%e49bo+b|Ns96;|6Jv2y@)zHOv`I%oiq$
zvFI{dO?F|4U}C;Ec^*ra6>A4b0Rsa_3j+fKBTNe`TZ2S{euETPma##o$q>w9K*&#a
zVl|YvLsG@iAOu!}FvD*0Bvx(q2Cyj8WF|H>5!P7^EE7Osd<0BhX)0?fpPa|0z{7T;
zF$LmS)+>`|u^IDAHSmI!Yyp!`Cf{LGU}E!_9LKJr!FB>{BFsL928#xLkO*57ik>%<
gKd`GPu<Zg#F)%dj2h*MnpCO7F7{Pp|$tD~c0EMV#t^fc4

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index 66646044..12d5875d 100644
--- a/artifacts/mods/gl_partycontrol.ssl
+++ b/artifacts/mods/gl_partycontrol.ssl
@@ -12,12 +12,15 @@
 */
 
 #include "..\headers\define.h"
+#include "..\headers\command.h"
 #include "main.h"
 
 variable
    configSection := "CombatControl",
    controlMode,
    pidList,
+   displayName,
+   displayNameColor,
    hasGeckoSkinning := false;
 
 
@@ -34,10 +37,17 @@ procedure combatturn_handler begin
       and (len_array(pidList) == 0 or scan_array(pidList, pid bwand 0xFFFFFF) != -1)
       and (controlMode == 1 or party_member_obj(pid))) then begin
       set_dude_obj(critter);
+      if displayName then begin
+         set_iface_tag_text(displayName, obj_name(critter), displayNameColor);
+         show_iface_tag(displayName);
+      end
       if hasGeckoSkinning then critter_add_trait(critter, TRAIT_PERK, PERK_gecko_skinning_perk, 1);
    end else begin
       set_dude_obj(real_dude_obj);
+      hide_iface_tag(displayName);
    end
+   move_to(dude_obj, dude_tile, dude_elevation); // for removing roof tiles
+   tile_set_center(dude_tile);
 end
 
 procedure start begin
@@ -45,7 +55,10 @@ procedure start begin
       set_perk_ranks(PERK_gecko_skinning_perk, 1);
       set_perk_level(PERK_gecko_skinning_perk, 999); // prevent it from appearing in the perk selection window
       controlMode := GetConfig("CombatControl", "Mode", 0);
+      displayName := GetConfig("CombatControl", "DisplayName", 0);
+      displayNameColor := GetConfig("CombatControl", "DisplayNameColor", 0);
       if (controlMode > 2) then controlMode := 0;
+      if (displayName < 5 or displayName > 9) then displayName := 0;
       if (controlMode > 0) then begin
          pidList := GetConfigListInt("CombatControl", "PIDList");
          fix_array(pidList);