From cbb6afac7c874b47c79a450f1f687fc6efd2b28f Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Tue, 16 Oct 2018 22:18:35 +0800
Subject: [PATCH] Updated NPC combat control mod to work with BoxBarCount.

Added additional notes to HOOK_COMBATDAMAGE in hookscripts.txt.
---
 artifacts/mods/gl_partycontrol.int  | Bin 2346 -> 2466 bytes
 artifacts/mods/gl_partycontrol.ssl  |  11 +++++++----
 artifacts/scripting/hookscripts.txt |   4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/artifacts/mods/gl_partycontrol.int b/artifacts/mods/gl_partycontrol.int
index 59a4e14d3365814d18b22e568a58320a84678e2a..eb15a3ab7db85888621404a2037c223b75f1c622 100644
GIT binary patch
delta 813
zcmZ1_v`AQ>f$0Dv0|SFl122eX=9?&BSntIE0TK`jMlyrMnHd-uRA3?yn)w6+0|OHS
z1A_^K4<lJBpyC@~A`qI@075eygVIon-44Q#Vt4>yz)1FGP}ZY~w`zHKauX|@@++M4
zOY=%5hcYHGx=r53_*a!9z|+Miv$%wTK_(@oD6w2GGcU8oH?ugo#wowTDX|Emegl)r
z<a<m8lR21q8JA5KV|Hd-H#v&ARx%9adj_TkqXUfp|NsBrVB8=L5@E5L{DC=>an0l?
z79A#5vB@1Qk&L@0KVr#dd^OpRRh;qB<TO@!#z&LeSPhuiq$clRm62hSYLIAfZP0I!
z0vW)-++ft`-JlO*v$akBz^cn$0b(<-O;%yk<!5aW2JzS)fk+0{$q8&AGb`9^blBAz
zSU`g8Y9Nw<wLz#se*!3`u7JrSO=V5x5G&Z#CO=>^cFzH;V}Qwmd7cfQAyzXmg86I^
z>)87m*Ms>E4Gtiug4qmUl6A5kyCQd2V+zFo>?bBiu^TaQ@J;Sx*JI+anJmYlqQTh(
zR?5&I1f?w?mT;6c@Pe)10wNiiCU4+S&;c`f8rOi8vNTviX|T6BPM~PentX;`k^cvZ
zn8oBj><aaqkU(I8+Q`{p4zZDe6WKV<JTQ+5s*1J29O4PiIFuNH$+I*FH9%d?0P#E%
WBzPFWQP05Alms?U{=j5zPI&-oF{~*7

delta 714
zcmZ1^yh=!*f$0Dv0|SFl122eXdNfhMuwH@z0$?<R$G{BYGczzSs6Yjv6!SC&1_mYu
z1_l$T0F+{JgNiSL3P35Ae^AB_C=I39c_0iahD#6zjAZwKvaU?LRXaJAF^*AV@)5?r
zlV36^ax!oPc)Ivx7MD!sWHy}az|79*G1-IJnXzVa4|A=g$^nq)m>P@@F#iAl|9^vV
zgEUBlg=4Z3OD1F0<Q^6sCYC3Ycd<k=c1#vw&1T#&xq(%jal_;ptn!Q-ChuT1U}AkS
z`4y{-4C{*qi3ZmO{RSzJ0SwFyMvdML`XDx2$YdopU3NDRn}Kz57@Mv-OM@_o$F>1P
zGO#oVHRw0&Z`j{(rD1==n}%%=GuSpvUd3jk!}g_t1*DAa3y6d$o&a+76)<_EsjR6S
zs^QCIA$DVFgU0n>l@1LKAP0fj3}BLFau2&Aw@_mW#Fy+@lXtKiF|lu${Dxgmfc-%O
zFWAH_Ad-=3@)iz7egPCQfyqxe6qq>dCd+WB)N{0e&17m20@JJw<`7dkN>Bm<CePVm
z0SOKUh+CK-LBI*o%>Xrp0j7#$ABxS;cmmtR+`xK(kzsNr2R~Sp;~Q9%p<zFm_H6hJ
OwTBVRXPunGX$AnCO_%Bb

diff --git a/artifacts/mods/gl_partycontrol.ssl b/artifacts/mods/gl_partycontrol.ssl
index 125141d7..d7e2b7b6 100644
--- a/artifacts/mods/gl_partycontrol.ssl
+++ b/artifacts/mods/gl_partycontrol.ssl
@@ -21,6 +21,7 @@ variable
    pidList,
    displayName,
    displayNameColor,
+   maxBoxCount,
    inControl := false,
    hasGeckoSkinning := false;
 
@@ -57,6 +58,7 @@ procedure combatturn_handler begin
 end
 
 procedure gamemodechange_handler begin
+   if has_trait(TRAIT_PERK, real_dude_obj, PERK_gecko_skinning_perk) then hasGeckoSkinning := true;
    if not(get_game_mode BWAND COMBAT) then inControl := false;
 end
 
@@ -65,14 +67,15 @@ procedure start begin
       set_perk_ranks(PERK_gecko_skinning_perk, 1);
       set_perk_level(PERK_gecko_skinning_perk, 999); // prevent it from appearing in the perk selection window
       controlMode := GetConfig("CombatControl", "Mode", 0);
-      displayName := GetConfig("CombatControl", "DisplayName", 0);
-      displayNameColor := GetConfig("CombatControl", "DisplayNameColor", 0);
       if (controlMode > 2) then controlMode := 0;
-      if (displayName < 5 or displayName > 9) then displayName := 0;
       if (controlMode > 0) then begin
          pidList := GetConfigListInt("CombatControl", "PIDList");
          fix_array(pidList);
-         if has_trait(TRAIT_PERK, dude_obj, PERK_gecko_skinning_perk) then hasGeckoSkinning := true;
+         maxBoxCount := get_ini_setting("ddraw.ini|Misc|BoxBarCount") + 4;
+         displayName := GetConfig("CombatControl", "DisplayName", 0);
+         displayNameColor := GetConfig("CombatControl", "DisplayNameColor", 0);
+         if (maxBoxCount < 9) then maxBoxCount := 9;
+         if (displayName < 5 or displayName > maxBoxCount) then displayName := 0;
 
          register_hook_proc(HOOK_COMBATTURN, combatturn_handler);
          register_hook_proc(HOOK_GAMEMODECHANGE, gamemodechange_handler);
diff --git a/artifacts/scripting/hookscripts.txt b/artifacts/scripting/hookscripts.txt
index e19f13b1..67329cf0 100644
--- a/artifacts/scripting/hookscripts.txt
+++ b/artifacts/scripting/hookscripts.txt
@@ -162,8 +162,8 @@ critter arg1  - The target
 critter arg2  - The attacker
 int     arg3  - The amount of damage to the target
 int     arg4  - The amount of damage to the attacker
-int     arg5  - The special effect flags for the target
-int     arg6  - The special effect flags for the attacker
+int     arg5  - The special effect flags for the target (use bwand DAM_* to check specific flags)
+int     arg6  - The special effect flags for the attacker (use bwand DAM_* to check specific flags)
 int     arg7  - The weapon used in the attack
 int     arg8  - The bodypart that was struck
 int     arg9  - Damage Multiplier (this is divided by 2, so a value of 3 does 1.5x damage, and 8 does 4x damage. Usually it's 2, but with Silent Death perk and the corresponding attack conditions, it's 4; for critical hits, the value is taken from the critical table)