Merge branch 'develop'

* 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)

.gitignore

@@ -46,6 +46,8 @@ nb-configuration.xml
 *.user
 *.userosscache
 *.sln.docstates
+*.VC.db
+*.VC.opendb
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

artifacts/config_files/Perks.ini

@@ -7,6 +7,34 @@
 ; have an additional NoHardcode option in this file which can
 ; be used to remove their hardcoded effects, and add new stat/skill effects
 
+;Name=The name of the perk
+;Desc=The description of the perk
+;Image=The line number (0-indexed) of the corresponding FRM in skilldex.lst
+;Ranks=The number of perk levels
+;Level=The minimum required level
+;Type=If 0, the perk checks only Skill1 for skill requirements; if 1, it checks
+; Skill1 or Skill2; if 2, it checks both Skill1 and Skill2
+;Stat=The modified stat or -1 if you don't want to change any stats
+;StatMag=The increased/decreased value to the modified stat
+;Skill1=The first skill (or -1 for none) to check, but if you set a specific bit
+; (67108864 or 0x4000000), it checks GVAR. For example, if Skill1=67108864, then
+; the perk will check GVAR_PLAYER_REPUTATION (67108864 + 0) on Skill1Mag value
+;Skill1Mag=Positive value is used as the minimum requirements of the first
+; skill/GVAR, and a negative value is interpreted as the maximum requirement.
+; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill
+; >= 100 and meets all other requirements, the perk will be available in the
+; selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be
+; available if player has big guns skill >= 120
+;Skill2=The second skill/GVAR (or -1 for none) to check
+;Skill2Mag=Same as Skill1Mag, but for Skill2
+;STR-LCK=Positive values are used as minimum requirements of SPECIAL stats, and
+; negative values are interpreted as maximum requirements. For some special
+; perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat),
+; the values are not used as requirements but to add to corresponding SPECIAL
+; stats
+
+;If the value is set to -99999, the variable will be ignored (similar to comment out that line)
+
 ;This is a modification to perk 119
 [119]
 Name=Example
@@ -36,4 +64,4 @@ Name=Example
 Desc=This is an example trait
 Image=72
 StatMod=0|-1 ;Subtract 1 from strength
-SkillMod=0|20|1|-5 ;Add 20 to the players small guns skill and subtract 5 from big guns
+SkillMod=0|20|1|-5 ;Add 20 to the player's small guns skill and subtract 5 from big guns

artifacts/config_files/Translations.ini

@@ -11,4 +11,4 @@ SaveSfallDataFail=ERROR saving extended savegame information! Check if other pro
 [AppearanceMod]
 RaceText=Race
 StyleText=Style
-MainButtonText=Appearance 
+MainButtonText=Appearance

artifacts/config_files/npcarmor.ini

@@ -0,0 +1,73 @@
+
+; This section maps 7 armor types to corresponding armor item PIDs
+[ArmorTypes]
+Jacket   = 74,265
+Leather  = 1,379
+Metal    = 2,240,380
+Power    = 3,232
+AdvPower = 348,349
+Combat   = 17,239,381
+Robe     = 113,524
+
+; Default armor FIDs (the same for all NPCs)
+[Default]
+Power=16777217
+AdvPower=16777287
+Robe=16777218
+
+
+; Sulik
+[1]
+PID=16777313
+Default=16777280
+Leather=16777325
+Power=16777324
+Metal=16777323
+Jacket=16777321
+Combat=16777322
+
+; Vic
+[2]
+PID=16777278
+Default=16777307
+Jacket=16777329
+Combat=16777330
+Metal=16777331
+Power=16777332
+Leather=16777333
+
+; Cassidy
+[3]
+PID=16777305
+Default=16777354
+Leather=16777260
+Power=16777328
+Metal=16777327
+Jacket=16777351
+Combat=16777326
+
+; Myron
+[4]
+PID=16777376
+Default=16777304
+Leather=
+Power=16777349
+Combat=16777350
+
+; Cat Jules
+[5]
+PID=16777734
+Default=16777353
+Leather=16777347
+Metal=16777348
+Jacket=16777346
+Combat=16777226
+
+; Kitsune
+[6]
+PID=16777724
+Default=16777222
+Leather=16777221
+Metal=16777223
+Jacket=16777222
+Combat=16777219

artifacts/config_files/sfall-mods.ini

@@ -0,0 +1,40 @@
+[Highlighting]
+
+; DX scandode of a key to press to highlight items on the ground
+;  42 - SHIFT key
+Key=42
+
+; Set to 1 to also highlight containers
+Containers=0
+
+; Set to 1 to also highlight lootable corpses
+Corpses=0
+
+; Set to 1 to only highlight objects in the player's line-of-sight
+CheckLOS=0
+
+; Set the color of outlines, available colors:
+; 1 - glowing red
+; 2 - red
+; 4 - grey
+; 8 - glowing green
+; 16 - bright yellow
+; 32 - dark yellow
+; 64 - purple
+OutlineColor=16
+
+; Motion Scanner mode:
+; 0 - ignored
+; 1 - requires Motion Scanner present in player inventory to activate highlighting
+; 2 - requires Motion Scanner and also requires 1 charge on every use (depleted scanner will not work anymore)
+MotionScanner=0
+
+
+[CombatControl]
+;Allows you to directly control other critters in combat
+;Set to 0 to disable
+;Set to 1 to control all critters in combat
+;Set to 2 to control all party members
+;If you want to control only specific critters, uncomment the PIDList line and set a comma delimited list of PIDs
+Mode=0
+;PIDList=62,89,97,107,160,161

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.8.4
+;v4.0.3
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -72,7 +72,7 @@ Use32BitHeadGraphics=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Input]
-;Set to 1 to enable the mouse scroll wheel to scroll through your inventory
+;Set to 1 to enable the mouse scroll wheel to scroll through inventory, barter, and loot screens
 UseScrollWheel=1
 
 ;The mouse Z position is divided by this modifier to calculate the number of inventory
@@ -127,22 +127,6 @@ SpeedKey9=0x00
 ;Set to -1 for either ctrl key, -2 for either alt key or -3 for either shift key
 WindowScrollKey=0
 
-;A key to press to toggle the highlighting of all items on the ground on the current map
-ToggleItemHighlightsKey=42
-
-;Set to 1 to also highlight containers
-HighlightContainers=0
-
-;Set the color of outlines, available colors:
-;0x01 - glowing red
-;0x02 - red
-;0x04 - grey
-;0x08 - glowing green
-;0x10 - bright yellow
-;0x20 - dark yellow
-;0x40 - purple
-OutlineColor=0x10
-
 ;A key to press to reload your currently equipped weapon
 ReloadWeaponKey=0
 
@@ -382,8 +366,7 @@ UseScrollingQuestsList=1
 ;PremadeFIDs=201,203,202
 
 ;Use this line to modify the list of cities and their associated global variables used for city reputations
-;Syntax is 'city id : global id',with each city/global pair separated by a comma.
-;CityRepsCount=19
+;Syntax is 'city id : global id', with each city/global pair separated by a comma.
 ;CityRepsList=0:47,2:48,1:49,4:50,5:51,3:52,8:53,6:54,7:55,13:56,10:57,11:59,14:61,17:63,19:64,18:65,25:66,9:294,20:308
 
 ;Set this to a valid path to save a copy of the console contents
@@ -398,7 +381,6 @@ SpeedInterfaceCounterAnims=0
 
 ;These lines allow you to control the karma frm's displayed on the character screen
 ;Number of KarmaPoints should be 1 less than number of KarmaFRMs
-;KarmaFRMsCount=3
 ;KarmaFRMs=47,48,49
 ;KarmaPoints=-100,100
 
@@ -429,7 +411,7 @@ RemoveCriticalTimelimits=0
 NPCStage6Fix=0
 
 ;Change the colour of the font used on the main menu for the Fallout/sfall version number
-;It's the last byte ('3c' by default,) that picks the colour used. The first byte supplies additional flags
+;It's the last byte ('3c' by default) that picks the colour used. The first byte supplies additional flags
 ;MainMenuFontColour=0x0600003c
 
 ;Two alternate fixes to the interaction between HtH attacks and the fast shot trait
@@ -459,7 +441,6 @@ CritterInvSizeLimit=200
 ;Some bit flags to alter behaviour of the motion sensor
 ;1 - Allow sensor use on automap when motion sensor is in pack rather than hands
 ;2 - Motion sensor doesn't require charges
-;4 - Motion sensor is required to use the item highlight feature
 MotionScannerFlags=1
 
 ;Set to non-0 to adjust the maximum encounter table size
@@ -532,14 +513,6 @@ DialogPanelAnimDelay=33
 ;Controls the speed of pipboy alarm clock animations (lower - faster; valid range: 0..127)
 PipboyTimeAnimDelay=50
 
-;Allows you to directly control other critters in combat
-;Set to 0 to disable
-;Set to 1 to control all critters in combat
-;Set to 2 to control all party members
-;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs
-ControlCombat=0
-;ControlCombatPIDList=62,89,97,107,160,161
-
 ;Set to 1 to stack empty identical weapons, no matter what type of ammo was loaded before
 StackEmptyWeapons=0
 
@@ -556,6 +529,9 @@ DialogOptions9Lines=1
 ;Set to 1 to leave the music playing in dialogue with talking heads
 EnableMusicInDialogue=0
 
+;Set to 1 to prevent the player from running while sneaking without Silent Running perk
+DontTurnOffSneakIfYouRun=0
+
 ;Set to 1 to fix the bug that unable to sell used geiger counters or stealth boys
 CanSellUsedGeiger=1
 
@@ -575,6 +551,13 @@ NumbersInDialogue=0
 ;Set to 1 to display sfall built-in credits at the bottom of credits.txt contents instead of at the top
 CreditsAtBottom=0
 
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+[Scripts]
+;Comma-separated list of masked paths to load global scripts from
+;Only use single slash \ as directory separator
+;Paths outside of scripts folder are supported
+GlobalScriptPaths=scripts\gl*.int,scripts\sfall\gl*.int
+
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Debugging]
 ;Extra sfall configuration settings that can be used by modders

artifacts/example_mods/AutoDoors/gl_autodoors.ssl

@@ -0,0 +1,77 @@
+/*
+
+Auto Doors mod for Fallout 2 by Mr.Stalin
+-----------------------------------------
+
+- allows the player to automatically open/walk through unlocked doors when not in combat
+
+Requires sfall 3.7b or higher
+
+NOTE: this script requires compiler from sfall modderspack with -s option
+(short circuit evaluation)
+
+*/
+
+#include "..\headers\define.h"
+#include "..\headers\command.h"
+#include "..\headers\sfall\sfall.h"
+#include "..\headers\sfall\define_extra.h"
+
+procedure start;
+procedure map_enter_p_proc;
+procedure set_door_flag(variable state);
+procedure combatturn_handler;
+
+#define PORTAL      (0)
+#define DOOR_FLAGS  (0x24)
+
+variable only_once := 0;
+
+procedure start begin
+   if game_loaded then begin
+      if (sfall_ver_major >= 4) then
+         register_hook_proc(HOOK_COMBATTURN, combatturn_handler);
+      else
+         set_global_script_repeat(60);
+      call map_enter_p_proc;
+   end else begin
+      if (only_once == 1 and combat_is_initialized) then begin
+         only_once := 2;
+         call set_door_flag(false);
+      end else if (only_once == 2 and not(combat_is_initialized)) then begin
+         only_once := 1;
+         if (sfall_ver_major >= 4) then
+            set_global_script_repeat(0);
+         call set_door_flag(FLAG_WALKTHRU);
+      end
+   end
+end
+
+procedure map_enter_p_proc begin
+   only_once := 1;
+   call set_door_flag(FLAG_WALKTHRU);
+end
+
+procedure set_door_flag(variable state) begin
+   variable objectMap, obj, objPid, arrayPid, i;
+
+   objectMap := list_as_array(LIST_SCENERY);
+   arrayPid := temp_array(1, 0);
+
+   foreach (obj in objectMap) begin
+      objPid := obj_pid(obj);
+
+      if (proto_data(objPid, sc_type) != PORTAL) or is_in_array(objPid, arrayPid) then
+         continue;
+
+      arrayPid[i] := objPid;
+      i++;
+      resize_array(arrayPid, i + 1);
+      set_proto_data(objPid, DOOR_FLAGS, state);
+   end
+end
+
+procedure combatturn_handler begin
+   if (only_once == 1) then
+      set_global_script_repeat(60);
+end

artifacts/example_mods/AutoDoors/readme.txt

@@ -0,0 +1,9 @@
+Auto Doors mod for Fallout 2 by Mr.Stalin
+-----------------------------------------
+
+- allows the player to automatically open/walk through unlocked doors when not in combat
+
+
+Requires sfall 3.7b or higher.
+
+To use, copy gl_autodoors.int to your scripts folder.

artifacts/example_mods/StealCheat/gl_stealcheat.ssl

@@ -1,22 +1,24 @@
-procedure start; 
+procedure start;
 // adjust include paths if needed
-#include "..\..\scripting_docs\headers\sfall.h" 
+#include "..\..\scripting_docs\headers\sfall.h"
 
 #define RESULT_SUCCESS  (1)
 #define RESULT_FAIL     (0)
- 
-procedure start begin 
-   if not init_hook then begin
+
+procedure start begin
+   if game_loaded then begin
+      register_hook(HOOK_STEAL);
+   end else begin
       variable
          thief := get_sfall_arg,
          target := get_sfall_arg,
          item := get_sfall_arg,
          action := get_sfall_arg,
          result := RESULT_SUCCESS;
-      
-      if (thief == dude_obj) then begin 
-         display_msg(sprintf(mstr_skill(570 + result + action*2), obj_name(item))); 
-         set_sfall_return(result); 
-      end 
-   end 
+
+      if (thief == dude_obj) then begin
+         display_msg(sprintf(mstr_skill(570 + result + action*2), obj_name(item)));
+         set_sfall_return(result);
+      end
+   end
 end

artifacts/example_mods/TakeAllHotkey/gl_takeallkey.ssl

@@ -0,0 +1,20 @@
+procedure start;
+// adjust include paths if needed
+#include "..\..\scripting_docs\headers\sfall.h"
+#include "..\..\scripting_docs\headers\dik.h"
+
+procedure start begin
+   if game_loaded then begin
+      register_hook(HOOK_KEYPRESS);
+   end else begin
+      variable
+         event := get_sfall_arg,
+         keyDX := get_sfall_arg;
+
+      if (event == 1) and (keyDX == DIK_SEMICOLON) then begin
+         tap_key(DIK_CAPITAL);
+         tap_key(DIK_A);
+         tap_key(DIK_CAPITAL);
+      end
+   end
+end

artifacts/example_mods/TakeAllHotkey/hs_keypress.ssl

@@ -1,16 +0,0 @@
-procedure start;
-#include ".\HEADERS\dik.h"
-
-procedure start begin
-	variable event, keyDX;
-	if not init_hook then begin
-		event := get_sfall_arg;
-		keyDX := get_sfall_arg;
-
-		if ((event == 1) and (keyDX == DIK_SEMICOLON)) then begin
-			tap_key(DIK_CAPITAL);
-			tap_key(DIK_A);
-			tap_key(DIK_CAPITAL);
-		end
-	end
-end

artifacts/example_mods/TakeAllHotkey/readme.txt

@@ -2,8 +2,8 @@
 ----------------------------------------
 
 - makes pressing the semicolon key send an uppercase A after a semicolon.
-- the uppercase A (shift + A if Caps Lock is off) is the built-in hotkey for the TAKE ALL button on the loot screen.
+- Note: the uppercase A (shift + A if Caps Lock is off) is the built-in hotkey for the TAKE ALL button on the loot screen.
 
-To use, copy hs_keypress.int file to your scripts folder.
+To use, copy *.int file to your scripts folder.
 
 This mod is a simple example of how you can use HOOK_KEYPRESS hooks.

artifacts/mods/gl_highlighting.ssl

@@ -0,0 +1,115 @@
+/**
+
+   Item Highlight mod.
+
+   Previously was part of sfall itself, now a separate mod.
+   Features:
+   - highlighting items, containers (optional) and lootable corpses (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)
+   - motion scanner charges are decreased on each use (optional)
+
+   NOTE: this script requires compiler from sfall modderspack with -s option
+   (short circuit evaluation)
+
+   version 1.0
+
+**/
+
+#include "main.h"
+//#include "..\..\..\!SRC\headers\define.h"
+
+#define CRITTER_IS_DEAD    (1)
+#define PID_MOTION_SENSOR  (59)
+#define NO_HIGHLIGHT(obj)  (get_flags(obj) bwand FLAG_NOHIGHLIGHT)
+#define NO_STEAL(obj)      (get_proto_data(obj_pid(obj), PROTO_CR_FLAGS) bwand CFLG_NOSTEAL)
+
+variable configSection := "Highlighting";
+variable highlightKey;
+variable alsoContainer;
+variable alsoCorpse;
+variable checkLOS;
+variable outlineColor;
+variable motionScanner;
+variable highlightFailMsg1;
+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 (enable) then set_outline(obj, outlineColor);
+         else set_outline(obj, 0);
+      end
+   end
+end
+
+procedure ToggleHighlight(variable enable) begin
+   variable obj;
+   foreach obj in list_as_array(LIST_GROUNDITEMS) begin
+      if obj != outlined_object then begin
+         call ToggleHighlightObject(obj, enable);
+      end
+   end
+   if (alsoCorpse) then begin
+      foreach obj in list_as_array(LIST_CRITTERS) begin
+         if critter_state(obj) == CRITTER_IS_DEAD and not NO_STEAL(obj) then begin
+            call ToggleHighlightObject(obj, enable);
+         end
+      end
+   end
+   tile_refresh_display;
+end
+
+procedure KeyPressHandler begin
+   variable pressed := get_sfall_arg,
+            scanCode := get_sfall_arg,
+            scanner, charges;
+
+   if scanCode == highlightKey then begin
+      if pressed then begin
+         if motionScanner then begin
+            scanner := obj_carrying_pid_obj(dude_obj, PID_MOTION_SENSOR);
+            if scanner then begin
+               if motionScanner >= 2 then begin
+                  charges := get_weapon_ammo_count(scanner);
+                  if charges > 0 then begin
+                     set_weapon_ammo_count(scanner, charges - 1);
+                     intface_redraw;
+                     call ToggleHighlight(true);
+                  end else begin
+                     display_msg(highlightFailMsg2);
+                  end
+               end else begin
+                  call ToggleHighlight(true);
+               end
+            end else begin
+               display_msg(highlightFailMsg1);
+            end
+         end else begin
+            call ToggleHighlight(true);
+         end
+      end else begin
+         call ToggleHighlight(false);
+      end
+   end
+end
+
+procedure start begin
+   if game_loaded and (sfall_ver_major >= 4) then begin
+      call InitConfigs;
+
+      highlightKey := GetConfig(configSection, "Key", 0);
+      alsoContainer := GetConfig(configSection, "Containers", 0);
+      alsoCorpse := GetConfig(configSection, "Corpses", 0);
+      checkLOS := GetConfig(configSection, "CheckLOS", 0);
+      outlineColor := GetConfig(configSection, "OutlineColor", 16);
+      if (outlineColor < 1) then outlineColor := 64;
+      motionScanner := GetConfig(configSection, "MotionScanner", 0);
+
+      highlightFailMsg1 := Translate("HighlightFail1", "You aren't carrying a motion sensor.");
+      highlightFailMsg2 := Translate("HighlightFail2", "Your motion sensor is out of charge.");
+
+      register_hook_proc(HOOK_KEYPRESS, KeyPressHandler);
+   end
+end