Butterfly nets

data/json/itemgroups/Clothing_Gear/gear_civilian.json

@@ -185,7 +185,8 @@
       [ "metal_RPG_die", 1 ],
       [ "balloon", 5 ],
       [ "deck_of_cards", 1 ],
-      [ "milkshake_fastfood", 3 ]
+      [ "milkshake_fastfood", 3 ],
+      { "group": "butterfly_net_any", "prob": 5 }
     ]
   },
   {

data/json/itemgroups/activities_hobbies.json

@@ -229,7 +229,8 @@
       { "item": "bandolier_wrist", "prob": 100 },
       { "item": "fitness_band", "prob": 10 },
       { "item": "hand_pump", "prob": 10 },
-      { "item": "folded_inflatable_boat", "prob": 4 }
+      { "item": "folded_inflatable_boat", "prob": 4 },
+      { "group": "butterfly_net_any", "prob": 20 }
     ]
   },
   {

data/json/itemgroups/misc.json

@@ -347,5 +347,10 @@
     "type": "item_group",
     "id": "armor_riot_leg",
     "items": [ [ "armor_riot_leg", 100 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "butterfly_net_any",
+    "items": [ { "item": "butterfly_net_collapsible", "prob": 4 }, { "item": "butterfly_net_makeshift", "prob": 6 } ]
   }
 ]

data/json/items/fluff.json

@@ -1813,5 +1813,62 @@
       }
     ],
     "melee_damage": { "bash": 10 }
+  },
+  {
+    "type": "GENERIC",
+    "id": "butterfly_net_collapsible",
+    "name": { "str": "collapsible butterfly net" },
+    "description": "A piece of canvas on a collapsible aluminum frame.  Used to catch bugs or fish, but might not be as useful for the mutated ones.  It must be extended to use.",
+    "weight": "247 g",
+    "volume": "780 ml",
+    "longest_side": "235 mm",
+    "color": "light_gray",
+    "symbol": "P",
+    "material": [ { "type": "aluminum", "portion": 7 }, { "type": "canvas", "portion": 3 } ],
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "any", "balance": "neutral" },
+    "price": "18 USD",
+    "price_postapoc": "15 cent",
+    "flags": [ "FRAGILE_MELEE" ],
+    "melee_damage": { "bash": 3 },
+    "use_action": {
+      "menu_text": "Extend",
+      "type": "transform",
+      "target": "butterfly_net_collapsible_extended",
+      "msg": "You snap open your butterfly net."
+    },
+    "//": "Volume based on https://www.amazon.com/dp/B0CBLV98KP with the assumption that it's a cylinder with a 6.5cm diameter - using 13cm would give ridiculously high volume, and the 13cm assumption on the website includes only half of the collapsed length."
+  },
+  {
+    "type": "GENERIC",
+    "id": "butterfly_net_collapsible_extended",
+    "name": { "str": "collapsible butterfly net (extended)", "str_pl": "collapsible butterfly nets (extended)" },
+    "description": "A piece of canvas on a collapsible aluminum frame.  Used to catch bugs or fish, but might not be as useful for the mutated ones.",
+    "copy-from": "butterfly_net_collapsible",
+    "longest_side": "92 cm",
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "neutral" },
+    "use_action": {
+      "menu_text": "Collapse",
+      "type": "transform",
+      "target": "butterfly_net_collapsible",
+      "msg": "You collapse your butterfly net."
+    }
+  },
+  {
+    "type": "GENERIC",
+    "id": "butterfly_net_makeshift",
+    "name": { "str": "butterfly net" },
+    "description": "A piece of canvas stretched over a stick.  Used to catch bugs or fish, but might not be as useful for the mutated ones.",
+    "copy-from": "butterfly_net_collapsible_extended",
+    "weight": "376 g",
+    "volume": "865 ml",
+    "longest_side": "92 cm",
+    "color": "brown",
+    "symbol": "P",
+    "material": [ { "type": "wood", "portion": 7 }, { "type": "canvas", "portion": 3 } ],
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "neutral" },
+    "price": "18 USD",
+    "price_postapoc": "5 cent",
+    "flags": [ "FRAGILE_MELEE" ],
+    "melee_damage": { "bash": 3 }
   }
 ]

data/json/recipes/recipe_others.json

@@ -3382,5 +3382,20 @@
       [ [ "wood_panel", 1 ], [ "sheet_metal", 1 ] ],
       [ [ "nails", 40, "LIST" ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "butterfly_net_makeshift",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "25 m",
+    "autolearn": true,
+    "proficiencies": [ { "proficiency": "prof_carving" } ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [ [ [ "stick", 1 ] ], [ [ "sheet_canvas", 1 ], [ "sheet_canvas_patchwork", 1 ] ] ],
+    "byproducts": [ [ "splinter", 8 ] ]
   }
 ]

data/json/uncraft/generic.json

@@ -758,5 +758,21 @@
     "time": "30 s",
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "zipper_long_plastic", 1 ] ], [ [ "plastic_sheet", 4 ] ] ]
+  },
+  {
+    "result": "butterfly_net_makeshift",
+    "type": "uncraft",
+    "activity_level": "LIGHT_EXERCISE",
+    "time": "2 m",
+    "qualities": [ { "id": "CUT", "level": 2 } ],
+    "components": [ [ [ "splinter", 2 ] ], [ [ "sheet_canvas", 1 ] ] ]
+  },
+  {
+    "result": "butterfly_net_collapsible",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "3 m",
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "scrap_aluminum", 3 ] ], [ [ "sheet_canvas", 1 ] ] ]
   }
 ]