Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix mics repair kit #72751

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@
[ "bullwhip", 1 ],
[ "10gal_hat", 3 ],
[ "glasses_monocle", 2 ],
[ "duct_tape", 60 ],
{ "group": "duct_tape", "prob": 60 },
[ "superglue", 20 ],
[ "firecracker_pack", 5 ],
[ "firecracker", 5 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/Clothing_Gear/gear.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{ "group": "tools_survival", "prob": 100 },
{ "group": "tools_tailor", "prob": 20 },
{ "group": "ammo_pocket_batteries_full", "prob": 10 },
[ "duct_tape", 10 ],
{ "group": "duct_tape", "prob": 10 },
[ "superglue", 5 ],
[ "plastichoboreel", 5 ],
[ "survivormap", 5 ],
Expand Down
6 changes: 3 additions & 3 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
{ "item": "bandages", "prob": 15, "count": [ 1, 3 ] },
{ "item": "liq_bandage_spray", "prob": 5, "charges-min": 1 },
{ "group": "adhesive_bandages_box_used", "prob": 15 },
{ "item": "duct_tape", "prob": 20, "charges": [ 50, 200 ] },
{ "group": "duct_tape", "prob": 20 },
{ "item": "superglue", "prob": 10 },
{ "item": "sewing_kit", "prob": 10, "charges-min": 0 },
{ "item": "mouthpiece", "prob": 10 },
Expand Down Expand Up @@ -1674,7 +1674,7 @@
{ "prob": 30, "group": "cig_box_cigarette_0_10" },
{ "item": "rope_6", "prob": 5 },
{ "item": "rope_30", "prob": 2 },
{ "item": "duct_tape", "prob": 10, "charges": [ 50, 200 ] },
{ "group": "duct_tape", "prob": 10 },
{ "group": "ammo_pocket_batteries_full", "prob": 15 },
{ "item": "matches", "prob": 10, "charges": [ 0, 20 ] },
{ "item": "ref_matches", "prob": 10, "charges": [ 0, 32 ] },
Expand Down Expand Up @@ -2468,7 +2468,7 @@
{ "item": "dayquil", "prob": 70, "charges": [ 1, 5 ] },
[ "screwdriver", 40 ],
[ "screwdriver_set", 10 ],
{ "item": "duct_tape", "prob": 10, "charges": [ 25, 400 ] },
{ "group": "duct_tape", "prob": 10, "count": [ 1, 2 ] },
{ "item": "superglue", "prob": 5 },
[ "boots", 70 ],
[ "boots_winter", 60 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
[ "string_36", 25 ],
[ "toilet_paper", 10 ],
{ "item": "handflare", "prob": 15, "charges": 300 },
[ "duct_tape", 25 ],
{ "group": "duct_tape", "prob": 25 },
[ "superglue", 20 ],
{ "item": "flashlight", "prob": 25, "charges": [ 0, 300 ] },
[ "thread", 20 ],
Expand Down Expand Up @@ -1208,7 +1208,7 @@
{ "item": "mask_dust", "prob": 15 },
{ "item": "manual_mechanics", "prob": 35 },
{ "item": "manual_fabrication", "prob": 20 },
{ "item": "duct_tape", "prob": 70, "charges": [ 50, 200 ] },
{ "group": "duct_tape", "prob": 70 },
{ "item": "superglue", "prob": 25 },
{ "item": "misc_repairkit", "prob": 15, "charges-min": 0 },
{ "group": "tools_toolbox", "prob": 2 }
Expand Down Expand Up @@ -1269,7 +1269,7 @@
{ "item": "multitool", "prob": 30 },
{ "item": "screwdriver_set", "prob": 20 },
{ "item": "socket_screwdriver_set", "prob": 20 },
{ "item": "duct_tape", "prob": 50 },
{ "group": "duct_tape", "prob": 50 },
{ "item": "superglue", "prob": 10 },
{ "item": "misc_repairkit", "prob": 25, "charges": 200 },
{ "group": "tools_toolbox", "prob": 2 }
Expand Down Expand Up @@ -2101,7 +2101,7 @@
[ "thread", 15 ],
[ "yarn", 15 ],
[ "sinew", 15 ],
[ "duct_tape", 15 ],
{ "group": "duct_tape", "prob": 15 },
[ "superglue", 5 ],
[ "feather", 15 ],
[ "mag_animecon", 15 ],
Expand Down
8 changes: 4 additions & 4 deletions data/json/itemgroups/SUS/domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
{ "item": "string_36", "count": [ 1, 4 ], "prob": 80 },
{ "item": "string_36", "count": [ 1, 4 ], "prob": 50 },
{ "item": "string_36", "count": [ 1, 4 ], "prob": 20 },
{ "item": "duct_tape", "prob": 40, "charges": [ 25, 400 ] },
{ "group": "duct_tape", "prob": 40 },
{ "item": "superglue", "prob": 30 },
{ "item": "plastic_straw", "prob": 70, "count": [ 1, 6 ] },
{ "item": "plastic_straw", "prob": 40, "count": [ 1, 6 ] },
Expand Down Expand Up @@ -264,7 +264,7 @@
{ "item": "solder_wire", "prob": 40 },
{ "item": "superglue", "prob": 40 },
{ "item": "knitting_needles", "prob": 40 },
{ "item": "duct_tape", "prob": 40, "charges": [ 5, 160 ] },
{ "group": "duct_tape", "prob": 40 },
{ "item": "wax_paraffin", "prob": 10 },
{ "item": "zipper_short_plastic", "prob": 35 },
{ "item": "zipper_short_plastic", "prob": 15 },
Expand Down Expand Up @@ -304,7 +304,7 @@
{ "group": "tools_common", "count": 2 },
{ "item": "superglue", "prob": 90 },
{ "item": "boxcutter", "prob": 85 },
{ "item": "duct_tape", "prob": 85, "charges": [ 5, 200 ] },
{ "group": "duct_tape", "prob": 85 },
{ "item": "flashlight", "prob": 80, "ammo-item": "light_disposable_cell", "charges": [ 100, 300 ] },
{ "item": "toothbrush_plain", "custom-flags": [ "FILTHY" ], "prob": 80 },
{ "item": "bottle_opener", "prob": 75 },
Expand Down Expand Up @@ -369,7 +369,7 @@
{ "item": "candle", "count": [ 1, 2 ], "prob": 75, "charges-min": 70 },
{ "item": "corkscrew", "prob": 70 },
{ "group": "adhesive_bandages_box_used", "prob": 60 },
{ "item": "duct_tape", "prob": 40, "charges": [ 100, 400 ] },
{ "group": "duct_tape", "prob": 40 },
{ "item": "superglue", "prob": 30 },
{ "item": "light_battery_cell", "count": 4, "prob": 50, "charges": 100 },
{ "item": "deck_of_cards", "prob": 50 },
Expand Down
4 changes: 2 additions & 2 deletions data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
{ "item": "bubblewrap", "prob": 50 },
{ "item": "binoculars", "prob": 20 },
{ "item": "roller_blades", "prob": 20 },
{ "item": "duct_tape", "prob": 100, "charges": [ 50, 200 ] },
{ "group": "duct_tape", "prob": 100 },
{ "item": "superglue", "prob": 60 },
{ "item": "lawnmower", "prob": 25 },
{ "item": "lawn_dart", "prob": 10 },
Expand Down Expand Up @@ -1442,7 +1442,7 @@
{ "item": "paint_brush", "prob": 33 },
{ "item": "xacto", "prob": 10 },
{ "item": "screwdriver", "prob": 10 },
{ "item": "duct_tape", "prob": 5, "charges": [ 25, 100 ] },
{ "group": "duct_tape", "prob": 5 },
{ "item": "superglue", "prob": 10 },
{ "item": "splinter", "prob": 10, "count": [ 2, 3 ] },
{ "item": "toolbox_empty", "prob": 100 }
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/mail.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"type": "item_group",
"subtype": "collection",
"entries": [
{ "item": "duct_tape", "prob": 25 },
{ "group": "duct_tape", "prob": 25 },
{ "item": "bubblewrap", "prob": 33 },
{ "item": "cardboard", "count": [ 10, 40 ], "prob": 33 },
{ "item": "box_small", "count": [ 1, 2 ], "prob": 50 },
Expand Down
14 changes: 10 additions & 4 deletions data/json/itemgroups/supplies.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@
[ "vac_mold", 3 ]
]
},
{
"id": "duct_tape",
"type": "item_group",
"container-item": "cardboard_roll",
"items": [ { "item": "duct_tape", "prob": 100, "charges": [ 20, 200 ] } ]
},
{
"id": "tailoring_fabric",
"type": "item_group",
Expand Down Expand Up @@ -234,7 +240,7 @@
[ "wire", 10 ],
{ "group": "ammo_pocket_batteries_full", "prob": 50 },
[ "pilot_light", 50 ],
{ "item": "duct_tape", "prob": 200, "charges": [ 50, 200 ] },
{ "group": "duct_tape", "prob": 200 },
[ "superglue", 100 ],
[ "string_6", 100 ],
[ "string_36", 100 ],
Expand Down Expand Up @@ -392,7 +398,7 @@
[ "wood_panel", 10 ],
{ "item": "wire", "prob": 50, "count": [ 1, 10 ] },
{ "item": "wire_barbed", "prob": 20, "count": [ 1, 10 ] },
[ "duct_tape", 60 ],
{ "group": "duct_tape", "prob": 60 },
[ "compressor", 5 ],
[ "foot_crank", 10 ],
[ "spray_can", 50 ],
Expand Down Expand Up @@ -747,7 +753,7 @@
[ "rubber_band", 5 ],
{ "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
{ "item": "smart_phone", "prob": 18, "charges-min": 0 },
{ "item": "duct_tape", "prob": 5, "charges": [ 50, 200 ] },
{ "group": "duct_tape", "prob": 5 },
{ "item": "superglue", "prob": 5 },
{ "group": "ammo_pocket_batteries", "prob": 5 },
{ "item": "flashlight", "prob": 10, "charges": [ 0, 300 ] },
Expand Down Expand Up @@ -786,7 +792,7 @@
[ "paper", 100 ],
{ "group": "writing_utensils", "prob": 35 },
[ "file", 15 ],
{ "item": "duct_tape", "prob": 15, "charges": [ 50, 200 ] },
{ "group": "duct_tape", "prob": 15 },
{ "item": "superglue", "prob": 15 },
[ "file", 15 ],
[ "office_holepunch", 15 ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/itemgroups/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
[ "screwdriver", 100 ],
[ "screwdriver_set", 50 ],
[ "socket_screwdriver_set", 10 ],
[ "duct_tape", 10 ],
{ "group": "duct_tape", "prob": 10 },
[ "superglue", 10 ],
[ "tin_snips", 10 ],
[ "wrench", 20 ],
Expand Down Expand Up @@ -860,7 +860,7 @@
[ "glasses_safety", 20 ],
[ "vac_mold", 10 ],
[ "polycarbonate_sheet", 50 ],
[ "duct_tape", 8 ],
{ "group": "duct_tape", "prob": 8 },
{ "item": "misc_repairkit", "prob": 15, "charges-min": 0 },
{ "item": "welder", "prob": 10 },
{ "item": "welding_blanket", "prob": 10, "count": [ 0, 1 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/vehicles_fuel_related.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
],
"prob": 80
},
{ "item": "duct_tape", "charges": [ 20, 200 ], "prob": 30 },
{ "group": "duct_tape", "prob": 30 },
{ "item": "superglue", "prob": 20 },
{ "distribution": [ { "item": "pockknife" }, { "item": "boxcutter" } ], "prob": 60 },
{ "item": "glowstick", "count": [ 0, 2 ], "charges": 1400, "prob": 30 },
Expand Down
1 change: 0 additions & 1 deletion data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@
"count": 200,
"//1": "200 charges - one roll is 20 yards. One charge = 0.1 yard.",
"flags": [ "UNRECOVERABLE" ],
"container": "cardboard_roll",
"//2": "Based on https://www.amazon.com/dp/B097HKH3G4, with the assumption that the tape is 1mm thick for volume calculation"
},
{
Expand Down
7 changes: 4 additions & 3 deletions data/json/items/containers/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -4629,7 +4629,7 @@
},
{
"id": "cardboard_roll",
"type": "GENERIC",
"type": "TOOL",
"category": "other",
"name": { "str": "cardboard roll" },
"description": "A small cardboard roll used to conveniently store materials such as tape or toilet paper.",
Expand All @@ -4641,12 +4641,13 @@
"material": [ "cardboard" ],
"symbol": "o",
"color": "dark_gray",
"ammo": [ "tape" ],
"pocket_data": [
{
"pocket_type": "CONTAINER",
"pocket_type": "MAGAZINE",
"max_contains_volume": "1 L",
"max_contains_weight": "1 kg",
"item_restriction": [ "duct_tape", "medical_tape", "toilet_paper" ],
"ammo_restriction": { "tape": 200 },
"volume_multiplier": 0.75
}
],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/workshop.json
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@
"symbol": ";",
"color": "light_gray",
"ammo": [ "tape" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "tape": 200 } } ],
"pocket_data": [ { "magazine_well": "5000 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "cardboard_roll" ] } ],
"charges_per_use": 5,
"qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 2 ], [ "AXE", 1 ], [ "SAW_W", 2 ], [ "BUTCHER", 7 ], [ "FABRIC_CUT", 1 ] ],
"use_action": [
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/NC_JUNK_SHOPKEEP.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
{ "item": "bubblewrap", "prob": 50 },
{ "item": "binoculars", "prob": 20 },
{ "item": "roller_blades", "prob": 20 },
{ "item": "duct_tape", "prob": 70 },
{ "group": "duct_tape", "prob": 70 },
{ "item": "char_smoker", "prob": 25 },
{ "item": "lawn_dart", "prob": 10 },
{ "item": "dehydrator", "prob": 15 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/campus/great_library_librarian_goods.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"id": "GREAT_LIBRARY_Shop_Supplies",
"subtype": "distribution",
"items": [
{ "item": "duct_tape", "charges": [ 35, 50 ] },
{ "group": "duct_tape" },
{ "item": "superglue", "count": [ 0, 1 ] },
{ "item": "paper", "count": [ 150, 200 ] },
{ "item": "cardboard", "count": [ 10, 20 ] }
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/godco/classes.json
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@
"subtype": "collection",
"entries": [
{ "item": "screwdriver" },
{ "item": "duct_tape" },
{ "group": "duct_tape" },
{ "item": "welder" },
{ "item": "goggles_welding" },
{ "item": "solar_cell" }
Expand Down Expand Up @@ -1167,7 +1167,7 @@
"type": "item_group",
"id": "GODCO_olwen_carried",
"subtype": "collection",
"entries": [ { "item": "laptop" }, { "item": "duct_tape" }, { "item": "lemonlime" } ]
"entries": [ { "item": "laptop" }, { "group": "duct_tape" }, { "item": "lemonlime" } ]
},
{
"type": "item_group",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/items_generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@
[ "dry_meat", 3 ],
[ "dry_rice", 8 ],
[ "dry_veggy", 5 ],
[ "duct_tape", 20 ],
{ "group": "duct_tape", "prob": 20 },
[ "dynamite", 3 ],
[ "e_tool", 1 ],
[ "ear_plugs", 1 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"type": "item_group",
"id": "REFUGEE_Garry_carried",
"subtype": "collection",
"entries": [ { "item": "duct_tape" }, { "item": "superglue" } ]
"entries": [ { "group": "duct_tape" }, { "item": "superglue" } ]
},
{
"type": "item_group",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
{ "item": "solder_wire", "charges": [ 75, 90 ] },
{ "item": "thread", "charges": [ 100, 240 ] },
{ "item": "nail", "charges": [ 80, 100 ] },
{ "item": "duct_tape", "charges": [ 35, 50 ] },
{ "group": "duct_tape" },
{ "item": "superglue", "count": [ 0, 1 ] },
{ "item": "glass_shard", "count": [ 150, 200 ] },
{ "item": "clay_lump", "count": [ 2, 3 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@
{ "item": "jeans" },
{ "item": "socks" },
{ "item": "boots_steel" },
{ "item": "duct_tape" },
{ "group": "duct_tape" },
{ "item": "screwdriver" },
{ "item": "wristwatch" },
{ "item": "mag_cars" },
Expand Down
10 changes: 5 additions & 5 deletions data/json/vehicles/helicopters.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
],
"items": [
{ "x": 0, "y": 0, "chance": 100, "items": [ "lighter" ] },
{ "x": 0, "y": 0, "chance": 100, "items": [ "duct_tape" ] },
{ "x": 0, "y": 0, "chance": 100, "item_groups": [ "duct_tape" ] },
{ "x": 0, "y": 0, "chance": 100, "items": [ "flashlight" ], "ammo": 100 },
{ "x": -1, "y": 0, "chance": 100, "items": [ "caff_gum" ] },
{ "x": -1, "y": 0, "chance": 100, "items": [ "gum" ] },
Expand Down Expand Up @@ -453,7 +453,7 @@
],
"items": [
{ "x": -1, "y": 0, "chance": 100, "items": [ "lighter" ] },
{ "x": -1, "y": 0, "chance": 100, "items": [ "duct_tape" ] },
{ "x": -1, "y": 0, "chance": 100, "item_groups": [ "duct_tape" ] },
{ "x": -1, "y": 0, "chance": 100, "items": [ "flashlight" ], "ammo": 100 },
{ "x": 1, "y": 0, "chance": 100, "items": [ "caff_gum" ] },
{ "x": 1, "y": 0, "chance": 100, "items": [ "gum" ] },
Expand Down Expand Up @@ -1588,7 +1588,7 @@
{ "x": -1, "y": 0, "chance": 10, "items": [ "pocket_firstaid" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "screwdriver" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "wrench" ] },
{ "x": -1, "y": 2, "chance": 5, "items": [ "duct_tape" ] },
{ "x": -1, "y": 2, "chance": 5, "item_groups": [ "duct_tape" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "mag_fieldrepair" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "misc_repairkit" ], "ammo": 100 },
{ "x": -1, "y": 2, "chance": 5, "items": [ "two_way_radio" ] },
Expand Down Expand Up @@ -1709,7 +1709,7 @@
{ "x": -1, "y": 0, "chance": 10, "items": [ "pocket_firstaid" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "screwdriver" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "wrench" ] },
{ "x": -1, "y": 2, "chance": 5, "items": [ "duct_tape" ] },
{ "x": -1, "y": 2, "chance": 5, "item_groups": [ "duct_tape" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "mag_fieldrepair" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "misc_repairkit" ], "ammo": 100 },
{ "x": -1, "y": 2, "chance": 5, "items": [ "two_way_radio" ] },
Expand Down Expand Up @@ -1816,7 +1816,7 @@
{ "x": -4, "y": 2, "chance": 5, "items": [ "hood_rain" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "screwdriver" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "wrench" ] },
{ "x": -1, "y": 2, "chance": 5, "items": [ "duct_tape" ] },
{ "x": -1, "y": 2, "chance": 5, "item_groups": [ "duct_tape" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "mag_fieldrepair" ] },
{ "x": -1, "y": 2, "chance": 7, "items": [ "misc_repairkit" ], "ammo": 100 },
{ "x": -1, "y": 2, "chance": 5, "items": [ "two_way_radio" ] },
Expand Down
Loading
Loading