From d8d3bade9435e76db22d617751c7fcde1ecc1d09 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Mon, 1 Jul 2019 13:06:32 +0800
Subject: [PATCH] Fixed XP stealing bug in gl_partycontrol.

* if the combat ends automatically after a controlled critter's turn,
it would get the player's combat xp and "level up".
---
 artifacts/mods/gl_partycontrol.int | Bin 3892 -> 3828 bytes
 artifacts/mods/gl_partycontrol.ssl |   7 +------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int
index 864e2ed3d18cb917495a996db2d661ebe49a9b95..ce8f92b4ba56612bac46dc3bf6627ef2162bb3c3 100644
GIT binary patch
delta 492
zcmdlY_eFNXMNcaRFkqAbQ*eUo6okoW0HI+dcMOEZ=mw!-B#+HzDMoi@Mw`t^EP||@
zN)0Rr7#SG2lqT13YT7G-*bEE}Mo`+gK^ny3yw)Jm;M$<yAO+$<<p2Nw|Gxny|Dizw
zBs+N-m)&GJE_ueB$#z`&f}6mqIU0l@rf^M}T*sv}`3aY<tqYpWCy4&WCtz{r2IB^O
z5R2QTVSgjT0Y*j!hJ`S@xV0wxaZj~Y0m(BkHyA<8<~{{60W8V{bw49q&kuww_m9bP
zJOw;_cN$Y5T6wZ2&*Cv=+%WkZj~)}xy~+Q0RHXRsfDK}35Q5Sc5C`$fO}63HXAGO1
z!)wSWHhCVeI^(*@$9Pqkc#lnf!z(Yz2UgAo)yCRj4zYsw-((d&eMvP)SVO{(fq{Xo
UK^UZ-&u?-LpFU&7<T-pZ046GN&Hw-a

delta 488
zcmew&yG3roMNcyZFkqAbQ*eTt3&LbHfY30Kdk%!f=mw!-Bu~v|DMoi@#+uDZEP||@
zat$m87#SG2<R;f}YO2eD*bEE}Mh6)G|NsBL!MH&hB*OWoL88I6LBBx?%zH9<0=onU
zh{?dvU_AK)XCPz7WG60t!B1c@js_u!Hm(Vio4AzNK!RLPCO_e{o4kZe*R}=3XMii>
zHfoRnncVmUEY93u+@KF)akn(=Z)7;Y$jHF35atf<tjT=bQ>{}#@(j!kMi6UwxF9Bg
zMVUZuXJBApgz4e2K*;h~Ouolmz{4-om;%+hYH}2hG2@5HeLQ+hymFKG@u*1g%YY4H
zXb^(Z77z#V#!ddiqt7^PvJS5yW7y<4UUkNIliPSznE2Qxui=%K^aCqrgKA@KFo#&d
lXE*r?ufAj&B%C2(%fP_E)*uX0&(}9uhfkkz$K)8k82}UdZifH>

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index fe6d42b2..cf0254c2 100644
--- a/artifacts/mods/gl_partycontrol.ssl
+++ b/artifacts/mods/gl_partycontrol.ssl
@@ -72,7 +72,7 @@ procedure combatturn_handler begin
       end
    end else if inControl then begin
       if displayName then hide_iface_tag(displayName);
-      if (status == -1 or AllowControl(pid) == false) then begin
+      if ((status == 0 or status == -1) and dude_obj != real_dude_obj) then begin
          set_dude_obj(real_dude_obj);
          obj_set_light_level(dude_obj, 100, 4);
          npcControl := 0;
@@ -84,11 +84,6 @@ procedure gamemodechange_handler begin
    if not(hasGeckoSkinning) then hasGeckoSkinning := has_trait(TRAIT_PERK, real_dude_obj, PERK_gecko_skinning_perk);
    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
       move_to(dude_obj, dude_tile, dude_elevation);
    end
 end