feat(content,port): More NPCs

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 }
+    ]
   }
 ]

data/json/items/fluff.json

@@ -1,4 +1,21 @@
 [
+  {
+    "id": "trade_writ",
+    "type": "BOOK",
+    "name": { "str": "writ of trade", "str_pl": "writs of trade" },
+    "description": "A short writ featuring the signed agreement of establishing a trade route.",
+    "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",

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|||||||||||||***",
+        "***|á.....+r-u+í....|******|Í....+u-r+..ä...|***",
+        "***w......-----.....|******|.....-----......w***",
+        "***w......-STb-.....|******|.....-bTS-......w***",
+        "***|......+iib-.....||WWWW||.....-bii+......|***",
+        "***||||-+---+--.....|^....^|.....--+---+-||||***",
+        "***R,,+.............D......D.............+,,R***",
+        "***R,,wÓ...-é....-..|p.~~.p|..-é....-.ó..w,,R***",
+        "***R,,w....-.....-+-|..~~..|-+-.....-....w,,R***",
+        "***R,Q|....-.....-YU|..~~..|UY-.....-....|Q,R***",
+        "***||||||||||||||||||..~~..||||||||||||||||||***",
+        "***|á.....+r-u+í....|..~~..|Í....+u-r+..ä...|***",
+        "***w......-----.....|..~~..|.....-----......w***",
+        "***w......-STb-.....|..~~..|.....-bTS-......w***",
+        "***|......+iib-.....|..~~..|.....-bii+......|***",
+        "***||||-+---+--.....|p.~~.p|.....--+---+-||||***",
+        "***R,,+.............D..~~..D.............+,,R***",
+        "***R,,wÓ...-é....-..|..~~..|..-é....-.ó..w,,R***",
+        "***R,,w....-.....-+-|^.~~.^|-+-.....-....w,,R***",
+        "***R,Q|....-.....-YU|..~~..|UY-.....-....|Q,R***",
+        "***||||||||||||||||||..~~..||||||||||||||||||***",
+        "****|%%%%%%%%%%%|>,,G..~~..=EEx|%%%%%%%%%%%|****",
+        "****|%%%%%%%%%%%|<,,G..~~..=EEE|%%%%%%%%%%%|****",
+        "***||||||||||||||||||..~~..||||||||||||||||||***",
+        "***|á.....+r-u+í....|..~~..|Í....+u-r+..ä...|***",
+        "***w......-----.....|..~~..|.....-----......w***",
+        "***w......-STb-.....|..~~..|.....-bTS-......w***",
+        "***|......+iib-.....|^.~~.^|.....-bii+......|***",
+        "***||||-+---+--.....|..~~..|.....--+---+-||||***",
+        "***R,,+.............D..~~..D.............+,,R***",
+        "***R,,wÓ...-é....-..|p.~~.p|..-é....-.ó..w,,R***",
+        "***R,,w....-.....-+-|..~~..|-+-.....-....w,,R***",
+        "***R,Q|....-.....-YU|..~~..|UY-.....-....|Q,R***",
+        "***||||||||||||||||||..~~..||||||||||||||||||***",
+        "***|á.....+r-u+í....|..~~..|Í....+u-r+..ä...|***",
+        "***w......-----.....|..~~..|.....-----......w***",
+        "***w......-STb-.....|..~~..|.....-bTS-......w***",
+        "***|......+iib-.....|..~~..|.....-bii+......|***",
+        "***||||-+---+--.....|p.~~.p|.....--+---+-||||***",
+        "***R,,+.............D......D.............+,,R***",
+        "***R,,wÓ...-é....-..|^....^|..-é....-.ó..w,,R***",
+        "***R,,w....-.....-+-||WWWW||-+-.....-....w,,R***",
+        "***R,Q|....-.....-YU|******|UY-.....-....|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": "no_faction", "x": [ 0, 13 ], "y": [ 30, 39 ] } ],
+      "place_npcs": [ { "class": "apartment_survivor", "x": 8, "y": 37 } ]
+    }
+  },
   {
     "method": "json",
     "object": {