From d946850af43a01b160425a6dfa05e90468d7862e Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sat, 6 Apr 2019 09:33:27 +0800
Subject: [PATCH] Fixed the weapon duplication bug in NPC combat control mod.

---
 artifacts/mods/gl_partycontrol.int | Bin 3584 -> 3862 bytes
 artifacts/mods/gl_partycontrol.ssl |  13 +++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int
index 4deb0bee5c21ee3cfa7e84e80856add915a491fa..9bcc1f98e0429b244cb114c13e11a227adf2d1e2 100644
GIT binary patch
delta 1183
zcmZpWnI<RDz;u9-fq_A&ffq!xh)oobt><E3U|?fF0W2v{t^|~ZQebgr1_lNdr~s5=
zdBniLz{J47U;-6@Qmm7p;y0iIP>Riqfq?<!kQWRL^-wV|#dZNqF);jt(ol-a48mYU
za}YPk@gTDdAo4Jhdk%!f=mw!-Bu^ZK#puBxpa%h)g&CC?RYfxM%2M;nGgEU?;xiKS
zQgTv@K*3U6l2}y2@c;k+{|pR_3nsfTeHY^@PA!Q~%SlWxW?<k-hp{JHGCySEiJL6L
z;>>traso>&W5MKmEaHqIlfSWKG9H_pz^cQ<W-z&rHInhl<QJ^Uf;&JFz`)ob)F2IF
zvGq)rVKZc0GTDzUQ!oT1!ob=f)SwSyv0F_(!4|7p24XWXG#G(t#s*`EPWBTG5)Jwd
zQXo<G6_dT#<rz;*&SE!YJTiF>y95)5+~jTSos8=yJ8)PFe`;U>DdYGAA|Vz`Zs3wL
z0dYC=KqLbP$kvAa4f`9eH0*D9)36O<GE|lg=3Y*_$qzVuOt|DACUVIkG=o^23qT|T
zNIBRGAXejDkQkTT<OEJ}{x=O04X!X}b3U2e##zXiG5H6lz97VHAZLIBhHJuP3odoW
zCzBJnvTa*HCV-s?mg6>pc)jrnSe&`R7!qLIEe-n{84fTqGB7NJ1rvAHWDf3xNh}<b
z=dp>@Lv=7U7(!Xh4Tc~yc-%lF19O8BByf48AU1$Rd88n@1{4J#(?Q7&B+kInz}lcc
z0hFBofccCKMj##|2aMNLet_}M|Ns9R9GWV?!8zHHTb+mRUt<c?mY&Ha+(rUCml}A%
z8b!dQ%H(a_3QW8VlW%aVF!BAH{Eu5qfY$*<iOysd9)%db3a~}szy|BIYJ#N|LonY9
zEYHwj)L_{NPFs8yFcBzi3h@AAR^uA52qPpocrQ#|z@x&%`(pAj9yuvK1F#%hgAkZz
zZ7_#8pHE@(KOQ|MK99+IykY`;1t?DJm>j~ZAiy^ZMR3mK7T!!wNw6^-O-YmOxFrB(
C*ZXw<

delta 970
zcmbOx*B~R%z;u9-fq_A&ffqzGUzjK$ThGbBz`(|U0$AjrTnQ)*rNH9M3=9k^Pyr~#
zGKYbIfr){E!2~J*rC5ES;y0iIP>PL(fq?<!kQWRLaZoWZ#nuI;7#RLRX(+|{0m5KJ
za}d`NsJH=yhLPN15Ei4+W+g^#Mt-*9lEk7ChX4Qn|7T!e?3i4{^nG$8^L-}nu*pd*
z&Wufym$B4JYJtLpfvLgh03%3YgK>j2NQ9MdvJGn{W5eWStU64ruO?q%jb!YbtjDG-
zSOk)0U~CYAC}eY+oWy3x7&mzeTc#i%SdO(ps6ijZV*4_gk3Ck^0K{fs09gSF0hkr+
zO$`za`VCSbS@xvK6WHY$n<j5yH<Ydei7+rW7)=0$){&;N1`~*R>^CO=Vee$jnB2x;
z&AFz51*DE+&E!)Yx{Ml=e{jeOYJfx-*kEqs_%T_H(?^Q)21F_64X`u^%z2zqlY2NN
zG@!y@_aO%X=duQg23MF1Ip<BDz%DWQ31=ju(qua>eZe(w!@vQ?<u$pEOPz7v<Yiph
zwsvT8Zy-Kxd;%6{ZZL-Uhuf}Ue<Q;IMn(pPg|JZJR+;R_oxsEUqA>*$z}zj9Yj}(V
zxKB0kg2Uqvh-BoMypKnLiTlUo2Rteoyf47!GBgN5X$y$?JQgT=L?-X!k+f!O5C*B@
zEdY_=u+j&csMJ&j7GY>G1oMrcJfjB7#t;yj*I;r3uee}PBgE&74Td05o)eQ-@TxHJ
zJeYirSB{BSWAZy*F(zJ#$!vUj8oUmWfQQFD%<c>ncNKu#CC(0Y*CZ6VmdQPQnUj^d
FgaI_R&GP^N

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index 8585f91f..559b7f16 100644
--- a/artifacts/mods/gl_partycontrol.ssl
+++ b/artifacts/mods/gl_partycontrol.ssl
@@ -102,6 +102,18 @@ procedure inventorymove_handler begin
    end
 end
 
+procedure invenwield_handler begin
+   variable critter := get_sfall_arg,
+      item  := get_sfall_arg,
+      slot  := get_sfall_arg,
+      event := get_sfall_arg;
+
+   // Fix weapon duplication when equipping in combat
+   if (event and AllowControl(obj_pid(critter))) then begin
+      set_flags(item, get_flags(item) bwand bwnot(FLAG_LEFT_HAND bwor FLAG_RIGHT_HAND));
+   end
+end
+
 procedure start begin
    if (game_loaded and sfall_ver_major >= 4) then begin
       variable configSection := "CombatControl";
@@ -135,6 +147,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);
+         register_hook_proc(HOOK_INVENWIELD, invenwield_handler);
       end
    end
 end