From b8de20d45532ebbe09f92f714c1dc42f6b3443aa Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Thu, 7 Nov 2019 09:45:57 +0800
Subject: [PATCH] Fixed gl_partycontrol change in commit 9fab4b3

---
 artifacts/mods/gl_partycontrol.int | Bin 4368 -> 4388 bytes
 artifacts/mods/gl_partycontrol.ssl |  10 ++++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int
index 297282a7a741ce3178c4d69112ada8c3dfea9a25..c2a36601db2575ab996d81aedaf72ab988f9a8fe 100644
GIT binary patch
delta 507
zcmbQBv_xsbMb8KZFkqAcQ*eUk7=+1a0-<3fFHF4`OawynS!|YKG-PJ9*zCh%%%<wl
zz;b|*fq};XL^5zS2sP+~Sln$5`zJ6mFfdd!l{J`5p1`Hf*fx0wS1x1P<U1Uill{3B
zIL|<Ia<7|Q!L82dFnIyDIRCE(i3ZmO{RSzp8J{K}1IxVQjul)75&@ep4Px;$O^)G-
zwT0Nq)*#dX5q;Mn0n*+01f+(6xxpCX8eWHn{f!I<7#SHD7B(0|)bgrL{>C#^Pywpa
z2r7DP@*G}S-Y*byKytiaCLiN1;1T3$Oo1rjOPlP(XUw=}av7gK<E_cd_*A3>c|a-|
z7#f72v<1XoeyPb%`1BcrCX4VJFbN1vcH>uPTs1k5U)Ayu#PbY{4Mt!sEDe@mnz6wU
zL<?|%NCtMOfvgSY5WD$*O+Le~FR298%>dQS-XIK8FW@y<L_nXhWU`BZFXN%flLYDj
Dp&xV?

delta 426
zcmZ3YG(l;?MNbz7FkqAcQ*eT36NJfV0-<3fFHF4`Oawynsce>FG-PH}+3dq&%qFPQ
zz;b|*fq_Q{L^5zS2u)tXrOsG1`3zSsW6<O~9Ga7pxfM8fKvZ$hn%u*!t`1Sl&|n1C
z!_Z*fAPr)1KWmU^aBa|UkOK4WO}@pg&Zsk)i6>TY7DxnSIz%N;-sA$FSV4$6Yz;zC
z(OZ-6@raA+H0*C=IKarrz_75v7$U<fG?|Ncsvr;86y^pasOYB28+c`TA2dk7?Bsng
z`4(>hkHC+{6o?YOpvhr;#*8y2ck$^n9-F+2PlZX~$K(fm;*4yQfAHxu+D+ErH(=ub
zH#v%5opIXaCVo}Mb(2@{%SrKn1KY*kAOxmaVSeO)Hu(X+J|o{`0ReGFv&k9)`iu#a
OBLsXI*G*m~PzL}x-(ooc

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index d6f7aae3..2e9d0f63 100644
--- a/artifacts/mods/gl_partycontrol.ssl
+++ b/artifacts/mods/gl_partycontrol.ssl
@@ -80,10 +80,12 @@ procedure combatturn_handler begin
       end
    end else if inControl then begin
       // remove perks before switching control (only work with 4.1.8+)
-      foreach (perkID in perksList) begin
-         level := has_trait(TRAIT_PERK, real_dude_obj, perkID);
-         if (level) then begin
-            critter_rm_trait(critter, TRAIT_PERK, perkID, level);
+      if (dude_obj != real_dude_obj) then begin
+         foreach (perkID in perksList) begin
+            level := has_trait(TRAIT_PERK, real_dude_obj, perkID);
+            if (level) then begin
+               critter_rm_trait(critter, TRAIT_PERK, perkID, level);
+            end
          end
       end
       if isShowTag then begin