Added caps shuffling to Duppo and San Fran merchants

NovaRain · NovaRain · commit 25678c04d308 · 2025-04-03T20:26:20.000+08:00
(bartering with them will always have caps from tables.)

Changed merchant inventory wipe to not run on first map enter.
Set ProcessorIdle=1 in ddraw.ini to prevent potential issues on Win11.
diff --git a/extra/package/ddraw.ini b/extra/package/ddraw.ini
@@ -13,6 +13,7 @@ OverrideArtCacheSize=1
 UseFileSystemOverride=1
 WorldMapSlots=21
 BoostScriptDialogLimit=1
+ProcessorIdle=1
 
 [Scripts]
 IniConfigFolder=mods
diff --git a/scripts_src/headers/upu.h b/scripts_src/headers/upu.h
@@ -155,6 +155,7 @@ end
 // call before restock
 procedure move_quest_items begin
    if wipe_inventory != 1 then return 0;
+   if map_first_run then return 0;
    variable tmp_box := create_object(PID_FOOTLOCKER_CLEAN_LEFT, 5, 0);
    variable pid;
    variable pids := [
diff --git a/scripts_src/maps/ncr1.ssl b/scripts_src/maps/ncr1.ssl
@@ -38,6 +38,8 @@
 
 export variable cyber_dog_obj := 0;
 export variable i_duppo_table := 0;
+export variable i_duppo_tbl_1 := 0;
+export variable i_duppo_tbl_2 := 0;
 export variable i_duppo_talk  := 0;
 export variable i_duppo_obj   := 0;
 
diff --git a/scripts_src/maps/sfchina.ssl b/scripts_src/maps/sfchina.ssl
@@ -43,9 +43,13 @@ procedure map_update_p_proc;
 procedure Initial_Inven;
 
 export variable i_table_swap    := 0;
+export variable i_gun_table_1   := 0;
+export variable i_gun_table_2   := 0;
 export variable i_gun_merchant  := 0;
 
 export variable i_lao_table_swap := 0;
+export variable i_lao_table_1    := 0;
+export variable i_lao_table_2    := 0;
 export variable i_lao_merchant   := 0;
 
 export variable i_dragon_obj := 0;
diff --git a/scripts_src/ncr/scduppo.ssl b/scripts_src/ncr/scduppo.ssl
@@ -102,6 +102,8 @@ procedure combat_p_proc;
    pointers and variables that need not be saved. If a variable
    Needs to be saved, make it a map variable (MVAR_) */
 import variable i_duppo_table;
+import variable i_duppo_tbl_1;
+import variable i_duppo_tbl_2;
 import variable i_duppo_talk;
 import variable i_duppo_obj;
 
@@ -195,7 +197,7 @@ end
    written by designers are placed in here. Additionally, Reactions are generated and
    stored which affects player interactions. */
 procedure talk_p_proc begin
-   variable obj;
+   variable obj, caps;
 
    Evil_Critter:=0;
    Slavery_Tolerant:=SLAVE_TOLERANT;
@@ -205,6 +207,14 @@ procedure talk_p_proc begin
 
    GetReaction;
 
+   if (i_duppo_table == i_duppo_tbl_1) then begin
+      obj := i_duppo_tbl_2;
+   end else begin
+      obj := i_duppo_tbl_1;
+   end
+   caps := item_caps_total(obj);
+   self_caps_adjust(caps);
+   item_caps_adjust(obj, -caps);
    move_obj_inven_to_obj(i_duppo_table, self_obj);
 
    start_gdialog(NAME,self_obj,4,-1,-1);
@@ -215,8 +225,8 @@ procedure talk_p_proc begin
    set_local_var(LVAR_Herebefore, 1);
 
    move_obj_inven_to_obj(self_obj, i_duppo_table);
-   //self_caps_adjust(item_caps_total(i_duppo_table)); -comment out by NovaRain (expansion)
-   //item_caps_adjust(i_duppo_table, -self_caps); -comment out by NovaRain (expansion)
+   //self_caps_adjust(item_caps_total(i_duppo_table)); -comment out by NovaRain
+   //item_caps_adjust(i_duppo_table, -self_caps); -comment out by NovaRain
 end
 
 /* This procedure gets called only on the death of this NPC. Special things like
diff --git a/scripts_src/ncr/sidtbl.ssl b/scripts_src/ncr/sidtbl.ssl
@@ -40,12 +40,19 @@
 #define LVAR_Restock_Time               (7)
 #define LVAR_Restock_Time_Fix           (8) //added by killap
 
+#define DUPPO_TBL_1 17327
+#define DUPPO_TBL_2 17724
+
 import variable i_duppo_table;
+import variable i_duppo_tbl_1;
+import variable i_duppo_tbl_2;
 import variable i_duppo_talk;
 import variable i_duppo_obj;
 
 procedure start begin
    i_duppo_table := self_obj;
+   if (self_tile == DUPPO_TBL_1) then i_duppo_tbl_1 := self_obj;
+   if (self_tile == DUPPO_TBL_2) then i_duppo_tbl_2 := self_obj;
 end
 
 /********************************************************************
@@ -148,9 +155,6 @@ procedure map_enter_p_proc begin
       restock_fix
       if (local_var(LVAR_Restock_Time) < game_time) then begin
 
-#define DUPPO_TBL_1 17327
-#define DUPPO_TBL_2 17724
-
 //Tools & ammo
          if (self_tile == DUPPO_TBL_1) then begin
             tmp_box := move_quest_items();
diff --git a/scripts_src/sanfran/fcgunmer.ssl b/scripts_src/sanfran/fcgunmer.ssl
@@ -94,6 +94,8 @@ procedure Node014;
    Needs to be saved, make it a map variable (MVAR_) */
 
 import variable i_table_swap;
+import variable i_gun_table_1;
+import variable i_gun_table_2;
 import variable i_gun_merchant;
 
 
@@ -126,16 +128,15 @@ procedure map_enter_p_proc begin
    if (not is_loading_game) then begin
       if (game_time > local_var(LVAR_Restock_Money)) then begin
          if (self_caps < 5000) then
-            item_caps_adjust(i_table_swap, Random(2000, 5000)); //edit by killap (expansion) - was self_obj
+            item_caps_adjust(i_table_swap, Random(2000, 5000)); //edit by killap - was self_obj
          set_local_var(LVAR_Restock_Money, game_time + (ONE_GAME_WEEK * Random(1, 3)));
       end
    end
 
-   i_gun_merchant := self_obj; //added by killap (expansion)
-
+   i_gun_merchant := self_obj; //added by killap
 end
 
-//added by killap (expansion)
+//added by killap
 procedure map_update_p_proc begin
    if (i_gun_merchant <= 0) then
       i_gun_merchant := self_obj;
@@ -184,6 +185,8 @@ end
    written by designers are placed in here. Additionally, Reactions are generated and
    stored which affects player interactions. */
 procedure talk_p_proc begin
+   variable obj, caps;
+
    Evil_Critter:=0;
    Slavery_Tolerant:=SLAVE_TOLERANT;
    Karma_Perception:=KARMA_PERCEPTION1;
@@ -192,14 +195,23 @@ procedure talk_p_proc begin
 
    GetReaction;
 
-   //set_local_var(LVAR_Money, self_caps); -comment out by killap (expansion)
-   //self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap (expansion)
+   //set_local_var(LVAR_Money, self_caps); -comment out by killap
+   //self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap
 
    move_obj_inven_to_obj(self_obj, swap_obj);
    move_obj_inven_to_obj(i_table_swap, self_obj);
 
-   //self_caps_adjust(local_var(LVAR_Money)); -comment out by killap (expansion)
-   //set_local_var(LVAR_Money, 0); -comment out by killap (expansion)
+   if (i_table_swap == i_gun_table_1) then begin
+      obj := i_gun_table_2;
+   end else begin
+      obj := i_gun_table_1;
+   end
+   caps := item_caps_total(obj);
+   self_caps_adjust(caps);
+   item_caps_adjust(obj, -caps);
+
+   //self_caps_adjust(local_var(LVAR_Money)); -comment out by killap
+   //set_local_var(LVAR_Money, 0); -comment out by killap
 
    if (san_fran_flag(SF_SHI_ENEMY)) then begin
       start_gdialog(NAME,self_obj,4,-1,-1);
@@ -229,8 +241,8 @@ procedure talk_p_proc begin
       end_dialogue;
    end
 
-   //set_local_var(LVAR_Money, self_caps); -comment out by killap (expansion)
-   //self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap (expansion)
+   //set_local_var(LVAR_Money, self_caps); -comment out by killap
+   //self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap
 
    move_obj_inven_to_obj(self_obj, i_table_swap);
    move_obj_inven_to_obj(swap_obj, self_obj);
@@ -241,8 +253,8 @@ procedure talk_p_proc begin
       gSay_End;
       end_dialogue;
    end*/
-   //item_caps_adjust(self_obj, local_var(LVAR_Money)); -comment out by killap (expansion)
-   //set_local_var(LVAR_Money, 0); -comment out by killap (expansion)
+   //self_caps_adjust(local_var(LVAR_Money)); -comment out by killap
+   //set_local_var(LVAR_Money, 0); -comment out by killap
 end
 
 /* This procedure gets called only on the death of this NPC. Special things like
diff --git a/scripts_src/sanfran/fclaocho.ssl b/scripts_src/sanfran/fclaocho.ssl
@@ -144,6 +144,8 @@ procedure Node052;
    Needs to be saved, make it a map variable (MVAR_) */
 
 import variable i_lao_table_swap;
+import variable i_lao_table_1;
+import variable i_lao_table_2;
 import variable i_lao_merchant;
 
 /* Local variables which do not need to be saved between map changes. */
@@ -239,6 +241,8 @@ end
    written by designers are placed in here. Additionally, Reactions are generated and
    stored which affects player interactions. */
 procedure talk_p_proc begin
+   variable obj, caps;
+
    Evil_Critter:=0;
    Slavery_Tolerant:=SLAVE_INTOLERANT;
    Karma_Perception:=KARMA_PERCEPTION0;
@@ -248,12 +252,21 @@ procedure talk_p_proc begin
    GetReaction;
 
    //set_local_var(LVAR_Money, self_caps); -comment out by killap
-   //item_caps_adjust(self_obj, -local_var(LVAR_Money)); -comment out by killap
+   //self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap
 
    move_obj_inven_to_obj(self_obj, swap_obj);
    move_obj_inven_to_obj(i_lao_table_swap, self_obj);
 
-   //item_caps_adjust(self_obj, local_var(LVAR_Money)); -comment out by killap
+   if (i_lao_table_swap == i_lao_table_1) then begin
+      obj := i_lao_table_2;
+   end else begin
+      obj := i_lao_table_1;
+   end
+   caps := item_caps_total(obj);
+   self_caps_adjust(caps);
+   item_caps_adjust(obj, -caps);
+
+   //self_caps_adjust(local_var(LVAR_Money)); -comment out by killap
    //set_local_var(LVAR_Money, 0); -comment out by killap
 
    if (san_fran_flag(SF_SHI_ENEMY)) then begin
@@ -273,12 +286,12 @@ procedure talk_p_proc begin
    end
 
    //set_local_var(LVAR_Money, self_caps); -comment out by killap
-   //item_caps_adjust(self_obj, -local_var(LVAR_Money)); -comment out by killap
+   //self_caps_adjust(-local_var(LVAR_Money)); -comment out by killap
 
    move_obj_inven_to_obj(self_obj, i_lao_table_swap);
    move_obj_inven_to_obj(swap_obj, self_obj);
 
-   //item_caps_adjust(self_obj, local_var(LVAR_Money)); -comment out by killap
+   //self_caps_adjust(local_var(LVAR_Money)); -comment out by killap
    //set_local_var(LVAR_Money, 0); -comment out by killap
 end
 
diff --git a/scripts_src/sanfran/figuntbl.ssl b/scripts_src/sanfran/figuntbl.ssl
@@ -53,6 +53,8 @@ procedure validHandle(variable handle);
    Needs to be saved, make it a map variable (MVAR_)
 *******************************************************************/
 import variable i_table_swap;
+import variable i_gun_table_1;
+import variable i_gun_table_2;
 import variable i_gun_merchant;
 
 /*******************************************************************
@@ -74,6 +76,8 @@ import variable i_gun_merchant;
 
 procedure start begin
    i_table_swap := self_obj;
+   if (self_tile == TABLE_1) then i_gun_table_1 := self_obj;
+   if (self_tile == TABLE_2) then i_gun_table_2 := self_obj;
 end
 
 procedure timed_event_p_proc begin
diff --git a/scripts_src/sanfran/filaotbl.ssl b/scripts_src/sanfran/filaotbl.ssl
@@ -53,6 +53,8 @@ procedure validHandle(variable handle);
    Needs to be saved, make it a map variable (MVAR_)
 *******************************************************************/
 import variable i_lao_table_swap;
+import variable i_lao_table_1;
+import variable i_lao_table_2;
 import variable i_lao_merchant;
 
 /*******************************************************************
@@ -74,6 +76,8 @@ import variable i_lao_merchant;
 
 procedure start begin
    i_lao_table_swap := self_obj;
+   if (self_tile == TABLE_1) then i_lao_table_1 := self_obj;
+   if (self_tile == TABLE_2) then i_lao_table_2 := self_obj;
 end
 
 procedure timed_event_p_proc begin
