feat(balance): crafting energy weapons requires special components

data/json/furniture_and_terrain/furniture-industrial.json

@@ -262,17 +262,31 @@
       "sound": "metal screeching!",
       "sound_fail": "crash!",
       "items": [
-        { "item": "scrap", "count": [ 1, 4 ] },
-        { "item": "cable", "charges": [ 100, 800 ] },
-        { "item": "pipe", "count": [ 0, 4 ] },
-        { "item": "circuit", "count": [ 0, 5 ] },
-        { "item": "e_scrap", "count": [ 2, 8 ] },
-        { "item": "amplifier", "count": [ 0, 4 ] },
-        { "item": "power_supply", "count": [ 0, 2 ] },
-        { "item": "metal_tank_little", "count": [ 0, 6 ] }
+        { "item": "scrap", "count": [ 1, 20 ] },
+        { "item": "cable", "charges": [ 50, 400 ] },
+        { "item": "pipe", "count": [ 0, 2 ] },
+        { "item": "circuit", "count": [ 0, 2 ] },
+        { "item": "e_scrap", "count": [ 1, 10 ] },
+        { "item": "amplifier", "count": [ 0, 2 ] },
+        { "item": "power_supply", "count": [ 0, 1 ] },
+        { "item": "metal_tank_little", "count": [ 0, 3 ] },
+        { "item": "supercapacitor", "count": [ 0, 4 ] }
       ],
       "//": "Variable reduction since might hit more or less material.",
       "ranged": { "reduction": [ 13, 25 ], "destroy_threshold": 200, "block_unaimed_chance": "25%" }
+    },
+    "deconstruct": {
+      "items": [
+        { "item": "scrap", "count": [ 1, 4 ] },
+        { "item": "cable", "charges": [ 300, 600 ] },
+        { "item": "pipe", "count": [ 2, 4 ] },
+        { "item": "circuit", "count": [ 2, 5 ] },
+        { "item": "e_scrap", "count": [ 2, 8 ] },
+        { "item": "amplifier", "count": [ 2, 4 ] },
+        { "item": "power_supply", "count": [ 1, 2 ] },
+        { "item": "metal_tank_little", "count": [ 4, 6 ] },
+        { "item": "supercapacitor", "count": [ 6, 10 ] }
+      ]
     }
   },
   {

data/json/items/generic.json

@@ -1391,6 +1391,51 @@
     "to_hit": -3,
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
   },
+  {
+    "type": "GENERIC",
+    "id": "broken_dissector",
+    "symbol": ",",
+    "color": "light_blue",
+    "name": { "str": "broken dissector" },
+    "category": "other",
+    "description": "Some kind of automated medical laser cutting system.  It has suffered some damage and doesn't seem to work any more, but it could be gutted for parts.",
+    "price": "20 kUSD",
+    "price_postapoc": "50 cent",
+    "material": [ "steel", "aluminum" ],
+    "weight": "30 kg",
+    "volume": "20 L",
+    "flags": [ "NO_REPAIR" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "laser_source",
+    "symbol": "-",
+    "color": "light_gray",
+    "name": { "str": "industrial laser" },
+    "category": "spare_parts",
+    "description": "A high-power laser source, salvaged from some industrial machinery.  Doesn't do anything on its own, but could probably be useful in electronics crafting.",
+    "price": "2000 USD",
+    "price_postapoc": "2 USD",
+    "material": [ "aluminum", "diamond" ],
+    "weight": "500 g",
+    "volume": "750 ml",
+    "to_hit": -1
+  },
+  {
+    "type": "GENERIC",
+    "id": "supercapacitor",
+    "symbol": ":",
+    "color": "light_gray",
+    "name": { "str": "high-energy capacitor" },
+    "category": "spare_parts",
+    "description": "A rather large electronic component that stores energy and releases it near instantly.  Useful in electronics crafting.",
+    "price": "100 USD",
+    "price_postapoc": "50 cent",
+    "material": [ "plastic", "aluminum" ],
+    "weight": "750 g",
+    "volume": "500 ml",
+    "to_hit": -1
+  },
   {
     "type": "GENERIC",
     "id": "processor",

data/json/recipes/weapon/ranged.json

@@ -1089,7 +1089,8 @@
       [ [ "power_supply", 2 ] ],
       [ [ "steel_chunk", 3 ], [ "scrap", 18 ] ],
       [ [ "rebar", 1 ], [ "pipe", 1 ] ],
-      [ [ "e_scrap", 20 ] ]
+      [ [ "e_scrap", 20 ] ],
+      [ [ "supercapacitor", 8 ] ]
     ]
   },
   {
@@ -1128,7 +1129,8 @@
       [ [ "RAM", 1 ] ],
       [ [ "small_lcd_screen", 1 ] ],
       [ [ "battery_ups", 1 ] ],
-      [ [ "small_storage_battery", 1 ], [ "UPS_off", 1 ] ]
+      [ [ "small_storage_battery", 1 ], [ "UPS_off", 1 ] ],
+      [ [ "supercapacitor", 12 ] ]
     ]
   },
   {
@@ -1146,6 +1148,7 @@
     "using": [ [ "soldering_standard", 200 ] ],
     "components": [
       [ [ "battery_ups", 1 ] ],
+      [ [ "laser_source", 1 ] ],
       [ [ "amplifier", 2 ] ],
       [ [ "power_supply", 1 ] ],
       [ [ "cable", 100 ] ],
@@ -1235,15 +1238,24 @@
     "result": "coilgun",
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_RANGED",
-    "skill_used": "fabrication",
-    "skills_required": [ [ "mechanics", 5 ], [ "electronics", 4 ] ],
-    "difficulty": 4,
+    "skill_used": "electronics",
+    "skills_required": [ [ "mechanics", 5 ], [ "fabrication", 4 ] ],
+    "difficulty": 5,
     "time": "1 h",
     "reversible": true,
     "book_learn": [ [ "advanced_electronics", 3 ], [ "textbook_electronics", 3 ], [ "textbook_anarch", 4 ] ],
     "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ],
     "tools": [ [ [ "soldering_standard", 10, "LIST" ], [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
-    "components": [ [ [ "pipe", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "amplifier", 1 ] ], [ [ "scrap", 6 ] ], [ [ "cable", 20 ] ] ]
+    "components": [
+      [ [ "plastic_chunk", 10 ] ],
+      [ [ "power_supply", 2 ] ],
+      [ [ "amplifier", 1 ] ],
+      [ [ "scrap", 6 ] ],
+      [ [ "cable", 100 ] ],
+      [ [ "e_scrap", 10 ] ],
+      [ [ "battery_ups", 1 ] ],
+      [ [ "supercapacitor", 6 ] ]
+    ]
   },
   {
     "type": "recipe",

data/json/traps.json

@@ -437,8 +437,9 @@
     "symbol": "7",
     "visibility": 2,
     "avoidance": 20,
-    "difficulty": 99,
+    "difficulty": 2,
     "action": "dissector",
+    "drops": [ "broken_dissector" ],
     "vehicle_data": { "damage": 500, "sound_volume": 10, "sound": "BRZZZAP!", "sound_type": "trap", "sound_variant": "dissector" }
   },
   {

data/json/uncraft/generic.json

@@ -1421,6 +1421,32 @@
     "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "plastic_chunk", 40 ] ], [ [ "scrap", 40 ] ], [ [ "steel_chunk", 20 ] ] ]
   },
+  {
+    "result": "broken_dissector",
+    "type": "uncraft",
+    "skill_used": "electronics",
+    "difficulty": 4,
+    "time": "3 h",
+    "using": [ [ "soldering_standard", 20 ] ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
+    "components": [
+      [ [ "motor_micro", 4 ] ],
+      [ [ "power_supply", 6 ] ],
+      [ [ "cable", 40 ] ],
+      [ [ "scrap", 10 ] ],
+      [ [ "plastic_chunk", 2 ] ],
+      [ [ "processor", 1 ] ],
+      [ [ "RAM", 2 ] ],
+      [ [ "circuit", 1 ] ],
+      [ [ "amplifier", 6 ] ],
+      [ [ "e_scrap", 4 ] ],
+      [ [ "laser_source", 2 ] ],
+      [ [ "supercapacitor", 4 ] ],
+      [ [ "lens", 4 ] ],
+      [ [ "lens_small", 2 ] ],
+      [ [ "gold_small", 10 ] ]
+    ]
+  },
   {
     "result": "cable",
     "type": "uncraft",