From fc53df5a16bdd26aeba4031657521f1bf6d1ebc8 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sun, 9 May 2021 19:21:40 +0800
Subject: [PATCH] Added a new hook: HOOK_CANUSEWEAPON

Updated NPC armor appearance mod script.
---
 artifacts/mods/gl_npcarmor.int         | Bin 5018 -> 5216 bytes
 artifacts/mods/gl_npcarmor.ssl         |  15 +++++-
 artifacts/scripting/headers/sfall.h    |   1 +
 artifacts/scripting/hookscripts.md     |  16 +++++++
 sfall/FalloutEngine/Functions_def.h    |   2 +
 sfall/Game/combatAI.cpp                |  28 ++++++++++++
 sfall/Game/combatAI.h                  |  19 ++++++++
 sfall/Modules/HookScripts.cpp          |   1 +
 sfall/Modules/HookScripts.h            |   1 +
 sfall/Modules/HookScripts/CombatHs.cpp |  61 +++++++++++++++++++++++--
 sfall/Modules/HookScripts/CombatHs.h   |   2 +
 sfall/ddraw.vcxproj                    |   2 +
 sfall/ddraw.vcxproj.filters            |   6 +++
 13 files changed, 148 insertions(+), 6 deletions(-)
 create mode 100644 sfall/Game/combatAI.cpp
 create mode 100644 sfall/Game/combatAI.h

diff --git a/artifacts/mods/gl_npcarmor.int b/artifacts/mods/gl_npcarmor.int
index 1fb06619983fdfb790a0587090706f6df32e7ed5..fe51142f3de4528c6e86e87e5306f7bc836acfde 100644
GIT binary patch
delta 1373
zcmbQG{y;;Zf$0Dv0|SFl122eXZkQ+_ThGP7z`(|U0+=^Ixe`zsO2NgApaM{eH4e(?
zfznWl^%(;L12Y2y!y>2vlwx;-itk`xsE3MyDNZ#81_qD|&w#mbf@=ko`3OowDIS<Z
zzd;3{6rU7?!N>=pVI;o>gvBVpAfN{UlZ6>oM8%R5^Gb_T%Tp5z^7G;|67y1WQj0d5
zFnTaC@oP-3V-96>n|y`YS2P0@YzzzyMh*KLj2rYpJXW>IW-M|-tZE<*17m{`M3`mI
z<UDTi$+avzll3|I?O55s(o79T2N?hV|Np<ixIr2u!t$p<qQSL6zd;JbV_<49YAOM<
z7!c++uuML~r84;!iv$Y`O9RW~2i$5&jZdJe3_&#OIS>hU7sO3#AQ21_fvRK#t6&C`
zEDfw+ny~?_n*k!q*kIIT3l%qNd^-67x8Y=WR%s!2J+L4%%x7##lS^2QxY+d?SU?i&
zdXqP>+A|)S{DD<XiXGw&R**MAAr12;JHuoHwhcm@d>|bRaHBZ>O#Z~C$@pcm47)nx
zqscDp{)~?%Pht0EJT&<cyNe8m55x)vh6dgS$p)<k%?6$Z8ITd2e3P9xl61J5Kpb$O
z8-Q3`P9PG@KM7_r!$OhEY4QaQamGE9UvMZhzJf)KAS@)9AR)o!G}(dEjftyiatEg!
z6KCAy6P(rh$G|3mA{HED+)51+@c3dz@+dguxq~L>aqB8V&Ewt&){BUB6G-CVUNiXs
zmto+(29^n+#6AJ0s==}`1jOc<0r5D`3=j|OABf$bu-MHA^COSKWG8MdCLX`ZdEBbf
zFt4#fyvD%VVAS{&WE{_o$?LeqBzUGF(g;YH0g^&kC*R?AVB%w%EXO0m#H%pbhR2DC
zH)(PMkGdc;G}$mfOypylyn`o@@xx>;UM-LYGu{Y2eu0MlU@skNDr<mxmR|sDJOebS
zK+XkwhOcMx9$tCIGn4Ot$v?dEjQ>FPFtSW`;hV%G;?bA_$s_!$CO_iKU=q}u?8D!}
zB*-`U5`Tk|Ko=y47&zeOT7vE2fVfV8WpastFXO+-hXfj!1gj>y2!fnCO|XwixNWkU
zkPnk^+T;?UaK?L+&j@933Hd=x6JeWdCoHSW)|3P`3zC}Ip*#t&7zdOGPH+rNO|_G&
GgcShn?j{ZZ

delta 1179
zcmaE$F-u*bf$0Dv0|SFl122eX4wxt)ThGbBz`(|U0+<`1TnQ)*rQqTvPyr~#s>i^<
zz|6qF&;=EMQfz%t@dZ!;D8-S-z`y`<$QA~MIH(wy;`{)n7#L1LX(+}01IoAurJ)pW
z5|r@`N<%5W0x09hWF<!3&FPG;OiX+Qlh-kaGKx)RVeu8U0QsMRp~0wOe}i#@K8VNi
zZE_lmoDj=55Ql-W!3ZkcGkF?|vNux$D_ESV!4O2VTmz8|Obtc{82|tO|G&YwK^i2&
za;8C|!L>oZK?=kJ$v2gNSqw<lu&~-OF<+VdfJ0>R16C^`wlc5^W|)nvt0wEP8F8_d
zHL!pr*vcknu-P+mO<uvK#>AF1`2w356Pw567i=4ZIKn^*7~ncNTqdt#*JQMre1%<|
zQET!ac7H~#$vzyuj9imvakwzCPnrCHLxPDTZ1OLTBq7dIV9g+p8h}`wU6b=TC8RjJ
zKpX~^1|cvFayQs#oGg<Ua4ItzO`gVL#KhS(`3I*P6X&VP4qSFj9Lpv*a8(QPfi-~4
z18d;Qn#{v3!^AafvKF_hAX@lwvrSIm7GvW2GP#1=(3q`(WdbNUOaPm})L_(L*%$(1
zb3cHD0rvwC4;(3Av$?G%-{F>F;?9`-i(89{d)j0zZr#bjJc1@rg{<&+F@eM)_dQ6G
z2Squ=C@{&=z}g@+c><S>0<TxYey|%3HI+4(H0U=z0V`mJL^n^y<S#r<OgyV5TkxvG
z{lWl|<n@|dz#GVDG5HX$789@6<afLg^?VVi#(@muivW=b7r@dC?-i6Z!vJzS0|NsS
zOrB4qK?0tlK*4(gY7R8bVaT66Fu9VGmx<49vIVdHWM=+u9^t0O6i5Q)`!snLe+H94
z*<==h7AAqP$z1{sO#GK7^9af@@%v2H5%gtrn_MN>z$9>J@*hEvul$7in1s$vz9;0v
zB(!d_j&L}m+T<4D3^&1Pkhl@{g9R<vS&X0{1+yf<Bx_R=n1*BsHYiU5EXLlHG}%E!
F0RY<z0XqNy

diff --git a/artifacts/mods/gl_npcarmor.ssl b/artifacts/mods/gl_npcarmor.ssl
index 422154cd..32fd3c54 100644
--- a/artifacts/mods/gl_npcarmor.ssl
+++ b/artifacts/mods/gl_npcarmor.ssl
@@ -9,7 +9,7 @@
    NOTE: this script requires compiler from sfall modderspack with -s option
    (short circuit evaluation)
 
-   version 1.1
+   version 1.2
 
 */
 
@@ -21,6 +21,7 @@
 #define FID_OBJ_CRITTER  (0x01000000)
 
 procedure update_armor_apperance;
+procedure canuseweapon_handler;
 
 variable
    modIni := "npcarmor.ini",
@@ -203,6 +204,7 @@ procedure start begin
       register_hook_proc(HOOK_INVENWIELD, invenwield_handler);
       register_hook_proc(HOOK_ADJUSTFID, adjustfid_handler);
       register_hook_proc(HOOK_INVENTORYMOVE, inventorymove_handler);
+      register_hook_proc_spec(HOOK_CANUSEWEAPON, canuseweapon_handler);
 
       debug_msg("NPC armor appearance mod: Done.");
    end
@@ -220,3 +222,14 @@ procedure update_armor_apperance begin
       end
    end
 end
+
+procedure canuseweapon_handler begin
+   variable critter, canWield;
+   critter := get_sfall_arg;
+   if (critter) then begin
+      canWield := check_weapon_change(critter, get_sfall_arg, true);
+      //if (canWield != 0) then canWield := 1;
+      set_sfall_arg(3, canWield); // override result
+      set_sfall_return(canWield);
+   end
+end
diff --git a/artifacts/scripting/headers/sfall.h b/artifacts/scripting/headers/sfall.h
index 2de164b0..b596aa7b 100644
--- a/artifacts/scripting/headers/sfall.h
+++ b/artifacts/scripting/headers/sfall.h
@@ -73,6 +73,7 @@
 #define HOOK_ADJUSTRADS       (45)
 #define HOOK_ROLLCHECK        (46)
 #define HOOK_BESTWEAPON       (47)
+#define HOOK_CANUSEWEAPON     (48)
 
 //Valid arguments to list_begin
 #define LIST_CRITTERS    (0)
diff --git a/artifacts/scripting/hookscripts.md b/artifacts/scripting/hookscripts.md
index 877c6868..4b81fec3 100644
--- a/artifacts/scripting/hookscripts.md
+++ b/artifacts/scripting/hookscripts.md
@@ -888,3 +888,19 @@ Critter arg4 - the target of the critter (can be 0)
 
 Item    ret0 - overrides the chosen best weapon
 ```
+
+-------------------------------------------
+
+#### `HOOK_CANUSEWEAPON (hs_canuseweapon.int)`
+
+Run when the AI checks whether it can use a weapon.
+This mostly happens when NPCs try to find weapons in their inventory or on the map.
+
+```
+Critter arg0 - the critter doing the check
+Item    arg1 - the weapon being checked
+int     arg2 - attack type (see ATKTYPE_* constants)
+int     arg3 - original result of engine function: 1 - can use, 0 - can't use
+
+int     ret0 - overrides the result of engine function. Any non-zero value allows using the weapon
+```
diff --git a/sfall/FalloutEngine/Functions_def.h b/sfall/FalloutEngine/Functions_def.h
index 01c1672c..86e5232e 100644
--- a/sfall/FalloutEngine/Functions_def.h
+++ b/sfall/FalloutEngine/Functions_def.h
@@ -19,6 +19,8 @@
 	because the compiler builds the better/optimized code when calling the engine functions
 */
 WRAP_WATCOM_FFUNC4(long, _word_wrap, const char*, text, int, maxWidth, DWORD*, buf, BYTE*, count)
+WRAP_WATCOM_FFUNC4(fo::GameObject*, ai_best_weapon, fo::GameObject*, source, fo::GameObject*, prevItem, fo::GameObject*, checkItem, fo::GameObject*, target)
+WRAP_WATCOM_FFUNC3(bool, ai_can_use_weapon, fo::GameObject*, critter, fo::GameObject*, item, DWORD, hitMode)
 WRAP_WATCOM_FFUNC3(long, ai_have_ammo, fo::GameObject*, critter, fo::GameObject*, item, fo::GameObject**, outAmmo)
 WRAP_WATCOM_FFUNC3(long, ai_pick_hit_mode, fo::GameObject*, source, fo::GameObject*, item, fo::GameObject*, target)
 WRAP_WATCOM_FFUNC3(fo::GameObject*, ai_search_inven_weap, fo::GameObject*, source, long, apCheck, fo::GameObject*, target)
diff --git a/sfall/Game/combatAI.cpp b/sfall/Game/combatAI.cpp
new file mode 100644
index 00000000..79e1acec
--- /dev/null
+++ b/sfall/Game/combatAI.cpp
@@ -0,0 +1,28 @@
+/*
+ *    sfall
+ *    Copyright (C) 2008-2021  The sfall team
+ *
+ */
+
+//#include "..\main.h"
+#include "..\FalloutEngine\Fallout2.h"
+
+#include "..\Modules\HookScripts\CombatHs.h"
+
+#include "combatAI.h"
+
+namespace game
+{
+
+namespace sf = sfall;
+
+// Implementation of ai_can_use_weapon_ engine function with the HOOK_CANUSEWEAPON hook
+long CombatAI::ai_can_use_weapon(fo::GameObject* source, fo::GameObject* weapon, long hitMode) {
+	long result = fo::func::ai_can_use_weapon(source, weapon, hitMode);
+	return sf::CanUseWeaponHook_Invoke(result, source, weapon, hitMode);
+}
+
+void CombatAI::init() { // TODO: add to main.cpp
+}
+
+}
diff --git a/sfall/Game/combatAI.h b/sfall/Game/combatAI.h
new file mode 100644
index 00000000..0a19075d
--- /dev/null
+++ b/sfall/Game/combatAI.h
@@ -0,0 +1,19 @@
+/*
+ *    sfall
+ *    Copyright (C) 2008-2021  The sfall team
+ *
+ */
+
+#pragma once
+
+namespace game
+{
+
+class CombatAI {
+public:
+	static void init();
+
+	static long ai_can_use_weapon(fo::GameObject* source, fo::GameObject* weapon, long hitMode);
+};
+
+}
\ No newline at end of file
diff --git a/sfall/Modules/HookScripts.cpp b/sfall/Modules/HookScripts.cpp
index a1a0eed4..27a2e7e9 100644
--- a/sfall/Modules/HookScripts.cpp
+++ b/sfall/Modules/HookScripts.cpp
@@ -109,6 +109,7 @@ static HooksInjectInfo injectHooks[] = {
 	{HOOK_ADJUSTRADS,       Inject_AdjustRadsHook,       1},  // always embedded for party control fix
 	{HOOK_ROLLCHECK,        Inject_RollCheckHook,        0},
 	{HOOK_BESTWEAPON,       Inject_BestWeaponHook,       0},
+	{HOOK_CANUSEWEAPON,     Inject_CanUseWeaponHook,     0},
 };
 
 void HookScripts::InjectingHook(int hookId) {
diff --git a/sfall/Modules/HookScripts.h b/sfall/Modules/HookScripts.h
index beb6391d..fa069ebd 100644
--- a/sfall/Modules/HookScripts.h
+++ b/sfall/Modules/HookScripts.h
@@ -74,6 +74,7 @@ enum HookType
 	HOOK_ADJUSTRADS       = 45,
 	HOOK_ROLLCHECK        = 46,
 	HOOK_BESTWEAPON       = 47,
+	HOOK_CANUSEWEAPON     = 48,
 	HOOK_COUNT
 };
 
diff --git a/sfall/Modules/HookScripts/CombatHs.cpp b/sfall/Modules/HookScripts/CombatHs.cpp
index 0ff0c430..a6b7266c 100644
--- a/sfall/Modules/HookScripts/CombatHs.cpp
+++ b/sfall/Modules/HookScripts/CombatHs.cpp
@@ -600,12 +600,12 @@ static fo::GameObject* __stdcall BestWeaponHook_Script(fo::GameObject* bestWeapo
 
 static void __declspec(naked) ai_search_inven_weap_hook() {
 	__asm {
-		push ecx;
-		push ebx;
-		push edx;
-		push eax;
+		push ecx; // target
+		push ebx; // weapon2 (secondary)
+		push edx; // weapon1 (primary)
+		push eax; // source
 		call fo::funcoffs::ai_best_weapon_;
-		push eax;
+		push eax; // bestWeapon
 		call BestWeaponHook_Script;
 		retn;
 	}
@@ -619,6 +619,48 @@ fo::GameObject* BestWeaponHook_Invoke(fo::GameObject* bestWeapon, fo::GameObject
 }
 */
 
+static long __stdcall CanUseWeaponHook_Script(long result, fo::GameObject* source, fo::GameObject* weapon, long hitMode) {
+	BeginHook();
+	argCount = 4;
+
+	args[0] = (DWORD)source;
+	args[1] = (DWORD)weapon;
+	args[2] = hitMode;
+	args[3] = result;
+
+	RunHookScript(HOOK_CANUSEWEAPON);
+
+	if (cRet > 0) {
+		result = rets[0];
+		if (result != 0) result = 1;
+	}
+
+	EndHook();
+	return result;
+}
+
+static void __declspec(naked) CanUseWeaponHook() {
+	__asm {
+		push ecx;
+		push ebx; // hitMode
+		push edx; // weapon
+		push eax; // source
+		call fo::funcoffs::ai_can_use_weapon_;
+		push eax; // result
+		call CanUseWeaponHook_Script;
+		pop  ecx;
+		retn;
+	}
+}
+
+long CanUseWeaponHook_Invoke(long result, fo::GameObject* source, fo::GameObject* weapon, long hitMode) {
+	return (HookScripts::HookHasScript(HOOK_CANUSEWEAPON))
+	       ? CanUseWeaponHook_Script(result, source, weapon, hitMode)
+	       : result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 void Inject_ToHitHook() {
 	HookCalls(ToHitHook, {
 		0x421686, // combat_safety_invalidate_weapon_func_
@@ -709,6 +751,14 @@ void Inject_BestWeaponHook() {
 	HookCall(0x429A59, ai_search_inven_weap_hook);
 }
 
+void Inject_CanUseWeaponHook() {
+	HookCalls(CanUseWeaponHook, {
+		0x429A1B, // ai_search_inven_weap_
+		0x429CF2, // ai_search_environ_
+		0x429E1C  // ai_pick_hit_mode_
+	});
+}
+
 void InitCombatHookScripts() {
 	HookScripts::LoadHookScript("hs_tohit", HOOK_TOHIT);
 	HookScripts::LoadHookScript("hs_afterhitroll", HOOK_AFTERHITROLL);
@@ -722,6 +772,7 @@ void InitCombatHookScripts() {
 	HookScripts::LoadHookScript("hs_subcombatdmg", HOOK_SUBCOMBATDAMAGE);
 	HookScripts::LoadHookScript("hs_targetobject", HOOK_TARGETOBJECT);
 	HookScripts::LoadHookScript("hs_bestweapon", HOOK_BESTWEAPON);
+	HookScripts::LoadHookScript("hs_canuseweapon", HOOK_CANUSEWEAPON);
 }
 
 }
diff --git a/sfall/Modules/HookScripts/CombatHs.h b/sfall/Modules/HookScripts/CombatHs.h
index 04ed91f4..5027e204 100644
--- a/sfall/Modules/HookScripts/CombatHs.h
+++ b/sfall/Modules/HookScripts/CombatHs.h
@@ -19,11 +19,13 @@ void Inject_OnExplosionHook();
 void Inject_SubCombatDamageHook();
 void Inject_TargetObjectHook();
 void Inject_BestWeaponHook();
+void Inject_CanUseWeaponHook();
 
 int __fastcall AmmoCostHook_Script(DWORD hookType, fo::GameObject* weapon, DWORD &rounds);
 
 long CalcApCostHook_Invoke(fo::GameObject* source, long hitMode, long isCalled, long cost, fo::GameObject* weapon);
 //void FindTargetHook_Invoke(fo::GameObject* targets[], fo::GameObject* attacker);
 //fo::GameObject* BestWeaponHook_Invoke(fo::GameObject* bestWeapon, fo::GameObject* source, fo::GameObject* weapon1, fo::GameObject* weapon2, fo::GameObject* target);
+long CanUseWeaponHook_Invoke(long result, fo::GameObject* source, fo::GameObject* weapon, long hitMode);
 
 }
diff --git a/sfall/ddraw.vcxproj b/sfall/ddraw.vcxproj
index d3c79632..497fc3c1 100644
--- a/sfall/ddraw.vcxproj
+++ b/sfall/ddraw.vcxproj
@@ -291,6 +291,7 @@
     <ClInclude Include="FalloutEngine\Variables.h" />
     <ClInclude Include="FalloutEngine\Functions.h" />
     <ClInclude Include="FalloutEngine\Functions_def.h" />
+    <ClInclude Include="Game\combatAI.h" />
     <ClInclude Include="Game\inventory.h" />
     <ClInclude Include="Game\items.h" />
     <ClInclude Include="Game\objects.h" />
@@ -402,6 +403,7 @@
     <ClCompile Include="FalloutEngine\FunctionOffsets.cpp" />
     <ClCompile Include="FalloutEngine\Variables.cpp" />
     <ClCompile Include="FalloutEngine\Functions.cpp" />
+    <ClCompile Include="Game\combatAI.cpp" />
     <ClCompile Include="Game\inventory.cpp" />
     <ClCompile Include="Game\items.cpp" />
     <ClCompile Include="Game\objects.cpp" />
diff --git a/sfall/ddraw.vcxproj.filters b/sfall/ddraw.vcxproj.filters
index f6023c84..edb22c53 100644
--- a/sfall/ddraw.vcxproj.filters
+++ b/sfall/ddraw.vcxproj.filters
@@ -343,6 +343,9 @@
       <Filter>Game</Filter>
     </ClInclude>
     <ClInclude Include="Translate.h" />
+    <ClInclude Include="Game\combatAI.h">
+      <Filter>Game</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
@@ -636,6 +639,9 @@
       <Filter>Game</Filter>
     </ClCompile>
     <ClCompile Include="Translate.cpp" />
+    <ClCompile Include="Game\combatAI.cpp">
+      <Filter>Game</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc" />