Merge pull request #61877 from MNG-cataclysm/merchant_pockets

Expand merchant storage space
CleverRaven · Oct 26, 2022 · ad6cafc · ad6cafc
2 parents c21b171 + dadaea2
commit ad6cafc
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 74 deletions.
diff --git a/data/json/mapgen/chemist_holdout/chemical_lab.json b/data/json/mapgen/chemist_holdout/chemical_lab.json
@@ -14,7 +14,7 @@
         "......-~~~~~~~~~~~~~-...",
         "......-~~~~~00~~~~~~-...",
         "......-~~##W##W##W#~-...",
-        "......-~~#A     @ #~-...",
+        "......-~~#A     c #~-...",
         "......G~~=     CCC#~-...",
         "......-~~# RR     W~-...",
         "......-~~#####   c#~-...",
@@ -34,7 +34,11 @@
       "palettes": [ "cabin_palette" ],
       "faction_owner": [ { "id": "wasteland_scavengers", "x": [ 1, 23 ], "y": [ 1, 23 ] } ],
       "items": { "C": [ { "item": "cabin_chemist_sell", "chance": 100, "repeat": [ 4, 5 ] } ] },
-      "npcs": { "@": { "class": "NPC_cabin_chemist" } }
+      "place_npcs": [ { "class": "NPC_cabin_chemist", "x": 16, "y": 8 } ],
+      "place_zones": [
+        { "type": "LOOT_UNSORTED", "faction": "wasteland_scavengers", "x": [ 15, 15 ], "y": [ 8, 8 ] },
+        { "type": "LOOT_CURRENCY", "faction": "wasteland_scavengers", "x": [ 17, 17 ], "y": [ 8, 8 ] }
+      ]
     }
   },
   {

diff --git a/data/json/mapgen/homeless_camp.json b/data/json/mapgen/homeless_camp.json
@@ -212,6 +212,10 @@
       ],
       "npcs": { "@": { "class": "NPC_homeless_broker" }, "`": { "class": "NPC_homeless_group_survivor" } },
       "faction_owner": [ { "id": "wasteland_scavengers", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
+      "place_zones": [
+        { "type": "LOOT_UNSORTED", "faction": "wasteland_scavengers", "x": [ 11, 11 ], "y": [ 9, 9 ] },
+        { "type": "LOOT_CURRENCY", "faction": "wasteland_scavengers", "x": [ 11, 11 ], "y": [ 10, 10 ] }
+      ],
       "terrain": {
         " ": "t_region_groundcover",
         "_": "t_region_soil",

diff --git a/data/json/mapgen/nested/city_npc_nested_spawns.json b/data/json/mapgen/nested/city_npc_nested_spawns.json
@@ -59,6 +59,10 @@
       "terrain": { "-": "t_wall", ".": "t_floor" },
       "furniture": { "t": "f_table", "b": "f_brazier", "m": "f_makeshift_bed", "7": "f_safe_o", "L": "f_locker" },
       "place_npcs": [ { "class": "survivor_cop", "x": 5, "y": 8 } ],
+      "place_zones": [
+        { "type": "LOOT_UNSORTED", "faction": "no_faction", "x": [ 5, 5 ], "y": [ 9, 9 ] },
+        { "type": "LOOT_CURRENCY", "faction": "no_faction", "x": [ 5, 5 ], "y": [ 7, 7 ] }
+      ],
       "items": {
         "L": [ { "item": "cannedfood", "chance": 50, "repeat": [ 1, 2 ] }, { "item": "alcohol", "chance": 50, "repeat": [ 1, 2 ] } ],
         "7": [

diff --git a/data/json/mapgen/occupied_lumber_mill/occupied_lumber_mill.json b/data/json/mapgen/occupied_lumber_mill/occupied_lumber_mill.json
@@ -115,6 +115,11 @@
         { "id": "wasteland_scavengers", "x": [ 24, 47 ], "y": [ 24, 47 ] },
         { "id": "wasteland_scavengers", "x": [ 48, 71 ], "y": [ 48, 71 ] }
       ],
+      "place_zones": [
+        { "type": "LOOT_UNSORTED", "faction": "wasteland_scavengers", "x": [ 25, 25 ], "y": [ 43, 43 ] },
+        { "type": "LOOT_CURRENCY", "faction": "wasteland_scavengers", "x": [ 26, 26 ], "y": [ 43, 43 ] },
+        { "type": "LOOT_WOOD", "faction": "wasteland_scavengers", "x": [ 26, 26 ], "y": [ 44, 44 ] }
+      ],
       "terrain": { "o": "t_concrete" },
       "gaspumps": { "G": { "fuel": "gasoline", "amount": [ 50000, 268750 ] } },
       "place_vehicles": [

diff --git a/data/json/mapgen/valhalla_cult/mapgen.json b/data/json/mapgen/valhalla_cult/mapgen.json
@@ -193,6 +193,10 @@
       "npcs": { "!": { "class": "pagan_cult_shopkeep" }, "2": { "class": "pagan_cult_member" } },
       "terrain": { " ": "t_region_groundcover", ".": "t_rock_floor", "]": "t_bars" },
       "furniture": { "1": "f_firefly_terrarium", "3": "f_rack_wood", "L": "f_rack_wood", "r": "f_rack_wood" },
+      "place_zones": [
+        { "type": "LOOT_UNSORTED", "faction": "valhallists", "x": [ 18, 18 ], "y": [ 13, 13 ] },
+        { "type": "LOOT_CURRENCY", "faction": "valhallists", "x": [ 20, 20 ], "y": [ 13, 13 ] }
+      ],
       "items": {
         "L": [
           { "item": "condiments", "chance": 80, "repeat": [ 2, 4 ] },

diff --git a/data/json/npcs/cabin_chemist/chemist_npc.json b/data/json/npcs/cabin_chemist/chemist_npc.json
@@ -5,7 +5,7 @@
     "class": "NC_CHEM_MERCHANT",
     "name_suffix": "chemist",
     "attitude": 0,
-    "mission": 7,
+    "mission": 3,
     "chat": "TALK_NPC_CABIN_CHEMIST",
     "faction": "wasteland_scavengers",
     "mission_offered": "MISSION_CABIN_CHEMIST_GET_analytical_set_basic"
@@ -100,70 +100,70 @@
         "text": "[50$]  I'll buy some sprayable fungicide.",
         "effect": [
           { "u_buy_item": "gas_fungicidal", "container": "jug_plastic", "cost": 5000, "count": 1500 },
-          { "u_add_effect": "chemist_waiting_for_gas_fungicidal", "duration": "8 h" },
+          { "npc_add_effect": "chemist_waiting_for_gas_fungicidal", "duration": "8 h" },
           { "npc_add_effect": "currently_busy", "duration": "8 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_gas_fungicidal" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_gas_fungicidal" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[50$]  I'll buy some powder fungicide.",
         "effect": [
           { "u_buy_item": "fungicide", "container": "bottle_twoliter", "cost": 5000, "count": 1500 },
-          { "u_add_effect": "chemist_waiting_for_fungicide", "duration": "8 h" },
+          { "npc_add_effect": "chemist_waiting_for_fungicide", "duration": "8 h" },
           { "npc_add_effect": "currently_busy", "duration": "8 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_fungicide" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_fungicide" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[50$]  I'll buy some disinfectant.",
         "effect": [
           { "u_buy_item": "disinfectant", "container": "bottle_plastic", "cost": 5000, "count": 20 },
-          { "u_add_effect": "chemist_waiting_for_disinfectant", "duration": "12 h" },
+          { "npc_add_effect": "chemist_waiting_for_disinfectant", "duration": "12 h" },
           { "npc_add_effect": "currently_busy", "duration": "12 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_disinfectant" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_disinfectant" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[120$]  I'll buy some antibiotics.",
         "effect": [
           { "u_buy_item": "antibiotics", "container": "bottle_plastic_pill_prescription", "cost": 12000, "count": 20 },
-          { "u_add_effect": "chemist_waiting_for_antibiotics", "duration": "96 h" },
+          { "npc_add_effect": "chemist_waiting_for_antibiotics", "duration": "96 h" },
           { "npc_add_effect": "currently_busy", "duration": "96 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_antibiotics" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_antibiotics" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[140$]  I'll buy some antifungal drugs.",
         "effect": [
           { "u_buy_item": "antifungal", "container": "bottle_plastic_pill_prescription", "cost": 14000, "count": 20 },
-          { "u_add_effect": "chemist_waiting_for_antifungal", "duration": "96 h" },
+          { "npc_add_effect": "chemist_waiting_for_antifungal", "duration": "96 h" },
           { "npc_add_effect": "currently_busy", "duration": "96 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_antifungal" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_antifungal" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[200$]  I'll buy some black gunpowder.",
         "effect": [
           { "u_buy_item": "chem_black_powder", "container": "jar_3l_glass_sealed", "cost": 20000, "count": 10000 },
-          { "u_add_effect": "chemist_waiting_for_chem_black_powder", "duration": "72 h" },
+          { "npc_add_effect": "chemist_waiting_for_chem_black_powder", "duration": "72 h" },
           { "npc_add_effect": "currently_busy", "duration": "72 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_chem_black_powder" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_chem_black_powder" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[300$]  I'll buy some napalm.",
         "effect": [
           { "u_buy_item": "napalm", "container": "jerrycan", "cost": 30000, "count": 10000 },
-          { "u_add_effect": "chemist_waiting_for_napalm", "duration": "72 h" },
+          { "npc_add_effect": "chemist_waiting_for_napalm", "duration": "72 h" },
           { "npc_add_effect": "currently_busy", "duration": "72 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_napalm" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_napalm" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       }
     ]
@@ -188,70 +188,70 @@
         "text": "[50$]  I'll buy some sprayable fungicide.",
         "effect": [
           { "u_buy_item": "gas_fungicidal", "container": "jug_plastic", "cost": 5000, "count": 1500 },
-          { "u_add_effect": "chemist_waiting_for_gas_fungicidal", "duration": "8 h" },
+          { "npc_add_effect": "chemist_waiting_for_gas_fungicidal", "duration": "8 h" },
           { "npc_add_effect": "currently_busy", "duration": "8 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_gas_fungicidal" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_gas_fungicidal" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[50$]  I'll buy some powder fungicide.",
         "effect": [
           { "u_buy_item": "fungicide", "container": "bottle_twoliter", "cost": 5000, "count": 1500 },
-          { "u_add_effect": "chemist_waiting_for_fungicide", "duration": "8 h" },
+          { "npc_add_effect": "chemist_waiting_for_fungicide", "duration": "8 h" },
           { "npc_add_effect": "currently_busy", "duration": "8 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_fungicide" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_fungicide" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[50$]  I'll buy some disinfectant.",
         "effect": [
           { "u_buy_item": "disinfectant", "container": "bottle_plastic", "cost": 5000, "count": 20 },
-          { "u_add_effect": "chemist_waiting_for_disinfectant", "duration": "12 h" },
+          { "npc_add_effect": "chemist_waiting_for_disinfectant", "duration": "12 h" },
           { "npc_add_effect": "currently_busy", "duration": "12 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_disinfectant" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_disinfectant" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[120$]  I'll buy some antibiotics.",
         "effect": [
           { "u_buy_item": "antibiotics", "container": "bottle_plastic_pill_prescription", "cost": 12000, "count": 20 },
-          { "u_add_effect": "chemist_waiting_for_antibiotics", "duration": "96 h" },
+          { "npc_add_effect": "chemist_waiting_for_antibiotics", "duration": "96 h" },
           { "npc_add_effect": "currently_busy", "duration": "96 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_antibiotics" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_antibiotics" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[140$]  I'll buy some antifungal drugs.",
         "effect": [
           { "u_buy_item": "antifungal", "container": "bottle_plastic_pill_prescription", "cost": 14000, "count": 20 },
-          { "u_add_effect": "chemist_waiting_for_antifungal", "duration": "96 h" },
+          { "npc_add_effect": "chemist_waiting_for_antifungal", "duration": "96 h" },
           { "npc_add_effect": "currently_busy", "duration": "96 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_antifungal" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_antifungal" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[200$]  I'll buy some black gunpowder.",
         "effect": [
           { "u_buy_item": "chem_black_powder", "container": "jar_3l_glass_sealed", "cost": 20000, "count": 10000 },
-          { "u_add_effect": "chemist_waiting_for_chem_black_powder", "duration": "72 h" },
+          { "npc_add_effect": "chemist_waiting_for_chem_black_powder", "duration": "72 h" },
           { "npc_add_effect": "currently_busy", "duration": "72 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_chem_black_powder" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_chem_black_powder" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       },
       {
         "text": "[300$]  I'll buy some napalm.",
         "effect": [
           { "u_buy_item": "napalm", "container": "jerrycan", "cost": 30000, "count": 10000 },
-          { "u_add_effect": "chemist_waiting_for_napalm", "duration": "72 h" },
+          { "npc_add_effect": "chemist_waiting_for_napalm", "duration": "72 h" },
           { "npc_add_effect": "currently_busy", "duration": "72 h" }
         ],
-        "condition": { "not": { "u_has_effect": "chemist_waiting_for_napalm" } },
+        "condition": { "not": { "npc_has_effect": "chemist_waiting_for_napalm" } },
         "topic": "TALK_CABIN_CHEMIST_BULK_SELL_END"
       }
     ]

diff --git a/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json b/data/json/npcs/lumbermill_employees/TALK_lumbermill_fabricate.json
@@ -29,41 +29,41 @@
         "text": "[100$]  I'll buy some logs.",
         "effect": [
           { "u_buy_item": "log", "cost": 10000, "count": 10 },
-          { "u_add_effect": "lumbermill_waiting_for_log", "duration": "2 h" },
+          { "npc_add_effect": "lumbermill_waiting_for_log", "duration": "2 h" },
           { "npc_add_effect": "currently_busy", "duration": "2 h" }
         ],
         "topic": "TALK_LUMBERMILL_FABRICATE_END",
-        "condition": { "not": { "u_has_effect": "lumbermill_waiting_for_log" } }
+        "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_log" } }
       },
       {
         "text": "[120$]  I'll buy some wooden panels.",
         "effect": [
           { "u_buy_item": "wood_panel", "cost": 12000, "count": 10 },
-          { "u_add_effect": "lumbermill_waiting_for_wood_panel", "duration": "3 h" },
+          { "npc_add_effect": "lumbermill_waiting_for_wood_panel", "duration": "3 h" },
           { "npc_add_effect": "currently_busy", "duration": "3 h" }
         ],
         "topic": "TALK_LUMBERMILL_FABRICATE_END",
-        "condition": { "not": { "u_has_effect": "lumbermill_waiting_for_wood_panel" } }
+        "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_panel" } }
       },
       {
         "text": "[240$]  I'll buy some large wooden sheets.",
         "effect": [
           { "u_buy_item": "wood_sheet", "cost": 24000, "count": 10 },
-          { "u_add_effect": "lumbermill_waiting_for_wood_sheet", "duration": "3 h" },
+          { "npc_add_effect": "lumbermill_waiting_for_wood_sheet", "duration": "3 h" },
           { "npc_add_effect": "currently_busy", "duration": "3 h" }
         ],
         "topic": "TALK_LUMBERMILL_FABRICATE_END",
-        "condition": { "not": { "u_has_effect": "lumbermill_waiting_for_wood_sheet" } }
+        "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_sheet" } }
       },
       {
         "text": "[350$]  I'll buy some wooden beams.",
         "effect": [
           { "u_buy_item": "wood_beam", "cost": 35000, "count": 10 },
-          { "u_add_effect": "lumbermill_waiting_for_wood_beam", "duration": "4 h" },
+          { "npc_add_effect": "lumbermill_waiting_for_wood_beam", "duration": "4 h" },
           { "npc_add_effect": "currently_busy", "duration": "4 h" }
         ],
         "topic": "TALK_LUMBERMILL_FABRICATE_END",
-        "condition": { "not": { "u_has_effect": "lumbermill_waiting_for_wood_beam" } }
+        "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_beam" } }
       }
     ]
   },
@@ -93,41 +93,41 @@
         "text": "[100$]  I'll buy some logs.",
         "effect": [
           { "u_buy_item": "log", "cost": 10000, "count": 10 },
-          { "u_add_effect": "lumbermill_waiting_for_log", "duration": "2 h" },
+          { "npc_add_effect": "lumbermill_waiting_for_log", "duration": "2 h" },
           { "npc_add_effect": "currently_busy", "duration": "2 h" }
         ],
         "topic": "TALK_LUMBERMILL_FABRICATE_END",
-        "condition": { "not": { "u_has_effect": "lumbermill_waiting_for_log" } }
+        "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_log" } }
       },
       {
         "text": "[120$]  I'll buy some wooden panels.",
         "effect": [
           { "u_buy_item": "wood_panel", "cost": 12000, "count": 10 },
-          { "u_add_effect": "lumbermill_waiting_for_wood_panel", "duration": "3 h" },
+          { "npc_add_effect": "lumbermill_waiting_for_wood_panel", "duration": "3 h" },
           { "npc_add_effect": "currently_busy", "duration": "3 h" }
         ],
         "topic": "TALK_LUMBERMILL_FABRICATE_END",
-        "condition": { "not": { "u_has_effect": "lumbermill_waiting_for_wood_panel" } }
+        "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_panel" } }
       },
       {
         "text": "[240$]  I'll buy some large wooden sheets.",
         "effect": [
           { "u_buy_item": "wood_sheet", "cost": 24000, "count": 10 },
-          { "u_add_effect": "lumbermill_waiting_for_wood_sheet", "duration": "3 h" },
+          { "npc_add_effect": "lumbermill_waiting_for_wood_sheet", "duration": "3 h" },
           { "npc_add_effect": "currently_busy", "duration": "3 h" }
         ],
         "topic": "TALK_LUMBERMILL_FABRICATE_END",
-        "condition": { "not": { "u_has_effect": "lumbermill_waiting_for_wood_sheet" } }
+        "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_sheet" } }
       },
       {
         "text": "[350$]  I'll buy some wooden beams.",
         "effect": [
           { "u_buy_item": "wood_beam", "cost": 35000, "count": 10 },
-          { "u_add_effect": "lumbermill_waiting_for_wood_beam", "duration": "4 h" },
+          { "npc_add_effect": "lumbermill_waiting_for_wood_beam", "duration": "4 h" },
           { "npc_add_effect": "currently_busy", "duration": "4 h" }
         ],
         "topic": "TALK_LUMBERMILL_FABRICATE_END",
-        "condition": { "not": { "u_has_effect": "lumbermill_waiting_for_wood_beam" } }
+        "condition": { "not": { "npc_has_effect": "lumbermill_waiting_for_wood_beam" } }
       }
     ]
   }