aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-05-07 00:33:50 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-05-07 00:33:50 -0700
commitba3bfc9e67a3134de0d715a1486b7ed97456adb6 (patch)
tree696189542e7c2f1ca9f35b539d90460217e4d81e
parentFix up the maid npc (diff)
downloadcataclysm-dda-mod_battle-maid-redone-ba3bfc9e67a3134de0d715a1486b7ed97456adb6.tar.xz
Add custom inventory for maid npc
-rw-r--r--npcs/NC_SHOGGOTH_MAID.json14
-rw-r--r--npcs/classes.json2
2 files changed, 14 insertions, 2 deletions
diff --git a/npcs/NC_SHOGGOTH_MAID.json b/npcs/NC_SHOGGOTH_MAID.json
index 4791644..762271a 100644
--- a/npcs/NC_SHOGGOTH_MAID.json
+++ b/npcs/NC_SHOGGOTH_MAID.json
@@ -14,11 +14,23 @@
{ "item": "kawaii_boots", "prob": 100 },
{ "item": "maid_gloves_long_cotton", "prob": 100 },
{ "item": "kawaii_vest", "prob": 100 },
- { "item": "kawaii_scarf", "prob": 100 },
{ "item": "kawaii_maid_hardcase_slim", "prob": 100 },
{ "item": "kawaii_secretpoach", "prob": 100 },
{ "item": "kawaii_secretpoach", "prob": 100 },
{ "item": "kawaii_maid_megane_01", "prob": 100 }
]
+ }, {
+ "type": "item_group",
+ "id": "NC_SHOGGOTH_MAID_carried",
+ "subtype": "collection",
+ "entries": [
+ { "item": "pocketwatch", "prob": 100 },
+ { "item": "knife_steak", "prob": 100 },
+ { "item": "kawaii_scarf", "prob": 100 },
+ { "item": "cloak", "prob": 100 },
+ { "item": "assassins_throwing_dagger", "prob": 100 },
+ { "item": "master_doll", "prob": 100 },
+
+ ]
}
]
diff --git a/npcs/classes.json b/npcs/classes.json
index 1660570..52635ca 100644
--- a/npcs/classes.json
+++ b/npcs/classes.json
@@ -32,7 +32,7 @@
[ "PRETTY", 100 ]
],
"worn_override": "NC_SHOGGOTH_MAID_worn",
- "carry_override": "naked_prisoner",
+ "carry_override": "NC_SHOGGOTH_MAID_carried",
"weapon_override": "EMPTY_GROUP",
}
]