From 322796676779200544c0c5e1713a5727928bd718 Mon Sep 17 00:00:00 2001
From: burner1024 <burner1024@users.noreply.github.com>
Date: Wed, 17 Jan 2018 12:55:22 +0700
Subject: [PATCH] More highlighting (#130)

* allow to highlight alive critters

* allow to ignore NO_HIGHLIGHT flag

* don't highlight while in loot screen, so that it's not constantly toggled by shift-A ("Take All" hotkey)
---
 artifacts/config_files/sfall-mods.ini |   6 ++++++
 artifacts/mods/gl_highlighting.int    | Bin 3428 -> 18708 bytes
 artifacts/mods/gl_highlighting.ssl    |  17 ++++++++++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/artifacts/config_files/sfall-mods.ini b/artifacts/config_files/sfall-mods.ini
index 86beef7e..f59dddaf 100644
--- a/artifacts/config_files/sfall-mods.ini
+++ b/artifacts/config_files/sfall-mods.ini
@@ -7,9 +7,15 @@ Key=42
 ; Set to 1 to also highlight containers
 Containers=1
 
+; Set to 1 to ignore NO_HIGHLIGHT flag on objects and highlight them regardless
+IgnoreNoHighlight=0
+
 ; Set to 1 to also highlight lootable corpses
 Corpses=1
 
+; Set to 1 to also highlight alive critters
+Critters=0
+
 ; Set to 1 to only highlight objects in the player's line-of-sight
 CheckLOS=0
 
diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int
index 31771aeafff59aec52f0ffa310ca08366b8d5d2e..b771c35259fcc8ac13dfb292329d1d4957878d31 100644
GIT binary patch
literal 18708
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
HY1;q*(fA5%

delta 1512
zcmbO-iSdb)Km*eOMg|53p$1+M&B8HJK(?Nffq{XI0R^xGK)G5_8cKo1nHd-u%%B2L
zisc*w0|Q9h4JrVoSaTQ{7?>Cs7=oYzP>S^%l<|mxp&rTvQ)~`U4Zpx#IKiIAz`(%B
zz`)1@7XmXl*MKPoMmY!#Be^pmEJg(e0X-DJz`!6-Qk0lioRe6RnV;vGH@Tl(Ve(~m
z>B;}t<#~7#bBgnw^NR|KQyC_Eb1Y!IwD}E(CL;$2M67tSE!XnN6CAB285)>DA;_K4
zz|x=%VlgmG0EKMA<bAfPlV{uT3b1Se3o|zu9bo+b|NsBVdA1spW%&5m;Oev$nHvm2
zidcg{Bm-P&gK>j2NQBj4a)hnjWEnn@$qDvKBCK~nf(%RzMh&h|1*axYvv-&*!^gwK
zrZD-Ny*xKl11ne&Lxb?-3;c3I?0!(L5kv>uipc>EVlr$^4H6Bm4f+jIU}=^HA()YD
zD<(HNsKE3wH3&iV-I%<?L5_)?Y4QyRMNZcSeULtOv&mA9vb?MfLQNGAli2+xyEx`g
zKJ6$l`K19b8%PmH!Q?-VJ~A8uAPxg#gAv&O_nOKYOdzIk_)V^JmStsaU~Q0^Y$qin
zz<#WO1*Dj>3q&$7Pu}EY!Nl1$`Hhp03}+TtjIqI};Wv~84J=NF$sx`fOq>}Y(->JN
z&v8~@;@CEMolBSzH{5Qh7NG`Xh~3;qU=fA}BPgE-%x9Y%;3_4-^$W}ag*Vu{Tvxz+
zw#iMdN=#gbCUY6ePkw91G5M^ka6Q)!NS0z?1gn9NY#=Xz_*`coK4Rc#5Ng-~7Wo7b
z;rf72A2$m`6$3j=AGa1ngj)kepCOus+yPK!eo$o$AWNZ+13L?pI_i0S8dD(g%iYx=
z0ZI-{0$_zK4Q9{)S%hK$3(QB{XBv3H5xE6KGD4CO#1e4EU|@tMM8*bTkcr%XP}D1c
z#2D(aX<&kA;L$<Rpa<4~O+7PIeGH0v3!Lg%pz3=XcuhcVXMp&?1*`$$dsH8=LN)9H
zt6-h%=OJDX6MKYWX$V*aHb=5S%;4pLsAo(8+00l5Ru3tXnW5pu4pnIeRXGo=as#SL
WF))_{qLcv~zzpn7Ns}+|O8@}bjV@0B

diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl
index 654fc21c..2e695ddc 100644
--- a/artifacts/mods/gl_highlighting.ssl
+++ b/artifacts/mods/gl_highlighting.ssl
@@ -4,7 +4,7 @@
 
    Previously was part of sfall itself, now a separate mod.
    Features:
-   - highlighting items, containers (optional) and dead bodies (optional) on the ground
+   - highlighting items, containers (optional), critters (optional) and dead bodies (optional) on the ground
    - configurable hotkey is used to trigger highlight
    - only objects in direct line-of-sight of player are highlighted (optional)
    - motion scanner is required to enable highlight (optional)
@@ -28,7 +28,9 @@
 variable configSection := "Highlighting";
 variable highlightKey;
 variable alsoContainer;
+variable ignoreNoHighlight;
 variable alsoCorpse;
+variable alsoCritter;
 variable checkLOS;
 variable outlineColor;
 variable motionScanner;
@@ -37,7 +39,7 @@ variable highlightFailMsg2;
 
 procedure ToggleHighlightObject(variable obj, variable enable) begin
    if obj and (not enable or not checkLOS or not obj_blocking_line(dude_obj, tile_num(obj), BLOCKING_TYPE_SHOOT)) then begin
-      if (alsoContainer and obj_item_subtype(obj) == item_type_container) or (not NO_HIGHLIGHT(obj)) then begin
+      if (alsoContainer and obj_item_subtype(obj) == item_type_container) or (not (NO_HIGHLIGHT(obj) and not ignoreNoHighlight)) then begin
          if (enable) then set_outline(obj, outlineColor);
          else set_outline(obj, 0);
       end
@@ -58,6 +60,13 @@ procedure ToggleHighlight(variable enable) begin
          end
       end
    end
+   if (alsoCritter) then begin
+      foreach obj in list_as_array(LIST_CRITTERS) begin
+         if critter_state(obj) != CRITTER_IS_DEAD then begin
+            call ToggleHighlightObject(obj, enable);
+         end
+      end
+   end
    tile_refresh_display;
 end
 
@@ -66,7 +75,7 @@ procedure KeyPressHandler begin
             scanCode := get_sfall_arg,
             scanner, charges;
 
-   if scanCode == highlightKey then begin
+   if scanCode == highlightKey and not (get_game_mode BWAND INTFACELOOT) then begin
       if pressed then begin
          if motionScanner then begin
             scanner := obj_carrying_pid_obj(dude_obj, PID_MOTION_SENSOR);
@@ -101,7 +110,9 @@ procedure start begin
 
       highlightKey := GetConfig(configSection, "Key", 0);
       alsoContainer := GetConfig(configSection, "Containers", 0);
+      ignoreNoHighlight := GetConfig(configSection, "IgnoreNoHighlight", 0);
       alsoCorpse := GetConfig(configSection, "Corpses", 0);
+      alsoCritter := GetConfig(configSection, "Critters", 0);
       checkLOS := GetConfig(configSection, "CheckLOS", 0);
       outlineColor := GetConfig(configSection, "OutlineColor", 16);
       if (outlineColor < 1) then outlineColor := 64;