Make sure to disable wipe_inventory in UPU.ini + minor merchant tweaks

docs/ecco_readme.txt

@@ -213,7 +213,11 @@ MovieTimer_artimer2=210
 MovieTimer_artimer3=330
 MovieTimer_artimer4=450
 
-4. Follow the rest of the installation steps from github.
+4. Open mods\upu.ini and make sure to set the following in [main] section:
+
+wipe_inventory=0
+
+5. Follow the rest of the installation steps from github.
 
 
 

extra/installer.iss

@@ -181,6 +181,9 @@ Filename: "{app}\ddraw.ini"; Section: "Misc"; Key: "MovieTimer_artimer2"; String
 Filename: "{app}\ddraw.ini"; Section: "Misc"; Key: "MovieTimer_artimer3"; String: "330"; Components: main
 Filename: "{app}\ddraw.ini"; Section: "Misc"; Key: "MovieTimer_artimer4"; String: "450"; Components: main
 
+; Disable wipe_inventory
+Filename: "{app}\mods\upu.ini"; Section: "main"; Key: "wipe_inventory"; String: "0"; Components: main
+
 ;Filename: "{app}\ddraw.ini"; Section: "Misc"; Key: "CheckWeaponAmmoCost"; String: "1"; Components: combat
 
 Filename: "{app}\mods\ecco\combat.ini"; Section: "AI"; Key: "called_tweaks"; String: "0"; Components: not ai_called_shots

root/data/config/pbs_map_tweaks.ini

@@ -210,6 +210,11 @@ run_on_load=0
 26708=a16,a38,w16:1
 
 
+[56_0] ; newr3
+; Eldridge: wield 14mm to prevent stealing
+26719=w22:1
+
+
 [58_0] ; NEWRCS
 ; One full MFC pack to locked locker in the office
 14895=a39:1

scripts_src/den/diflibox.ssl

@@ -53,7 +53,7 @@ procedure map_enter_p_proc begin
          check_restock_item(PID_BEER, 0, 6, 100)
          check_restock_item(PID_BOOZE, 0, 3, 100)
          check_restock_item(PID_NUKA_COLA, 0, 2, 100)
-         check_restock_item(PID_44_MAGNUM_REVOLVER, 1, 1, 25) // pbs: was 50%
+         check_restock_item(PID_44_MAGNUM_REVOLVER, 1, 1, 25) // pbs: was 1-3, 100%
          check_restock_item(PID_44_MAGNUM_JHP, 1, 5, 100)
          check_restock_item(PID_STIMPAK, 0, 3, 100)
          check_restock_item(PID_HUNTING_RIFLE, 1, 1, 25) // pbs: was 50%

scripts_src/den/ditubbox.ssl

@@ -55,8 +55,8 @@ procedure map_enter_p_proc begin
          check_restock_item(PID_LEATHER_JACKET, 1, 1, 100)
          check_restock_item(PID_STIMPAK, 2, 5, 100)
          check_restock_item(PID_10MM_SMG, 0, 1, 50) // pbs: was 100%
-         check_restock_item(PID_PBS_9MM_SMG, 0, 1, 50) // pbs: added
-         check_restock_item(PID_9MM_BALL, 1, 3, 75) // pbs: added
+         check_restock_item(PID_PBS_9MM_SMG, 0, 1, 100) // pbs: added
+         check_restock_item(PID_9MM_BALL, 1, 3, 100) // pbs: added
          check_restock_item(PID_SPRINGER_RIFLE, 1, 1, 75) // pbs: added
          check_restock_item(PID_DESERT_EAGLE, 1, 2, 100)
          check_restock_item(PID_SLEDGEHAMMER, 0, 1, 100)

scripts_src/newreno/nceldrid.ssl

@@ -112,7 +112,7 @@ procedure Node030;
 #define back_room_bit                  bit_16
 #define closed_warning_bit             bit_17
 // pbs:
-#define pistol_blyat_bit               bit_24
+#define pistol_given_blyat_bit         bit_24
 
 #define module                         lvar_bit(LVAR_Flags, module_bit)
 #define set_module                     set_lvar_bit_on(LVAR_Flags, module_bit)
@@ -138,8 +138,8 @@ procedure Node030;
 #define closed_warning                 lvar_bit(LVAR_Flags, closed_warning_bit)
 #define set_closed_warning             set_lvar_bit_on(LVAR_Flags, closed_warning_bit)
 
-#define pistol_blyat                   lvar_bit(LVAR_Flags, pistol_blyat_bit)
-#define set_pistol_blyat               set_lvar_bit_on(LVAR_Flags, pistol_blyat_bit)
+#define pistol_given_blyat             lvar_bit(LVAR_Flags, pistol_given_blyat_bit)
+#define set_pistol_given_blyat         set_lvar_bit_on(LVAR_Flags, pistol_given_blyat_bit)
 
 #define give_eldridge_box(x)           if (x != current_box) then begin                               \
                                           if (current_box != 0) then begin                            \
@@ -325,6 +325,17 @@ procedure pickup_p_proc begin
    end
 end
 
+procedure ensure_pistol_blyat begin
+   // pbs: workaround for overly-aggressive wipe_inventory: restore pistol, but only once (potentially grants a second one)
+   if (not pistol_given_blyat) then begin
+      if (obj_is_carrying_obj_pid(new_reno_eldridge_box_2, PID_223_PISTOL) == 0) then begin
+         ndebug("restoring deleted .223 Pistol!");
+         call add_item_pid(new_reno_eldridge_box_2, PID_223_PISTOL);
+      end
+      set_pistol_given_blyat;
+   end
+end
+
 procedure talk_p_proc begin
    //added by killap
    if (Fallout2_enclave_destroyed) then
@@ -335,14 +346,7 @@ procedure talk_p_proc begin
       gdialog_set_barter_mod(-10);
    //added by killap
 
-   // pbs: workaround for overly-aggressive wipe_inventory: restore pistol, but only once (potentially grants a second one)
-   if (not pistol_blyat) then begin
-      if (obj_is_carrying_obj_pid(new_reno_eldridge_box_2, PID_223_PISTOL) == 0) then begin
-         ndebug("restoring deleted .223 Pistol!");
-         call add_item_pid(new_reno_eldridge_box_2, PID_223_PISTOL);
-      end
-      set_pistol_blyat;
-   end
+   call ensure_pistol_blyat;
    if (eldridge_bed_time) then begin
       call Node030;
    end else begin

scripts_src/newreno/nieldbox.ssl

@@ -72,8 +72,8 @@ procedure map_enter_p_proc begin
          check_restock_item(PID_223_FMJ, 1, 5, 75)
          check_restock_item(PID_14MM_AP, 2, 6, 100) // pbs: 2x count
          check_restock_item(PID_PBS_14MM_JHP, 1, 1, 40) // new
-         check_restock_item(PID_SHOTGUN_SHELLS, 1, 5, 100)
-         check_restock_item(PID_PBS_SHOTGUN_SLUGS, 1, 5, 100) // new
+         check_restock_item(PID_SHOTGUN_SHELLS, 3, 5, 100) // pbs: was 1-5
+         check_restock_item(PID_PBS_SHOTGUN_SLUGS, 1, 4, 100) // new
          check_restock_item(PID_PBS_DRAGON_BREATH, 1, 2, 25) // new
          check_restock_item(PID_DYNAMITE, 1, 1, 50)
          check_restock_item(PID_PLASTIC_EXPLOSIVES, 1,1 , 50)