Skip to content

Commit

Permalink
item_groups penultimate (#38240)
Browse files Browse the repository at this point in the history
item_groups sorting
  • Loading branch information
LilShiningMan authored Feb 23, 2020
1 parent 4e3f9e1 commit 087338b
Show file tree
Hide file tree
Showing 8 changed files with 556 additions and 550 deletions.
270 changes: 270 additions & 0 deletions data/json/itemgroups/art_antiques_crafts.json
Original file line number Diff line number Diff line change
@@ -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 ]
]
}
]
5 changes: 5 additions & 0 deletions data/json/itemgroups/drugs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ]
}
]
11 changes: 11 additions & 0 deletions data/json/itemgroups/electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
}
]
Loading

0 comments on commit 087338b

Please sign in to comment.