Increased the max number of objects that can be outlined simultaneously

(from 100 to 500, same as Mash's HRP 4.x) Minor code edits to npc_engine_level_up function.
Added opcode_exists script function from CE
2026-07-27 16:52:34 -07:00 · 2026-07-27 22:33:11 +08:00 · 2026-07-22 10:31:14 +08:00 · 2026-07-17 08:52:21 +08:00 · 2026-07-16 11:07:29 +08:00 · 2026-07-16 09:55:17 +08:00
454 changed files with 16174 additions and 8456 deletions
@@ -0,0 +1 @@
+*.ssl linguist-language=Pascal
@@ -0,0 +1,12 @@
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+   interval: "monthly"
+  # target-branch: "develop"
+  labels:
+  - "dependencies"
@@ -3,21 +3,30 @@ name: Build
 on:
 push:
  branches:
+  - 'master'
  - 'develop'
  - 'github-action'
  paths:
  - '.github/workflows/build.yml'
  - 'action.yml'
  - 'sfall/**'
+ pull_request:
+  branches:
+  - 'master'
+  - 'develop'
+  paths:
+  - '.github/workflows/build.yml'
+  - 'action.yml'
+  - 'sfall/**'

 jobs:
 Build:
  name:    sfall
-  runs-on: windows-latest
+  runs-on: windows-2022
  steps:

  - name: Clone sfall
-    uses: actions/checkout@v2
+    uses: actions/checkout@v7

  # Action is used twice for self-testing only
  # DevXP build results are intentionally *not* included in artifact
@@ -27,25 +36,27 @@ jobs:
    uses: ./
    with:
     release-xp: true
+     dev-xp:     false

  - name: DevXP build
    uses: ./
    with:
-     dev-xp: true
+     release-xp: false
+     dev-xp:     true

-  - name:  Prepare artifact
+  - name:  Prepare artifacts
    run:   |
           :
           mkdir -p sfall-build

           cp artifacts/ddraw.ini sfall-build
-           cp artifacts/sfall.dat sfall-build
+           cp artifacts/sfall_dat/sfall.dat sfall-build
           cp "${{ steps.build.outputs.release-xp }}" sfall-build
    shell: bash

  - name: Upload artifacts
-    uses: actions/upload-artifact@v2
+    uses: actions/upload-artifact@v7
    with:
     name:           sfall-build
     path:           sfall-build
-     retention-days: 14
+     retention-days: 30
@@ -7,26 +7,26 @@ on:

 jobs:
  deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v7

      - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
        with:
          python-version: '3.x'

      - name: Install dependencies
        run: |
-          sudo apt -y -qq install bundler python3-pip
+          sudo apt update && sudo apt -y -qq install bundler python3-pip
          pip3 install ruamel.yaml --user

      - name: Build
        run: ./docs/generate.sh

      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}
          publish_dir: ./docs/_site
@@ -26,6 +26,7 @@
 *.exe
 *.out
 *.app
+!ducible.exe

 # NetBeans
 nbproject/private/
@@ -55,7 +56,7 @@ nb-configuration.xml
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
-[Dd]evXP
+[Dd]evXP/
 [Rr]elease/
 [Rr]eleases/
 [Rr]eleaseXP/
@@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

-    {project}  Copyright (C) {year}  {fullname}
+    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -664,12 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -1,7 +1,10 @@
 # sfall
-[![github pages](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml/badge.svg)](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml)

-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.
+[![License](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![Dev Build](https://github.com/sfall-team/sfall/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/phobos2077/sfall/actions/workflows/build.yml)
+[![GitHub Pages](https://github.com/sfall-team/sfall/actions/workflows/gh-pages.yml/badge.svg)](https://github.com/phobos2077/sfall/actions/workflows/gh-pages.yml)
+
+A set of engine modifications for the classic game Fallout 2 in the form of a DLL, which modifies executable in memory without changing anything in EXE file itself.

 **Engine modifications include:**
 - Better support for modern operating systems
@@ -10,8 +13,65 @@ A set of engine modifications for the classic game Fallout 2 in form of a DLL, w
 - Many additional features for users, such as item highlight button, party member control, etc.
 - Extended scripting capabilities for modders (many new opcodes to control sfall features as well as previously unavailable vanilla engine functions)

+Original author: **Timeslip**

-Original author: timeslip
+Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows Fallout to run correctly on modern operating systems, and adds additional features for modders.

-Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows fallout to run correctly on modern operating systems, and adds additional features for modders.
+## Installation

+- Download `sfall_*.7z` from the [release archive](https://sourceforge.net/projects/sfall/files/).
+
+- Extract `ddraw.dll`, `ddraw.ini`, `sfall.dat`, and the `mods` folder to Fallout's base directory (i.e. the one that contains `fallout2.exe`). Also, remove `gl_highlighting.int` and `gl_partycontrol.int` from Fallout's `data\scripts\` directory if you are updating from an older version.
+
+- __Important Note:__\
+  If you are using a mod that already included sfall (e.g. killap's [Unofficial Patch](https://github.com/BGforgeNet/Fallout2_Unofficial_Patch) or [Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project)), then that mod has probably included a custom modified `ddraw.ini`. In that case, overwriting it with sfall's vanilla `ddraw.ini` will be likely break your game. Instead, only overwrite `ddraw.dll`, and keep the mod's existing copy of `ddraw.ini`. (Or, if you know what you're doing, you can merge them together by hand.)
+
+- The folder `translations` contains translations of some of the strings that sfall displays in the game. To use a translation, copy this folder to Fallout's base directory too, and then in `ddraw.ini` change the __TranslationsINI__ setting to `.\translations\<your language>.ini`.
+
+## Uninstallation
+
+Delete `ddraw.dll`, `ddraw.ini`, and `sfall.dat` from your Fallout directory, and delete `sfall-mods.ini` from the `mods` folder.
+
+## Usage
+
+This mod is configured via the `ddraw.ini` and `sfall-mods.ini` files, which can be opened with any text editor. Details of every configerable option are included in those files. Where a comment refers to a DX scancode, the complete list of codes can be found at the link below:\
+https://kippykip.com/b3ddocs/commands/scancodes.htm
+
+In a default installation using an unmodified copy of `ddraw.ini`, the middle mouse button will be set to switch between weapons and the mouse wheel will be set to scroll through any menus that respond to the up/down arrow keys. Holding **Ctrl** and hitting numpad keys 0 to 6 (with Num Lock off) will adjust the game speed. Holding **left Ctrl** will let you move items between inventory lists by simply clicking on them. Pressing **left Shift** will highlight items on the ground, and holding the key will let you move an entire stack of items at once. The script extender and any engine fixes are also enabled. Most of the options that change gameplay in some way not originally intended by the developers are disabled.
+
+For [__Wine__](https://www.winehq.org/) users:\
+You need to set DLL overrides for `ddraw.dll` to __"native, builtin"__ in `winecfg` or use `WINEDLLOVERRIDES="ddraw=n,b"` to run Fallout from the command line. If you want to play alternative sound files, you'll also need to install GStreamer Good 32-bit plugins.
+
+## Build Instructions
+
+### Prerequisites:
+
+* Visual Studio 2015 with **"Windows XP support for C++"** component. If you're using Visual Studio 2017/2019/2022, make sure to install **"VC++ 2015.3 v14.00 (v140) toolset for desktop"** component as well.
+* [DirectX SDK (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=6812). You will also need `ddraw.lib` from DXSDK February 2010 and `dinput.lib` from DXSDK August 2007. Both files can be found in the [DirectX SDK Collection repo](https://github.com/NovaRain/DXSDK_Collection).
+* [DirectX Runtime (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=8109). You can also install it from DirectX SDK installer.
+
+### Steps:
+
+1. Set up a `postbuild.cmd` using the template from the repo.
+2. Open the solution file and build with the **ReleaseXP** configuration (this is the one used for sfall releases).
+3. If everything is set up correctly, you should have a new sfall `ddraw.dll` in your Fallout 2 directory.
+
+### Minimalist Setup:
+
+If you don't need a full-fledged IDE, you can use Visual Studio Build Tools instead. Taking [Visual Studio 2017 Build Tools](https://aka.ms/vs/15/release/vs_buildtools.exe) for example:
+1. Install using the command line:
+   ```
+   vs_BuildTools.exe --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.MSBuildTools --add Microsoft.VisualStudio.Component.VC.140 --add Microsoft.VisualStudio.Component.WinXP --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --passive
+   ```
+2. Set up a `postbuild.cmd` using the template from the repo.
+3. Use MSBuild in **x86 Native Tools Command Prompt** to build sfall:
+   ```
+   MSBuild.exe ddraw.sln /t:Clean;Build /p:Configuration=ReleaseXP /p:Platform=Win32
+   ```
+
+## Additional info
+
+* [Changelog](CHANGELOG.md)
+* [Scripting Documentation](https://sfall-team.github.io/sfall/)
+* Fallout Engine IDA Database: [for IDA Pro 6.8](https://www.dropbox.com/s/tm0nyx0lnk4yui0/Fallout_1_and_2_IDA68.rar?dl=1 "Download from Dropbox") | [for IDA Pro 7.0](https://www.dropbox.com/s/61srq09pn8grfpu/Fallout_1_and_2_IDA70.rar?dl=1 "Download from Dropbox") (comments are in Russian)
+* [Fallout 2 Reference Edition](https://github.com/alexbatalov/fallout2-re)
@@ -8,9 +8,7 @@ author:      '@wipe2238'
 #
 # - name: Build sfall
 #   id:   sfall
-#   uses: phobos2077/sfall@develop
-#   with:
-#    release-xp: true
+#   uses: sfall-team/sfall@master
 #
 # - name: Copy sfall to mod directory
 #   run:  copy "${{ steps.sfall.outputs.release-xp }}" "my/mod/directory/ddraw.dll"
@@ -22,11 +20,13 @@ inputs:

 release-xp:
  description: 'Set to true to enable building with ReleaseXP configuration'
-  required:    true
+  required:    false
+  default:     true

 dev-xp:
  description: 'Set to true to enable building with DevXP configuration'
-  required:    true
+  required:    false
+  default:     false

 # Outputs are always using Windows directory separator (`\`)
 outputs:
@@ -49,7 +49,7 @@ runs:
 # Quick check for things which should never happen
 - name:  Sanity checks
   run:   |
-          if   [[ "${{ runner.os }}" != "Windows" ]]; then
+          if   [[ "$RUNNER_OS" != "Windows" ]]; then
               echo "[ERROR] This action can only be used on Windows"
               exit 1
          elif [[ "${{ inputs.release-xp }}" != "true" ]] && [[ "${{ inputs.dev-xp }}" != "true" ]]; then
@@ -68,7 +68,7 @@ runs:

 # DXSDK directory must be prepared only once, in case action is used N times
 # Using `.lib` suffix to make sure directory is ignored by git in exotic scenarios
- # Using `::set-output` to make sure workflow environment remains unchanged
+ # Using $GITHUB_OUTPUT to make sure workflow environment remains unchanged
 - name:  Prepare DXSDK directory
   id:    dxsdk
   run:   |
@@ -82,23 +82,33 @@ runs:
             #
             echo "::endgroup::"
          fi
-          echo "::set-output name=dir::$(cygpath --windows "$DXSDK_DIR/DXSDK_Jun2010/")"
+          echo "dir=$(cygpath --windows "$DXSDK_DIR/DXSDK_Jun2010/")" >> $GITHUB_OUTPUT
+   shell: bash
+
+ # Install VS 2015 C++ build tools and WinXP Support components via Chocolatey
+ - name:  Prepare VS 2015 C++ build tools
+   id:    vs2015_tools
+   run:   |
+          echo "::group::Prepare VS 2015 C++ build tools"
+
+          choco install visualstudio2017buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.MSBuildTools --add Microsoft.VisualStudio.Component.VC.140 --add Microsoft.VisualStudio.Component.WinXP --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --passive"
+
+          echo "::endgroup::"
   shell: bash

 # MSBuild is not in PATH on Windows machines
- # Using `::set-output` to make sure workflow environment remains unchanged
+ # Using $GITHUB_OUTPUT to make sure workflow environment remains unchanged
 - name:  Prepare MSBuild
   id:    msbuild
   run:   |
          echo "::group::Prepare MSBuild"

          MSBUILD_EXE="$("/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild/**/Bin/MSBuild.exe)"
-          echo "::set-output name=exe::$MSBUILD_EXE"
+          echo "exe=$MSBUILD_EXE" >> $GITHUB_OUTPUT

          echo "::endgroup::"
   shell: bash

- # Creating empty `PostBuild.cmd` to avoid false-positive build error
 - name:  Build ReleaseXP
   id:    build-release-xp
   run:   |
@@ -106,10 +116,9 @@ runs:
             echo ::group::Build ReleaseXP

             #
-             echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd"
             "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=ReleaseXP -p:Platform=Win32 -p:PlatformToolset=v140_xp
             #
-             echo "::set-output name=ddraw-dll::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/ReleaseXP/ddraw.dll")"
+             echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/ReleaseXP/ddraw.dll")" >> $GITHUB_OUTPUT

             echo "::endgroup::"
          fi
@@ -117,7 +126,6 @@ runs:
    DXSDK_DIR: ${{ steps.dxsdk.outputs.dir }}
   shell: bash

- # Creating empty `PostBuild.cmd` to avoid false-positive build error
 - name: Build DevXP
   id:   build-dev-xp
   run:   |
@@ -126,11 +134,10 @@ runs:
             echo "::group::Build DevXP"

             #
-             echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd"
             "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=DevXP -p:Platform=Win32 -p:PlatformToolset=v140_xp
             #
-             echo "::set-output name=ddraw-dll::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.dll")"
-             echo "::set-output name=ddraw-pdb::$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.pdb")"
+             echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.dll")" >> $GITHUB_OUTPUT
+             echo "ddraw-pdb=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.pdb")" >> $GITHUB_OUTPUT

             echo "::endgroup::"
          fi
@@ -1,16 +1,65 @@
 ;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
-; in this file, as some perks have hardcoded effects which may catch you out
+;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 catch you out
+;Set the bonus value to 0 in the 'PerksTweak' section for perks to get around this problem

-;Since traits need to be picked before any scripts run, they have an additional NoHardcode option in this file which can
-; be used to remove their hardcoded effects, and add new stat/skill effects
+;Since traits need to be picked before any scripts run, they have an additional 'NoHardcode' option in this file
+; which can be used to remove their hardcoded effects, and add new stat/skill effects

+;##############################################################################
 [PerksTweak]
+;Changes the light level bonus for 'Night Vision' perk (ID 9)
+;valid range: 0..100, 20 - default bonus
+NightVisionBonus=20
+
+;Changes the Outdoorsman skill bonus for 'Survivalist' perk (ID 16)
+;125 - maximum bonus, 25 - default bonus
+SurvivalistBonus=25
+
 ;Changes the bonus for 'Master Trader' perk (ID 17)
 ;25 - default bonus
 MasterTraderBonus=25

+;Changes the skill point bonus for 'Educated' perk (ID 18)
+;125 - maximum bonus, 2 - default bonus
+EducatedBonus=2
+
+;Changes the hit point bonuses for 'Healer' perk (ID 19)
+;999 - maximum bonus, 4 - default bonus
+HealerMinBonus=4
+;999 - maximum bonus, 10 - default bonus
+HealerMaxBonus=10
+
+;Changes the hit point bonus for 'Lifegiver' perk (ID 28)
+;125 - maximum bonus, 4 - default bonus
+LifegiverBonus=4
+
+;Changes the Science and Repair skill bonus for 'Mr.Fixit' perk (ID 31)
+;125 - maximum bonus, 10 - default bonus
+MrFixitBonus=10
+
+;Changes the skill bonuses for 'Medic' perk (ID 32)
+;125 - maximum bonus, 10 - default bonus
+MedicFirstAidBonus=10
+MedicDoctorBonus=10
+
+;Changes the Lockpick and Steal skill bonus for 'Master Thief' perk (ID 33)
+;125 - maximum bonus, 15 - default bonus
+MasterThiefBonus=15
+
+;Changes the Speech skill bonus for 'Speaker' perk (ID 34)
+;125 - maximum bonus, 20 - default bonus
+SpeakerBonus=20
+
+;Changes the Sneak skill bonus (when in darkness) for 'Ghost' perk (ID 38)
+;125 - maximum bonus, 20 - default bonus
+GhostBonus=20
+
+;Changes the Outdoorsman skill bonus for 'Ranger' perk (ID 47)
+;125 - maximum bonus, 15 - default bonus
+RangerOutdoorsmanBonus=15
+
 ;Changes the distance bonus for 'Weapon Long Range' weapon perk (ID 58)
 ;2 - no bonus, 4 - default bonus
 WeaponLongRangeBonus=4
@@ -30,13 +79,36 @@ WeaponScopeRangeBonus=5
 VaultCityInoculationsPoisonBonus=10
 VaultCityInoculationsRadBonus=10

+;Changes the distance bonus for 'Cautious Nature' perk (ID 80)
+;Affects where critters spawn in 'surrounding' random encounters without a specified distance
+;valid range: -12..20, 3 - default bonus
+CautiousNatureBonus=3
+
+;Changes the percentage bonus for 'Comprehension' perk (ID 81)
+;50 - default bonus
+ComprehensionBonus=50
+
 ;Changes the damage bonus per level for 'Demolition Expert' perk (ID 82)
 ;999 - maximum bonus, 10 - default bonus
 DemolitionExpertBonus=10

-;Changes the damage bonus for 'Living Anatomy' perk (ID 97)
-;125 - maximum bonus, 5 - default bonus
+;Changes the Gambling skill bonus for 'Gambler' perk (ID 83)
+;125 - maximum bonus, 20 - default bonus
+GamblerBonus=20
+
+;Changes the Steal skill bonus for 'Harmless' perk (ID 91)
+;125 - maximum bonus, 20 - default bonus
+HarmlessBonus=20
+
+;Changes the damage bonus and the Doctor skill bonus for 'Living Anatomy' perk (ID 97)
+;125 - maximum bonus, 5 - default damage bonus
 LivingAnatomyBonus=5
+;125 - maximum bonus, 10 - default skill bonus
+LivingAnatomyDoctorBonus=10
+
+;Changes the Speech and Barter skill bonus for 'Negotiator' perk (ID 99)
+;125 - maximum bonus, 10 - default bonus
+NegotiatorBonus=10

 ;Changes the damage bonus for 'Pyromaniac' perk (ID 101)
 ;125 - maximum bonus, 5 - default bonus
@@ -50,10 +122,23 @@ SalesmanBonus=20
 ;valid range: 0..100, 50 - default percent
 StonewallPercent=50

+;Changes the Lockpick, Steal, and Traps skill bonus for 'Thief' perk (ID 105)
+;125 - maximum bonus, 10 - default bonus
+ThiefBonus=10
+
 ;Changes the strength bonus for 'Weapon Handling' perk (ID 106)
 ;0 - no bonus, 10 - maximum bonus, 3 - default bonus
 WeaponHandlingBonus=3

+;Changes the skill bonuses for 'Vault City Training' perk (ID 107)
+;125 - maximum bonus, 5 - default bonus
+VaultCityTrainingFirstAidBonus=5
+VaultCityTrainingDoctorBonus=5
+
+;Changes the Speech skill bonus for 'Expert Excrement Expeditor' perk (ID 116)
+;125 - maximum bonus, 5 - default bonus
+ExpertExcrementExpeditorBonus=5
+
 ;##############################################################################
 [Perks]
 ;Set to 1 to enable the modifications for perks
@@ -64,32 +149,36 @@ Enable=0
 ;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
+;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/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864), it checks GVAR.
-; For example, if Skill1=0x4000004, then the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value
+;Skill1/Skill2: The first/second skill (or -1 for none) to check, but if you set a specific bit 0x4000000 (67108864),
+; it checks the corresponding GVAR
+; For example, if Skill1=0x4000004, the perk will check GVAR_BAD_MONSTER (0x4000000 + 4) on Skill1Mag value

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

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

 ;You can add simple extra perks with ID numbers from 119 to 255
-; that do not require using scripting functions to change player stats, and can also be used for Armor perks
+;The extra perks do not require using scripting functions to change player stats, and can also be used for Armor perks
 ;These parameters are only for extra perks
 ;Stat1/Stat2: same as Stat
 ;Stat1Mag/Stat2Mag: same as StatMag
 ;Skill3-Skill5: The skill to be modified (or -1 for none)
 ;Skill3Mod-Skill5Mod: The increased/decreased value to the modified skill

-;##############################################################################
 ;This is a modification to vanilla perk 0
 [0]
 Name=Example
@@ -1,4 +1,13 @@
 [sfall]
+;Table for overriding ASCII codes for keyboard character input when entering the player's name and saved game descriptions
+;Only character codes in the ASCII range 33-126 can be overridden
+;Character codes that do not need to be overridden can be omitted by using commas as delimiters
+;You must also set a key for switching layouts using the XltKey option in ddraw.ini
+;Default character code table for the English layout (letter codes only)
+;XltTable=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,,,,,,,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,,,,
+
+;##############################################################################
+
 SaveInCombat=Cannot save at this time.
 KarmaGain=You gained %d karma.
 KarmaLoss=You lost %d karma.
@@ -11,6 +20,8 @@ PartyLvlMsg=Lvl:
 PartyACMsg=AC:
 PartyAddictMsg=Addict
 NPCPickupFail=%s cannot pick up the item.
+AmmoInfoGlovz=Div: DR/%d, DT/%d
+AmmoInfoYAAM=DT Mod: %d

 PartyOrderAttackHuman=I'll take care of it.|Okay, I got it.|Sounds like a plan.
 PartyOrderAttackCreature=::Growl::
@@ -2,7 +2,6 @@

 [Main]

-
 [Items]
 ;Override the PIDs of the standard healing drugs that AI will use in combat
 ;Set to -1 if you don't want AI to identify this item as a healing drug
@@ -10,4 +9,11 @@
 ;in the proto for other items, so AI will use them for healing in combat as well
 STIMPAK=40
 SUPER_STIMPAK=144
-HEALING_POWDER=237
+HEALING_POWDER=273
+
+;Overrides the PID of the item that grants a +1 stat bonus when placed in an active item slot
+;Default is 433. Set to -1 to prevent any item from granting the bonus
+MIRROR_SHADES_PID=433
+;The SPECIAL stat number (0..6) to which the bonus is applied
+;Default is 3 (Charisma). Set to -1 to disable the item's effect
+MIRROR_SHADES_STAT=3
@@ -4,7 +4,7 @@
 ;WeaponAnims codes
 ; 1 - Knife (D)
 ; 2 - Club (E)
-; 3 - Sledgehammer (F) 
+; 3 - Sledgehammer (F)
 ; 4 - Spear (G)
 ; 5 - Pistol (H)
 ; 6 - SMG (I)
@@ -1,7 +1,7 @@
 ;WeaponAnims codes
 ; 1 - Knife (D)
 ; 2 - Club (E)
-; 3 - Sledgehammer (F) 
+; 3 - Sledgehammer (F)
 ; 4 - Spear (G)
 ; 5 - Pistol (H)
 ; 6 - SMG (I)
@@ -72,11 +72,12 @@ Power=16777349
 [5]
 PID=16777720
 WeaponAnims=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-Default=16777353
+Default=16777346
 Jacket=16777346
 Leather=16777347
 Metal=16777348
-Combat=16777226
+Combat=16777367
+Robe=16777368

 ; Kitsune (RP)
 [6]
@@ -1,9 +1,12 @@
 sfall's main configuration options appear in ddraw.ini, but there are several other configuration files that it can read in for modding purposes.

-Books.ini: Lets you override/add books to the game (associated object PIDs, skills and text messages)
+Books.ini: Lets you override/add books to the game (associated object PIDs, skills, and text messages)
+Drugs.ini: Lets you override/add drugs to the game (associated object PIDs, addiction duration, and text messages)
 Perks.ini: Lets you override the name/description/frm image/other stats of perks and traits
-Elevators.ini: Lets you override which elevators lead where
+Elevators.ini: Lets you override which elevators lead to where
 CriticalOverrides.ini: Lets you make modifications to the critical hit tables
 Translations.ini: Contains some text strings which sfall displays, to allow their translation
 Skills.ini: Lets you change the formula used for calculating skills
 Stats.ini: Lets you change the formula used to calculate the derived stats
+Tweaks.ini: Lets you override a few object PIDs used in the engine
+Unarmed.ini: Lets you configure the requirements and effects of unarmed attacks
@@ -4,15 +4,18 @@
 Key=42

 ; Set to 1 to also highlight containers
-Containers=1
+Containers=0

 ; Set to 1 to also highlight lootable corpses
-Corpses=1
+Corpses=0
+
+; Set to 1 to also highlight critters, with the same rules as in combat
+Critters=0

 ; Set to 1 to only highlight objects in the player's line-of-sight
-CheckLOS=0
+CheckLOS=1

-; Set the color of outlines, available colors:
+; Set the outline color for items; available colors:
 ; 1 - glowing red
 ; 2 - red
 ; 4 - grey
@@ -20,29 +23,42 @@ CheckLOS=0
 ; 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 4.2.7)
+; You can set a custom color from the game palette by multiplying the color index value by 256 (in 4.2.7 or later)
 OutlineColor=16

+; Set the outline color for containers
+; For empty containers, set the color to 0 to disable highlighting
+OutlineColorContainers=32
+OutlineColorContainersEmpty=4
+
+; Set the outline color for corpses
+; For empty corpses, set the color to 0 to disable highlighting
+OutlineColorCorpses=32
+OutlineColorCorpsesEmpty=4
+
 ; 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)
+; 1 - requires Motion Sensor to be present in the player's inventory to activate highlighting
+; 2 - requires Motion Sensor and consumes 1 charge on every use (depleted sensor will not work anymore)
 MotionScanner=0


 [CombatControl]
-;Allows you to directly control other critters in combat
+;Allows you to control other critters directly in combat
 ;Set to 0 to disable
-;Set to 1 to control all critters in combat
+;Set to 1 to control all critters in combat (allowed only in sfall debugging mode)
 ;Set to 2 to control all party members
-;Set to 3 to let you order party members to attack specified targets after your first attack instead of controlling them directly
+;Set to 3 to let you use the command cursor to specify targets for party members to attack in combat
 Mode=0
-;If you want to control only specific critters, uncomment the PIDList line and set a comma delimited list of PIDs
+;If you want to control only specific critters, uncomment the PIDList line and set a comma-delimited list of PIDs
 ;PIDList=62,89,97,107,160,161

-;Set a comma delimited list of perk IDs for perks to be inherited from the player during the combat control
+;Set a comma-delimited list of perk IDs for perks to be inherited from the player during the combat control
 PerksList=0,73

+;Set to 1 to allow the player to gain a positive reputation when killing NPCs while controlling other critters
+GainReputation=0
+
 ;Choose a notification box to display the name of the controlled critter above the interface bar
 ;Must be between 5 and (4 + the value of BoxBarCount in ddraw.ini)
 ;For sfall 4.1.6+ the number for the notification box is set automatically, so just use any value
@@ -0,0 +1,201 @@
+;Example Ammo INI for vanilla damage formula
+
+; PID_EXPLOSIVE_ROCKET
+[1]
+pid=14
+ac_adjust=0
+dr_adjust=-25
+dam_mult=1
+dam_div=1
+
+; PID_10MM_JHP
+[2]
+pid=29
+ac_adjust=0
+dr_adjust=25
+dam_mult=2
+dam_div=1
+
+; PID_10MM_AP
+[3]
+pid=30
+ac_adjust=0
+dr_adjust=-25
+dam_mult=1
+dam_div=2
+
+; PID_44_MAGNUM_JHP
+[4]
+pid=31
+ac_adjust=0
+dr_adjust=20
+dam_mult=2
+dam_div=1
+
+; PID_FLAMETHROWER_FUEL
+[5]
+pid=32
+ac_adjust=-20
+dr_adjust=25
+dam_mult=1
+dam_div=1
+
+; PID_14MM_AP
+[6]
+pid=33
+ac_adjust=0
+dr_adjust=-50
+dam_mult=1
+dam_div=2
+
+; PID_223_FMJ
+[7]
+pid=34
+ac_adjust=-20
+dr_adjust=-20
+dam_mult=1
+dam_div=1
+
+; PID_5MM_JHP
+[8]
+pid=35
+ac_adjust=0
+dr_adjust=35
+dam_mult=2
+dam_div=1
+
+; PID_5MM_AP
+[9]
+pid=36
+ac_adjust=0
+dr_adjust=-35
+dam_mult=1
+dam_div=2
+
+; PID_ROCKET_AP
+[10]
+pid=37
+ac_adjust=-15
+dr_adjust=-50
+dam_mult=1
+dam_div=1
+
+; PID_SMALL_ENERGY_CELL
+[11]
+pid=38
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_MICRO_FUSION_CELL
+[12]
+pid=39
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_SHOTGUN_SHELLS
+[13]
+pid=95
+ac_adjust=-10
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_44_FMJ_MAGNUM
+[14]
+pid=111
+ac_adjust=0
+dr_adjust=-20
+dam_mult=1
+dam_div=1
+
+; PID_9MM_BALL
+[15]
+pid=121
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_BBS
+[16]
+pid=163
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_ROBO_ROCKET_AMMO
+[17]
+pid=274
+ac_adjust=0
+dr_adjust=-25
+dam_mult=1
+dam_div=1
+
+; PID_45_CALIBER_AMMO
+[18]
+pid=357
+ac_adjust=0
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_2MM_EC_AMMO
+[19]
+pid=358
+ac_adjust=-30
+dr_adjust=-20
+dam_mult=3
+dam_div=2
+
+; PID_4_7MM_CASELESS
+[20]
+pid=359
+ac_adjust=-5
+dr_adjust=-10
+dam_mult=3
+dam_div=2
+
+; PID_9MM_AMMO
+[21]
+pid=360
+ac_adjust=0
+dr_adjust=10
+dam_mult=1
+dam_div=2
+
+; PID_HN_NEEDLER_CARTRIDGE
+[22]
+pid=361
+ac_adjust=-10
+dr_adjust=0
+dam_mult=1
+dam_div=1
+
+; PID_HN_AP_NEEDLER_CARTRIDGE
+[23]
+pid=362
+ac_adjust=-10
+dr_adjust=0
+dam_mult=2
+dam_div=1
+
+; PID_7_62MM_AMMO
+[24]
+pid=363
+ac_adjust=-5
+dr_adjust=-10
+dam_mult=1
+dam_div=1
+
+; PID_FLAMETHROWER_FUEL_MK_II
+[25]
+pid=382
+ac_adjust=-20
+dr_adjust=0
+dam_mult=1
+dam_div=1
@@ -1,14 +1,14 @@
 /*

-Ammo INI Loader mod for Fallout 2 by NovaRain
---------------------------------------------
+Ammo INI Loader mod v1.1 for Fallout 2 by NovaRain
+--------------------------------------------------

 - modifies ammo protos with data from an INI file:
  * AmmoGlovz.ini if DamageFormula=1 or 2 in ddraw.ini
  * AmmoYAAM.ini if DamageFormula=5 in ddraw.ini
  * AmmoMod.ini if not using any bulit-in damage formula

-Requires sfall 3.5 or higher
+Requires sfall 4.0/3.8.29 or higher

 */

@@ -23,7 +23,7 @@ variable ammoData;
 variable enabled;

 procedure start begin
-   variable i := 1, ammo, ammoPid, dmgMod;
+   variable i := 1, ammo, ammoSection, dmgMod;
   if game_loaded then begin
      enabled := get_ini_setting("ddraw.ini|Misc|DamageFormula");
      if (enabled == 1 or enabled == 2) then
@@ -37,19 +37,19 @@ procedure start begin
      if (enabled <= 0) then return;

      ammoData := create_array_map;
-      ammoPid := enabled; // pid from the first section
-      while (ammoPid > 0) do begin
+      ammoSection := get_ini_section(ammoIni, "" + i);
+      while (ammoSection.pid > 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");
+         ammo.ac_adjust := atoi(ammoSection.ac_adjust);
+         ammo.dr_adjust := atoi(ammoSection.dr_adjust);
         // dam_mult and dam_div must be positive integers
-         dmgMod := get_ini_setting(ammoIni + "|" + i + "|dam_mult");
+         dmgMod := atoi(ammoSection.dam_mult);
         ammo.dam_mult := dmgMod if (dmgMod > 0) else 1;
-         dmgMod := get_ini_setting(ammoIni + "|" + i + "|dam_div");
+         dmgMod := atoi(ammoSection.dam_div);
         ammo.dam_div := dmgMod if (dmgMod > 0) else 1;
-         ammoData[ammoPid] := ammo;
+         ammoData[atoi(ammoSection.pid)] := ammo;
         i++;
-         ammoPid := get_ini_setting(ammoIni + "|" + i + "|pid");
+         ammoSection := get_ini_section(ammoIni, "" + i);
      end
      call map_enter_p_proc;
      debug_msg("Ammo INI Loader mod: " + ammoIni + " - set " + (i - 1) + " ammo protos.");
--- a/Show More
+++ b/Show More