From fbdb9777c7560eea1fd4ba3e10b7e9dbed159447 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Thu, 1 Nov 2018 17:25:29 +0800
Subject: [PATCH] Updated NPC combat control mod to prevent Marcus and
 non-biped critters from equipping armor when controlled by the player.

---
 artifacts/mods/gl_partycontrol.int | Bin 2466 -> 2706 bytes
 artifacts/mods/gl_partycontrol.ssl |  14 ++++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int
index eb15a3ab7db85888621404a2037c223b75f1c622..260e132072f80f3f54d76f18572f95c6b44d3832 100644
GIT binary patch
delta 725
zcmZ1^JV{ibf$0Dv0|SFl122eXwwov*ThGD3z`(|U0+_3yTnQ)*rNH9M3=9k^Pyr~#
z{DXmkfr){E!2~J*rC3%##Wz3&pcHEYlyQuK!41j;Q|x_Uih<z)l!j95-=GYTMNlS)
z;^+X83=9mvCf>R&CYG63mYP?RUsRc!UzQr5k(if~lUlTSGvj1NCXSBD9?Z^+_a^r+
z*Gjg5e9yqtV03`-|NsC08;l#IK_V<!la*L98ShN)VbNuDo4ku9lJV7K5!NgwcB{z^
ztYS=TLX&5(%7LgItcHwUlV7pQN_#a(G`KeCH%NgDU|?=AYV>Z<2eH|<O;%#lWn3{i
zfX#}D-Dq+Tn~WB_5lDuCsX+*0Av;rp1Y9p;gV6*~<Q!=#YcQF-iOrO=tbqljp1o}H
z2R22<vdKd1#*BL=yRmCC-kV&+ZdK1w0Fq{4g&D^o2QjYk30R!D!5HEcj)I2$jSL4E
z85tNB!u-k+26H$>j)8%JyAf<114DxeL>~h<l`t)C%5K;JHj%OMDVSzx;BAm>m^_nR
zn1`#XF$Lloj#ZO)up2XenEZxakBL)mvJ8ic6jv2gy%3bPfSAk~F*%CEi-~j9<YgRs
yOq{nSU*phY;^LUh#;GF36#!Pt)Bw@L+F%YbpUYvg3#T`y1Xz}>DQR*ay95BcewW_>

delta 487
zcmbOvx=2`{f$0Dv0|SFl122eX=9?%WThGqGz`(|U0+_v^TnQ)*rNH9M3=9k^Pyr~#
ze1d_2fr){E!2~J*rC2JU;v1j>P>R(6$~eZrpa*4wDRw(B#lY|YN<%63Wl+YWiJxw7
ze#$tJk%@iT<O*hI#&whTFxN_kfxN@O)L?Xg@&Et-{~L@Oq(LGqR+EERG8xxQ-ov8H
zC^q>OOC;m2$u6u}Ol+?vZ(tQ;Vtq9E1gji~dckVQC^cD%O;%c}L88I6LBBx?WB>zm
zgHfY*gFcAO);2kaO_#A^as!(c6WgQ7d)Q>S*dBpo7?>J_CNr^{a;i13fcWfclO5O<
z8Pz5yu^ThyOrFNB&Db~j5W5u*XIEni#AWO!CePw9X5^cEjzf=$!)Ee74izcRE|6vh
zh6W)hZ2_^EqinJbrxz2)iOC(DdQ2QYChy?XW8zes{DM=3i8F69AD0*tXWV2pF7L^u
G9Krw<OJ3gq

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index d7e2b7b6..22ee5916 100644
--- a/artifacts/mods/gl_partycontrol.ssl
+++ b/artifacts/mods/gl_partycontrol.ssl
@@ -46,7 +46,7 @@ procedure combatturn_handler begin
       if inControl then begin
          // center the screen on the controlled critter and remove roof tiles
          move_to(dude_obj, dude_tile, dude_elevation);
-         if displayName then begin
+         if (displayName and critter != real_dude_obj) then begin
             set_iface_tag_text(displayName, obj_name(critter), displayNameColor);
             show_iface_tag(displayName);
          end
@@ -62,8 +62,17 @@ procedure gamemodechange_handler begin
    if not(get_game_mode BWAND COMBAT) then inControl := false;
 end
 
+procedure inventorymove_handler begin
+   if (inControl 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);
+      end
+   end
+end
+
 procedure start begin
-   if game_loaded and (sfall_ver_major >= 4) then begin
+   if (game_loaded and sfall_ver_major >= 4) then 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);
@@ -79,6 +88,7 @@ procedure start begin
 
          register_hook_proc(HOOK_COMBATTURN, combatturn_handler);
          register_hook_proc(HOOK_GAMEMODECHANGE, gamemodechange_handler);
+         register_hook_proc(HOOK_INVENTORYMOVE, inventorymove_handler);
       end
    end
 end