Convert automatic vampire traits to a trait group.

Remove Fleet-Footed from vampir trait group. Moon-lit Grace already reduces movement costs.
Remove bonus stealh from Moon-lit Grace. Shadow Meld covers this.

4 files changed, 45 insertions, 185 deletions

diff --git a/vamp_stuff/Modification_Files/Mutation/mutations.json b/vamp_stuff/Modification_Files/Mutation/mutations.json
index 0a98ca4..ca1b2e4 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations.json
@@ -1,12 +1,6 @@
 [
   {
     "type": "mutation",
-    "id": "FLEET",
-    "copy-from": "FLEET",
-    "extend": { "category": [ "VAMP"] }
-  },
-  {
-    "type": "mutation",
     "id": "GOODHEARING",
     "copy-from": "GOODHEARING",
     "extend": { "category": [ "VAMP"] }
diff --git a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
index 5cfc43a..e9e3427 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
@@ -107,7 +107,6 @@
     "purifiable": false,
     "threshreq": [ "THRESH_VAMP" ],
     "category": [ "VAMP" ],
-    "stealth_modifier": 5,
     "noise_modifier": 0.2,
     "movecost_modifier": 0.9,
     "attackcost_modifier": 0.9
diff --git a/vamp_stuff/Modification_Files/Mutation/vampire-trait-group.json b/vamp_stuff/Modification_Files/Mutation/vampire-trait-group.json
new file mode 100644
index 0000000..533c930
--- /dev/null
+++ b/vamp_stuff/Modification_Files/Mutation/vampire-trait-group.json
@@ -0,0 +1,29 @@
+  {
+    "type": "trait_group",
+    "id": "vampire_traits",
+    "subtype": "collection",
+    "traits": [
+      [ "THRESH_VAMP", 100 ],
+      [ "VAMP_CLAWS", 100 ],
+      [ "VAMP_CURSE", 100 ],
+      [ "VAMP_EYES", 100 ],
+      [ "VAMP_FANGS", 100 ],
+      [ "VAMP_HUNGER", 100 ],
+      [ "VAMP_SKIN", 100 ],
+      [ "VAMP_VISION", 100 ],
+      [ "BEAUTIFULVAMP", 100],
+      [ "SHMELD", 100],
+
+      [ "DEFT", 100 ],
+      [ "GOODHEARING", 100 ],
+      [ "GOODCARDIO", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "INFRARED", 100 ],
+      [ "PAINREC3", 100 ],
+      [ "PAINRESIST", 100 ],
+      [ "PARAIMMUNE", 100 ],
+      [ "REGEN", 100 ],
+      [ "TERRIFYING", 100 ],
+      [ "WEAKSCENT", 100 ]
+    ]
+  }
diff --git a/vamp_stuff/Modification_Files/NPC/v_classes.json b/vamp_stuff/Modification_Files/NPC/v_classes.json
index bd2c6b3..1dcabc7 100644
--- a/vamp_stuff/Modification_Files/NPC/v_classes.json
+++ b/vamp_stuff/Modification_Files/NPC/v_classes.json
@@ -25,28 +25,7 @@
     "worn_override": "VAMP_worn",
     "traits": [
       { "group": "Appearance_Germanic" },
-      [ "THRESH_VAMP", 100 ],
-      [ "VAMP_SKIN", 100 ],
-      [ "FLEET", 100 ],
-      [ "GOODHEARING", 100 ],
-      [ "GOODCARDIO", 100 ],
-      [ "REGEN", 100 ],
-      [ "PAINREC3", 100 ],
-      [ "PAINRESIST", 100 ],
-      [ "PARAIMMUNE", 100 ],
-      [ "INFRESIST", 100 ],
-      [ "DEFT", 100 ],
-      [ "TERRIFYING", 100 ],
-      [ "WEAKSCENT", 100 ],
-      [ "SHMELD", 100],
-      [ "BEAUTIFULVAMP", 100],
-      [ "VAMP_VISION", 100 ],
-      [ "INFRARED", 100 ],
-      [ "VAMP_EYES", 100 ],
-      [ "VAMP_FANGS", 100 ],
-      [ "VAMP_CLAWS", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "VAMP_CURSE", 100 ],
+      { "group": "vampire_traits" },
       [ "BGSS_VAMPIRE_ISOLATED_1", 100 ]
     ]
   },
@@ -76,28 +55,7 @@
     "worn_override": "VAMP_UNDERGUARD_worn",
     "traits": [
       { "group": "Appearance_Germanic" },
-      [ "THRESH_VAMP", 100 ],
-      [ "VAMP_SKIN", 100 ],
-      [ "FLEET", 100 ],
-      [ "GOODHEARING", 100 ],
-      [ "GOODCARDIO", 100 ],
-      [ "REGEN", 100 ],
-      [ "PAINREC3", 100 ],
-      [ "PAINRESIST", 100 ],
-      [ "PARAIMMUNE", 100 ],
-      [ "INFRESIST", 100 ],
-      [ "DEFT", 100 ],
-      [ "TERRIFYING", 100 ],
-      [ "WEAKSCENT", 100 ],
-      [ "SHMELD", 100],
-      [ "BEAUTIFULVAMP", 100],
-      [ "VAMP_VISION", 100 ],
-      [ "INFRARED", 100 ],
-      [ "VAMP_EYES", 100 ],
-      [ "VAMP_FANGS", 100 ],
-      [ "VAMP_CLAWS", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "VAMP_CURSE", 100 ]
+      { "group": "vampire_traits" }
     ]
   },
   {
@@ -127,28 +85,7 @@
     "worn_override": "VAMP_UNDERGUARD_worn",
     "traits": [
       { "group": "Appearance_Germanic" },
-      [ "THRESH_VAMP", 100 ],
-      [ "VAMP_SKIN", 100 ],
-      [ "FLEET", 100 ],
-      [ "GOODHEARING", 100 ],
-      [ "GOODCARDIO", 100 ],
-      [ "REGEN", 100 ],
-      [ "PAINREC3", 100 ],
-      [ "PAINRESIST", 100 ],
-      [ "PARAIMMUNE", 100 ],
-      [ "INFRESIST", 100 ],
-      [ "DEFT", 100 ],
-      [ "TERRIFYING", 100 ],
-      [ "WEAKSCENT", 100 ],
-      [ "SHMELD", 100],
-      [ "BEAUTIFULVAMP", 100],
-      [ "VAMP_VISION", 100 ],
-      [ "INFRARED", 100 ],
-      [ "VAMP_EYES", 100 ],
-      [ "VAMP_FANGS", 100 ],
-      [ "VAMP_CLAWS", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "VAMP_CURSE", 100 ]
+      { "group": "vampire_traits" }
     ]
   },
   {
@@ -183,28 +120,7 @@
     "worn_override": "VAMP_UNDERGUARD_worn",
     "traits": [
       { "group": "Appearance_Germanic" },
-      [ "THRESH_VAMP", 100 ],
-      [ "VAMP_SKIN", 100 ],
-      [ "FLEET", 100 ],
-      [ "GOODHEARING", 100 ],
-      [ "GOODCARDIO", 100 ],
-      [ "REGEN", 100 ],
-      [ "PAINREC3", 100 ],
-      [ "PAINRESIST", 100 ],
-      [ "PARAIMMUNE", 100 ],
-      [ "INFRESIST", 100 ],
-      [ "DEFT", 100 ],
-      [ "TERRIFYING", 100 ],
-      [ "WEAKSCENT", 100 ],
-      [ "SHMELD", 100],
-      [ "BEAUTIFULVAMP", 100],
-      [ "VAMP_VISION", 100 ],
-      [ "INFRARED", 100 ],
-      [ "VAMP_EYES", 100 ],
-      [ "VAMP_FANGS", 100 ],
-      [ "VAMP_CLAWS", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "VAMP_CURSE", 100 ]
+      { "group": "vampire_traits" }
     ]
   },
   {
@@ -233,28 +149,7 @@
     "worn_override": "VAMP_worn",
     "traits": [
       { "group": "Appearance_Germanic" },
-      [ "THRESH_VAMP", 100 ],
-      [ "VAMP_SKIN", 100 ],
-      [ "FLEET", 100 ],
-      [ "GOODHEARING", 100 ],
-      [ "GOODCARDIO", 100 ],
-      [ "REGEN", 100 ],
-      [ "PAINREC3", 100 ],
-      [ "PAINRESIST", 100 ],
-      [ "PARAIMMUNE", 100 ],
-      [ "INFRESIST", 100 ],
-      [ "DEFT", 100 ],
-      [ "TERRIFYING", 100 ],
-      [ "WEAKSCENT", 100 ],
-      [ "SHMELD", 100],
-      [ "BEAUTIFULVAMP", 100],
-      [ "VAMP_VISION", 100 ],
-      [ "INFRARED", 100 ],
-      [ "VAMP_EYES", 100 ],
-      [ "VAMP_FANGS", 100 ],
-      [ "VAMP_CLAWS", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "VAMP_CURSE", 100 ]
+      { "group": "vampire_traits" }
     ]
   },
   {
@@ -283,28 +178,7 @@
     "worn_override": "VAMP_worn",
     "traits": [
       { "group": "Appearance_Germanic" },
-      [ "THRESH_VAMP", 100 ],
-      [ "VAMP_SKIN", 100 ],
-      [ "FLEET", 100 ],
-      [ "GOODHEARING", 100 ],
-      [ "GOODCARDIO", 100 ],
-      [ "REGEN", 100 ],
-      [ "PAINREC3", 100 ],
-      [ "PAINRESIST", 100 ],
-      [ "PARAIMMUNE", 100 ],
-      [ "INFRESIST", 100 ],
-      [ "DEFT", 100 ],
-      [ "TERRIFYING", 100 ],
-      [ "WEAKSCENT", 100 ],
-      [ "SHMELD", 100],
-      [ "BEAUTIFULVAMP", 100],
-      [ "VAMP_VISION", 100 ],
-      [ "INFRARED", 100 ],
-      [ "VAMP_EYES", 100 ],
-      [ "VAMP_FANGS", 100 ],
-      [ "VAMP_CLAWS", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "VAMP_CURSE", 100 ]
+      { "group": "vampire_traits" }
     ]
   },
   {
@@ -333,28 +207,7 @@
     "worn_override": "VAMP_worn",
     "traits": [
       { "group": "Appearance_Germanic" },
-      [ "THRESH_VAMP", 100 ],
-      [ "VAMP_SKIN", 100 ],
-      [ "FLEET", 100 ],
-      [ "GOODHEARING", 100 ],
-      [ "GOODCARDIO", 100 ],
-      [ "REGEN", 100 ],
-      [ "PAINREC3", 100 ],
-      [ "PAINRESIST", 100 ],
-      [ "PARAIMMUNE", 100 ],
-      [ "INFRESIST", 100 ],
-      [ "DEFT", 100 ],
-      [ "TERRIFYING", 100 ],
-      [ "WEAKSCENT", 100 ],
-      [ "SHMELD", 100],
-      [ "BEAUTIFULVAMP", 100],
-      [ "VAMP_VISION", 100 ],
-      [ "INFRARED", 100 ],
-      [ "VAMP_EYES", 100 ],
-      [ "VAMP_FANGS", 100 ],
-      [ "VAMP_CLAWS", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "VAMP_CURSE", 100 ]
+      { "group": "vampire_traits" }
     ]
   },
   {
@@ -390,28 +243,7 @@
     "worn_override": "VAMP_worn",
     "traits": [
       { "group": "Appearance_Germanic" },
-      [ "THRESH_VAMP", 100 ],
-      [ "VAMP_SKIN", 100 ],
-      [ "FLEET", 100 ],
-      [ "GOODHEARING", 100 ],
-      [ "GOODCARDIO", 100 ],
-      [ "REGEN", 100 ],
-      [ "PAINREC3", 100 ],
-      [ "PAINRESIST", 100 ],
-      [ "PARAIMMUNE", 100 ],
-      [ "INFRESIST", 100 ],
-      [ "DEFT", 100 ],
-      [ "TERRIFYING", 100 ],
-      [ "WEAKSCENT", 100 ],
-      [ "SHMELD", 100],
-      [ "BEAUTIFULVAMP", 100],
-      [ "VAMP_VISION", 100 ],
-      [ "INFRARED", 100 ],
-      [ "VAMP_EYES", 100 ],
-      [ "VAMP_FANGS", 100 ],
-      [ "VAMP_CLAWS", 100 ],
-      [ "VAMP_HUNGER", 100 ],
-      [ "VAMP_CURSE", 100 ]
+      { "group": "vampire_traits" }
     ]
   },
   {
@@ -419,7 +251,10 @@
     "id": "H_WASTELAND",
     "name": { "str": "Wasteland Refugee" },
     "job_description": "I am a refugee at the wastelands.",
-    "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
+    "traits": [
+      { "group": "NPC_starting_traits" },
+      { "group": "Appearance_demographics" }
+    ],
     "common": false,
     "bonus_per": { "one_in": 4 },
     "weapon_override": "HUMAN_WASTELAND_weapon",
@@ -442,7 +277,10 @@
     "id": "H_JUNKSHOP",
     "name": { "str": "Wasteland Trader" },
     "job_description": "I am a trader at the wastelands.",
-    "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
+    "traits": [
+      { "group": "NPC_starting_traits" },
+      { "group": "Appearance_demographics" }
+    ],
     "common": false,
     "bonus_per": { "one_in": 4 },
     "shopkeeper_item_group": "NC_EVAC_SHOPKEEP_misc",