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
zcmZWnJ!lj`6u#M0@!Xx;o!PnIo)H2G-jBt?<**Zio`qcyNf8@CIS#>)Laqwtomg1O
zaSv03Ll7)1#3G8VS6HO+ihxb92th)$)J6o+H#55zR|jU_&-Z@5_jU$#IN$%WzM0GA
z@^she{&l=mAEb(v@@Hbd%=*KX#D1UktJK_06)V-Am9IPOQ^9lZj~LkuB*b{ropm`x
zP=^|LFpYh8mW}a^`ytvgQ4TalOozifoY5ZdDQ<f4<&A&PW`Z8TX^5e0&>To386+q#
zAE8{L$1Ch1HhIkM;i8<wM|{o^3SaT+bZ|1sZ1i>W)`Kq9h_$cS!f*T|TgC0-UABl9
z{HyD4;h0AJ9h2jv8OAEWcgxJ*qTW}IxMiZc6lJQ@R%l+mE%WV~FY7r_Ht}uZVP{L@
zZjTra{U}<t9D-$&aa`|KYrz6dR>vRyloXzU3KM96GeI+TpCGr{Z!pGoa3k8c^~CjT
zJ#h_pgP5)1DN$jMu_5MZ6K!EPQNv$irjl&q|4Dw+>E$hdxsT^$jqMS;OEO%VFf$aw
zIzE@TE*?%=TknSbdA-lZpQi_5Mhp+(U60m9(>_ZdNjSz<_(W_ckqtYVTEVa3Sw6IN
fG^U2A)E!ysWLuSr*jH0dsfsUD)hTswM=ksTRWZBr

delta 648
zcmY+BJxIeq6vuO^3bjd_T+WYbE24qcDh66tp@<G{P9k*?1rb4zA`T+;nn4^K#HSA8
zpiT}BqEJMNcIe<Dh~Od)4i36GN(b>inpzJodGE*j|KHs^+P|CF`P?{H6vfB(I@@(i
z!_{QB4zdt$S97kbTb37>y+HmgPyh0tldR0I7SO9dq9BS(h!dKkojeM-w4IJohjze3
zpjVgdkTFhjfnM|mr-27lhGne{UBH&+gwKS7N|PnTt>}<+(!SwQi|PYX%WHHSDq0L3
zK#%UAP3SUgSk-OSD8rE+kA$v;52DE(ZZqnxGAD<#;3T~1&&Y*Ba0$(V9UAxD(*}47
zrNYg$fmayKLfc5ORD`~mdm0->f&CsfMqt?(@^BNw;(kUB3dVGJMS7XSQK@;EDkMw?
z4M4_>p>A-^6#Ev;C8U6j$NlqCg;!t?_n|D@;t`BLYJEimTm)>*4X@P>DX0~fqshMu
z?qg3Nu4}E)ySyTXdEz~bH3OH{zL}|3Cgs720#hWa5B`mq41!A*F{%7-MULTzw5sF=
NT3g~OsX)3V{R<mYj=BH<

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index 9e251afe6..09dcd5357 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
zcmV-K2fO&S^a+>r34nwFv;seIe@$!~MHJq(9ow-T$5~q_EddOKDnObLHzhPcRT@_z
zqOGbn3aF}-uCp6w+wE>-Z+;b_@g92Wq3VGHLa6*4DpU!CP*qix(nF9qaDpBX0tu?3
zBH&QL1#tl8=gscU#-^#Lqn)4kX5P>D-kX`A$PHPNBn5SlKDLTtD2KMAe<J=K$KMn9
zdlL1cr_c_(ssn#<N%+NX!l1heJ%+zNk={0mn<)N<L-en36Tx3uq{m&Lzai2SqcAur
z($jl!Lp+)f(JzDEHIbfCU~oaCE9YQvS)}LrU?W85`@a?Gg&OPS^HOd=_+espTz4ic
zW6ZW@jVhj}@SIPw-uR$Ve|NA!!hFJV2sm{|t>HoT71OkrFxRQsCXsVYcMclWIkKiO
zW}m63&g4SPntoNaG*c%Qb&soO^h36$kIku8RS$3;ny?mi%du-KhwQ}wqd@7e8@j0l
zS7S}%rd?6ZDYX`$XJ(i&M1>?J=M9Z{k($?Qr|U2_iHXb;HZD_of5w`h@qNi?Mt$B?
zR}N!?F$#g%m~GlbSIVd#o3ocD)hZcV-qx(Ppy>yF9sZo^`3L`STpX!z#@6a5>a(h8
z?j*wj!!mHrt+Bj|^kb=-R#TT4JzLkEX(DObuACxLYr1L%2)Qce<B>jtm#L15DTd|D
zsx$g@O($ZAPeg{jf8dygg?%cJnL$@LYIWMtmnkBII%}%cIv!X3ahAo?^D@pLmQrQC
zvQVuW7Dgd?z)~wFp=QcK^s=g^`I;o@(Zff^iV&&d&LZaOTG7&%iWPf#v?xhEp5JSS
zjQY&letUVpS{t($D4t4rb1afaCdv@qBYvcF<EmjD)#n!+f7LN;OQP7LetPmq52{5`
z(kDjo3HEG&9z~_|r0+p{U|k9A5hyaDG%nL|3=NUKZ4_pu8#1+Z7aF9L2%-4v$O_bf
zwxMUx(<p;_Xy3#2Q!VlP&>jWtSGnaaw8J{G;(=)Y6{J(C@sqwT(Ec!`mr*x5fCkZa
z&Zm-!o^=ohe|J~VCSh%_ySuf$ejC5SZX;qZx01;LuiJw5CW<~<OqV-^M$mI1#7g10
zJLrzM0|HkDQ~=-j28!`rTd_O6qoFY@5{qsQ@?(Uf6GkQRF6yADd`8=iV9tWpHrSab
zeKH9%1#EmCbp0NpLp-8)n$*aT5IsqdTw{JFYl0-1e@8x9!I6i!Cy#^GU()uQK(6&M
zk6|yj-OJse#&oZsNkT8MRmo2UOm4NrB+lft{{k}w4bmNV-9?Z%MCP*O=Y3<6?)XT^
zED7yqJLMwOpv+?5zF){Z$%|vVu<AI93F~5BT`~Uq+&<d3VJQ^R_6tHS#XZDJ90~B6
z`*{uYe{j1w{Z<e!d2dU+5^TLR!Spm%{8{u)W0mx&K0(&eK-6L&MP^b`Ct#+yLt^|W
zZJ4e(#Vr<go)dJOXrdzmmPWWFi6SN?-3sj=V^M%vH*Hfe+eX_oo26-$rDKA|x&Np#
zo~e(}HUm<2;QJ)Ixq^i=K=$$&Dkkj;@%8y6e|qFh-RJIs({&hjyzSQ*S=V^2mA3Q`
zUaoM=OBdyFgm=9}=Nfv^tp>Aj^Ery;C+^|X|GJACw|N!9h+Bd!Xh^}+JG0@R%W?q0
z%qIan+5`BuI88e)h2#LPnLh<wd7S~bqu=Lt^un#f?+6(xEtDS}Z$T|9LZ!B$Jk7IV
zf7+JaMRy70p2fDVvpfa;X?|8iZMNb6vexn6P5k|au6Wjle9UcxqPYuBy<v_m*V%cM
zQ@AzQV`^=7id*k{Mb}L7m6UF}%V24~33nd2Dd2KCkA6bPHjd1sK;;@@O}Sh{6ix$v
z8V-49!w|@(eWwe2uCWw&0Vtg3P66ISe*z~#-U7nAN)o&xudF|UufEQT_x2kUZwcWw
zf%%PycfyM=4DclT1&UE!vp7QA1z8%C!LfuoplIY$>}<`Y#7ykGyOm69lCz%n+;v`W
zOk$4Qf>U3gYfM3wEQ`0DyWA{uK?=E*X_e*P4AfvKC+Ya?rd#ksuvc+c{5!Joe_a5J
zB*Q{+7#3YI5sR(}RI}{8_!NjrQ$)J@K`O6mqVM|vR$N~Zt%qw0R<v)*&LpEKMc|i!
zx;Z=Bz3fbdvNLtR*{Mid&d#WJzKYoio^;JJY!xT;W*Xt=PWY@-YFp31RyU9GvzLQ3
zdz9-edm0~8`aZNTd=~_3!_Vw{f1Rj7o%vNSd#KKQALzU-zNz!8Xr0_&c=#T_sq!cJ
zUC(&L=LUbR@eHB482P|Gjo@T%{B-~KZ?jt!MiFlWSyDLeWe2sgAO&hL61YJacfjZ3
zvG?B>_~YG#5chY4O1|XZJ~!mQ+3RNcUWhZF3V(^X7cL68d#{1QHAeT)8~2fw(B~W#
yCehpLzolhPabNa4Yl;8Aa$BfRw`zC-w*eFq6#xJc2LJ#&aRLCt0RR9OdIA7<v7Ijf

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