Hub Deathclaw

- Tweaked: Added fail-safe to Harold and Beth dialog to not accidentally reset the Deathclaw status when the player already killed it before in a random encounter.

Author: Lexx2k

Fallout2/Fallout1in2/Mapper/source/scripts/06hub/HAROLD.ssl

@@ -575,7 +575,10 @@ procedure Harold45 begin
 end
 
 procedure Harold47 begin
-   set_global_var(GVAR_KILL_DEATHCLAW, 1);
+   // Only set to 1 if the deathclaw wasn't killed yet
+   if (global_var(GVAR_KILL_DEATHCLAW) < 2) then begin
+      set_global_var(GVAR_KILL_DEATHCLAW, 1);
+   end
    Reply(233);
    NOption(234, Harold49, 4);
 end

Fallout2/Fallout1in2/Mapper/source/scripts/06hub/HBETH.ssl

@@ -644,7 +644,10 @@ procedure Beth45 begin
 end
 
 procedure Beth46 begin
-   set_global_var(GVAR_KILL_DEATHCLAW, 1);
+   // Only set to 1 if the deathclaw wasn't killed yet
+   if (global_var(GVAR_KILL_DEATHCLAW) < 2) then begin
+      set_global_var(GVAR_KILL_DEATHCLAW, 1);
+   end
    Reply(240);
    NOption(241, Beth47, 4);
    BOption(242, Beth49, 4);

Fallout2/Fallout1in2/Mapper/source/scripts/GlobalScripts/gl_fo1mechanics.ssl

@@ -129,8 +129,7 @@ procedure GameModeChange_handler begin
    call skilled;
 
    // The Eyebot has a built-in motion scanner function
-   if Eyebot_In_Party then
-      call motion_scanner;
+   if Eyebot_In_Party then call motion_scanner;
 
    // Activate special radiation death if > 1000 rem. See data/enddeath.txt
    set_global_var(GVAR_SPECIAL_RADIATION_DEATH, dude_rads);
@@ -221,8 +220,7 @@ end
 
 procedure skilled begin
    // We have to manually do this, because we are overwriting the hardcoded effect in the perks.ini file.
-   if dude_trait(TRAIT_skilled) then
-      set_perk_freq(4);
+   if dude_trait(TRAIT_skilled) then set_perk_freq(4);
 end
 
 procedure gecko_skinning begin
@@ -374,8 +372,7 @@ procedure UseObjOn_handler begin
       item := get_sfall_arg;
 
    // Give 1 bottle cap when drinking a Nuka Cola :>
-   if (obj_pid(item) == PID_NUKA_COLA) then
-      item_caps_adjust(source, 1);
+   if (obj_pid(item) == PID_NUKA_COLA) then item_caps_adjust(source, 1);
 end
 
 procedure WithinPerception_handler begin

Fallout2/Fallout1in2/Mapper/source/scripts/headers/critpid.h

@@ -187,7 +187,7 @@
 #define PID_MEAN_PIG_RAT                  (16777393)
 #define PID_FARMER_4                      (16777394)
 #define PID_WORKER_3                      (16777395)
-#define PID_MERCHANT_6                    (16777396)
+#define PID_MERCHANT_6                    (16777396) // Merchant PID that spawns with carvlead script in towns 
 #define PID_GUARD_4                       (16777397)
 #define PID_GLOWER                        (16777398)
 #define PID_MAD_GLOWING_ONE               (16777399)