diff --git a/artifacts/config_files/sfall-mods.ini b/artifacts/config_files/sfall-mods.ini index 5868185b..9b645c93 100644 --- a/artifacts/config_files/sfall-mods.ini +++ b/artifacts/config_files/sfall-mods.ini @@ -26,12 +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 +; Set the color of outlines for corpses +OutlineColorCorpses=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 11091da7..e5c487e0 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 e4fc73da..1bf0f707 100644 --- a/artifacts/mods/gl_highlighting.ssl +++ b/artifacts/mods/gl_highlighting.ssl @@ -36,8 +36,8 @@ variable alsoCorpse; variable alsoCritter; variable checkLOS; variable outlineColor; -variable outlineColorCorpses; variable outlineColorContainers; +variable outlineColorCorpses; variable motionScanner; variable highlightFailMsg1; variable highlightFailMsg2; @@ -173,10 +173,11 @@ 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; + outlineColorContainers := GetConfig(configSection, "OutlineColorContainers", 16); + if (outlineColorContainers < 1) then outlineColorContainers := 64; + outlineColorCorpses := GetConfig(configSection, "OutlineColorCorpses", 16); + if (outlineColorCorpses < 1) then outlineColorCorpses := 64; motionScanner := GetConfig(configSection, "MotionScanner", 0); highlightFailMsg1 := Translate("HighlightFail1", "You aren't carrying a motion sensor."); diff --git a/artifacts/sfall_dat/sfall.dat b/artifacts/sfall_dat/sfall.dat index f40cb85b..70a3d254 100644 Binary files a/artifacts/sfall_dat/sfall.dat and b/artifacts/sfall_dat/sfall.dat differ diff --git a/artifacts/sfall_dat/sfall_ru.dat b/artifacts/sfall_dat/sfall_ru.dat index b9f914d4..7a75d652 100644 Binary files a/artifacts/sfall_dat/sfall_ru.dat and b/artifacts/sfall_dat/sfall_ru.dat differ diff --git a/artifacts/sfall_dat/sfall_zh.dat b/artifacts/sfall_dat/sfall_zh.dat index c8b3d6c7..727841fd 100644 Binary files a/artifacts/sfall_dat/sfall_zh.dat and b/artifacts/sfall_dat/sfall_zh.dat differ