From 12149ae8624a17128634a18f673d802e56321ab0 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 28 Jul 2020 15:24:40 -0700
Subject: Formatting fixes

---
 modinfo.json   | 18 ++++++++---------
 monsters.json  | 64 +++++++++++++++++++++++++++++-----------------------------
 mutations.json |  9 ++-------
 3 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/modinfo.json b/modinfo.json
index 060320f..f2bc002 100644
--- a/modinfo.json
+++ b/modinfo.json
@@ -1,11 +1,11 @@
 [
-  {
-    "type": "MOD_INFO",
-    "ident": "battle_maid_redone",
-    "name": "Battle Maid Redone",
-    "authors": ["jc_gargma"],
-    "description": "Translated and tweaked version of the original Battle Maid mod.",
-    "category": "misc_additions",
-    "dependencies": [ "dda" ]
-  }
+    {
+        "type": "MOD_INFO",
+        "ident": "battle_maid_redone",
+        "name": "Battle Maid Redone",
+        "description": "Translated and tweaked version of the original Battle Maid mod.",
+        "authors": ["jc_gargma"],
+        "category": "misc_additions",
+        "dependencies": [ "dda" ]
+    }
 ]
diff --git a/monsters.json b/monsters.json
index ec4589b..e3058b8 100644
--- a/monsters.json
+++ b/monsters.json
@@ -35,6 +35,37 @@
         "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS", "WARM", "NOGIB", "CAN_OPEN_DOORS", "HUMAN", "PATH_AVOID_DANGER_1", "FLIES" ],
         "anger_triggers": [ "FRIEND_ATTACKED"]
     },
+    {
+        "id": "maid_master",
+        "type": "MONSTER",
+        "name": { "str": "Mistress", "str_pl": "Mistresses" },
+        "description": "A girl entrusted to you by the owner of the house you served at. There's a deep feeling of fear in your stomach as you embrace the cataclysm, but protecting this girl gives you purpose and makes you feel less alone.",
+        "default_faction": "player",
+        "bodytype": "human",
+        "species": [ "HUMAN" ],
+        "diff": 2,
+        "volume": "1000 ml",
+        "weight": "1 kg",
+        "hp": 40,
+        "speed": 150,
+        "material": [ "flesh" ],
+        "symbol": "m",
+        "color": "brown",
+        "aggression": -10,
+        "morale": 100,
+        "melee_skill": 2,
+        "melee_dice": 2,
+        "melee_dice_sides": 4,
+        "melee_cut": 2,
+        "dodge": 2,
+        "armor_bash": 0,
+        "armor_cut": 0,
+        "vision_day": 30,
+        "vision_night": 3,
+        "harvest": "human",
+        "death_function": [ "NORMAL" ],
+        "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "GUILT", "BONES", "CAN_OPEN_DOORS", "HUMAN", "PATH_AVOID_DANGER_1" ]
+    },
     {
         "id": "mon_little_maid",
         "type": "MONSTER",
@@ -68,38 +99,7 @@
         "death_function": [ "MELT" ],
         "regenerates": 10,
         "regen_morale": true,
-        "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS", "WARM", "NOGIB", "CAN_OPEN_DOORS", "HUMAN", "PATH_AVOID_DANGER_1", "FLIES" ],
+        "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS", "WARM", "NOGIB", "CAN_OPEN_DOORS", "HUMAN", "PATH_AVOID_DANGER_1" ],
         "anger_triggers": [ "FRIEND_ATTACKED" ]
-    },
-    {
-        "id": "maid_master",
-        "type": "MONSTER",
-        "name": { "str": "Mistress", "str_pl": "Mistresses" },
-        "description": "A girl entrusted to you by the owner of the house you served at. There's a deep feeling of fear in your stomach as you embrace the cataclysm, but protecting this girl gives you purpose and makes you feel less alone.",
-        "default_faction": "player",
-        "bodytype": "human",
-        "species": [ "HUMAN" ],
-        "diff": 2,
-        "volume": "1000 ml",
-        "weight": "1 kg",
-        "hp": 40,
-        "speed": 150,
-        "material": [ "flesh" ],
-        "symbol": "m",
-        "color": "brown",
-        "aggression": -10,
-        "morale": 100,
-        "melee_skill": 2,
-        "melee_dice": 2,
-        "melee_dice_sides": 4,
-        "melee_cut": 2,
-        "dodge": 2,
-        "armor_bash": 0,
-        "armor_cut": 0,
-        "vision_day": 30,
-        "vision_night": 3,
-        "harvest": "human",
-        "death_function": [ "NORMAL" ],
-        "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "GUILT", "BONES", "CAN_OPEN_DOORS", "HUMAN", "PATH_AVOID_DANGER_1" ]
     }
 ]
diff --git a/mutations.json b/mutations.json
index b340d37..2e3ae31 100644
--- a/mutations.json
+++ b/mutations.json
@@ -33,12 +33,7 @@
     {
         "type": "mutation",
         "id": "FELINE_EARS",
-        "name": { "str": "Feline Ears" },
-        "points": 0,
-        "visibility": 4,
-        "description": "Your ears have extended into long, pointed, velvety ones, like those of a feline.  You find it easier to tune in on sounds from afar.",
-        "types": [ "EARS" ],
-        "category": [ "FELINE" ],
-        "hearing_modifier": 1.25
+        "copy-from": "FELINE_EARS",
+        "points": 0
     }
 ]
-- 
cgit v1.2.1