aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-05-07 04:07:04 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-05-07 04:07:04 -0700
commitde20d43b7a6d1e46c33ecdcf9ff809fea7192e53 (patch)
tree9326d34c32dce3d7c297015e1c3ae2a89009e9cf
parentFix maid not being placable (diff)
downloadcataclysm-dda-mod_battle-maid-redone-de20d43b7a6d1e46c33ecdcf9ff809fea7192e53.tar.xz
Clean up maid npc more
-rw-r--r--mutations.json12
-rw-r--r--npcs/classes.json2
-rw-r--r--npcs/npcs.json2
3 files changed, 3 insertions, 13 deletions
diff --git a/mutations.json b/mutations.json
index d0e17d8..6e64286 100644
--- a/mutations.json
+++ b/mutations.json
@@ -1,18 +1,8 @@
[
{
"type": "mutation",
- "id": "MARTIAL_ARTS_maid",
- "name": { "str": "Servant's fighting technique" },
- "points": 3,
- "description": "Your Mistress was more hated than most, forcing you to learn some unorthodox combat techniques.",
- "starting_trait": true,
- "initial_ma_styles": [ "style_maid" ],
- "valid": false
- },
- {
- "type": "mutation",
"id": "PROF_MA_MAID",
- "name": { "str": "Servant's fighting technique" },
+ "name": { "str": "Battle Maid" },
"points": 0,
"description": "Your Mistress was more hated than most, forcing you to learn some unorthodox combat techniques.",
"initial_ma_styles": [ "style_maid" ],
diff --git a/npcs/classes.json b/npcs/classes.json
index 3506175..fb387a6 100644
--- a/npcs/classes.json
+++ b/npcs/classes.json
@@ -2,7 +2,7 @@
{
"type": "npc_class",
"id": "NC_SHOGGOTH_MAID",
- "name": { "str": "demon maid" },
+ "name": { "str": "maid" },
"job_description": "I'm your loyal servant, Mistress!",
"common": false,
"skills": [
diff --git a/npcs/npcs.json b/npcs/npcs.json
index 3de8c59..f55a88b 100644
--- a/npcs/npcs.json
+++ b/npcs/npcs.json
@@ -2,7 +2,7 @@
{
"type": "npc",
"id": "shoggoth_maid_npc",
- "name_suffix": "Demon Maid",
+ "name_suffix": "Maid",
"class": "NC_SHOGGOTH_MAID",
"gender": "female",
"attitude": 3,