From abd62dd834aff81f213b3537f2a1a1703e44fe21 Mon Sep 17 00:00:00 2001
From: phobos2077 <phobos2077@gmail.com>
Date: Thu, 27 Jun 2024 23:25:25 +0200
Subject: [PATCH] gl_highlighting: separate colors for containers and corpses

- Items and corpses blending together can be an issue
---
 artifacts/config_files/sfall-mods.ini |   8 +++++++-
 artifacts/mods/gl_highlighting.int    | Bin 4942 -> 5238 bytes
 artifacts/mods/gl_highlighting.ssl    |  13 ++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/artifacts/config_files/sfall-mods.ini b/artifacts/config_files/sfall-mods.ini
index ec6a99de7..5868185ba 100644
--- a/artifacts/config_files/sfall-mods.ini
+++ b/artifacts/config_files/sfall-mods.ini
@@ -15,7 +15,7 @@ Critters=0
 ; Set to 1 to only highlight objects in the player's line-of-sight
 CheckLOS=1
 
-; Set the color of outlines for items, corpses, and containers; available colors:
+; Set the color of outlines for items; available colors:
 ; 1 - glowing red
 ; 2 - red
 ; 4 - grey
@@ -26,6 +26,12 @@ CheckLOS=1
 ; You can set a custom color from the game palette by multiplying the color index value by 256 (in 4.2.7 or later)
 OutlineColor=16
 
+; Set the color of outlines for corpses
+OutlineColorCorpses=4
+
+; Set the color of outlines for containers
+OutlineColorContainers=4
+
 ; Motion Scanner mode:
 ; 0 - ignored
 ; 1 - requires Motion Sensor to be present in the player's inventory to activate highlighting
diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int
index 138e3b527d4d5e786880350c1c77c54757361295..11091da72d5b6b8c4b97866c6b57969d6229d069 100644
GIT binary patch
delta 1699
zcmZuxU1(HC6rP#gyL<od+`AVwn^i)vMT2S5ZLm~CLjJnQg48M%U4lw2wn!oyn<pU?
zABq)OY!8(Z`cOhBp%g2&6e*<!Ez*JnD}64K2OlH^ky2koJ9FmlHh1;H%$f6@@BGei
zmtXyN8y9Se5<(*3DQQ$b<FC&wN<e)*S~Pb<;aRzMHxVs!RVg!aRod`nsWZ6_r1AW5
zt<(NC{F>Bd5i@j8+F-`oKvkl3pLtm-G65Z52g;*8AU9bMolfHpm%2<q&!=(!oYv_a
z$|Ef+Kbjb>v>-h2WJ2_I8V}8c|92Z+OYr+JM{o7UlOLZs_2I;c;mK2z_2J3->8TS_
zgltNq6K9S|N_`3rvnTZC5BoC#?Tz=n)G>{=9LKYNL6_m0BBQQ0tidj0gyqU0j14ST
zf-j9v>5tHzJ6+6I6oD{NMoGjQqEnsnW%w@l4*eXS<<2sb!P)$~bOP??kA)LRq@pbP
z)X97ZL*}4q)s$lSaKY>{t-Yx1glp!(&A%c)Cn6o#`c`ZbeWHkrMMa07cvQ7kkw#?L
z-|<9cC76Ji($y0kqDO2Ot|%$1jqXIT|7c@dB7!k%M{LidAtRkfb!Ph{d}4Jmy8(;V
zXt<X6C2iOb;F<Lb{Rg(%=b5`3uGrPc#au+SiZgLm!F9GUw+PGbMi_Q_i_WyjsyN;X
zM$0yvbdSRY=WV(I_nd0v-E5`8FrE$lZh0tyji!%R{eLj(KAL5F4T+C7M}`(1rU47?
zHs&qKYAQ4CoXB31m5_yV(|Wl6VNBZ^ydS0FwDS7pb$R7P(TmBd2K4;>{fMYp>-(^k
z?jO>f6Egde)Zq*7J;p1r=5@TaqT|hezeJxue{w?%s_K;w?`e;OzJ%ipi4B8(=f=m#
zQT?M&a0hi8>V7v1eum5bE*4ycErn8N@LN)XD~r9ZXu(5`1n{T7xfDE2>`v3pyEVeQ
zQ~;Y-5_Jr&25*L!lFU(3Z9}2kAGJ`NI=}luce=MV$=(@-BWZfr4~O`W8*i9>Uq=lu
z!Z*CT7|!dTE+NRz3Pa$N4)4GU@1sv43SVQ<4j59R26ZJa!n_i{z`d|9SQQ>#_er(W
z819E1urJE<LMdhFQ3lHr1(l|-7g)5F7wRd>2t48)2knINmA26X821C+4el9XpmY-E
n?S$Dt=GQM_y08$94aDPm%JI0SG~au?=Y>fo?<B6t>*@aw#nf(r

delta 1441
zcmZuxUr19?7{BN4-tGSXH?uXTjA0@YF6S_?5h7|L615DZKuCO$A>o7gBzlw{DkyB9
zNbEr(BBBQodWl{#k`WP6JxYX+K14)_NCb7xx#zBJbl}|Ye81m!zQ1QXZ2!>aU~wA>
zg5Y73N@@ST)3uZ%09_rv2);7KC9(sa6Y?H8gvcJ|02kp&auCTLtHTd{oyM(Rks+cH
za0yw}upmU9`UFbU;tEZW1VEj&xH?00k`ST}tCmI+BmvNP6-bWeOJ7F?Ca+ak`vE5w
zD-b)_dmLY{#hpHmZ`R>!9N&TxdINXG15|vz60#AzmOjCT92T85cp?wP<uaRwgfrXd
z4_UYyH&I010x5hO4a2?gtQh`Mj5LbjGQ=X6P#Y8?3u0s)_9K^(2s!1t>rWKn3{KO#
z$|7tkeTwpfDUV=PO)AP)ro1D{G3ZwNn)6f_!r1fUspoJEr*WL3YK~ZCphZhGsJqN8
zM9c=c;X}BfB}KIiv)Z8B#^_39tp&>3NpuRnX}3gu4(9dIj6PPeVU_8v{~`(G<|@sj
zxH6Bke)f7E4)lSzwuvQr(PSwJQjn-#g1m7a#i3-3dd9C>-$p+i8JT_#%fTJvW>rX$
zw29YZlnFi<lr2z(rD&94#%vdjBUm?wbNXj2u_PapBw03Qk%g@^&m5`oQ;BO9Aa1q9
z%sb3n2<9VbtguzMXiX(-9F)MN7d!zg4j-*p-kz+#y<DJ(onyE{icI5I?0j~a{iaDF
zUCg3`p|mXaE^O9NL4jU7C0ajW!tO;De6pJp)^ESrf=0Z(V0TkKVke<wH#cQDuU7c0
zoFAvWin+E3r=1?pe#--s)R?m}fzP<@6_j<^QDECSPTn)+7V5ZZNV@%o_kDTFcj4^7
z4L22ccKyFCL16Y0mi>vi5<GL$C=0u8r|3?B<`J<5y;ST#fr<ktd1;h_j%cgnjbM|F
zbeeuq1589uTv2e8I`!s!4z)6_$4`uXLs(`~<(3=Va)MdT{>M^-_tBwvw8w8xlsgOF
SWwen_Sd3;#4-+uzH2eiMn--7&

diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl
index 6b0b2871b..e4fc73dac 100644
--- a/artifacts/mods/gl_highlighting.ssl
+++ b/artifacts/mods/gl_highlighting.ssl
@@ -15,7 +15,7 @@
    NOTE: this script requires compiler from sfall modderspack with -s option
    (short circuit evaluation)
 
-   version 1.2
+   version 1.3
 
 **/
 
@@ -36,6 +36,8 @@ variable alsoCorpse;
 variable alsoCritter;
 variable checkLOS;
 variable outlineColor;
+variable outlineColorCorpses;
+variable outlineColorContainers;
 variable motionScanner;
 variable highlightFailMsg1;
 variable highlightFailMsg2;
@@ -65,6 +67,12 @@ procedure GetOutlineColor(variable obj, variable isCritter) begin
    if checkLOS and not DudeCanSee(obj) then
       return 0;
 
+   if obj_type(obj) == OBJ_TYPE_CRITTER then
+      return outlineColorCorpses;
+
+   if obj_item_subtype(obj) == item_type_container then
+      return outlineColorContainers;
+
    return outlineColor;
 end
 
@@ -165,6 +173,9 @@ procedure start begin
       alsoCritter := GetConfig(configSection, "Critters", 0);
       checkLOS := GetConfig(configSection, "CheckLOS", 0);
       outlineColor := GetConfig(configSection, "OutlineColor", 16);
+      outlineColorCorpses := GetConfig(configSection, "OutlineColorCorpses", 16);
+      outlineColorContainers := GetConfig(configSection, "OutlineColorContainers", 16);
+
       if (outlineColor < 1) then outlineColor := 64;
       motionScanner := GetConfig(configSection, "MotionScanner", 0);