diff --git a/artifacts/config_files/sfall-mods.ini b/artifacts/config_files/sfall-mods.ini index ec6a99de..5868185b 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 138e3b52..11091da7 100644 Binary files a/artifacts/mods/gl_highlighting.int and b/artifacts/mods/gl_highlighting.int differ diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl index 6b0b2871..e4fc73da 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);