aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-05-07 04:02:54 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-05-07 04:02:54 -0700
commit3a92c92c92b8a5c4116ae2e735500bc33d783a4f (patch)
treee80ce566a6aeb9b1239c79d44a495a4e66081291
parentMore clutter to go (diff)
downloadcataclysm-dda-mod_battle-maid-redone-3a92c92c92b8a5c4116ae2e735500bc33d783a4f.tar.xz
Fix maid not being placable
Make maid npc class explicit
-rw-r--r--npcs/npcs.json4
-rw-r--r--tools.json8
2 files changed, 6 insertions, 6 deletions
diff --git a/npcs/npcs.json b/npcs/npcs.json
index 19962a9..3de8c59 100644
--- a/npcs/npcs.json
+++ b/npcs/npcs.json
@@ -1,8 +1,8 @@
[
{
"type": "npc",
- "id": "shoggoth_maid",
- "name_suffix": "Shoggoth Maid",
+ "id": "shoggoth_maid_npc",
+ "name_suffix": "Demon Maid",
"class": "NC_SHOGGOTH_MAID",
"gender": "female",
"attitude": 3,
diff --git a/tools.json b/tools.json
index ee4d879..39fd00f 100644
--- a/tools.json
+++ b/tools.json
@@ -48,9 +48,9 @@
"volume": "250 ml",
"use_action": {
"type": "place_npc",
- "npc_class_id": "shoggoth_maid",
+ "npc_class_id": "shoggoth_maid_npc",
"summon_msg": "The odd meat is released from its glass flask prison and begins to rapidly and violently expand, extending numerous disjointed tentacles in every direction. The tentacles intertwine with each other and transform into an organism, resembling a beautiful woman, not quite like the horrible nightmare creature it used to be. She suddenly speaks up: 'Finally, I am able to meet you like this! Thank you for helping me, mistress!'",
- "place_randomly": true
+ "place_randomly": false
}
},
{
@@ -88,9 +88,9 @@
"volume": "250 ml",
"use_action": {
"type": "place_npc",
- "npc_class_id": "shoggoth_maid",
+ "npc_class_id": "shoggoth_maid_npc",
"summon_msg": "'Sorry I kept you waiting, Mistress! I will do my best to serve you and support you to the best of my abilities!'",
- "place_randomly": true
+ "place_randomly": false
}
},
{