aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npcs/TALK_MAID_ALLY.json27
-rw-r--r--tools.json5
2 files changed, 2 insertions, 30 deletions
diff --git a/npcs/TALK_MAID_ALLY.json b/npcs/TALK_MAID_ALLY.json
index 50a6025..1907357 100644
--- a/npcs/TALK_MAID_ALLY.json
+++ b/npcs/TALK_MAID_ALLY.json
@@ -74,38 +74,11 @@
"condition": { "not": { "or": [ { "npc_has_effect": "asked_to_socialize" }, { "not": { "npc_has_trait": "THRESH_SHOGGOTH" } } ] } }
},
{ "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
- {
- "text": "I don't want to ever be apart from you.",
- "topic": "TALK_SHOGGOTH_HEART",
- "condition": { "npc_has_trait": "THRESH_SHOGGOTH" }
- },
{ "text": "I changed my mind, wanted to ask you something else.", "topic": "TALK_MAID_ALLY" },
{ "text": "Let's go.", "topic": "TALK_DONE" }
]
},
{
- "id": "TALK_SHOGGOTH_HEART",
- "type": "talk_topic",
- "dynamic_line": "Oh Mistress...♪ I feel the same way! But you know, there is a way we can be together forever, no matter how cold or cruel this world is...",
- "responses": [ { "text": "Tell me more.", "topic": "TALK_SHOGGOTH_HEART2" } ]
- },
- {
- "id": "TALK_SHOGGOTH_HEART2",
- "type": "talk_topic",
- "dynamic_line": "Take my heart and eat it. Ah, don't worry♪ I won't die. My strength will become our strength, and nobody will be able to separate us then!",
- "responses": [
- { "text": "This...let's do it. Now.", "topic": "TALK_SHOGGOTH_HEART3" },
- { "text": "You know what? Never mind.", "topic": "TALK_DONE" }
- ]
- },
- {
- "id": "TALK_SHOGGOTH_HEART3",
- "type": "talk_topic",
- "dynamic_line": "For my beloved Mistress, I would do anything! Oh, if you ever change your mind, just put my heart back in the flask - I'll be back in no time!",
- "speaker_effect": { "effect": [ { "u_buy_item": "meat_shoggoth", "count": 2 }, "npc_die" ] },
- "responses": [ { "text": "...", "topic": "TALK_DONE" } ]
- },
- {
"id": [ "TALK_MAID_ORDERS" ],
"type": "talk_topic",
"dynamic_line": [ "As you command, my Mistress.", "Do you have orders for me?", "How can I serve you?", "Just say the word." ],
diff --git a/tools.json b/tools.json
index f32532c..ee4d879 100644
--- a/tools.json
+++ b/tools.json
@@ -4,15 +4,14 @@
"comestible_type": "MED",
"id": "meat_shoggoth",
"name": { "str": "shoggoth heart", "str_pl": "shoggoth meats" },
- "description": "The heart of a shoggoth. You could eat it to master the beast's morphogenic prowess, or you could use it to 'master' the beast in another way.",
+ "description": "The heart of a shoggoth. You could use it to 'master' the beast.",
"weight": "1000 g",
"symbol": ")",
"color": "dark_gray",
"price": "50 USD",
"material": [ "maid" ],
"volume": "250 ml",
- "category": "tools",
- "use_action": { "type": "mutagen_iv", "mutation_category": "SHOGGOTH" }
+ "category": "tools"
},
{
"type": "GENERIC",