diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json new file mode 100644 index 0000000000000..fe97e08571c3e --- /dev/null +++ b/data/json/itemgroups/art_antiques_crafts.json @@ -0,0 +1,270 @@ +[ + { + "type": "item_group", + "id": "art", + "items": [ + [ "petrified_eye", 1 ], + [ "spiral_stone", 20 ], + [ "cane", 10 ], + [ "candlestick", 20 ], + { "group": "tinware", "prob": 5 }, + [ "heels", 50 ], + [ "coat_fur_sf", 1 ], + [ "tricorne", 3 ], + [ "gold_bracelet", 8 ], + [ "gold_necklace", 8 ], + [ "gold_locket", 3 ], + [ "gold_ring", 8 ], + [ "gold_ear", 8 ], + [ "pearl_collar", 1 ], + [ "diamond_ring", 1 ], + [ "copper_bracelet", 1 ], + [ "copper_necklace", 1 ], + [ "copper_locket", 1 ], + [ "copper_ring", 1 ], + [ "copper_ear", 1 ], + [ "silver_bracelet", 10 ], + [ "silver_necklace", 10 ], + [ "silver_locket", 4 ], + [ "silver_ring", 10 ], + [ "silver_ear", 10 ], + [ "bead_ear", 10 ], + [ "jade_brooch", 2 ], + [ "diamond", 1 ], + [ "manual_dodge", 1 ], + [ "fancy_sunglasses", 2 ], + [ "pocketwatch", 5 ], + [ "well_pump", 1 ], + [ "nodachi", 1 ], + [ "katana", 2 ], + [ "rapier", 3 ], + [ "cavalry_sabre", 2 ], + [ "sf_watch", 5 ], + [ "platinum_watch", 1 ], + [ "ring_signet", 1 ], + [ "magic_8_ball", 1 ], + [ "coin_quarter", 1 ] + ] + }, + { + "type": "item_group", + "id": "medieval", + "items": [ + [ "katana", 2 ], + [ "katana_inferior", 2 ], + [ "cestus", 2 ], + [ "mace", 20 ], + [ "mace_inferior", 25 ], + [ "morningstar", 10 ], + [ "morningstar_inferior", 15 ], + [ "glaive", 10 ], + [ "rapier", 3 ], + [ "cavalry_sabre", 3 ], + [ "estoc", 3 ], + [ "estoc_inferior", 3 ], + [ "cutlass", 3 ], + [ "cutlass_inferior", 3 ], + [ "scimitar", 20 ], + [ "scimitar_inferior", 25 ], + [ "arming_sword", 25 ], + [ "arming_sword_inferior", 25 ], + [ "broadsword", 30 ], + [ "broadsword_inferior", 30 ], + [ "longsword", 25 ], + [ "longsword_inferior", 25 ], + [ "zweihander", 20 ], + [ "zweihander_inferior", 20 ], + [ "battleaxe", 20 ], + [ "battleaxe_inferior", 20 ], + [ "warhammer", 10 ], + [ "halberd", 5 ], + [ "lucern_hammer", 3 ], + [ "lucern_hammerfake", 5 ], + [ "pike", 5 ], + [ "pike_inferior", 10 ], + [ "spear_steel", 5 ], + [ "shillelagh", 3 ], + [ "shillelagh_weighted", 2 ], + [ "helmet_plate", 1 ], + [ "armor_plate", 2 ], + [ "huge_crossbow", 2 ], + [ "quiver", 2 ], + [ "quiver_large", 1 ], + [ "baldric", 4 ], + [ "nodachi", 1 ], + [ "nodachi_inferior", 2 ], + [ "gambeson", 3 ], + [ "tunic", 1 ], + [ "armor_lamellar", 2 ], + [ "armor_lightplate", 1 ], + [ "cuirass_lightplate", 2 ], + [ "armguard_lightplate", 1 ], + [ "legguard_lightplate", 1 ], + [ "armor_samurai", 1 ], + [ "helmet_kabuto", 1 ], + [ "gloves_plate", 1 ], + [ "boots_plate", 1 ], + [ "helmet_barbute", 1 ], + [ "helmet_conical", 1 ], + [ "helmet_galea", 1 ], + [ "helmet_nasal", 1 ], + [ "chainmail_suit", 1 ], + [ "chainmail_hood", 3 ], + [ "chainmail_vest", 3 ], + [ "chainmail_arms", 3 ], + [ "chainmail_legs", 3 ], + [ "chainmail_feet", 3 ], + [ "chainmail_hands", 3 ], + [ "legguard_metal", 1 ], + [ "textbook_weapwest", 5 ], + [ "textbook_weapeast", 5 ], + [ "textbook_armwest", 5 ], + [ "textbook_armeast", 5 ], + [ "textbook_armschina", 5 ], + [ "q_staff", 10 ], + [ "i_staff", 5 ], + [ "sword_bayonet", 10 ], + [ "bagh_nakha", 5 ], + [ "kris", 5 ], + [ "cheese_hard", 1 ], + [ "tinderbox", 4 ], + [ "flint_steel", 7 ], + [ "canteen_wood", 5 ], + [ "apron_leather", 1 ], + [ "pot_copper", 3 ], + { "group": "tinware", "prob": 10 } + ] + }, + { + "type": "item_group", + "id": "antique", + "ammo": 75, + "magazine": 100, + "items": [ + [ "oxylamp", 50 ], + [ "cow_bell", 15 ], + [ "sickle", 2 ], + [ "scythe", 2 ], + [ "hollow_cane", 2 ], + [ "sword_cane", 2 ], + [ "pipe_tobacco", 10 ], + [ "talking_doll", 10 ], + [ "brazier", 12 ], + [ "candle", 10 ], + [ "alarmclock", 10 ], + [ "golf_club", 10 ], + [ "pocketwatch", 8 ], + [ "cane", 12 ], + [ "bat", 8 ], + [ "football", 12 ], + [ "baseball", 12 ], + [ "glass_plate", 15 ], + [ "glass_bowl", 15 ], + [ "glass", 15 ], + [ "ceramic_cup", 15 ], + [ "ceramic_bowl", 15 ], + [ "ceramic_plate", 15 ], + { "group": "tinware", "prob": 25 }, + [ "bowling_ball", 12 ], + [ "spiral_stone", 1 ], + [ "petrified_eye", 1 ], + [ "teapot", 15 ], + [ "briefcase", 10 ], + [ "gold_watch", 5 ], + [ "silver_watch", 10 ], + [ "jade_brooch", 12 ], + [ "silver_locket", 8 ], + [ "gold_locket", 4 ], + [ "ring_signet", 4 ], + [ "ring_engagement", 2 ], + [ "ring_wedding", 1 ], + [ "pistol_flintlock", 4 ], + [ "carbine_flintlock", 4 ], + [ "rifle_flintlock", 4 ], + [ "boxing_gloves", 12 ], + [ "straw_doll", 1 ], + [ "pitchfork", 1 ], + [ "straw_sandals", 1 ], + [ "holy_symbol", 10 ], + [ "magic_8_ball", 1 ], + [ "coin_quarter", 1 ], + [ "bronze_medal", 1 ], + [ "silver_medal", 1 ], + [ "gold_medal", 1 ] + ] + }, + { + "type": "item_group", + "id": "antique_rare", + "items": [ + [ "trex_gun", 4 ], + [ "spiral_stone", 2 ], + [ "cutlass", 2 ], + [ "broadsword", 2 ], + [ "nodachi", 2 ], + [ "zweihander", 2 ], + [ "longsword", 2 ], + [ "katana", 2 ], + [ "kris", 2 ], + [ "rapier", 2 ], + [ "cavalry_sabre", 2 ], + [ "glaive", 2 ], + [ "naginata", 2 ], + [ "naginata_fake", 2 ], + [ "naginata_inferior", 3 ], + [ "estoc", 2 ], + [ "estoc_fake", 6 ], + [ "qiang", 3 ], + [ "halberd", 2 ], + [ "halberd_fake", 7 ], + [ "lucern_hammer", 2 ], + [ "lucern_hammerfake", 7 ], + [ "katana_fake", 4 ], + [ "katana_inferior", 8 ], + [ "zweihander_fake", 4 ], + [ "zweihander_inferior", 8 ], + [ "cutlass_fake", 4 ], + [ "cutlass_inferior", 8 ], + [ "jian", 2 ], + [ "jian_fake", 4 ], + [ "jian_inferior", 8 ], + [ "scimitar", 4 ], + [ "scimitar_fake", 8 ], + [ "arming_sword", 4 ], + [ "arming_sword_fake", 8 ], + [ "broadsword_fake", 4 ], + [ "broadsword_inferior", 8 ], + [ "longsword_fake", 4 ], + [ "longsword_inferior", 8 ], + [ "rapier_fake", 4 ], + [ "cavalry_sabre_fake", 4 ], + [ "wakizashi_fake", 4 ], + [ "wakizashi_inferior", 8 ], + [ "kris_fake", 8 ], + [ "pistol_flintlock", 4 ], + [ "carbine_flintlock", 4 ], + [ "rifle_flintlock", 4 ], + [ "petrified_eye", 2 ], + [ "ji", 1 ], + [ "dao", 3 ], + [ "sword_xiphos", 4 ], + [ "khopesh", 4 ], + [ "spear_dory", 3 ] + ] + }, + { + "id": "pottery", + "type": "item_group", + "items": [ + [ "bowl_clay", 10 ], + [ "clay_canister", 15 ], + [ "clay_hydria", 10 ], + [ "clay_watercont", 10 ], + [ "jug_clay", 15 ], + [ "ceramic_plate", 15 ], + [ "ceramic_bowl", 15 ], + [ "ceramic_cup", 15 ], + [ "jug_clay", 15 ] + ] + } +] diff --git a/data/json/itemgroups/drugs.json b/data/json/itemgroups/drugs.json index 865427188fcbf..038e054ecb350 100644 --- a/data/json/itemgroups/drugs.json +++ b/data/json/itemgroups/drugs.json @@ -147,5 +147,10 @@ [ "flu_shot", 5 ], [ "syringe", 8 ] ] + }, + { + "type": "item_group", + "id": "meth_ingredients", + "items": [ [ "dayquil", 2 ], [ "aspirin", 40 ], [ "adderall", 5 ], [ "energy_drink", 2 ], [ "caffeine", 20 ] ] } ] diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json index 0beed9d1f863b..d6d6122259d8c 100644 --- a/data/json/itemgroups/electronics.json +++ b/data/json/itemgroups/electronics.json @@ -101,5 +101,16 @@ [ "l-stick", 1 ], [ "reading_light", 6 ] ] + }, + { + "type": "item_group", + "subtype": "distribution", + "id": "phones", + "items": [ + { "item": "cell_phone", "prob": 9, "charges-min": 0, "charges-max": 15 }, + { "item": "cell_phone", "prob": 1, "charges-min": 150, "charges-max": 150 }, + { "item": "smart_phone", "prob": 9, "charges-min": 0, "charges-max": 15 }, + { "item": "smart_phone", "prob": 1, "charges-min": 130, "charges-max": 130 } + ] } ] diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 32fc78ef60dff..e424787c33ada 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -10,301 +10,6 @@ [ "beekeeping_gloves", 5 ] ] }, - { - "type": "item_group", - "id": "trash", - "ammo": 20, - "magazine": 50, - "items": [ - [ "plastic_shopping_bag", 35 ], - [ "iodine", 5 ], - [ "prussian_blue", 5 ], - [ "bum_wine", 5 ], - [ "meth", 2 ], - [ "heroin", 1 ], - [ "wrapper", 50 ], - [ "fp_loyalty_card", 5 ], - [ "string_6", 2 ], - [ "chain", 20 ], - [ "glass_sheet", 5 ], - { "item": "glass_shard", "prob": 20, "count": [ 1, 8 ] }, - [ "ceramic_shard", 15 ], - [ "stick", 95 ], - [ "seed_wheat", 5 ], - [ "seed_tomato", 5 ], - [ "seed_weed", 5 ], - [ "seed_flower", 5 ], - [ "seed_tobacco", 1 ], - [ "joint_roach", 5 ], - [ "pipe", 20 ], - [ "bag_plastic", 10 ], - [ "bottle_plastic", 10 ], - [ "bottle_plastic_small", 5 ], - [ "bag_canvas", 5 ], - [ "bag_canvas_small", 5 ], - [ "bottle_glass", 10 ], - [ "can_drink_unsealed", 10 ], - [ "can_food_unsealed", 10 ], - [ "box_small", 10 ], - [ "bubblewrap", 50 ], - [ "cig_butt", 30 ], - { "item": "lighter", "prob": 60, "charges-min": 0, "charges-max": 10 }, - { "item": "matches", "prob": 60, "charges-min": 0, "charges-max": 20 }, - [ "syringe", 8 ], - [ "tinder", 1 ], - [ "rag", 1 ], - [ "hairpin", 1 ], - [ "kevlar_plate", 1 ], - [ "ceramic_armor", 1 ], - [ "leather", 1 ], - [ "software_hacking", 10 ], - [ "news_regional", 8 ], - [ "file", 5 ], - [ "decoy_elfa", 10 ], - [ "recipe_elfa", 1 ], - [ "jug_plastic", 10 ], - [ "spray_can", 50 ], - [ "jar_glass", 10 ], - [ "jar_3l_glass", 8 ], - [ "flyer", 10 ], - [ "scorecard", 10 ], - [ "talking_doll", 60 ], - [ "marble", 65 ], - [ "handflare_dead", 3 ], - [ "creepy_doll", 1 ], - [ "straw_doll", 1 ], - [ "striped_shirt", 1 ], - [ "striped_pants", 1 ], - [ "foodperson_mask", 1 ], - [ "razor_blade", 10 ], - [ "survnote", 5 ], - [ "eclipse_glasses", 1 ], - [ "plastic_sheet", 5 ], - [ "balloon", 5 ], - [ "box_medium", 15 ], - [ "thermos", 30 ], - { "group": "tinware", "prob": 15 } - ] - }, - { - "type": "item_group", - "id": "trash_cart", - "items": [ - [ "bottle_plastic", 5 ], - [ "bottle_plastic_small", 15 ], - [ "bottle_glass", 2 ], - { "group": "tinware", "prob": 2 }, - [ "can_drink_unsealed", 5 ], - [ "plastic_shopping_bag", 13 ], - [ "bag_plastic", 15 ], - [ "wrapper", 30 ], - [ "flyer", 15 ], - [ "scorecard", 10 ], - [ "eclipse_glasses", 1 ], - [ "plastic_sheet", 5 ] - ] - }, - { - "type": "item_group", - "id": "art", - "items": [ - [ "petrified_eye", 1 ], - [ "spiral_stone", 20 ], - [ "cane", 10 ], - [ "candlestick", 20 ], - { "group": "tinware", "prob": 5 }, - [ "heels", 50 ], - [ "coat_fur_sf", 1 ], - [ "tricorne", 3 ], - [ "gold_bracelet", 8 ], - [ "gold_necklace", 8 ], - [ "gold_locket", 3 ], - [ "gold_ring", 8 ], - [ "gold_ear", 8 ], - [ "pearl_collar", 1 ], - [ "diamond_ring", 1 ], - [ "copper_bracelet", 1 ], - [ "copper_necklace", 1 ], - [ "copper_locket", 1 ], - [ "copper_ring", 1 ], - [ "copper_ear", 1 ], - [ "silver_bracelet", 10 ], - [ "silver_necklace", 10 ], - [ "silver_locket", 4 ], - [ "silver_ring", 10 ], - [ "silver_ear", 10 ], - [ "bead_ear", 10 ], - [ "jade_brooch", 2 ], - [ "diamond", 1 ], - [ "manual_dodge", 1 ], - [ "fancy_sunglasses", 2 ], - [ "pocketwatch", 5 ], - [ "well_pump", 1 ], - [ "nodachi", 1 ], - [ "katana", 2 ], - [ "rapier", 3 ], - [ "cavalry_sabre", 2 ], - [ "sf_watch", 5 ], - [ "platinum_watch", 1 ], - [ "ring_signet", 1 ], - [ "magic_8_ball", 1 ], - [ "coin_quarter", 1 ] - ] - }, - { - "type": "item_group", - "id": "medieval", - "items": [ - [ "katana", 2 ], - [ "katana_inferior", 2 ], - [ "cestus", 2 ], - [ "mace", 20 ], - [ "mace_inferior", 25 ], - [ "morningstar", 10 ], - [ "morningstar_inferior", 15 ], - [ "glaive", 10 ], - [ "rapier", 3 ], - [ "cavalry_sabre", 3 ], - [ "estoc", 3 ], - [ "estoc_inferior", 3 ], - [ "cutlass", 3 ], - [ "cutlass_inferior", 3 ], - [ "scimitar", 20 ], - [ "scimitar_inferior", 25 ], - [ "arming_sword", 25 ], - [ "arming_sword_inferior", 25 ], - [ "broadsword", 30 ], - [ "broadsword_inferior", 30 ], - [ "longsword", 25 ], - [ "longsword_inferior", 25 ], - [ "zweihander", 20 ], - [ "zweihander_inferior", 20 ], - [ "battleaxe", 20 ], - [ "battleaxe_inferior", 20 ], - [ "warhammer", 10 ], - [ "halberd", 5 ], - [ "lucern_hammer", 3 ], - [ "lucern_hammerfake", 5 ], - [ "pike", 5 ], - [ "pike_inferior", 10 ], - [ "spear_steel", 5 ], - [ "shillelagh", 3 ], - [ "shillelagh_weighted", 2 ], - [ "helmet_plate", 1 ], - [ "armor_plate", 2 ], - [ "huge_crossbow", 2 ], - [ "quiver", 2 ], - [ "quiver_large", 1 ], - [ "baldric", 4 ], - [ "nodachi", 1 ], - [ "nodachi_inferior", 2 ], - [ "gambeson", 3 ], - [ "tunic", 1 ], - [ "armor_lamellar", 2 ], - [ "armor_lightplate", 1 ], - [ "cuirass_lightplate", 2 ], - [ "armguard_lightplate", 1 ], - [ "legguard_lightplate", 1 ], - [ "armor_samurai", 1 ], - [ "helmet_kabuto", 1 ], - [ "gloves_plate", 1 ], - [ "boots_plate", 1 ], - [ "helmet_barbute", 1 ], - [ "helmet_conical", 1 ], - [ "helmet_galea", 1 ], - [ "helmet_nasal", 1 ], - [ "chainmail_suit", 1 ], - [ "chainmail_hood", 3 ], - [ "chainmail_vest", 3 ], - [ "chainmail_arms", 3 ], - [ "chainmail_legs", 3 ], - [ "chainmail_feet", 3 ], - [ "chainmail_hands", 3 ], - [ "legguard_metal", 1 ], - [ "textbook_weapwest", 5 ], - [ "textbook_weapeast", 5 ], - [ "textbook_armwest", 5 ], - [ "textbook_armeast", 5 ], - [ "textbook_armschina", 5 ], - [ "q_staff", 10 ], - [ "i_staff", 5 ], - [ "sword_bayonet", 10 ], - [ "bagh_nakha", 5 ], - [ "kris", 5 ], - [ "cheese_hard", 1 ], - [ "tinderbox", 4 ], - [ "flint_steel", 7 ], - [ "canteen_wood", 5 ], - [ "apron_leather", 1 ], - [ "pot_copper", 3 ], - { "group": "tinware", "prob": 10 } - ] - }, - { - "type": "item_group", - "id": "grenades", - "items": [ - [ "grenade", 30 ], - [ "grenade_inc", 30 ], - [ "flashbang", 30 ], - [ "EMPbomb", 20 ], - [ "grenade_emp", 5 ], - [ "gasbomb", 15 ], - [ "gasbomb_makeshift", 15 ], - [ "smokebomb", 50 ], - [ "dynamite", 50 ], - [ "mininuke", 5 ], - [ "c4", 50 ] - ] - }, - { - "type": "item_group", - "id": "weapons", - "items": [ - [ "chain", 20 ], - [ "knuckle_brass", 20 ], - [ "hammer", 35 ], - [ "wrench", 30 ], - [ "hammer_sledge", 4 ], - [ "hammer_sledge_short", 2 ], - [ "hatchet", 10 ], - [ "ax", 8 ], - [ "knife_combat", 14 ], - [ "kukri", 2 ], - [ "knife_hunting", 4 ], - [ "knife_rambo", 8 ], - [ "knife_rm42", 2 ], - [ "throwing_knife", 7 ], - [ "throwing_axe", 6 ], - [ "punch_dagger", 6 ], - [ "pipe", 20 ], - [ "bat", 60 ], - [ "bullwhip", 10 ], - [ "machete", 5 ], - [ "baton", 8 ], - [ "blackjack", 10 ], - [ "tazer", 3 ], - [ "rapier", 3 ], - [ "cavalry_sabre", 2 ], - [ "bat_metal", 60 ], - [ "e_tool", 2 ], - [ "knife_trench", 7 ], - [ "switchblade", 4 ], - [ "tonfa", 10 ], - [ "tonfa_wood", 10 ], - [ "shocktonfa_off", 5 ], - [ "tanto", 7 ], - [ "wakizashi", 3 ], - [ "nodachi", 1 ], - [ "katana", 2 ], - [ "survnote", 1 ] - ] - }, - { - "type": "item_group", - "id": "spiral", - "items": [ [ "spiral_stone", 20 ], [ "vortex_stone", 2 ] ] - }, { "type": "item_group", "id": "radio", @@ -511,22 +216,6 @@ [ "lsd", 6 ] ] }, - { - "type": "item_group", - "id": "wreckage", - "items": [ - [ "chain", 20 ], - [ "steel_chunk", 30 ], - [ "spring", 50 ], - [ "steel_lump", 30 ], - [ "frame", 20 ], - [ "hdframe", 20 ], - [ "cu_pipe", 25 ], - [ "scrap_copper", 50 ], - [ "rock", 40 ], - [ "survnote", 1 ] - ] - }, { "type": "item_group", "id": "moonshine_brew", @@ -541,235 +230,6 @@ [ "chem_ethanol", 5 ] ] }, - { - "type": "item_group", - "id": "cow", - "items": [ [ "cow_bell", 1 ] ] - }, - { - "type": "item_group", - "id": "dog_cop", - "items": [ [ "kevlar_harness", 1 ] ] - }, - { - "type": "item_group", - "id": "tobacco_products", - "items": [ - [ "cig", 60 ], - [ "tobacco", 20 ], - [ "chaw", 20 ], - [ "cigar", 10 ], - [ "ecig", 10 ], - [ "advanced_ecig", 8 ], - [ "nicotine_liquid", 15 ], - [ "pipe_tobacco", 10 ] - ] - }, - { - "type": "item_group", - "id": "trash_forest", - "items": [ - { "group": "ammo_casings", "prob": 3 }, - [ "rock", 5 ], - [ "ceramic_shard", 5 ], - [ "stick", 5 ], - [ "pine_bough", 2 ], - [ "hickory_root", 2 ], - [ "hickory_nut", 3 ], - [ "acorns", 2 ], - [ "pinecone", 3 ], - [ "flyer", 1 ], - [ "fp_loyalty_card", 1 ], - [ "one_year_old_newspaper", 1 ], - [ "months_old_newspaper", 2 ], - [ "weeks_old_newspaper", 3 ], - [ "newest_newspaper", 4 ], - [ "bag_plastic", 3 ], - [ "bottle_plastic", 2 ], - [ "bottle_plastic_small", 1 ], - [ "bag_canvas", 1 ], - [ "bag_canvas_small", 1 ], - [ "cup_plastic_unsealed", 3 ], - [ "bottle_glass", 1 ], - { "group": "tinware", "prob": 3 }, - [ "can_drink_unsealed", 2 ], - [ "can_food_unsealed", 1 ], - [ "box_small", 5 ], - [ "box_medium", 3 ], - [ "box_large", 1 ], - [ "plastic_sheet", 1 ], - [ "jug_plastic", 1 ], - [ "jar_glass", 2 ], - [ "jar_3l_glass", 1 ], - [ "wrapper", 3 ], - { "item": "withered", "prob": 5, "count-min": 1, "count-max": 10 }, - [ "straw_pile", 5 ], - [ "tinder", 1 ], - { "item": "plant_fibre", "prob": 2, "count-min": 1, "count-max": 10 }, - [ "string_6", 1 ], - [ "cig_butt", 4 ], - [ "string_36", 1 ], - [ "steel_lump", 1 ], - [ "steel_chunk", 1 ], - { "item": "scrap", "prob": 2, "count-min": 1, "count-max": 10 }, - { "item": "glass_shard", "prob": 3, "count-min": 8, "count-max": 84 }, - { "item": "feather", "prob": 5, "count-min": 5, "count-max": 10 }, - [ "wire", 1 ], - [ "wire_barbed", 1 ], - [ "splinter", 3 ], - [ "rag", 2 ], - [ "rag_bloody", 1 ], - [ "bone", 2 ], - [ "syringe", 1 ], - [ "spike", 1 ], - [ "tanbark", 2 ], - [ "thermos", 1 ], - [ "bag_body_bag", 1 ] - ] - }, - { - "type": "item_group", - "id": "antique", - "ammo": 75, - "magazine": 100, - "items": [ - [ "oxylamp", 50 ], - [ "cow_bell", 15 ], - [ "sickle", 2 ], - [ "scythe", 2 ], - [ "hollow_cane", 2 ], - [ "sword_cane", 2 ], - [ "pipe_tobacco", 10 ], - [ "talking_doll", 10 ], - [ "brazier", 12 ], - [ "candle", 10 ], - [ "alarmclock", 10 ], - [ "golf_club", 10 ], - [ "pocketwatch", 8 ], - [ "cane", 12 ], - [ "bat", 8 ], - [ "football", 12 ], - [ "baseball", 12 ], - [ "glass_plate", 15 ], - [ "glass_bowl", 15 ], - [ "glass", 15 ], - [ "ceramic_cup", 15 ], - [ "ceramic_bowl", 15 ], - [ "ceramic_plate", 15 ], - { "group": "tinware", "prob": 25 }, - [ "bowling_ball", 12 ], - [ "spiral_stone", 1 ], - [ "petrified_eye", 1 ], - [ "teapot", 15 ], - [ "briefcase", 10 ], - [ "gold_watch", 5 ], - [ "silver_watch", 10 ], - [ "jade_brooch", 12 ], - [ "silver_locket", 8 ], - [ "gold_locket", 4 ], - [ "ring_signet", 4 ], - [ "ring_engagement", 2 ], - [ "ring_wedding", 1 ], - [ "pistol_flintlock", 4 ], - [ "carbine_flintlock", 4 ], - [ "rifle_flintlock", 4 ], - [ "boxing_gloves", 12 ], - [ "straw_doll", 1 ], - [ "pitchfork", 1 ], - [ "straw_sandals", 1 ], - [ "holy_symbol", 10 ], - [ "magic_8_ball", 1 ], - [ "coin_quarter", 1 ], - [ "bronze_medal", 1 ], - [ "silver_medal", 1 ], - [ "gold_medal", 1 ] - ] - }, - { - "type": "item_group", - "id": "antique_rare", - "items": [ - [ "trex_gun", 4 ], - [ "spiral_stone", 2 ], - [ "cutlass", 2 ], - [ "broadsword", 2 ], - [ "nodachi", 2 ], - [ "zweihander", 2 ], - [ "longsword", 2 ], - [ "katana", 2 ], - [ "kris", 2 ], - [ "rapier", 2 ], - [ "cavalry_sabre", 2 ], - [ "glaive", 2 ], - [ "naginata", 2 ], - [ "naginata_fake", 2 ], - [ "naginata_inferior", 3 ], - [ "estoc", 2 ], - [ "estoc_fake", 6 ], - [ "qiang", 3 ], - [ "halberd", 2 ], - [ "halberd_fake", 7 ], - [ "lucern_hammer", 2 ], - [ "lucern_hammerfake", 7 ], - [ "katana_fake", 4 ], - [ "katana_inferior", 8 ], - [ "zweihander_fake", 4 ], - [ "zweihander_inferior", 8 ], - [ "cutlass_fake", 4 ], - [ "cutlass_inferior", 8 ], - [ "jian", 2 ], - [ "jian_fake", 4 ], - [ "jian_inferior", 8 ], - [ "scimitar", 4 ], - [ "scimitar_fake", 8 ], - [ "arming_sword", 4 ], - [ "arming_sword_fake", 8 ], - [ "broadsword_fake", 4 ], - [ "broadsword_inferior", 8 ], - [ "longsword_fake", 4 ], - [ "longsword_inferior", 8 ], - [ "rapier_fake", 4 ], - [ "cavalry_sabre_fake", 4 ], - [ "wakizashi_fake", 4 ], - [ "wakizashi_inferior", 8 ], - [ "kris_fake", 8 ], - [ "pistol_flintlock", 4 ], - [ "carbine_flintlock", 4 ], - [ "rifle_flintlock", 4 ], - [ "petrified_eye", 2 ], - [ "ji", 1 ], - [ "dao", 3 ], - [ "sword_xiphos", 4 ], - [ "khopesh", 4 ], - [ "spear_dory", 3 ] - ] - }, - { - "type": "item_group", - "subtype": "distribution", - "id": "phones", - "items": [ - { "item": "cell_phone", "prob": 9, "charges-min": 0, "charges-max": 15 }, - { "item": "cell_phone", "prob": 1, "charges-min": 150, "charges-max": 150 }, - { "item": "smart_phone", "prob": 9, "charges-min": 0, "charges-max": 15 }, - { "item": "smart_phone", "prob": 1, "charges-min": 130, "charges-max": 130 } - ] - }, - { - "id": "pottery", - "type": "item_group", - "items": [ - [ "bowl_clay", 10 ], - [ "clay_canister", 15 ], - [ "clay_hydria", 10 ], - [ "clay_watercont", 10 ], - [ "jug_clay", 15 ], - [ "ceramic_plate", 15 ], - [ "ceramic_bowl", 15 ], - [ "ceramic_cup", 15 ], - [ "jug_clay", 15 ] - ] - }, { "type": "item_group", "id": "roof_holdout", @@ -854,15 +314,5 @@ [ "golf_ball", 20 ], { "group": "alcohol_bottled_canned", "prob": 343 } ] - }, - { - "type": "item_group", - "id": "maps", - "items": [ { "item": "roadmap", "prob": 33 }, { "item": "touristmap", "prob": 33 }, { "item": "survivormap", "prob": 33 } ] - }, - { - "type": "item_group", - "id": "meth_ingredients", - "items": [ [ "dayquil", 2 ], [ "aspirin", 40 ], [ "adderall", 5 ], [ "energy_drink", 2 ], [ "caffeine", 20 ] ] } ] diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 7a6f43da0627c..5f0d7676bc50d 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -148,5 +148,29 @@ "type": "item_group", "//": "Horse vehicle items", "items": [ [ "horse_tack", 50 ], [ "yoke_harness", 50 ], [ "reins_tackle", 50 ] ] + }, + { + "type": "item_group", + "id": "maps", + "items": [ { "item": "roadmap", "prob": 33 }, { "item": "touristmap", "prob": 33 }, { "item": "survivormap", "prob": 33 } ] + }, + { + "type": "item_group", + "id": "tobacco_products", + "items": [ + [ "cig", 60 ], + [ "tobacco", 20 ], + [ "chaw", 20 ], + [ "cigar", 10 ], + [ "ecig", 10 ], + [ "advanced_ecig", 8 ], + [ "nicotine_liquid", 15 ], + [ "pipe_tobacco", 10 ] + ] + }, + { + "type": "item_group", + "id": "spiral", + "items": [ [ "spiral_stone", 20 ], [ "vortex_stone", 2 ] ] } ] diff --git a/data/json/itemgroups/monster_drops_lairs.json b/data/json/itemgroups/monster_drops_lairs.json index 12e93d8632047..a8716a32a77e9 100644 --- a/data/json/itemgroups/monster_drops_lairs.json +++ b/data/json/itemgroups/monster_drops_lairs.json @@ -267,5 +267,15 @@ [ "can_sealer", 10 ], [ "remotevehcontrol", 8 ] ] + }, + { + "type": "item_group", + "id": "cow", + "items": [ [ "cow_bell", 1 ] ] + }, + { + "type": "item_group", + "id": "dog_cop", + "items": [ [ "kevlar_harness", 1 ] ] } ] diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json new file mode 100644 index 0000000000000..9c216b4cf6f9a --- /dev/null +++ b/data/json/itemgroups/trash_and_debris.json @@ -0,0 +1,174 @@ +[ + { + "type": "item_group", + "id": "wreckage", + "items": [ + [ "chain", 20 ], + [ "steel_chunk", 30 ], + [ "spring", 50 ], + [ "steel_lump", 30 ], + [ "frame", 20 ], + [ "hdframe", 20 ], + [ "cu_pipe", 25 ], + [ "scrap_copper", 50 ], + [ "rock", 40 ], + [ "survnote", 1 ] + ] + }, + { + "type": "item_group", + "id": "trash_forest", + "items": [ + { "group": "ammo_casings", "prob": 3 }, + [ "rock", 5 ], + [ "ceramic_shard", 5 ], + [ "stick", 5 ], + [ "pine_bough", 2 ], + [ "hickory_root", 2 ], + [ "hickory_nut", 3 ], + [ "acorns", 2 ], + [ "pinecone", 3 ], + [ "flyer", 1 ], + [ "fp_loyalty_card", 1 ], + [ "one_year_old_newspaper", 1 ], + [ "months_old_newspaper", 2 ], + [ "weeks_old_newspaper", 3 ], + [ "newest_newspaper", 4 ], + [ "bag_plastic", 3 ], + [ "bottle_plastic", 2 ], + [ "bottle_plastic_small", 1 ], + [ "bag_canvas", 1 ], + [ "bag_canvas_small", 1 ], + [ "cup_plastic_unsealed", 3 ], + [ "bottle_glass", 1 ], + { "group": "tinware", "prob": 3 }, + [ "can_drink_unsealed", 2 ], + [ "can_food_unsealed", 1 ], + [ "box_small", 5 ], + [ "box_medium", 3 ], + [ "box_large", 1 ], + [ "plastic_sheet", 1 ], + [ "jug_plastic", 1 ], + [ "jar_glass", 2 ], + [ "jar_3l_glass", 1 ], + [ "wrapper", 3 ], + { "item": "withered", "prob": 5, "count-min": 1, "count-max": 10 }, + [ "straw_pile", 5 ], + [ "tinder", 1 ], + { "item": "plant_fibre", "prob": 2, "count-min": 1, "count-max": 10 }, + [ "string_6", 1 ], + [ "cig_butt", 4 ], + [ "string_36", 1 ], + [ "steel_lump", 1 ], + [ "steel_chunk", 1 ], + { "item": "scrap", "prob": 2, "count-min": 1, "count-max": 10 }, + { "item": "glass_shard", "prob": 3, "count-min": 8, "count-max": 84 }, + { "item": "feather", "prob": 5, "count-min": 5, "count-max": 10 }, + [ "wire", 1 ], + [ "wire_barbed", 1 ], + [ "splinter", 3 ], + [ "rag", 2 ], + [ "rag_bloody", 1 ], + [ "bone", 2 ], + [ "syringe", 1 ], + [ "spike", 1 ], + [ "tanbark", 2 ], + [ "thermos", 1 ], + [ "bag_body_bag", 1 ] + ] + }, + { + "type": "item_group", + "id": "trash", + "ammo": 20, + "magazine": 50, + "items": [ + [ "plastic_shopping_bag", 35 ], + [ "iodine", 5 ], + [ "prussian_blue", 5 ], + [ "bum_wine", 5 ], + [ "meth", 2 ], + [ "heroin", 1 ], + [ "wrapper", 50 ], + [ "fp_loyalty_card", 5 ], + [ "string_6", 2 ], + [ "chain", 20 ], + [ "glass_sheet", 5 ], + { "item": "glass_shard", "prob": 20, "count": [ 1, 8 ] }, + [ "ceramic_shard", 15 ], + [ "stick", 95 ], + [ "seed_wheat", 5 ], + [ "seed_tomato", 5 ], + [ "seed_weed", 5 ], + [ "seed_flower", 5 ], + [ "seed_tobacco", 1 ], + [ "joint_roach", 5 ], + [ "pipe", 20 ], + [ "bag_plastic", 10 ], + [ "bottle_plastic", 10 ], + [ "bottle_plastic_small", 5 ], + [ "bag_canvas", 5 ], + [ "bag_canvas_small", 5 ], + [ "bottle_glass", 10 ], + [ "can_drink_unsealed", 10 ], + [ "can_food_unsealed", 10 ], + [ "box_small", 10 ], + [ "bubblewrap", 50 ], + [ "cig_butt", 30 ], + { "item": "lighter", "prob": 60, "charges-min": 0, "charges-max": 10 }, + { "item": "matches", "prob": 60, "charges-min": 0, "charges-max": 20 }, + [ "syringe", 8 ], + [ "tinder", 1 ], + [ "rag", 1 ], + [ "hairpin", 1 ], + [ "kevlar_plate", 1 ], + [ "ceramic_armor", 1 ], + [ "leather", 1 ], + [ "software_hacking", 10 ], + [ "news_regional", 8 ], + [ "file", 5 ], + [ "decoy_elfa", 10 ], + [ "recipe_elfa", 1 ], + [ "jug_plastic", 10 ], + [ "spray_can", 50 ], + [ "jar_glass", 10 ], + [ "jar_3l_glass", 8 ], + [ "flyer", 10 ], + [ "scorecard", 10 ], + [ "talking_doll", 60 ], + [ "marble", 65 ], + [ "handflare_dead", 3 ], + [ "creepy_doll", 1 ], + [ "straw_doll", 1 ], + [ "striped_shirt", 1 ], + [ "striped_pants", 1 ], + [ "foodperson_mask", 1 ], + [ "razor_blade", 10 ], + [ "survnote", 5 ], + [ "eclipse_glasses", 1 ], + [ "plastic_sheet", 5 ], + [ "balloon", 5 ], + [ "box_medium", 15 ], + [ "thermos", 30 ], + { "group": "tinware", "prob": 15 } + ] + }, + { + "type": "item_group", + "id": "trash_cart", + "items": [ + [ "bottle_plastic", 5 ], + [ "bottle_plastic_small", 15 ], + [ "bottle_glass", 2 ], + { "group": "tinware", "prob": 2 }, + [ "can_drink_unsealed", 5 ], + [ "plastic_shopping_bag", 13 ], + [ "bag_plastic", 15 ], + [ "wrapper", 30 ], + [ "flyer", 15 ], + [ "scorecard", 10 ], + [ "eclipse_glasses", 1 ], + [ "plastic_sheet", 5 ] + ] + } +] diff --git a/data/json/itemgroups/weapons_misc.json b/data/json/itemgroups/weapons_misc.json new file mode 100644 index 0000000000000..b236ec8da1ecc --- /dev/null +++ b/data/json/itemgroups/weapons_misc.json @@ -0,0 +1,62 @@ +[ + { + "type": "item_group", + "id": "weapons", + "items": [ + [ "chain", 20 ], + [ "knuckle_brass", 20 ], + [ "hammer", 35 ], + [ "wrench", 30 ], + [ "hammer_sledge", 4 ], + [ "hammer_sledge_short", 2 ], + [ "hatchet", 10 ], + [ "ax", 8 ], + [ "knife_combat", 14 ], + [ "kukri", 2 ], + [ "knife_hunting", 4 ], + [ "knife_rambo", 8 ], + [ "knife_rm42", 2 ], + [ "throwing_knife", 7 ], + [ "throwing_axe", 6 ], + [ "punch_dagger", 6 ], + [ "pipe", 20 ], + [ "bat", 60 ], + [ "bullwhip", 10 ], + [ "machete", 5 ], + [ "baton", 8 ], + [ "blackjack", 10 ], + [ "tazer", 3 ], + [ "rapier", 3 ], + [ "cavalry_sabre", 2 ], + [ "bat_metal", 60 ], + [ "e_tool", 2 ], + [ "knife_trench", 7 ], + [ "switchblade", 4 ], + [ "tonfa", 10 ], + [ "tonfa_wood", 10 ], + [ "shocktonfa_off", 5 ], + [ "tanto", 7 ], + [ "wakizashi", 3 ], + [ "nodachi", 1 ], + [ "katana", 2 ], + [ "survnote", 1 ] + ] + }, + { + "type": "item_group", + "id": "grenades", + "items": [ + [ "grenade", 30 ], + [ "grenade_inc", 30 ], + [ "flashbang", 30 ], + [ "EMPbomb", 20 ], + [ "grenade_emp", 5 ], + [ "gasbomb", 15 ], + [ "gasbomb_makeshift", 15 ], + [ "smokebomb", 50 ], + [ "dynamite", 50 ], + [ "mininuke", 5 ], + [ "c4", 50 ] + ] + } +]