Skip to content

Commit

Permalink
Fix item groups (chance -> prob)
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhilkinSerg committed Dec 17, 2019
1 parent befe6dd commit e037b93
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 88 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
{
"type": "item_group",
"id": "NC_MUTANT_REFUGEE_bashing",
"items": [ { "group": "refugee_bashing", "chance": 100 } ]
"items": [ { "group": "refugee_bashing", "prob": 100 } ]
},
{
"type": "item_group",
"id": "NC_MUTANT_REFUGEE_cutting",
"items": [ { "group": "refugee_cutting", "chance": 100 } ]
"items": [ { "group": "refugee_cutting", "prob": 100 } ]
},
{
"type": "item_group",
"id": "NC_MUTANT_REFUGEE_stabbing",
"items": [ { "group": "refugee_stabbing", "chance": 100 } ]
"items": [ { "group": "refugee_stabbing", "prob": 100 } ]
},
{
"type": "item_group",
Expand Down
46 changes: 23 additions & 23 deletions data/mods/More_Locations/captive_faction/captive_item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"items": [
{
"distribution": [
{ "collection": [ { "group": "captive_pants" }, { "group": "captive_shirt" } ], "chance": 100 },
{ "group": "captive_suit", "chance": 20 }
{ "collection": [ { "group": "captive_pants" }, { "group": "captive_shirt" } ], "prob": 100 },
{ "group": "captive_suit", "prob": 20 }
]
},
{ "group": "captive_gloves", "prob": 40 },
Expand All @@ -25,54 +25,54 @@
"subtype": "collection",
"items": [
{
"distribution": [ { "item": "jeans", "chance": 100, "damage": [ 1, 2 ] }, { "item": "pants", "chance": 100, "damage": [ 1, 2 ] } ]
"distribution": [ { "item": "jeans", "prob": 100, "damage": [ 1, 2 ] }, { "item": "pants", "prob": 100, "damage": [ 1, 2 ] } ]
}
]
},
{
"type": "item_group",
"id": "captive_shirt",
"items": [
{ "item": "tshirt", "chance": 100, "damage": [ 1, 2 ] },
{ "item": "longshirt", "chance": 100, "damage": [ 1, 2 ] },
{ "item": "undershirt", "chance": 100, "damage": [ 1, 2 ] },
{ "item": "sweatshirt", "chance": 50, "damage": [ 1, 2 ] }
{ "item": "tshirt", "prob": 100, "damage": [ 1, 2 ] },
{ "item": "longshirt", "prob": 100, "damage": [ 1, 2 ] },
{ "item": "undershirt", "prob": 100, "damage": [ 1, 2 ] },
{ "item": "sweatshirt", "prob": 50, "damage": [ 1, 2 ] }
]
},
{
"type": "item_group",
"id": "captive_suit",
"items": [ { "item": "jumpsuit", "chance": 100, "damage": [ 1, 2 ] } ]
"items": [ { "item": "jumpsuit", "prob": 100, "damage": [ 1, 2 ] } ]
},
{
"type": "item_group",
"id": "captive_gloves",
"items": [ { "item": "gloves_wraps", "chance": 100 } ]
"items": [ { "item": "gloves_wraps", "prob": 100 } ]
},
{
"type": "item_group",
"id": "captive_shoes",
"subtype": "collection",
"items": [
{ "distribution": [ { "item": "footrags", "chance": 200 }, { "item": "sneakers", "chance": 10, "damage": [ 1, 2 ] } ] }
{ "distribution": [ { "item": "footrags", "prob": 200 }, { "item": "sneakers", "prob": 10, "damage": [ 1, 2 ] } ] }
]
},
{
"type": "item_group",
"id": "captive_masks",
"items": [ { "item": "scarf_loose", "chance": 50 } ]
"items": [ { "item": "scarf_loose", "prob": 50 } ]
},
{
"type": "item_group",
"id": "captive_eyes",
"items": [ { "item": "glasses_eye", "chance": 50 } ]
"items": [ { "item": "glasses_eye", "prob": 50 } ]
},
{
"type": "item_group",
"id": "captive_hat",
"items": [
{ "item": "hat_cotton", "chance": 100, "damage": [ 1, 2 ] },
{ "item": "hat_knit", "chance": 100, "damage": [ 1, 2 ] }
{ "item": "hat_cotton", "prob": 100, "damage": [ 1, 2 ] },
{ "item": "hat_knit", "prob": 100, "damage": [ 1, 2 ] }
]
},
{
Expand All @@ -81,7 +81,7 @@
"subtype": "collection",
"items": [
{
"distribution": [ { "item": "leather_pouch", "chance": 300 }, { "item": "mbag", "chance": 5 }, { "item": "fanny", "chance": 5 } ],
"distribution": [ { "item": "leather_pouch", "prob": 300 }, { "item": "mbag", "prob": 5 }, { "item": "fanny", "prob": 5 } ],
"prob": 100
}
]
Expand All @@ -93,14 +93,14 @@
"items": [
{
"distribution": [
{ "item": "primitive_knife", "chance": 100 },
{ "item": "glass_shiv", "chance": 50 },
{ "item": "rock", "chance": 200 },
{ "item": "soap", "chance": 100 },
{ "item": "hairpin", "chance": 100 },
{ "item": "bottle_plastic", "chance": 100 },
{ "item": "can_food_unsealed", "chance": 100 },
{ "item": "string_6", "chance": 20 }
{ "item": "primitive_knife", "prob": 100 },
{ "item": "glass_shiv", "prob": 50 },
{ "item": "rock", "prob": 200 },
{ "item": "soap", "prob": 100 },
{ "item": "hairpin", "prob": 100 },
{ "item": "bottle_plastic", "prob": 100 },
{ "item": "can_food_unsealed", "prob": 100 },
{ "item": "string_6", "prob": 20 }
],
"prob": 90
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
{
"type": "item_group",
"id": "NC_MUTANT_REFUGEE_bashing",
"items": [ { "group": "refugee_bashing", "chance": 100 } ]
"items": [ { "group": "refugee_bashing", "prob": 100 } ]
},
{
"type": "item_group",
"id": "NC_MUTANT_REFUGEE_cutting",
"items": [ { "group": "refugee_cutting", "chance": 100 } ]
"items": [ { "group": "refugee_cutting", "prob": 100 } ]
},
{
"type": "item_group",
"id": "NC_MUTANT_REFUGEE_stabbing",
"items": [ { "group": "refugee_stabbing", "chance": 100 } ]
"items": [ { "group": "refugee_stabbing", "prob": 100 } ]
},
{
"type": "item_group",
Expand Down
6 changes: 3 additions & 3 deletions data/mods/More_Locations/refugee_faction/NC_REFUGEE.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
{
"type": "item_group",
"id": "NC_REFUGEE_bashing",
"items": [ { "group": "refugee_bashing", "chance": 100 } ]
"items": [ { "group": "refugee_bashing", "prob": 100 } ]
},
{
"type": "item_group",
"id": "NC_REFUGEE_cutting",
"items": [ { "group": "refugee_cutting", "chance": 100 } ]
"items": [ { "group": "refugee_cutting", "prob": 100 } ]
},
{
"type": "item_group",
"id": "NC_REFUGEE_stabbing",
"items": [ { "group": "refugee_stabbing", "chance": 100 } ]
"items": [ { "group": "refugee_stabbing", "prob": 100 } ]
},
{
"type": "item_group",
Expand Down
112 changes: 56 additions & 56 deletions data/mods/More_Locations/refugee_faction/refugee_item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"items": [
{
"distribution": [
{ "collection": [ { "group": "refugee_pants" }, { "group": "refugee_shirt" } ], "chance": 100 },
{ "group": "refugee_suit", "chance": 20 }
{ "collection": [ { "group": "refugee_pants" }, { "group": "refugee_shirt" } ], "prob": 100 },
{ "group": "refugee_suit", "prob": 20 }
]
},
{ "group": "refugee_gloves", "prob": 70 },
Expand All @@ -27,10 +27,10 @@
"items": [
{
"distribution": [
{ "item": "jeans", "chance": 100 },
{ "item": "pants_cargo", "chance": 50 },
{ "item": "pants", "chance": 100 },
{ "item": "pants_ski", "chance": 5 }
{ "item": "jeans", "prob": 100 },
{ "item": "pants_cargo", "prob": 50 },
{ "item": "pants", "prob": 100 },
{ "item": "pants_ski", "prob": 5 }
]
}
]
Expand All @@ -39,43 +39,43 @@
"type": "item_group",
"id": "refugee_shirt",
"items": [
{ "item": "tshirt", "chance": 100 },
{ "item": "longshirt", "chance": 10 },
{ "item": "polo_shirt", "chance": 100 },
{ "item": "undershirt", "chance": 100 },
{ "item": "sweatshirt", "chance": 100 }
{ "item": "tshirt", "prob": 100 },
{ "item": "longshirt", "prob": 10 },
{ "item": "polo_shirt", "prob": 100 },
{ "item": "undershirt", "prob": 100 },
{ "item": "sweatshirt", "prob": 100 }
]
},
{
"type": "item_group",
"id": "refugee_suit",
"items": [ { "item": "suit", "chance": 500 }, { "item": "jumpsuit", "chance": 100 }, { "item": "clown_suit", "chance": 1 } ]
"items": [ { "item": "suit", "prob": 500 }, { "item": "jumpsuit", "prob": 100 }, { "item": "clown_suit", "prob": 1 } ]
},
{
"type": "item_group",
"id": "refugee_gloves",
"items": [
{ "item": "gloves_work", "chance": 50 },
{ "item": "gloves_winter", "chance": 50 },
{ "item": "gloves_leather", "chance": 100 },
{ "item": "gloves_light", "chance": 50 }
{ "item": "gloves_work", "prob": 50 },
{ "item": "gloves_winter", "prob": 50 },
{ "item": "gloves_leather", "prob": 100 },
{ "item": "gloves_light", "prob": 50 }
]
},
{
"type": "item_group",
"id": "refugee_coat",
"items": [
{ "item": "jacket_evac", "chance": 500 },
{ "item": "jacket_jean", "chance": 100 },
{ "item": "coat_rain", "chance": 100 },
{ "item": "coat_winter", "chance": 100 },
{ "item": "jacket_light", "chance": 50 },
{ "item": "jacket_leather", "chance": 10 },
{ "item": "jacket_flannel", "chance": 100 },
{ "item": "jacket_windbreaker", "chance": 50 },
{ "item": "greatcoat", "chance": 5 },
{ "item": "peacoat", "chance": 10 },
{ "item": "coat_lab", "chance": 10 }
{ "item": "jacket_evac", "prob": 500 },
{ "item": "jacket_jean", "prob": 100 },
{ "item": "coat_rain", "prob": 100 },
{ "item": "coat_winter", "prob": 100 },
{ "item": "jacket_light", "prob": 50 },
{ "item": "jacket_leather", "prob": 10 },
{ "item": "jacket_flannel", "prob": 100 },
{ "item": "jacket_windbreaker", "prob": 50 },
{ "item": "greatcoat", "prob": 5 },
{ "item": "peacoat", "prob": 10 },
{ "item": "coat_lab", "prob": 10 }
]
},
{
Expand All @@ -86,40 +86,40 @@
{ "item": "socks" },
{
"distribution": [
{ "item": "boots", "chance": 200 },
{ "item": "boots_winter", "chance": 50 },
{ "item": "boots_western", "chance": 5 },
{ "item": "boots_hiking", "chance": 100 },
{ "item": "boots_western", "chance": 5 },
{ "item": "dress_shoes", "chance": 100 },
{ "item": "dance_shoes", "chance": 2 },
{ "item": "sneakers", "chance": 200 }
{ "item": "boots", "prob": 200 },
{ "item": "boots_winter", "prob": 50 },
{ "item": "boots_western", "prob": 5 },
{ "item": "boots_hiking", "prob": 100 },
{ "item": "boots_western", "prob": 5 },
{ "item": "dress_shoes", "prob": 100 },
{ "item": "dance_shoes", "prob": 2 },
{ "item": "sneakers", "prob": 200 }
]
}
]
},
{
"type": "item_group",
"id": "refugee_masks",
"items": [ { "item": "scarf_loose", "chance": 50 } ]
"items": [ { "item": "scarf_loose", "prob": 50 } ]
},
{
"type": "item_group",
"id": "refugee_eyes",
"items": [ { "item": "glasses_eye", "chance": 50 }, { "item": "sunglasses", "chance": 20 } ]
"items": [ { "item": "glasses_eye", "prob": 50 }, { "item": "sunglasses", "prob": 20 } ]
},
{
"type": "item_group",
"id": "refugee_hat",
"items": [
{ "item": "hat_cotton", "chance": 100 },
{ "item": "hat_ball", "chance": 200 },
{ "item": "hat_knit", "chance": 100 },
{ "item": "hat_hunting", "chance": 10 },
{ "item": "hat_newsboy", "chance": 5 },
{ "item": "hat_boonie", "chance": 10 },
{ "item": "cowboy_hat", "chance": 10 },
{ "item": "porkpie", "chance": 5 }
{ "item": "hat_cotton", "prob": 100 },
{ "item": "hat_ball", "prob": 200 },
{ "item": "hat_knit", "prob": 100 },
{ "item": "hat_hunting", "prob": 10 },
{ "item": "hat_newsboy", "prob": 5 },
{ "item": "hat_boonie", "prob": 10 },
{ "item": "cowboy_hat", "prob": 10 },
{ "item": "porkpie", "prob": 5 }
]
},
{
Expand All @@ -129,19 +129,19 @@
"items": [
{
"distribution": [
{ "item": "backpack", "chance": 100 },
{ "item": "backpack_leather", "chance": 50 },
{ "item": "mbag", "chance": 100 },
{ "item": "runner_bag", "chance": 5 }
{ "item": "backpack", "prob": 100 },
{ "item": "backpack_leather", "prob": 50 },
{ "item": "mbag", "prob": 100 },
{ "item": "runner_bag", "prob": 5 }
],
"prob": 100
},
{
"distribution": [
{ "item": "wristwatch", "chance": 100 },
{ "item": "gold_watch", "chance": 50 },
{ "item": "diving_watch", "chance": 5 },
{ "item": "game_watch", "chance": 10 }
{ "item": "wristwatch", "prob": 100 },
{ "item": "gold_watch", "prob": 50 },
{ "item": "diving_watch", "prob": 5 },
{ "item": "game_watch", "prob": 10 }
],
"prob": 30
},
Expand All @@ -166,9 +166,9 @@
{ "item": "flashlight", "prob": 10 },
{
"distribution": [
{ "item": "pockknife", "chance": 200 },
{ "item": "multitool", "chance": 10 },
{ "item": "knife_swissarmy", "chance": 20 }
{ "item": "pockknife", "prob": 200 },
{ "item": "multitool", "prob": 10 },
{ "item": "knife_swissarmy", "prob": 20 }
],
"prob": 30
},
Expand Down

0 comments on commit e037b93

Please sign in to comment.