Merge branch 'master' into 2.4_Lite

NovaRain · NovaRain · commit 759e0213882b · 2025-07-27T18:39:01.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,8 +5,8 @@ on:
   pull_request:
 
 env:
-  sfall_version: 4.4.6.1
-  mpack_version: 4.4.6
+  sfall_version: 4.4.7
+  mpack_version: 4.4.7
 
 jobs:
   build:
diff --git a/.github/workflows/scanmsg.yml b/.github/workflows/scanmsg.yml
@@ -0,0 +1,24 @@
+name: ScanMsg
+
+on:
+  push:
+    paths:
+      - .github/workflows/scanmsg.yml
+      - data/text/*/*/*.msg
+  pull_request:
+    paths:
+      - .github/workflows/scanmsg.yml
+      - data/text/*/*/*.msg
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  ScanMsg:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: ScanMsg
+        run: ./extra/bin/ScanMsg.exe data/text
diff --git a/data/text/po/portuguese.po b/data/text/po/portuguese.po
@@ -4,9 +4,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-07-08-15:10+0000\n"
-"PO-Revision-Date: 2024-08-01 14:53+0000\n"
-"Last-Translator: tygyh <jonis9898@hotmail.com>\n"
-"Language-Team: Portuguese <https://hive.bgforge.net/projects/fallout/rp/pt/>\n"
+"PO-Revision-Date: 2025-07-22 03:22+0000\n"
+"Last-Translator: Gustavo <gustavotito.dev@gmail.com>\n"
+"Language-Team: Portuguese <https://hive.bgforge.net/projects/fallout/rp/pt/>"
+"\n"
 "Language: portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -121231,7 +121232,7 @@ msgstr ""
 
 #: dialog/mcvegeir.msg:401
 msgid "Modoc happy. Trade good!"
-msgstr ""
+msgstr "Modoc está feliz. Boas trocas!"
 
 #: dialog/midclrks.msg:100
 msgid "These rocks are just too big for you to move."
diff --git a/data/text/po/russian.po b/data/text/po/russian.po
@@ -4,14 +4,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-07-08-15:10+0000\n"
-"PO-Revision-Date: 2024-09-24 08:09+0000\n"
-"Last-Translator: Pavel <pavel061090563pavel@gmail.com>\n"
+"PO-Revision-Date: 2025-07-20 19:22+0000\n"
+"Last-Translator: Qwest8K <BloodRayne4000@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.12.2\n"
 
 #: cuts/afailed.sve:10
@@ -97086,7 +97087,7 @@ msgstr "Мне нечего сказать никому!"
 
 #: dialog/hcoldghl.msg:133
 msgid "I need a nap."
-msgstr "Соснуть, что ли?"
+msgstr "Хочу спать."
 
 #: dialog/hcoldghl.msg:134
 msgid "It's cold and there are wolves after me."
@@ -97177,7 +97178,7 @@ msgstr "Хорошо!"
 
 #: dialog/hcoutfit.msg:117
 msgid "Naw."
-msgstr "Не!"
+msgstr "Не."
 
 #: dialog/hcoutfit.msg:118
 msgid "I'll shovel the crap for a while."
@@ -121669,7 +121670,7 @@ msgstr ""
 
 #: dialog/mcvegeir.msg:401
 msgid "Modoc happy. Trade good!"
-msgstr ""
+msgstr "Модок счастлив. Торговля хороша!"
 
 #: dialog/midclrks.msg:100
 msgid "These rocks are just too big for you to move."
@@ -179395,16 +179396,12 @@ msgid "This looks to be the computer that controls a door nearby."
 msgstr "Похоже, это компьютер, который управляет расположенной рядом дверью."
 
 #: dialog/patchinf.msg:100 dialog/patchinf.msg:101
-#, fuzzy
-#| msgid ""
-#| "You are running killap's Fallout 2 Restoration Project. Version 2.3.3u. "
-#| "Thanks for installing!"
 msgid ""
 "You are running RPU v2.x.x, based on killap's F2 Restoration Project. Thanks"
 " for installing!"
 msgstr ""
-"Вы запустили killap's Fallout 2 Restoration Project. Version 2.3.3u. Спасибо"
-" за установку!"
+"Вы запустили RPU версии 2.x.x, основанный на Fallout 2 Restoration Project "
+"от killap'а. Благодарим за установку."
 
 #: dialog/pi8ball.msg:200 dialog/zi8ball.msg:200
 msgid "Outlook good."
diff --git a/data/text/portuguese/dialog/mcvegeir.msg b/data/text/portuguese/dialog/mcvegeir.msg
@@ -111,4 +111,4 @@
 {302}{}{Adeus.}
 {303}{}{Fantasmas?}
 {400}{}{A mensagem foi bem recebida. A cidade de Modoc gostaria de estabelecer comércio com o seu povo.}
-{401}{}{Modoc happy. Trade good!}
+{401}{}{Modoc está feliz. Boas trocas!}
diff --git a/data/text/russian/dialog/hcoldghl.msg b/data/text/russian/dialog/hcoldghl.msg
@@ -31,6 +31,6 @@
 {130}{}{::зевает::}
 {131}{}{::пффффффф::}
 {132}{}{Мне нечего сказать никому!}
-{133}{}{Соснуть, что ли?}
+{133}{}{Хочу спать.}
 {134}{}{Здесь холодно и воют волки.}
 {135}{}{Собаки могут вилять хвостом НЕСКОЛЬКО ЧАСОВ после того, как подохнут!}
diff --git a/data/text/russian/dialog/hcoutfit.msg b/data/text/russian/dialog/hcoutfit.msg
@@ -15,7 +15,7 @@
 {114}{}{Работа у меня есть. На заднем дворе здоровенная куча браминьего навоза. Если разгребешь ее за день - получишь $100. Идет?}
 {115}{}{Хочешь работу? Ну, тут есть два варианта: перекидывать лопатами навоз за $100 в день, или сопровождать один из наших караванов за $200. Наши караваны ходят в Гекко, НКР и Город Убежища.}
 {116}{}{Хорошо!}
-{117}{}{Не!}
+{117}{}{Не.}
 {118}{}{Я буду убирать навоз.}
 {119}{}{Я пойду с караваном в Гекко.}
 {120}{}{Я пойду с караваном в НКР.}
diff --git a/data/text/russian/dialog/mcvegeir.msg b/data/text/russian/dialog/mcvegeir.msg
@@ -66,4 +66,4 @@
 {302}{}{Пока.}
 {303}{}{Призраки?}
 {400}{}{Сообщение было принято с радостью. Город Модок готов открыть торговлю с вашим народом.}
-{401}{}{Modoc happy. Trade good!}
+{401}{}{Модок счастлив. Торговля хороша!}
diff --git a/data/text/russian/dialog/patchinf.msg b/data/text/russian/dialog/patchinf.msg
@@ -1,2 +1,2 @@
-{100}{}{You are running RPU v2.x.x, based on killap's F2 Restoration Project. Thanks for installing!}
-{101}{}{You are running RPU v2.x.x, based on killap's F2 Restoration Project. Thanks for installing!}
+{100}{}{Вы запустили RPU версии 2.x.x, основанный на Fallout 2 Restoration Project от killap'а. Благодарим за установку.}
+{101}{}{Вы запустили RPU версии 2.x.x, основанный на Fallout 2 Restoration Project от killap'а. Благодарим за установку.}
diff --git a/extra/bin/ScanMsg.exe b/extra/bin/ScanMsg.exe
diff --git a/extra/env.sh b/extra/env.sh
@@ -8,9 +8,9 @@ export bin_dir="$extra_dir/bin"
 release_dir="$(realpath release)"
 export release_dir
 export mods_dir="$release_dir/mods"
-export mpack_version=${mpack_version:-4.4.6}
+export mpack_version=${mpack_version:-4.4.7}
 export mpack_7z="mpack.7z"
-export sfall_version=${sfall_version:-4.4.6.1}
+export sfall_version=${sfall_version:-4.4.7}
 export WINEARCH=win32
 export WINEDEBUG=-all
 export mod_name=rpu
diff --git a/scripts_src/arroyo/acdog.ssl b/scripts_src/arroyo/acdog.ssl
@@ -52,12 +52,23 @@ procedure start begin
 end
 
 procedure map_enter_p_proc begin
-   if ( (global_var(GVAR_ARROYO_DOG) == QUEST_NONE) or (reached_tl_4) or (global_var(GVAR_ARROYO_DOG) == DOG_RUN_OFF) ) then begin //edit by killap - added: or (reached_tl_4) or (global_var(GVAR_ARROYO_DOG) == DOG_RUN_OFF)
-       set_self_invisible;          // invis
-   end
-   else begin
-       set_self_visible;          // vis
-   end
+    // If PC saved Smoke, by TL4 Morlis cooks it
+    if reached_tl_4 then begin
+        if (global_var(GVAR_ARROYO_DOG) != DOG_FINISHED_GOOD) then begin
+            // Cross off the quest
+            set_global_var(GVAR_ARROYO_DOG, DOG_FINISHED_BAD);
+        end
+        destroy_self;
+        return;
+    end
+
+   if ( (global_var(GVAR_ARROYO_DOG) == QUEST_NONE)
+        or (global_var(GVAR_ARROYO_DOG) == DOG_RUN_OFF)
+    ) then begin    // edit by killap - added: or (global_var(GVAR_ARROYO_DOG) == DOG_RUN_OFF)
+        set_self_invisible;
+    end else begin
+       set_self_visible;
+    end
 end
 
 procedure critter_p_proc begin
@@ -101,5 +112,4 @@ procedure destroy_p_proc begin
    set_global_var(GVAR_ARROYO_DOG,DOG_DEAD);
    if (cur_map_index == MAP_ARROYO_WILDERNESS) then
        set_map_var(MVAR_Dog_Already_Dead,1);
-
 end
diff --git a/scripts_src/arroyo/acnagor.ssl b/scripts_src/arroyo/acnagor.ssl
@@ -191,34 +191,6 @@ procedure talk_p_proc begin
        end_dialogue;
    end
 
-   else if (reached_tl_3) then begin
-       call Node015;
-    end
-
-   else if (reached_tl_2) then begin
-       start_gdialog(NAME,self_obj,4,-1,-1);
-       gSay_Start;
-           call Node014;
-       gSay_End;
-       end_dialogue;
-   end
-
-   else if (reached_tl_1) then begin
-       start_gdialog(NAME,self_obj,4,-1,-1);
-       gSay_Start;
-           call Node013;
-       gSay_End;
-       end_dialogue;
-   end
-
-   else if (dude_iq < 4) then begin //moved here by killap
-       start_gdialog(NAME,self_obj,4,-1,-1);
-       gSay_Start;
-           call Node012;
-       gSay_End;
-       end_dialogue;
-   end
-
    else if (global_var(GVAR_ARROYO_DOG) == DOG_RUN_OFF) then begin
        floater(131);
    end
@@ -258,6 +230,34 @@ procedure talk_p_proc begin
        call Node011;
    end
 
+   else if (reached_tl_3) then begin
+       call Node015;
+   end
+
+   else if (reached_tl_2) then begin
+       start_gdialog(NAME,self_obj,4,-1,-1);
+       gSay_Start;
+           call Node014;
+       gSay_End;
+       end_dialogue;
+   end
+
+   else if (reached_tl_1) then begin
+       start_gdialog(NAME,self_obj,4,-1,-1);
+       gSay_Start;
+           call Node013;
+       gSay_End;
+       end_dialogue;
+   end
+
+   else if (dude_iq < 4) then begin //moved here by killap
+       start_gdialog(NAME,self_obj,4,-1,-1);
+       gSay_Start;
+           call Node012;
+       gSay_End;
+       end_dialogue;
+   end
+
    else if (local_var(LVAR_Herebefore) == 0) then begin
        set_local_var(LVAR_Herebefore,1);
        start_gdialog(NAME,self_obj,4,-1,-1);
@@ -465,10 +465,10 @@ procedure Node016 begin
 end
 
 procedure Node017 begin
-   if (dude_is_male) then
-       NMessage(214);
+   // PC saved Smoke, but Morlis cooks him by TL4
+   if (global_var(GVAR_ARROYO_DOG) == DOG_FINISHED_GOOD) then
+      NMessage(214);
    else
-       NMessage(215);
+      // Else, it dies in an unspecified way
+      NMessage(215);
 end
-
-//xxxxxxxxxxxxxxxxxxxx
diff --git a/scripts_src/headers/global.h b/scripts_src/headers/global.h
@@ -1323,11 +1323,29 @@
 #define SPEAR_GET_FLINT                     (2)
 #define SPEAR_FINISHED                      (3)
 
+/**
+ * Nagor-Smoke quest accepted
+ */
 #define DOG_ACCEPTED                        (1)
+/**
+ * Smoke found in wilderness and has joined PC
+ */
 #define DOG_RETURNED                        (2)
+/**
+ * PC told Nagor to go after Smoke himself
+ */
 #define DOG_RUN_OFF                         (3)
+/**
+ * Smoke died
+ */
 #define DOG_DEAD                            (4)
+/**
+ * Smoke returned to Nagor, quest completed
+ */
 #define DOG_FINISHED_GOOD                   (5)
+/**
+ * Smoke is dead, PC told Nagor, quest failed
+ */
 #define DOG_FINISHED_BAD                    (6)
 
 #define CHAD_SUSPICIOUS                     (1)
