Add flint and steel recipe

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -931,6 +931,7 @@
     "entries": [
       { "item": "rock", "prob": 40 },
       { "item": "rock_flaking", "prob": 15 },
+      { "item": "flint", "prob": 5 },
       { "item": "rock_large", "prob": 10 },
       { "item": "jackhammer", "prob": 2, "charges": [ 0, 1200 ] },
       { "item": "elec_jackhammer", "prob": 1 },
@@ -1244,6 +1245,7 @@
       { "item": "rock", "prob": 40, "count": [ 1, 10 ] },
       { "item": "rock_large", "prob": 10, "count": [ 1, 10 ] },
       { "item": "rock_flaking", "prob": 20, "count": [ 1, 10 ] },
+      { "item": "flint", "prob": 5, "count": [ 1, 10 ] },
       { "item": "material_shrd_limestone", "prob": 40, "count": [ 1, 10 ] },
       { "item": "material_limestone", "prob": 40, "count": [ 1, 10 ] },
       { "item": "material_niter", "prob": 5, "count": [ 1, 10 ] },
@@ -1313,6 +1315,7 @@
     "items": [
       [ "rock", 40 ],
       [ "rock_flaking", 10 ],
+      [ "flint", 5 ],
       [ "rock_large", 5 ],
       [ "sharp_rock", 5 ],
       { "group": "newspaper_recent", "prob": 5 },
@@ -1326,6 +1329,7 @@
     "items": [
       [ "rock", 40 ],
       [ "rock_flaking", 5 ],
+      [ "flint", 2 ],
       [ "rock_large", 5 ],
       [ "stick", 95 ],
       [ "pine_bough", 20 ],

data/json/itemgroups/Locations_MapExtras/mansion.json

@@ -1016,6 +1016,7 @@
       [ "stick", 50 ],
       [ "rock", 50 ],
       [ "rock_flaking", 5 ],
+      [ "flint", 1 ],
       [ "rock_large", 5 ],
       [ "plastic_shopping_bag", 40 ],
       [ "sinew", 40 ],

data/json/itemgroups/misc.json

@@ -76,6 +76,7 @@
       { "item": "clay_lump", "count": [ 1, 4 ], "prob": 5 },
       { "item": "rock", "count": [ 1, 4 ], "prob": 10 },
       { "item": "rock_flaking", "count": [ 1, 4 ], "prob": 2 },
+      { "item": "flint", "prob": 1 },
       { "item": "rock_large", "prob": 10 },
       { "item": "pebble", "count": [ 1, 4 ], "prob": 15 }
     ]

data/json/itemgroups/trash_and_debris.json

@@ -77,6 +77,7 @@
     "items": [
       [ "rock", 80 ],
       [ "rock_flaking", 80 ],
+      [ "flint", 20 ],
       [ "stick", 80 ],
       [ "acorns", 80 ],
       [ "pinecone", 80 ],

data/json/items/resources/misc.json

@@ -138,8 +138,8 @@
     "id": "sharp_rock",
     "symbol": "*",
     "color": "light_gray",
-    "name": { "str": "flint" },
-    "description": "A rock with sharp edges.  Makes a passable melee weapon, and can also make sparks if struck against high-carbon steel.",
+    "name": { "str": "sharp rock" },
+    "description": "A baseball-sized rock with a somewhat sharp edge that also chips in a semi-predictable way if struck.  With the right skills, you could give it a better edge.",
     "material": [ "stone" ],
     "weight": "500 g",
     "volume": "250 ml",

data/json/items/resources/stone.json

@@ -21,6 +21,13 @@
     "to_hit": -1,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_60" ]
   },
+  {
+    "type": "AMMO",
+    "id": "flint",
+    "copy-from": "rock_flaking",
+    "name": { "str": "flint" },
+    "description": "A chunk of flint, the kind of rock that can make sparks if stuck against high-carbon steel.  It also chips in a semi-predictable way if struck, leaving a sharp edge."
+  },
   {
     "type": "GENERIC",
     "id": "rock_large",

data/json/items/tool/fire.json

@@ -64,13 +64,13 @@
     "id": "flint_steel",
     "type": "TOOL",
     "name": { "str": "flint and steel", "str_pl": "sets of flint and steel" },
-    "description": "This is a magnesium bar and a carbon steel striker.  Use it to spark a flame.",
+    "description": "This is a flint and a hardened high carbon steel striker.  Use it to spark a flame.",
     "weight": "400 g",
     "volume": "250 ml",
     "price": 300,
     "price_postapoc": 250,
     "to_hit": -1,
-    "material": [ "stone", "steel" ],
+    "material": [ "stone", "hc_steel" ],
     "symbol": ",",
     "color": "dark_gray",
     "initial_charges": 2000,

data/json/recipes/recipe_ammo.json

@@ -10,7 +10,7 @@
     "autolearn": true,
     "flags": [ "BLIND_EASY" ],
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
-    "components": [ [ [ "rock", 1 ], [ "sharp_rock", 1 ] ] ]
+    "components": [ [ [ "rock", 1 ], [ "rock_flaking_any", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -254,7 +254,7 @@
         [ "ceramic_shard", 1 ],
         [ "scrap", 2 ],
         [ "nail", 10 ],
-        [ "sharp_rock", 1 ]
+        [ "rock_flaking_any", 1, "LIST" ]
       ],
       [ [ "fletching", 1, "LIST" ] ]
     ]
@@ -427,7 +427,7 @@
         [ "ceramic_shard", 1 ],
         [ "scrap", 2 ],
         [ "nail", 10 ],
-        [ "sharp_rock", 1 ]
+        [ "rock_flaking_any", 1, "LIST" ]
       ],
       [ [ "fletching", 1, "LIST" ] ]
     ]

data/json/recipes/recipe_deconstruction.json

@@ -3565,6 +3565,30 @@
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "scrap", 7 ] ] ]
   },
+  {
+    "result": "hc_steel_lump",
+    "type": "uncraft",
+    "activity_level": "BRISK_EXERCISE",
+    "time": "10 m",
+    "qualities": [ { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "hc_steel_chunk", 4 ] ] ]
+  },
+  {
+    "result": "mc_steel_lump",
+    "type": "uncraft",
+    "activity_level": "BRISK_EXERCISE",
+    "time": "10 m",
+    "qualities": [ { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "mc_steel_chunk", 4 ] ] ]
+  },
+  {
+    "result": "lc_steel_lump",
+    "type": "uncraft",
+    "activity_level": "BRISK_EXERCISE",
+    "time": "10 m",
+    "qualities": [ { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "lc_steel_chunk", 4 ] ] ]
+  },
   {
     "result": "pocketwatch",
     "type": "uncraft",

data/json/recipes/tools/tools_hand.json

@@ -33,6 +33,26 @@
     "tools": [ [ [ "hotcut", -1 ] ] ],
     "components": [ [ [ "plastic_chunk", 2 ], [ "2x4", 1 ], [ "stick", 2 ] ] ]
   },
+  {
+    "result": "flint_steel",
+    "type": "recipe",
+    "activity_level": "BRISK_EXERCISE",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "2 h",
+    "autolearn": true,
+    "using": [ [ "forging_standard", 2 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_metalworking" },
+      { "proficiency": "prof_blacksmithing" },
+      { "proficiency": "prof_toolsmithing" }
+    ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
+    "tools": [ [ [ "tongs", -1 ] ] ],
+    "components": [ [ [ "hc_steel_chunk", 1 ] ], [ [ "flint", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",

data/json/recipes/tools/tools_primitive.json

@@ -39,7 +39,7 @@
     "proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ],
     "components": [
       [ [ "stick", 1 ], [ "2x4", 1 ] ],
-      [ [ "rock_flaking", 1 ], [ "sharp_rock", 1 ] ],
+      [ [ "rock_flaking_any", 1, "LIST" ] ],
       [ [ "cordage_short", 1, "LIST" ], [ "filament", 50, "LIST" ] ]
     ]
   },
@@ -138,7 +138,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "HAMMER_SOFT", "level": 1 }, { "id": "CHISEL_WOOD", "level": 1 } ],
-    "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "rock_flaking", 1 ], [ "sharp_rock", 1 ] ] ]
+    "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "rock_flaking_any", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -173,13 +173,14 @@
     "difficulty": 2,
     "time": "1 h",
     "autolearn": true,
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ],
+    "qualities": [
+      { "id": "HAMMER", "level": 1 },
+      { "id": "HAMMER_SOFT", "level": 1 },
+      { "id": "PUNCH", "level": 1 },
+      { "id": "CUT", "level": 2 }
+    ],
     "proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ],
-    "components": [
-      [ [ "stick", 1 ], [ "2x4", 1 ] ],
-      [ [ "rock", 1 ], [ "ceramic_shard", 1 ], [ "sharp_rock", 1 ] ],
-      [ [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ] ]
-    ]
+    "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ], [ [ "rock_flaking_any", 1, "LIST" ] ], [ [ "cordage_short", 2, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -196,7 +197,7 @@
     "proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ],
     "components": [
       [ [ "stick", 1 ], [ "2x4", 1 ] ],
-      [ [ "rock", 1 ], [ "ceramic_shard", 1 ], [ "sharp_rock", 1 ] ],
+      [ [ "rock", 1 ], [ "ceramic_shard", 1 ], [ "rock_flaking_any", 1, "LIST" ] ],
       [ [ "cordage_short", 2, "LIST" ], [ "filament", 100, "LIST" ] ]
     ]
   },
@@ -340,7 +341,7 @@
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ],
-    "components": [ [ [ "rock_flaking", 1 ], [ "sharp_rock", 1 ] ] ]
+    "components": [ [ [ "rock_flaking_any", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -355,7 +356,7 @@
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "HAMMER_SOFT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knapping" }, { "proficiency": "prof_knapping_speed" } ],
-    "components": [ [ [ "rock_flaking", 1 ], [ "sharp_rock", 1 ] ] ]
+    "components": [ [ [ "rock_flaking_any", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",

data/json/recipes/weapon/piercing.json

@@ -190,11 +190,7 @@
       { "proficiency": "prof_knapping_speed" },
       { "proficiency": "prof_carving", "fail_multiplier": 1.15 }
     ],
-    "components": [
-      [ [ "stick_long", 1 ] ],
-      [ [ "rock_flaking", 1 ], [ "sharp_rock", 1 ] ],
-      [ [ "cordage_short", 1, "LIST" ], [ "filament", 50, "LIST" ] ]
-    ]
+    "components": [ [ [ "stick_long", 1 ] ], [ [ "rock_flaking_any", 1, "LIST" ] ], [ [ "cordage_short", 1, "LIST" ] ] ]
   },
   {
     "result": "sharpened_pipe",

data/json/recipes/weapon/ranged.json

@@ -130,7 +130,7 @@
       { "proficiency": "prof_carving", "time_multiplier": 1.5, "fail_multiplier": 1.15 }
     ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ],
-    "components": [ [ [ "2x4", 2 ] ], [ [ "pipe", 1 ] ], [ [ "sharp_rock", 1 ] ] ]
+    "components": [ [ [ "2x4", 2 ] ], [ [ "pipe", 1 ] ], [ [ "hc_steel_chunk", 1 ] ], [ [ "flint", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -159,7 +159,7 @@
       { "proficiency": "prof_carving", "time_multiplier": 1.5, "fail_multiplier": 1.15 }
     ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ] ],
-    "components": [ [ [ "2x4", 2 ] ], [ [ "pipe", 1 ] ], [ [ "sharp_rock", 1 ] ] ]
+    "components": [ [ [ "2x4", 2 ] ], [ [ "pipe", 1 ] ], [ [ "hc_steel_chunk", 1 ] ], [ [ "flint", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -188,7 +188,7 @@
       { "proficiency": "prof_carving", "time_multiplier": 1.5, "fail_multiplier": 1.15 }
     ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ] ],
-    "components": [ [ [ "2x4", 2 ] ], [ [ "pipe", 1 ] ], [ [ "sharp_rock", 1 ] ] ]
+    "components": [ [ [ "2x4", 2 ] ], [ [ "pipe", 1 ] ], [ [ "hc_steel_chunk", 1 ] ], [ [ "flint", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -217,7 +217,7 @@
       { "proficiency": "prof_carving", "time_multiplier": 1.5, "fail_multiplier": 1.15 }
     ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ] ],
-    "components": [ [ [ "2x4", 1 ] ], [ [ "pipe", 1 ] ], [ [ "sharp_rock", 1 ] ] ]
+    "components": [ [ [ "2x4", 1 ] ], [ [ "pipe", 1 ] ], [ [ "hc_steel_chunk", 1 ] ], [ [ "flint", 1 ] ] ]
   },
   {
     "result": "carbine_flintlock_double",
@@ -239,7 +239,7 @@
       { "proficiency": "prof_gunsmithing_antique" },
       { "proficiency": "prof_carving", "time_multiplier": 1.5, "fail_multiplier": 1.15 }
     ],
-    "components": [ [ [ "2x4", 2 ] ], [ [ "pipe", 2 ] ], [ [ "sharp_rock", 2 ] ] ]
+    "components": [ [ [ "2x4", 2 ] ], [ [ "pipe", 2 ] ], [ [ "hc_steel_chunk", 2 ] ], [ [ "flint", 2 ] ] ]
   },
   {
     "result": "carbine_flintlock_double",

data/json/requirements/materials.json

@@ -284,6 +284,12 @@
     "//": "Materials for use when forging atypically small items from steel",
     "components": [ [ [ "steel_chunk", 1 ], [ "scrap", 5 ] ] ]
   },
+  {
+    "id": "rock_flaking_any",
+    "type": "requirement",
+    "//": "Rocks that can be used for knapping.",
+    "components": [ [ [ "rock_flaking", 1 ], [ "sharp_rock", 1 ], [ "flint", 1 ] ] ]
+  },
   {
     "id": "waterproofing",
     "type": "requirement",