Fixed premature assignment of arguments before the beginning of the hooks in InventoryHs.cpp. (#173 )

(cherry picked from commit fff48407c3) Updated version number.
Merge branch 'develop'
2026-07-27 16:52:34 -07:00 · 2018-06-24 12:36:01 +08:00 · 2018-06-12 21:01:12 +08:00 · 2018-06-12 20:52:03 +08:00 · 2018-06-12 12:13:42 +08:00 · 2018-06-11 13:40:09 +08:00
268 changed files with 39391 additions and 27341 deletions
@@ -46,6 +46,8 @@ nb-configuration.xml
 *.user
 *.userosscache
 *.sln.docstates
+*.VC.db
+*.VC.opendb

 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -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
@@ -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.
@@ -11,4 +11,4 @@ SaveSfallDataFail=ERROR saving extended savegame information! Check if other pro
 [AppearanceMod]
 RaceText=Race
 StyleText=Style
-MainButtonText=Appearance 
+MainButtonText=Appearance
@@ -0,0 +1,79 @@
+
+; 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
+WeaponAnims=1,3,4,6
+Default=16777280
+Leather=16777325
+Power=16777324
+Metal=16777323
+Jacket=16777321
+Combat=16777322
+
+; Vic
+[2]
+PID=16777278
+WeaponAnims=1,5,7
+Default=16777307
+Jacket=16777329
+Combat=16777330
+Metal=16777331
+Power=16777332
+Leather=16777333
+
+; Cassidy
+[3]
+PID=16777305
+WeaponAnims=4,5,7
+Default=16777354
+Leather=16777260
+Power=16777328
+Metal=16777327
+Jacket=16777351
+Combat=16777326
+
+; Myron
+[4]
+PID=16777376
+WeaponAnims=1,5
+Default=16777304
+Leather=
+Power=16777349
+Combat=16777350
+
+; Cat Jules
+[5]
+PID=16777734
+WeaponAnims=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
+Default=16777353
+Leather=16777347
+Metal=16777348
+Jacket=16777346
+Combat=16777226
+
+; Kitsune
+[6]
+PID=16777724
+WeaponAnims=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
+Default=16777222
+Leather=16777221
+Metal=16777223
+Jacket=16777222
+Combat=16777219
@@ -0,0 +1,40 @@
+[Highlighting]
+
+; DX scancode 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
@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.7
+;v4.0.6

 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -48,31 +48,31 @@ SpeedMultiInitial=100
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Graphics]
 ;Set to 0 for 8 bit fullscreen
-;Set to 4 for dx9 fullscreen
-;Set to 5 for dx9 windowed
-;A dx9 mode is required for any graphics related script extender functions to work (i.e. fullscreen shaders)
+;Set to 4 for DX9 fullscreen
+;Set to 5 for DX9 windowed
+;A DX9 mode is required for any graphics related script extender functions to work (i.e. fullscreen shaders)
 ;Modes 1, 2 and 3 are no longer supported
 Mode=0

-;If using a dx9 mode, this changes the resolution
+;If using a DX9 mode, this changes the resolution
 ;The graphics are simply stretched to fit the new window; this does _not_ let you see more of the map
 ;If set to 0, use Fallout's native resolution
 GraphicsWidth=0
 GraphicsHeight=0

-;Set to 1 to do the palette conversion on the gpu
-;Set to 2 to do the palette conversion on the cpu
+;Set to 1 to do the palette conversion on the GPU
+;Set to 2 to do the palette conversion on the CPU
 ;Set to 0 to pick automatically
 ;GPU is faster, but requires v2.0 pixel shader support
 GPUBlt=0

 ;Set to 1 to allow using 32 bit graphics for talking heads
-;Requires graphics mode 4 or 5, and gpublt set to 1
+;Requires graphics mode 4 or 5, and GPUBlt set to 1
 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
@@ -98,7 +98,7 @@ ReverseMouseButtons=0
 BackgroundKeyboard=0
 BackgroundMouse=0

-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

 ;The modifier key you have to hold down to change any speed settings
 ;Set to 0 if you don't want to use a modifier key, or a DX scancode otherwise
@@ -107,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=0x00
+SpeedToggleKey=0

 ;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
@@ -127,20 +127,19 @@ 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
-;Set to 2 for purple outlines
-HighlightContainers=0
-
 ;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 press to open a debug game editor
+;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=0x1d
+
+;A key to press to open a debug game editor (requires FalloutClient.exe from the modders pack)
+;Set to 0 to disable, or a DX scancode otherwise
 DebugEditorKey=0

-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]

 ;Time limit in years. Must be between -3 and 13
@@ -164,28 +163,14 @@ WorldMapFPSPatch=1
 ;Controls the world map speed if WorldMapFPSPatch is 1. Higher values cause slower movement
 WorldMapDelay2=66

-;XX OBSOLETE  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-;XX 
-;XX ;This will change the physical speed at which you move across the map
-;XX ;Set to 0 to leave at the default. (i.e. limited by vwait in windowed mode, or by processor speed in fullscreen)
-;XX ;If set to something other than 0, it enforces a maximum fps on the world map screen.
-;XX ;Changing this to something other than 0 is not recommended if you've already applied a world map speed patch to your Fallout exe.
-;XX WorldMapFPS=0
-;XX 
-;XX ;Only set to 1 if your systems high performance timer is unreliable for some reason
-;XX ForceLowResolutionTimer=0
-;XX 
-;XX ;Set to 1 to enable Ray's patch to make world map encounter rate independent of your travel speed
-;XX WorldMapEncounterFix=0
-;XX WorldMapEncounterRate=6
-;XX 
-;XX ;Obsolete, but can still be used if you know what it does.
-;XX ;WorldMapDelay=0
-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;Set to 1 to enable Ray's patch to make world map encounter rate independent of your travel speed
+;Higher values of WorldMapEncounterRate cause a slower encounter rate
+WorldMapEncounterFix=0
+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
@@ -201,9 +186,14 @@ WorldMapSlots=0
 ;To use a patch file other than patch000.dat, uncomment the next line and add your new file name
 ;If you want to check for multiple patch files, you can include a %d in the file name (sprintf syntax)
 ;By default, only the first patch file found will be used.
-;If you want to load multiple patch files at once, uncomment the NumberPatchLoop line and set it to the number of files to check for
+;If you want to load multiple patch files (up to 1000) at once, uncomment the MultiPatches line and set it to 1
 ;PatchFile=patch%03d.dat
-;NumberPatchLoop=100
+;MultiPatches=0
+
+;Set to 1 to use 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

 ;To change the default and starting player models, uncomment the next four lines.
 ;The default models can also be changed ingame via script
@@ -233,6 +223,7 @@ Movie16=artimer4.mve
 Movie17=credits.mve

 ;To change the starting year, month or day, uncomment the next 3 lines
+;Both StartMonth and StartDay are 0-indexed
 ;StartYear=-1
 ;StartMonth=-1
 ;StartDay=-1
@@ -247,11 +238,12 @@ Movie17=credits.mve
 ;PerksFile=Perks.ini

 ;Set to 1 if you want the pipboy to be available at the start of the game
+;Set to 2 to make the pipboy available by only skipping the vault suit movie check
 PipBoyAvailableAtGameStart=0

 ;Set to 1 to double the number of available kill types
 ;If you use this, you need to provide the extra descriptions in proto.msg (entries from 1450 to 1487 are names and 1488 to 1525 are descriptions)
-;Changing this option mid game will not invalidate old save games, but the players kill counters will be completely screwed.
+;Changing this option mid game will not invalidate old save games, but the player's kill counters will be completely screwed.
 ;Setting this to 1 may cause problems if the player kills more than 32767 of any one critter type
 ;Additional kill types must have their new critical tables set! (See the OverrideCriticalTable option)
 ExtraKillTypes=0
@@ -267,11 +259,14 @@ DamageFormula=0
 ;Prevents you from using 0 to escape from dialogue at any time.
 DialogueFix=1

+;Prevents you from using number keys to enter unvisited areas on a town map
+TownMapHotkeysFix=1
+
 ;Set to 1 to disable the horrigan encounter
 DisableHorrigan=0

-;Set to 1 to disable the random element in npc levelling.
-;This will cause all npc party members to automatically level up as soon as the player reaches the requirements
+;Set to 1 to disable the random element in NPC levelling.
+;This will cause all NPC party members to automatically level up as soon as the player reaches the requirements
 NPCAutoLevel=0

 ;Change the initial starting location and world map viewport
@@ -287,9 +282,6 @@ SingleCore=1
 ;Set to 1 to override the art_chache_size setting in fallout2.cfg
 OverrideArtCacheSize=0

-;Set to 1 to fix issues with the GainXXX perks not giving all the bonuses that they should
-GainStatPerkFix=1
-
 ;Prevents you from saving in combat except at the start of your turn to avoid a few bugs
 ;Note that even with this option enabled, it is still not advisable to save in combat at all.
 ;Set to 2 to block all saving in combat
@@ -298,25 +290,24 @@ SaveInCombatFix=1
 ;Point at an ini file containing elevator data
 ;ElevatorsFile=Elevators.ini

-;Uncomment and set to a comma delimited list of numbers to use a custom xp table.
-;Players level is capped once the highest specified level is reached
+;Uncomment and set a comma delimited list of numbers to use a custom xp table.
+;Player's level is capped once the highest specified level is reached
 ;XPTable=50,100,200

-;Set to 1 to enable additional weapon animations codes from o-t
+;Set to 1 to enable additional weapon animation 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

 ;Uncomment these lines to modify the default modifiers for aimed shots at specific bodyparts
-;BodypartHitMod0=-40
-;BodypartHitMod1=-30
-;BodypartHitMod2=-30
-;BodypartHitMod3=0
-;BodypartHitMod4=-20
-;BodypartHitMod5=-20
-;BodypartHitMod6=-60
-;BodypartHitMod7=-30
-;BodypartHitMod8=0
+;BodyHit_Head=-40
+;BodyHit_Left_Arm=-30
+;BodyHit_Right_Arm=-30
+;BodyHit_Torso_Uncalled=0
+;BodyHit_Right_Leg=-20
+;BodyHit_Left_Leg=-20
+;BodyHit_Eyes=-60
+;BodyHit_Groin=-30

 ;Set to 1 to use a CriticalOverrides.ini file to override the default critical table
 ;Set to 2 to use the default critical with bug fixes (doesn't require an ini)
@@ -340,7 +331,7 @@ CorpseLineOfFireFix=0
 ;Set a number of milliseconds to idle each input loop
 ;Set to -1 to disable
 ;Set to 0 to idle only if other processes are waiting for processor time
-;Set to 1 (or some higher number if needed) to prevent 100% cpu use
+;Set to 1 (or some higher number if needed, the maximum is 127) to prevent 100% CPU use
 ProcessorIdle=-1

 ;Set to 1 if using the hero appearance mod
@@ -349,17 +340,20 @@ EnableHeroAppearanceMod=0
 ;Set to 1 to skip the 3 opening movies
 SkipOpeningMovies=0

-;Causes npc's 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

 ;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
+;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

-;Change the skilldex cursor frm numbers
+;Set to 1 to boost the maximum number of tile FRMs from 4096 to 16383
+MoreTiles=0
+
+;Change the Skilldex cursor FRM numbers
 ;Default is 293 for all skills
 Lockpick=293
 Steal=293
@@ -381,8 +375,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
@@ -391,18 +384,19 @@ UseScrollingQuestsList=1
 ;Set to 1 to add additional pages of save slots
 ExtraSaveSlots=0

-;Set to 1 to speed up the hp/ac counter animations
+;Set to 1 to speed up the HP/AC counter animations
+;Set to 2 to update the HP/AC counters instantly
 SpeedInterfaceCounterAnims=0

-;These lines allow you to control the karma frm's displayed on the character screen
-;KarmaFRMsCount=3
+;These lines allow you to control the karma FRMs displayed on the character screen
+;Number of KarmaPoints should be 1 less than number of KarmaFRMs
 ;KarmaFRMs=47,48,49
 ;KarmaPoints=-100,100

 ;Set to 1 to allow science and repair to be used on the player, or 2 for all critters. (Rather than only brahmin/robots)
 ScienceOnCritters=0

-;Modify this value to change the players speed of rotation on the inventory and character screens
+;Modify this value to change the player's speed of rotation on the inventory and character screens
 ;Default is 166
 SpeedInventoryPCRotation=166

@@ -416,11 +410,11 @@ BonusHtHDamageFix=1
 ;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory
 DisplayBonusDamage=0

-;Modify the maximum number of animations allowed to run on a map. (Default is 32)
-AnimationsAtOnceLimit=120
+;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

-;Set to 1 to fix issues with the wield_obj_critter script function.
-WieldObjCritterFix=1
+;Modify the maximum number of animations allowed to run on a map. (Default is 32, and the maximum is 127)
+AnimationsAtOnceLimit=120

 ;Set to 1 to remove the limits that stop the player rolling critical successes/misses in the first few days of game time
 RemoveCriticalTimelimits=0
@@ -428,11 +422,8 @@ RemoveCriticalTimelimits=0
 ;Set to 1 to enable party members with level 6 protos to reach level 6
 NPCStage6Fix=0

-;Set to 1 to fix the problem with melee weapon equiped npcs being unable to attack multi-hex critters
-MultiHexPathingFix=1
-
 ;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
@@ -453,7 +444,7 @@ BoostScriptDialogLimit=0
 ;DerivedStats=Stats.ini

 ;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 pc only, 2 to apply to the pc and party members, or 3 to apply to all critters
+;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 extra unused stat (STAT_unused = 10)
 ;Add 4 to the mode to limit the weight check to used items only
 CritterInvSizeLimitMode=0
@@ -462,7 +453,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
@@ -472,6 +462,12 @@ EncounterTableSize=0
 ;Set to 1 to disable the pipboy alarm button
 DisablePipboyAlarm=0

+;Uncomment the next four lines to move the main menu buttons and credit text (the 'Copyright(c)' line on the main menu)
+;MainMenuOffsetX=0
+;MainMenuOffsetY=0
+;MainMenuCreditsOffsetX=0
+;MainMenuCreditsOffsetY=0
+
 ;Prevents you from using super stims on a critter who is at full health.
 SuperStimExploitFix=0

@@ -482,13 +478,15 @@ QuickPocketsApCostReduction=2
 ;Set to 1 to allow objects seeing through other objects with their ShootThru flag set
 ObjCanSeeObj_ShootThru_Fix=0

-;These options change the bullet distribution of burst attacks
-;All the bullets are divided into three groups: central, left and right. These three groups will then travel along three parallel tracks, trying to hit targets on the way
-;Set the mod to 1 to enable the next four lines
+;Set to 1 to enable the balanced bullet distribution formula for burst attacks
+ComputeSprayMod=0
+
+;These options modify the bullet distribution of burst attacks if ComputeSprayMod is 1
+;All the bullets are divided into three groups: central, left and right
+;These three groups will then travel along three parallel tracks, trying to hit targets on the way
 ;CenterMult/Div set the ratio of how many bullets go to the central group, and remaining bullets are divided equally to left and right sides
 ;TargetMult/Div set the ratio of how many bullets in the central group will attack the primary target directly
-;Multipliers are capped at divisor values.
-ComputeSprayMod=0
+;Multipliers are capped at divisor values
 ComputeSpray_CenterMult=1
 ComputeSpray_CenterDiv=3
 ComputeSpray_TargetMult=1
@@ -524,43 +522,59 @@ CheckWeaponAmmoCost=0
 CombatPanelAnimDelay=1000
 ;Controls the speed of dialog panel animations (lower - faster; valid range: 0..255)
 DialogPanelAnimDelay=33
-
-;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 it to a comma delimited list of PIDs
-ControlCombat=0
-;ControlCombatPIDList=62,89,97,107,160,161
+;Controls the speed of pipboy alarm clock animations (lower - faster; valid range: 0..127)
+PipboyTimeAnimDelay=50

 ;Set to 1 to stack empty identical weapons, no matter what type of ammo was loaded before
 StackEmptyWeapons=0

+;Changes the way weapon reloading works when you drag ammo onto a weapon in the inventory
+;Set to -1 to disable (vanilla behavior with the 'Move Items' window)
+;Set to 0 to use all the ammo boxes to reload
+;Set to 1 or more to reserve the specified amount of ammo boxes and use all the rest to reload
+;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=0
+DialogOptions9Lines=1

+;Set to 1 to leave the music playing in dialogue with talking heads
+EnableMusicInDialogue=0

-;Prevents 'Too Many Items' bug from corrupting game saves
-TooManyItemsBugFix=1
+;Set to 1 to prevent the player from running while sneaking without Silent Running perk
+DontTurnOffSneakIfYouRun=0

-;Set to 1 to fix a minor visual glitch when picking up a solo item from the top of inventory with a stack of multiple items at the bottom
-;Also fixes the inability to reload weapons by dragging ammo onto weapons in the inventory list
-InventoryDragIssuesFix=1
+;Set to 1 to fix the bug that unable to sell used geiger counters or stealth boys
+CanSellUsedGeiger=1

-;Set to 1 to add proper checks for NPC's addiction instead of always using global variables
-;Also fixes Jet Antidote not working on NPCs
-NPCDrugAddictionFix=1
-
-;Set to 1 to fix issues with NPC stats being dropped unreasonably if one has mutiple of the same armor in inventory and equips the armor,
-;And either you order NPC to remove the armor through dialog or one levels up
-ArmorCorruptsNPCStatsFix=1
-
-;Set to 1 to fix the bug that NPCs become unresponsive and act like walking containers if you move to another map while they are under 'lost next turn' critical miss effect
-NPCTurnsIntoContainerFix=1
-
-;Set to 1 to fix issues with being able to charge the car with using cells on scenary/critters and cells getting consumed even when the car is already fully charged
+;Set to 1 to fix the issue with being able to charge the car by using cells on other scenary/critters
 CarChargingFix=1

+;Set to 1 to skip weapon equip/unequip animations when performing various actions
+InstantWeaponEquip=0
+
+;To add additional game msg files, uncomment the next line and set a comma delimited list of filenames without .msg extension
+;You need to use the message_str_game script function to get messages from the files
+;ExtraGameMsgFileList=
+
+;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 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]
@@ -570,18 +584,32 @@ CarChargingFix=1
 ;Set to 1 to enable sfall debugging mode
 Enable=0

+;Fallout 2 Debug Patch
 ;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
+;output_map_data_info=1
+;show_load_info=1
+;show_script_messages=1
+;show_tile_num=1
+;[sound]
+;debug=1
+;debug_sfxc=1
+;-------
 DebugMode=0

 ;Change to 1 to skip the compatibility mode check
 SkipCompatModeCheck=0

 ;Set to 1 to skip the executable file size check
+;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
+;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 enabling sfall debugging mode
 ;ExtraCRC=0x00000000,0x00000000

 ;Set to 1 to stop Fallout from deleting non readonly protos at startup
@@ -591,7 +619,7 @@ DontDeleteProtos=0
 ;Set to 1 to give scripts direct access to Fallout's address space, and to make arbitrary calls into Fallout's code
 AllowUnsafeScripting=0

-;These options control what output is saved in the debug log
+;These options control what output is saved in the debug log (sfall-log.txt)

 ;Prints messages duing sfall initialization
 Init=0
@@ -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
@@ -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.
@@ -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
@@ -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
@@ -0,0 +1,9 @@
+"Take All" Hotkey mod for Fallout 2 by NovaRain
+----------------------------------------
+
+- makes pressing the semicolon key send an uppercase A after a semicolon.
+- 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 *.int file to your scripts folder.
+
+This mod is a simple example of how you can use HOOK_KEYPRESS hooks.
@@ -0,0 +1,126 @@
+/**
+
+   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 isHighlight;
+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
+         isHighlight := true;
+         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
+         isHighlight := false;
+         call ToggleHighlight(false);
+      end
+   end
+end
+
+procedure CombatTurnHandler begin
+   if isHighlight then begin
+      isHighlight := false;
+      call ToggleHighlight(false);
+   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);
+      register_hook_proc(HOOK_COMBATTURN, CombatTurnHandler);
+   end
+end
@@ -0,0 +1,154 @@
+/*
+
+   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, allowed weapon anim codes, NPC PIDs and NPC FIDs in INI file.
+
+   NOTE: this script requires compiler from sfall modderspack with -s option
+   (short circuit evaluation)
+
+   version 1.1
+
+*/
+
+#include "main.h"
+
+#define IS_ARMOR(item)  (obj_type(item) == OBJ_TYPE_ITEM and obj_item_subtype(item) == item_type_armor)
+#define IS_WEAPON(item)  (obj_type(item) == OBJ_TYPE_ITEM and obj_item_subtype(item) == item_type_weapon)
+
+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
+
+procedure check_weapon_change(variable critter, variable item, variable isWield) begin
+   variable npc, newWeaponAnim, weaponAnimList, i;
+   if (npcMap[obj_pid(critter)]) then begin
+      npc := npcMap[obj_pid(critter)];
+      if isWield then begin
+         newWeaponAnim := get_proto_data(obj_pid(item), PROTO_WP_ANIM);
+         weaponAnimList := string_split(npc["WeaponAnims"], ",");
+         if newWeaponAnim then begin
+            foreach (i in weaponAnimList) begin
+               if (newWeaponAnim == atoi(i)) then return -1;
+            end
+         end else begin // anim code 0 - none/unarmed
+            return -1;
+         end
+      end
+   end
+   return 0;
+end
+
+// for NPCs when they change armor/weapon themselves
+procedure invenwield_handler begin
+   variable critter, item, fid, slot, isWorn, canWield;
+   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
+
+   if (critter and item and (slot == INVEN_TYPE_RIGHT_HAND or slot == INVEN_TYPE_LEFT_HAND)) then begin
+      canWield := check_weapon_change(critter, item, isWorn);
+      set_sfall_return(canWield);
+   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
+
+// when changing weapon from inventory while controlling other NPCs
+procedure inventorymove_handler begin
+   variable slot, item, canWield;
+   slot := get_sfall_arg;
+   item := get_sfall_arg;
+   if (dude_obj != real_dude_obj) then begin
+      if (IS_WEAPON(item) and (slot == INVEN_TYPE_RIGHT_HAND or slot == INVEN_TYPE_LEFT_HAND)) then begin
+         canWield := check_weapon_change(dude_obj, item, item != 0);
+         set_sfall_return(canWield);
+      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);
+      register_hook_proc(HOOK_INVENTORYMOVE, inventorymove_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["WeaponAnims"] := sect["WeaponAnims"];
+         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
+
--- a/Show More
+++ b/Show More