Merge branch 'bgforge_master'

.github/workflows/build.yml

@@ -3,41 +3,48 @@ name: build
 on: [push]
 
 env:
-  sfall_version: 4.3.4
-  mpack_version: 4.3.4
+  sfall_version: 4.4.3.1
+  mpack_version: 4.4.3
 
 jobs:
   build:
     if: ${{ github.actor != 'bgforge-hive' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Run tests
-        run: |
-          set -xeu -o pipefail
-          ./extra/tests.sh
+      - name: ShellCheck
+        uses: ludeeus/action-shellcheck@master
+
+      - name: Fallout tests
+        uses: BGforgeNet/fallout-tests@main
+        with:
+          scripts_h: scripts_src/headers/scripts.h
+          scripts_lst: data/scripts/scripts.lst
+          scripts_dir: scripts_src
+          dialog_dir: data/text/english/dialog
+          worldmap_path: false
+
+      - name: Install wine
+        uses: devopsx/gha-ubuntu-i386-fix@master
 
       - name: Install packages
         run: |
-          set -xeu -o pipefail
-          sudo dpkg --add-architecture i386
-          sudo apt -qq update
-          sudo apt-get install -o=Dpkg::Use-Pty=0 -y crudini dos2unix gcc p7zip wine-stable wine32
-          wineboot
+          sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -o=Dpkg::Use-Pty=0 -y crudini dos2unix gcc p7zip
+          WINEARCH=win32 eatmydata wineboot
 
       - name: Build and package
         run: ./extra/full.sh
 
       - name: Upload artifacts - exe
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: "!startsWith(github.ref, 'refs/tags/')"
         with:
           name: rpu.exe
           path: rpu*.exe
 
       - name: Upload artifacts - translations zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: "!startsWith(github.ref, 'refs/tags/')"
         with:
           name: rpu_translations.zip
@@ -49,7 +56,7 @@ jobs:
         run: rm -f rpu*_translations.zip
 
       - name: Upload artifacts - main zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: "!startsWith(github.ref, 'refs/tags/')"
         with:
           name: rpu.zip

.github/workflows/poify.yml

@@ -1,20 +1,22 @@
 name: Poify/Unpoify
 on:
   push:
+    branches:
+      - master
     paths:
-      - "data/text/**" # tra_dir
+      - "data/text/**"
 
 jobs:
-  build:
+  msg2po:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Poify/Unpoify
         uses: BGforgeNet/msg2po@master
         with:
-          poify: "true"
-          unpoify: "true"
-          push: "true"
-          single_commit: "true"
+          poify: true
+          unpoify: true
+          push: true
+          single_commit: true

.github/workflows/pr.yml

@@ -4,10 +4,31 @@ on:
   pull_request:
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Run tests
-        run: ./extra/tests.sh
+      - name: ShellCheck
+        uses: ludeeus/action-shellcheck@master
+
+      - name: Fallout tests
+        uses: BGforgeNet/fallout-tests@main
+        with:
+          scripts_h: scripts_src/headers/scripts.h
+          scripts_lst: data/scripts/scripts.lst
+          scripts_dir: scripts_src
+          dialog_dir: data/text/english/dialog
+          worldmap_path: false
+
+      - name: Poify/Unpoify test
+        uses: BGforgeNet/msg2po@master
+        with:
+          poify: true
+          unpoify: true
+          single_commit: false
+          poify_commit: false
+          unpoify_commit: false
+          dir2msgstr: true
+          dir2msgstr_commit: false

.gitignore

@@ -17,7 +17,13 @@ release/ddraw.dll
 release/ddraw.ini
 release/sfall-mods.ini
 release/translations/
-release/mods/
+
+release/mods/*
+!release/mods/elevators.ini
+!release/mods/f2_res.dat
+!release/mods/rpu.ini
+!release/mods/upu.ini
+!release/mods/mods_order.txt
 
 extra/bin/*
 !extra/bin/dat2.exe

.vscode/settings.json

@@ -6,7 +6,5 @@
         "**/data/city.txt": "ini",
         "**/data/maps.txt": "ini",
         "**/data/party.txt": "ini",
-        "**/data/worldmap.txt": "ini",
-
     }
 }

README.md

@@ -7,33 +7,36 @@
 [![Discord](https://img.shields.io/discord/420268540700917760?logo=discord&label=discord&color=blue&logoColor=FEE75C)](https://discord.gg/4Yqfggm)
 [![IRC](https://img.shields.io/badge/%23IRC-join%20%20%20%20%E2%9D%B1%E2%9D%B1%E2%9D%B1-darkorange)](https://bgforge.net/irc)
 
-[__Download__](https://github.com/BGforgeNet/Fallout2_Restoration_Project/releases/latest)
-| [__Installation__](#installation)
-| [__Bug reports__](#bug-reports-feature-requests)
-| [__Translations__](docs/translations.md)
-| [__Additional mods__](#additional-mods)
+[**Download**](https://github.com/BGforgeNet/Fallout2_Restoration_Project/releases/latest)
+| [**Installation**](#installation)
+| [**Bug reports**](#bug-reports-feature-requests)
+| [**Translations**](docs/translations.md)
+| [**Additional mods**](#additional-mods)
 
 This is an updated version of [killap's Restoration Project](http://killap.net/) for Fallout 2.
 
 ### Installation
-- RPU must be installed on vanilla game.
-- RPU requires starting a **new game** after installation.
 
-(One exception is [updating](docs/update.md) from RP or a previous RPU version).
+- RPU must be installed on vanilla game.
+- RPU requires starting a new game after installation. (One exception is [updating](docs/update.md) from RP or a previous RPU version).
 
 #### Windows
+
 1. Download `rpu_v*.exe` from the [latest release](https://github.com/BGforgeNet/Fallout2_Restoration_Project/releases/latest) page.
 1. Launch, point the installer to the game directory, choose language and options.
-1. After installation, see `mods/rpu.ini` for various settings that can be configured.
-1. AP ammo fix is not enabled by default. See `DamageFormula` in `ddraw.ini` for options, or consider [FO2tweaks](https://github.com/BGforgeNet/FO2tweaks#damage-mod) implementation.
+1. After installation, see `mods/upu.ini`, `mods/rpu.ini` for various settings that can be configured.
 1. Check out [recommended](#recommended) mods to add on top.
 
 #### Linux / MacOS
-Follow the [instruction](docs/linux.md). AP ammo note from above also applies.
+
+Follow the [instruction](docs/linux.md).
 
 ### Additional mods
+
 #### Included
+
 RPU includes the following mods:
+
 - [Unofficial Patch](https://github.com/BGforgeNet/Fallout2_Unofficial_Patch)
 - [High quality music](https://github.com/BGforgeNet/Fallout2-HQ-music)
 - [Hero Appearance](https://github.com/BGforgeNet/Fallout2_Hero_Appearance)
@@ -47,16 +50,21 @@ RPU includes the following mods:
 - High resolution patch
 
 #### Recommended
+
 For additional QoL options, check out:
+
 - [Lossless music](https://github.com/BGforgeNet/Fallout2-HQ-music)
 - [FO2tweaks](https://github.com/BGforgeNet/FO2tweaks)
+- [Inventory Filter](https://github.com/rotators/InventoryFilter)
 
 ### Bug reports, feature requests
+
 1. Go to [github issues](https://github.com/BGforgeNet/Fallout2_Restoration_Project/issues) or [forums](https://forums.bgforge.net/viewforum.php?f=39).
 2. Open an issue/topic, describe the bug. Report each bug separately.
 3. Attach a savegame and a screenshot.
 
 ### Additional info
+
 - [Changelog](docs/changelog.md)
 - [New content description](https://github.com/BGforgeNet/Fallout2_Restoration_Project/blob/master/docs/rp-new_content.txt) (spoilers)
 - [Walkthrough](https://f2rp.bgforge.net/) (heavy spoilers)

data/data/worldmap.txt

@@ -368,12 +368,10 @@ type_00=ratio:10%, pid:16777424, Item:273, Item:4, Item:(0-10)41, Script:765
 type_01=ratio:10%, pid:16777424, Item:273, Item:4, Item:(0-10)41, Script:770               ; Nomad Shaman
 type_02=ratio:40%, pid:16777424, Item:49, Item:284, Item:7, Item:(0-10)41, Script:622      ; Male Nomad w/ Antidote, Meat Jerky, and Spear
 type_03=ratio:40%, pid:16777426, Item:273, Item:4, Item:(0-10)41, Script:622               ; Female Nomad w/ Healing Powder and  Knife
-type_04=pid:16777226, If (Rand(10%)), Script:203                            ; Brahmin
-type_05=pid:16777226, If (Rand(15%)), Script:203                            ; Brahmin
+type_02=pid:16777268, If (Rand(10%)), Script:1129                           ; Male Orphan
+type_03=pid:16777269, If (Rand(15%)), Script:1129                           ; Female Orphan
 position=cone, spacing:2
-;765 - chief
-;770 - shaman
-
+team_num=129      ; TEAM_RND_NOMAD
 
 [Encounter: ARROK_Molerats]
 type_00=ratio:85%, pid:16777326, Script:617                     ; Molerats
@@ -418,23 +416,19 @@ type_01=ratio:33%, pid:16777283, Item:21(wielded), Script:623   ; Strong Peasant
 type_02=ratio:15%, pid:16777279, Item:320, Script:623           ; Weak Peasant Male w/ Sharpened Pole
 type_03=ratio:15%, pid:16777280, Item:4, Script:623             ; Weak Peasant Female w/ Knife
 type_04=ratio:4%, pid:16777270, Script:623                      ; Male Loser - killap - adult male proto, so why child script?
-type_05=pid:16777269, Script:1129                                ; Female Child
-type_06=pid:16777268, Script:1129                                ; Male Child - killap - no longer uses adult proto with child script
+type_05=pid:16777269, Script:1129                               ; Female Child
+type_06=pid:16777268, Script:1129                               ; Male Child - killap - no longer uses adult proto with child script
 type_07=Dead, pid:16777298                                      ; Dead Dog
 position=Surrounding, Spacing:6, Distance:7
+team_num=131   ; TEAM_RND_HOMELESS
 
 [Encounter: KLA_Farmers]
 type_00=ratio:67%, pid:16777281, Item:9, Item:(0-3)71, Item:(0-10)41, Script:493    ; Average Peasant Male w/ 10mm SMG and Fruit
 type_01=ratio:25%, pid:16777282, Item:299, Item:(1-2)71, Item:(0-10)41, Script:493   ; Average Peasant Female w/ Hunting Rifle and Fruit
 type_02=ratio:4%, pid:16777269, Item:71, Script:785             ; Female Child w/ Fruit
 type_03=ratio:4%, pid:16777268, Script:785                      ; Male Child	-killap - no longer uses adult proto with child script
 type_04=Dead, pid:16777298                                      ; Dead Dog
-;position=Surrounding
-;position=straight_line, spacing:1
-;position=straight_line, spacing:2
-;position=double_line, spacing:1
-;position=wedge, spacing:2
-;position=cone, spacing:2
+team_num=183   ; TEAM_RND_FARMER
 position=huddle, spacing:1
 
 [Encounter: KLA_Golden_Geckos]
@@ -506,19 +500,13 @@ type_01=Dead, pid:16777221
 position=Surrounding, Spacing:3
 
 [Encounter: DEN_Slavers]
-type_00=ratio:20%, pid:16777433, Item:18(wielded), Item:(0-10)41, Item:40, Script:508          ; Male Slaver w/ Desert Eagle and Stimpak
+type_00=ratio:20%, pid:16777433, Item:18(wielded), Item:(0-10)41, Item:40, Script:508        ; Male Slaver w/ Desert Eagle and Stimpak
 type_01=ratio:20%, pid:16777434, Item:9(wielded), Item:(0-10)41, Item:40, Script:508         ; Female Slaver w/ Springer Rifle and Stimpak
 type_02=ratio:20%, pid:16777233, Script:628                                     ; Cute Female Slave
 type_03=ratio:20%, pid:16777238, Script:628                                     ; Strong Male Slave
 type_04=ratio:10%, pid:16777243, Script:628                                     ; Generic Female Slave
 type_05=ratio:10%, pid:16777244, Script:628                                     ; Generic Male Slave
-;position=Surrounding
-;position=straight_line, spacing:1
-;position=straight_line, spacing:2
-;position=double_line, spacing:1
 position=wedge, spacing:2
-;position=cone, spacing:2
-;position=huddle, spacing:1
 
 [Encounter: DEN_Slave_Run]
 type_00=ratio:50%, pid:16777433, Item:5(wielded), Item:(0-10)41, Script:627                    ; Male Slaver w/ Club
@@ -783,7 +771,6 @@ type_02=ratio:25%, pid:16777437, Item:9(wielded), Item:(0-20)41, Script:787
 type_03=ratio:25%, pid:16777437, Item:352(wielded), Item:(0-20)41, Script:787                              ; Homesteader female w/ H&K G11
 type_04=pid:16777269, Script:788                                                                           ; Homesteader child - female
 type_05=pid:16777268, Script:788                                                                           ; Homesteader child - male
-
 position=huddle, spacing:2
 
 [Encounter: RDRC_Broken_Hills_Caravan]
@@ -2910,9 +2897,9 @@ enc_08=Chance:15%,Enc:(2-4) Bounty_Hunter_Low AMBUSH Player, If(Global(0) < -500
 enc_09=Chance:15%,Enc:(2-4) Bounty_Hunter_Low_Mid AMBUSH Player, If(Global(0) < -500) And If(Player(Level) > 6) And If(Player(Level) < 13)
 enc_10=Chance:15%,Enc:(2-4) Bounty_Hunter_High_Mid AMBUSH Player, If(Global(0) < -500) And If(Player(Level) > 12) And If(Player(Level) < 19)
 enc_11=Chance:15%,Enc:(2-5) Bounty_Hunter_High AMBUSH Player, If(Global(0) < -500) And If(Player(Level) > 18)
-enc_11=Chance:10%,Enc:(4-7) Morton_Brother, If(Global(386) > 0) And If(Global(386) < 6)
-enc_12=Chance:5%,Counter:1,Special,Map:Special Bridge Encounter,Enc:Special1, If(Player(Level) > 9) And If(Global(605) < 1)
-enc_13=Chance:3%,Counter:1,Special,Map:Special Holy Encounter 2,Enc:Special1, If(Global(614) > 0) And If(Global(606) < 1)
+enc_12=Chance:10%,Enc:(4-7) Morton_Brother, If(Global(386) > 0) And If(Global(386) < 6)
+enc_13=Chance:5%,Counter:1,Special,Map:Special Bridge Encounter,Enc:Special1, If(Player(Level) > 9) And If(Global(605) < 1)
+enc_14=Chance:3%,Counter:1,Special,Map:Special Holy Encounter 2,Enc:Special1, If(Global(614) > 0) And If(Global(606) < 1)
 
 [Encounter Table 69]
 lookup_name=Wild6_D                                                                         ; Area between New Reno and NCR