[Aftershock] Prepnet dialogue and itemgroup fixes (#37950)

CleverRaven · Feb 13, 2020 · b0def6b · b0def6b
1 parent adf0d33
commit b0def6b
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 12 deletions.
diff --git a/data/mods/Aftershock/items/items.json b/data/mods/Aftershock/items/items.json
@@ -11,7 +11,7 @@
     "type": "GENERIC",
     "id": "crypto_coin",
     "name": { "str": "Crypto coin", "str_pl": "Crypto coins" },
-    "description": "PrepNet had been heavily involved in avoiding taxes by using untraceable internet currencies.  If this movement had grown it could have crippled the US tax base but the Cataclysm happened first.  These are physical coins with random numbers sequences embossed on them.",
+    "description": "PrepNet had been heavily involved in avoiding taxes by using untraceable internet currencies.  These however are physical coins with random numbers sequences embossed on them and RFID chips inside.",
     "price": 12000,
     "price_postapoc": 15000,
     "//": "The coins would be worthless but the PrepNet Phyle still retains some manufacturing capacity",

diff --git a/data/mods/Aftershock/maps/item_groups.json b/data/mods/Aftershock/maps/item_groups.json
@@ -94,7 +94,8 @@
       [ "afs_bag_of_holding", 1 ],
       [ "afs_atomic_smartphone", 5 ],
       [ "laser_pack", 10 ],
-      [ "ftk93", 5 ]
+      [ "ftk93", 5 ],
+      [ "atomic_butterchurn", 5 ]
     ]
   },
   {
@@ -130,7 +131,7 @@
   {
     "id": "kitchen",
     "type": "item_group",
-    "items": [ [ "afs_atompot", 1 ] ]
+    "items": [ [ "afs_atompot", 1 ], [ "atomic_butterchurn", 1 ] ]
   },
   {
     "id": "oven",
@@ -175,7 +176,7 @@
   {
     "id": "hardware",
     "type": "item_group",
-    "items": [ [ "afs_power_cutter", 5 ] ]
+    "items": [ [ "afs_power_cutter", 5 ], [ "atomic_butterchurn", 1 ] ]
   },
   {
     "id": "hardware_bulk",

diff --git a/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json b/data/mods/Aftershock/maps/mapgen/prepnet_orchard.json
@@ -15,8 +15,8 @@
         "....__ddd....t.T.7d7....",
         "FFwww+wwFFFFFFFFFFFFFFFF",
         "FpwCcccwudd...d........F",
-        "F.wCcccWdbd..t.T.7.7...F",
-        "F.WcccHwdbdd...........F",
+        "F.wCcccWBbd..t.T.7.7...F",
+        "F.WcccHwBbdd...........F",
         "F.wCccHW.dd.....d......F",
         "FpwDccHwu#...t.T.7.7...F",
         "F.www+ww...............F",
@@ -49,19 +49,21 @@
         "b": "t_grass",
         "c": "t_thconc_floor",
         "d": "t_dirt",
+        "B": "t_dirt",
         "p": "t_grass",
         "t": "t_tree_plum",
         "u": "t_underbrush",
         "w": "t_wall_log",
         "F": "t_fence_barbed"
       },
-      "furniture": { "C": "f_chair", "D": "f_desk", "H": "f_sofa", "b": "f_bench" },
+      "furniture": { "C": "f_chair", "D": "f_desk", "H": "f_sofa", "b": "f_bench", "B": "f_table" },
       "place_items": [
         { "item": "supplies_farming", "x": 6, "y": 13, "chance": 50 },
         { "item": "supplies_farming", "x": 4, "y": 11, "chance": 15 },
         { "item": "supplies_farming", "x": 6, "y": 7, "chance": 15 },
         { "item": "supplies_farming", "x": 3, "y": 9, "chance": 99 }
       ],
+      "place_loot": [ { "group": "prepnet_orchard_trade", "chance": 100, "x": [ 8 ], "y": [ 8, 9 ], "repeat": [ 3, 7 ] } ],
       "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
       "place_monster": [
         { "group": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },
@@ -86,8 +88,8 @@
         "....__ddd........7dt....",
         "FFwww+wwFFFFFFFFFFFFFFFF",
         "FpwCcccwUdd..#.s.......F",
-        "F.wCcccWdbd..#.s.7.t...F",
-        "F.WcccHwdbdd...........F",
+        "F.wCcccWBbd..#.s.7.t...F",
+        "F.WcccHwBbdd...........F",
         "F.wCccHW.ad............F",
         "FpwDccHwUu...#.s.7.t...F",
         "F.www+ww#....#.s.......F",
@@ -122,19 +124,21 @@
         "b": "t_grass",
         "c": "t_thconc_floor",
         "d": "t_dirt",
+        "B": "t_dirt",
         "p": "t_grass",
         "s": "t_shrub_blueberry",
         "t": "t_tree_apricot",
         "u": "t_underbrush_harvested_spring",
         "w": "t_wall_log",
         "F": "t_fence_barbed"
       },
-      "furniture": { "&": "f_trashcan", "C": "f_chair", "D": "f_desk", "H": "f_sofa", "a": "f_trashcan", "b": "f_bench" },
+      "furniture": { "&": "f_trashcan", "C": "f_chair", "D": "f_desk", "H": "f_sofa", "a": "f_trashcan", "b": "f_bench", "B": "f_table" },
       "place_items": [
         { "item": "supplies_farming", "x": 6, "y": 13, "chance": 50 },
         { "item": "supplies_farming", "x": 4, "y": 11, "chance": 15 },
         { "item": "supplies_farming", "x": 6, "y": 7, "chance": 15 }
       ],
+      "place_loot": [ { "group": "prepnet_orchard_trade", "chance": 100, "x": [ 8 ], "y": [ 8, 9 ], "repeat": [ 3, 7 ] } ],
       "sealed_item": { "p": { "items": { "item": "farming_seeds", "chance": 100 }, "furniture": "f_plant_harvest" } },
       "place_monster": [
         { "group": "GROUP_PARK_SCENIC", "x": 12, "y": 14, "chance": 2 },

diff --git a/data/mods/Aftershock/npcs/prepnet_dialogue.json b/data/mods/Aftershock/npcs/prepnet_dialogue.json
@@ -97,7 +97,10 @@
     "dynamic_line": "Here? Fruits and berries.  Maybe the occasional piece of farm equipment, but you need crypto coins",
     "responses": [
       { "text": "Ok.", "topic": "TALK_PrepNet_gardener_1" },
-      { "text": "What are crypto coins?", "topic": "TALK_PrepNet_gardener_currency" },
+      {
+        "text": "Crypto coins?  Are you insane, there isn't any global internet now.",
+        "topic": "TALK_PrepNet_gardener_currency"
+      },
       { "text": "What can I buy here?", "effect": "start_trade", "topic": "TALK_PrepNet_gardener_1" }
     ]
   },
@@ -116,7 +119,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_PrepNet_gardener_currency",
-    "dynamic_line": "We use crypto coins for money here.  They were a pre-Cataclysm attempt to abstract money even further and create electronic cash.  We figured we'd keep it up.  Barter only gets you so far.",
+    "dynamic_line": "We use so-called crypto coins for money here.  They were a pre-Cataclysm attempt to abstract money even further and create electronic cash.  Now it's a joke because we use physical coins.  Barter only gets you so far.  And one day we'll have the Net back up.",
     "responses": [
       { "text": "Oh, okay.", "topic": "TALK_PrepNet_gardener_1" },
       { "text": "What can I buy here?", "effect": "start_trade", "topic": "TALK_PrepNet_gardener_1" }

diff --git a/data/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json b/data/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json
@@ -0,0 +1,35 @@
+[
+  {
+    "type": "item_group",
+    "id": "prepnet_orchard_trade",
+    "subtype": "distribution",
+    "entries": [
+      { "group": "irradiated_food", "prob": 200 },
+      { "group": "hardware", "prob": 100 },
+      { "group": "gear_survival", "prob": 100 },
+      { "group": "rad_gear", "prob": 100 },
+      { "group": "prepnet_basic_robots", "prob": 20 },
+      { "group": "prepnet_basic_grenades", "prob": 30 },
+      { "group": "ammo_any_batteries_full", "prob": 100 },
+      { "group": "prepnet_id_cards", "prob": 50 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "prepnet_id_cards",
+    "subtype": "distribution",
+    "items": [ [ "id_science", 90 ], [ "id_military", 5 ], [ "id_industrial", 5 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "prepnet_basic_grenades",
+    "subtype": "distribution",
+    "items": [ [ "grenade_inc", 50 ], [ "scrambler", 25 ], [ "fungicidalbomb", 25 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "prepnet_basic_robots",
+    "subtype": "distribution",
+    "items": [ [ "bot_rifleturret", 40 ], [ "bot_bloodhound_drone", 25 ] ]
+  }
+]