fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added new arguments to barter price hook from Crafty (slightly modified) #76

Browse Source
This commit is contained in:
phobos2077
2017-03-13 00:17:50 +07:00
parent 4823b71d96
commit ede1bacf2b
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/hookscripts.txt
+4 -1
View File
@@ -235,9 +235,12 @@ Runs whenever the value of goods being purchased is calculated
critter arg1 - the critter doing the bartering (either dude_obj or inven_dude) critter arg1 - the critter doing the bartering (either dude_obj or inven_dude)
critter arg2 - the critter being bartered with critter arg2 - the critter being bartered with
int arg3 - the default value of the goods int arg3 - the default value of the goods
critter arg4 - the barter critter (has all of the goods being traded in its inventory) critter arg4 - table of requested goods (being bought from NPC)
int arg5 - the amount of actual caps in the barter stack (as opposed to goods) int arg5 - the amount of actual caps in the barter stack (as opposed to goods)
int arg6 - the value of all goods being traded before skill modifications int arg6 - the value of all goods being traded before skill modifications
critter arg7 - table of offered goods (being sold to NPC)
int arg8 - the total cost of the goods offered by the player
int arg9 - set 1 if the "offers" button was pressed(not for a party member), otherwise 0
int ret1 - the modified value of all of the goods int ret1 - the modified value of all of the goods
sfall/Modules/HookScripts.cpp
+16 -6
View File
@@ -534,20 +534,30 @@ static void __declspec(naked) RemoveObjHook() {
static void __declspec(naked) BarterPriceHook() { static void __declspec(naked) BarterPriceHook() {
__asm { __asm {
hookbegin(6); hookbegin(9);
mov args[0], eax; mov args[0], eax;
mov args[4], edx; mov args[4], edx;
call fo::funcoffs::barter_compute_value_ call fo::funcoffs::barter_compute_value_;
mov edx, ds:[FO_VAR_btable] mov edx, ds:[FO_VAR_btable];
mov args[8], eax; mov args[8], eax;
mov args[12], edx; mov args[12], edx;
xchg eax, edx; xchg eax, edx;
call fo::funcoffs::item_caps_total_ call fo::funcoffs::item_caps_total_;
mov args[16], eax; mov args[16], eax;
mov eax, ds:[FO_VAR_btable] mov eax, ds:[FO_VAR_btable]
call fo::funcoffs::item_total_cost_ call fo::funcoffs::item_total_cost_;
mov args[20], eax; mov args[20], eax;
mov eax, edx; mov eax, ds:[FO_VAR_ptable];
mov args[24], eax;
call fo::funcoffs::item_total_cost_;
mov args[28], eax;
xor eax, eax;
mov edx, [esp]; // check offers button
cmp edx, 0x474D51; // last address on call stack
jne skip;
inc eax;
skip:
mov args[32], eax;
pushad; pushad;
push HOOK_BARTERPRICE; push HOOK_BARTERPRICE;
call RunHookScript; call RunHookScript;