Skip to content

Commit bdbf7ab

Browse files
committed
Progress every day
- ModdersPack update (sfall-team/sfall@abd62dd) - Scripts recompilation - Configuration refresh - News update
1 parent f896f18 commit bdbf7ab

File tree

11 files changed

+21
-3
lines changed

11 files changed

+21
-3
lines changed

Fallout2/Fallout1in2/ddraw.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ StartingMap=V13ent.map
294294

295295
;To change the 'FALLOUT II v1.02d' version string on the main menu, uncomment the next line
296296
;You can use up to 2 %d's in this if you want to include Fallout's version number somewhere
297-
VersionString=FALLOUT ET TU v1.10.3513
297+
VersionString=FALLOUT ET TU v1.10.3517
298298

299299
;To use a config file other than fallout2.cfg, uncomment the next line and add the name of your new file
300300
;ConfigFile=
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
460 Bytes
Binary file not shown.

NEWS.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Notable changes since last release ([v1.10.3504](https://github.com/rotators/Fo1in2/releases/tag/v1.10.3504))
22

3+
- **Fixed**: It was possible to sell items to various NPCs before "giving" them via dialog, so they could be stolen back later.
34
- **Fixed**: the text position of ShowLootWeight mod when ExpandInventory=1

Tools/ModdersPack/config_files/sfall-mods.ini

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Critters=0
1515
; Set to 1 to only highlight objects in the player's line-of-sight
1616
CheckLOS=1
1717

18-
; Set the color of outlines for items, corpses, and containers; available colors:
18+
; Set the color of outlines for items; available colors:
1919
; 1 - glowing red
2020
; 2 - red
2121
; 4 - grey
@@ -26,6 +26,12 @@ CheckLOS=1
2626
; You can set a custom color from the game palette by multiplying the color index value by 256 (in 4.2.7 or later)
2727
OutlineColor=16
2828

29+
; Set the color of outlines for corpses
30+
OutlineColorCorpses=4
31+
32+
; Set the color of outlines for containers
33+
OutlineColorContainers=4
34+
2935
; Motion Scanner mode:
3036
; 0 - ignored
3137
; 1 - requires Motion Sensor to be present in the player's inventory to activate highlighting
296 Bytes
Binary file not shown.

Tools/ModdersPack/mods/gl_highlighting.ssl

+12-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
NOTE: this script requires compiler from sfall modderspack with -s option
1616
(short circuit evaluation)
1717

18-
version 1.2
18+
version 1.3
1919

2020
**/
2121

@@ -36,6 +36,8 @@ variable alsoCorpse;
3636
variable alsoCritter;
3737
variable checkLOS;
3838
variable outlineColor;
39+
variable outlineColorCorpses;
40+
variable outlineColorContainers;
3941
variable motionScanner;
4042
variable highlightFailMsg1;
4143
variable highlightFailMsg2;
@@ -65,6 +67,12 @@ procedure GetOutlineColor(variable obj, variable isCritter) begin
6567
if checkLOS and not DudeCanSee(obj) then
6668
return 0;
6769

70+
if obj_type(obj) == OBJ_TYPE_CRITTER then
71+
return outlineColorCorpses;
72+
73+
if obj_item_subtype(obj) == item_type_container then
74+
return outlineColorContainers;
75+
6876
return outlineColor;
6977
end
7078

@@ -165,6 +173,9 @@ procedure start begin
165173
alsoCritter := GetConfig(configSection, "Critters", 0);
166174
checkLOS := GetConfig(configSection, "CheckLOS", 0);
167175
outlineColor := GetConfig(configSection, "OutlineColor", 16);
176+
outlineColorCorpses := GetConfig(configSection, "OutlineColorCorpses", 16);
177+
outlineColorContainers := GetConfig(configSection, "OutlineColorContainers", 16);
178+
168179
if (outlineColor < 1) then outlineColor := 64;
169180
motionScanner := GetConfig(configSection, "MotionScanner", 0);
170181

0 commit comments

Comments
 (0)