feat(content,port): More NPCs (#3917)

* Update fluff.json * Update misc.json * Update misc.json * Update overmap_terrain_evac_center.json * Update specials.json * Update campsite.json * Update ws_survivor_camp.json * Update moonshine_camp.json * Update homeless_camp.json * Update homeless_camp.json * Update apartment_con_new.json * Add files via upload * Update epilogue_factions.json * Update NPC_free_merchant_shopkeep.json * Add files via upload * style(autofix.ci): automated formatting * Update TALK_NPC_moonshiner.json * Update scrap_trader.json * Update scrap_trader_missions.json * Update apartment_con_new.json * Update scrap_trader.json * Update apartment_con_new.json * Delete data/json/npcs/Mr_Lapin/cabin.json * Delete data/json/npcs/Mr_Lapin/Mr_Lapin.json * refactor: move overmap terrains into relevant files * fix: remove unimplemented `TALK_LUMBERMILL_FABRICATE` * fix: change item requirement from `magnetron` to `microwave` - mission id was mismatching (5 vs 25) - due to magnetron being obsolete, it's impossible to complete this mission * fix: rename to solder the name for `solder_wire` is `solder`, but the description uses item id, which may be confusing. * fix: use SI unit * Update specials.json * Update fluff.json split the writs of trade into separate items * style(autofix.ci): automated formatting * Update chemist_missions.json * Update lumbermill_missions.json * Update NPC_free_merchant_shopkeep.json * Update lumbermill_missions.json * Update occupied_lumber_mill.json added missing nested_mapgen_id's * style(autofix.ci): automated formatting * Update occupied_lumber_mill.json * Update fluff.json * style(autofix.ci): automated formatting * Update scrap_trader_missions.json * Update NPC_free_merchant_shopkeep.json * style(autofix.ci): automated formatting * Update data/json/overmap/overmap_special/specials.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update data/json/overmap/overmap_special/specials.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update data/json/overmap/overmap_terrain/overmap_terrain.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update data/json/overmap/overmap_special/specials.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update epilogue_factions.json * Update apartment_con_new.json * Update factions.json added Mr. Lapin's faction * Update Mr_Lapin.json added Mr. Lapin's faction * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: scarf <greenscarf005@gmail.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
cataclysmbnteam · Jan 11, 2024 · 35d7c1c · 35d7c1c
1 parent 16e54d5
commit 35d7c1c
Show file tree

Hide file tree

Showing 41 changed files with 4,167 additions and 1 deletion.
diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
@@ -211,5 +211,22 @@
       { "item": "holybook_bible1", "prob": 3 },
       { "item": "candlestick", "prob": 2 }
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "cabin_chemist_sell",
+    "items": [ { "group": "chem_lab", "prob": 100 }, { "group": "harddrugs", "prob": 70 }, { "group": "tools_medical", "prob": 80 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "still_alcohol",
+    "//": "Alcohol you'd find in at a still or moonshine camp",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "moonshine", "prob": 86 },
+      { "item": "beer", "prob": 80 },
+      { "item": "fruit_wine", "prob": 40 },
+      { "item": "brandy", "prob": 20 }
+    ]
   }
 ]
diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json
@@ -1,4 +1,55 @@
 [
+  {
+    "id": "trade_writ_chemist",
+    "type": "BOOK",
+    "name": { "str": "writ of trade (chemist)", "str_pl": "writs of trade (chemist)" },
+    "description": "A few sheets of paper from the chemist living out in the wilderness listing some of the chemical they're capable of making.",
+    "weight": "1 g",
+    "volume": "5 ml",
+    "price": 3000,
+    "price_postapoc": 50,
+    "bashing": 1,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "looks_like": "mag_glam",
+    "color": "light_cyan",
+    "intelligence": 5,
+    "time": "10 m"
+  },
+  {
+    "id": "trade_writ_scrap",
+    "type": "BOOK",
+    "name": { "str": "writ of trade (scrap)", "str_pl": "writs of trade (scrap)" },
+    "description": "A handwritten listing of the inventory at the scrapyard.",
+    "weight": "1 g",
+    "volume": "5 ml",
+    "price": 3000,
+    "price_postapoc": 50,
+    "bashing": 1,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "looks_like": "mag_glam",
+    "color": "light_cyan",
+    "intelligence": 5,
+    "time": "10 m"
+  },
+  {
+    "id": "trade_writ_lumberyard",
+    "type": "BOOK",
+    "name": { "str": "writ of trade (lumberyard)", "str_pl": "writs of trade (lumberyard)" },
+    "description": "A printout of the local lumberyard's latest inventory.",
+    "weight": "1 g",
+    "volume": "5 ml",
+    "price": 3000,
+    "price_postapoc": 50,
+    "bashing": 1,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "looks_like": "mag_glam",
+    "color": "light_cyan",
+    "intelligence": 5,
+    "time": "10 m"
+  },
   {
     "id": "magic_8_ball",
     "type": "GENERIC",

diff --git a/data/json/mapgen/apartment_con_new.json b/data/json/mapgen/apartment_con_new.json
@@ -345,6 +345,72 @@
     "type": "mapgen",
     "weight": 250
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [
+      [ "apartments_con_tower_113", "apartments_con_tower_013" ],
+      [ "apartments_con_tower_102", "apartments_con_tower_002" ]
+    ],
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        "************************************************",
+        "***|------|-|-|ww---|******|---ww|-|-|------|***",
+        "***|.dBBd.+r|u+..e3u|******|u3e..+u|r+.dBBd.|***",
+        "***w..BB..|-|-|..ii2|******|2ii..|-|-|..BB..w***",
+        "***w.h....|STb|..iiO|******|Oii..|bTS|......w***",
+        "***|CxC...+iib|j.uu1|******|uu1.j|bii+....X.|***",
+        "***|--|-+-|-+-|..lll|-WWWW-|lll..|-+-|-+-|--|***",
+        "***R,,+......nt.....|^.....|........nt...+,,R***",
+        "***R,,w..F..........D......D.............w,,R***",
+        "***R,,w..F.......|+-|p....p|-+|..........w,,R***",
+        "***R,Q|..F.I.FFF^|.Y|......|Y.|oo.FFFFI.^|Q,R***",
+        "***|------|-|-|--|--|......|--|--|-|-|------|***",
+        "***|.dBBd.+r|u+..e3u|......|u3e..+u|r+.dBBd.|***",
+        "***w..BB..|-|-|..ii2|......|2ii..|-|-|..BB..w***",
+        "***w......|STb|..iiO|......|Oii..|bTS|......w***",
+        "***|oX....+iib|j.uu1|......|uu1.j|bii+....X.|***",
+        "***|--|-+-|-+-|..lll|.....^|lll..|-+-|-+-|--|***",
+        "***R,,+...tn........|p....p|.........nt..+,,R***",
+        "***R,,w.............D......D......A......w,,R***",
+        "***R,,w..A.....FI|+-|......|-+|..........w,,R***",
+        "***R,Q|.....FFFF^|.Y|......|Y.|^...IFFF.o|Q,R***",
+        "***|------------||--|......|--||------------|***",
+        "***|%%%%%%%%%%%%|<,,G......=EE`|%%%%%%%%%%%%|***",
+        "***|%%%%%%%%%%%%|>,,G......=EEE|%%%%%%%%%%%%|***",
+        "***|------|-|-|-|---|......|---|-|-|-|------|***",
+        "***|.dBBd.+r|u+..e3u|......|u3e..+u|r+.dBBd.|***",
+        "***w..BB..|-|-|..ii2|......|2ii..|-|-|..BB..w***",
+        "***w......|STb|..iiO|......|Oii..|bTS|......w***",
+        "***|oo....+iib|..uu1|^.....|uu1.j|bii+....X.|***",
+        "***|--|-+-|-+-|..lll|......|lll..|-+-|-+-|--|***",
+        "***R,,+...tn........|......|........nt...+,,R***",
+        "***R,,w.............D......D.............w,,R***",
+        "***R,,w..A....A..|+-|p....p|-+|I..htth...w,,R***",
+        "***R,Q|...FFFI..^|.Y|......|Y.|^..htth.oo|Q,R***",
+        "***|------|-|-|--|--|......|--|--|-|-|------|***",
+        "***|.dBBd.+r|u+..e3u|......|u3e..+u|r+.dBBd.|***",
+        "***w..BB..|-|-|..ii2|.....^|2ii..|-|-|..BB..w***",
+        "***w......|STb|..iiO|......|Oii..|bTS|......w***",
+        "***|.X....+iib|j.uu1|......|uu1.j|bii+....X.|***",
+        "***|--|-+-|-+-|^.lll|......|lll..|-+-|-+-|--|***",
+        "***R,,+...A..nt.....|p....p|........tn...+,,R***",
+        "***R,,w.............D......D...........A.w,,R***",
+        "***R,,w.........o|+-|-WWWW-|-+|..A...h...w,,R***",
+        "***R,Q|..A.FFFI.o|.Y|******|Y.|o...ICxC.^|Q,R***",
+        "***|RR|--ww---ww-|--|******|--|-ww---ww--|RR|***",
+        "************************************************",
+        "************************************************",
+        "************************************************"
+      ],
+      "palettes": [ "apartment_palette" ],
+      "faction_owner": [ { "id": "no_faction", "x": [ 0, 23 ], "y": [ 30, 39 ] } ],
+      "place_zones": [ { "type": "NPC_NO_INVESTIGATE", "faction": "wasteland_scavengers", "x": [ 0, 13 ], "y": [ 30, 39 ] } ],
+      "place_npcs": [ { "class": "apartment_survivor", "x": 8, "y": 37 } ]
+    }
+  },
   {
     "method": "json",
     "object": {