aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-06-18 18:16:02 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-06-18 18:16:02 -0700
commitfb4f024273df6c51e021cc6a01177de85b28eb37 (patch)
tree46a5347ddd959462718575ddf9a5b5e3ceb9e051
parentUpdate mod readme (diff)
downloadcataclysm-dda-mod_battle-maid-redone-fb4f024273df6c51e021cc6a01177de85b28eb37.tar.xz
Clean up outdated itemgroups
Add maid items to new drop tables
-rw-r--r--item_groups.json228
1 files changed, 168 insertions, 60 deletions
diff --git a/item_groups.json b/item_groups.json
index 702fed8..a019d83 100644
--- a/item_groups.json
+++ b/item_groups.json
@@ -1,28 +1,33 @@
[
+ {
+ "type": "item_group",
+ "id": "mansion_guns",
+ "magazine": 100,
+ "ammo": 100,
+ "subtype": "distribution",
+ "entries": [
+ { "group": "kawaii_mansion_weapons", "prob": 60 }
+ ]
+ },
{
+ "id" : "kawaii_mansion_weapons",
"type" : "item_group",
- "id" : "mansion_guns",
"items":[
- ["vorpal_kitchen_knife", 1],
- ["slaying_pan", 2],
- ["brutal_broom", 2],
- ["spiked_whip", 2],
- ["shikomi_kasa", 2],
- ["shikomi_stick", 2],
- ["maid_claw", 2],
- ["maid_gloves_cotton", 2],
- ["maid_gloves_long_cotton", 2],
- ["kawaii_maid_garter", 5],
- ["petticoat", 5],
- ["kawaii_maid_panties", 5],
- ["kawaii_maid_bra", 5],
- ["kawaii_maid_niso_thick", 3],
- ["kawaii_maid_niso_thin", 3]
+ [ "vorpal_kitchen_knife", 1 ],
+ [ "slaying_pan", 2 ],
+ [ "brutal_broom", 2 ],
+ [ "spiked_whip", 2 ],
+ [ "shikomi_kasa", 2 ],
+ [ "shikomi_stick", 2 ],
+ [ "maid_claw", 2 ],
+ [ "battle_mop", 2 ],
+ [ "destruction_otama", 1]
]
},
{
- "type" : "item_group",
"id" : "mansion_books",
+ "type" : "item_group",
+ "subtype": "distribution",
"entries":[
{ "item": "manual_maid", "prob": 3 }
]
@@ -30,84 +35,187 @@
{
"type" : "item_group",
"id" : "bedroom",
+ "ammo": 100,
+ "magazine": 100,
+ "subtype": "distribution",
"entries":[
- { "item": "kawaii_maid_garter", "prob": 3 },
- { "item": "petticoat", "prob": 3 },
- { "item": "jokyu_fuku", "prob": 3 },
{ "item": "maid_dress_french", "prob": 3 },
{ "item": "kawaii_maid_hat", "prob": 3 },
- { "item": "maid_gloves_cotton", "prob": 2 },
- { "item": "maid_gloves_long_cotton", "prob": 2 },
+ { "item": "kawaii_hat_cotton", "prob": 3 },
+ { "item": "kawaii_maid_dress", "prob": 3 },
+ { "item": "jokyu_fuku", "prob": 3 },
{ "item": "kawaii_maid_panties", "prob": 3 },
{ "item": "kawaii_maid_bra", "prob": 3 },
- { "item": "kawaii_dress_shoes", "prob": 3 },
- { "item": "kawaii_boots", "prob": 3 },
+ { "item": "kawaii_maid_garter", "prob": 3 },
+ { "item": "petticoat", "prob": 3 },
{ "item": "kawaii_maid_niso_thick", "prob": 3 },
- { "item": "kawaii_maid_niso_thin", "prob": 3 }
+ { "item": "kawaii_maid_niso_thin", "prob": 3 },
+ { "item": "maid_gloves_cotton", "prob": 3 },
+ { "item": "maid_gloves_long_cotton", "prob": 3 },
+ { "item": "kawaii_dress_shoes", "prob": 3 },
+ { "item": "kawaii_boots", "prob": 3 }
]
},
{
"type" : "item_group",
"id" : "dresser",
+ "ammo": 100,
+ "magazine": 100,
+ "items": [
+ [ "maid_dress_french", 3 ],
+ [ "kawaii_maid_hat", 3 ],
+ [ "kawaii_hat_cotton", 3 ],
+ [ "kawaii_maid_dress", 3 ],
+ [ "jokyu_fuku", 3 ],
+ [ "kawaii_maid_panties", 3 ],
+ [ "kawaii_maid_bra", 3 ],
+ [ "kawaii_maid_garter", 3 ],
+ [ "petticoat", 3 ],
+ [ "kawaii_maid_niso_thick", 3 ],
+ [ "kawaii_maid_niso_thin", 3 ],
+ [ "maid_gloves_cotton", 3 ],
+ [ "maid_gloves_long_cotton", 3 ],
+ [ "kawaii_dress_shoes", 3 ],
+ [ "kawaii_boots", 3 ]
+ ]
+},
+{
+ "id" : "dresser_servant",
+ "type" : "item_group",
+ "subtype": "distribution",
"items":[
- ["kawaii_maid_garter", 3],
- ["petticoat", 3],
- ["jokyu_fuku", 3],
- ["maid_dress_french", 3],
- ["maid_gloves_cotton", 2],
- ["maid_gloves_long_cotton", 2],
- ["kawaii_maid_hat", 3],
- ["kawaii_maid_panties", 3],
- ["kawaii_maid_bra", 3],
- ["kawaii_dress_shoes", 3],
- ["kawaii_boots", 3],
- ["kawaii_maid_niso_thick", 3],
- ["kawaii_maid_niso_thin", 3]
+ [ "maid_dress_french", 90 ],
+ [ "kawaii_maid_hat", 90 ],
+ [ "kawaii_hat_cotton", 90 ],
+ [ "kawaii_maid_dress", 90 ],
+ [ "jokyu_fuku", 90 ],
+ [ "tux", 90 ],
+ [ "kawaii_maid_panties", 10 ],
+ [ "kawaii_maid_bra", 10 ],
+ [ "kawaii_maid_garter", 10 ],
+ [ "petticoat", 10 ],
+ [ "kawaii_maid_niso_thick", 10 ],
+ [ "kawaii_maid_niso_thin", 10 ],
+ [ "maid_gloves_cotton", 30 ],
+ [ "maid_gloves_long_cotton", 30 ],
+ [ "kawaii_dress_shoes", 30 ],
+ [ "kawaii_boots", 30 ]
]
},
{
"type" : "item_group",
"id" : "hatstore_hats",
"items":[
- ["kawaii_maid_hat", 3]
+ [ "kawaii_maid_hat", 30 ],
+ [ "kawaii_hat_cotton", 30 ]
+ ]
+},
+{
+ "type" : "item_group",
+ "id" : "hatstore_accessories",
+ "items":[
+ [ "kawaii_scarf", 10 ]
+ ]
+},
+{
+ "type" : "item_group",
+ "id" : "shoestore_shoes",
+ "items":[
+ [ "kawaii_dress_shoes", 5 ],
+ [ "kawaii_boots", 5 ]
]
},
{
"type" : "item_group",
"id" : "allclothes",
+ "subtype": "distribution",
"entries":[
- { "item": "kawaii_maid_garter", "prob": 3 },
- { "item": "petticoat", "prob": 3 },
- { "item": "jokyu_fuku", "prob": 3 },
{ "item": "maid_dress_french", "prob": 3 },
{ "item": "kawaii_maid_hat", "prob": 3 },
- { "item": "maid_gloves_cotton", "prob": 3 },
- { "item": "maid_gloves_long_cotton", "prob": 3 },
+ { "item": "kawaii_hat_cotton", "prob": 3 },
+ { "item": "kawaii_maid_dress", "prob": 3 },
+ { "item": "jokyu_fuku", "prob": 3 },
{ "item": "kawaii_maid_panties", "prob": 3 },
{ "item": "kawaii_maid_bra", "prob": 3 },
- { "item": "kawaii_dress_shoes", "prob": 3 },
- { "item": "kawaii_boots", "prob": 3 },
+ { "item": "kawaii_maid_garter", "prob": 3 },
+ { "item": "petticoat", "prob": 3 },
{ "item": "kawaii_maid_niso_thick", "prob": 3 },
- { "item": "kawaii_maid_niso_thin", "prob": 3 }
+ { "item": "kawaii_maid_niso_thin", "prob": 3 },
+ { "item": "maid_gloves_cotton", "prob": 3 },
+ { "item": "maid_gloves_long_cotton", "prob": 3 },
+ { "item": "kawaii_dress_shoes", "prob": 3 },
+ { "item": "kawaii_boots", "prob": 3 }
+ ]
+},
+{
+ "type" : "item_group",
+ "id" : "laundry",
+ "items":[
+ [ "kawaii_maid_dress", 3 ],
+ [ "maid_dress_french", 3 ]
]
},
{
"type" : "item_group",
"id" : "pawn",
"items":[
- ["kawaii_maid_garter", 3],
- ["petticoat", 3],
- ["jokyu_fuku", 3],
- ["maid_dress_french", 3],
- ["kawaii_maid_hat", 3],
- ["maid_gloves_cotton", 2],
- ["maid_gloves_long_cotton", 2],
- ["kawaii_maid_panties", 3],
- ["kawaii_maid_bra", 3],
- ["kawaii_dress_shoes", 3],
- ["kawaii_boots", 3],
- ["kawaii_maid_niso_thick", 3],
- ["kawaii_maid_niso_thin", 3]
+ [ "maid_dress_french", 3 ],
+ [ "kawaii_maid_hat", 3 ],
+ [ "kawaii_hat_cotton", 3 ],
+ [ "kawaii_maid_dress", 3 ],
+ [ "jokyu_fuku", 3 ],
+ [ "tux", 3 ],
+ [ "kawaii_maid_panties", 3 ],
+ [ "kawaii_maid_bra", 3 ],
+ [ "kawaii_maid_garter", 3 ],
+ [ "petticoat", 3 ],
+ [ "kawaii_maid_niso_thick", 3 ],
+ [ "kawaii_maid_niso_thin", 3 ],
+ [ "maid_gloves_cotton", 3 ],
+ [ "maid_gloves_long_cotton", 3 ],
+ [ "kawaii_dress_shoes", 3 ],
+ [ "kawaii_boots", 3 ]
+ ]
+},
+{
+ "id" : "costume_clothes",
+ "type" : "item_group",
+ "items":[
+ [ "maid_dress_french", 35 ],
+ [ "kawaii_maid_dress", 35 ],
+ [ "jokyu_fuku", 35 ]
+ ]
+},
+{
+ "id" : "costume_accessories",
+ "type" : "item_group",
+ "items":[
+ [ "kawaii_maid_hat", 10 ],
+ [ "kawaii_scarf", 5 ],
+ [ "kawaii_maid_bra", 5 ],
+ [ "kawaii_maid_garter", 5 ],
+ [ "petticoat", 5 ],
+ [ "kawaii_maid_niso_thick", 20 ],
+ [ "kawaii_maid_niso_thin", 20 ],
+ [ "maid_gloves_cotton", 20 ],
+ [ "maid_gloves_long_cotton", 20 ],
+ [ "kawaii_dress_shoes", 20 ],
+ [ "kawaii_boots", 20 ]
+ ]
+},
+{
+ "id" : "costume_weapons",
+ "type" : "item_group",
+ "items":[
+ [ "vorpal_kitchen_knife", 1 ],
+ [ "slaying_pan", 2 ],
+ [ "brutal_broom", 2 ],
+ [ "spiked_whip", 2 ],
+ [ "shikomi_kasa", 2 ],
+ [ "shikomi_stick", 2 ],
+ [ "maid_claw", 2 ],
+ [ "battle_mop", 2 ],
+ [ "destruction_otama", 1]
]
}
]