Sync missing messages with UPU, cleanup unused references. See BGforg…

…eNet/Fallout2_Unofficial_Patch#105
BGforgeNet · Apr 22, 2024 · 5c6f5fc · 5c6f5fc
1 parent 822fa15
commit 5c6f5fc
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 20 deletions.
diff --git a/data/text/english/dialog/fcgunmer.msg b/data/text/english/dialog/fcgunmer.msg
@@ -50,4 +50,4 @@
 {149}{}{That is all I can think of at the moment. Good day.}
 {150}{}{Good day.}
 {151}{}{You are a thief, a murderer, and a villain. I'm afraid I must kill you.}
-
+{152}{}{Wait...}
diff --git a/data/text/english/dialog/wsterm2c.msg b/data/text/english/dialog/wsterm2c.msg
@@ -23,4 +23,6 @@
  the floor. So much for using this terminal.]}
 {119}{}{Exit}
 {120}{}{You already shut down the automated repair system.}
-{121}{}{I can't access the terminal. Someone broke the keyboard.}
+{121}{}{I can't access the terminal. Someone broke the keyboard.}
+
+{200}{}{ is unable to read what's on the monitor.}
diff --git a/data/text/english/dialog/zcslave.msg b/data/text/english/dialog/zcslave.msg
@@ -0,0 +1,4 @@
+{100}{}{You see a miserable wretch of human being.}
+{101}{}{You still see a miserable wretch of a human being.}
+{150}{}{You see a really, really miserable wretch of a human being. Why are you staring?}
+{151}{}{Yes, still a really miserable wretch of a human being.}
diff --git a/scripts_src/headers/slvcamp.h b/scripts_src/headers/slvcamp.h
@@ -18,9 +18,8 @@
 #define MVAR_Take_Slaves                        (3)
 #define MVAR_Can_Check_Slaves                   (4)
 #define MVAR_Guide_Sister                       (5)
-#define MVAR_Came_With_Rangers                  (7)
 
 #define slaves_in_big_pen(x)     tile_in_tile_rect(15936, 15922, 18536, 18322, x)
 #define slaves_in_small_pen(x)   tile_in_tile_rect(12670, 12658, 13470, 13458, x)
 
-#endif // slvcamp_H
+#endif // slvcamp_H
diff --git a/scripts_src/maps/slvcm1.ssl b/scripts_src/maps/slvcm1.ssl
@@ -47,7 +47,6 @@ procedure map_enter_p_proc begin
 
    //help rangers attack camp
    if (global_var(GVAR_LOAD_MAP_INDEX) == 5) then begin
-      set_map_var(MVAR_Came_With_Rangers,1);
       move_to(dude_obj, 16692, 0);
       Critter := create_object_sid(PID_MALE_NCR_RANGER,17097,dude_elevation,SCRIPT_SCATKRNG);
       set_team(Critter,TEAM_PLAYER);

diff --git a/scripts_src/sierra/wsterm2a.ssl b/scripts_src/sierra/wsterm2a.ssl
@@ -81,7 +81,7 @@ procedure Node017;
 
 /* Local Variables which are saved. All Local Variables need to be
    prepended by LVAR_ */
-#define LVAR_Diagnostic                 (0)
+// #define LVAR_Diagnostic                 (0)  // unused
 #define LVAR_Gave_Xp                    (1)
 #define LVAR_Last_Used                  (2)
 #define LVAR_Hack_Security              (3) // Seraph's Code
@@ -109,11 +109,7 @@ procedure use_p_proc begin
 
    script_overrides;
 
-   if (local_var(LVAR_Diagnostic) == 1) then begin
-       display_msg(mstr(200));
-   end
-
-   else if (global_var(GVAR_SIERRA_BASE_ENEMY) == 1) then begin
+   if (global_var(GVAR_SIERRA_BASE_ENEMY) == 1) then begin
        Damage:=random(LOW_DAMAGE,HIGH_DAMAGE);
        critter_damage(source_obj,Damage);
        display_msg(message_str(SCRIPT_WSTERM1A,300)); //was SCRIPT_WSTERM1B - killap

diff --git a/scripts_src/slvcamp/slvcc2.ssl b/scripts_src/slvcamp/slvcc2.ssl
@@ -253,8 +253,6 @@ end
 procedure Node002 begin
    if (has_rep_slaver) then begin
       floater_rand(304 - dude_is_female, 312 + dude_is_male);
-   end else if (map_var(MVAR_Came_With_Rangers) == 2) then begin
-      floater(910);
    end else begin
       floater_rand(300, 302);
    end

diff --git a/scripts_src/valtcity/vcconnar.ssl b/scripts_src/valtcity/vcconnar.ssl
@@ -986,13 +986,6 @@ procedure Node039 begin
    NOption(606, Node041, 004);
 end
 
-//not used anymore...
-procedure Node040 begin
-   Reply(607);
-   NOption(608, Node999, 004);
-   NOption(609, Node041, 004);
-end
-
 procedure Node041 begin
    Reply(610);
    NOption(611, Node999, 004);