From 73ec85b01dce17614924bae4d56cfa4f71175a26 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Thu, 26 May 2022 22:55:08 +0800
Subject: [PATCH] Code edits to gl_npcarmor script

---
 artifacts/mods/gl_npcarmor.int | Bin 5338 -> 5358 bytes
 artifacts/mods/gl_npcarmor.ssl |  11 ++++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/artifacts/mods/gl_npcarmor.int b/artifacts/mods/gl_npcarmor.int
index 7c89d055c41e9996527da5ab20021a7427b0edc9..9f8c4ba23404195b656605d0a50ebc6b33b1cc95 100644
GIT binary patch
delta 877
zcmcbm`A%~}XT1Xh0|PSy1H&Q)6u`a!D!v0nn1Qo_fq{XMfq~%+syMe9l>Z1yLn&T6
zDB~NHhEjYhAPgZ!J_rLw@^9NL#kiA+bz1{VgZAVN{05sjSY|RZYD`|l8l%OgaR6jD
zV}lWxW@s>O&<C@a!6ZYIErf1-I=O~VXR-sEqF@JDgt@^8qLOXT<RUg>&W;8akT`qC
z<aKQJj53qov8hXzfJ7Krk<69`iLgga)??o&m;qulz|G+doBV-YlhJRo6o)#a&15GI
ze@2_hlQ?`CWhOu1aFt#LF`t2<fww`jL90Qtfu}(RWCCZ#WCzY99c}>-hk>!dsKEfl
z;<^AL!Tgh87ITAf1K4^lzRBk}jU^%SEDb_nS&+vevR;#=xRe<yCNJO-pB&01!+2qG
z5tkbix4`6GT=tARCja89)(-(|0a*ps!o8tEqCvkw3M|Tu<Xdn^azB{7fJb%mNp1m2
zAFv80kc$8R|Nn0=frKEB)#OjyhJii}EE7O+u?VKB!Lku-6R#S?@4RYY8MwVX4Or}D
zgvB7wy2&Lx+KhK5FW|9fRGa*ON1Rb*@(-SH#tD-Hcx4&aP0r(WX8bVOk6(TAO<n=U
z36o#(1~S%7w&BxeoG>|qFH(12!+x-Pt~8awT*^NW>;eXm4?w9F7Nq=Ali%^lGe%A3
z;|Gy?{PK)Fll}O2b6;yrfdsmM#bgnIOvXKv>jYXE=S*f1Y-E&}+$Jc`IBD`SL0`t6
x$zKE;n1nbcmkEI!aYCq{QDkz2urK46$;*Vp8FME86VBwk0|^F^DU%CCvH%c9&8GkW

delta 918
zcmaE-c}sIbXT1&s0|PSy1H&Q)6u{mC72km(%)pt$z`(%Bz`$?@Rh(N1%6|l<p%kwc
zl<^HpLn*!~5QY#VAA|uT`4?@LV%*8Zyr_X?@&b0F%^WN<85u<;FJg@mV_-f2vYD~L
zsL2+_YJ56*0-w(01I(<GBiUpGOTgmH4Mq+6AQsz-$!%=LoFxq`ARc?k<U?%sj2x4h
z*wrNyKq3sR4Mt#^p~1L88pL9Eo9x8CQ7{C=W`LW+=`@*zLzB^JvL1&zqsHVg4u3|C
z$;&u=8963@;c%6n1Tmk1p@FwSvO%jsvw^2U24n(f$m9^tBpt3lAPxg#gHeM4h{d%B
zM1uJz!7OH&^_;&ZKjJi&gvhfr2!Uncj^i?$tjDFym@;_}i}K|6tQ?bTxi}d2Om5?H
zW8(TV`5c!$<C4jI+|_~(U~M4lz<%PMGkF%bEaREUJGf05EhfL?7H3qO%*JDAY|+3n
z0TiN(!0MSAj2bK(!9M2|g7}CR;sCfwJUNrIcw`x8P43{)W;`)@2e<0vn><pI5LMu?
z{Qv*|{{|CC=<^Cp=HU&OuW8s1w&hAw8Azt_3D`E~215|dJ8N<iuQTJF$;Wuj8EYp0
z;|*lYnjFBV%~&(JhA*<d3so;j2Y(lcWMF{C93w2~_}LmH8eALn8>CR=nc(tn4H9r!
zkdID4)j?yPA6@?B0dU#`#SJ(y@mEYf#;ZQLlYa{Lp~e(QauHCOtRaxexMK1ofmX(j
z$r6H%j4YF93Cc6pP2MHw%UCg)L#TmC@XO>bA&|fB2=y~EOwJMZWqdGsmvA^^#AG3n
QOwJRKuoh{U+#-?%0FuJkQ~&?~

diff --git a/artifacts/mods/gl_npcarmor.ssl b/artifacts/mods/gl_npcarmor.ssl
index b4c0741d..7719a799 100644
--- a/artifacts/mods/gl_npcarmor.ssl
+++ b/artifacts/mods/gl_npcarmor.ssl
@@ -224,12 +224,13 @@ procedure update_armor_apperance begin
 end
 
 procedure canuseweapon_handler begin
-   variable critter, canWield;
+   variable critter, canUse;
    critter := get_sfall_arg;
    if (critter != dude_obj and get_sfall_arg_at(3)) then begin
-      canWield := check_weapon_change(critter, get_sfall_arg, true);
-      // override result
-      set_sfall_arg(3, canWield);
-      set_sfall_return(canWield);
+      canUse := check_weapon_change(critter, get_sfall_arg, true);
+      if (canUse == false) then begin
+         set_sfall_arg(3, 0);
+         set_sfall_return(0); // overrides the result of engine function. Any non-zero value allows using the weapon
+      end
    end
 end