Updated version number and changelog

Recompiled gl_npcarmor due to sslc fixes.

.github/dependabot.yml

@@ -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"

.github/workflows/build.yml

@@ -0,0 +1,62 @@
+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-2022
+  steps:
+
+  - name: Clone sfall
+    uses: actions/checkout@v4
+
+  # Action is used twice for self-testing only
+  # DevXP build results are intentionally *not* included in artifact
+
+  - name: ReleaseXP build
+    id:   build
+    uses: ./
+    with:
+     release-xp: true
+     dev-xp:     false
+
+  - name: DevXP build
+    uses: ./
+    with:
+     release-xp: false
+     dev-xp:     true
+
+  - name:  Prepare artifacts
+    run:   |
+           :
+           mkdir -p sfall-build
+
+           cp artifacts/ddraw.ini 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@v4
+    with:
+     name:           sfall-build
+     path:           sfall-build
+     retention-days: 14

.github/workflows/gh-pages.yml

@@ -0,0 +1,34 @@
+name: github pages
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          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@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/_site
+          user_name: 'github-actions[bot]'
+          user_email: 'github-actions[bot]@users.noreply.github.com'

.gitignore

@@ -26,6 +26,7 @@
 *.exe
 *.out
 *.app
+!ducible.exe
 
 # NetBeans
 nbproject/private/
@@ -58,7 +59,7 @@ nb-configuration.xml
 [Dd]evXP/
 [Rr]elease/
 [Rr]eleases/
-[Ww]in2K/
+[Rr]eleaseXP/
 x64/
 x86/
 build/
@@ -224,3 +225,9 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 sfall/postbuild.cmd
+
+# jekyll build files
+docs/_site
+docs/.sass-cache
+docs/.jekyll-metadata
+docs/pages/*.md

LICENSE

@@ -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>.

README.md

@@ -1,6 +1,8 @@
 # sfall
 
 [![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.
 
@@ -11,12 +13,65 @@ A set of engine modifications for the classic game Fallout 2 in the form of a DL
 - 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 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.
 
----
-#### Fallout Engine IDA Database
-[Download for IDA Pro 6.8](https://www.dropbox.com/s/tm0nyx0lnk4yui0/Fallout_1_and_2_IDA68.rar?dl=1 "Download from Dropbox")
- | [Download 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)
+## 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)

action.yml

@@ -0,0 +1,146 @@
+name:        'sfall'
+description: 'Builds sfall binaries'
+author:      '@wipe2238'
+
+###
+#
+# Example:
+#
+# - name: Build sfall
+#   id:   sfall
+#   uses: sfall-team/sfall@master
+#
+# - name: Copy sfall to mod directory
+#   run:  copy "${{ steps.sfall.outputs.release-xp }}" "my/mod/directory/ddraw.dll"
+#
+###
+
+# While both inputs are marked as required, users needs to set only one of them (at minimum) to 'true' for action to work
+inputs:
+
+ release-xp:
+  description: 'Set to true to enable building with ReleaseXP configuration'
+  required:    false
+  default:     true
+
+ dev-xp:
+  description: 'Set to true to enable building with DevXP configuration'
+  required:    false
+  default:     false
+
+# Outputs are always using Windows directory separator (`\`)
+outputs:
+
+ release-xp:
+  description:  'Full path to ddraw.dll built with ReleaseXP configuration'
+  value:         ${{ steps.build-release-xp.outputs.ddraw-dll }}
+
+ dev-xp:
+  description: 'Full path to ddraw.dll built with DevXP configuration'
+  value:       ${{ steps.build-dev-xp.outputs.ddraw-dll }}
+ dev-xp-pdb:
+  description: 'Full path to ddraw.pdb built with DevXP configuration'
+  value:       ${{ steps.build-dev-xp.outputs.ddraw-pdb }}
+
+runs:
+ using: 'composite'
+ steps:
+
+ # Quick check for things which should never happen
+ - name:  Sanity checks
+   run:   |
+          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
+               echo "[ERROR] At least one of following inputs must be set to 'true' -- 'release-xp', 'dev-xp'"
+               exit 1
+          #
+          elif [[ ! -d "$(cygpath --unix "$GITHUB_ACTION_PATH/sfall/")" ]]; then
+               echo "[ERROR] Solution directory not found -- 'sfall\\'"
+               exit 1
+          elif [[ ! -f "$(cygpath --unix "$GITHUB_ACTION_PATH/sfall/ddraw.sln")" ]]; then
+               echo "[ERROR] Solution file not found -- 'sfall\\ddraw.sln'"
+               exit 1
+          fi
+          #
+   shell: bash
+
+ # 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 $GITHUB_OUTPUT to make sure workflow environment remains unchanged
+ - name:  Prepare DXSDK directory
+   id:    dxsdk
+   run:   |
+          DXSDK_DIR="$GITHUB_ACTION_PATH/sfall/DXSDK.lib"
+          if [[ ! -d "$DXSDK_DIR" ]]; then
+             echo "::group::Prepare DXSDK directory"
+             #
+             git clone --quiet https://github.com/NovaRain/DXSDK_Collection.git "$DXSDK_DIR"
+             cp "$DXSDK_DIR/DXSDK_Aug2007/Lib/x86/dinput.lib" "$DXSDK_DIR/DXSDK_Jun2010/Lib/x86/"
+             cp "$DXSDK_DIR/DXSDK_Feb2010/Lib/x86/ddraw.lib" "$DXSDK_DIR/DXSDK_Jun2010/Lib/x86/"
+             #
+             echo "::endgroup::"
+          fi
+          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 $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 "exe=$MSBUILD_EXE" >> $GITHUB_OUTPUT
+
+          echo "::endgroup::"
+   shell: bash
+
+ - name:  Build ReleaseXP
+   id:    build-release-xp
+   run:   |
+          if [[ "${{ inputs.release-xp }}" == "true" ]]; then
+             echo ::group::Build ReleaseXP
+
+             #
+             "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=ReleaseXP -p:Platform=Win32 -p:PlatformToolset=v140_xp
+             #
+             echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/ReleaseXP/ddraw.dll")" >> $GITHUB_OUTPUT
+
+             echo "::endgroup::"
+          fi
+   env:
+    DXSDK_DIR: ${{ steps.dxsdk.outputs.dir }}
+   shell: bash
+
+ - name: Build DevXP
+   id:   build-dev-xp
+   run:   |
+          :
+          if [[ "${{ inputs.dev-xp }}" == "true" ]]; then
+             echo "::group::Build DevXP"
+
+             #
+             "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=DevXP -p:Platform=Win32 -p:PlatformToolset=v140_xp
+             #
+             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
+   env:
+    DXSDK_DIR: ${{ steps.dxsdk.outputs.dir }}
+   shell: bash

artifacts/config_files/Drugs.ini

@@ -0,0 +1,37 @@
+; Allows you to configure advanced settings for drugs.
+; Maximum 50 drugs are allowed
+; Note: for vanilla drugs, you can only override the values of NumEffect and AddictTime parameters
+
+[main]
+; set to 1 to change Jet addiction to be removed after the time expires
+JetWithdrawal=0
+
+; total number of drugs in this file
+Count=0
+
+; count starts from 1
+[1]
+; drug item PID
+PID=0
+
+; set a limit on the count of first and second delayed effects when using the drug, i.e. if the queue has delayed effects from the drug,
+; and their count is greater or equal to NumEffects, it is not possible to obtain new effects from using the drug
+; e.g. this count is 4 for Buffout/Mentats/Psycho/Jet
+; set -1 to leave this parameter unchanged
+NumEffects=-1
+
+; the duration of the addiction effect in game minutes (i.e. 1440 = 24 game hours)
+; set to 0 to use the default time of 7 days (as all drugs except Jet)
+AddictTime=0
+
+; the number of the global variable from vault13.gam responsible for displaying addiction in the character screen
+; if you set GvarID with numbers: 21-26, 295, 296, or variable numbers that have already been declared in previous sections,
+; the TextID and FrmID options in this section will be ignored
+; set to 0 if the addiction is not required
+GvarID=0
+
+; the index number from editor.msg to display the title of the addiction (the description uses the index number of TextID + 100)
+TextID=-1
+
+; the line number (0-indexed) of the corresponding FRM in skilldex.lst
+FrmID=-1

artifacts/config_files/Perks.ini

@@ -2,15 +2,64 @@
 
 ;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
@@ -86,9 +171,16 @@ Enable=0
 
 ;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]
+;You can add simple extra perks with ID numbers from 119 to 255
+;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
 Desc=This is an example perk description
 Image=72
@@ -109,6 +201,39 @@ INT=0
 AGL=0
 LCK=0
 
+;Example for creating extra perks
+[119]
+Name=Extra Perk
+Desc=This perk can change player stats and skills
+Image=72
+Ranks=1
+Level=2
+Type=0
+Stat=-1
+StatMag=0
+Skill1=-1
+Skill1Mag=0
+Skill2=-1
+Skill2Mag=0
+STR=0
+PER=0
+END=0
+CHR=0
+INT=0
+AGL=0
+LCK=0
+; for extra perks only
+Stat1=-1
+Stat1Mag=0
+Stat2=-1
+Stat2Mag=0
+Skill3=-1
+Skill3Mod=0
+Skill4=-1
+Skill4Mod=0
+Skill5=-1
+Skill5Mod=0
+
 ;##############################################################################
 [Traits]
 ;Set to 1 to enable the modifications for traits

artifacts/config_files/Translations.ini

@@ -11,6 +11,14 @@ 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::
+PartyOrderAttackRobot=::Beep::
+
+HiResInfo=This version of sfall has its own integrated High Resolution Patch mode, which is compatible with the settings of the High Resolution Patch by Mash.\n\nIf you want to continue using the Hi-Res Patch by Mash without seeing this message, disable the 'HiResMode' option in ddraw.ini.\nOr you can disable the external Hi-Res Patch to get new graphics improvements from sfall.\n\nDo you want to disable the High Resolution Patch by Mash?
 
 [AppearanceMod]
 RaceText=Race

artifacts/config_files/Tweaks.ini

@@ -10,4 +10,4 @@
 ;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

artifacts/config_files/npcarmor - vanilla.ini

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

artifacts/config_files/npcarmor.ini

@@ -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]

artifacts/config_files/sfall-mods.ini

@@ -0,0 +1,73 @@
+[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 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=1
+
+; Set the color of outlines for items; available colors:
+; 1 - glowing red
+; 2 - red
+; 4 - grey
+; 8 - glowing green
+; 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 (in 4.2.7 or later)
+OutlineColor=16
+
+; Set the color of outlines for containers
+OutlineColorContainers=4
+
+; Set the color of outlines for corpses
+OutlineColorCorpses=4
+
+; Motion Scanner mode:
+; 0 - ignored
+; 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 control other critters directly in combat
+;Set to 0 to disable
+;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 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
+;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
+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
+;Set to 0 to disable
+DisplayName=0
+
+;Set the color of display name, available colors:
+;0 - green
+;1 - red
+;2 - white
+;3 - yellow
+;4 - dark yellow
+;5 - blue
+;6 - purple
+;7 - dull pink
+DisplayNameColor=0

artifacts/example_mods/AmmoMod/AmmoMod.ini

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

artifacts/example_mods/BurstControl/gl_burstcontrol.ssl

@@ -0,0 +1,30 @@
+/*
+   A basic example of how to use set_spray_settings function for script-based burst control
+*/
+
+#include "..\headers\define.h"
+#include "..\headers\sfall\define_extra.h"
+#include "..\headers\sfall\sfall.h"
+
+procedure start;
+procedure ammocost_handler;
+
+procedure start begin
+   if game_loaded then begin
+      register_hook_proc(HOOK_AMMOCOST, ammocost_handler);
+   end
+end
+
+procedure ammocost_handler begin
+   variable
+      weapon   := get_sfall_arg,
+      bullets  := get_sfall_arg,
+      cost     := get_sfall_arg,
+      event    := get_sfall_arg;
+
+   if (event == 2 and weapon > 0) then begin // when calculating number of burst rounds
+      if (obj_pid(weapon) == PID_ASSAULT_RIFLE) then begin
+         set_spray_settings(1, 1, 1, 1); // burst attack will not hit other targets
+      end
+   end
+end

artifacts/example_mods/ComputeDamage/gl_compute_damage.ssl

@@ -1,28 +1,69 @@
 /*
-   Example algorithm of how the game engine calculates combat damage
+   This script reimplements the combat damage calculation of the original game.
+   Use this to implement your own damage formula!
 */
 
-#include "..\headers\define.h"
-#include "..\headers\command.h"
-#include "..\headers\sfall\sfall.h"
-#include "..\headers\sfall\define_extra.h"
+#include "../sfall/define_lite.h"
+#include "../sfall/define_extra.h"
+#include "../sfall/sfall.h"
+
+#define DAMAGE_FORMULA_VANILLA  (0)
+#define DAMAGE_FORMULA_GLOVZ    (1)
+#define DAMAGE_FORMULA_GLOVZ2   (2)
+#define DAMAGE_FORMULA_YAAM     (5)
 
 procedure start;
-procedure compute_damage_F2;
-procedure item_w_damage_hook;
+procedure combatdamage_handler;
+procedure itemdamage_handler;
+procedure calc_damage_YAAM(variable weapon, variable rounds, variable armorDT, variable armorDR, variable bonusRangedDamage, variable multiplyDamage, variable difficulty);
 procedure item_w_subtype(variable weapon, variable hit_mode);
 procedure get_ammo_value(variable weapon, variable param);
 
-variable item_w_damage;
+variable
+   damage_formula,
+   item_damage_min,
+   item_damage_max,
+   item_damage_weapon,
+   item_damage_attacker;
 
 procedure start begin
    if game_loaded then begin
-      register_hook_proc(HOOK_COMBATDAMAGE, compute_damage_F2);
-      register_hook_proc(HOOK_ITEMDAMAGE, item_w_damage_hook);
+      damage_formula := get_ini_setting("ddraw.ini|Misc|DamageFormula");
+      register_hook_proc(HOOK_COMBATDAMAGE, combatdamage_handler);
+      register_hook_proc(HOOK_ITEMDAMAGE, itemdamage_handler);
    end
 end
 
-procedure compute_damage_F2 begin
+/*
+   HOOK_COMBATDAMAGE
+
+   Runs when:
+   1) Game calculates how much damage each target will get. This includes primary target as well as all extras (explosions and bursts). This happens BEFORE the actual attack animation.
+   2) AI decides whether it is safe to use area attack (burst, grenades), if he might hit friendlies.
+
+   Does not run for misses, or non-combat damage like dynamite explosions.
+
+   Critter arg0  - The target
+   Critter arg1  - The attacker
+   int     arg2  - The amount of damage to the target
+   int     arg3  - The amount of damage to the attacker
+   int     arg4  - The special effect flags for the target (use bwand DAM_* to check specific flags)
+   int     arg5  - The special effect flags for the attacker (use bwand DAM_* to check specific flags)
+   Item    arg6  - The weapon used in the attack
+   int     arg7  - The bodypart that was struck
+   int     arg8  - Damage Multiplier (this is divided by 2, so a value of 3 does 1.5x damage, and 8 does 4x damage. Usually it's 2; for critical hits, the value is taken from the critical table; with Silent Death perk and the corresponding attack conditions, the value will be doubled)
+   int     arg9  - Number of bullets actually hit the target (1 for melee attacks)
+   int     arg10 - The amount of knockback to the target
+   int     arg11 - Attack Type (see ATKTYPE_* constants)
+   mixed   arg12 - computed attack data (see C_ATTACK_* for offsets and use get/set_object_data functions to get/set the data)
+
+   int     ret0 - The damage to the target
+   int     ret1 - The damage to the attacker
+   int     ret2 - The special effect flags for the target
+   int     ret3 - The special effect flags for the attacker
+   int     ret4 - The amount of knockback to the target
+*/
+procedure combatdamage_handler begin
    variable dmg_type, weapon_perk, dmg_thresh, dmg_resist, weapon_subtype, bonus_ranged, difficulty, i, dmg_mult, dmg_div, damage;
    variable target, flags, knockback, amount;
 
@@ -40,6 +81,11 @@ procedure compute_damage_F2 begin
       amountKnockback  := get_sfall_arg,
       hit_mode         := get_sfall_arg;
 
+   if (ctdSource != item_damage_attacker or weapon != item_damage_weapon) then begin
+      debug_msg("! ERROR ! compute_damage: Expected attacker or weapon differs!");
+      return;
+   end
+
    if (flagsSource bwand DAM_HIT) then begin
       target := ctdTarget;
       flags := flagsTarget;
@@ -50,7 +96,6 @@ procedure compute_damage_F2 begin
       knockback := 0;
    end
 
-   //amount := 0;
    if target and (obj_type(target) == OBJ_TYPE_CRITTER) then begin
       if weapon then begin
          dmg_type := weapon_dmg_type(weapon);
@@ -77,7 +122,7 @@ procedure compute_damage_F2 begin
       end
 
       weapon_subtype := item_w_subtype(weapon, hit_mode); // item_w_subtype_
-      if (ctdSource != dude_obj) or (weapon_subtype != WEAPON_TYPE_GUNS) then
+      if (ctdSource != dude_obj) or (weapon_subtype != WEAPON_TYPE_RANGED) then
          bonus_ranged := 0;
       else
          bonus_ranged := has_trait(TRAIT_PERK, ctdSource, PERK_bonus_ranged_damage) * 2;
@@ -90,27 +135,31 @@ procedure compute_damage_F2 begin
             difficulty := 125;
       end
 
-      // F2 default start
-      // Damage = (1 - (DR_armor + DR_ammo_adjust) * (((raw_damage * (dmg_mult * damageMultiplier)) / dmg_div) - dmg_thresh)
-      dmg_resist += get_ammo_value(weapon, PROTO_AM_DR_MOD); // item_w_dr_adjust_ (DR Adjust %)
-      if (dmg_resist < 100) then begin
-         if (dmg_resist < 0) then dmg_resist := 0;
+      if (damage_formula == DAMAGE_FORMULA_YAAM) then begin
+         amount := calc_damage_YAAM(weapon, rounds, dmg_thresh, dmg_resist, bonus_ranged, damageMultiplier, difficulty);
+      end else begin
+         // F2 default start
+         // Damage = (1 - (DR_armor + DR_ammo_adjust) * (((raw_damage * (dmg_mult * damageMultiplier)) / dmg_div) - dmg_thresh)
+         dmg_resist += get_ammo_value(weapon, PROTO_AM_DR_MOD); // item_w_dr_adjust_ (DR Adjust %)
+         if (dmg_resist < 100) then begin
+            if (dmg_resist < 0) then dmg_resist := 0;
 
-         dmg_mult := damageMultiplier * get_ammo_value(weapon, PROTO_AM_DMG_MULT); // item_w_dam_mult_ (Dmg mod A)
-         dmg_div := get_ammo_value(weapon, PROTO_AM_DMG_DIV); // item_w_dam_div_ (Dmg mod B)
+            dmg_mult := damageMultiplier * get_ammo_value(weapon, PROTO_AM_DMG_MULT); // item_w_dam_mult_ (Dmg mod A)
+            dmg_div := get_ammo_value(weapon, PROTO_AM_DMG_DIV); // item_w_dam_div_ (Dmg mod B)
 
-         for (i := 1; i <= rounds; i++) begin
-            damage := (item_w_damage + bonus_ranged) * dmg_mult; // item_w_damage_ (raw_damage)
-            if dmg_div then damage /= dmg_div;
+            for (i := 1; i <= rounds; i++) begin
+               damage := (random(item_damage_min, item_damage_max) + bonus_ranged) * dmg_mult; // item_w_damage_ (raw_damage)
+               if dmg_div then damage /= dmg_div;
 
-            damage := (((damage / 2) * difficulty) / 100) - dmg_thresh;
-            if (damage > 0) then begin
-               damage := damage - ((damage * dmg_resist) / 100); // reduce damage by the percentage of DR_armor + DR_Ammo
-               if (damage > 0) then amount += damage;
+               damage := (((damage / 2) * difficulty) / 100) - dmg_thresh;
+               if (damage > 0) then begin
+                  damage := damage - ((damage * dmg_resist) / 100); // reduce damage by the percentage of DR_armor + DR_Ammo
+                  if (damage > 0) then amount += damage;
+               end
             end
          end
+         // F2 default end
       end
-      // F2 default end
 
       if (ctdSource == dude_obj) then begin
          if has_trait(TRAIT_PERK, ctdSource, PERK_living_anatomy_perk) and (critter_kill_type(ctdTarget) != KILL_TYPE_robot_kills)
@@ -140,11 +189,11 @@ procedure compute_damage_F2 begin
    end
 
    if (flagsSource bwand DAM_HIT) then begin
-      display_msg("amountTarget = " + amountTarget+ ", amount = " + amount);
+      display_msg("COMBATDAMAGE amountTarget = " + amountTarget+ ", amount = " + amount);
       amountTarget := amount;
       flagsTarget := flags;
    end else begin
-      display_msg("amountSource = " + amountSource+ ", amount = " + amount);
+      display_msg("COMBATDAMAGE amountSource = " + amountSource+ ", amount = " + amount);
       amountSource := amount;
       flagsSource := flags;
    end
@@ -154,40 +203,118 @@ procedure compute_damage_F2 begin
    set_sfall_return(flagsTarget);
    set_sfall_return(flagsSource);
    set_sfall_return(amountKnockback);
+
+   set_sfall_arg(2, amountTarget);
+   set_sfall_arg(3, amountSource);
+   set_sfall_arg(4, flagsTarget);
+   set_sfall_arg(5, flagsSource);
+   set_sfall_arg(10, amountKnockback);
 end
 
-procedure item_w_damage_hook begin
-   variable
-      item_w_damage_min := get_sfall_arg,
-      item_w_damage_max := get_sfall_arg;
-      //weapon := get_sfall_arg,
-      //source := get_sfall_arg,
+procedure calc_damage_YAAM(variable weapon, variable rounds, variable armorDT, variable armorDR, variable bonusRangedDamage, variable multiplyDamage, variable difficulty) begin
+   variable accumulatedDamage, ammoDiv, ammoMult, ammoDT, calcDT, _calcDT, calcDR, i, rawDamage, resistedDamage;
+   if (rounds <= 0) then begin
+      return 0;
+   end
+
+   ammoDiv := get_ammo_value(weapon, PROTO_AM_DMG_DIV);
+   ammoMult := get_ammo_value(weapon, PROTO_AM_DMG_MULT);
+
+   // Damage Multipler = Critical Multipler * Ammo Dividend
+   multiplyDamage *= ammoMult;
+
+   // Retrieve ammo DT (well, it's really Retrieve ammo DR, but since we're treating ammo DR as ammo DT...)
+   ammoDT := get_ammo_value(weapon, PROTO_AM_DR_MOD);
+
+   calcDT := armorDT - ammoDT;
+   _calcDT := calcDT;
+
+   if (calcDT >= 0) then begin
+      _calcDT := 0;
+   end else begin
+      // note that this should be a negative value
+      _calcDT *= 10;
+      calcDT := 0;
+   end
+
+   // DR = armor DR + DT (note that DT should be less than or equal to zero)
+   calcDR = armorDR + _calcDT;
+   if (calcDR < 0) then begin
+      calcDR = 0;
+   end else if (calcDR >= 100) then begin
+      return 0;
+   end
+
+   display_msg("YAAM: AmmoDT=" + ammoDT + ", DT=" + calcDT + "/" + armorDT + ", DR=" + calcDR + "/" + armorDR);
+   // Start of damage calculation loop
+   for (i := 0; i < rounds; i++) begin
+      rawDamage = random(item_damage_min, item_damage_max);
+      rawDamage += bonusRangedDamage;
+
+      rawDamage -= calcDT;
+      if (rawDamage <= 0) then
+         continue;
+
+      rawDamage *= multiplyDamage;
+      if (ammoDiv != 0) then begin
+         rawDamage /= ammoDiv;
+      end
+      rawDamage /= 2; // related to critical hit damage multiplier bonus
+      rawDamage *= difficulty; // combat difficulty setting (75 if wimpy, 100 if normal or if attacker is player, 125 if rough)
+      rawDamage /= 100;
+
+      resistedDamage = calcDR * rawDamage;
+      resistedDamage /= 100;
+      rawDamage -= resistedDamage;
+
+      if (rawDamage > 0) then begin
+         display_msg("YAAM: Bullet " + i + " dmg=" + rawDamage);
+         accumulatedDamage += rawDamage;
+      end
+   end
+   return accumulatedDamage;
+end
+
+/*
+   HOOK_ITEMDAMAGE
+
+   Runs when retrieving the damage rating of the player's used weapon. (Which may be their fists.)
+
+   int     arg0 - The default min damage
+   int     arg1 - The default max damage
+   Item    arg2 - The weapon used (0 if unarmed)
+   Critter arg3 - The critter doing the attacking
+   int     arg4 - The type of attack
+   int     arg5 - non-zero if this is an attack using a melee weapon
+
+   int     ret0 - Either the damage to be used, if ret1 isn't given, or the new minimum damage if it is
+   int     ret1 - The new maximum damage
+*/
+procedure itemdamage_handler begin
+   item_damage_min := get_sfall_arg;
+   item_damage_max := get_sfall_arg;
+   item_damage_weapon := get_sfall_arg;
+   item_damage_attacker := get_sfall_arg;
       //hit_mode := get_sfall_arg,
       //isMelee := get_sfall_arg;
 
-   item_w_damage := (item_w_damage_min + (item_w_damage_max - item_w_damage_min) / 2);
-   display_msg("item_w_damage_ = " + item_w_damage);
-
-   set_sfall_return(item_w_damage);
+   display_msg("itemdamage: " + item_damage_min + "-" + item_damage_max);
 end
 
 procedure item_w_subtype(variable weapon, variable hit_mode) begin
    variable attack_mode, type := WEAPON_TYPE_UNARMED;
 
    if weapon and (hit_mode <= ATKTYPE_RWEP2) then begin
-      attack_mode := (get_proto_data(obj_pid(weapon), PROTO_IT_FLAGS));
+      attack_mode := weapon_attack_mode(obj_pid(weapon), hit_mode);
 
-      if (hit_mode == ATKTYPE_LWEP2) or (hit_mode == ATKTYPE_RWEP2) then
-         attack_mode := (attack_mode bwand 0xF0) / 16; // shift 4 bits to the right
-      else
-         attack_mode := (attack_mode bwand 0x0F);
-
-      if (attack_mode > ATKMODE_PRI_THROW) then
-         type := WEAPON_TYPE_GUNS;
-      else if (attack_mode == ATKMODE_PRI_THROW) then
+      if (attack_mode >= ATTACK_MODE_SINGLE) then
+         type := WEAPON_TYPE_RANGED;
+      else if (attack_mode == ATTACK_MODE_THROW) then
          type := WEAPON_TYPE_THROWN;
-      else if (attack_mode > ATKMODE_PRI_KICK) then
+      else if (attack_mode >= ATTACK_MODE_SWING) then
          type := WEAPON_TYPE_MELEE;
+      else if (attack_mode == ATTACK_MODE_NONE) then
+         type := WEAPON_TYPE_NONE;
    end
 
    return type;

artifacts/example_mods/ExplosiveTimer/gl_explosivetimer.ssl

@@ -0,0 +1,44 @@
+/*
+   Example implementation of the algorithm of how the game engine sets the explosive timer.
+*/
+
+#include "..\..\scripting_docs\headers\sfall.h"
+#include "..\..\scripting_docs\headers\define_lite.h"
+
+// from CONDTION.H
+#define ROLL_CRITICAL_FAILURE (0)
+#define ROLL_FAILURE          (1)
+#define ROLL_SUCCESS          (2)
+#define ROLL_CRITICAL_SUCCESS (3)
+
+procedure start;
+
+procedure start begin
+   if game_loaded then begin
+      register_hook(HOOK_EXPLOSIVETIMER);
+   end else begin
+      variable
+         time   := get_sfall_arg,
+         result := ROLL_CRITICAL_FAILURE;
+
+      if has_trait(TRAIT_PERK, dude_obj, PERK_demolition_expert_perk) then
+         result := ROLL_SUCCESS;
+      else begin
+         result := roll_vs_skill(dude_obj, SKILL_TRAPS, 0);
+      end
+
+      if (result) then begin
+         if (result == ROLL_FAILURE) then
+            time /= 2;
+         else begin // success or critical success
+            result := ROLL_SUCCESS;
+         end
+      end else begin  // critical failure
+         time := 0;
+         result := ROLL_FAILURE;
+      end
+
+      set_sfall_return(time);
+      set_sfall_return(result);  // failure/success
+   end
+end