Merge branch 'develop'. sfall is now updated to 4.0.

Added compiled gl_partycontrol script from the previous commit.
Added Gecko Skinning perk to controlled critters if player has the perk, to make geckos killed by controlled critters also have gecko skins in their inventory.
2026-07-27 16:52:34 -07:00 · 2017-10-14 23:03:07 +08:00 · 2017-10-02 10:04:56 +08:00 · 2017-10-02 09:54:47 +08:00 · 2017-09-19 23:04:35 +08:00 · 2017-09-19 11:58:41 +08:00
242 changed files with 30839 additions and 25840 deletions
@@ -46,6 +46,8 @@ nb-configuration.xml
 *.user
 *.userosscache
 *.sln.docstates
+*.VC.db
+*.VC.opendb

 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -1,5 +1,5 @@
 [sfall]
-SaveInCombat=Cannot save at this time.
+SaveInCombat=Cannot save at this time
 KarmaGain=You gained %d karma.
 KarmaLoss=You lost %d karma.
 HighlightFail1=You aren't carrying a motion sensor.
@@ -7,9 +7,6 @@ HighlightFail2=Your motion sensor is out of charge.
 SuperStimExploitMsg=You cannot use a super stim on someone who is not injured!
 BlockedCombat=You cannot enter combat at this time.
 SaveSfallDataFail=ERROR saving extended savegame information! Check if other programs interfere with savegame files/folders and try again.
-PartyLvlMsg=Lvl:
-PartyACMsg=AC:
-PartyAddictMsg=Addict

 [AppearanceMod]
 RaceText=Race
@@ -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
@@ -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=1
+
+; Set to 1 to also highlight corpses
+Corpses=1
+
+; 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
@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.8.13
+;v4.0

 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -17,8 +17,7 @@ NumSoundBuffers=0
 ;Set to 1 to allow attaching sound files to combat float messages
 AllowSoundForFloats=1

-;Set to 1 to automatically search for alternative formats (mp3/wma/wav) when Fallout tries to play an acm
-;Set to 2 to play alternative music files even if original acm files are not present in the music folder
+;Set to 1 to automatically search for alternative formats when Fallout tries to play an acm
 ;This does not effect the play_sfall_sound and stop_sfall_sound script functions
 AllowDShowSound=0

@@ -71,17 +70,9 @@ GPUBlt=0
 ;Requires graphics mode 4 or 5, and GPUBlt set to 1
 Use32BitHeadGraphics=0

-;Set to 1 to automatically search for alternative avi video files when Fallout tries to play the game movies
-;Requires graphics mode 4 or 5
-AllowDShowMovies=0
-
-;Fade effect time percentage modifier
-;Default is 100. Decrease/increase this value to speed up/slow down fade effects
-FadeMultiplier=100
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Input]
-;Set to 1 to enable the mouse scroll wheel to scroll through inventory, barter, and loot screens
+;Set to 1 to enable the mouse scroll wheel to scroll through your inventory
 UseScrollWheel=1

 ;The mouse Z position is divided by this modifier to calculate the number of inventory
@@ -116,7 +107,7 @@ SpeedModKey=-1

 ;A key to press to toggle the speed tweak on or off
 ;Specify 0 if you don't want a toggle key, or a DX scancode otherwise
-SpeedToggleKey=0
+SpeedToggleKey=0x00

 ;The keys corresponding to the 10 speed slots
 ;Set to 0 to disable a slot, otherwise specify the DX scancode of the key you want to use
@@ -136,38 +127,10 @@ 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
-;Set to 0 if you don't want a toggle key, or a DX scancode otherwise
-ToggleItemHighlightsKey=42
-
-;Set to 1 to also highlight containers
-HighlightContainers=1
-
-;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
-;Set to 0 if you don't want a reload key, or a DX scancode otherwise
 ReloadWeaponKey=0

-;A key to hold down to let you move/drop a whole stack of items at once without the 'Move Items' window
-;Set to 0 if you don't want to use a modifier key, or a DX scancode otherwise
-ItemFastMoveKey=29
-
-;Set to 1 to skip the 'Move Items' window when taking items from containers or corpses and not holding down ItemFastMoveKey
-;Requires ItemFastMoveKey to be enabled
-FastMoveFromContainer=0
-
 ;A key to press to open a debug game editor
-;Set to 0 to disable, or a DX scancode otherwise
-;Requires sfall debugging mode and FalloutClient.exe from the modders pack
 DebugEditorKey=0

 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -201,7 +164,7 @@ WorldMapEncounterRate=5

 ;The number of slots available in the locations list panel of the world map
 ;Set to 0 to leave unchanged. 17 is default.
-;Setting this greater than 17 requires a replacement background FRM, or you'll get glitched graphics
+;Setting this greater than 17 requires a replacement background frm, or you'll get glitched graphics
 WorldMapSlots=0

 ;To start a new game somewhere other than artemple.map, uncomment the next line and set it to the map you want to load
@@ -221,7 +184,7 @@ WorldMapSlots=0
 ;PatchFile=patch%03d.dat
 ;MultiPatches=0

-;Set to 1 to use the modified data load order for the engine to find game data
+;Set to 1 to enable the modified data load order for the engine to find game data
 ;Original: patchXXX.dat > critter_patches > critter_dat > f2_res_patches > f2_res_dat > master_patches > master_dat
 ;Modified: master_patches > critter_patches > patchXXX.dat > critter_dat > f2_res_patches > f2_res_dat > master_dat
 DataLoadOrderPatch=0
@@ -325,7 +288,7 @@ SaveInCombatFix=1
 ;Player's level is capped once the highest specified level is reached
 ;XPTable=50,100,200

-;Set to 1 to enable additional weapon animation codes from o-t
+;Set to 1 to enable additional weapon animations codes from o-t
 ;The 4 byte value at 0x39 of weapon protos may range from 0 to 15 rather than 0 to 10
 ;Since the letters 'n' and 'r' are in use for other animations, an animation code of 11 corrisponds to 's' and 15 to 't'
 AdditionalWeaponAnims=1
@@ -365,38 +328,23 @@ CorpseLineOfFireFix=0
 ;Set to 1 (or some higher number if needed, the maximum is 127) to prevent 100% CPU use
 ProcessorIdle=-1

-;Set a number of how many protos per type can be loaded into memory at once (valid range: 512..4096)
-;Set to -1 to let set_proto_data script function automatically increase the limit when needed
-LoadProtoMaxLimit=-1
-
 ;Set to 1 if using the hero appearance mod
-;You can add AppChCrt.frm and AppChEdt.frm files to art/intrface/ to set a custom background for the character screen
 EnableHeroAppearanceMod=0

 ;Set to 1 to skip the 3 opening movies
 SkipOpeningMovies=0

-;Causes NPCs who complete their combat turn with AP left over will try and find other ways to spend it.
-;Only NPCs with AP left equal to or greater than the value given here will be considered.
+;Causes NPCs who complete their combat turn with ap left over will try and find other ways to spend it.
+;Only NPCs with ap left equal to or greater than the value given here will be considered.
 ;Set to 0 to disable
 NPCsTryToSpendExtraAP=0

-;Set to 1 to fix NPCs not checking weapon perks properly when searching for the best weapon
-;Note that enabling this option can significantly affect the weapon choice of some NPCs in combat
-AIBestWeaponFix=0
-
-;Set to 1 to fix NPCs not taking chem_primary_desire in AI.txt as drug use preference when using drugs in their inventory
-AIDrugUsePerfFix=0
-
 ;Allows the use of tiles over 80*36 in size. sfall will just split and resave them at startup
 ;Set to 1 to check all tiles on started (slow)
 ;Set to 2 if you provide a XLtiles.lst file in art/tiles/ containing a list of the tile ids that need checking
 AllowLargeTiles=0

-;Set to 1 to boost the maximum number of tile FRMs from 4096 to 16383
-MoreTiles=0
-
-;Change the Skilldex cursor FRM numbers
+;Change the Skilldex cursor frm numbers
 ;Default is 293 for all skills
 Lockpick=293
 Steal=293
@@ -406,14 +354,11 @@ Doctor=293
 Science=293
 Repair=293

-;Set to 1 to add scroll buttons to the pipboy quest list, and remove the quests per area limit
-;Set to 2 to use a different set of scroll buttons
-UseScrollingQuestsList=1
+;Remove window position rounding
+RemoveWindowRounding=0

-;To change the location of quest list scroll buttons, uncomment the next two lines
-;Defaults are 140 for the X-axis and 334 for the Y-axis
-;QuestsScrollButtonsX=140
-;QuestsScrollButtonsY=334
+;Set to 1 to add scroll buttons to the pip boy quest list, and remove the quests per area limit
+UseScrollingQuestsList=1

 ;Uncomment these lines to control the premade characters offered when starting a new game
 ;Multiple options should be separated by commas, and there must be the same number of entries in both lines
@@ -421,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
@@ -433,12 +377,10 @@ ExtraSaveSlots=0

 ;Set to 1 to speed up the HP/AC counter animations
 ;Set to 2 to update the HP/AC counters instantly
-;Set to 3 to update the AC counter instantly when switching to other controlled critters in combat
 SpeedInterfaceCounterAnims=0

-;These lines allow you to control the karma FRMs displayed on the character screen
+;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

@@ -459,9 +401,6 @@ BonusHtHDamageFix=1
 ;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory
 DisplayBonusDamage=0

-;Set to 1 to display the range of the second attack mode in the inventory when you switch weapon modes in active item slots
-DisplaySecondWeaponRange=1
-
 ;Modify the maximum number of animations allowed to run on a map. (Default is 32, and the maximum is 127)
 AnimationsAtOnceLimit=120

@@ -494,16 +433,14 @@ BoostScriptDialogLimit=0

 ;These options modify the checks to see if a critter can carry an additional item, changing which items are counted towards the weight limit and adding an additional size check
 ;Set the mode to 0 to disable the size check, 1 to apply to the PC only, 2 to apply to the PC and party members, or 3 to apply to all critters
-;Only the PC uses CritterInvSizeLimit. Other critters will use the unused stat (STAT_unused = 10) or have the size limit of 100 if the stat is not set
+;Only the PC uses CritterInvSizeLimit. Other critters will use the extra unused stat (STAT_unused = 10)
 ;Add 4 to the mode to limit the weight check to used items only
-;You can use line number 542/543 in proto.msg and line number 35 in inventry.msg to set up custom messages for item size
 CritterInvSizeLimitMode=0
-CritterInvSizeLimit=100
+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
@@ -526,17 +463,9 @@ SuperStimExploitFix=0
 InventoryApCost=4
 QuickPocketsApCostReduction=2

-;Set to 1 to allow objects seeing through other objects that have their ShootThru flag set
-;Note that enabling this option can cause unexpected NPC behavior in some situations
+;Set to 1 to allow objects seeing through other objects with their ShootThru flag set
 ObjCanSeeObj_ShootThru_Fix=0

-;Set to 1 to fix the broken obj_can_hear_obj script function
-ObjCanHearObjFix=0
-
-;Set to 1 to enable the mood argument of start_gdialog script function to be available for talking heads
-;If the argument value is -1, the mood will be determined by the local variable 0 of the script (vanilla behavior)
-StartGDialogFix=0
-
 ;Set to 1 to enable the balanced bullet distribution formula for burst attacks
 ComputeSprayMod=0

@@ -584,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

@@ -602,9 +523,6 @@ StackEmptyWeapons=0
 ;If the amount of ammo boxes in the inventory is less than or equal to the reserve, only one box will be used
 ReloadReserve=-1

-;Set to 1 to change the counter in the 'Move Items' window to start at the maximum number of items
-ItemCounterDefaultMax=0
-
 ;Allows 9 options (lines of text) to be displayed correctly in a dialog window
 DialogOptions9Lines=1

@@ -618,7 +536,6 @@ DontTurnOffSneakIfYouRun=0
 CanSellUsedGeiger=1

 ;Set to 1 to fix the issue with being able to charge the car by using cells on other scenary/critters
-;Set to 0 if another mod you're using has custom vehicles
 CarChargingFix=1

 ;Set to 1 to skip weapon equip/unequip animations when performing various actions
@@ -631,24 +548,16 @@ InstantWeaponEquip=0
 ;Set to 1 to display numbered dialogue options
 NumbersInDialogue=0

-;Set to 1 to use Fallout's normal text font instead of DOS-like font on the world map
-WorldMapFontPatch=0
-
-;Set to 1 to display full item description for weapon/ammo in barter screen
-FullItemDescInBarter=0
-
-;Set to 1 to display experience points with the bonus from Swift Learner perk when gained from non-scripted situations
-DisplaySwiftLearnerExp=1
-
-;Set to 1 to display party member's current level/AC/addict flag on the combat control panel
-PartyMemberExtraInfo=0
-
-;Set to 1 to prevent the inventory/loot/automap interfaces from being placed on top of other script-created windows
-InterfaceDontMoveOnTop=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
@@ -658,8 +567,8 @@ CreditsAtBottom=0
 Enable=0

 ;Fallout 2 Debug Patch
-;Set to 1 to send debug output to the screen, 2 to a debug.log file, or 3 to both the screen and a debug.log file
-;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout2.cfg:
+;Set to 1 to enable debugging output to screen or 2 to create a debug.log file
+;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout2.cfg
 ;-------
 ;[debug]
 ;mode=environment
@@ -677,12 +586,12 @@ DebugMode=0
 SkipCompatModeCheck=0

 ;Set to 1 to skip the executable file size check
-;Does not require sfall debugging mode
+;Does not require enabling sfall debugging mode
 SkipSizeCheck=0

 ;If you're testing changes to the Fallout exe, you can override the CRC that sfall looks for here
 ;You can use several hex values, separated by commas
-;Does not require sfall debugging mode
+;Does not require enabling sfall debugging mode
 ;ExtraCRC=0x00000000,0x00000000

 ;Set to 1 to stop Fallout from deleting non readonly protos at startup
@@ -1,77 +0,0 @@
-/*
-
-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
@@ -1,9 +0,0 @@
-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.
@@ -0,0 +1,114 @@
+/**
+
+   Item Highlight mod.
+
+   Previously was part of sfall itself, now a separate mod.
+   Features:
+   - highlighting items, containers (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)
+   - 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)
+
+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 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
@@ -0,0 +1,114 @@
+/*
+
+   NPC Armor Appearance mod
+
+   Used to replace the scripted part of B-Team mod.
+   Appropriate graphics are required for this mod to work.
+   Can be adopted to any mod by adjusting armor PIDs, NPC PIDs and NPC FIDs in INI file.
+
+   NOTE: this script requires compiler from sfall modderspack with -s option
+   (short circuit evaluation)
+
+   version 1.0
+
+*/
+
+#include "main.h"
+
+#define IS_ARMOR(item)  (obj_type(item) == OBJ_TYPE_ITEM and obj_item_subtype(item) == item_type_armor)
+
+variable
+   modIni := "npcarmor.ini",
+   defaultFids,
+   armorPidMap, // maps armor PID to it's "type" - leather armor, metal, power armor, etc.
+   npcMap;
+
+procedure check_armor_change(variable critter, variable item, variable isWorn) begin
+   variable npc, armorType, fid;
+   if (npcMap[obj_pid(critter)]) then begin
+      npc := npcMap[obj_pid(critter)];
+      if (not isWorn) then begin
+         // display_msg("No armor fid: " + npc["Default"]);
+         return npc["Default"];
+      end else if (item) then begin
+         armorType := armorPidMap[obj_pid(item)];
+         fid := npc[armorType] or defaultFids[armorType];
+         if (fid == 0 or fid == -1) then fid := npc["Default"];
+         // display_msg("Change fid: " + fid + ", npc: " + npc[armorType] + ", default:" + defaultFids[armorType]);
+         return fid;
+      end
+   end
+   return -1;
+end
+
+// for NPCs when they change armor themselves
+procedure invenwield_handler begin
+   variable critter, item, fid, slot, isWorn;
+   critter := get_sfall_arg;
+   item := get_sfall_arg;
+   slot := get_sfall_arg;
+   isWorn := get_sfall_arg;
+
+   if (critter and item and slot == INVEN_TYPE_WORN) then begin
+      fid := check_armor_change(critter, item, isWorn);
+      if (fid != -1) then begin
+         art_change_fid_num(critter, fid);
+      end
+   end
+end
+
+// when changing armor from inventory while controlling other NPCs
+procedure adjustfid_handler begin
+   variable fid, armor;
+   if (dude_obj != real_dude_obj) then begin
+      armor := critter_inven_obj(dude_obj, INVEN_TYPE_WORN);
+      fid := check_armor_change(dude_obj, armor, armor != 0);
+      if (fid != -1) then begin
+         set_sfall_return(fid);
+      end
+   end
+end
+
+
+procedure start begin
+   variable sect, sects, armorTypes, armorType, npc, pid, pids, i;
+   if game_loaded and (sfall_ver_major >= 4) then begin
+      register_hook_proc(HOOK_INVENWIELD, invenwield_handler);
+      register_hook_proc(HOOK_ADJUSTFID, adjustfid_handler);
+
+      defaultFids := get_ini_section(modIni, "Default");
+      fix_array(defaultFids);
+      foreach (armorType: i in defaultFids) begin
+         defaultFids[armorType] := atoi(i);
+      end
+
+      armorPidMap := create_array_map;
+      armorTypes := get_ini_section(modIni, "ArmorTypes");
+      foreach (armorType: pids in armorTypes) begin
+         pids := string_split(pids, ",");
+         foreach (pid in pids) begin
+            armorPidMap[atoi(pid)] := armorType;
+         end
+      end
+
+      npcMap := create_array_map;
+
+      i := 1;
+      sect := get_ini_section(modIni, ""+i);
+      while (sect.PID) do begin
+         npc := create_array_map;
+         npc["Default"] := atoi(sect["Default"]);
+         foreach (armorType: pids in armorTypes) begin
+            if (sect[armorType]) then begin
+               npc[armorType] := atoi(sect[armorType]);
+            end
+         end
+         npcMap[atoi(sect.PID)] := npc;
+
+         i += 1;
+         sect := get_ini_section(modIni, ""+i);
+      end
+   end
+
+end
+
@@ -0,0 +1,55 @@
+/*
+
+   NPC Combat Control
+
+   Allows to take control of your party member or other NPCs during combat
+
+   NOTE: this script requires compiler from sfall modderspack with -s option
+   (short circuit evaluation)
+
+   version 1.0
+
+*/
+
+#include "..\headers\define.h"
+#include "main.h"
+
+variable
+   configSection := "CombatControl",
+   controlMode,
+   pidList,
+   hasGeckoSkinning := false;
+
+
+procedure combatturn_handler begin
+   variable
+      status := get_sfall_arg,
+      critter := get_sfall_arg,
+      arg3 := get_sfall_arg,
+      pid;
+
+   // display_msg("Combat Turn: " + status + ", by "  + obj_name(critter) + ", arg3: " + arg3);
+   pid := obj_pid(critter);
+   if (status == 1
+      and (len_array(pidList) == 0 or scan_array(pidList, pid bwand 0xFFFFFF) != -1)
+      and (controlMode == 1 or party_member_obj(pid))) then begin
+      set_dude_obj(critter);
+      if hasGeckoSkinning then critter_add_trait(critter, TRAIT_PERK, PERK_gecko_skinning_perk, 1);
+   end else begin
+      set_dude_obj(real_dude_obj);
+   end
+end
+
+procedure start begin
+   if game_loaded and (sfall_ver_major >= 4) then begin
+      controlMode := GetConfig("CombatControl", "Mode", 0);
+      if (controlMode > 2) then controlMode := 0;
+      if (controlMode > 0) then begin
+         pidList := GetConfigListInt("CombatControl", "PIDList");
+         fix_array(pidList);
+         if has_trait(TRAIT_PERK, dude_obj, PERK_gecko_skinning_perk) then hasGeckoSkinning := true;
+
+         register_hook_proc(HOOK_COMBATTURN, combatturn_handler);
+      end
+   end
+end
@@ -0,0 +1,57 @@
+
+#include "..\scripting\headers\sfall.h"
+#include "..\scripting\headers\define_lite.h"
+#include "..\scripting\headers\define_extra.h"
+
+#include "..\scripting\headers\lib.arrays.h"
+#include "..\scripting\headers\lib.strings.h"
+// #include "..\scripting\headers\lib.inven.h"
+
+variable ini := "sfall-mods.ini";
+variable translationIni;
+
+// Gets the integer value from ddraw.ini
+procedure GetConfig(variable section, variable key, variable def) begin
+   variable val := get_ini_setting(ini + "|" + section + "|" + key);
+   if val == -1 then val := def;
+   return val;
+end
+
+// Gets the string value from ddraw.ini
+procedure GetConfigStr(variable section, variable key, variable def) begin
+   variable val := get_ini_string(ini + "|" + section + "|" + key);
+   if val == -1 or val == "" then val := def;
+   return val;
+end
+
+// Gets the value from ddraw.ini as a temp array of strings
+procedure GetConfigList(variable section, variable key) begin
+   variable val := get_ini_string(ini + "|" + section + "|" + key);
+   if val == -1 or val == "" then return [];
+
+   return string_split(val, ",");
+end
+
+// Gets the value from ddraw.ini as a temp array of ints
+procedure GetConfigListInt(variable section, variable key) begin
+   variable arr, i, item;
+
+   arr := GetConfigList(section, key);
+   for (i := 0; i < len_array(arr); i++) begin
+      arr[i] := atoi(arr[i]);
+   end
+   return arr;
+end
+
+// Translates given string using Translations.ini
+procedure Translate(variable id, variable def) begin
+   variable str := get_ini_string(translationIni + "|Sfall|" + id);
+   if not str or (strlen(str) == 0) then begin
+      str := def;
+   end
+   return str;
+end
+
+procedure InitConfigs begin
+   translationIni := GetConfigStr("Main", "TranslationsINI", "./Translations.ini");
+end
@@ -0,0 +1,2 @@
+To install each mod, copy *.int file into your <Fallout Dir>\data\scripts\ folder.
+For gl_npcarmor.int, you also need to copy npcarmor.ini to your Fallout directory.
@@ -3,23 +3,13 @@ This folder contains documentation about sfall scripting extensions.
    headers\ - folder contains sfall headers that you should #include in your scripts
        sfall.h - main sfall header, always include it
        define_extra.h - some additional preprocessor constants for vanilla engine stuff (proto offsets, etc.)
-        define_lite.h - a lite version of official define.h
-        dik.h - DX scancodes constants for use with key_pressed function and HOOK_KEYPRESS
-        lib.arrays.h - procedures that will help you use arrays in their full:
-        - use them as stacks, sets
-        - easily compare, copy, slice, cut, add arrays
-        - display array contents (for debugging)
-        - save/load two-dimensional arrays to savegame in one command (e.g. arrays of objects)
-        lib.inven.h - fallout items manipulation functions
-        lib.math.h - a few simple functions for calculations
-        lib.strings.h - search in strings, join, repeat, etc.
-        lib.misc.h - misc stuff
-
+        dik.h - DX scancodes constants for use with key_pressed function and HOOK_KEYPRESS 
+    
    sfall function notes.txt - incomplete reference for new opcodes
    sfall opcode list.txt - list of all sfall opcodes (w/o descriptions)
    hookscripts.txt - detailed manual for using hook scripts to modify engine behavior
    arrays.txt - manual for sfall arrays
-
-If you are/will be using sfall Script Editor, don't forget to check out new compiler documentation in ScriptEditor\docs\sslc_readme.txt,
+    
+If you are/will be using sfall Script Editor, don't forget to check out new compiler documentation in ScriptEditor\docs\sslc_readme.txt, 
 there are numerious new syntax features and extensions to SSL (Star-Trek Scripting language).
-
+    
@@ -10,12 +10,6 @@
 #define OBJ_TYPE_MISC       (5)
 #define OBJ_TYPE_SPATIAL    (6)

-#define WEAPON_TYPE_NONE    (0)
-#define WEAPON_TYPE_UNARMED (1)
-#define WEAPON_TYPE_MELEE   (2)
-#define WEAPON_TYPE_THROWN  (3)
-#define WEAPON_TYPE_GUNS    (4)
-
 /* Item Common Flags */
 #define HIDDEN_ITEM     134217728  // 0x08000000 - Hidden Item

@@ -27,14 +21,14 @@
 #define WEAPON_2HAND          512  // 0x00000200 - 2Hnd (weapon is two-handed)

 #define ATKMODE_PRI_NONE        0
-#define ATKMODE_PRI_PUNCH       1  // 0001
-#define ATKMODE_PRI_KICK        2  // 0010
-#define ATKMODE_PRI_SWING       3  // 0011
-#define ATKMODE_PRI_THRUST      4  // 0100
-#define ATKMODE_PRI_THROW       5  // 0101
-#define ATKMODE_PRI_SINGLE      6  // 0110
-#define ATKMODE_PRI_BURST       7  // 0111
-#define ATKMODE_PRI_FLAME       8  // 1000
+#define ATKMODE_PRI_PUNCH       1
+#define ATKMODE_PRI_KICK        2
+#define ATKMODE_PRI_SWING       3
+#define ATKMODE_PRI_THRUST      4
+#define ATKMODE_PRI_THROW       5
+#define ATKMODE_PRI_SINGLE      6
+#define ATKMODE_PRI_BURST       7
+#define ATKMODE_PRI_FLAME       8
 #define ATKMODE_SEC_NONE        0
 #define ATKMODE_SEC_PUNCH      16  // 0x00000010
 #define ATKMODE_SEC_KICK       32  // 0x00000020
@@ -107,27 +101,20 @@
 // offsets for get_proto_data
 #define PROTO_PID             (1)
 #define PROTO_TEXTID          (4)
-#define PROTO_FID             (8)

 // items
-#define PROTO_IT_LDIST       (12)
-#define PROTO_IT_LINT        (16)
-#define PROTO_IT_FLAG        (20)
 #define PROTO_IT_FLAGS       (24)
-#define PROTO_IT_SCRIPTID    (28)
 #define PROTO_IT_TYPE        (32)
 #define PROTO_IT_MATERIAL   (108)
 #define PROTO_IT_SIZE       (112)
 #define PROTO_IT_WEIGHT     (116)
 #define PROTO_IT_COST       (120)
 #define PROTO_IT_INV_FID    (124)
-#define PROTO_IT_SOUND      (128)  // byte

 // weapons
 #define PROTO_WP_ANIM        (36)
 #define PROTO_WP_DMG_MIN     (40)
 #define PROTO_WP_DMG_MAX     (44)
-#define PROTO_WP_DMG_TYPE    (48)
 #define PROTO_WP_RANGE_1     (52)
 #define PROTO_WP_RANGE_2     (56)
 #define PROTO_WP_PROJ_PID    (60)
@@ -199,11 +186,7 @@
 #define PROTO_DR_ADDICT_DELAY   (100)

 // critters
-#define PROTO_CR_LDIST           (20)
-#define PROTO_CR_LINT            (24)
-#define PROTO_CR_FLAG            (28)
-#define PROTO_CR_FLAGS           (32)  // Critter Flags
-#define PROTO_CR_SCRIPTID        (36)
+#define PROTO_CR_FLAGS           (32)
 #define PROTO_CR_HEAD_FID        (40)
 #define PROTO_CR_AI_PACKET       (44)
 #define PROTO_CR_TEAM_NUM        (48)
@@ -234,26 +217,26 @@
 #define CALIBER_7_62MM              (18)

 // hidden perks
-#define PERK_add_nuka               (53)
-#define PERK_add_buffout            (54)
-#define PERK_add_mentats            (55)
-#define PERK_add_psycho             (56)
-#define PERK_add_radaway            (57)
-#define PERK_weapon_long_range      (58)
-#define PERK_weapon_accurate        (59)
-#define PERK_weapon_penetrate       (60)
-#define PERK_weapon_knockback       (61)
-#define PERK_armor_powered          (62)
-#define PERK_armor_combat           (63)
-#define PERK_weapon_scope_range     (64)
-#define PERK_weapon_fast_reload     (65)
-#define PERK_weapon_night_sight     (66)
-#define PERK_weapon_flameboy        (67)
-#define PERK_armor_advanced_1       (68)
-#define PERK_armor_advanced_2       (69)
-#define PERK_add_jet                (70)
-#define PERK_add_tragic             (71)
-#define PERK_armor_charisma         (72)
+#define PERK_add_nuka            (53)
+#define PERK_add_buffout         (54)
+#define PERK_add_mentats         (55)
+#define PERK_add_psycho          (56)
+#define PERK_add_radaway         (57)
+#define PERK_weapon_long_range   (58)
+#define PERK_weapon_accurate     (59)
+#define PERK_weapon_penetrate    (60)
+#define PERK_weapon_knockback    (61)
+#define PERK_armor_powered       (62)
+#define PERK_armor_combat        (63)
+#define PERK_weapon_scope_range  (64)
+#define PERK_weapon_fast_reload  (65)
+#define PERK_weapon_night_sight  (66)
+#define PERK_weapon_flameboy     (67)
+#define PERK_armor_advanced_1    (68)
+#define PERK_armor_advanced_2    (69)
+#define PERK_add_jet             (70)
+#define PERK_add_tragic          (71)
+#define PERK_armor_charisma      (72)

 #define WPN_ANIM_NONE               (0x00) // (A)
 #define WPN_ANIM_KNIFE              (0x01) // (D)
@@ -267,21 +250,4 @@
 #define WPN_ANIM_MINIGUN            (0x09) // (L)
 #define WPN_ANIM_ROCKET_LAUNCHER    (0x0A) // (M)

-// common object data offsets
-#define OBJ_DATA_TILENUM            (0x04)
-#define OBJ_DATA_CUR_FRM            (0x18) // current frame number
-#define OBJ_DATA_ROTATION           (0x1C)
-#define OBJ_DATA_FID                (0x20)
-#define OBJ_DATA_ELEVATION          (0x28)
-#define OBJ_DATA_PID                (0x64)
-#define OBJ_DATA_CID                (0x68)
-#define OBJ_DATA_SID                (0x78)
-// items
-#define OBJ_DATA_CUR_CHARGES        (0x3C)
-// critters
-#define OBJ_DATA_COMBAT_STATE       (0x3C) // flags: 1 - combat, 2 - target is out of range, 4 - flee
-#define OBJ_DATA_CUR_ACTION_POINT   (0x40)
-#define OBJ_DATA_DAMAGE_LAST_TURN   (0x48)
-#define OBJ_DATA_WHO_HIT_ME         (0x54)
-
 #endif // DEFINE_EXTRA_H
@@ -26,14 +26,15 @@ end
   return intp;
 end*/

-/*procedure ceil(variable val) begin
+procedure ceil(variable val) begin
   variable intp;
   intp := floor(val);
   if (abs(val-intp) > 0.0) then begin
      intp++;
   end
   return intp;
-end*/
+end
+

 procedure cap_number(variable num, variable min, variable max) begin
   if (num > max) then num := max;
@@ -17,6 +17,7 @@
 #define INTFACEUSE  (0x8000)
 #define INTFACELOOT (0x10000)
 #define BARTER      (0x20000)
+#define HEROWIN     (0x40000)

 //Valid arguments to register_hook
 #define HOOK_TOHIT            (0)
@@ -45,6 +46,9 @@
 #define HOOK_WITHINPERCEPTION (23)
 #define HOOK_INVENTORYMOVE    (24)
 #define HOOK_INVENWIELD       (25)
+#define HOOK_ADJUSTFID        (26)
+#define HOOK_COMBATTURN       (27)
+#define HOOK_CARTRAVEL        (28)

 //Valid arguments to list_begin
 #define LIST_CRITTERS    (0)
@@ -132,7 +136,6 @@
 #define set_attack_explosion_radius(x)        metarule2_explosions(3, x, 0)
 #define set_attack_is_explosion(x)            metarule2_explosions(4, x, 0)
 #define set_attack_is_explosion_fire          set_attack_is_explosion(DMG_fire)
-#define set_explosion_radius(grenade, rocket) metarule2_explosions(5, grenade, rocket)


 #define GAME_MSG_COMBAT      (0)
@@ -206,34 +209,25 @@
 #define party_member_list_all           party_member_list(1)


-#define attack_is_aimed                                 sfall_func0("attack_is_aimed")
-#define create_win(winName, x, y, w, h)                 sfall_func5("create_win", winName, x, y, w, h)
-#define create_win_flag(winName, x, y, w, h, flag)      sfall_func6("create_win", winName, x, y, w, h, flag)
-#define critter_inven_obj2(obj, type)                   sfall_func2("critter_inven_obj2", obj, type)
-#define display_stats                                   sfall_func0("display_stats")
-#define exec_map_update_scripts                         sfall_func0("exec_map_update_scripts")
-#define floor2(value)                                   sfall_func1("floor2", value)
-#define get_current_inven_size(obj)                     sfall_func1("get_current_inven_size", obj)
-#define get_cursor_mode                                 sfall_func0("get_cursor_mode")
-#define get_flags(obj)                                  sfall_func1("get_flags", obj)
-#define get_map_enter_position                          sfall_func0("get_map_enter_position")
-#define get_object_data(obj, offset)                    sfall_func2("get_object_data", obj, offset)
-#define get_outline(obj)                                sfall_func1("get_outline", obj)
-#define intface_hide                                    sfall_func0("intface_hide")
-#define intface_is_hidden                               sfall_func0("intface_is_hidden")
-#define intface_redraw                                  sfall_func0("intface_redraw")
-#define intface_show                                    sfall_func0("intface_show")
-#define inventory_redraw(invSide)                       sfall_func1("inventory_redraw", invSide)
-#define item_weight(obj)                                sfall_func1("item_weight", obj)
-#define lock_is_jammed(obj)                             sfall_func1("lock_is_jammed", obj)
-#define obj_under_cursor(crSwitch, inclDude)            sfall_func2("obj_under_cursor", crSwitch, inclDude)
-#define outlined_object                                 sfall_func0("outlined_object")
-#define set_cursor_mode(mode)                           sfall_func1("set_cursor_mode", mode)
-#define set_flags(obj, flags)                           sfall_func2("set_flags", obj, flags)
-#define set_ini_setting(setting, value)                 sfall_func2("set_ini_setting", setting, value)
-#define set_map_enter_position(tile, elev, rot)         sfall_func3("set_map_enter_position", tile, elev, rot)
-#define set_object_data(obj, offset, value)             sfall_func3("set_object_data", obj, offset, value)
-#define set_outline(obj, color)                         sfall_func2("set_outline", obj, color)
-#define spatial_radius(obj)                             sfall_func1("spatial_radius", obj)
-#define tile_refresh_display                            sfall_func0("tile_refresh_display")
-#define unjam_lock(obj)                                 sfall_func1("unjam_lock", obj)
+#define car_gas_amount                        sfall_func0("car_gas_amount")
+#define critter_inven_obj2(obj, type)         sfall_func2("critter_inven_obj2", obj, type)
+#define exec_map_update_scripts               sfall_func0("exec_map_update_scripts")
+#define get_cursor_mode                       sfall_func0("get_cursor_mode")
+#define get_flags(obj)                        sfall_func1("get_flags", obj)
+#define get_ini_section(file, sect)           sfall_func2("get_ini_section", file, sect)
+#define get_ini_sections(file)                sfall_func1("get_ini_sections", file)
+#define get_outline(obj)                      sfall_func1("get_outline", obj)
+#define intface_hide                          sfall_func0("intface_hide")
+#define intface_is_hidden                     sfall_func0("intface_is_hidden")
+#define intface_redraw                        sfall_func0("intface_redraw")
+#define intface_show                          sfall_func0("intface_show")
+#define item_weight(obj)                      sfall_func1("item_weight", obj)
+#define outlined_object                       sfall_func0("outlined_object")
+#define real_dude_obj                         sfall_func0("real_dude_obj")
+#define set_car_intface_art(artIndex)         sfall_func1("set_car_intface_art", artIndex)
+#define set_cursor_mode(mode)                 sfall_func1("set_cursor_mode", mode)
+#define set_dude_obj(critter)                 sfall_func1("set_dude_obj", critter)
+#define set_flags(obj, flags)                 sfall_func2("set_flags", obj, flags)
+#define set_outline(obj, color)               sfall_func2("set_outline", obj, color)
+#define spatial_radius(obj)                   sfall_func1("spatial_radius", obj)
+#define tile_refresh_display                  sfall_func0("tile_refresh_display")
--- a/Show More
+++ b/Show More