Skip to content

Commit

Permalink
Merge pull request CleverRaven#37400 from LilShiningMan/lsm---item-gr…
Browse files Browse the repository at this point in the history 
…oup-sort-5

Item Group Sorting #5
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Jan 26, 2020
2 parents 9000542 + 3fb2a3f commit 95d54b2
Show file tree
Hide file tree
Showing 6 changed files with 701 additions and 695 deletions.
129 changes: 129 additions & 0 deletions data/json/itemgroups/agriculture.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
[
{
"type": "item_group",
"id": "farming_seeds",
"items": [
[ "seed_blueberries", 60 ],
[ "seed_strawberries", 60 ],
[ "seed_blackberries", 60 ],
[ "seed_cranberries", 60 ],
[ "seed_raspberries", 60 ],
[ "seed_wheat", 60 ],
[ "seed_barley", 60 ],
[ "seed_sugar_beet", 60 ],
[ "seed_lettuce", 60 ],
[ "seed_cabbage", 60 ],
[ "seed_onion", 60 ],
[ "seed_carrot", 60 ],
[ "seed_sunflower", 60 ],
[ "seed_pumpkin", 60 ],
[ "seed_corn", 60 ],
[ "seed_oats", 60 ],
[ "soybean_seed", 60 ],
[ "seed_broccoli", 60 ],
[ "seed_celery", 60 ],
[ "seed_cucumber", 60 ],
[ "seed_potato_raw", 60 ],
[ "seed_zucchini", 60 ],
[ "seed_cotton_boll", 10 ],
[ "seed_tobacco", 10 ],
[ "seed_cactus", 10 ],
[ "seed_flower", 60 ],
[ "seed_beans", 60 ],
[ "seed_chili_pepper", 60 ],
[ "seed_tomato", 60 ]
]
},
{
"type": "item_group",
"id": "farming_tools",
"items": [
[ "hoe", 60 ],
[ "shovel", 60 ],
[ "g_shovel", 60 ],
[ "trimmer_off", 60 ],
[ "boots", 60 ],
[ "bucket", 40 ],
[ "gloves_rubber", 60 ],
[ "fertilizer_liquid", 20 ],
[ "fertilizer_commercial", 30 ],
[ "fungicide", 20 ],
[ "insecticide", 30 ],
{ "item": "chem_saltpetre", "prob": 15, "charges-min": 10, "charges-max": 50 },
[ "sickle", 40 ],
[ "toolbox", 10 ],
[ "bullwhip", 30 ],
[ "distaff_spindle", 2 ],
[ "carding_paddles", 2 ],
[ "scythe", 40 ],
[ "tree_spile", 40 ],
[ "material_quicklime", 30 ],
[ "pitchfork", 40 ],
[ "steam_triple_small", 1 ],
[ "steam_triple_medium", 1 ],
[ "v_plow_item", 41 ],
[ "v_planter_item", 41 ],
[ "v_reaper_item", 41 ],
[ "v_reaper_item_advanced", 8 ],
[ "v_planter_item_advanced", 8 ]
]
},
{
"type": "item_group",
"id": "hydro",
"items": [
[ "blueberries", 3 ],
[ "strawberries", 2 ],
[ "grapes", 7 ],
[ "cranberries", 2 ],
[ "raspberries", 3 ],
[ "blackberries", 2 ],
[ "rhubarb", 5 ],
[ "wheat", 6 ],
[ "barley", 6 ],
[ "sugar_beet", 4 ],
[ "hops", 4 ],
[ "cotton_boll", 1 ],
[ "seed_cotton_boll", 1 ],
[ "seed_wheat", 1 ],
[ "seed_tomato", 1 ],
[ "seed_blueberries", 1 ],
[ "seed_strawberries", 1 ],
[ "seed_blackberries", 1 ],
[ "seed_cranberries", 1 ],
[ "seed_raspberries", 1 ],
[ "seed_barley", 1 ],
[ "seed_sugar_beet", 1 ],
[ "seed_lettuce", 1 ],
[ "seed_cabbage", 1 ],
[ "seed_onion", 1 ],
[ "seed_carrot", 1 ],
[ "seed_pumpkin", 1 ],
[ "seed_sunflower", 1 ],
[ "seed_flower", 1 ],
[ "seed_cactus", 1 ],
[ "seed_corn", 1 ],
[ "soybean_seed", 1 ],
[ "raw_edamame", 1 ],
[ "seed_hops", 1 ],
[ "seed_beans", 1 ],
[ "seed_lentils", 1 ],
[ "seed_chili_pepper", 1 ],
[ "seed_garlic", 1 ],
[ "tomato", 9 ],
[ "pumpkin", 6 ],
[ "broccoli", 9 ],
[ "cucumber", 10 ],
[ "zucchini", 7 ],
[ "potato", 10 ],
[ "corn", 7 ],
[ "celery", 4 ],
[ "onion", 3 ],
[ "garlic", 3 ],
[ "carrot", 3 ],
[ "withered", 40 ],
[ "straw_pile", 20 ],
[ "survnote", 1 ]
]
}
]
73 changes: 73 additions & 0 deletions data/json/itemgroups/books.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,5 +641,78 @@
"id": "tailorbooks",
"type": "item_group",
"items": [ [ "tailor_portfolio", 30 ], [ "mag_tailor", 50 ], [ "manual_tailor", 30 ], [ "textbook_tailor", 30 ] ]
},
{
"id": "magazines",
"type": "item_group",
"items": [
{ "group": "book_mag_gen", "prob": 240 },
{ "group": "book_mag_interests", "prob": 220 },
{ "group": "book_mag_tech", "prob": 155 },
{ "group": "book_mag_combat", "prob": 100 },
{ "group": "book_gunmags", "prob": 95 },
{ "group": "book_mag_surv", "prob": 90 },
[ "mag_porn", 20 ],
[ "mag_comic", 20 ],
[ "months_old_newspaper", 1 ],
[ "weeks_old_newspaper", 4 ],
[ "newest_newspaper", 10 ],
[ "survnote", 1 ]
]
},
{
"id": "book_mag_gen",
"type": "item_group",
"items": [
[ "mag_tv", 40 ],
[ "mag_dude", 40 ],
[ "mag_glam", 60 ],
[ "mag_beauty", 50 ],
[ "mag_news", 35 ],
[ "news_regional", 15 ]
]
},
{
"id": "book_mag_interests",
"type": "item_group",
"items": [
[ "mag_cooking", 30 ],
[ "mag_carpentry", 30 ],
[ "mag_barter", 35 ],
[ "mag_swimming", 10 ],
[ "mag_tailor", 25 ],
[ "mag_firstaid", 40 ],
[ "mag_cars", 40 ],
[ "mag_animecon", 10 ]
]
},
{
"id": "book_mag_tech",
"type": "item_group",
"items": [
[ "mag_fabrication", 30 ],
[ "mag_computer", 35 ],
[ "mag_electronics", 35 ],
[ "mag_mechanics", 35 ],
[ "mag_gaming", 20 ]
]
},
{
"id": "book_mag_combat",
"type": "item_group",
"items": [
[ "mag_bashing", 10 ],
[ "mag_cutting", 10 ],
[ "mag_stabbing", 10 ],
[ "mag_melee", 10 ],
[ "mag_unarmed", 20 ],
[ "mag_dodge", 20 ],
[ "mag_throwing", 20 ]
]
},
{
"id": "book_mag_surv",
"type": "item_group",
"items": [ [ "mag_survival", 40 ], [ "mag_traps", 20 ], [ "fun_survival", 10 ], [ "mag_archery", 20 ] ]
}
]
72 changes: 0 additions & 72 deletions data/json/itemgroups/gear.json
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,4 @@
[
{
"type": "item_group",
"id": "everyday_gear",
"ammo": 75,
"magazine": 100,
"//": "Small common items carried in a person's pockets, purse, etc. Cash card at roughly 50%.",
"items": [
{ "item": "cash_card", "prob": 1600, "charges-min": 0, "charges-max": 50000 },
[ "cell_phone", 50 ],
[ "smart_phone", 180 ],
{ "item": "cig", "prob": 250, "charges-min": 1, "charges-max": 20 },
[ "lighter", 200 ],
[ "joint", 10 ],
[ "ref_lighter", 50 ],
[ "matches", 50 ],
{ "group": "tobacco_products", "prob": 60 },
[ "permanent_marker", 10 ],
[ "dog_whistle", 5 ],
[ "multitool", 1 ],
[ "cane", 25 ],
[ "pocketwatch", 50 ],
[ "pockknife", 50 ],
[ "knife_folding", 30 ],
[ "knife_swissarmy", 10 ],
[ "teleumbrella", 20 ],
[ "umbrella", 20 ],
[ "aspirin", 100 ],
[ "vitamins", 100 ],
[ "eyedrops", 50 ],
[ "inhaler", 50 ],
[ "flashlight", 50 ],
[ "heavy_flashlight", 15 ],
[ "camera", 30 ],
[ "camera_pro", 5 ],
[ "eink_tablet_pc", 30 ],
[ "laptop", 15 ],
[ "mobile_memory_card", 50 ],
[ "usb_drive", 50 ],
[ "mp3", 20 ],
[ "portable_game", 50 ],
[ "vibrator", 5 ],
[ "gum", 50 ],
{ "group": "ammo_pocket_batteries", "prob": 50 },
[ "wrapper", 50 ],
[ "string_6", 50 ],
[ "pocket_firstaid", 5 ],
[ "pocket_survival", 5 ],
[ "pocket_firearms", 5 ],
[ "newest_newspaper", 75 ],
[ "flyer", 10 ],
[ "thermos", 5 ],
[ "hairbrush", 25 ],
[ "comb_pocket", 50 ]
]
},
{
"type": "item_group",
"id": "swat_gear",
Expand Down Expand Up @@ -135,23 +80,6 @@
[ "survivormap", 5 ]
]
},
{
"id": "gear_homeless",
"type": "item_group",
"//": "Regular items for the homeless.",
"items": [
{ "group": "trash", "prob": 30 },
{ "group": "donated_clothes", "prob": 25 },
{ "group": "gear_survival", "prob": 5 },
{ "group": "contraband", "prob": 20 },
{ "group": "prison_textile", "prob": 7, "damage": [ 1, 2 ] },
{ "group": "novels", "prob": 10 },
{ "group": "misc_smoking", "prob": 10 },
{ "group": "stoner", "prob": 5 },
{ "group": "cannedfood", "prob": 10, "count": [ 1, 3 ] },
{ "item": "drink_hobo", "prob": 1 }
]
},
{
"type": "item_group",
"id": "fireman_gear",
Expand Down
Loading

0 comments on commit 95d54b2

Please sign in to comment.