Readjust the availability of a certain coffeepot (#82989)

Author: gettingusedto

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -524,7 +524,6 @@
       [ "switchblade", 6 ],
       [ "atomic_light", 1 ],
       [ "atomic_lamp", 1 ],
-      [ "atomic_coffeepot", 1 ],
       [ "flaregun", 10 ],
       [ "signal_flare", 15 ],
       [ "knee_pads", 10 ],
@@ -1738,8 +1737,7 @@
       { "item": "dehydrator", "prob": 30 },
       { "item": "vac_sealer", "prob": 45 },
       { "item": "waffleiron", "prob": 45 },
-      { "item": "forge", "prob": 5 },
-      { "item": "atomic_coffeepot", "prob": 2 }
+      { "item": "forge", "prob": 5 }
     ]
   },
   {

data/json/itemgroups/SUS/domestic.json

@@ -568,7 +568,7 @@
     "//2": "This group is for a cupboard where coffee and tea supplies are kept.",
     "subtype": "collection",
     "entries": [
-      { "distribution": [ { "item": "coffeemaker", "prob": 90 }, { "item": "atomic_coffeepot", "prob": 10 } ], "prob": 75 },
+      { "distribution": [ { "item": "coffeemaker", "prob": 90 } ], "prob": 75 },
       {
         "distribution": [
           { "item": "coffee_raw", "prob": 30 },

data/json/itemgroups/collections_domestic.json

@@ -131,8 +131,7 @@
       { "item": "char_smoker", "prob": 5, "charges": [ 0, -1 ] },
       [ "can_sealer", 2 ],
       [ "oil_press_manual", 2 ],
-      [ "snow_machine_home", 5 ],
-      [ "atomic_coffeepot", 1 ]
+      [ "snow_machine_home", 5 ]
     ]
   },
   {

data/json/itemgroups/food_service.json

@@ -451,7 +451,6 @@
     "type": "item_group",
     "subtype": "distribution",
     "entries": [
-      { "item": "atomic_coffeepot", "prob": 1 },
       { "item": "bottle_glass", "prob": 15 },
       { "prob": 25, "group": "coffee_raw_bag_plastic_20" },
       { "item": "coffee_syrup", "charges": [ 1, -1 ], "prob": 25 },

data/json/items/tool/cooking.json

@@ -1,27 +1,4 @@
 [
-  {
-    "id": "atomic_coffeepot",
-    "type": "ITEM",
-    "subtypes": [ "TOOL" ],
-    "category": "tools",
-    "name": { "str": "atomic coffeemaker" },
-    "looks_like": "coffeemaker",
-    "description": "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive generator to heat water for coffee, reducing the amount of total electricity it consumes.  Consumer safety concerns led to it being banned in the EU as well as many other countries, but don't let that stop you from brewing your morning Joe with the power of the atom™!",
-    "weight": "6102 g",
-    "volume": "1500 ml",
-    "longest_side": "20 cm",
-    "price": "1 kUSD",
-    "price_postapoc": "30 USD",
-    "material": [ "plastic", "aluminum", "lead", "steel" ],
-    "qualities": [ [ "BOIL", 1 ] ],
-    "symbol": ",",
-    "color": "light_green",
-    "use_action": [ "HOTPLATE_ATOMIC", { "type": "link_up", "cable_length": 2, "charge_rate": "1 kW" } ],
-    "//": "This now uses energy to heat food, the RTG is just a minor cost-saving element.  However in a pinch you could use just the RTG to unfreeze water",
-    "flags": [ "LEAK_DAM", "RADIOACTIVE", "DURABLE_MELEE", "WATER_BREAK", "ALLOWS_REMOTE_USE" ],
-    "melee_damage": { "bash": 5 },
-    "tool_ammo": [ "battery" ]
-  },
   {
     "id": "butchering_kit",
     "name": { "str": "butchering kit" },

data/json/mapgen/s_coffee.json

@@ -251,7 +251,7 @@
         { "item": "coffee_bathroom", "x": [ 5, 6 ], "y": [ 21, 22 ], "chance": 20, "repeat": [ 1, 2 ] },
         { "item": "coffee_bathroom", "x": [ 2, 3 ], "y": [ 21, 22 ], "chance": 20, "repeat": [ 1, 2 ] }
       ],
-      "place_item": [ { "item": "coffeemaker", "x": 21, "y": 22 }, { "item": "atomic_coffeepot", "x": 21, "y": 22, "chance": 20 } ],
+      "place_item": [ { "item": "coffeemaker", "x": 21, "y": 22 } ],
       "items": { "x": { "item": "cash_register_random", "chance": 100 } }
     }
   },

data/json/obsoletion_and_migration_0.J/migration_items.json

@@ -103,5 +103,10 @@
     "type": "MIGRATION",
     "id": "helmet_acidchitin_light_xs",
     "replace": "helmet_acidchitin_xs"
+  },
+  {
+    "type": "MIGRATION",
+    "id": "atomic_coffeepot",
+    "replace": "coffeemaker"
   }
 ]

data/json/recipes/tools/tools_electronic.json

@@ -303,31 +303,6 @@
       [ [ "cable", 15 ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "result": "atomic_coffeepot",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "electronics",
-    "difficulty": 6,
-    "time": "1h 30 m",
-    "reversible": true,
-    "book_learn": [ [ "recipe_caseless", 8 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "proficiencies": [ { "proficiency": "prof_plasticworking" }, { "proficiency": "prof_elec_semiconductors" } ],
-    "using": [ [ "glue_any", 1 ] ],
-    "components": [
-      [ [ "plastic_chunk", 5 ] ],
-      [ [ "power_supply", 2 ] ],
-      [ [ "wire_mesh", 1 ], [ "cotton_patchwork", 1 ] ],
-      [ [ "thermos", 2 ] ],
-      [ [ "element", 1 ], [ "crude_heating_element", 1 ] ],
-      [ [ "scrap_aluminum", 2 ] ],
-      [ [ "betavoltaic", 2 ] ],
-      [ [ "RTG_coffee", 1 ] ]
-    ]
-  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

data/json/requirements/cooking_tools.json

@@ -94,7 +94,6 @@
         [ "propane_cooker", 16 ],
         [ "acetylene_cooker", 8 ],
         [ "popcan_stove", 20 ],
-        [ "atomic_coffeepot", 115 ],
         [ "fire", -1 ]
       ]
     ]

data/json/vehicleparts/modular_tools.json

@@ -103,7 +103,6 @@
     "allowed_tools": [
       "aluminum_pan",
       "angle_grinder",
-      "atomic_coffeepot",
       "coffeemaker",
       "copper_pan",
       "cordless_drill",