Allow to complete Nagor-Smoke quest up until timelimit 4, ref BGforgeNet/Fallout2_Unofficial_Patch#157

Author: burner1024

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

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

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)