Port some mutation/cbm specific fields to enchantments, part 3

data/json/obsoletion_and_migration_0.I/obsolete_traits.json

@@ -0,0 +1,7 @@
+[
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "EAGLEEYED_NIGHT",
+    "trait": "EAGLEEYED"
+  }
+]

data/mods/Aftershock/mutations/mutations.json

@@ -82,7 +82,7 @@
     "points": 1,
     "visibility": 8,
     "ugliness": 5,
-    "consume_time_modifier": 0.5,
+    "enchantments": [ { "values": [ { "value": "CONSUME_TIME_MOD", "multiply": -0.5 } ] } ],
     "description": "A set of tentacles surrounds your mouth.  They allow you to eat twice as fast.  Slightly decreases wet penalties.",
     "types": [ "MUZZLE" ],
     "prereqs": [ "MOUTH_TENDRILS" ],

data/mods/Aftershock/mutations/obsolete.json

@@ -89,7 +89,7 @@
     "description": "You make more noise while walking.  You're also more likely to set off traps.",
     "valid": false,
     "cancels": [ "LIGHTSTEP" ],
-    "noise_modifier": 1.7
+    "enchantments": [ { "values": [ { "value": "FOOTSTEP_NOISE", "multiply": 0.7 } ] } ]
   },
   {
     "type": "mutation",
@@ -220,7 +220,6 @@
     "cancels": [ "SMALL", "SMALL2" ],
     "changes_to": [ "GIGANTIC_OK" ],
     "enchantments": [ { "values": [ { "value": "MAX_HP", "add": -6 } ] } ],
-    "fatigue_modifier": 0.15,
     "restricts_gear": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r" ],
     "destroys_gear": true
   },
@@ -262,9 +261,7 @@
     "description": "You require more food than most people, but recover stamina slightly faster.",
     "valid": false,
     "types": [ "METABOLISM" ],
-    "changes_to": [ "LARGE_DIET" ],
-    "enchantments": [ { "values": [ { "value": "METABOLISM", "multiply": 0.5 } ] } ],
-    "stamina_regen_modifier": 0.1
+    "changes_to": [ "LARGE_DIET" ]
   },
   {
     "type": "mutation",
@@ -276,10 +273,7 @@
     "types": [ "HEALING" ],
     "cancels": [ "LIGHTEATER", "COLDBLOOD", "COLDBLOOD2", "COLDBLOOD3", "COLDBLOOD4", "WAKEFUL", "WAKEFUL2", "WAKEFUL3" ],
     "prereqs": [ "HUNGER" ],
-    "healing_multiplier": 0.25,
-    "fatigue_modifier": 0.75,
-    "fatigue_regen_modifier": 0.5,
-    "enchantments": [ { "values": [ { "value": "METABOLISM", "multiply": 0.4 } ] } ]
+    "healing_multiplier": 0.25
   },
   {
     "type": "mutation",

data/mods/BombasticPerks/perks.json

@@ -446,7 +446,7 @@
     "points": 0,
     "description": "You really like to do stuff with your own hands.  +10% for crafting speed.",
     "category": [ "perk" ],
-    "crafting_speed_multiplier": 1.1
+    "enchantments": [ { "values": [ { "value": "CRAFTING_SPEED_MULTIPLIER", "multiply": 0.1 } ] } ]
   },
   {
     "type": "mutation",

data/mods/Limb_WIP/mutations/mutations.json

@@ -113,12 +113,11 @@
     "threshreq": [ "THRESH_GASTROPOD" ],
     "leads_to": [ "GASTROPOD_BALANCE" ],
     "flags": [ "SLUDGE_IMMUNE" ],
-    "enchantments": [ "ENCH_GASTROPOD_FOOT" ],
+    "enchantments": [ "ENCH_GASTROPOD_FOOT", { "values": [ { "value": "FOOTSTEP_NOISE", "multiply": -0.75 } ] } ],
     "visibility": 8,
     "ugliness": 9,
     "encumbrance_always": [ [ "leg_l", 10 ], [ "leg_r", 10 ], [ "foot_l", 10 ], [ "foot_r", 10 ] ],
     "restricts_gear": [ "leg_l", "leg_r", "foot_l", "foot_r", "leg_stub_r", "leg_stub_l" ],
-    "noise_modifier": 0.25,
     "destroys_gear": true
   },
   {

data/mods/Magiclysm/migration_and_obsoletion.json

@@ -69,5 +69,15 @@
     "min_duration": 36000,
     "max_duration": 1080000,
     "duration_increment": 36000
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "NOCTURNAL_DAY",
+    "trait": "NOCTURNAL"
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "NOCTURNAL_NIGHT",
+    "trait": "NOCTURNAL"
   }
 ]

data/mods/Magiclysm/mutations/fantasy_species.json

@@ -185,7 +185,7 @@
     "purifiable": false,
     "category": [ "SPECIES_DWARF" ],
     "threshreq": [ "THRESH_SPECIES_DWARF" ],
-    "crafting_speed_multiplier": 1.1
+    "enchantments": [ { "values": [ { "value": "CRAFTING_SPEED_MULTIPLIER", "multiply": 0.1 } ] } ]
   },
   {
     "type": "mutation",
@@ -353,8 +353,7 @@
     "category": [ "SPECIES_ELF" ],
     "threshreq": [ "THRESH_SPECIES_ELF" ],
     "flags": [ "SEESLEEP" ],
-    "fatigue_modifier": -0.166667,
-    "fatigue_regen_modifier": 1
+    "enchantments": [ { "values": [ { "value": "FATIGUE_REGEN", "multiply": 1 }, { "value": "FATIGUE", "multiply": -0.166667 } ] } ]
   },
   {
     "type": "mutation",
@@ -507,12 +506,12 @@
           { "value": "MAX_HP", "multiply": -0.25 },
           { "value": "STRENGTH", "add": -3 },
           { "value": "DEXTERITY", "add": 2 },
+          { "value": "FOOTSTEP_NOISE", "multiply": -1 },
           { "value": "STOMACH_SIZE_MULTIPLIER", "multiply": -0.5 },
           { "value": "CARRY_WEIGHT", "multiply": 0.7 }
         ]
       }
-    ],
-    "noise_modifier": 0
+    ]
   },
   {
     "type": "mutation",
@@ -528,45 +527,16 @@
     "category": [ "SPECIES_GOBLIN" ],
     "threshreq": [ "THRESH_SPECIES_GOBLIN" ],
     "enchantments": [
-      { "condition": { "not": "is_day" }, "values": [ { "value": "SLEEPY", "add": -50 } ] },
-      { "condition": "is_day", "values": [ { "value": "SLEEPY", "add": 50 } ] }
+      {
+        "condition": { "not": "is_day" },
+        "values": [ { "value": "SLEEPY", "add": -50 }, { "value": "OVERMAP_SIGHT", "add": 6 } ]
+      },
+      {
+        "condition": "is_day",
+        "values": [ { "value": "SLEEPY", "add": 50 }, { "value": "OVERMAP_SIGHT", "add": -2 } ]
+      }
     ]
   },
-  {
-    "type": "mutation",
-    "id": "NOCTURNAL_DAY",
-    "name": { "str": "Nocturnal OverMap Day Vision" },
-    "//": "Invisible to player, sets overmap vision",
-    "points": 0,
-    "ugliness": 0,
-    "visibility": 0,
-    "description": "This adjusts goblin overmap sight so their vision is not as far during the day.",
-    "mixed_effect": true,
-    "valid": false,
-    "player_display": false,
-    "overmap_sight": -2,
-    "category": [ "SPECIES_GOBLIN" ],
-    "threshreq": [ "THRESH_SPECIES_GOBLIN" ],
-    "triggers": [ [ { "condition": { "not": "is_day" }, "msg_on": { "text": "", "rating": "good" } } ] ],
-    "transform": { "target": "NOCTURNAL_NIGHT", "msg_transform": "", "active": false, "moves": 0 }
-  },
-  {
-    "type": "mutation",
-    "id": "NOCTURNAL_NIGHT",
-    "name": { "str": "Nocturnal OverMap Night Vision" },
-    "points": 0,
-    "ugliness": 0,
-    "visibility": 0,
-    "description": "This adjusts goblin overmap sight so their vision is farther at night.",
-    "mixed_effect": true,
-    "valid": false,
-    "player_display": false,
-    "overmap_sight": 6,
-    "category": [ "SPECIES_GOBLIN" ],
-    "threshreq": [ "THRESH_SPECIES_GOBLIN" ],
-    "triggers": [ [ { "condition": "is_day", "msg_on": { "text": "", "rating": "good" } } ] ],
-    "transform": { "target": "NOCTURNAL_DAY", "msg_transform": "", "active": false, "moves": 0 }
-  },
   {
     "type": "mutation",
     "id": "GOBLIN_TEETH",

data/mods/Magiclysm/mutations/mutations.json

@@ -296,12 +296,12 @@
         "values": [
           { "value": "MAX_HP", "add": -6 },
           { "value": "STRENGTH", "add": 4 },
+          { "value": "FATIGUE", "multiply": 0.15 },
           { "value": "STOMACH_SIZE_MULTIPLIER", "multiply": 1 },
           { "value": "CARRY_WEIGHT", "multiply": 0.1 }
         ]
       }
     ],
-    "fatigue_modifier": 0.15,
     "restricts_gear": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r" ],
     "destroys_gear": true,
     "anger_relations": [ [ "HUMAN", 30 ] ]
@@ -626,9 +626,8 @@
     "threshreq": [ "THRESH_DRAGON_BLACK" ],
     "prereqs": [ "MANA_MULT3" ],
     "purifiable": false,
-    "mana_modifier": 250,
     "spells_learned": [ [ "dragon_terror", 1 ] ],
-    "enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 2 } ] } ]
+    "enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 2 }, { "value": "MAX_MANA", "add": 250 } ] } ]
   },
   {
     "type": "mutation",
@@ -640,8 +639,7 @@
     "threshreq": [ "THRESH_DRAGON_BLACK" ],
     "prereqs": [ "DRAGON_MAGIC" ],
     "spells_learned": [ [ "dragon_terror", 0 ], [ "dragon_boost", 1 ] ],
-    "mana_modifier": 750,
-    "enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 4 } ] } ]
+    "enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 4 }, { "value": "MAX_MANA", "add": 750 } ] } ]
   },
   {
     "type": "mutation",

data/mods/Magiclysm/mutations/temporary.json

@@ -49,7 +49,6 @@
     "description": "You are resting in the depths of the earth.  You should never actually see this.",
     "player_display": false,
     "points": 0,
-    "fatigue_regen_modifier": 0.5,
     "healing_awake": 0.8,
     "healing_multiplier": 2.5,
     "mending_modifier": 16,
@@ -58,7 +57,8 @@
         "values": [
           { "value": "HUNGER", "multiply": -1.0 },
           { "value": "THIRST", "multiply": -1.0 },
-          { "value": "METABOLISM", "multiply": -1.0 }
+          { "value": "METABOLISM", "multiply": -1.0 },
+          { "value": "FATIGUE_REGEN", "multiply": 0.5 }
         ]
       }
     ]

data/mods/Magiclysm/npc/trait_groups.json

@@ -220,7 +220,6 @@
       { "trait": "EATPOISON" },
       { "trait": "TUNNEL_FIGHTER" },
       { "trait": "NOCTURNAL" },
-      { "trait": "NOCTURNAL_DAY" },
       { "trait": "TROGLO2" },
       { "trait": "MOODSWINGS" }
     ]

data/mods/Magiclysm/traits/attunements.json

@@ -10,7 +10,7 @@
     "description": "With the mechanically-minded Technomancer and the sheer power of lightning from a Stormshaper, the Artificer has a unique confluence of skills and spells to be perfect for invention.  While modern inventions and machines have won out in a modern society, after a Cataclysm one has a chance to go back to roots of things.  To make weird gadgets that are just as likely to explode as explode the thing you're pointing at.",
     "prereqs": [ "STORMSHAPER", "TECHNOMANCER" ],
     "spells_learned": [ [ "spy_wasp", 5 ], [ "artificer_toolkit", 5 ] ],
-    "crafting_speed_multiplier": 1.2,
+    "enchantments": [ { "values": [ { "value": "CRAFTING_SPEED_MULTIPLIER", "multiply": 0.2 } ] } ],
     "cancels": [
       "ALCHEMIST",
       "BIOTEK",
@@ -90,7 +90,7 @@
     "description": "The Biotek is quite simply the marriage of technology and flesh.  It was not even discovered as an attunement until recent times due to the great advancements in technology in the last 50 years.  The Biotek is unique as it is the only known attunement that warps the Aethereum in such a way as to allow cybernetics to coincide with magical abilities, to an extent.",
     "prereqs": [ "BIOMANCER", "TECHNOMANCER" ],
     "spells_learned": [ [ "nitro_boost", 5 ], [ "biotek_healing", 5 ] ],
-    "bionic_mana_penalty": 0.5,
+    "enchantments": [ { "values": [ { "value": "BIONIC_MANA_PENALTY", "multiply": -0.5 } ] } ],
     "bionic_slot_bonuses": { "torso": 20 },
     "cancels": [
       "ARTIFICER",
@@ -570,8 +570,7 @@
     "valid": false,
     "description": "The Technomancer specializes in augmenting humans without actually modifying them; and the Overclocker takes the heat aptitude of a Kelvinist and puts that to work.  You are able to think significantly faster, and are able to align your ley lines for spellcasting faster as a result.",
     "prereqs": [ "KELVINIST", "TECHNOMANCER" ],
-    "enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 5 } ] } ],
-    "casting_time_multiplier": 0.75,
+    "enchantments": [ { "values": [ { "value": "INTELLIGENCE", "add": 5 }, { "value": "CASTING_TIME_MULTIPLIER", "multiply": -0.25 } ] } ],
     "spells_learned": [ [ "overaccelerate", 5 ], [ "overclocker_drive", 5 ] ],
     "cancels": [
       "ARTIFICER",

data/mods/Magiclysm/traits/fantasy_species.json

@@ -74,7 +74,6 @@
       "EATPOISON",
       "TUNNEL_FIGHTER",
       "NOCTURNAL",
-      "NOCTURNAL_DAY",
       "MOODSWINGS",
       "TROGLO2"
     ]

data/mods/Magiclysm/traits/manatouched.json

@@ -14,7 +14,7 @@
     "name": { "str": "Manatouched" },
     "points": 1,
     "description": "Magic is in you.  Magic is you.",
-    "mana_multiplier": 1.5,
+    "enchantments": [ { "values": [ { "value": "MAX_MANA", "multiply": 0.5 } ] } ],
     "valid": false,
     "purifiable": false,
     "threshold": true
@@ -35,7 +35,7 @@
     "name": { "str": "Seeker Bolts" },
     "description": "Your hands glow with mana energy.  You can fire seeker bolts from your fingertips.",
     "points": 2,
-    "mana_modifier": 250,
+    "enchantments": [ { "values": [ { "value": "MAX_MANA", "add": 250 } ] } ],
     "lumination": [ [ "hand_r", 8 ], [ "hand_l", 8 ] ],
     "prereqs": [ "MANA_LUM" ],
     "category": [ "MANATOUCHED" ],
@@ -228,7 +228,7 @@
     "types": [ "MANA_ADD" ],
     "prereqs": [ "MANA_ADD3" ],
     "category": [ "MANATOUCHED" ],
-    "mana_modifier": 2500
+    "enchantments": [ { "values": [ { "value": "MAX_MANA", "add": 2500 } ] } ]
   },
   {
     "type": "mutation",
@@ -241,7 +241,7 @@
     "threshreq": [ "THRESH_MANA" ],
     "types": [ "MANA_REGEN" ],
     "category": [ "MANATOUCHED" ],
-    "mana_regen_multiplier": 2
+    "enchantments": [ { "values": [ { "value": "REGEN_MANA", "multiply": 1 } ] } ]
   },
   {
     "type": "mutation",
@@ -254,7 +254,7 @@
     "types": [ "MANA_MULT" ],
     "category": [ "MANATOUCHED" ],
     "prereqs": [ "MANA_MULT3" ],
-    "mana_multiplier": 2.65
+    "enchantments": [ { "values": [ { "value": "MAX_MANA", "multiply": 1.65 } ] } ]
   },
   {
     "type": "mutation",