From daf9e57d36ebbf22322fd50043f7fb0375897777 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Thu, 5 Oct 2023 09:24:34 +0800
Subject: [PATCH] Updated NPC combat control mod for player's Jinxed trait/perk

* controlled critters will now be "Jinxed" as well (closes #492)
---
 artifacts/mods/gl_partycontrol.int | Bin 5394 -> 5504 bytes
 artifacts/mods/gl_partycontrol.ssl |  15 +++++++++++++--
 artifacts/sfall.dat                | Bin 162069 -> 162099 bytes
 artifacts/sfall_ru.dat             | Bin 162327 -> 162357 bytes
 artifacts/sfall_zh.dat             | Bin 162086 -> 162116 bytes
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int
index 5843a2281a38d675c9832cb9c222bbccaee753fb..83280fac8151a8da1334a7fd2c51f47b4fbd5776 100644
GIT binary patch
delta 834
zcmbQF)u27$W&JD$1_ovZ28J326u<-HO@c8Xw9qdI&9DYaLn+}rDB}o}hEgI>n&B3V
z0ii`6K<LdGjCVMBxa$ruGB7YOHV8H7Pfp-g=H_jXY|v`ZY~X2-nLL48nep7@E!<}%
zH-S|#H5eUW1SxMYZjc6v@XVV$i$~vi8i>t+kTrqIK5LL@&~K0e%Q7?wfoaADs4TA(
zLY7x(G7qmhW6NX{UVX-r$pJztlRJ1-m;^;8ujAE_5#WI8G@1ai+@-0k!K6VSB*y15
z`4jI|#)8Qw_;MKoCY$kl)^BTI0m<-R0+9?%FdbkXXTxWR%lJ1nNHn-2+=im6tl=}n
zbOuI{e?g%I)?EfB85@}zq`>Oan#!PlgQ-h7z&LphzocXo#0>&bU>&TWum!OM93}?{
zX-)pYFD4|&0}^21giB4DtRP?l6J~1=g1A%Q+~hQYXvs$q^8`b{n&9RM22H*tpwCz{
znM+Wev2U`GpfO{?<TOD@NN7&}E2y9j4Gm16{Qv*|e<L%*{X&l>s|jf`KA0RJ<Rl~<
z2DSv`GH?_NYfWAvlx+I~EDEw3B03Ecd5urN;>-=kkRTI&(XhXf0h~w{!V-z_xydfV
zQw2{zRT@FOCXzS#m9Q-D9Edp}IgvS&MMScML^D7f2DnwCe3K`Lh%t$3OkN?P!6ce7
I`I3kO097%&@&Et;

delta 648
zcmZqBo}@M5W&Iik1_ovZ28J326u=_{<xYaqP)eu=$^hwuGC`CuhydXuAOeAfVft?&
z#6T>OA`r>IusMVA4yOzQV}sBEMvzE@af397#og2((cs#k-yk(PfLoatA~vf*0xVL;
zt<3mf@*?iDj7KIH@Q5>RnB2jmFS!DwkAbPd=l~<gs0I^=NjyI$U*M7D)q&^*so_<b
z{EJ7OaoS`hUVX;4$#McJlgoHjm;{bYp2Mpl!@mQhhJmrcXadL>m!`4?lLmc|7+=`r
z2fSAqn<j7L%VkWOtitcfe4>G6@+E#_Nv;MKkO~1V5Xr#WAOz9D|6#J6fP;|09<VSc
zOjy8aa)E#eOqi`f2;x$Ky2;xFq9scpW(k5#M3^PWG+9efpHXLWl%P7J!sI4FV@8F^
z+XQnN878X;d2*&fbP1JAo+6~lSTuQ`kdu(m3%I@D02JCYSx7k9whAl?awJ$(SOXF?
zjZeVh%nim6#|u|A>~CZM2j)Upv<N3m-XuI#Fbb;D2;y)NhRG2kvb=f_b3k$;dXt+(
kvV=r_fjD44fUOc)F!`T|7?a4Z$zq}!Od`J~JBT^}02@<|x&QzG

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index 9e251afe..09dcd535 100644
--- a/artifacts/mods/gl_partycontrol.ssl
+++ b/artifacts/mods/gl_partycontrol.ssl
@@ -12,7 +12,7 @@
    NOTE: this script requires compiler from sfall modderspack with -s option
    (short circuit evaluation)
 
-   version 1.3
+   version 1.4
 
 */
 
@@ -44,8 +44,12 @@ variable
    dudeLightInt, dudeLightDist;
 
 
+// returns non-zero for a controlled NPC
 procedure AllowControl(variable pid) begin
-   return ((pidList == 0 or scan_array(pidList, pid bwand 0xFFFFFF) != -1) and (party_member_obj(pid)));
+   if (pidList) then begin
+      return scan_array(pidList, pid bwand 0xFFFFFF) != -1;
+   end
+   return party_member_obj(pid);
 end
 
 procedure SetLight(variable critter, variable lInt, variable lDist) begin
@@ -99,6 +103,10 @@ procedure CombatTurn_Handler begin
             level := has_trait(TRAIT_PERK, real_dude_obj, perkID);
             if (level) then critter_add_trait(critter, TRAIT_PERK, perkID, level);
          end
+         // special handling if dude has Jinxed trait/perk
+         if (has_trait(TRAIT_TRAIT, real_dude_obj, TRAIT_jinxed) or has_trait(TRAIT_PERK, real_dude_obj, PERK_jinxed_perk)) then begin
+            critter_add_trait(critter, TRAIT_PERK, PERK_jinxed_perk, 1);
+         end
          intface_redraw;
 
          obj_set_light_level(critter, 100, 4);
@@ -138,6 +146,8 @@ procedure CombatTurn_Handler begin
             level := has_trait(TRAIT_PERK, real_dude_obj, perkID);
             if (level) then critter_rm_trait(critter, TRAIT_PERK, perkID, level);
          end
+         // special handling for Jinxed
+         critter_rm_trait(critter, TRAIT_PERK, PERK_jinxed_perk, -1);
       end
 
       if (status < 0) then begin
@@ -152,6 +162,7 @@ procedure GameModeChange_Handler begin
       inControl := false;
       npcControl := 0;
       move_to(dude_obj, dude_tile, dude_elevation);
+      DEBUGMSG("Move to dude after NPC control.")
    end
 end
 
diff --git a/artifacts/sfall.dat b/artifacts/sfall.dat
index 241cfa53634e6fc57728f6c2cdbe9b4a1f9582dd..28537126d730128d6f3bef0a5effd9d922093667 100644
GIT binary patch
delta 1890
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

delta 1860
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

diff --git a/artifacts/sfall_ru.dat b/artifacts/sfall_ru.dat
index 48a2cba1d0c3de1a518ffc7b6130f9f5289ec999..b6a41beaa2ef26f683d6253c040f90f640106a9d 100644
GIT binary patch
delta 1890
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

delta 1860
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

diff --git a/artifacts/sfall_zh.dat b/artifacts/sfall_zh.dat
index 2c739770557dd9699556da4a263654ca9be96a6e..cbed484f736189d906b5515d6336037fd696e73e 100644
GIT binary patch
delta 1890
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

delta 1860
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