Minor code format edits in LoadGameHook.cpp

Updated FalloutStructs.h and ddraw.ini.

DebugEditor/Program.cs

@@ -15,7 +15,8 @@ namespace FalloutClient {
             if (args.Length == 1 && args[0] == "-debugedit") {
                 Application.Run(new DebugEditor(new EditorConnection()));
             } else {
-                MessageBox.Show("The debug editor can only be run from the game.",
+                MessageBox.Show("The debug editor can only be run from the game.\n" +
+                    "Use the key assigned to the DebugEditorKey option in ddraw.ini to run the debugger.",
                     "sfall Debug Editor", MessageBoxButtons.OK, MessageBoxIcon.Stop);
             }
         }

DebugEditor/SfallDebugEditor.csproj

@@ -9,14 +9,13 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FalloutClient</RootNamespace>
-    <AssemblyName>FalloutClient</AssemblyName>
+    <AssemblyName>FalloutDebug</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -29,6 +28,7 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>false</BootstrapperEnabled>
   </PropertyGroup>
@@ -42,14 +42,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

README.md

@@ -2,7 +2,7 @@
 
 A set of engine modifications for the classic game Fallout 2 in form of a DLL, which modifies executable in memory without changing anything in EXE file itself.
 
-Engine modifications include:   
+**Engine modifications include:**
 - Better support for modern operating systems
 - Externalizing many settings like starting map and game time, skills, perks, critical hit tables, books, etc.
 - Bug fixes

artifacts/config_files/Perks.ini

@@ -1,28 +1,56 @@
 ;This file handles modifications to perks and traits
-;When adding extra perks to a mod, it's advisable to use
+
-; the fake perk scripting functions rather than make modifications
+;When adding extra perks to a mod, it's advisable to use the fake perk scripting functions rather than make modifications
-; in this file, as some perks have hardcoded effects which may
+; in this file, as some perks have hardcoded effects which may catch you out
-; catch you out
+
-;Since traits need to be picked before any scripts run, they
+;Since traits need to be picked before any scripts run, they have an additional NoHardcode option in this file which can
-; have an additional NoHardcode option in this file which can
 ; be used to remove their hardcoded effects, and add new stat/skill effects
 
 [PerksTweak]
-;Change the penalty distance and distance bonus for 'Weapon Scope Range' weapon perk
+;Changes the bonus for 'Master Trader' perk (ID 17)
+;25 - default bonus
+MasterTraderBonus=25
+
+;Changes the distance bonus for 'Weapon Long Range' weapon perk (ID 58)
+;2 - no bonus, 4 - default bonus
+WeaponLongRangeBonus=4
+
+;Changes the hit chance bonus for 'Weapon Accurate' weapon perk (ID 59)
+;0 - no bonus, 125 - maximum bonus, 20 - default bonus
+WeaponAccurateBonus=20
+
+;Change the penalty distance and distance bonus for 'Weapon Scope Range' weapon perk (ID 64)
 ;0 - no penalty, 8 - default penalty
 WeaponScopeRangePenalty=8
 ;2 - no bonus, 5 - default bonus
 WeaponScopeRangeBonus=5
 
-;Changes the distance bonus for 'Weapon Long Range' weapon perk
+;Changes the resistance bonuses for 'Vault City Inoculations' perk (ID 78)
-;2 - no bonus, 4 - default bonus
+;valid range: -100..100, 10 - default bonus
-WeaponLongRangeBonus=4
+VaultCityInoculationsPoisonBonus=10
+VaultCityInoculationsRadBonus=10
 
-;Changes the hit chance bonus for 'Weapon Accurate' weapon perk
+;Changes the damage bonus per level for 'Demolition Expert' perk (ID 82)
-;0 - no bonus,  200 - maximum bonus, 20 - default bonus
+;999 - maximum bonus, 10 - default bonus
-WeaponAccurateBonus=20
+DemolitionExpertBonus=10
 
-;Changes the strength bonus for 'Weapon Handling' perk
+;Changes the damage bonus for 'Living Anatomy' perk (ID 97)
+;125 - maximum bonus, 5 - default bonus
+LivingAnatomyBonus=5
+
+;Changes the damage bonus for 'Pyromaniac' perk (ID 101)
+;125 - maximum bonus, 5 - default bonus
+PyromaniacBonus=5
+
+;Changes the skill bonus per level for 'Salesman' perk (ID 103)
+;999 - maximum bonus, 20 - default bonus
+SalesmanBonus=20
+
+;Changes the percent chance for 'Stonewall' perk (ID 104)
+;valid range: 0..100, 50 - default percent
+StonewallPercent=50
+
+;Changes the strength bonus for 'Weapon Handling' perk (ID 106)
 ;0 - no bonus, 10 - maximum bonus, 3 - default bonus
 WeaponHandlingBonus=3
 
@@ -31,31 +59,25 @@ WeaponHandlingBonus=3
 ;Set to 1 to enable the modifications for perks
 Enable=0
 
-;Name=The name of the perk (max 63 characters)
+;Name: The name of the perk (max 63 characters)
-;Desc=The description of the perk (max 255 characters)
+;Desc: The description of the perk (max 255 characters)
-;Image=The line number (0-indexed) of the corresponding FRM in skilldex.lst
+;Image: The line number (0-indexed) of the corresponding FRM in skilldex.lst
-;Ranks=The number of perk levels
+;Ranks: The number of perk levels
-;Level=The minimum required level
+;Level: The minimum required level
-;Type=If 0, the perk checks only Skill1 for skill requirements; if 1, it checks
+;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
-; 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
-;Stat=The modified stat or -1 if you don't want to change any stats
+;StatMag: The increased/decreased value to the modified stat
-;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
+;Skill1/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864), it checks GVAR.
-; (67108864 or 0x4000000), it checks GVAR. For example, if Skill1=67108864, then
+; For example, if Skill1=0x4000004, then the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value
-; the perk will check GVAR_PLAYER_REPUTATION (67108864 + 0) on Skill1Mag value
+
-;Skill1Mag=Positive value is used as the minimum requirements of the first
+;Skill1Mag/Skill2Mag: Positive value is used as the minimum requirements of the first/second skill/GVAR, and a negative value is interpreted as the maximum requirement.
-; 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
-; For example, with Skill1=0 and Skill1Mag=100, if player has small guns skill
+; selection window; with Skill1=1 and Skill1Mag=-120, the perk will not be available if player has big guns skill >= 120
-; >= 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
+;STR-LCK: Positive values are used as minimum requirements of SPECIAL stats, and negative values are interpreted as maximum requirements.
-; available if player has big guns skill >= 120
+; For some special perks processed by the engine (e.g. PERK_armor_powered and PERK_armor_combat), the values are not used as requirements
-;Skill2=The second skill/GVAR (or -1 for none) to check
+; but to add to corresponding SPECIAL stats
-;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)
 
@@ -63,7 +85,7 @@ Enable=0
 ;This is a modification to perk 119
 [119]
 Name=Example
-Desc=This is an example perk~Second line
+Desc=This is an example perk description
 Image=72
 Ranks=1
 Level=1

artifacts/config_files/Skills.ini

@@ -1,11 +1,22 @@
 ;This file lets you set the formula for calculating skills
 
 [skills]
-BasedOnPoints=0 ;Set to 1 to base skill costs on spent points instead of current level
+;Changes the initial bonus to skill level for tag skills
+;valid range: 0..100, 20 - default bonus
+TagSkillBonus=20
 
-Skill0=s1|i2|l1.5 ;Skill 0 (small guns) is str*1 + int*2 + luck*1.5
+;Changes the behavior of tag skills
-SkillBase1=50     ;Big guns has a base of 50
+;Set to 1 to give the initial skill bonus to the fourth tag skill from "Tag!" perk (Fallout 1 behavior)
-SkillMulti2=10    ;Each point spent in energy weapons increases it by 10
+;Set to 2 to disable the double bonus of skill points for tag skills
-SkillImage1=72
+;Set to 3 to use both modes
+TagSkillMode=0
 
-SkillCost0=0|0|0|0|0|300 ;Each level of small guns costs 6 skill points
+;Set to 1 to base skill costs on spent points instead of current level
+BasedOnPoints=0
+
+;Examples
+;Skill0=s1|i2|l1.5 ;Skill 0 (small guns) is str*1 + int*2 + luck*1.5
+;SkillBase1=50     ;Big guns has a base of 50
+;SkillMulti2=10    ;Each point spent in energy weapons increases it by 10
+;SkillImage1=72
+;SkillCost0=0|0|0|0|0|300 ;Each level of small guns costs 6 skill points

artifacts/config_files/Stats.ini

@@ -6,6 +6,10 @@
 ;multi[x] - where x is from 0 to 6, the multiplier of st/pe/en/etc.
 ;shift[x] - shifts the base stat before the multiplication
 
+[Main]
+;Set to 1 to take the bonus values of SPECIAL stats into account when calculating maximum hit points
+;Set to 0 for the Fallout original behavior (bonus stats do not affect maximum hit points)
+HPDependOnBonusStats=0
 
 ;max hp
 [7]

artifacts/config_files/elevators.ini

@@ -40,7 +40,7 @@ Image=24
 ButtonCount=3
 
 ;Set the appearance of the elevator
-MainFrm=148
+MainFrm=148    ; EL_VAULT.FRM
-ButtonsFrm=151
+ButtonsFrm=151 ; EL_MIL3.FRM
 
 ;Set up the exit points for all three buttons (see examples above)

artifacts/ddraw.ini

@@ -1,5 +1,5 @@
 ;sfall configuration settings
-;v3.8.22
+;v3.8.29
 
 [Main]
 ;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -8,24 +8,6 @@ UseCommandLine=0
 ;Uncomment and point to a file to get alternate translations for some sfall messages
 ;TranslationsINI=sfall\Translations.ini
 
-;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-[Sound]
-;Sets the number of allowed simultaneous sound effects
-;Set to 0 to leave the default unchanged (i.e. 4)
-NumSoundBuffers=0
-
-;Set to 1 to allow attaching sound files to combat float messages
-AllowSoundForFloats=0
-
-;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
-;This does not effect the play_sfall_sound and stop_sfall_sound script functions
-AllowDShowSound=0
-
-;Set to 1 to override the music path used by default (i.e. data\sound\music\) if not present in the cfg
-;Set to 2 to overwrite all occurances of the music path
-OverrideMusicDir=2
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Speed]
 ;Set to 0 to disable everything in this section
@@ -46,7 +28,7 @@ SpeedMulti9=900
 ;The initial speed at game startup
 SpeedMultiInitial=100
 
-;Set to 1 to also affect the playback speed of mve video files without an audio track
+;Set to 1 to also affect the playback speed of MVE video files without an audio track
 AffectPlayback=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -54,6 +36,7 @@ AffectPlayback=0
 ;Set to 0 for 8 bit fullscreen
 ;Set to 4 for DX9 fullscreen
 ;Set to 5 for DX9 windowed
+;Set to 6 for DX9 fullscreen windowed (the resolution in f2_res.ini should be set to the same aspect ratio as your desktop resolution)
 ;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
@@ -64,12 +47,22 @@ Mode=0
 GraphicsWidth=0
 GraphicsHeight=0
 
-;Uncomment the option to use a hardware shader (requires DX9 graphics mode 4 or 5)
+;Window position data. Do not modify
+;Set to 0 to reset if the window position is incorrect
+WindowData=0
+
+;Uncomment the option to use a hardware shader (requires DX9 graphics mode)
 ;The shader file <name>.fx must be placed in <GameRoot>\<master_patches>\shaders\ and must contain one technique with one or more passes
+;You can specify multiple shader files, separated by commas
 ;GlobalShaderFile=global.fx
 
+;Set to 1 to automatically enable linear texture filtering when the scale factor is not an integer
+;Set to 2 to force-enable linear texture filtering
+;This can be used in conjunction with the GlobalShaderFile option
+TextureFilter=1
+
 ;Set to 1 to do the palette conversion on the GPU
-;Set to 2 to do the palette conversion on the CPU
+;Set to 2 to do the palette conversion on the CPU (used for compatibility with old video cards)
 ;Set to 0 to pick automatically
 ;GPU is faster, but requires v2.0 pixel shader support
 GPUBlt=0
@@ -81,14 +74,47 @@ GPUBlt=0
 ;Requires DX9 graphics mode and v2.0 pixel shader support (see GPUBlt option)
 Use32BitHeadGraphics=0
 
-;Set to 1 to automatically search for alternative avi video files when Fallout tries to play the game movies
+;Set to 1 to automatically search for alternative AVI video files when Fallout tries to play the game movies
-;Requires DX9 graphics mode 4 or 5
+;Set to 2 to force AVI videos to fit the screen width
+;Requires DX9 graphics mode
 AllowDShowMovies=0
 
 ;Fade effect time percentage modifier
 ;Default is 100. Decrease/increase this value to speed up/slow down fade effects
 FadeMultiplier=100
 
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+[Interface]
+;Set to 1 to draw a dotted line while traveling on the world map (similar to Fallout 1)
+WorldMapTravelMarkers=0
+;Uncomment these lines to change the appearance of the markers
+;The color index in Fallout default palette (valid range: 1..228; default is 134)
+;TravelMarkerColor=134
+;The length and spacing of the dots in pixels for each type of terrain in worldmap.txt
+;Syntax is 'length:spacing', with each pair separated by a comma (valid range: 1..10; default is 2)
+;TravelMarkerStyles=2:2,2:2,2:2,2:2
+
+;Set to 1 to display terrain types when hovering the cursor over the player's marker on the world map
+WorldMapTerrainInfo=0
+
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+[Sound]
+;Sets the number of allowed simultaneous sound effects
+;Set to 0 to leave the default unchanged (i.e. 4). The maximum is 32
+NumSoundBuffers=0
+
+;Set to 1 to allow attaching sound files to combat float messages
+AllowSoundForFloats=0
+
+;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
+;This does not effect the play_sfall_sound and stop_sfall_sound script functions
+AllowDShowSound=0
+
+;Set to 1 to override the default music path with data\sound\music\ if music_path is not present in the cfg
+;Set to 2 to overwrite all occurrences of the music path
+OverrideMusicDir=1
+
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Input]
 ;Set to 1 to enable the mouse scroll wheel to scroll through the inventory, barter, and loot screens
@@ -141,7 +167,7 @@ SpeedKey7=0x00
 SpeedKey8=0x00
 SpeedKey9=0x00
 
-;A key to hold down to move the window around when using graphics mode 5
+;A key to hold down to move the window around when using DX9 graphics mode 5
 ;Set to 0 if you don't want to use a modifier key, or a DX scancode otherwise
 ;Set to -1 for either ctrl key, -2 for either alt key or -3 for either shift key
 WindowScrollKey=0
@@ -164,9 +190,10 @@ HighlightCorpses=1
 ;16 - bright yellow
 ;32 - dark yellow
 ;64 - purple
+;You can set a custom color from the game palette by multiplying the color index value by 256 (available since sfall 3.8.27)
 OutlineColor=16
 
-;A key to press to reload your currently equipped weapon
+;A key to press to reload your currently equipped weapon or use the active item
 ;Set to 0 if you don't want a reload key, or a DX scancode otherwise
 ReloadWeaponKey=0
 
@@ -180,7 +207,7 @@ 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
+;Requires sfall debugging mode and FalloutDebug.exe from the modders pack
 DebugEditorKey=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -188,6 +215,7 @@ DebugEditorKey=0
 ;Changes some of Fallout 2 engine functions to Fallout 1 behavior:
 ;- disables playing the final movie/credits after the endgame slideshow
 ;- disables halving the weight for power armor items
+;- endgame_movie script function plays movie 10 or 11 based on the player's gender before the credits
 Fallout1Behavior=0
 
 ;Time limit in years. Must be between -3 and 13
@@ -247,7 +275,8 @@ DataLoadOrderPatch=1
 ;FemaleDefaultModel=hfjmps
 
 ;To change the various ingame movies, modify the next 17 lines
-;Most of these can also be changed ingame via script.
+;You can also define additional movies by adding Movie18 - Movie32 lines
+;Most of these can also be changed ingame via script
 Movie1=iplogo.mve
 Movie2=intro.mve
 Movie3=elder.mve
@@ -303,7 +332,7 @@ 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
+;Set to 1 to disable the Horrigan encounter
 DisableHorrigan=0
 
 ;Set to 1 to disable the random element in NPC levelling.
@@ -324,7 +353,7 @@ SingleCore=1
 OverrideArtCacheSize=0
 
 ;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.
+;Note that even with this option enabled, it is still not advisable to save in combat at all (obsolete information)
 ;Set to 2 to block all saving in combat
 SaveInCombatFix=1
 
@@ -332,9 +361,9 @@ 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 animation codes from o to 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'
+;Since the letters 'n' and 'r' are in use for other animations, an animation code of 11 corresponds to 's' and 15 to 't'
 AdditionalWeaponAnims=1
 
 ;Uncomment these lines to modify the default modifiers for aimed shots at specific bodyparts
@@ -367,14 +396,14 @@ AlwaysReloadMsgs=0
 PlayIdleAnimOnReload=0
 
 ;Changes the timer (in days) for deleting corpses on a map after you leave (valid range: 0..13)
-;The corpses of critters with 'Ages' flag or on maps with 'dead_bodies_age=No' set in maps.txt will not disappear
+;The corpses of critters with 'Ages' flag set or on maps with 'dead_bodies_age=No' set in maps.txt will not disappear
 ;Default is 6. Set to 0 for a 12-hour timer
 CorpseDeleteTime=6
 
 ;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 0 to idle only if other processes are waiting for processor time (WinXP/2000: if processes have equal priority)
-;Set to 1 (or some higher number if needed, the maximum is 127) to prevent 100% CPU use
+;Set to 1 (or some higher number if needed) to prevent 100% CPU use. The maximum is 127
 ProcessorIdle=-1
 
 ;Set to 1 if using the hero appearance mod
@@ -445,6 +474,14 @@ UseScrollingQuestsList=1
 ;Set to 1 to add additional pages of save slots
 ExtraSaveSlots=0
 
+;To use more than one save slot for quick saving (F6 key) without picking a slot beforehand, set the next two lines
+;AutoQuickSave sets how many save slots on a page you want to use for quick saving (valid range: 1..10)
+;AutoQuickSavePage is the page number to use (valid range: 1..1000) if ExtraSaveSlots is enabled
+;The quick saves will be rotated from the first slot on the page to the n-th slot
+;Set to 0 to disable. AutoQuickSave will use the current selected page if AutoQuickSavePage is disabled
+AutoQuickSave=0
+AutoQuickSavePage=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
@@ -475,9 +512,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
 
@@ -490,12 +524,16 @@ RemoveCriticalTimelimits=0
 ;Change the colour of the font used on the main menu for the button text
 ;MainMenuBigFontColour=0x3C
 
-;Two alternate fixes to the interaction between HtH attacks and the fast shot trait
+;Alternative behaviors to the Fast Shot trait
-;0 - Fallout 2 original behaviour
+;0 - Fallout 2 original behavior: -1 AP cost for ranged weapons; aimed attacks are disabled
-;1 - Haenlomal's fix, called shots are enabled for HtH attacks
+;1 - Haenlomal's fix: aimed attacks are enabled for melee/unarmed weapons and HtH attacks
-;2 - Restoring the -1 AP bonus for HtH attacks (i.e. Fallout 1 behaviour)
+;2 - Alternative behavior: apply -1 AP cost to melee/unarmed weapons and HtH attacks
+;3 - Fallout 1 original behavior: -1 AP cost for all weapons; aimed attacks are disabled
 FastShotFix=1
 
+;Set to 1 to fix the carry weight penalty of the Small Frame trait not being applied to bonus Strength points
+SmallFrameFix=0
+
 ;Set to 1 to boost the maximum number of script names from 1450 to 10000
 BoostScriptDialogLimit=0
 
@@ -503,7 +541,7 @@ BoostScriptDialogLimit=0
 ;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
 ;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
+;You can use message number 542/543 in proto.msg and message number 35 in inventry.msg to set up custom messages for item size
 CritterInvSizeLimitMode=0
 CritterInvSizeLimit=100
 
@@ -513,8 +551,10 @@ CritterInvSizeLimit=100
 ;4 - Motion sensor is required to use the item highlight feature
 MotionScannerFlags=1
 
-;Set to non-0 to adjust the maximum encounter table size
+;Set a value greater than 40 to change the maximum encounter table size (enc_## in worldmap.txt)
-;Default is 40, and the maximum is 127
+;Default is 40, and the maximum is 100
+;Note: Setting this greater than 50 requires renumbering all message lines for the encounter tables in worldmap.msg
+;The messages for each table must be numbered from (3000 + table number * 100) to (3099 + table number * 100)
 EncounterTableSize=0
 
 ;Set to 1 to disable the pipboy alarm button
@@ -533,8 +573,8 @@ SuperStimExploitFix=0
 InventoryApCost=4
 QuickPocketsApCostReduction=2
 
-;Set to 1 to allow objects seeing through other objects that have their ShootThru flag set
+;Set to 1 to fix obj_can_see_obj script function to allow critters to see through objects with 'ShootThru' flag set and other critters in front of them
-;Note that enabling this option can cause unexpected NPC behavior in some situations
+;Note that enabling this option can cause unexpected NPC behavior in some cases, e.g. initiating combat or dialogue when the player is behind certain obstacles
 ObjCanSeeObj_ShootThru_Fix=0
 
 ;Set to 1 to fix the broken obj_can_hear_obj script function
@@ -544,13 +584,16 @@ ObjCanHearObjFix=0
 ;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 fix and repurpose the unused called_shot/num_attacks arguments of attack_complex script function
+;Set to 1 to fix attacker_results/target_results arguments and repurpose the unused called_shot/num_attacks arguments of attack_complex script function
-;This also changes the behavior of the result flags arguments
+;New behavior of the arguments:
-;called_shot - additional damage, when the damage received by the target is above the specified minimum damage
+;called_shot - additional damage when hitting the target
 ;num_attacks - the number of free action points on the first turn only
-;attacker_results - unused, must be 0 or not equal to the target_results argument when specifying result flags for the target
 AttackComplexFix=0
 
+;Set to 1 to fix the issue with the division operator treating negative integers as unsigned
+;Note: To perform the unsigned integer division, use the new 'div' operator
+DivisionOperatorFix=1
+
 ;Set to 1 to enable the balanced bullet distribution formula for burst attacks
 ComputeSprayMod=0
 
@@ -598,8 +641,8 @@ PipboyTimeAnimDelay=50
 ;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
+;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs
 ;ControlCombatPIDList=62,89,97,107,160,161
 
 ;Set to 1 to stack empty identical weapons, no matter what type of ammo was loaded before
@@ -625,6 +668,13 @@ DontTurnOffSneakIfYouRun=0
 ;Set to 0 to disable switching. (Default is 3)
 UseWalkDistance=3
 
+;Changes the displayed message when you recover from the negative effects of radiation exposure
+;The value is the message number in misc.msg (Default is 3003: 'You feel better')
+RadEffectsRemovalMsg=3003
+
+;Set to 1 to display messages about radiation for the active geiger counter
+ActiveGeigerMsgs=1
+
 ;Set to 1 to fix the bug of being unable to sell used geiger counters or stealth boys
 CanSellUsedGeiger=1
 
@@ -640,6 +690,9 @@ CarPlacedTileFix=1
 InstantWeaponEquip=0
 
 ;To add additional game msg files, uncomment the next line and set a comma delimited list of filenames without .msg extension
+;By default, the files will have consecutive numbers assigned beginning with 0
+;You can use the syntax 'filename:number' to manually assign numbers to specific msg files, with each pair separated by a comma
+;If a file after the specified pair does not have a number assigned, it will have the next consecutive number from the last pair
 ;You need to use the message_str_game script function to get messages from the files
 ;ExtraGameMsgFileList=
 
@@ -649,6 +702,10 @@ 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 use Fallout's normal text font for death screen subtitles
+;Requires changing the color of subtitles in death.pal palette to white color (index 220) to display the text correctly
+DeathScreenFontPatch=0
+
 ;Set to 1 to display full item description for weapon/ammo in the barter screen
 FullItemDescInBarter=0
 
@@ -658,8 +715,9 @@ 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
+;Set to 1 to skip loading all game settings except the game/combat difficulty from saved games
-InterfaceDontMoveOnTop=0
+;Set to 2 to also skip loading the game/combat difficulty settings
+SkipLoadingGameSettings=0
 
 ;Overrides the global variable number used to show the special death message of the Modoc toilet explosion
 ;Set to -1 to disable the special death message when the global variable is set
@@ -709,10 +767,27 @@ CreditsAtBottom=0
 ;Set to 1 to enable sfall debugging mode
 Enable=0
 
+;Set to 1 to give scripts direct access to Fallout's address space, and to make arbitrary calls into Fallout's code
+;Set to 2 to also disable the memory address check in unsafe script functions
+;Does not require sfall debugging mode
+AllowUnsafeScripting=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
+;ExtraCRC=0x00000000,0x00000000
+
+;Set to 1 to skip the executable file size check
+;Does not require sfall debugging mode
+SkipSizeCheck=0
+
+;Change to 1 to skip the compatibility mode check
+SkipCompatModeCheck=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 debug.log
 ;Does not require sfall debugging mode
-;While you don't need to create an environment variable, you do still need to set the appropriate lines in fallout2.cfg:
+;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
@@ -729,25 +804,12 @@ DebugMode=0
 ;Set to 1 to hide error messages in debug output when a null value is passed to the function as an object
 HideObjIsNullMsg=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 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
-;ExtraCRC=0x00000000,0x00000000
-
 ;Set to 1 to stop Fallout from deleting non read-only protos at startup
 ;Has pretty nasty side effects when saving/reloading, so don't use for regular gameplay
 DontDeleteProtos=0
 
-;Set to 1 to give scripts direct access to Fallout's address space, and to make arbitrary calls into Fallout's code
+;Set to 1 to force sfall to search for global/hook scripts every time the game loads rather than only the first time
-;Does not require sfall debugging mode
+AlwaysFindScripts=0
-AllowUnsafeScripting=0
 
 ;Set to 1 to force critters to display combat float messages
 ;Requires AllowSoundForFloats to be enabled

artifacts/example_mods/AmmoMod/gl_ammomod.ssl

@@ -12,52 +12,58 @@ Requires sfall 3.5 or higher
 
 */
 
-#include "..\headers\define_extra.h"
+#include "..\headers\sfall\sfall.h"
+#include "..\headers\sfall\define_extra.h"
 
-procedure set_ammo_mod;
 procedure start;
 procedure map_enter_p_proc;
 
 variable ammoIni;
+variable ammoData;
 variable enabled;
 
-procedure set_ammo_mod begin
-   variable pid, dmg_mod, i := 1;
-
-   while (i > 0) do begin
-      pid := get_ini_setting(ammoIni + "|" + i + "|pid");
-      if (pid < 1) then break;
-      set_proto_data(pid, PROTO_AM_AC_MOD, get_ini_setting(ammoIni + "|" + i + "|ac_adjust"));
-      set_proto_data(pid, PROTO_AM_DR_MOD, get_ini_setting(ammoIni + "|" + i + "|dr_adjust"));
-
-      // dam_mult and dam_div must be positive integers
-      dmg_mod := get_ini_setting(ammoIni + "|" + i + "|dam_mult");
-      if (dmg_mod < 1) then dmg_mod := 1;
-      set_proto_data(pid, PROTO_AM_DMG_MULT, dmg_mod);
-      dmg_mod := get_ini_setting(ammoIni + "|" + i + "|dam_div");
-      if (dmg_mod < 1) then dmg_mod := 1;
-      set_proto_data(pid, PROTO_AM_DMG_DIV, dmg_mod);
-
-      i++;
-   end
-   //debug_msg("AmmoMod: " + ammoIni + " - set " + (i - 1) + " ammo protos.");
-end
-
 procedure start begin
+   variable i := 1, ammo, ammoPid, dmgMod;
    if game_loaded then begin
-      ammoIni := get_ini_setting("ddraw.ini|Misc|DamageFormula");
+      enabled := get_ini_setting("ddraw.ini|Misc|DamageFormula");
-      if (ammoIni == 1 or ammoIni == 2) then
+      if (enabled == 1 or enabled == 2) then
          ammoIni := "AmmoGlovz.ini";
-      else if (ammoIni == 5) then
+      else if (enabled == 5) then
          ammoIni := "AmmoYAAM.ini";
       else
          ammoIni := "AmmoMod.ini";
 
       enabled := get_ini_setting(ammoIni + "|1|pid");
-      if (enabled > 0) then call set_ammo_mod;
+      if (enabled <= 0) then return;
+
+      ammoData := create_array_map;
+      ammoPid := enabled; // pid from the first section
+      while (ammoPid > 0) do begin
+         ammo := create_array_map; // create permanent arrays
+         ammo.ac_adjust := get_ini_setting(ammoIni + "|" + i + "|ac_adjust");
+         ammo.dr_adjust := get_ini_setting(ammoIni + "|" + i + "|dr_adjust");
+         // dam_mult and dam_div must be positive integers
+         dmgMod := get_ini_setting(ammoIni + "|" + i + "|dam_mult");
+         ammo.dam_mult := dmgMod if (dmgMod > 0) else 1;
+         dmgMod := get_ini_setting(ammoIni + "|" + i + "|dam_div");
+         ammo.dam_div := dmgMod if (dmgMod > 0) else 1;
+         ammoData[ammoPid] := ammo;
+         i++;
+         ammoPid := get_ini_setting(ammoIni + "|" + i + "|pid");
+      end
+      call map_enter_p_proc;
+      debug_msg("Ammo INI Loader mod: " + ammoIni + " - set " + (i - 1) + " ammo protos.");
    end
 end
 
 procedure map_enter_p_proc begin
-   if (enabled > 0) then call set_ammo_mod;
+   variable pid, values;
+   if (enabled > 0) then begin
+      foreach (pid: values in ammoData) begin
+         set_proto_data(pid, PROTO_AM_AC_MOD, values.ac_adjust);
+         set_proto_data(pid, PROTO_AM_DR_MOD, values.dr_adjust);
+         set_proto_data(pid, PROTO_AM_DMG_MULT, values.dam_mult);
+         set_proto_data(pid, PROTO_AM_DMG_DIV, values.dam_div);
+      end
+   end
 end