Harden android startup path

2026-07-27 16:47:11 -07:00 · 2026-04-04 08:18:51 -07:00
215 changed files with 4512 additions and 21925 deletions
@@ -17,5 +17,15 @@

 - *Preview builds are not available for pull requests from forked repositories.* To enable preview builds, submit the PR from a branch within this repository. 

+- *Formatting issues? You have two options:*
+1. **Fix formatting automatically** using the following Docker command: *(If you're using Windows, remove `--user $(id -u):$(id -g)`)* 
+```bash
+docker run --rm \
+  -v $(pwd):/app --workdir /app  \
+  --user $(id -u):$(id -g) silkeh/clang:18 \
+  bash -c 'find src -type f -name \*.cc -o -name \*.h | xargs clang-format -i'
+```
+2. **Skip formatting check** by adding the `skip-formatting` label to this PR.
+
 --->

@@ -6,15 +6,10 @@ on:
  push:
    branches: [main]

-permissions:
-  contents: read
-
 jobs:
  format:
    runs-on: ubuntu-latest
    if: github.actor != 'github-actions[bot]' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
-    permissions:
-      contents: write
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
@@ -44,4 +39,4 @@ jobs:
            echo "No formatting changes"
          fi

-    
+    
@@ -8,16 +8,11 @@ on:
      - opened
      - synchronize

-permissions:
-  contents: read
-
 jobs:
  build_webassembly_version:
    name: Build webassembly version
    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      deployments: write
+    permissions: write-all
    steps:
      - name: start deployment
        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
@@ -143,3 +138,4 @@ jobs:
          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
          ref: ${{ github.event.pull_request.head.sha }}
          env_url: https://${{ github.repository_owner }}.github.io/fallout2-ce/PR-${{ github.event.pull_request.number }}/
+
@@ -9,9 +9,6 @@ on:
      - opened
      - synchronize

-permissions:
-  contents: read
-
 defaults:
  run:
    shell: bash
@@ -38,9 +35,6 @@ jobs:
    name: Code format check

    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read

    steps:
      - name: Clone
@@ -77,7 +71,6 @@ jobs:
    name: Android

    runs-on: ubuntu-latest
-    needs: [ce-dat]

    steps:
      - name: Clone
@@ -111,38 +104,21 @@ jobs:
          cd os/android
          ./gradlew assembleDebug

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
-      - name: Package
+      - name: Change apk file name
        run: |
-          mkdir -p out/dist/fallout2-ce-android-debug
-          cp os/android/app/build/outputs/apk/debug/app-debug.apk out/dist/fallout2-ce-android-debug/fallout2-ce.apk
-          cp out/dist/ce.dat out/dist/fallout2-ce-android-debug/ce.dat
-          cd out/dist
-          zip -r fallout2-ce-android-debug.zip fallout2-ce-android-debug
+          mv os/android/app/build/outputs/apk/debug/app-debug.apk os/android/app/build/outputs/apk/debug/fallout2-ce.apk

      - name: Upload
        uses: actions/upload-artifact@v4
        with:
-          name: fallout2-ce-android-debug
-          path: out/dist/fallout2-ce-android-debug.zip
+          name: fallout2-ce-debug.apk
+          path: os/android/app/build/outputs/apk/debug/fallout2-ce.apk
          retention-days: 7

-  ce-dat:
-    name: Build ce.dat
-    uses: ./.github/workflows/reusable-build-ce-dat.yml
-    with:
-      preset: linux-x64-debug
-
  ios:
    name: iOS

    runs-on: macos-14
-    needs: [ce-dat]

    steps:
      - name: Clone
@@ -167,32 +143,17 @@ jobs:
          cd out/build/ios
          cpack -C Debug

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
-      - name: Package
-        run: |
-          mkdir -p out/dist/fallout2-ce-ios
-          cp out/build/ios/fallout2-ce.ipa out/dist/fallout2-ce-ios/fallout2-ce-ios.ipa
-          cp out/dist/ce.dat out/dist/fallout2-ce-ios/ce.dat
-          cd out/dist
-          zip -r fallout2-ce-ios.zip fallout2-ce-ios
-
      - name: Upload
        uses: actions/upload-artifact@v4
        with:
-          name: fallout2-ce-ios
-          path: out/dist/fallout2-ce-ios.zip
+          name: fallout2-ce.ipa
+          path:  out/build/ios/fallout2-ce.ipa
          retention-days: 7

  linux:
    name: Linux (${{ matrix.arch }})

    runs-on: ubuntu-22.04
-    needs: [ce-dat]

    strategy:
      fail-fast: false
@@ -232,31 +193,21 @@ jobs:
        run: |
          cmake --build --preset linux-${{ matrix.arch }}-debug

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
-      - name: Package
+      - name: Change executable file name
        run: |
-          mkdir -p out/dist/fallout2-ce-linux-${{ matrix.arch }}
-          cp out/build/linux-${{ matrix.arch }}-debug/fallout2-ce out/dist/fallout2-ce-linux-${{ matrix.arch }}/fallout2-ce
-          cp out/dist/ce.dat out/dist/fallout2-ce-linux-${{ matrix.arch }}/ce.dat
-          tar -czvf out/dist/fallout2-ce-linux-${{ matrix.arch }}.tar.gz -C out/dist fallout2-ce-linux-${{ matrix.arch }}
+          mv out/build/linux-${{ matrix.arch }}-debug/fallout2-ce out/build/linux-${{ matrix.arch }}-debug/fallout2-ce-linux-${{ matrix.arch }}

      - name: Upload
        uses: actions/upload-artifact@v4
        with:
          name: fallout2-ce-linux-${{ matrix.arch }}
-          path: out/dist/fallout2-ce-linux-${{ matrix.arch }}.tar.gz
+          path:  out/build/linux-${{ matrix.arch }}-debug/fallout2-ce-linux-${{ matrix.arch }}
          retention-days: 7

  linux-armhf:
    name: Linux (armhf)

    runs-on: ubuntu-22.04-arm
-    needs: [ce-dat]

    steps:
      - name: Clone
@@ -282,31 +233,21 @@ jobs:
      - name: Build
        run: cmake --build build

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
-      - name: Package
+      - name: Change executable file name
        run: |
-          mkdir -p out/dist/fallout2-ce-linux-armhf
-          cp build/fallout2-ce out/dist/fallout2-ce-linux-armhf/fallout2-ce
-          cp out/dist/ce.dat out/dist/fallout2-ce-linux-armhf/ce.dat
-          tar -czvf out/dist/fallout2-ce-linux-armhf.tar.gz -C out/dist fallout2-ce-linux-armhf
+          mv build/fallout2-ce build/fallout2-ce-linux-armhf

      - name: Upload
        uses: actions/upload-artifact@v4
        with:
          name: fallout2-ce-linux-armhf
-          path: out/dist/fallout2-ce-linux-armhf.tar.gz
+          path:  build/fallout2-ce-linux-armhf
          retention-days: 7

  linux-arm64:
    name: Linux (arm64)

    runs-on: ubuntu-22.04-arm
-    needs: [ce-dat]

    steps:
      - name: Clone
@@ -323,24 +264,15 @@ jobs:
      - name: Build
        run: cmake --build build

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
-      - name: Package
+      - name: Change executable file name
        run: |
-          mkdir -p out/dist/fallout2-ce-linux-arm64
-          cp build/fallout2-ce out/dist/fallout2-ce-linux-arm64/fallout2-ce
-          cp out/dist/ce.dat out/dist/fallout2-ce-linux-arm64/ce.dat
-          tar -czvf out/dist/fallout2-ce-linux-arm64.tar.gz -C out/dist fallout2-ce-linux-arm64
+          mv build/fallout2-ce build/fallout2-ce-linux-arm64

      - name: Upload
        uses: actions/upload-artifact@v4
        with:
          name: fallout2-ce-linux-arm64
-          path: out/dist/fallout2-ce-linux-arm64.tar.gz
+          path:  build/fallout2-ce-linux-arm64
          retention-days: 7

  macos:
@@ -374,7 +306,7 @@ jobs:
      - name: Upload
        uses: actions/upload-artifact@v4
        with:
-          name: fallout2-ce-macos
+          name: fallout2-ce-macos.dmg
          path: out/build/macos/Fallout II Community Edition.dmg
          retention-days: 7

@@ -382,14 +314,15 @@ jobs:
    name: Windows (${{ matrix.arch }})

    runs-on: windows-2025
-    needs: [ce-dat]

    strategy:
      fail-fast: false
      matrix:
        include:
          - arch: x86
+            generator-platform: Win32
          - arch: x64
+            generator-platform: x64

    steps:
      - name: Clone
@@ -404,41 +337,29 @@ jobs:
        uses: actions/cache@v4
        with:
          path: out
-          key: windows-${{ matrix.arch }}-cmake-v103
+          key: windows-${{ matrix.arch }}-cmake-v102

      - name: Configure
        shell: cmd
        run: |
-          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.v141.x86.x64 Microsoft.VisualStudio.Component.VC.v141.xp -property installationPath`) do set "VS_PATH=%%i"
-          call "%VS_PATH%\Common7\Tools\VsDevCmd.bat" ^
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
          && cmake --preset windows-${{ matrix.arch }}

      - name: Build
        shell: cmd
        run: |
-          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.v141.x86.x64 Microsoft.VisualStudio.Component.VC.v141.xp -property installationPath`) do set "VS_PATH=%%i"
-          call "%VS_PATH%\Common7\Tools\VsDevCmd.bat" ^
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
          && cmake --build --preset windows-${{ matrix.arch }}-release

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
-      - name: Package
+      - name: Change executable file name
        run: |
-          mkdir -p out/dist/fallout2-ce-windows-${{ matrix.arch }}
-          cp out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce.exe out/dist/fallout2-ce-windows-${{ matrix.arch }}/fallout2-ce.exe
-          cp out/dist/ce.dat out/dist/fallout2-ce-windows-${{ matrix.arch }}/ce.dat
-          cd out/dist
-          7z a fallout2-ce-windows-${{ matrix.arch }}.zip fallout2-ce-windows-${{ matrix.arch }}
+          mv out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce.exe out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce-${{ matrix.arch }}.exe

      - name: Upload
        uses: actions/upload-artifact@v4
        with:
          name: fallout2-ce-windows-${{ matrix.arch }}
-          path: out/dist/fallout2-ce-windows-${{ matrix.arch }}.zip
+          path:  out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce-${{ matrix.arch }}.exe
          retention-days: 7


@@ -446,8 +367,7 @@ jobs:
    name: Release Continuous build
    runs-on: ubuntu-latest
    needs: [android, ios, linux, linux-armhf, linux-arm64, macos, windows]
-    permissions:
-      contents: write
+    permissions: write-all
    steps:
      - name: Fetch artifacts
        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
@@ -467,7 +387,6 @@ jobs:
      - name: Move unpacked artifacts to root folder
        if: ${{ always() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
        run: |
-          rm -rf artifacts/ce-dat
          ls -Rlah .
          find .
          cd artifacts/
@@ -5,9 +5,6 @@ on:
    types:
      - closed

-permissions:
-  contents: read
-
 jobs:
  delete_pr_preview:
    name: Delete PR preview from gh-pages
@@ -5,27 +5,15 @@ on:
    types:
      - published

-permissions:
-  contents: read
-
 defaults:
  run:
    shell: bash

 jobs:
-  ce-dat:
-    name: Build ce.dat
-    uses: ./.github/workflows/reusable-build-ce-dat.yml
-    with:
-      preset: linux-x64-release
-
  android:
    name: Android

    runs-on: ubuntu-latest
-    needs: [ce-dat]
-    permissions:
-      contents: write

    steps:
      - name: Clone
@@ -59,21 +47,12 @@ jobs:
          cd os/android
          ./gradlew assembleRelease

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
      - name: Upload
        run: |
-          mkdir -p out/dist/fallout2-ce-android
-          cp os/android/app/build/outputs/apk/release/app-release.apk out/dist/fallout2-ce-android/fallout2-ce-android.apk
-          cp out/dist/ce.dat out/dist/fallout2-ce-android/ce.dat
-          cd out/dist
-          zip -r fallout2-ce-android.zip fallout2-ce-android
-          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-android.zip
-          rm fallout2-ce-android.zip
+          cd os/android/app/build/outputs/apk/release
+          cp app-release.apk fallout2-ce-android.apk
+          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-android.apk
+          rm fallout2-ce-android.apk
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -81,9 +60,6 @@ jobs:
    name: iOS

    runs-on: macos-14
-    needs: [ce-dat]
-    permissions:
-      contents: write

    steps:
      - name: Clone
@@ -119,21 +95,12 @@ jobs:
          cd build
          cpack -C RelWithDebInfo

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
      - name: Upload
        run: |
-          mkdir -p out/dist/fallout2-ce-ios
-          cp build/fallout2-ce.ipa out/dist/fallout2-ce-ios/fallout2-ce-ios.ipa
-          cp out/dist/ce.dat out/dist/fallout2-ce-ios/ce.dat
-          cd out/dist
-          zip -r fallout2-ce-ios.zip fallout2-ce-ios
-          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-ios.zip
-          rm fallout2-ce-ios.zip
+          cd build
+          cp fallout2-ce.ipa fallout2-ce-ios.ipa
+          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-ios.ipa
+          rm fallout2-ce-ios.ipa
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -141,9 +108,6 @@ jobs:
    name: Linux (${{ matrix.arch }})

    runs-on: ubuntu-20.04
-    needs: [ce-dat]
-    permissions:
-      contents: write

    strategy:
      fail-fast: false
@@ -200,18 +164,10 @@ jobs:
            -j $(nproc) \
            # EOL

-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
-
      - name: Upload
        run: |
-          mkdir -p out/dist/fallout2-ce-linux-${{ matrix.arch }}
-          cp build/fallout2-ce out/dist/fallout2-ce-linux-${{ matrix.arch }}/fallout2-ce
-          cp out/dist/ce.dat out/dist/fallout2-ce-linux-${{ matrix.arch }}/ce.dat
-          tar -czvf fallout2-ce-linux-${{ matrix.arch }}.tar.gz -C out/dist fallout2-ce-linux-${{ matrix.arch }}
+          cd build
+          tar -czvf fallout2-ce-linux-${{ matrix.arch }}.tar.gz fallout2-ce
          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-linux-${{ matrix.arch }}.tar.gz
          rm fallout2-ce-linux-${{ matrix.arch }}.tar.gz
        env:
@@ -221,8 +177,6 @@ jobs:
    name: macOS

    runs-on: macos-11
-    permissions:
-      contents: write

    steps:
      - name: Clone
@@ -290,59 +244,47 @@ jobs:
    name: Windows (${{ matrix.arch }})

    runs-on: windows-2025
-    needs: [ce-dat]
-    permissions:
-      contents: write

    strategy:
      fail-fast: false
      matrix:
        include:
          - arch: x86
+            generator-platform: Win32
          - arch: x64
+            generator-platform: x64

    steps:
      - name: Clone
        uses: actions/checkout@v4

-      - name: Install Visual Studio 2022 Build Tools with v141_xp
+      - name: Install Visual Studio 2019 Build Tools with v141_xp
        shell: cmd
        run: |
-          choco install visualstudio2022buildtools -y --package-parameters="'--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.xp --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.10240 --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --add Microsoft.VisualStudio.Component.WinXP'"
+          choco install visualstudio2019buildtools -y --package-parameters="'--add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.xp --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.10240 --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP --add Microsoft.VisualStudio.Component.WinXP'"

      - name: Cache cmake build
        uses: actions/cache@v4
        with:
-          path: out
-          key: windows-${{ matrix.arch }}-cmake-v2
+          path: build
+          key: windows-${{ matrix.arch }}-cmake-v1

      - name: Configure
        shell: cmd
        run: |
-          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.v141.x86.x64 Microsoft.VisualStudio.Component.VC.v141.xp -property installationPath`) do set "VS_PATH=%%i"
-          call "%VS_PATH%\Common7\Tools\VsDevCmd.bat" ^
-          && cmake --preset windows-${{ matrix.arch }}
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake -B build -G "Visual Studio 16 2019" -A ${{ matrix.generator-platform }}

      - name: Build
        shell: cmd
        run: |
-          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.v141.x86.x64 Microsoft.VisualStudio.Component.VC.v141.xp -property installationPath`) do set "VS_PATH=%%i"
-          call "%VS_PATH%\Common7\Tools\VsDevCmd.bat" ^
-          && cmake --build --preset windows-${{ matrix.arch }}-release
-
-      - name: Download ce.dat
-        uses: actions/download-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" ^
+          && cmake --build build --config RelWithDebInfo

      - name: Upload
        run: |
-          mkdir -p out/dist/fallout2-ce-windows-${{ matrix.arch }}
-          cp out/build/windows-${{ matrix.arch }}/RelWithDebInfo/fallout2-ce.exe out/dist/fallout2-ce-windows-${{ matrix.arch }}/fallout2-ce.exe
-          cp out/dist/ce.dat out/dist/fallout2-ce-windows-${{ matrix.arch }}/ce.dat
-          cd out/dist
-          7z a fallout2-ce-windows-${{ matrix.arch }}.zip fallout2-ce-windows-${{ matrix.arch }}
+          cd build/RelWithDebInfo
+          7z a fallout2-ce-windows-${{ matrix.arch }}.zip fallout2-ce.exe
          gh release upload ${{ github.event.release.tag_name }} fallout2-ce-windows-${{ matrix.arch }}.zip
          rm fallout2-ce-windows-${{ matrix.arch }}.zip
        env:
@@ -1,49 +0,0 @@
-name: Reusable Build ce.dat
-
-on:
-  workflow_call:
-    inputs:
-      preset:
-        required: true
-        type: string
-
-permissions:
-  contents: read
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  build-ce-dat:
-    name: Build ce.dat
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v4
-
-      - name: Dependencies
-        run: |
-          sudo apt update
-          sudo apt install libsdl2-dev zlib1g-dev
-
-      - name: Configure
-        run: |
-          cmake --preset ${{ inputs.preset }}
-
-      - name: Build ce-dat-tool
-        run: |
-          cmake --build --preset ${{ inputs.preset }} --target ce-dat-tool
-
-      - name: Create ce.dat
-        run: |
-          mkdir -p out/dist
-          out/build/${{ inputs.preset }}/ce-dat-tool create files/ce.dat out/dist/ce.dat
-
-      - name: Upload ce.dat artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ce-dat
-          path: out/dist/ce.dat
-          retention-days: 7
@@ -10,7 +10,6 @@
 *.userosscache
 *.sln.docstates
 .DS_Store
-.local-tools/

 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -400,15 +399,3 @@ FodyWeavers.xsd
 # versioning header
 src/platform/git_version.h
 CMakeUserPresets.json
-
-# Local configs for AI agents
-.opencode
-.agents
-.aider*
-.gemini
-.claude
-.mcp.json
-AGENTS.md
-CLAUDE.md
-GEMINI.md
-opencode.json
@@ -20,14 +20,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS NO)

-if(MSVC)
-    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/EHsc>)
-endif()
-
 option(FALLOUT_VENDORED "Use vendored third-party libraries" ON)
-option(FALLOUT_AUDIO_OGG "Enable OGG decoding with stb_vorbis when available" ON)
-
-set(FALLOUT_STB_VORBIS_DIR "" CACHE PATH "Directory containing stb_vorbis.c")

 if(ANDROID)
    add_library(${EXECUTABLE_NAME} SHARED)
@@ -38,9 +31,7 @@ endif()
 # Git Info
 include("cmake/gitver.cmake")

-# Shared engine sources — used by both game and mapper targets.
-# Excludes main.cc/main.h (game-only entry logic).
-set(FALLOUT_ENGINE_SOURCES
+target_sources(${EXECUTABLE_NAME} PUBLIC
    "src/actions.cc"
    "src/actions.h"
    "src/animation.cc"
@@ -71,8 +62,6 @@ set(FALLOUT_ENGINE_SOURCES
    "src/combat.h"
    "src/config.cc"
    "src/config.h"
-    "src/content_config.cc"
-    "src/content_config.h"
    "src/credits.cc"
    "src/credits.h"
    "src/critter.cc"
@@ -113,8 +102,6 @@ set(FALLOUT_ENGINE_SOURCES
    "src/font_manager.h"
    "src/game_config.cc"
    "src/game_config.h"
-    "src/game_config_migration.cc"
-    "src/game_config_migration.h"
    "src/game_dialog.cc"
    "src/game_dialog.h"
    "src/game_memory.cc"
@@ -156,6 +143,8 @@ set(FALLOUT_ENGINE_SOURCES
    "src/lips.h"
    "src/loadsave.cc"
    "src/loadsave.h"
+    "src/main.cc"
+    "src/main.h"
    "src/mainmenu.cc"
    "src/mainmenu.h"
    "src/map_defs.h"
@@ -183,10 +172,6 @@ set(FALLOUT_ENGINE_SOURCES
    "src/obj_types.h"
    "src/object.cc"
    "src/object.h"
-    "src/ogg_decoder.cc"
-    "src/ogg_decoder.h"
-    "src/opcode_context.cc"
-    "src/opcode_context.h"
    "src/options.cc"
    "src/options.h"
    "src/palette.cc"
@@ -268,7 +253,7 @@ set(FALLOUT_ENGINE_SOURCES
    "src/xfile.h"
 )

-set(FALLOUT_PLATFORM_SOURCES
+target_sources(${EXECUTABLE_NAME} PUBLIC
    "src/audio_engine.cc"
    "src/audio_engine.h"
    "src/delay.cc"
@@ -302,8 +287,6 @@ set(FALLOUT_PLATFORM_SOURCES
    "src/sfall_opcodes.cc"
    "src/sfall_opcodes.h"
    "src/sfall_script_hooks.cc"
-    "src/script_sound.cc"
-    "src/script_sound.h"
    "src/sfall_arrays.cc"
    "src/sfall_arrays.h"
    "src/sfall_animation.cc"
@@ -316,49 +299,12 @@ set(FALLOUT_PLATFORM_SOURCES
 	"third_party/lodepng/lodepng.cpp"
 )

-target_sources(${EXECUTABLE_NAME} PUBLIC
-    ${FALLOUT_ENGINE_SOURCES}
-    "src/main.cc"
-    "src/main.h"
-)
-
-target_sources(${EXECUTABLE_NAME} PUBLIC ${FALLOUT_PLATFORM_SOURCES})
-
 target_include_directories(${EXECUTABLE_NAME} PUBLIC "third_party/lodepng")

-set(FALLOUT_HAVE_STB_VORBIS OFF)
-if(FALLOUT_AUDIO_OGG)
-    if(EXISTS "${CMAKE_SOURCE_DIR}/third_party/stb_vorbis/stb_vorbis.c")
-        set(_fallout_stb_vorbis_dir "${CMAKE_SOURCE_DIR}/third_party/stb_vorbis")
-    else()
-        set(_fallout_stb_vorbis_dir "${FALLOUT_STB_VORBIS_DIR}")
-        if(NOT _fallout_stb_vorbis_dir)
-            find_path(_fallout_stb_vorbis_dir
-                NAMES "stb_vorbis.c"
-                DOC "Directory containing stb_vorbis.c")
-        endif()
-    endif()
-
-    if(_fallout_stb_vorbis_dir AND EXISTS "${_fallout_stb_vorbis_dir}/stb_vorbis.c")
-        set(FALLOUT_HAVE_STB_VORBIS ON)
-        target_include_directories(${EXECUTABLE_NAME} PRIVATE "${_fallout_stb_vorbis_dir}")
-    else()
-        message(STATUS "OGG support disabled: stb_vorbis.c not found")
-    endif()
-endif()
-
-if(FALLOUT_HAVE_STB_VORBIS)
-    target_compile_definitions(${EXECUTABLE_NAME} PRIVATE HAVE_STB_VORBIS=1)
-else()
-    target_compile_definitions(${EXECUTABLE_NAME} PRIVATE HAVE_STB_VORBIS=0)
-endif()
-
 if(IOS)
    target_sources(${EXECUTABLE_NAME} PUBLIC
        "src/platform/ios/paths.h"
        "src/platform/ios/paths.mm"
-        "src/platform/ios/quick_toolbar.h"
-        "src/platform/ios/quick_toolbar.cc"
    )
 endif()

@@ -411,8 +357,6 @@ if(APPLE)
            "os/macos/fallout2-ce.icns"
        )

-        target_link_libraries(${EXECUTABLE_NAME} "-framework CoreFoundation")
-
        target_sources(${EXECUTABLE_NAME} PUBLIC ${RESOURCES})
        set_source_files_properties(${RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")

@@ -498,144 +442,6 @@ target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
 target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})

-if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
-    add_executable(ce-dat-tool
-        "tools/dat_tool.cc"
-        "tools/dat_archive.cc"
-        "tools/fo1_dat_lzss.cc"
-        "src/dfile.cc"
-        "src/platform_compat.cc"
-    )
-
-    if(APPLE)
-        set_target_properties(ce-dat-tool PROPERTIES
-            XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO"
-            XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
-        )
-    endif()
-
-    target_link_libraries(ce-dat-tool
-        fpattern_windows::fpattern_windows
-        ${ZLIB_LIBRARIES}
-        ${SDL2_LIBRARIES}
-    )
-    if(WIN32)
-        target_link_libraries(ce-dat-tool winmm)
-    endif()
-    target_include_directories(ce-dat-tool PRIVATE "src")
-    target_include_directories(ce-dat-tool PRIVATE ${ZLIB_INCLUDE_DIRS})
-    target_include_directories(ce-dat-tool PRIVATE ${SDL2_INCLUDE_DIRS})
-
-    add_executable(ce-frm2png
-        "tools/ce_frm2png.cc"
-        "src/platform_compat.cc"
-        "third_party/lodepng/lodepng.cpp"
-    )
-
-    if(APPLE)
-        set_target_properties(ce-frm2png PROPERTIES
-            XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO"
-            XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
-        )
-    endif()
-
-    target_include_directories(ce-frm2png PRIVATE "src")
-    target_include_directories(ce-frm2png PRIVATE "third_party/lodepng")
-    target_include_directories(ce-frm2png PRIVATE ${SDL2_INCLUDE_DIRS})
-    target_include_directories(ce-frm2png PRIVATE ${ZLIB_INCLUDE_DIRS})
-    target_link_libraries(ce-frm2png ${SDL2_LIBRARIES})
-    target_link_libraries(ce-frm2png ${ZLIB_LIBRARIES})
-
-    if(APPLE)
-        file(GLOB_RECURSE CE_DAT_INPUTS CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/files/ce.dat/*")
-        set(CE_DAT_RESOURCE_PATH "${CMAKE_CURRENT_BINARY_DIR}/ce.dat")
-
-        add_custom_command(
-            OUTPUT "${CE_DAT_RESOURCE_PATH}"
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}"
-            COMMAND $<TARGET_FILE:ce-dat-tool> create "${CMAKE_SOURCE_DIR}/files/ce.dat" "${CE_DAT_RESOURCE_PATH}"
-            DEPENDS ce-dat-tool ${CE_DAT_INPUTS}
-            COMMENT "Generating ce.dat for app bundle"
-            VERBATIM
-        )
-
-        add_custom_target(ce-dat-resource DEPENDS "${CE_DAT_RESOURCE_PATH}")
-        add_dependencies(${EXECUTABLE_NAME} ce-dat-resource)
-
-        target_sources(${EXECUTABLE_NAME} PRIVATE "${CE_DAT_RESOURCE_PATH}")
-        set_source_files_properties("${CE_DAT_RESOURCE_PATH}" PROPERTIES
-            GENERATED TRUE
-            MACOSX_PACKAGE_LOCATION "Resources")
-    endif()
-endif()
-
-if((NOT ANDROID) AND (NOT IOS) AND (NOT CMAKE_SYSTEM_NAME MATCHES "Emscripten"))
-    if(WIN32)
-        add_executable(mapper-ce WIN32)
-    else()
-        add_executable(mapper-ce)
-    endif()
-
-    target_sources(mapper-ce PUBLIC
-        ${FALLOUT_ENGINE_SOURCES}
-        ${FALLOUT_PLATFORM_SOURCES}
-        "src/mapper/map_func.cc"
-        "src/mapper/map_func.h"
-        "src/mapper/mapper.cc"
-        "src/mapper/mapper.h"
-        "src/mapper/mp_instance.cc"
-        "src/mapper/mp_instance.h"
-        "src/mapper/mp_proto.cc"
-        "src/mapper/mp_proto.h"
-        "src/mapper/mp_scrpt.cc"
-        "src/mapper/mp_scrpt.h"
-        "src/mapper/mp_targt.cc"
-        "src/mapper/mp_targt.h"
-        "src/mapper/mp_text.cc"
-        "src/mapper/mp_text.h"
-    )
-
-    target_compile_definitions(mapper-ce PUBLIC FALLOUT_MAPPER)
-
-    if(WIN32)
-        target_compile_definitions(mapper-ce PUBLIC
-            _CRT_SECURE_NO_WARNINGS
-            _CRT_NONSTDC_NO_WARNINGS
-            NOMINMAX
-            WIN32_LEAN_AND_MEAN
-            _STATIC_CPPLIB
-        )
-        target_link_libraries(mapper-ce
-            winmm
-            debug libcpmtd
-            optimized libcpmt
-        )
-        target_sources(mapper-ce PUBLIC
-            "os/windows/fallout2-ce.rc"
-        )
-    endif()
-
-    if(APPLE)
-        target_link_libraries(mapper-ce "-framework CoreFoundation")
-        set_target_properties(mapper-ce PROPERTIES
-            XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO"
-            XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
-        )
-    endif()
-
-    target_include_directories(mapper-ce PUBLIC "third_party/lodepng")
-    target_include_directories(mapper-ce PRIVATE "src")
-    target_include_directories(mapper-ce PRIVATE ${ZLIB_INCLUDE_DIRS})
-    target_include_directories(mapper-ce PRIVATE ${SDL2_INCLUDE_DIRS})
-
-    target_link_libraries(mapper-ce
-        fpattern::fpattern
-        fpattern_windows::fpattern_windows
-        ${ZLIB_LIBRARIES}
-        ${SDL2_LIBRARIES}
-    )
-endif()
-
 if(APPLE)
    if(IOS)
        install(TARGETS ${EXECUTABLE_NAME} DESTINATION "Payload")
@@ -119,6 +119,9 @@
                "base"
            ],
            "generator": "Xcode",
+            "cacheVariables": {
+                "CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY": ""
+            },
            "condition": {
                "type": "equals",
                "lhs": "${hostSystemName}",
@@ -1,120 +0,0 @@
-# Contributing
-
-This file is currently a shell to be filled in over time. For now, it only captures project-specific maintenance notes that are easy to miss.
-
-For current sfall compatibility status and the remaining work needed to close gaps, see [SFALL_COMPATIBILITY.md](SFALL_COMPATIBILITY.md).
-
-## Building
-
-The project uses CMake, so building mostly comes down to picking the right preset.
-
-## Commandline arguments
-
- `--scan-unimplemented` - do an analysis of opcodes and hooks used by loaded mods
- `--dev-load-game=1` - load the given save game automatically (useful for LLM automation)
-
-### macOS
-
- Install the Command Line Tools if needed: `xcode-select --install`
- Install the common build dependencies: `brew install cmake ninja`
- Configure and build:
-
-```sh
-cmake -S . -B out/build/macos -G Ninja -DCMAKE_BUILD_TYPE=Debug
-cmake --build out/build/macos --target fallout2-ce
-```
-
-### Linux
-
-Install SDL and a toolchain:
-
- Debian / Ubuntu:
-```sh
-sudo apt install build-essential cmake ninja-build libsdl2-dev zlib1g-dev
-```
- Fedora:
-```sh
-sudo dnf install gcc-c++ cmake ninja-build SDL2-devel zlib-devel
-```
- Arch Linux:
-```sh
-sudo pacman -S base-devel cmake ninja sdl2 zlib
-```
-
-Then build:
-```
-cmake -S . -B out/build/linux-x64-debug -G Ninja -DCMAKE_BUILD_TYPE=Debug
-cmake --build out/build/linux-x64-debug --target fallout2-ce
-```
-
-### Windows
-
-TODO: add Visual Studio build instructions. This will likely need a Visual Studio generator or preset plus the MSVC toolchain and Windows SDK.
-
-## `.dat` CLI Tool
-
-There is a small command-line archive tool in this repo for inspecting Fallout `.dat` files. It supports both Fallout 2 and Fallout 1 archives.
-
-From the repo root, build it with your normal CMake workflow, targeting `ce-dat-tool`:
-
-`cmake --build out/build/<preset-name> --target ce-dat-tool`
-
-The executable is written to your selected build directory, so the exact path will vary by preset and configuration.
-
-Available commands:
-
-1. `./<BUILD_DIR>/ce-dat-tool <archive.dat> list [pattern]`
-2. `ce-dat-tool <archive.dat> info [pattern]`
-3. `ce-dat-tool <archive.dat> extract [--lower] <output-dir> [pattern]`
-4. `ce-dat-tool <archive.dat> cat <entry>`
-5. `ce-dat-tool create <input-dir> <archive.dat>`
-
-Use `--lower` with `extract` when you want every extracted file and directory name forced to lowercase.
-For example:
-
-`ce-dat-tool master.dat extract --lower /tmp/ce-dat-tool-lower data\\*`
-
-## `ce-frm2png` CLI Tool
-
-There is also a small FRM conversion tool in this repo for exporting Fallout `.frm` art to `.png`.
-
-From the repo root, build it with your normal CMake workflow, targeting `ce-frm2png`:
-
-`cmake --build out/build/<preset-name> --target ce-frm2png`
-
-The executable is written to your selected build directory, so the exact path will vary by preset and configuration.
-
-Basic usage:
-
-1. `./<BUILD_DIR>/ce-frm2png <input.frm> [output.png]`
-2. `./<BUILD_DIR>/ce-frm2png <input.frm> [output.png] --palette <path-to-color.pal>`
-3. `./<BUILD_DIR>/ce-frm2png <input.frm> [output.png] --frame <index> --direction <index>`
-4. `./<BUILD_DIR>/ce-frm2png - [output.png|-] --palette <path-to-color.pal>`
-
-`-` can be used to take input from stdin (e.g. from `ce-dat-tool cat` or write to stdout).
-
-If `--palette` isn't specified, it will pick up `color.pal` in the .frm's directory or cwd.
-
-Notes:
-
- The tool expects a raw `color.pal` file. It does not read palettes directly from `master.dat`, so extract `color.pal` first if needed.
- A typical extraction flow is: `ce-dat-tool master.dat extract --lower . 'color.pal'`
- By default palette index `0` becomes transparent in the output PNG. Pass `--opaque` to keep it opaque.
- The current implementation writes RGBA PNGs. It does not preserve the original Fallout palette indices as a palette-indexed PNG.
-
-## Updating SDL
-
-SDL is pinned for native builds in `third_party/sdl2/CMakeLists.txt`. Right now, Android also relies on checked-in Java bindings in `os/android/app/src/main/java/org/libsdl/app`, and those bindings must match the SDL version fetched by CMake.
-
-When updating SDL:
-
-1. Update the SDL tag in `third_party/sdl2/CMakeLists.txt`.
-2. Run an Android build once so Gradle/CMake fetch the new SDL source tree.
-3. Copy the Android Java bindings from the fetched SDL checkout into `os/android/app/src/main/java/org/libsdl/app`.
-   Source path pattern:
-   `os/android/app/.cxx/<Variant>/<Hash>/arm64-v8a/_deps/sdl2-src/android-project/app/src/main/java/org/libsdl/app`
-4. Rebuild Android and confirm the SDL sync guard passes.
-
-The Android build contains a guard in `os/android/app/build.gradle` that fails if the checked-in Java bindings drift from the fetched native SDL source.
-
-This is a hack, not a good long-term setup. The Java bindings are still duplicated in the repo instead of being sourced from the same SDL tree as the native build. That should be improved so Android does not depend on a manual copy/sync step.
@@ -1,22 +1,18 @@
-# Fallout 2 Community Engine
+# Fallout 2 Community Edition

-Fallout 2 Community Engine is a fully working re-implementation of the Fallout 2 engine, optimized for a hassle-free experience on multiple platforms.  It provides high resolution support, quality-of-life improvements, and dozens of bug fixes.
+Fallout 2 Community Edition is a fully working re-implementation of Fallout 2, with the same original gameplay, engine bugfixes, and some quality of life improvements, that works (mostly) hassle-free on multiple platforms.  This is a fork of the original project, which isn't getting regular updates.

-This is a fork of the original Fallout2: CE project, which is no longer getting regular updates.
+Popular Fallout 2 total conversion mods are partially supported. Original versions of Nevada and Sonora (that do not rely on extended features provided by Sfall) work. [Fallout 2 Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project), [Fallout Et Tu](https://github.com/rotators/Fo1in2) and [Olympus 2207](https://olympus2207.com) are not yet supported. Other mods (particularly Resurrection and Yesterday) are not tested.

-Popular Fallout 2 total conversion mods are partially supported. Original versions of Nevada and Sonora (that do not rely on extended features provided by Sfall) work. [Fallout 2 Restoration Project](https://github.com/BGforgeNet/Fallout2_Restoration_Project) is supported (in Beta). [Fallout Et Tu](https://github.com/rotators/Fo1in2) and [Olympus 2207](https://olympus2207.com) are not yet supported. Other mods (particularly Resurrection and Yesterday) are not tested.
-
-Fallout2: CE has broad (though not total) compatibility with [Sfall](https://github.com/sfall-team/sfall) scripting extensions.  Many traditional Fallout mods work out of the box.
-
-There is also [Fallout 1 Community Edition](https://github.com/alexbatalov/fallout1-ce) (not affiliated with this fork).
+There is also [Fallout Community Edition](https://github.com/alexbatalov/fallout1-ce) (not affiliated with this fork).

 ## Installation

-You *must* own the game to play. Purchase your copy on [GOG](https://www.gog.com/game/fallout_2), [Epic Games](https://store.epicgames.com/p/fallout-2) or [Steam](https://store.steampowered.com/app/38410). Download latest [release](https://github.com/fallout2-ce/fallout2-ce/releases) or build from source.
+You must own the game to play. Purchase your copy on [GOG](https://www.gog.com/game/fallout_2), [Epic Games](https://store.epicgames.com/p/fallout-2) or [Steam](https://store.steampowered.com/app/38410). Download latest [release](https://github.com/fallout2-ce/fallout2-ce/releases) or build from source. 

 ### Windows

-[Download](https://github.com/fallout2-ce/fallout2-ce/releases) and unzip into your `Fallout2` folder. Launch the game using `fallout2-ce.exe`.
+Download and copy `fallout2-ce.exe` to your `Fallout2` folder. It serves as a drop-in replacement for `fallout2.exe`.

 ### Linux

@@ -26,10 +22,17 @@ You *must* own the game to play. Purchase your copy on [GOG](https://www.gog.com

 ```console
 $ sudo apt install innoextract
-$ innoextract ~/Downloads/setup_fallout_2_1.02_gog_v1_\(77792\).exe -d Fallout2
+$ innoextract ~/Downloads/setup_fallout2_2.1.0.18.exe -I app
+$ mv app Fallout2
 ```

- Download the Linux release archive, extract `fallout2-ce` and `ce.dat`, and copy them into this folder.
+- Download and copy `fallout2-ce` to this folder.
+
+- Install [SDL2](https://libsdl.org/download-2.0.php):
+
+```console
+$ sudo apt install libsdl2-2.0-0
+```

 - Run `./fallout2-ce`.

@@ -45,13 +48,13 @@ $ innoextract ~/Downloads/setup_fallout_2_1.02_gog_v1_\(77792\).exe -d Fallout2

 ```console
 $ brew install innoextract
-$ innoextract ~/Downloads/setup_fallout_2_1.02_gog_v1_\(77792\).exe -d fallout2
-$ mv fallout2 /Applications/Fallout2
+$ innoextract ~/Downloads/setup_fallout2_2.1.0.18.exe -I app
+$ mv app /Applications/Fallout2
 ```

- [Download](https://github.com/fallout2-ce/fallout2-ce/releases) and copy `Fallout II Community Edition.app` to this folder.
+- Download and copy `fallout2-ce.app` to this folder.

- Run `Fallout II Community Edition.app`.
+- Run `fallout2-ce.app`.

 ### Android

@@ -63,11 +66,9 @@ $ mv fallout2 /Applications/Fallout2

 > **NOTE**: From Android standpoint release and debug builds are different apps. Both apps require their own copy of game assets and have their own savegames. This is intentional. As a gamer just stick with release version and check for updates.

- Download the Android [release](https://github.com/fallout2-ce/fallout2-ce/releases), which contains an .apk file and `ce.dat`.
+- Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder to your device, for example to `Downloads`. You need `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder. Watch for file names - keep (or make) them lowercased (see [Configuration](#configuration)).

- Use Windows installation as a base - it contains data assets needed to play. Copy `Fallout2` folder to your device, for example to `Downloads`. You need `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder. Watch for file names - keep (or make) them lowercased (see [Configuration](#configuration)).  Copy `ce.dat` into this folder.
-
- Copy `fallout2-ce.apk` from the release to your device. Open it with file explorer, follow instructions (install from unknown source).
+- Download `fallout2-ce.apk` and copy it to your device. Open it with file explorer, follow instructions (install from unknown source).

 - When you run the game for the first time it will immediately present file picker. Select the folder from the first step. Wait until this data is copied. A loading dialog will appear, just wait for about 30 seconds. If you're installing total conversion mod or localized version with a large number of unpacked resources in `data` folder it can take up to 20 minutes. Once copied, the game will start automatically.

@@ -79,25 +80,11 @@ $ mv fallout2 /Applications/Fallout2

 - Run the game once. You'll see error message saying "Couldn't find/load text fonts". This step is needed for iOS to expose the game via File Sharing feature.

- Use Finder (macOS Catalina and later) or iTunes (Windows and macOS Mojave or earlier) to copy `master.dat`, `critter.dat`, `patch000.dat`, `ce.dat`, and `data` folder to "Fallout 2" app ([how-to](https://support.apple.com/HT210598)). Watch for file names - keep (or make) them lowercased (see [Configuration](#configuration)).
-
-
-
-**Controls on iPad:**
-
- One-finger tap → left click; hold → left button held.
- Two-finger tap → right click (cycles cursor mode between walk and attack).
- One-finger drag → scroll map / windows.
- Two-finger drag → mouse wheel.
- **Three-finger swipe down → ESC** (opens options / main menu).
- **Four-finger long press → F6** (quicksave). Hold four fingers on the screen for about half a second.
- **Three-finger long press → hold Shift** (highlights interactable objects — containers, doors, items — while held).
- Taps on the HUD (interface bar / end-turn / end-combat buttons) act as direct touches so small buttons are easy to hit without aiming.
- A Bluetooth keyboard works for everything else (numbered dialog choices, load game, etc.).
+- Use Finder (macOS Catalina and later) or iTunes (Windows and macOS Mojave or earlier) to copy `master.dat`, `critter.dat`, `patch000.dat`, and `data` folder to "Fallout 2" app ([how-to](https://support.apple.com/HT210598)). Watch for file names - keep (or make) them lowercased (see [Configuration](#configuration)).

 ### Browser

-> **NOTE**: WebAssembly build with emscripten
+> **NOTE**: WebAssebly build with emscripten
 ```
 docker run --rm -v $(pwd):/src emscripten/emsdk:3.1.74 sh -c 'git config --global --add safe.directory "*" && mkdir -p build && cd build && emcmake cmake ../ -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/Emscripten.cmake && emmake make'
 ```
@@ -109,55 +96,80 @@ The main configuration file is `fallout2.cfg`. There are several important setti

 The `sound` folder (with `music` folder inside) might be located either in `data` folder, or be in the Fallout folder. Update `music_path1` setting to match your hierarchy, usually it's `data/sound/music/` or `sound/music/`. Make sure it matches your path exactly (so it might be `SOUND/MUSIC/` if you've installed Fallout from CD). Music files themselves (with `ACM` extension) should be all uppercased, regardless of `sound` and `music` folders.

-Additional settings for screen resolution, UI customization, and map options are now integrated into the main `fallout2.cfg` file (previously part of `f2_res.ini` from Mash's HRP). When Fallout 2 CE starts, if it detects an existing `f2_res.ini` file, it automatically migrates these settings into `fallout2.cfg`. After migration, `fallout2.cfg` becomes the single source of truth for this configuration.
-
-Here are some important settings in `fallout2.cfg` under the `[screen]` and `[ui]` sections.  See [the example config](https://github.com/fallout2-ce/fallout2-ce/tree/refs/heads/main/files/fallout2.cfg) for a full list of settings.
+The second configuration file is `f2_res.ini`. Use it to change game window size, enable/disable fullscreen mode and configure IFACE settings (the control bar at the bottom of the game screen).

 ```ini
-[screen]
-resolution_x=1600 ; actual game window size (screen resolution), in pixels
-resolution_y=1080
-windowed=1 ; 0 = fullscreen
-scale=2 ; 1 = original scale, 2 = 2x scale, etc. (e.g. at scale 2 and screen resolution 1920x1080, in-game resolution will be 960x540, thus every pixel is twice as wide and tall)
+[MAIN]
+SCR_WIDTH=1280
+SCR_HEIGHT=720
+WINDOWED=1 ; 0 = fullscreen
+SCALE_2X=1 ; 0 = original scale, 1 = 2x - requires increasing the minimum resolution from 640x480 to 1280x960.

-[ui]
-;Set to 1 to expand the barter/trade window vertically, adding a 4th item slot per side (requires ce.dat)
-expand_barter_window=1
-;Maximum number of columns shown in the main inventory and loot/steal windows (valid range: 1..2)
-inventory_columns=2
-splash_screen_size=1 ; Splash screen scaling (0=original size, 1=fit preserving aspect, 2=stretch to fill)
-quick_toolbar_visible=0 ; Skills quick access toolbar visibility (iOS only) (0=hidden, 1=visible)
+[IFACE]
+; if IFACE_BAR_MODE=0 - the bottom of the map view window sits at the top of the IFACE Bar.
+; if IFACE_BAR_MODE=1 - the bottom of the map view window extends to the base of the screen and is overlapped by the IFACE Bar.
+IFACE_BAR_MODE=0
+
+;if IFACE_BAR_SIDE_ART=0 - Black, No Iface-bar side art used.
+;if IFACE_BAR_SIDE_ART=1 - Metal (grey) look Iface-bar side art used.
+;if IFACE_BAR_SIDE_ART=2 - Leather look Iface-bar side art used.
+;if IFACE_BAR_SIDE_ART=3-6 - Alternative Metal look Iface-bar side art used.
+;if IFACE_BAR_SIDE_ART=7 - Alternative Leather look Iface-bar side art used.
+;if IFACE_BAR_SIDE_ART=8 - Metal (brown) look Iface-bar side art used.
+IFACE_BAR_SIDE_ART=2
+
+;if IFACE_BAR_SIDES_ORI=0 - Iface-bar side graphics extend from the Iface-Bar to the Screen edges.
+;if IFACE_BAR_SIDES_ORI=1 - Iface-bar side graphics extend from the Screen edges to the Iface-Bar.
+IFACE_BAR_SIDES_ORI=0
+
+;This will increase the width of the interface bar expanding the area used to display text.
+;if IFACE_BAR_WIDTH=640 - Interface bar will remain at it's original width.
+;if IFACE_BAR_WIDTH=800 - Interface bar will use 800pix wide asset from f2_res.dat.
+;IFACE_BAR_WIDTH=640
+
+[STATIC_SCREENS]
+;if SPLASH_SCRN_SIZE=0 - Splash screen shows at original size if it fits, otherwise scales down while preserving aspect ratio.
+;if SPLASH_SCRN_SIZE=1 - Splash screen scales to fit the screen while preserving aspect ratio.
+;if SPLASH_SCRN_SIZE=2 - Splash screen stretches to fill the entire screen.
+SPLASH_SCRN_SIZE=0
+
+[MAPS]
+;if IGNORE_MAP_EDGES=0 - Hi-Res map scroll edges are enabled.
+;if IGNORE_MAP_EDGES=1 - Hi-Res map scroll edges are ignored.
+IGNORE_MAP_EDGES=0
 ```

-**Recommendations:**
+Recommendations:
 - **Desktops**: Use any size you see fit.
 - **Tablets**: Set these values to logical resolution of your device, for example iPad Pro 11 is 1668x2388 (pixels), but it's logical resolution is 834x1194 (points).
 - **Mobile phones**: Set height to 480, calculate width according to your device screen (aspect) ratio, for example Samsung S21 is 20:9 device, so the width should be 480 * 20 / 9 = 1067.

-In time this stuff will receive in-game interface, right now you have to do it manually. To see all currently working fallout2.cfg settings, just run the game once and quit. It will be automatically updated with defaults for every supported setting.
-*Note*: Use of the IFACE_BAR settings requires the `f2_res.dat` file, which contains graphical assets. Various versions are available, but one compatible with the above settings can be found here: [f2_res.dat](https://github.com/fallout2-ce/fallout2-ce/raw/refs/heads/main/files/f2_res.dat)
+In time this stuff will receive in-game interface, right now you have to do it manually. For a sample f2_res.ini configuration file, containing all currently working settings use this link: [f2_res.ini](https://raw.githubusercontent.com/fallout2-ce/fallout2-ce/refs/heads/mainmenu/files/f2_res.ini)
+
+*Note*: use of the IFACE_BAR settings requires the f2_res.dat file, which contains graphical assets. Various versions are available, but one compatible with the above f2_res.ini be found here: [f2_res.dat](https://github.com/fallout2-ce/fallout2-ce/raw/refs/heads/mainmenu/files/f2_res.dat)
+
+The third configuration file is `ddraw.ini` (part of Sfall). There are dozens of options that adjust or override engine behaviour and gameplay mechanics. This file is intended for modders and advanced users.
+
+For a sample ddraw.ini configuration file, containing all currently working settings use this link: [ddraw.ini](https://raw.githubusercontent.com/fallout2-ce/fallout2-ce/refs/heads/main/files/ddraw.ini)

 ## Quality of life benefits over vanilla Fallout

 * High resolution support
-* Expanded 2-column inventory
-* Expanded 4-row barter screen
-* Expanded AP bar
 * Increased pathfinding nodes 5x for more accurate pathfinding
 * Ctrl-click to quickly move items when bartering, looting, or stealing
 * _a_ to select "all" when selecting item quantity
 * _a_ to `Take All` when looting
 * When bartering, caps default to the right amount to balance the trade (if possible)
-* Music continues playing between maps
-* Auto open doors
+* Music continues playing between maps (requires config)
+* Auto open doors (requires config)

 ## Contributing

-For build instructions and contributor notes, see [CONTRIBUTING.md](CONTRIBUTING.md).
+Integrating Sfall goodies is the top priority. Quality of life updates are OK too. Please no large scale refactorings at this time as we need to reconcile changes from Reference Edition, which will make this process slow and error-prone. In any case open up an issue with your suggestion or to notify other people that something is being worked on.

-Integrating Sfall goodies is the top priority. Quality of life updates are OK too.  In any case open up an issue with your suggestion or to notify other people that something is being worked on.
+### Integrating Sfall

-For current sfall compatibility status and the remaining work needed to close gaps, see [SFALL_COMPATIBILITY.md](SFALL_COMPATIBILITY.md).
+There are literally hundreds if not thousands of fixes and features in sfall. I guess not all of them are needed in Community Edition, but for the sake of compatibility with big mods out there, let's integrate them all.

 ## License

@@ -4,28 +4,6 @@ This document tracks Fallout 2 CE compatibility with sfall.  This is for modders

 For now, this covers opcodes/metarules, and hooks.  In the future, it will include other ways of modifying the engine (like ini files), and other Sfall-specific behaviour.

-## Settings (ddraw.ini → fallout2.cfg / game.cfg)
-
-Settings previously read from `ddraw.ini` have been moved into standard CE config files.
-
-Most settings that control game behavior (premade characters, extra message files, combat tweaks, worldmap, etc.) have been moved into [`<DAT>/config/game.cfg`](files/ce.dat/config/game.cfg), which is a content-mod config file intended to be overridden by mods. See that file for the full list with descriptions.
-
-The following settings were moved into [`fallout2.cfg`](files/fallout2.cfg) instead:
-
-| ddraw.ini section | ddraw.ini key | fallout2.cfg section | fallout2.cfg key |
-| --- | --- | --- | --- |
-| `Misc` | `SkipOpeningMovies` | `ui` | `skip_opening_movies` |
-| `Misc` | `DisplayKarmaChanges` | `ui` | `display_karma_changes` |
-| `Misc` | `DisplayBonusDamage` | `ui` | `display_bonus_damage` |
-| `Misc` | `NumbersInDialogue` | `ui` | `numbers_in_dialogue` |
-| `Misc` | `AutoQuickSave` | `ui` | `auto_quick_save` |
-| `Main` | `EnableHighResolutionStencil` | `ui` | `enable_high_resolution_stencil` |
-| `Misc` | `ConsoleOutputPath` | `debug` | `console_output_path` |
-| `Misc` | `GaplessMusic` | `sound` | `gapless_music` |
-| `Misc` | `ScreenshotsFormat` | `system` | `screenshots_format` |
-| `Misc` | `UseWalkDistance` | `qol` | `use_walk_distance` |
-| `Misc` | `AutoOpenDoors` | `qol` | `auto_open_doors` |
-
 ## Opcodes / Metarules

 See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/) for documentation on specific functions.
@@ -38,55 +16,53 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | Skills | get/set_critter_skill_points<br>get/set_available_skill_points<br>set_skill_max<br>set_critter_skill_mod<br>set_base_skill_mod<br>mod_skill_points_per_level | not implemented | - |
 | Graphics | graphics_funcs_available<br>force_graphics_refresh<br>get_screen_width<br>get_screen_height<br>set_palette | implemented: only get_screen_width, get_screen_height | - |
 | Shaders | load_shader<br>free_shader<br>activate_shader<br>deactivate_shader<br>set/get_shader_* | 🚫 | likely will not implement direct compatibility
-| Perks and traits | set_perk_image<br>set_perk_*<br>set_pyromaniac_mod<br>apply_heaveho_fix<br>set_swiftlearner_mod<br>has/set_fake_perk<br>has/set_fake_trait<br>set_selectable_perk<br>set_perkbox_title<br>show/hide_real_perks<br>perk_add_mode<br>clear_selectable_perks<br>add/remove_trait<br>seq_perk_freq | not implemented | - |
+| Perks and traits | set_perk_image<br>set_perk_*<br>set_pyromaniac_mod<br>apply_heaveho_fix<br>set_swiftlearner_mod<br>set_fake_perk<br>set_fake_trait<br>set_selectable_perk<br>set_perkbox_title<br>hide_real_perks<br>show_real_perks<br>perk_add_mode<br>clear_selectable_perks<br>has_fake_perk<br>has_fake_trait<br>add_trait<br>remove_trait<br>seq_perk_freq | not implemented | - |
 | Virtual file system | fs_create<br>fs_copy<br>fs_find<br>fs_read/write_*<br>fs_delete<br>fs_size<br>fs_pos<br>fs_seek<br>fs_resize | 🚫 | Open an issue if you have a use case for these |
 | Combat / Knockback | set_weapon_knockback<br>set_target_knockback<br>set_attacker_knockback<br>remove_weapon_knockback<br>remove_target_knockback<br>remove_attacker_knockback | not implemented | - |
 | Maps and encounters | in_world_map<br>force_encounter<br>force_encounter_with_flags<br>set_map_time_multi<br>get/set_map_enter_position<br>exec_map_update_scripts<br>get/set_terrain_name<br>set_town_title<br>get/set_can_rest_on_map<br>set_rest_heal_time<br>set_rest_mode<br>set_worldmap_heal_time | implemented: in_world_map, force_encounter, force_encounter_with_flags, set_map_time_multi | - |
 | Maps and encounters / Worldmap | get_world_map_x/y_pos<br>set_world_map_pos | ✅ | - |
-| Audio | play_sfall_sound<br>stop_sfall_sound | ✅ | `play_sfall_sound` currently supports `.acm`, `.wav`, `.ogg` formats, and can load from `.dat` archives. `.mp3` is not yet supported. |
+| Audio | eax_available<br>set_eax_environment<br>play_sfall_sound<br>stop_sfall_sound | not implemented | *eax* opcodes will not be implemented |
 | Combat / Weapons and ammo | get/set_weapon_ammo_pid<br>get/set_weapon_ammo_count | ✅ | - |
 | Sfall / Version | sfall_ver_major<br>sfall_ver_minor<br>sfall_ver_build | ✅ | CE currently reports `4.3.4` |
 | Utility / Math | log, exponent, round, sqrt, abs, sin, cos, tan, arctan, ceil, ^, floor2, div | ✅ | - |
 | Keyboard and mouse | key_pressed<br>tap_key<br>get_mouse_x/y<br>get_mouse_buttons | ✅ | - |
 | Lists | list_begin<br>list_next<br>list_end<br>list_as_array<br>party_member_list | ✅ | - |
-| Explosions | set_attack_explosion_pattern<br>set_attack_explosion_art<br>set_attack_explosion_radius<br>set_attack_is_explosion_fire<br>set_explosion_radius<br>set_dynamite_damage<br>set_plastic_damage<br>get_explosion_damage<br>set_explosion_max_targets<br>item_make_explosive | ✅ except item_make_explosive | - |
+| Explosions | metarule2_explosions<br>set_attack_explosion_pattern<br>set_attack_explosion_art<br>set_attack_explosion_radius<br>set_attack_is_explosion_fire<br>set_explosion_radius<br>set_dynamite_damage<br>set_plastic_damage<br>get_explosion_damage<br>set_explosion_max_targets<br>item_make_explosive | ✅ except item_make_explosive | - |
 | Animations | reg_anim_combat_check<br>reg_anim_destroy<br>reg_anim_animate_and_hide<br>reg_anim_light<br>reg_anim_change_fid<br>reg_anim_take_out<br>reg_anim_turn_towards<br>reg_anim_callback<br>reg_anim_animate_and_move | ✅ except reg_anim_callback | - |
 | Art and appearance | art_exists<br>refresh_pc_art<br>art_cache_clear<br>set_hero_race<br>set_hero_style | implemented: art_exists, refresh_pc_art, art_cache_clear | - |
-| Tiles and paths | get_tile_fid<br>tile_under_cursor<br>tile_light<br>tile_get_objs<br>tile_refresh_display<br>obj_blocking_tile<br>tile_by_position<br>get_tile_ground_fid<br>get_tile_roof_fid<br>obj_blocking_line<br>path_find_to<br>objects_in_radius | ✅ | - |
+| Tiles and paths | get_tile_fid<br>tile_under_cursor<br>tile_light<br>tile_get_objs<br>tile_refresh_display<br>obj_blocking_tile<br>tile_by_position<br>get_tile_ground_fid<br>get_tile_roof_fid<br>obj_blocking_line<br>path_find_to<br>objects_in_radius | ✅ except objects_in_radius | - |
 | Utility | sprintf<br>typeof<br>atoi<br>atof | ✅ | - |
-| Utility / Strings | string_split<br>substr<br>strlen<br>charcode<br>get_string_pointer<br>string_find<br>string_find_from<br>string_format<br>string_format_array<br>string_replace<br>string_to_case<br>string_compare | ✅ | `get_string_pointer` is deprecated and intentionally omitted. |
-| Interface / Tags | show_iface_tag<br>hide_iface_tag<br>is_iface_tag_active<br>set_iface_tag_text<br>add_iface_tag | ✅ except set_iface_tag_text, add_iface_tag | CE only handles built-in interface tags here; custom tag creation/text is not supported yet. |
-| Global variables | set_sfall_global<br>get_sfall_global_int<br>get_sfall_global_float | ✅ except get_sfall_global_float | Current CE storage is int-backed; `set_sfall_global` stores integer values |
-| Hooks / Hook functions | init_hook<br>get_sfall_arg<br>get_sfall_args<br>get_sfall_arg_at<br>set_sfall_return<br>set_sfall_arg<br>register_hook<br>register_hook_proc<br>register_hook_proc_spec | ✅ | See below for implemented hooks. `init_hook` is deprecated and will not be implemented. register_hook_proc and register_hook_proc_spec both add hooks to the *end* of the hook list, instead of beginning and end, respectively. |
-| Arrays / Array functions | create_array<br>temp_array<br>fix_array<br>get/set_array<br>resize_array<br>free_array<br>scan_array<br>len_array<br>save/load_array<br>array_key<br>arrayexpr | ✅ | - |
+| Utility / Strings | string_split<br>substr<br>strlen<br>charcode<br>get_string_pointer<br>string_find<br>string_find_from<br>string_format<br>string_format_array<br>string_replace<br>string_to_case<br>string_compare | ✅ except get_string_pointer | `get_string_pointer` is deprecated and intentionally omitted. |
+| Interface / Tags | show_iface_tag<br>hide_iface_tag<br>is_iface_tag_active<br>set_iface_tag_text<br>add_iface_tag | implemented: all except set_iface_tag_text, add_iface_tag | CE only handles built-in interface tags here; custom tag creation/text is not supported yet. |
+| Global variables | set_sfall_global<br>get_sfall_global_int<br>get_sfall_global_float | implemented: all except get_sfall_global_float | Current CE storage is int-backed; `set_sfall_global` stores integer values and there is no float getter yet. |
+| Hooks / Hook functions | init_hook<br>get_sfall_arg<br>get_sfall_args<br>get_sfall_arg_at<br>set_sfall_return<br>set_sfall_arg<br>register_hook<br>register_hook_proc<br>register_hook_proc_spec | ✅ except init_hook | See below for implemented hooks. `init_hook` is deprecated and will not be implemented. register_hook_proc and register_hook_proc_spec both add hooks to the *end* of the hook list, instead of beginning and end, respectively. |
+| Arrays / Array functions | create_array<br>temp_array<br>fix_array<br>get/set_array<br>resize_array<br>free_array<br>scan_array<br>len_array<br>save/load_array<br>array_key<br>arrayexpr | ✅ except save_array, load_array | - |
 | Perks and traits / NPC perks | set_fake_perk_npc<br>set_fake_trait_npc<br>set_selectable_perk_npc<br>has_fake_perk_npc<br>has_fake_trait_npc | not implemented | - |
-| Global scripts / Global script functions | set_global_script_repeat<br>set_global_script_type<br>available_global_script_types | ✅ except available_global_script_types | - |
-| Combat | attack_is_aimed<br>block_combat<br>force_aimed_shots<br>disable_aimed_shots<br>get_attack_type<br>get/set_bodypart_hit_modifier<br>combat_data<br>get/set/reset_critical_table<br>get_last_target<br>get_last_attacker<br>set_critter_burst_disable<br>get/set_critter_current_ap<br>set_spray_settings<br>get/set_combat_free_move | implemented: get_attack_type, get/set_bodypart_hit_modifier, combat_data, get/set_critter_current_ap, get/set_combat_free_move | - |
+| Global scripts / Global script functions | set_global_script_repeat<br>set_global_script_type<br>available_global_script_types | implemented: all except available_global_script_types | - |
+| Combat | attack_is_aimed<br>block_combat<br>force_aimed_shots<br>disable_aimed_shots<br>get_attack_type<br>get/set_bodypart_hit_modifier<br>combat_data<br>get/set/reset_critical_table<br>get_last_target<br>get_last_attacker<br>set_critter_burst_disable<br>get/set_critter_current_ap<br>set_spray_settings<br>get/set_combat_free_move | implemented: only get_attack_type, get_bodypart_hit_modifier, combat_data, set_bodypart_hit_modifier | - |
 | Car | set_car_current_town<br>car_gas_amount<br>set_car_intface_art | implemented: all except set_car_intface_art | - |
-| Interface / Windows and images | art_frame_data<br>interface_art_draw<br>interface_print<br>draw_image<br>draw_image_scaled<br>get_window_under_mouse<br>create_win<br>get_window_attribute<br>message_box<br>set_window_flag<br>win_fill_color<br>interface_overlay<br>dialog_message<br>get_text_width<br>hide_window<br>show_window<br>create_message_window | implemented: only message_box, get_text_width, show_window, create_message_window | - |
-| Interface / Outline | outlined_object<br>get_outline<br>set_outline | ✅ | - |
+| Interface / Windows and images | art_frame_data<br>interface_art_draw<br>interface_print<br>draw_image<br>draw_image_scaled<br>get_window_under_mouse<br>create_win<br>get_window_attribute<br>message_box<br>set_window_flag<br>win_fill_color<br>interface_overlay<br>dialog_message<br>get_text_width<br>hide_window<br>show_window | implemented: only message_box, get_text_width, show_window | - |
+| Interface / Outline | outlined_object<br>get_outline<br>set_outline | implemented: all except get_outline | - |
 | Interface / Main interface | intface_is_hidden<br>intface_redraw<br>intface_hide<br>intface_show<br>set_quest_failure_value | implemented: only intface_redraw | `intface_redraw` only supports the zero-argument form; the optional-argument path is explicitly unimplemented. |
-| Interface / Inventory | display_stats<br>inventory_redraw<br>critter_inven_obj2<br>get_current_inven_size<br>item_weight | implemented: critter_inven_obj2, item_weight | - |
+| Interface / Inventory | display_stats<br>inventory_redraw<br>critter_inven_obj2<br>get_current_inven_size<br>item_weight | implemented: only critter_inven_obj2 | - |
 | Interface / Cursor | get/set_cursor_mode | ✅ | - |
 | Locks | lock_is_jammed<br>unjam_lock<br>set_unjam_locks_time | not implemented | - |
-| INI settings | get_ini_setting<br>get_ini_string<br>get_ini_section<br>get_ini_sections<br>get_ini_config<br>get_ini_config_db<br>set_ini_setting | ✅ except get_ini_config, get_ini_config_db | `modified_ini` is intentionally omitted as deprecated. |
-| Objects and scripts | set_self<br>set_dude_obj<br>real_dude_obj<br>remove_script<br>get/set_script<br>obj_is_carrying_obj<br>loot_obj<br>dialog_obj<br>obj_under_cursor<br>get/set_object_data<br>get/set_flags<br>set_unique_id<br>set_scr_name<br>obj_is_openable<br>get/set_proto_data<br>get_object_ai_data | implemented: set_self, get/set/remove_script, obj_is_carrying_obj, loot_obj, dialog_obj, obj_under_cursor, get_object_data, get_flags, set_flags, obj_is_openable, get_proto_data, set_proto_data | - |
-| Other / Game management | set_movie_path<br>stop/resume_game<br>mark_movie_played<br>game_loaded<br>get_game_mode<br>get_uptime<br>signal_close_game | implemented: game_loaded, get_game_mode, get_uptime, signal_close_game | - |
-| Gameplay tweaks | set_pickpocket_max<br>set_hit_chance_max<br>set_xp_mod<br>set_critter_hit_chance_mod<br>set_base_hit_chance_mod<br>set_hp_per_level_mod<br>gdialog_get_barter_mod<br>get/set_unspent_ap_bonus<br>get/<br>set_base_pickpocket_mod<br>set_critter_pickpocket_mod<br>get/set_inven_ap_cost<br>set_drugs_data<br>get_kill_counter<br>mod_kill_counter<br>set_pipboy_available | implemented: gdialog_get_barter_mod | - |
-| NPCs | inc_npc_level<br>get_npc_level<br>npc_engine_level_up | not implemented | - |
-| Other | get_year<br>set_dm/df_model<br>active_hand<br>toggle_active_hand<br>get/set_viewport_x/y<br>hero_select_win<br>get_light_level<br>message_str_game<br>sneak_success<br>create_spatial<br>unwield_slot<br>add_g_timer_event<br>add_extra_msg_file<br>get_metarule_table<br>metarule_exist<br>remove_timer_event<br>spatial_radius | implemented: get_year, active_hand, toggle_active_hand, get_light_level, message_str_game, add_extra_msg_file, metarule_exist | `input_funcs_available`, `nb_create_char` are deprecated in sfall and intentionally absent in CE. `add_extra_msg_file` does not support the explicit `fileNumber` form in CE. |
+| INI settings | modified_ini<br>get_ini_setting<br>get_ini_string<br>get_ini_section<br>get_ini_sections<br>get_ini_config<br>get_ini_config_db<br>set_ini_setting | ✅ except modified_ini, get_ini_config, get_ini_config_db | `modified_ini` is intentionally omitted as deprecated. |
+| Objects and scripts | set_self<br>set_dude_obj<br>real_dude_obj<br>remove_script<br>set_script<br>get_script<br>obj_is_carrying_obj<br>loot_obj<br>dialog_obj<br>obj_under_cursor<br>get_object_data<br>set_object_data<br>get_flags<br>set_flags<br>set_unique_id<br>set_scr_name<br>obj_is_openable<br>get/set_proto_data<br>get_object_ai_data | implemented: set_self, get_script, loot_obj, dialog_obj, obj_under_cursor, get_object_data, get_flags, set_flags, get_proto_data, set_proto_data | - |
+| Other / Game management | set_movie_path<br>stop_game<br>resume_game<br>mark_movie_played<br>game_loaded<br>get_game_mode<br>get_uptime<br>signal_close_game | implemented: game_loaded, get_game_mode, get_uptime | - |
+| Other | input_funcs_available<br>get_year<br>set_dm_model<br>set_df_model<br>set_pipboy_available<br>get_kill_counter<br>mod_kill_counter<br>active_hand<br>toggle_active_hand<br>set_pickpocket_max<br>set_hit_chance_max<br>set_xp_mod<br>set_critter_hit_chance_mod<br>set_base_hit_chance_mod<br>inc_npc_level<br>get_npc_level<br>get/set_viewport_x/y<br>set_hp_per_level_mod<br>get/set_unspent_ap_bonus<br>get/set_unspent_ap_perk_bonus<br>hero_select_win<br>create_message_window<br>get_light_level<br>gdialog_get_barter_mod<br>set_inven_ap_cost<br>set_base_pickpocket_mod<br>set_critter_pickpocket_mod<br>message_str_game<br>sneak_success<br>create_spatial<br>unwield_slot<br>get_inven_ap_cost<br>add_g_timer_event<br>add_extra_msg_file<br>get_metarule_table<br>metarule_exist<br>npc_engine_level_up<br>remove_timer_event<br>set_drugs_data<br>spatial_radius | implemented: get_year, active_hand, toggle_active_hand, create_message_window, message_str_game, add_extra_msg_file, metarule_exist | `input_funcs_available`, `nb_create_char` are deprecated in sfall and intentionally absent in CE. `add_extra_msg_file` does not support the explicit `fileNumber` form in CE. |

 ## Hooks

 | Hook | ID | Compatibility | Notes |
 | --- | --- | --- | --- |
 | ToHit | `HOOK_TOHIT` | ✅ | - |
-| AfterHitRoll | `HOOK_AFTERHITROLL` | ✅ | Overriding `defender` leaves a lot of attack variables in previous state (e.g. distance, ->oops, roundsHitMainTarget) |
-| CalcAPCost | `HOOK_CALCAPCOST` | ✅ | - |
+| AfterHitRoll | `HOOK_AFTERHITROLL` | 🚫 | Et tu |
+| CalcAPCost | `HOOK_CALCAPCOST` | 🚫 | - |
 | DeathAnim1 | `HOOK_DEATHANIM1` | 🚫 | Use DEATHANIM2 instead |
 | DeathAnim2 | `HOOK_DEATHANIM2` | ✅ | - |
 | CombatDamage | `HOOK_COMBATDAMAGE` | ✅ | - |
-| OnDeath | `HOOK_ONDEATH` | ✅ | - |
+| OnDeath | `HOOK_ONDEATH` | 🚫 | - |
 | FindTarget | `HOOK_FINDTARGET` | 🚫 | (maybe) |
 | UseObjOn | `HOOK_USEOBJON` | ✅ | - |
 | UseObj | `HOOK_USEOBJ` | ✅ | CE notes an sfall-matching inconsistency around return code `2` behavior between interface contexts. |
@@ -94,24 +70,24 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | BarterPrice | `HOOK_BARTERPRICE` | ✅ | - |
 | MoveCost | `HOOK_MOVECOST` | 🚫 | - |
 | ItemDamage | `HOOK_ITEMDAMAGE` | 🚫 | - |
-| AmmoCost | `HOOK_AMMOCOST` | ✅ | Requires `check_weapon_ammo_cost=1` if you want pre-attack ammo validation to respect per-shot/per-round overrides. |
+| AmmoCost | `HOOK_AMMOCOST` | 🚫 | Et tu |
 | KeyPress | `HOOK_KEYPRESS` | ✅ | Third hook arg is currently `0`; CE doesn't use VK codes. |
-| MouseClick | `HOOK_MOUSECLICK` | ✅ | - |
+| MouseClick | `HOOK_MOUSECLICK` | 🚫 | - |
 | UseSkill | `HOOK_USESKILL` | 🚫 | - |
-| Steal | `HOOK_STEAL` | ✅ | - |
-| WithinPerception | `HOOK_WITHINPERCEPTION` | ✅ | - |
+| Steal | `HOOK_STEAL` | 🚫 | Et tu |
+| WithinPerception | `HOOK_WITHINPERCEPTION` | 🚫 | Et tu |
 | InventoryMove | `HOOK_INVENTORYMOVE` | ✅ | - |
-| InvenWield | `HOOK_INVENWIELD` | ✅ | - |
-| AdjustFID | `HOOK_ADJUSTFID` | ✅ | Second hook arg currently matches the first because CE has no internal FID modifiers like Hero Appearance. |
-| CombatTurn | `HOOK_COMBATTURN` | ✅ | - |
-| StdProcedure | `HOOK_STDPROCEDURE` | ✅ | - |
-| StdProcedureEnd | `HOOK_STDPROCEDURE_END` | ✅ | - |
+| InvenWield | `HOOK_INVENWIELD` | 🚫 | - |
+| AdjustFID | `HOOK_ADJUSTFID` | 🚫 | - |
+| CombatTurn | `HOOK_COMBATTURN` | 🚫 | - |
+| StdProcedure | `HOOK_STDPROCEDURE` | 🚫 | Et tu |
+| StdProcedureEnd | `HOOK_STDPROCEDURE_END` | 🚫 | - |
 | CarTravel | `HOOK_CARTRAVEL` | 🚫 | - |
 | SetGlobalVar | `HOOK_SETGLOBALVAR` | 🚫 | - |
-| RestTimer | `HOOK_RESTTIMER` | ✅ | CE is slightly more strict: only `ret0 == 1` interrupts. Ticks wrap every 6.8y; do not rely on them for absolute game time. |
+| RestTimer | `HOOK_RESTTIMER` | 🚫 | Et tu |
 | GameModeChange | `HOOK_GAMEMODECHANGE` | ✅ | - |
 | UseAnimObj | `HOOK_USEANIMOBJ` | 🚫 | Et tu; (maybe) |
-| ExplosiveTimer | `HOOK_EXPLOSIVETIMER` | ✅ | - |
+| ExplosiveTimer | `HOOK_EXPLOSIVETIMER` | 🚫 | - |
 | DescriptionObj | `HOOK_DESCRIPTIONOBJ` | 🚫 | Et tu |
 | UseSkillOn | `HOOK_USESKILLON` | 🚫 | Et tu |
 | OnExplosion | `HOOK_ONEXPLOSION` | 🚫 | (maybe) |
@@ -124,5 +100,5 @@ See [`https://sfall-team.github.io/sfall/`](https://sfall-team.github.io/sfall/)
 | AdjustRads | `HOOK_ADJUSTRADS` | 🚫 | (maybe) |
 | RollCheck | `HOOK_ROLLCHECK` | 🚫 | - |
 | BestWeapon | `HOOK_BESTWEAPON` | 🚫 | - |
-| CanUseWeapon | `HOOK_CANUSEWEAPON` | ✅ | - |
+| CanUseWeapon | `HOOK_CANUSEWEAPON` | 🚫 | - |
 | BuildSfxWeapon | `HOOK_BUILDSFXWEAPON` | 🚫 | - |
@@ -1,131 +0,0 @@
-;
-; Game general config
-;
-; Fallout 2
-;
-
-[start]
-; Starting year, month, day. Month and day are 0-indexed (0 = January, 0 = first day of month).
-year=2241
-month=6
-day=24
-; To start a new game somewhere other than artemple.map, set this to the map file name.
-map=
-; Starting (tribal) and default (jumpsuit) player models. Can also be changed in-game via script.
-model_male=hmwarr
-model_male_default=hmjmps
-model_female=hfprim
-model_female_default=hfjmps
-; Set to 1 if you want the pipboy to be available at the start of the game.
-; Set to 2 to make the pipboy available by only skipping the vault suit movie check.
-pipboy=0
-
-[karma]
-; FRM numbers for karma icons on the character screen. Number of points entries should be 1 less than number of frms entries.
-; Example: frms=47,48,49  points=-100,100
-frms=
-points=
-
-[items]
-; Proto IDs for healing items.
-stimpak=40
-super_stimpak=144
-healing_powder=273
-
-[dialog]
-; Set to 1 to prevent using 0 to escape from dialogue at any time.
-no_exit_hotkey=1
-; Set to 1 to allow using '^' in dialog msg files to specify gender-based alternative text.
-; Text must be enclosed in angle brackets, e.g. <MaleText^FemaleText>.
-gender_words=0
-
-[main_menu]
-; Custom version string shown on the main menu. Supports up to two %d placeholders for the game version numbers.
-; Example: FALLOUT II v1.02d
-version_string=
-; Font color for the version string and copyright text. Last byte picks the color (default 0x3C).
-; First byte flags: 1 - version string only, 2 - underline, 4 - monospace font.
-; Example: 0x000055
-font_color=0
-; Font color for the main menu button text.
-big_font_color=0
-; Pixel offset for main menu buttons.
-offset_x=0
-offset_y=0
-; Pixel offset for the copyright text line.
-credits_offset_x=0
-credits_offset_y=0
-
-[movies]
-; Number of days after game start when each Hakunin dream sequence becomes available.
-artimer1=90
-artimer2=180
-artimer3=270
-artimer4=360
-
-[combat]
-; Damage formula used to calculate combat damage.
-; 0 - Fallout default, 1 - Glovz's Damage Fix, 2 - Glovz's Damage Fix with Damage Multiplier tweak, 5 - Haenlomal's Yet Another Ammo Mod
-; Don't change this unless another mod explicitly requires it.
-damage_formula=0
-; Set to 1 to fix the bug that caused bonus HtH damage to not be applied correctly.
-bonus_hth_damage_fix=1
-; Set to 1 to remove the time limits that prevent critical hits/misses in the first few days of the game.
-remove_critical_time_limits=0
-; Set to 1 to allow science and repair to be used on the player, or 2 for all critters (rather than only brahmin/robots).
-science_on_critters=0
-; Set to 1 to make pre-attack ammo checks respect weapon ammo cost and HOOK_AMMOCOST type 1 overrides.
-; Set to 0 to preserve vanilla behavior where one loaded round is enough to attempt the attack.
-check_weapon_ammo_cost=1
-; Set to 1 to enable modified burst bullet distribution (spray mod).
-burst_enabled=0
-; Ratio of bullets going to the center group vs. left/right in burst attacks. Multiplier is capped at divisor.
-burst_center_mult=1
-burst_center_div=3
-; Ratio of center-group bullets that target the primary target directly. Multiplier is capped at divisor.
-burst_target_mult=1
-burst_target_div=2
-
-[explosions]
-; Set to 1 to make explosions and projectiles emit light.
-emit_light=0
-; Dynamite damage range. Max is capped at 9999; min is capped at max.
-dynamite_max=50
-dynamite_min=30
-; Plastic explosive damage range. Max is capped at 9999; min is capped at max.
-plastic_explosive_max=80
-plastic_explosive_min=40
-
-[skilldex]
-; FRM numbers for Skilldex skill cursors. Default is 293 for all skills.
-lockpick=293
-steal=293
-traps=293
-first_aid=293
-doctor=293
-science=293
-repair=293
-
-[worldmap]
-; Set to 1 to prevent using number keys to enter unvisited areas on a town map.
-town_map_hotkeys_fix=1
-; Set to 1 to show travel markers on the world map, or 2 to show only when sneaking.
-trail_markers=0
-; Set to 1 to skip the encounter with Frank Horrigan.
-disable_horrigan=0
-; City reputation overrides. Syntax: city_id:global_id pairs separated by commas.
-; Example: 0:5001,2:5003,3:5004
-city_reputation_list=
-
-[characters]
-; Custom premade characters for the character selection screen.
-; premade_paths is a comma-separated list of file names (max 11 chars each) in the premade\ folder, without extension.
-; premade_fids is a comma-separated list of FRM numbers for the character portrait, matching the order of premade_paths.
-; Example: premade_paths=combat,diplomat,stealth   premade_fids=201,203,202
-premade_paths=
-premade_fids=
-
-[text]
-; Comma-separated list of extra game message file names (without .msg extension) to load from the game\ folder.
-; Use 'filename:number' syntax to assign explicit IDs. Access via message_str_game script function.
-extra_msg_file_list=
@@ -3,9 +3,26 @@
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Main]

+;Set to one to hide areas outside map bounds when using higher than 640x480 resolution, and to zero to disable
+;EnableHighResolutionStencil=1
+
+
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Misc]

+;Uncomment these lines to change the timers of how many days after the game starts Hakunin dream sequences will occur
+;MovieTimer_artimer1=5000
+;MovieTimer_artimer2=5000
+;MovieTimer_artimer3=5000
+;MovieTimer_artimer4=5000
+
+;To start a new game somewhere other than artemple.map, uncomment the next line and set it to the map you want to load
+;StartingMap=V13ent.map
+
+;To change the 'FALLOUT II v1.02d' version string on the main menu, uncomment the next line
+;You can use up to 2 %d's in this if you want to include Fallout's version number somewhere
+;VersionString=FALLOUT II v1.02d
+
 ;To use a config file other than fallout2.cfg, uncomment the next line and add the name of your new file
 ;ConfigFile=

@@ -13,6 +30,40 @@
 ;If you want to load multiple patch files (up to 1000) at once, you can include a %d in the file name (sprintf syntax)
 ;PatchFile=patch%03d.dat

+;Set to 1 to allow using the caret character '^' in dialog msg files to specify alternative text in dialogue based on the player's gender
+;The text must be enclosed in angle brackets (example: <MaleText^FemaleText>)
+;DialogGenderWords=0
+
+;To change the default and starting player models, uncomment the next four lines.
+;The default models can also be changed in-game via script
+;MaleStartModel=hmjmps
+;MaleDefaultModel=hmjmps
+;FemaleStartModel=hfjmps
+;FemaleDefaultModel=hfjmps
+
+;To change the starting year, month or day, uncomment the next 3 lines
+;Both StartMonth and StartDay are 0-indexed (i.e. 0 is January or the first day of a month)
+;StartYear=2241
+;StartMonth=01
+;StartDay=01
+
+;Set to 1 if you want the pipboy to be available at the start of the game
+;Set to 2 to make the pipboy available by only skipping the vault suit movie check
+;PipBoyAvailableAtGameStart=1
+
+;Choose the damage formula used to calculate combat damage.
+;Don't set this to anything other than 0 unless another mod you're using explicitly tells you to!
+;0 - Fallout default
+;1 - Glovz's Damage Fix
+;2 - Glovz's Damage Fix with Damage Multiplier tweak
+;5 - Haenlomal's Yet Another Ammo Mod
+;DamageFormula=0
+
+;Prevents you from using 0 to escape from dialogue at any time.
+;DialogueFix=1
+
+;Prevents you from using number keys to enter unvisited areas on a town map
+TownMapHotkeysFix=1

 ;Set to 1 to use a CriticalOverrides.ini file to override the default critical table
 ;Set to 2 to use the default critical with bug fixes (doesn't require an ini)
@@ -20,9 +71,108 @@
 ;If the ExtraKillTypes option is enabled, this should be set to 3, with containing entries for any new types
 ;Must be non-zero to use the edit/get/reset_critical script functions
 ;OverrideCriticalTable=2
+
+;Set to 1 to get notification of karma changes in the notification window
+DisplayKarmaChanges=0
+
+;Set to 1 to skip the 3 opening movies
+;Set to 2 to also skip the splash screen
+SkipOpeningMovies=0
+
+;Change the Skilldex cursor FRM numbers
+;Default is 293 for all skills
+Lockpick=293
+Steal=293
+Traps=293
+FirstAid=293
+Doctor=293
+Science=293
+Repair=293
+
+;Uncomment these lines to control the premade characters offered when starting a new game
+;Multiple options should be separated by commas, and there must be the same number of entries in both lines
+;Each name in PremadePaths is limited to 11 characters
+;PremadePaths=combat,diplomat,stealth
+;PremadeFIDs=201,203,202
+
+;Use this line to modify the list of cities and their associated global variables used for city reputations
+;Syntax is 'city id:global id', with each city/global pair separated by a comma.
+;CityRepsList=0:5001,2:5003,3:5004,4:5005,5:5006,6:5007,7:5008,8:5009,10:5011,11:5012,60:1640
+
+;Set this to a valid path to save a copy of the console contents
+;ConsoleOutputPath=console.txt
+
 ;Set to 1 to add additional pages of save slots !!! can be implemented !!!
 ;ExtraSaveSlots=1

+;To use more than one save slot for quick saving (F6 key) without picking a slot beforehand, set the next two lines
+;Quick save will cyclically overwrite saves from the first slot on the specified page to the last slot on the n-th page
+;AutoQuickSave sets how many pages you want to use for quick saving (valid range: 1..10)
+;Set to 0 to disable
+AutoQuickSave=0
+
+;These lines allow you to control the karma FRMs displayed on the character screen
+;Number of KarmaPoints should be 1 less than number of KarmaFRMs
+;KarmaFRMs=47,48,49
+;KarmaPoints=-100,100
+
+;Set to 1 to allow science and repair to be used on the player, or 2 for all critters. (Rather than only brahmin/robots)
+ScienceOnCritters=0
+
+;Set to 1 to fix the bug that caused bonus HtH damage to not be applied correctly.
+BonusHtHDamageFix=1
+
+;Set to 1 to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory
+;DisplayBonusDamage=1
+
+;Set to 1 to remove the limits that stop the game from rolling critical successes/failures in the first few days of game time
+RemoveCriticalTimelimits=0
+
+;Change the colour of the font used on the main menu for the Fallout/sfall version string and copyright text
+;It's the last byte ('3C' by default) that picks the colour used. The first byte supplies additional flags for this option
+;1 - change the colour for the version string only
+;2 - underline text for the version string
+;4 - use monospace font for the version string
+;MainMenuFontColour=0x000055
+;Change the colour of the font used on the main menu for the button text
+;MainMenuBigFontColour=0x3C
+
+;Uncomment the next four lines to move the main menu buttons and credit text (the 'Copyright(c)' line on the main menu)
+;MainMenuOffsetX=392
+;MainMenuOffsetY=26
+;MainMenuCreditsOffsetX=0
+;MainMenuCreditsOffsetY=0
+
+;These options modify the bullet distribution of burst attacks
+;All the bullets are divided into three groups: center, left, and right
+;These groups will then travel along three parallel tracks, trying to hit targets on the way
+;CenterMult/Div set the ratio of how many bullets go to the center group, and the remaining are divided equally to the left and right sides
+;TargetMult/Div set the ratio of how many bullets in the center group will attack the primary target directly
+;Multiplier values are capped at divisor values
+;ComputeSpray_CenterMult=1
+;ComputeSpray_CenterDiv=3
+;ComputeSpray_TargetMult=1
+;ComputeSpray_TargetDiv=2
+
+;Set to 1 to make explosions and projectiles emit light
+;ExplosionsEmitLight=1
+
+;Uncomment these lines to change explosives damage. DmgMax can be set to 9999 at max, and DmgMin is capped at DmgMax
+;Dynamite_DmgMax=50
+;Dynamite_DmgMin=30
+;PlasticExplosive_DmgMax=80
+;PlasticExplosive_DmgMin=40
+
+;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=
+
+;Set to 1 to display numbered dialogue options
+NumbersInDialogue=0
+
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 ; Configuration ini files
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -41,6 +191,9 @@
 ;See the Unarmed.ini in the modders pack for an example file
 ;UnarmedFile=sfall\Unarmed.ini

+;To change some engine parameters for the game mechanics, uncomment the next line
+;TweaksFile=sfall\Tweaks.ini
+
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Scripts]

--- a/Show More
+++ b/Show More