Skip to content

Commit

Permalink
Merge branch 'keyboardformat_port_update2' of https://github.com/cata…
Browse files Browse the repository at this point in the history
…clysmbnteam/Cataclysm-BN into keyboardformat_port_update2
  • Loading branch information
Kenan2000 committed May 15, 2024
2 parents 5713e3e + 2c87ebc commit 6da9642
Show file tree
Hide file tree
Showing 74 changed files with 987 additions and 925 deletions.
2 changes: 1 addition & 1 deletion data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@
"id": "bio_razors",
"type": "bionic",
"name": { "str": "Fingertip Razors" },
"description": "You possess razor-sharp claws underneath your fingernails that do a small amount of unarmed slashing damage whenever your fingertips are uncovered.",
"description": "You possess razor-sharp claws underneath your fingernails that do a fair amount of unarmed slashing damage whenever your fingertips are uncovered, and which you can use with some precision to cut and butcher..",
"occupied_bodyparts": [ [ "hand_l", 2 ], [ "hand_r", 2 ] ],
"fake_item": "fake_razor",
"flags": [ "BIONIC_NPC_USABLE" ]
Expand Down
11 changes: 11 additions & 0 deletions data/json/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -2158,5 +2158,16 @@
"id": "ROOF",
"type": "json_flag",
"context": [ ]
},
{
"id": "WEATHER_FORECAST",
"type": "json_flag",
"context": [ "ARMOR", "TOOL_ARMOR" ],
"info": "It can show the automated weather forcast."
},
{
"id": "WINDMETER",
"type": "json_flag",
"context": [ ]
}
]
16 changes: 16 additions & 0 deletions data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,22 @@
{ "item": "game_watch", "prob": 20 }
]
},
{
"id": "clothing_cleaning",
"type": "item_group",
"//": "wearable utility or protective gear for janitors and household cleaning purposes",
"//2": "Not intended to be a set of clothing for NPCs or monsters",
"items": [
[ "glasses_safety", 25 ],
[ "mask_dust", 15 ],
[ "mask_filter", 10 ],
[ "gloves_rubber", 15 ],
[ "gloves_medical", 10 ],
[ "boots_rubber", 15 ],
[ "fishing_waders", 5 ],
[ "knee_pads", 5 ]
]
},
{
"id": "clothing_work_boots",
"type": "item_group",
Expand Down
3 changes: 2 additions & 1 deletion data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
[ "aspirin", 50 ],
[ "bandages", 50 ],
[ "cotton_ball", 40 ],
[ "disinfectant", 30 ],
[ "disinfectant", 20 ],
[ "chem_hydrogen_peroxide", 30 ],
[ "eyedrops", 10 ],
[ "medical_gauze", 20 ],
[ "medical_tape", 20 ],
Expand Down
63 changes: 55 additions & 8 deletions data/json/itemgroups/Locations_MapExtras/Arsonist_stock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,63 @@
{
"type": "item_group",
"id": "NC_ARSONIST_STOCK",
"//": "Shopekeeper inventory for the arsonist NPC that spawns at the refugee center",
"subtype": "collection",
"items": [
{ "item": "molotov", "count": 50 },
{ "item": "improvised_pipebomb", "count": 50 },
{ "item": "fuse", "count": 20 },
{ "item": "FMCNote", "count": 3 },
{ "item": "nail", "count": 5 },
{ "item": "rebar_rail", "count": 5 },
{ "item": "textbook_anarch", "count": 1 },
{ "item": "fertilizer_commercial", "count": 1 }
{ "item": "FMCNote", "count": [ 5, 10 ] },
{ "item": "molotov", "count": [ 15, 30 ] },
{ "item": "improvised_pipebomb", "count": [ 10, 20 ] },
{ "group": "NC_ARSONIST_STOCK_crafting_supplies", "count": [ 5, 10 ] },
{ "group": "NC_ARSONIST_STOCK_scrap", "count": [ 5, 10 ] },
{ "group": "NC_ARSONIST_STOCK_books", "count": [ 1, 2 ] },
{
"distribution": [
{ "item": "lighter", "prob": 25 },
{ "item": "ref_lighter", "prob": 25 },
{ "item": "electric_lighter", "prob": 25 },
{ "item": "matches", "prob": 25 }
]
}
]
},
{
"id": "NC_ARSONIST_STOCK_crafting_supplies",
"type": "item_group",
"subtype": "distribution",
"entries": [
{ "item": "gasoline", "prob": 15, "container-item": "jar_glass", "charges": [ 250, 500 ] },
{ "item": "diesel", "prob": 15, "container-item": "jar_glass", "charges": [ 250, 500 ] },
{ "item": "motor_oil", "prob": 10, "container-item": "jar_glass", "charges": [ 250, 500 ] },
{ "item": "denat_alcohol", "prob": 10, "container-item": "jar_glass", "charges": [ 250, 500 ] },
{ "item": "fuse", "prob": 25, "charges": [ 5, 10 ] },
{ "item": "gunpowder", "prob": 5, "charges": [ 200, 400 ] },
{ "item": "chem_match_head_powder", "prob": 5, "charges": [ 100, 200 ] },
{ "item": "fertilizer_commercial", "prob": 10, "charges": [ 30, 60 ] }
]
},
{
"id": "NC_ARSONIST_STOCK_scrap",
"type": "item_group",
"subtype": "distribution",
"entries": [
{ "item": "pipe", "prob": 25, "charges": [ 2, 4 ] },
{ "item": "nail", "prob": 25, "charges": [ 25, 50 ] },
{ "item": "rebar", "prob": 20, "charges": [ 2, 4 ] },
{ "item": "wire", "prob": 5, "charges": [ 2, 4 ] },
{ "item": "chain", "prob": 5 },
{ "item": "scrap", "prob": 10, "charges": [ 5, 10 ] },
{ "item": "material_aluminium_ingot", "prob": 10, "count": [ 2, 4 ] }
]
},
{
"id": "NC_ARSONIST_STOCK_books",
"type": "item_group",
"subtype": "distribution",
"entries": [
{ "item": "textbook_anarch", "prob": 50 },
{ "item": "textbook_fireman", "prob": 30 },
{ "item": "textbook_gaswarfare", "prob": 10 },
{ "item": "atomic_survival", "prob": 10 }
]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{ "item": "aspirin", "prob": 85 },
{ "item": "caffeine", "prob": 25 },
{ "group": "tobacco_products", "prob": 161 },
{ "item": "sponge", "prob": 10 },
{ "group": "tools_cleaning_small", "prob": 10 },
{ "group": "ammo_pocket_batteries_full", "prob": 50 },
{ "item": "vibrator", "prob": 3 },
{ "item": "condom", "prob": 5, "count": [ 1, 3 ] },
Expand Down Expand Up @@ -104,7 +104,7 @@
[ "bowl_plastic", 20 ],
[ "canteen", 10 ],
[ "flask_hip", 15 ],
[ "sponge", 30 ],
{ "group": "tools_cleaning_small", "prob": 30 },
[ "pan", 15 ],
[ "pot", 15 ],
[ "teapot", 15 ],
Expand Down
33 changes: 14 additions & 19 deletions data/json/itemgroups/SUS/domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,9 @@
"//2": "This group is for the cleaning materials under a kitchen sink.",
"subtype": "collection",
"entries": [
{ "item": "detergent", "count": [ 1, 2 ] },
{ "item": "rag", "count": [ 1, 6 ] },
{ "item": "towel", "count": [ 1, 3 ] },
{ "item": "brush" },
{ "item": "brush", "prob": 85 },
{ "item": "bleach", "prob": 75, "charges-min": 1 },
{ "item": "ammonia", "prob": 65, "charges-min": 1 }
{ "group": "tools_cleaning_small", "count": [ 1, 3 ] },
{ "group": "supplies_household_cleaning", "count": [ 1, 3 ] },
{ "group": "clothing_cleaning", "prob": 50, "count": [ 1, 2 ] }
]
},
{
Expand Down Expand Up @@ -352,7 +348,7 @@
"//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
"//2": "This group is for things you often find stored on or next to a toilet.",
"subtype": "collection",
"entries": [ { "item": "bathroom_scale", "prob": 50 } ]
"entries": [ { "item": "paper", "charges": [ 10, 50 ] }, { "item": "bathroom_scale", "prob": 25 } ]
},
{
"id": "SUS_bathroom_cabinet",
Expand All @@ -361,21 +357,20 @@
"//2": "This group is for a bathroom cabinet under the sink.",
"subtype": "collection",
"entries": [
{ "item": "soap", "count": [ 1, 4 ], "prob": 70 },
{ "group": "supplies_household_cleaning", "count": [ 1, 3 ], "prob": 75 },
{ "group": "tools_cleaning_common", "count": [ 1, 3 ], "prob": 75 },
{ "group": "drugs_heal_simple", "count": [ 1, 2 ], "prob": 50 },
{
"distribution": [ { "item": "razor_shaving", "count": [ 1, 2 ], "prob": 50 }, { "item": "shavingkit", "prob": 50 } ],
"distribution": [
{ "item": "razor_blade", "count": [ 1, 3 ], "prob": 25 },
{ "item": "razor_shaving", "count": [ 1, 2 ], "prob": 25 },
{ "item": "shavingkit", "prob": 25 },
{ "item": "elec_hairtrimmer", "prob": 25 }
],
"prob": 75
},
{
"distribution": [ { "item": "bandages", "prob": 60 }, { "item": "medical_gauze", "prob": 20 }, { "item": "1st_aid", "prob": 10 } ],
"prob": 20
},
{ "item": "disinfectant", "prob": 40 },
{ "item": "chem_hydrogen_peroxide", "prob": 50 },
{ "item": "mirror", "prob": 25 },
{ "item": "sponge", "count": [ 1, 3 ], "prob": 75 },
{ "collection": [ { "item": "candle", "count": [ 1, 2 ] }, { "item": "matches" } ], "prob": 20 },
{ "item": "towel", "count": [ 1, 2 ], "prob": 75 }
{ "group": "tools_lighting", "prob": 25 }
]
},
{
Expand Down
16 changes: 3 additions & 13 deletions data/json/itemgroups/SUS/office.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,10 @@
"//2": "This group is for a typical janitors closet with cleaning chemicals and tools.",
"subtype": "collection",
"entries": [
{ "item": "bleach", "prob": 90, "charges-min": 20 },
{ "item": "ammonia", "prob": 75, "charges-min": 20 },
{ "item": "broom", "prob": 95 },
{ "item": "mop", "prob": 95 },
{ "item": "sponge", "prob": 90 },
{ "item": "rag", "count": [ 1, 6 ] },
{ "item": "towel", "count": [ 1, 2 ], "prob": 80 },
{ "item": "brush", "prob": 95 },
{ "item": "bucket", "prob": 90 },
{ "item": "boots_rubber", "prob": 90 },
{ "item": "gloves_rubber", "prob": 90 },
{ "group": "supplies_household_cleaning", "count": [ 2, 4 ], "prob": 75 },
{ "group": "tools_cleaning_common", "count": [ 2, 6 ], "prob": 75 },
{ "group": "clothing_cleaning", "count": [ 1, 3 ], "prob": 75 },
{ "item": "chem_hydrogen_peroxide", "prob": 40, "charges-min": 4 },
{ "item": "soap", "count": [ 1, 2 ], "prob": 70 },
{ "item": "detergent", "count": [ 1, 2 ], "prob": 80 },
{ "item": "paper", "charges": [ 50, 100 ], "prob": 90 }
]
}
Expand Down
29 changes: 6 additions & 23 deletions data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
{ "item": "lemonlime", "prob": 10, "container-item": "bottle_plastic" },
{ "item": "orangesoda", "prob": 15, "container-item": "bottle_plastic" },
{ "item": "colamdew", "prob": 10, "container-item": "bottle_plastic" },
{ "item": "sponge", "prob": 5 },
{ "group": "tools_cleaning_small", "prob": 5 },
{ "group": "tobacco_products", "prob": 151 },
{ "item": "weed", "prob": 10 },
{ "item": "joint", "prob": 10 },
Expand Down Expand Up @@ -417,7 +417,8 @@
{ "item": "hat_chef", "prob": 2 },
{ "item": "jacket_chef", "prob": 2 },
{ "item": "pot", "prob": 25 },
{ "item": "sponge", "prob": 30 },
{ "group": "tools_cleaning_small", "prob": 50 },
{ "group": "supplies_household_cleaning", "prob": 150 },
{ "item": "pot_copper", "prob": 15 },
{ "item": "pot_canning", "prob": 15 },
{ "item": "pressure_cooker", "prob": 5 },
Expand All @@ -428,14 +429,11 @@
{ "group": "pantry_liquids", "prob": 160 },
{ "item": "knife_butcher", "prob": 10 },
{ "item": "cookbook", "prob": 35 },
{ "item": "rag", "prob": 1 },
{ "item": "popcan_stove", "prob": 5 },
{ "group": "alcohol", "prob": 101 },
{ "item": "sweet_sausage", "prob": 2 },
{ "item": "roasted_coffee_bean", "prob": 10 },
{ "item": "bacon", "prob": 25 },
{ "item": "bleach", "prob": 20, "charges-min": 1 },
{ "item": "ammonia", "prob": 24, "charges-min": 1 },
{ "item": "milk_powder", "prob": 15 },
{ "item": "powder_eggs", "prob": 20 },
{
Expand Down Expand Up @@ -536,16 +534,13 @@
{ "item": "tongs", "prob": 25 },
{ "item": "lawn_dart", "prob": 10 },
{ "item": "flask_hip", "prob": 5 },
{ "item": "lye_powder", "prob": 5 },
{ "item": "atomic_light", "prob": 1 },
{ "item": "atomic_lamp", "prob": 1 },
{ "item": "smart_lamp", "prob": 2 },
{ "item": "dog_whistle", "prob": 5 },
{ "item": "dogfood", "prob": 20, "container-item": "can_medium" },
{ "item": "catfood", "prob": 20, "container-item": "can_food" },
{ "item": "charcoal", "prob": 5 },
{ "item": "soap", "prob": 70 },
{ "item": "detergent", "prob": 50 },
{ "item": "survnote", "prob": 1 },
{ "item": "cookbook_sushi", "prob": 5 },
{ "item": "scots_cookbook", "prob": 6 },
Expand Down Expand Up @@ -964,32 +959,20 @@
"id": "cleaning",
"subtype": "distribution",
"entries": [
{ "group": "supplies_household_cleaning", "prob": 250 },
{ "group": "tools_cleaning_common", "prob": 150 },
{ "group": "clothing_cleaning", "prob": 100 },
{ "item": "salt_water", "prob": 20 },
{ "item": "bleach", "prob": 20, "charges-min": 1 },
{ "item": "ammonia", "prob": 24, "charges-min": 1 },
{ "item": "broom", "prob": 30 },
{ "item": "mop", "prob": 30 },
{ "item": "sponge", "prob": 30 },
{ "item": "gloves_rubber", "prob": 20 },
{ "item": "mask_dust", "prob": 65 },
{ "item": "towel", "prob": 40 },
{ "item": "bottle_plastic", "prob": 10 },
{ "item": "bottle_plastic_small", "prob": 5 },
{ "item": "sewing_kit", "prob": 47 },
{ "item": "tailors_kit", "prob": 3 },
{ "item": "thread", "prob": 40 },
{ "item": "rag", "prob": 1 },
{ "item": "scissors", "prob": 50 },
{ "item": "string_36", "prob": 40 },
{ "item": "vinegar", "prob": 10 },
{ "item": "lye_powder", "prob": 5 },
{ "item": "oxy_powder", "prob": 5 },
{ "item": "boots_rubber", "prob": 20 },
{ "item": "charcoal", "prob": 5 },
{ "item": "fungicide", "prob": 2 },
{ "item": "insecticide", "prob": 2 },
{ "item": "soap", "prob": 80 },
{ "item": "detergent", "prob": 80 },
{ "item": "chem_hydrogen_peroxide", "prob": 20 }
]
},
Expand Down
16 changes: 16 additions & 0 deletions data/json/itemgroups/supplies.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,22 @@
{ "item": "leather", "prob": 50, "count": [ 3, 6 ] }
]
},
{
"id": "supplies_household_cleaning",
"//": "General purpose cleaning solvents, detergents, and the like for around the kitchen, bathroom, and the like.",
"type": "item_group",
"subtype": "distribution",
"entries": [
{ "item": "soap", "prob": 25, "charges-min": 1 },
{ "item": "detergent", "prob": 25, "charges-min": 1 },
{ "item": "bleach", "prob": 15, "charges-min": 1 },
{ "item": "ammonia", "prob": 15, "charges-min": 1 },
{ "item": "vinegar", "prob": 5, "charges-min": 1 },
{ "item": "lye", "prob": 5, "charges-min": 1 },
{ "item": "lye_powder", "prob": 5, "charges-min": 1 },
{ "item": "oxy_powder", "prob": 5, "charges-min": 1 }
]
},
{
"id": "paint",
"type": "item_group",
Expand Down
20 changes: 20 additions & 0 deletions data/json/itemgroups/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,26 @@
[ "toolbox_workshop", 3 ]
]
},
{
"id": "tools_cleaning_common",
"//": "Common tools for cleaning up around the house or in a business setting.",
"type": "item_group",
"subtype": "distribution",
"items": [
[ "broom", 25 ],
[ "mop", 25 ],
[ "bucket", 10 ],
{ "item": "bag_plastic", "prob": 15, "count": [ 1, 5 ] },
{ "group": "tools_cleaning_small", "prob": 25 }
]
},
{
"id": "tools_cleaning_small",
"//": "Cleaning tools that specifically could fit under a kitchen sink or in a bathroom cabinet.",
"type": "item_group",
"subtype": "distribution",
"items": [ [ "towel", 25 ], [ "rag", 25 ], [ "brush", 25 ], [ "sponge", 25 ] ]
},
{
"id": "tools_construction",
"type": "item_group",
Expand Down
Loading

0 comments on commit 6da9642

Please sign in to comment.