From b023999c5e0d977a4da2e28f729dfcfebf390d5f Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sun, 3 Nov 2019 10:10:11 +0800
Subject: [PATCH] Updated script mods.

---
 .../gl_highlighting_lite.int                  | Bin 3668 -> 3582 bytes
 .../example_mods/ItemHighlight_Lite/main.h    |   6 ++--
 .../example_mods/UIHotkeys/gl_uihotkeys.int   | Bin 594 -> 618 bytes
 .../example_mods/UIHotkeys/gl_uihotkeys.ssl   |   1 +
 sfall/Explosions.cpp                          |  30 ++++++++----------
 sfall/HookScripts.cpp                         |   2 +-
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/artifacts/example_mods/ItemHighlight_Lite/gl_highlighting_lite.int b/artifacts/example_mods/ItemHighlight_Lite/gl_highlighting_lite.int
index 02b0d7b96878ebb9b22f8ffb6036a99fdc2aed5a..36d6b1a695ff192185853e2961f395e2079e8761 100644
GIT binary patch
delta 1260
zcmca2^G{l!f$0Dv0|SFl122eX{xea)u-=OS0<<6$jAQ|cvoJ6)*uX>}G|MXn1_ovZ
z1_loZA4alfFfcGMF)%QMz(gQ4>n8}!0HdK?HYbSsC`K-*2$W(68N|rIz$gP1fKr_6
zAPh!52n{2-7eH8yZV(zqa(~$@#Td@W*f#kLlLRBf=7&tX8JW1hOrFOg9xKsc2?_uP
zh6bYs%L$+$fr&7JL>ga%Wmy^wK{U$+5Xr#OV03`-|NsC08;l#IK_V>s8YCKA8}u8b
zKs=B<*d&?BLaf%NY+yFbR9yC~0qbOj*u&~KxrsGUUj^B1P?s=4RonopXKFBNaD}*m
z_1I)4HeYF_241jzdSKEFOnQLHn8{gerh)-reIQqWUCy>@@&-0>=@u0Cvo;99Ol4a&
z`4O8cR2OrD5X3IFTazW&<zrc3y1?dFz)Wr`2eAYg8XQ1j0%EgUfJg>Vi0XsYwt)Ez
zpm1bhU|?$yYN~*Q9eY3n3q-}_DeRq$MU&+?e5HfHsu>%Mz%rAX${I`>^g&`A0h1SS
zs!v|aA<o5qqJae@#Mv|X9EUw)&tyJMU&frtF`SZ&PLs<xH5s!eFW|J};n)E+e@Ro>
zWCI?B$y{8zrX3)SAlE@@Ay~X}@ij<*VzqJo0Y*?tNBD?4W^xXfETh@vE-pnu6|g=~
zT!3B0^>6YXE)6EGH<O=n8SpUdX)1&GjqB0mC~g@Uu5S>RGH^BsHS7Rs<(7ena7#^&
z;+B=xgYXzQ;PN355$+(6JY&b?4cwxPZIh32n+b8>0U5x+1dAE&6O;LP#F<+fpG=;^
zuHnV|tT6==WjtaKuQUmOHLx_8LxPY;4^jd!FhIpwA&%vVfF`62aG;-?yn$CzoUuU|
zq>85lMeYh%ju|Sq14Zr;SdIlM_X0)k4Oos9BF8I%BKKo*6t5zq+vFNvRsK9=8AguD
j8+aA@XF$XlB|xrY)SCQ&S4x2Q5L7S-ESNHxi_Z%H&5j1D

delta 1347
zcmew-eMLr~f$0Dv0|SFl122eX37RNiSigV)0<<6$jAQ|cvoJ6)*uX>}G^+yx0|PSy
z1A_;I4<lLkF)%PNF)%QMz(gQ48%*6N2p>kW&48$nV&sAeL1=c6L5vIxj4}{DjN}42
zhJk^BQ4b~pp}D_7Xht^(4I_EHHcK&vGuGb$yNXGVfq~68u|R`?fq_laN}-y8fq}(J
z0YvJ6Nj*J11_q{D1_m~t%;FLah^lCi8)F$5g!J_E5_59m6N`!xD~rKO8JJWV7zB#b
z5_58NbMsS*^)mA^L8@yQ7?^Yz7&vNzK~gmgn`betVf5hfYG7&51_e3;1DIrPFq#00
zilPQfFrT5psKF9Ngb^gt_!=zB(qIUpS=A=@v4}~qiZn<xxHjlFNPz?ySfEC+P2R&|
zEt!B~2$Hdr1z4pSmrT}S4P>mET*oRU!lnn-&eUMk;MyP!VzbFiUc>4uUD3b`Hlzhi
z_JGNGU~<!B5jIojWgxW-Afv&$*clom;En;g8fMxp6lbzF2*K=OXPDf>rfLr{hq*xr
zVmrG5k~tvLPlD}XY%qq(N5RYkyXD;E4{XwceNZ(<4f<fwTa#tjB{`Qhut0fs?467!
zCZAyUm0kf;36^=$RMue9pbrw`ST@;!!;XtXu7L%_<$N@`g2SHi(c~Q*zS4(4A`Bo;
z{f4rjj^Ug!S%FiN@xWvQ4)w`}oZ>v3d{8@oHI+^FV>g+6f>ToZ9#oSNloo>dg)3$9
zA5Ka6O<-}5U%@V6U<C7-8iYYKch6)KE=9pA5SsxMOJFtJA(PX%G?=)ZCQslp;9(SM
zDuW~gZi~q_+_KU>5Kl00HV8HB0O{l|f{1VzfaO~tJO&Q9{3?hD_X?1__&o>@no40V
zxih(d+f0iG;teKPgz?BhBCPQV$RY;z24i?6T;SGH;j?K>fy5k74n$#-09YYQgE=JR
zd0HmR@rd)UgQmBApqOD)ne4)&$bSz-OlxupkAeU%ABv#G<Ru_MI}|~u$yaz3`SVc3
z{3f&TDl*QQtj4R#e*{G)ZgLc_BL6#x7-JsT{)Wk2yix*u5>UYvV8LCJxA1xa0A<1t
A1^@s6

diff --git a/artifacts/example_mods/ItemHighlight_Lite/main.h b/artifacts/example_mods/ItemHighlight_Lite/main.h
index 8e09b02d..13140aaa 100644
--- a/artifacts/example_mods/ItemHighlight_Lite/main.h
+++ b/artifacts/example_mods/ItemHighlight_Lite/main.h
@@ -2,10 +2,12 @@
 #include "..\scripting\headers\sfall.h"
 #include "..\scripting\headers\define_lite.h"
 #include "..\scripting\headers\define_extra.h"
-
+#include "..\scripting\headers\dik.h"
+/*
 #include "..\scripting\headers\lib.arrays.h"
 #include "..\scripting\headers\lib.strings.h"
-// #include "..\scripting\headers\lib.inven.h"
+#include "..\scripting\headers\lib.inven.h"
+*/
 
 variable ini := "sfall-mods.ini";
 variable translationIni;
diff --git a/artifacts/example_mods/UIHotkeys/gl_uihotkeys.int b/artifacts/example_mods/UIHotkeys/gl_uihotkeys.int
index 492d08a23057c4aad666e6c78105d7f9d8b3dd9b..7b0de54ce08bbd53978f5b29229cd0748336dfdd 100644
GIT binary patch
literal 618
zcmZo*I>5-lz#!DX3#O+uurvrXNHr)lNHr)nNHr)mNHr)os5GcHs4*}wFflMNurZ*5
zWl*jJl!j3-aVZ7?Jrn>kqqroosD$DF|Ns9P7#MgMxICSV0t_P}3>m;;4LV@AFf=fO
z>17Qp4ccH90|t4eF{MEtEGpc@4x*WY8dw^ifLII+4Tew_V}l_`geeF_GB7k4HRw04
z2eX+VGK>%#nHr1^Ffs@*Ff=$oO=W1{ZIEoxYS3)pX^;WwU`zv%42)ov3=HB8#$Y}~
zCxZY;ryW!;V`CCX4&)*b&A0$W!gb1{>U6-T^A?Iu9aNnxcyvO240EkzgE7QyOj=+Q
uA+Bab@~;)d%?xr-8p?<H0csvZ9}`611W@{6Ygi06(Fm#!CEUQ_Cj$U)^nktq

delta 243
zcmaFGa*0Ktf$0Dv0|SFl1233vnJ8c=IgJ4VBp?)=oHj8^E$;vS|Nk3wz=|0fn8Eb4
z29^eGFpB|$Jkprbpbr)mZej<~OjZpnjZZ)<28IShD2uVd5G2B6HSwJ!qs(LuMoq@B
z$wrKZoK_7iAPL3^lXH-GrzS5$@R+P7KVTGRl$!j5QC}LWp2-TNi-D=Z=l~-F69Yqo
LLxcWgFD3;5NgXz0

diff --git a/artifacts/example_mods/UIHotkeys/gl_uihotkeys.ssl b/artifacts/example_mods/UIHotkeys/gl_uihotkeys.ssl
index 8600570f..aff556fd 100644
--- a/artifacts/example_mods/UIHotkeys/gl_uihotkeys.ssl
+++ b/artifacts/example_mods/UIHotkeys/gl_uihotkeys.ssl
@@ -45,6 +45,7 @@ procedure start begin
                tap_key(DIK_A);
                tap_key(DIK_CAPITAL);
             end else if (mode bwand BARTER) then begin
+               play_sfx("IB2P1XX1");
                tap_key(DIK_M);
             end
          end
diff --git a/sfall/Explosions.cpp b/sfall/Explosions.cpp
index 5b2b7bae..5f71247c 100644
--- a/sfall/Explosions.cpp
+++ b/sfall/Explosions.cpp
@@ -62,7 +62,7 @@ next:
 		test al, al;
 		jz   skiplight;
 		mov  eax, [esp + 40]; // projectile ptr - 1st arg
-		mov  edx, 0xFFFF0008; // maximum radius + intensity (see anim_set_check__light_fix)
+		mov  edx, 0xFFFF0008; // maximum radius + intensity (see anim_set_check_light_fix)
 		xor  ebx, ebx;
 		call register_object_light_;
 skiplight:
@@ -81,7 +81,7 @@ static void __declspec(naked) explosion_lighting_fix2() {
 		call register_object_funset_;
 
 		mov  eax, [esp + 24]; // explosion obj ptr
-		mov  edx, 0xFFFF0008; // maximum radius + intensity (see anim_set_check__light_fix)
+		mov  edx, 0xFFFF0008; // maximum radius + intensity (see anim_set_check_light_fix)
 		xor  ebx, ebx;
 		call register_object_light_;
 
@@ -93,13 +93,13 @@ static void __declspec(naked) explosion_lighting_fix2() {
 	}
 }
 
-DWORD _stdcall LogThis(DWORD value1, DWORD value2, DWORD value3) {
-	dlog_f("anim_set_check__light_fix: object 0x%X, something 0x%X, radius 0x%X", DL_MAIN, value1, value2, value3);
-	return value1;
-}
+//DWORD _stdcall LogThis(DWORD value1, DWORD value2, DWORD value3) {
+//	dlog_f("anim_set_check_light_fix: object 0x%X, something 0x%X, radius 0x%X", DL_MAIN, value1, value2, value3);
+//	return value1;
+//}
 
-static const DWORD anim_set_check__light_back = 0x415A4C;
-static void __declspec(naked) anim_set_check__light_fix() {
+static const DWORD anim_set_check_light_back = 0x415A4C;
+static void __declspec(naked) anim_set_check_light_fix() {
 	__asm {
 		mov  eax, [esi + 4];   // object
 		lea  ecx, [esp + 16];  // unknown.. something related to next "tile_refresh_rect" call?
@@ -115,7 +115,7 @@ static void __declspec(naked) anim_set_check__light_fix() {
 nothingspecial:
 		mov  ebx, [eax + 112]; // object current light intensity (original behavior)
 end:
-		jmp  anim_set_check__light_back; // jump back right to the "obj_set_light" call
+		jmp  anim_set_check_light_back; // jump back right to the "obj_set_light" call
 	}
 }
 
@@ -126,7 +126,7 @@ static void __declspec(naked) fire_dance_lighting_fix1() {
 		push edx;
 		push ebx;
 		mov  eax, esi;        // projectile ptr - 1st arg
-		mov  edx, 0xFFFF0002; // maximum radius + intensity (see anim_set_check__light_fix)
+		mov  edx, 0xFFFF0002; // maximum radius + intensity (see anim_set_check_light_fix)
 		xor  ebx, ebx;
 		call register_object_light_;
 		mov  eax, esi;
@@ -134,14 +134,13 @@ static void __declspec(naked) fire_dance_lighting_fix1() {
 		pop  edx;
 		call register_object_animate_; // overwritten call
 		mov  eax, esi;                 // projectile ptr - 1st arg
-		mov  edx, 0x00010000;          // maximum radius + intensity (see anim_set_check__light_fix)
+		mov  edx, 0x00010000;          // maximum radius + intensity (see anim_set_check_light_fix)
 		mov  ebx, -1;
 		call register_object_light_;
 		jmp  fire_dance_lighting_back; // jump back
 	}
 }
 
-
 static const DWORD explosion_dmg_check_adr[] = {0x411709, 0x4119FC, 0x411C08, 0x4517C1, 0x423BC8, 0x42381A};
 static const DWORD explosion_art_adr[] = {0x411A19, 0x411A29, 0x411A35, 0x411A3C};
 static const DWORD explosion_art_defaults[] = {10, 2, 31, 29};
@@ -220,8 +219,7 @@ void ResetExplosionSettings() {
 }
 
 void ResetExplosionRadius() {
-	if (set_expl_radius_grenade != 2 || set_expl_radius_rocket != 3)
-		SetExplosionRadius(2, 3);
+	if (set_expl_radius_grenade != 2 || set_expl_radius_rocket != 3) SetExplosionRadius(2, 3);
 }
 
 void ExplosionInit() {
@@ -232,7 +230,7 @@ void ExplosionInit() {
 		dlog("Applying Explosion changes.", DL_INIT);
 		MakeJump(0x4118E1, ranged_attack_lighting_fix);
 		MakeJump(0x410A4A, fire_dance_lighting_fix1);
-		MakeJump(0x415A3F, anim_set_check__light_fix); // this allows to change light intensity
+		MakeJump(0x415A3F, anim_set_check_light_fix); // this allows to change light intensity
 		dlogr(" Done", DL_INIT);
 	}
 
@@ -241,4 +239,4 @@ void ExplosionInit() {
 	SimplePatch<DWORD>(0x4A2878, "Misc", "Dynamite_DmgMin", 30, 0, tmp);
 	tmp = SimplePatch<DWORD>(0x4A287F, "Misc", "PlasticExplosive_DmgMax", 80, 0, 9999);
 	SimplePatch<DWORD>(0x4A2884, "Misc", "PlasticExplosive_DmgMin", 40, 0, tmp);
-}
\ No newline at end of file
+}
diff --git a/sfall/HookScripts.cpp b/sfall/HookScripts.cpp
index f49ad4a6..cf128f2f 100644
--- a/sfall/HookScripts.cpp
+++ b/sfall/HookScripts.cpp
@@ -1532,7 +1532,7 @@ void _stdcall RegisterHook(DWORD script, DWORD id, DWORD procNum, bool specReg)
 
 	sScriptProgram *prog = GetGlobalScriptProgram(script);
 	if (prog) {
-		dlog_f("Global script %08x registered as hook ID %d\n", DL_HOOK, script, id);
+		dlog_f("Global script: %08x registered as hook ID %d\n", DL_HOOK, script, id);
 		sHookScript hook;
 		hook.prog = *prog;
 		hook.callback = procNum;