From 36273471cbcf947e4c7aec595253aee0d0f34688 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:30:10 +0100
Subject: [PATCH 01/16] Mutations modern names

---
 data/json/mutations/mutations.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 6442a6cf99142..3d70e2e0b804d 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -44,7 +44,7 @@
   {
     "type": "mutation",
     "id": "GOODHEARING",
-    "name": "Good Hearing",
+    "name": { "str": "Good Hearing" },
     "points": 1,
     "description": "Your hearing is better than average, and you can hear distant sounds more easily.",
     "starting_trait": true,
@@ -55,7 +55,7 @@
   {
     "type": "mutation",
     "id": "FEYHEARING",
-    "name": "Fey Hearing",
+    "name": { "str": "Fey Hearing" },
     "points": 2,
     "description": "Your not sure the shape of your ears are helping, but regardless you have become very sensitive to sounds.",
     "prereqs": [ "GOODHEARING" ],
@@ -885,7 +885,7 @@
   {
     "type": "mutation",
     "id": "BADHEARING",
-    "name": "Poor Hearing",
+    "name": { "str": "Poor Hearing" },
     "points": -2,
     "description": "Your hearing is poor, and you may not hear quiet or far-off noises.",
     "starting_trait": true,
@@ -897,7 +897,7 @@
   {
     "type": "mutation",
     "id": "DEAF",
-    "name": "Deaf",
+    "name": { "str": "Deaf" },
     "points": -4,
     "description": "You're not able to hear anything, and as such you're not able to talk to NPCs.",
     "starting_trait": true,
@@ -3659,7 +3659,7 @@
   {
     "type": "mutation",
     "id": "CANINE_EARS",
-    "name": "Canine Ears",
+    "name": { "str": "Canine Ears" },
     "points": 1,
     "visibility": 4,
     "ugliness": 1,
@@ -3672,7 +3672,7 @@
   {
     "type": "mutation",
     "id": "LUPINE_EARS",
-    "name": "Lupine Ears",
+    "name": { "str": "Lupine Ears" },
     "points": 1,
     "visibility": 4,
     "ugliness": 1,
@@ -3684,7 +3684,7 @@
   {
     "type": "mutation",
     "id": "FELINE_EARS",
-    "name": "Feline Ears",
+    "name": { "str": "Feline Ears" },
     "points": 1,
     "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.",
@@ -3695,7 +3695,7 @@
   {
     "type": "mutation",
     "id": "URSINE_EARS",
-    "name": "Ursine Ears",
+    "name": { "str": "Ursine Ears" },
     "points": 1,
     "visibility": 4,
     "ugliness": 1,
@@ -3719,7 +3719,7 @@
   {
     "type": "mutation",
     "id": "MOUSE_EARS",
-    "name": "Rodent Ears",
+    "name": { "str": "Rodent Ears" },
     "points": 1,
     "visibility": 8,
     "ugliness": 1,

From 40766d4f119df27a0ada2c6fe60c1eb134500380 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:33:09 +0100
Subject: [PATCH 02/16] Name string to object

---
 data/json/mutations/mutations.json   | 12 ++++++------
 data/json/npcs/expertise_traits.json |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 3d70e2e0b804d..180dceda2c9b1 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -844,7 +844,7 @@
   {
     "type": "mutation",
     "id": "BADBACK",
-    "name": "Bad Back",
+    "name": { "str": "Bad Back" },
     "points": -3,
     "description": "You simply cannot carry as much as people with a similar strength could.  Your maximum weight carried is reduced by 35%.",
     "starting_trait": true,
@@ -1480,7 +1480,7 @@
   {
     "type": "mutation",
     "id": "BIRD_EYE",
-    "name": "Avian Eyes",
+    "name": { "str": "Avian Eyes" },
     "points": 5,
     "visibility": 1,
     "description": "Your vision has become particularly acute: you suspect you could pick out zombies much farther away.  Perception +4.",
@@ -2824,7 +2824,7 @@
   {
     "type": "mutation",
     "id": "ALCMET",
-    "name": "Alcohol Metabolism",
+    "name": { "str": "Alcohol Metabolism" },
     "points": 2,
     "description": "So it's fermented?  Whatever, it's still good drinking.  You've developed the ability to metabolize alcohol as a food source.",
     "prereqs": [ "TOLERANCE" ],
@@ -5749,7 +5749,7 @@
   {
     "type": "mutation",
     "id": "THRESH_BEAST",
-    "name": "Beast",
+    "name": { "str": "Beast" },
     "points": 1,
     "description": "It's about time you grew out.  Now that you've matured, it is time to make something of yourself.",
     "valid": false,
@@ -5779,7 +5779,7 @@
   {
     "type": "mutation",
     "id": "THRESH_URSINE",
-    "name": "Bear",
+    "name": { "str": "Bear" },
     "points": 1,
     "description": "So the humans died, what's the worry?  Now they won't ruin the woods.",
     "cancels": [ "CARNIVORE" ],
@@ -6226,7 +6226,7 @@
   {
     "type": "mutation",
     "id": "PROF_AUTODOC",
-    "name": "Autodoc Specialist",
+    "name": { "str": "Autodoc Specialist" },
     "points": 0,
     "description": "You're trained in proper operation of the Autodoc, an advanced machine used for surgical procedures.  Operations involving it will be moderately more likely to succeed.",
     "valid": false,
diff --git a/data/json/npcs/expertise_traits.json b/data/json/npcs/expertise_traits.json
index 98090ddb5d576..f8fd5c5376943 100644
--- a/data/json/npcs/expertise_traits.json
+++ b/data/json/npcs/expertise_traits.json
@@ -2,7 +2,7 @@
   {
     "type": "mutation",
     "id": "Exp_Agriculture1",
-    "name": "Agriculture Training",
+    "name": { "str": "Agriculture Training" },
     "points": 0,
     "description": "This survivor has some formal training in agriculture, but not much experience.",
     "valid": false,
@@ -109,7 +109,7 @@
     "type": "mutation",
     "id": "Exp_Biochemistry1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Biochemistry Expert",
+    "name": { "str": "Biochemistry Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in biochemistry, a PhD or equivalent.",
     "valid": false,
@@ -119,7 +119,7 @@
     "type": "mutation",
     "id": "Exp_Biochemistry0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Biochemistry Expert",
+    "name": { "str": "Biochemistry Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in biochemistry, a PhD or equivalent.",
     "valid": false,

From 5958e2d28bb955a600c423854b70d57fb8d5c984 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:34:33 +0100
Subject: [PATCH 03/16] Names to objects

---
 data/json/mutations/mutations.json   |  4 ++--
 data/json/npcs/expertise_traits.json | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 180dceda2c9b1..1db6aa1023bd9 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -4901,7 +4901,7 @@
   {
     "type": "mutation",
     "id": "BEAK",
-    "name": "Beak",
+    "name": { "str": "Beak" },
     "points": -3,
     "visibility": 8,
     "ugliness": 4,
@@ -6086,7 +6086,7 @@
   {
     "type": "mutation",
     "id": "PROF_CYBERCOP",
-    "name": "Bionic Officer",
+    "name": { "str": "Bionic Officer" },
     "points": 0,
     "description": "You are a cybernetically-resurrected law enforcer, with jurisdiction throughout the New England region thanks to interstate agreements.  Whether you can do for the law what the law did for you is another question.",
     "valid": false,
diff --git a/data/json/npcs/expertise_traits.json b/data/json/npcs/expertise_traits.json
index f8fd5c5376943..52c8f40edcb92 100644
--- a/data/json/npcs/expertise_traits.json
+++ b/data/json/npcs/expertise_traits.json
@@ -80,7 +80,7 @@
   {
     "type": "mutation",
     "id": "Exp_Biochemistry1",
-    "name": "Biochemistry Training",
+    "name": { "str": "Biochemistry Training" },
     "points": 0,
     "description": "This survivor has some formal training in biochemistry, but not much experience.",
     "valid": false,
@@ -90,7 +90,7 @@
     "type": "mutation",
     "id": "Exp_Biochemistry0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Biochemistry Training",
+    "name": { "str": "Biochemistry Training" },
     "points": 0,
     "description": "This survivor has some formal training in biochemistry, but not much experience.",
     "valid": false,
@@ -99,7 +99,7 @@
   {
     "type": "mutation",
     "id": "Exp_Biochemistry2",
-    "name": "Biochemistry Expert",
+    "name": { "str": "Biochemistry Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in biochemistry, a PhD or equivalent.",
     "valid": false,
@@ -158,7 +158,7 @@
   {
     "type": "mutation",
     "id": "Exp_Biology1",
-    "name": "Biology Training",
+    "name": { "str": "Biology Training" },
     "points": 0,
     "description": "This survivor has some formal training in general biology, but not much experience.",
     "valid": false,
@@ -168,7 +168,7 @@
     "type": "mutation",
     "id": "Exp_Biology0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Biology Training",
+    "name": { "str": "Biology Training" },
     "points": 0,
     "description": "This survivor has some formal training in general biology, but not much experience.",
     "valid": false,
@@ -177,7 +177,7 @@
   {
     "type": "mutation",
     "id": "Exp_Biology2",
-    "name": "Biology Expert",
+    "name": { "str": "Biology Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in general biology, a PhD or equivalent.",
     "valid": false,
@@ -187,7 +187,7 @@
     "type": "mutation",
     "id": "Exp_Biology1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Biology Expert",
+    "name": { "str": "Biology Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in general biology, a PhD or equivalent.",
     "valid": false,
@@ -197,7 +197,7 @@
     "type": "mutation",
     "id": "Exp_Biology0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Biology Expert",
+    "name": { "str": "Biology Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in general biology, a PhD or equivalent.",
     "valid": false,

From e7faf740990d78ea93929a612b9ac3ceeea5a16c Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:45:32 +0100
Subject: [PATCH 04/16] Name to object

---
 data/json/mutations/mutations.json   |  6 +++---
 data/json/npcs/expertise_traits.json | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 1db6aa1023bd9..fa85f098ccf7d 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -3565,7 +3565,7 @@
   {
     "type": "mutation",
     "id": "WINGS_BIRD",
-    "name": "Bird Wings",
+    "name": { "str": "Bird Wings" },
     "points": 2,
     "visibility": 4,
     "ugliness": 2,
@@ -5729,7 +5729,7 @@
   {
     "type": "mutation",
     "id": "THRESH_BIRD",
-    "name": "Bird",
+    "name": { "str": "Bird" },
     "points": 1,
     "description": "You're sure you'll fly someday.  In the meantime, there are still nests to build.",
     "valid": false,
@@ -6186,7 +6186,7 @@
   {
     "type": "mutation",
     "id": "PROF_MA_BLACK",
-    "name": "Black Belt",
+    "name": { "str": "Black Belt" },
     "points": 0,
     "description": "You were competitive at national levels, and had considered teaching your art.  Defending against the entire town may still be a challenge, though.",
     "initial_ma_styles": [
diff --git a/data/json/npcs/expertise_traits.json b/data/json/npcs/expertise_traits.json
index 52c8f40edcb92..12b32ebdc1541 100644
--- a/data/json/npcs/expertise_traits.json
+++ b/data/json/npcs/expertise_traits.json
@@ -236,7 +236,7 @@
   {
     "type": "mutation",
     "id": "Exp_Bookkeeping1",
-    "name": "Bookkeeping Training",
+    "name": { "str": "Bookkeeping Training" },
     "points": 0,
     "description": "This survivor has some formal training in bookkeeping, but not much experience.",
     "valid": false,
@@ -246,7 +246,7 @@
     "type": "mutation",
     "id": "Exp_Bookkeeping0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Bookkeeping Training",
+    "name": { "str": "Bookkeeping Training" },
     "points": 0,
     "description": "This survivor has some formal training in bookkeeping, but not much experience.",
     "valid": false,
@@ -255,7 +255,7 @@
   {
     "type": "mutation",
     "id": "Exp_Bookkeeping2",
-    "name": "Bookkeeping Expert",
+    "name": { "str": "Bookkeeping Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in bookkeeping.",
     "valid": false,
@@ -265,7 +265,7 @@
     "type": "mutation",
     "id": "Exp_Bookkeeping1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Bookkeeping Expert",
+    "name": { "str": "Bookkeeping Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in bookkeeping.",
     "valid": false,
@@ -275,7 +275,7 @@
     "type": "mutation",
     "id": "Exp_Bookkeeping0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Bookkeeping Expert",
+    "name": { "str": "Bookkeeping Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in bookkeeping.",
     "valid": false,
@@ -314,7 +314,7 @@
   {
     "type": "mutation",
     "id": "Exp_Botany1",
-    "name": "Botany Training",
+    "name": { "str": "Botany Training" },
     "points": 0,
     "description": "This survivor has some formal training in botany, but not much experience.",
     "valid": false,
@@ -324,7 +324,7 @@
     "type": "mutation",
     "id": "Exp_Botany0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Botany Training",
+    "name": { "str": "Botany Training" },
     "points": 0,
     "description": "This survivor has some formal training in botany, but not much experience.",
     "valid": false,
@@ -333,7 +333,7 @@
   {
     "type": "mutation",
     "id": "Exp_Botany2",
-    "name": "Botany Expert",
+    "name": { "str": "Botany Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in botany, a PhD or equivalent.",
     "valid": false,
@@ -343,7 +343,7 @@
     "type": "mutation",
     "id": "Exp_Botany1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Botany Expert",
+    "name": { "str": "Botany Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in botany, a PhD or equivalent.",
     "valid": false,
@@ -353,7 +353,7 @@
     "type": "mutation",
     "id": "Exp_Botany0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Botany Expert",
+    "name": { "str": "Botany Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in botany, a PhD or equivalent.",
     "valid": false,

From 9dc67edd83dc8f55c9ccc092076324395828ceb9 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:48:11 +0100
Subject: [PATCH 05/16] Names to objects

---
 data/json/mutations/mutations.json   | 20 ++++++++++----------
 data/json/npcs/expertise_traits.json |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index fa85f098ccf7d..c6f3467b9b2c8 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -418,7 +418,7 @@
   {
     "type": "mutation",
     "id": "LOVES_BOOKS",
-    "name": "Bookworm",
+    "name": { "str": "Bookworm" },
     "points": 1,
     "description": "There's nothing quite like the smell of a good book!  Books are more fun (or less boring) for you!",
     "starting_trait": true,
@@ -586,7 +586,7 @@
   {
     "type": "mutation",
     "id": "CANNIBAL",
-    "name": "Cannibal",
+    "name": { "str": "Cannibal" },
     "points": 1,
     "description": "For your whole life you've been forbidden from indulging in your peculiar tastes.  Now the world's ended, and you'll be damned if anyone is going to tell you that you can't eat people.",
     "starting_trait": true,
@@ -2959,7 +2959,7 @@
   {
     "type": "mutation",
     "id": "BURROW",
-    "name": "Burrowing",
+    "name": { "str": "Burrowing" },
     "points": 10,
     "valid": false,
     "purifiable": false,
@@ -4294,7 +4294,7 @@
   {
     "type": "mutation",
     "id": "EYEBULGE",
-    "name": "Bulging Eyes",
+    "name": { "str": "Bulging Eyes" },
     "points": 0,
     "visibility": 8,
     "ugliness": 4,
@@ -4338,7 +4338,7 @@
   {
     "type": "mutation",
     "id": "WINGS_BUTTERFLY",
-    "name": "Butterfly Wings",
+    "name": { "str": "Butterfly Wings" },
     "points": -1,
     "visibility": 10,
     "ugliness": -2,
@@ -4432,7 +4432,7 @@
   {
     "type": "mutation",
     "id": "BEAUTIFUL",
-    "name": "Beautiful",
+    "name": { "str": "Beautiful" },
     "points": 2,
     "visibility": 4,
     "ugliness": -4,
@@ -4479,7 +4479,7 @@
   {
     "type": "mutation",
     "id": "MINOTAUR",
-    "name": "Bovine Snout",
+    "name": { "str": "Bovine Snout" },
     "points": -4,
     "visibility": 5,
     "ugliness": 6,
@@ -4874,7 +4874,7 @@
   {
     "type": "mutation",
     "id": "PAWS_LARGE",
-    "name": "Broad Paws",
+    "name": { "str": "Broad Paws" },
     "points": -4,
     "visibility": 4,
     "ugliness": 3,
@@ -5790,7 +5790,7 @@
   {
     "type": "mutation",
     "id": "THRESH_CATTLE",
-    "name": "Bovine",
+    "name": { "str": "Bovine" },
     "points": 1,
     "description": "Civilization collapsed?  Great!  You and your kin will never have to worry about a slaughterhouse again.",
     "valid": false,
@@ -6465,7 +6465,7 @@
   {
     "type": "mutation",
     "id": "BEE",
-    "name": "Bee",
+    "name": { "str": "Bee" },
     "points": 0,
     "valid": false,
     "description": "NPC trait that makes monsters see it as a bee.  It is a bug (heh) if you have it.",
diff --git a/data/json/npcs/expertise_traits.json b/data/json/npcs/expertise_traits.json
index 12b32ebdc1541..a9a0dea272629 100644
--- a/data/json/npcs/expertise_traits.json
+++ b/data/json/npcs/expertise_traits.json
@@ -12,7 +12,7 @@
     "type": "mutation",
     "id": "Exp_Agriculture0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Agriculture Training",
+    "name": { "str": "Agriculture Training" },
     "points": 0,
     "description": "This survivor has some formal training in agriculture, but not much experience.",
     "valid": false,

From fb09b97a4a9adca7bed7c4e92119e776e1dd1734 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:49:45 +0100
Subject: [PATCH 06/16] Names to objects

---
 data/json/mutations/mutations.json   | 20 ++++++++++----------
 data/json/npcs/expertise_traits.json |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index c6f3467b9b2c8..186a5dc3bb68a 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -1100,7 +1100,7 @@
   {
     "type": "mutation",
     "id": "CHEMIMBALANCE",
-    "name": "Chemical Imbalance",
+    "name": { "str": "Chemical Imbalance" },
     "points": -2,
     "description": "You suffer from a minor chemical imbalance, whether mental or physical.  Minor changes to your internal chemistry will manifest themselves on occasion, such as hunger, sleepiness, narcotic effects, etc.",
     "starting_trait": true,
@@ -1373,7 +1373,7 @@
   {
     "type": "mutation",
     "id": "CEPH_EYES",
-    "name": "Cephalopod Eyes",
+    "name": { "str": "Cephalopod Eyes" },
     "points": 1,
     "visibility": 8,
     "ugliness": 5,
@@ -1683,7 +1683,7 @@
   {
     "type": "mutation",
     "id": "GILLS_CEPH",
-    "name": "Cephalopod Gills",
+    "name": { "str": "Cephalopod Gills" },
     "points": 2,
     "visibility": 4,
     "ugliness": 4,
@@ -3161,7 +3161,7 @@
   {
     "type": "mutation",
     "id": "TAIL_CATTLE",
-    "name": "Cattle Tail",
+    "name": { "str": "Cattle Tail" },
     "points": -1,
     "visibility": 6,
     "ugliness": 2,
@@ -3382,7 +3382,7 @@
   {
     "type": "mutation",
     "id": "CENOBITE",
-    "name": "Cenobite",
+    "name": { "str": "Cenobite" },
     "points": 6,
     "visibility": 4,
     "ugliness": 10,
@@ -5117,7 +5117,7 @@
   {
     "type": "mutation",
     "id": "CARNIVORE",
-    "name": "Carnivore",
+    "name": { "str": "Carnivore" },
     "points": -4,
     "description": "Your body's ability to digest fruits, vegetables and grains is severely hampered.  You cannot eat anything besides meat.",
     "cancels": [ "VEGETARIAN", "HERBIVORE", "RUMINANT", "GRAZER" ],
@@ -5840,7 +5840,7 @@
   {
     "type": "mutation",
     "id": "THRESH_CEPHALOPOD",
-    "name": "Cephalopod",
+    "name": { "str": "Cephalopod" },
     "points": 1,
     "description": "Strange aeons, true, but Death seems to be slacking and you are doing just fine.",
     "valid": false,
@@ -5900,7 +5900,7 @@
   {
     "type": "mutation",
     "id": "THRESH_CHIMERA",
-    "name": "Chaos",
+    "name": { "str": "Chaos" },
     "points": 1,
     "description": "You can't tell what you are anymore.  Everything and yet nothing, like you weren't meant to exist.  But you do, and you're a force, no matter what happens.",
     "valid": false,
@@ -6258,7 +6258,7 @@
   {
     "type": "mutation",
     "id": "NPC_RUM",
-    "name": "Carries Rum",
+    "name": { "str": "Carries Rum" },
     "points": 0,
     "description": "This Bartender now carries rum!",
     "player_display": false,
@@ -6268,7 +6268,7 @@
   {
     "type": "mutation",
     "id": "NPC_WHISKEY",
-    "name": "Carries Whiskey",
+    "name": { "str": "Carries Whiskey" },
     "points": 0,
     "description": "This Bartender now carries whiskey!",
     "player_display": false,
diff --git a/data/json/npcs/expertise_traits.json b/data/json/npcs/expertise_traits.json
index a9a0dea272629..033f4f4064848 100644
--- a/data/json/npcs/expertise_traits.json
+++ b/data/json/npcs/expertise_traits.json
@@ -411,7 +411,7 @@
   {
     "type": "mutation",
     "id": "Exp_Chemistry2",
-    "name": "Chemistry Expert",
+    "name": { "str": "Chemistry Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in inorganic chemistry, a PhD or equivalent.",
     "valid": false,
@@ -421,7 +421,7 @@
     "type": "mutation",
     "id": "Exp_Chemistry1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Chemistry Expert",
+    "name": { "str": "Chemistry Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in inorganic chemistry, a PhD or equivalent.",
     "valid": false,
@@ -431,7 +431,7 @@
     "type": "mutation",
     "id": "Exp_Chemistry0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Chemistry Expert",
+    "name": { "str": "Chemistry Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in inorganic chemistry, a PhD or equivalent.",
     "valid": false,

From 9fa6d03739310f4420ca6085b8624301bb7b8bc4 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:51:00 +0100
Subject: [PATCH 07/16] Names to objects

---
 data/json/mutations/mutations.json   | 14 +++++++-------
 data/json/npcs/expertise_traits.json | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 186a5dc3bb68a..1f430b48bdb2a 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -1385,7 +1385,7 @@
   {
     "type": "mutation",
     "id": "CEPH_VISION",
-    "name": "Cephalopod Vision",
+    "name": { "str": "Cephalopod Vision" },
     "points": 3,
     "description": "Your brain has caught up with your eyes.  You can see much better in the dark, but sunlight seems much brighter now.  Activate to toggle NV-visible areas on or off.",
     "prereqs": [ "CEPH_EYES" ],
@@ -1994,7 +1994,7 @@
   {
     "type": "mutation",
     "id": "CHITIN",
-    "name": "Chitinous Skin",
+    "name": { "str": "Chitinous Skin" },
     "points": 2,
     "visibility": 3,
     "ugliness": 2,
@@ -2020,7 +2020,7 @@
   {
     "type": "mutation",
     "id": "CHITIN2",
-    "name": "Chitinous Armor",
+    "name": { "str": "Chitinous Armor" },
     "points": 2,
     "visibility": 6,
     "ugliness": 3,
@@ -2049,7 +2049,7 @@
   {
     "type": "mutation",
     "id": "CHITIN3",
-    "name": "Chitinous Plate",
+    "name": { "str": "Chitinous Plate" },
     "points": 2,
     "visibility": 8,
     "ugliness": 5,
@@ -2450,7 +2450,7 @@
   {
     "type": "mutation",
     "id": "CLAWS",
-    "name": "Claws",
+    "name": { "str": "Claws" },
     "points": 2,
     "visibility": 3,
     "ugliness": 2,
@@ -5294,7 +5294,7 @@
   {
     "type": "mutation",
     "id": "CHLOROMORPH",
-    "name": "Chloromorphosis",
+    "name": { "str": "Chloromorphosis" },
     "points": 10,
     "visibility": 7,
     "ugliness": 1,
@@ -6248,7 +6248,7 @@
   {
     "type": "mutation",
     "id": "NPC_BRANDY",
-    "name": "Carries Brandy",
+    "name": { "str": "Carries Brandy" },
     "points": 0,
     "description": "This Bartender now carries brandy!",
     "player_display": false,
diff --git a/data/json/npcs/expertise_traits.json b/data/json/npcs/expertise_traits.json
index 033f4f4064848..a4eade03a648c 100644
--- a/data/json/npcs/expertise_traits.json
+++ b/data/json/npcs/expertise_traits.json
@@ -21,7 +21,7 @@
   {
     "type": "mutation",
     "id": "Exp_Agriculture2",
-    "name": "Agriculture Expert",
+    "name": { "str": "Agriculture Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in agriculture.",
     "valid": false,
@@ -31,7 +31,7 @@
     "type": "mutation",
     "id": "Exp_Agriculture1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Agriculture Expert",
+    "name": { "str": "Agriculture Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in agriculture.",
     "valid": false,
@@ -41,7 +41,7 @@
     "type": "mutation",
     "id": "Exp_Agriculture0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Agriculture Expert",
+    "name": { "str": "Agriculture Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in agriculture.",
     "valid": false,
@@ -392,7 +392,7 @@
   {
     "type": "mutation",
     "id": "Exp_Chemistry1",
-    "name": "Chemistry Training",
+    "name": { "str": "Chemistry Training" },
     "points": 0,
     "description": "This survivor has some formal training in inorganic chemistry, but not much experience.",
     "valid": false,
@@ -402,7 +402,7 @@
     "type": "mutation",
     "id": "Exp_Chemistry0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Chemistry Training",
+    "name": { "str": "Chemistry Training" },
     "points": 0,
     "description": "This survivor has some formal training in inorganic chemistry, but not much experience.",
     "valid": false,

From 5dac970005d6e84bb966809878fb152b5dbb370e Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:52:11 +0100
Subject: [PATCH 08/16] Name to object

---
 data/json/mutations/mutations.json   | 10 +++++-----
 data/json/npcs/expertise_traits.json | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 1f430b48bdb2a..f9a4ccb753f7f 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -670,7 +670,7 @@
   {
     "type": "mutation",
     "id": "MARTIAL_FENCING",
-    "name": "Competitive Fencer",
+    "name": { "str": "Competitive Fencer" },
     "points": 0,
     "description": "You were an avid fencer, starting with foil and moving onto saber, then épée.  You competed nationally and dabbled with some of the historical fencing weapons afforded by HEMA's popularity.",
     "starting_trait": false,
@@ -2759,7 +2759,7 @@
   {
     "type": "mutation",
     "id": "COMPOUND_EYES",
-    "name": "Compound Eyes",
+    "name": { "str": "Compound Eyes" },
     "points": 2,
     "visibility": 9,
     "ugliness": 5,
@@ -3030,7 +3030,7 @@
   {
     "type": "mutation",
     "id": "HORNS_CURLED",
-    "name": "Curled Horns",
+    "name": { "str": "Curled Horns" },
     "points": -3,
     "visibility": 8,
     "ugliness": 2,
@@ -4238,7 +4238,7 @@
   {
     "type": "mutation",
     "id": "CRAFTY",
-    "name": "Crafty",
+    "name": { "str": "Crafty" },
     "points": 4,
     "description": "By making the most of your small stature, you can avoid the notice of all but the most perceptive creatures, and your speed is greatly increased.",
     "valid": false,
@@ -5352,7 +5352,7 @@
   {
     "type": "mutation",
     "id": "COLDBLOOD3",
-    "name": "Cold Blooded",
+    "name": { "str": "Cold Blooded" },
     "points": -3,
     "mixed_effect": true,
     "description": "You are cold-blooded and rely on heat to keep moving.  Your lose 1% of your speed for every 2 (1.1) degrees below 65 F (18.3 C), but only need to eat about half as much as before.",
diff --git a/data/json/npcs/expertise_traits.json b/data/json/npcs/expertise_traits.json
index a4eade03a648c..4d51b8ec828b2 100644
--- a/data/json/npcs/expertise_traits.json
+++ b/data/json/npcs/expertise_traits.json
@@ -470,7 +470,7 @@
   {
     "type": "mutation",
     "id": "Exp_Culinary1",
-    "name": "Culinary Training",
+    "name": { "str": "Culinary Training" },
     "points": 0,
     "description": "This survivor has some formal training in culinary arts, but not much experience.",
     "valid": false,
@@ -480,7 +480,7 @@
     "type": "mutation",
     "id": "Exp_Culinary0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Culinary Training",
+    "name": { "str": "Culinary Training" },
     "points": 0,
     "description": "This survivor has some formal training in culinary arts, but not much experience.",
     "valid": false,
@@ -489,7 +489,7 @@
   {
     "type": "mutation",
     "id": "Exp_Culinary2",
-    "name": "Culinary Expert",
+    "name": { "str": "Culinary Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in culinary arts, a professional chef or equivalent.",
     "valid": false,
@@ -499,7 +499,7 @@
     "type": "mutation",
     "id": "Exp_Culinary1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Culinary Expert",
+    "name": { "str": "Culinary Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in culinary arts, a professional chef or equivalent.",
     "valid": false,
@@ -509,7 +509,7 @@
     "type": "mutation",
     "id": "Exp_Culinary0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Culinary Expert",
+    "name": { "str": "Culinary Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in culinary arts, a professional chef or equivalent.",
     "valid": false,

From 4a66db3b3b62d12523d7c77ade602b39b61f8ea0 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:54:41 +0100
Subject: [PATCH 09/16] Debug mutations names to objects

---
 data/json/mutations/mutations.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index f9a4ccb753f7f..c0b4fd0a09718 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -6338,7 +6338,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_NIGHTVISION",
-    "name": "Debug Night Vision",
+    "name": { "str": "Debug Night Vision" },
     "points": 99,
     "valid": false,
     "description": "You can clearly see that this is for dev purposes only.",
@@ -6347,7 +6347,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_CLOAK",
-    "name": "Debug Invisibility",
+    "name": { "str": "Debug Invisibility" },
     "points": 99,
     "valid": false,
     "description": "If you see this, you'd best be debugging something.",
@@ -6356,7 +6356,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_LS",
-    "name": "Debug Life Support",
+    "name": { "str": "Debug Life Support" },
     "points": 99,
     "valid": false,
     "description": "Holds hunger, thirst, and fatigue stable.  You can debug all year long with this one!",
@@ -6365,7 +6365,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_NOSCENT",
-    "name": "Debug Deodorizer",
+    "name": { "str": "Debug Deodorizer" },
     "points": 99,
     "valid": false,
     "description": "Smell that bug?  Smell's certainly not coming from you!",
@@ -6374,7 +6374,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_SILENT",
-    "name": "Debug Silent Walk",
+    "name": { "str": "Debug Silent Walk" },
     "points": 99,
     "valid": false,
     "description": "Be vewwy vewwy quiet.  We're hunting bugs.",
@@ -6383,7 +6383,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_NOTEMP",
-    "name": "Debug HVAC",
+    "name": { "str": "Debug HVAC" },
     "points": 99,
     "valid": false,
     "description": "Temperature and weather won't bug you.",
@@ -6392,7 +6392,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_NODMG",
-    "name": "Debug Invincibility",
+    "name": { "str": "Debug Invincibility" },
     "points": 99,
     "valid": false,
     "description": "Bug repellent forcefield.",
@@ -6401,7 +6401,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_HS",
-    "name": "Debug Hammerspace",
+    "name": { "str": "Debug Hammerspace" },
     "points": 99,
     "valid": false,
     "description": "Crafting and construction requirements bugger off with this one.  Apply with care.",
@@ -6410,7 +6410,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_MIND_CONTROL",
-    "name": "Debug Mind Control",
+    "name": { "str": "Debug Mind Control" },
     "points": 99,
     "valid": false,
     "description": "Mind the bugs, would you kindly?",
@@ -6419,7 +6419,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_STORAGE",
-    "name": "Debug Carrying Capacity",
+    "name": { "str": "Debug Carrying Capacity" },
     "points": 99,
     "valid": false,
     "description": "Lets you carry 15 bugs worth of your body weight in your mandibles.",
@@ -6428,7 +6428,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_BIONICS",
-    "name": "Debug Bionic Installation",
+    "name": { "str": "Debug Bionic Installation" },
     "points": 99,
     "valid": false,
     "description": "Lets you instantly install torsion ratchets for your eight legs.",
@@ -6437,7 +6437,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_BIONIC_POWER",
-    "name": "Debug Bionic Power",
+    "name": { "str": "Debug Bionic Power" },
     "points": 99,
     "valid": false,
     "description": "For fueling your inner cybug.  Activate to increase power capacity by 100 (can be repeated.)",
@@ -6447,7 +6447,7 @@
   {
     "type": "mutation",
     "id": "DEBUG_BIONIC_POWERGEN",
-    "name": "Debug Bionic Powergen",
+    "name": { "str": "Debug Bionic Powergen" },
     "points": 99,
     "valid": false,
     "description": "Activate to increase power by an amount you specify (can be repeated).",

From e3240bb5b727033b35e68a0d6ed8763f7337e530 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:56:34 +0100
Subject: [PATCH 10/16] Names to objects

---
 data/json/mutations/mutations.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index c0b4fd0a09718..862eebb0d8e93 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -368,7 +368,7 @@
   {
     "type": "mutation",
     "id": "DEFT",
-    "name": "Deft",
+    "name": { "str": "Deft" },
     "points": 1,
     "description": "While you're not any better at melee combat, you are better at recovering from a miss, and will be able to attempt another strike faster.",
     "starting_trait": true,
@@ -2627,7 +2627,7 @@
   {
     "type": "mutation",
     "id": "DISIMMUNE",
-    "name": "Disease Immune",
+    "name": { "str": "Disease Immune" },
     "points": 2,
     "description": "Your body is simply immune to diseases.  You will never catch an ambient disease.",
     "prereqs": [ "DISRESISTANT" ],
@@ -3969,7 +3969,7 @@
   {
     "type": "mutation",
     "id": "DEX_UP",
-    "name": "Dextrous",
+    "name": { "str": "Dextrous" },
     "points": 1,
     "description": "You are a little nimbler.  Dexterity + 1",
     "changes_to": [ "DEX_UP_2", "DEX_ALPHA" ],
@@ -5920,7 +5920,7 @@
   {
     "type": "mutation",
     "id": "THRESH_MOUSE",
-    "name": "Diminutive",
+    "name": { "str": "Diminutive" },
     "points": 1,
     "description": "So much food, everywhere!  And nobody's even guarding it anymore!  These are good times.",
     "valid": false,

From 1029022e4244c921ae98eb649d517ef867469a20 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 11:57:50 +0100
Subject: [PATCH 11/16] Names to objects

---
 data/json/mutations/mutations.json   |  2 +-
 data/json/npcs/expertise_traits.json | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 862eebb0d8e93..c1ebdf30e7edc 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -6034,7 +6034,7 @@
   {
     "type": "mutation",
     "id": "ELECTRORECEPTORS",
-    "name": "Electroreceptors",
+    "name": { "str": "Electroreceptors" },
     "points": 2,
     "description": "A network of jelly-filled electroreceptors, like that of a shark, have grown throughout your face and nose.  They are very sensitive to magnetic fields, allowing you to see robots and creatures charged with electricity through walls, but being shocked will seriously mess you up.",
     "category": [ "FISH" ],
diff --git a/data/json/npcs/expertise_traits.json b/data/json/npcs/expertise_traits.json
index 4d51b8ec828b2..ee417c0e3a88b 100644
--- a/data/json/npcs/expertise_traits.json
+++ b/data/json/npcs/expertise_traits.json
@@ -548,7 +548,7 @@
   {
     "type": "mutation",
     "id": "Exp_Eng_Electrical1",
-    "name": "Electrical Engineering Training",
+    "name": { "str": "Electrical Engineering Training" },
     "points": 0,
     "description": "This survivor has some formal training in electrical engineering, but not much experience.",
     "valid": false,
@@ -558,7 +558,7 @@
     "type": "mutation",
     "id": "Exp_Eng_Electrical0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Electrical Engineering Training",
+    "name": { "str": "Electrical Engineering Training" },
     "points": 0,
     "description": "This survivor has some formal training in electrical engineering, but not much experience.",
     "valid": false,
@@ -567,7 +567,7 @@
   {
     "type": "mutation",
     "id": "Exp_Eng_Electrical2",
-    "name": "Electrical Engineering Expert",
+    "name": { "str": "Electrical Engineering Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in electrical engineering: an EngD, extensive field experience, or equivalent.",
     "valid": false,
@@ -577,7 +577,7 @@
     "type": "mutation",
     "id": "Exp_Eng_Electrical1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Electrical Engineering Expert",
+    "name": { "str": "Electrical Engineering Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in electrical engineering: an EngD, extensive field experience, or equivalent.",
     "valid": false,
@@ -587,7 +587,7 @@
     "type": "mutation",
     "id": "Exp_Eng_Electrical0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Electrical Engineering Expert",
+    "name": { "str": "Electrical Engineering Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in electrical engineering: an EngD, extensive field experience, or equivalent.",
     "valid": false,
@@ -860,7 +860,7 @@
   {
     "type": "mutation",
     "id": "Exp_Entomology1",
-    "name": "Entomology Training",
+    "name": { "str": "Entomology Training" },
     "points": 0,
     "description": "This survivor has some formal training in entomology, but not much experience.",
     "valid": false,
@@ -870,7 +870,7 @@
     "type": "mutation",
     "id": "Exp_Entomology0Fake1",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Entomology Training",
+    "name": { "str": "Entomology Training" },
     "points": 0,
     "description": "This survivor has some formal training in entomology, but not much experience.",
     "valid": false,
@@ -879,7 +879,7 @@
   {
     "type": "mutation",
     "id": "Exp_Entomology2",
-    "name": "Entomology Expert",
+    "name": { "str": "Entomology Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in entomology, a PhD or equivalent.",
     "valid": false,
@@ -889,7 +889,7 @@
     "type": "mutation",
     "id": "Exp_Entomology1Fake2",
     "//": "A fake! This survivor will pretend to know more about this subject than they do.",
-    "name": "Entomology Expert",
+    "name": { "str": "Entomology Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in entomology, a PhD or equivalent.",
     "valid": false,
@@ -899,7 +899,7 @@
     "type": "mutation",
     "id": "Exp_Entomology0Fake2",
     "//": "A fake! This survivor will pretend to know about this subject but doesn't.",
-    "name": "Entomology Expert",
+    "name": { "str": "Entomology Expert" },
     "points": 0,
     "description": "This survivor has extensive experience in entomology, a PhD or equivalent.",
     "valid": false,

From d19fddee8d2ddbfd38152b365dc9044166507c43 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 12:00:02 +0100
Subject: [PATCH 12/16] Names to objects

---
 data/json/mutations/mutations.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index c1ebdf30e7edc..026b3400f5ded 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -865,7 +865,7 @@
   {
     "type": "mutation",
     "id": "DISORGANIZED",
-    "name": "Disorganized",
+    "name": { "str": "Disorganized" },
     "points": -3,
     "description": "You are terrible at organizing and storing your possessions.  You can carry 40% less volume.",
     "starting_trait": true,
@@ -3434,7 +3434,7 @@
   {
     "type": "mutation",
     "id": "MORE_PAIN3",
-    "name": "Extreme Hyperalgesia",
+    "name": { "str": "Extreme Hyperalgesia" },
     "points": -5,
     "description": "Your body reacts cripplingly to any source of pain.  Pain dealt to you is doubled.",
     "prereqs": [ "MORE_PAIN2" ],
@@ -3443,7 +3443,7 @@
   {
     "type": "mutation",
     "id": "PRED1",
-    "name": "Culler",
+    "name": { "str": "Culler" },
     "points": 2,
     "description": "You've had a revelation: by killing the weaker creatures, who would only die anyway, you preserve resources for those better able to survive.  You are less bothered by the deaths of others: their own weakness invited these fates upon them.",
     "purifiable": false,
@@ -4672,7 +4672,7 @@
   {
     "type": "mutation",
     "id": "HUNGER3",
-    "name": "Extreme Metabolism",
+    "name": { "str": "Extreme Metabolism" },
     "points": -2,
     "description": "You consume three times as much food as the average human to maintain your truly superhuman endurance.",
     "prereqs": [ "HUNGER2" ],

From 46a1d6495e2dd1c155b81517bc98760b585b382e Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 12:01:14 +0100
Subject: [PATCH 13/16] Names to objects

---
 data/json/mutations/mutations.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 026b3400f5ded..81ef1845a3942 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -377,7 +377,7 @@
   {
     "type": "mutation",
     "id": "DRUNKEN",
-    "name": "Drunken Master",
+    "name": { "str": "Drunken Master" },
     "points": 1,
     "description": "The ancient arts of drunken brawling come naturally to you!  While under the influence of alcohol, your melee skill will rise considerably, especially unarmed combat.",
     "starting_trait": true,
@@ -2948,7 +2948,7 @@
   {
     "type": "mutation",
     "id": "EATDEAD",
-    "name": "Eater Of The Dead",
+    "name": { "str": "Eater Of The Dead" },
     "points": 4,
     "description": "Eating rotting, long-dead flesh is good for the struggle, and safe--if still completely unappealing--for you.",
     "prereqs": [ "EATPOISON" ],
@@ -3990,7 +3990,7 @@
   {
     "type": "mutation",
     "id": "DEX_UP_3",
-    "name": "Extremely Dextrous",
+    "name": { "str": "Extremely Dextrous" },
     "points": 3,
     "description": "You are nimble and quick.  Dexterity + 4",
     "prereqs": [ "DEX_UP_2" ],
@@ -4120,7 +4120,7 @@
   {
     "type": "mutation",
     "id": "PER_UP_3",
-    "name": "Extremely Perceptive",
+    "name": { "str": "Extremely Perceptive" },
     "points": 3,
     "description": "Your senses are much keener.  Perception + 4",
     "prereqs": [ "PER_UP_2" ],
@@ -4171,7 +4171,7 @@
   {
     "type": "mutation",
     "id": "PER_SLIME_OK",
-    "name": "Distributed Senses",
+    "name": { "str": "Distributed Senses" },
     "points": 7,
     "visibility": 10,
     "ugliness": 10,
@@ -5151,7 +5151,7 @@
   {
     "type": "mutation",
     "id": "PONDEROUS3",
-    "name": "Extremely Ponderous",
+    "name": { "str": "Extremely Ponderous" },
     "points": -6,
     "description": "Your muscles are very slow to move.  You move 30% slower.",
     "types": [ "RUNNING" ],
@@ -5366,7 +5366,7 @@
   {
     "type": "mutation",
     "id": "COLDBLOOD4",
-    "name": "Ectothermic",
+    "name": { "str": "Ectothermic" },
     "points": 0,
     "mixed_effect": true,
     "description": "Your body has become permanently cold-blooded.  Your speed lowers or raises 1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  You only need to eat half as much as an average human.",
@@ -6236,7 +6236,7 @@
   {
     "type": "mutation",
     "id": "PROF_DICEMASTER",
-    "name": "Dungeon Master",
+    "name": { "str": "Dungeon Master" },
     "points": 0,
     "description": "Weeks spent picking through manuals and researching topics you aren't versed in has taught you to find what you need to know more quickly.  You read slightly faster, and suffer no reading time penalty for books too complex for you to easily understand.",
     "reading_speed_multiplier": 0.9,

From 3b2bc82f9c59e25c9a77c77ff53ee0a54649a81d Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 12:02:25 +0100
Subject: [PATCH 14/16] Names to objects

---
 data/json/mutations/mutation_appearance.json |  2 +-
 data/json/mutations/mutations.json           | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/json/mutations/mutation_appearance.json b/data/json/mutations/mutation_appearance.json
index 4fed0dd60cc5c..e9ee2d4d4de40 100644
--- a/data/json/mutations/mutation_appearance.json
+++ b/data/json/mutations/mutation_appearance.json
@@ -626,7 +626,7 @@
   {
     "id": "FACIAL_HAIR_3DAYSTUBBLE",
     "type": "mutation",
-    "name": "Facial hair: 3-day stubble",
+    "name": { "str": "Facial hair: 3-day stubble" },
     "description": "You have a short trimmed moustache and beard imitating a 3-day stubble.",
     "points": 0,
     "valid": false,
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 81ef1845a3942..84f23be115f71 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -469,7 +469,7 @@
   {
     "type": "mutation",
     "id": "DISRESISTANT",
-    "name": "Disease Resistant",
+    "name": { "str": "Disease Resistant" },
     "points": 1,
     "description": "It's very unlikely that you will catch ambient diseases like a cold or the flu.",
     "starting_trait": true,
@@ -1161,7 +1161,7 @@
   {
     "type": "mutation",
     "id": "CLUMSY",
-    "name": "Clumsy",
+    "name": { "str": "Clumsy" },
     "points": -1,
     "description": "You make more noise while walking.  You're also more likely to set off traps.",
     "starting_trait": true,
@@ -3398,7 +3398,7 @@
   {
     "type": "mutation",
     "id": "NOPAIN",
-    "name": "Deadened",
+    "name": { "str": "Deadened" },
     "points": 2,
     "description": "Nothing hurts any more.  Those bites tickle and the wounds itch a bit, but that's it.",
     "valid": false,
@@ -3930,7 +3930,7 @@
   {
     "type": "mutation",
     "id": "STR_UP_3",
-    "name": "Extremely Strong",
+    "name": { "str": "Extremely Strong" },
     "points": 4,
     "visibility": 1,
     "description": "Your muscles are much stronger.  Strength + 4",
@@ -4044,7 +4044,7 @@
   {
     "type": "mutation",
     "id": "INT_UP_3",
-    "name": "Extremely Smart",
+    "name": { "str": "Extremely Smart" },
     "points": 3,
     "visibility": 1,
     "ugliness": 1,
@@ -4082,7 +4082,7 @@
   {
     "type": "mutation",
     "id": "INT_SLIME",
-    "name": "Distributed Neurology",
+    "name": { "str": "Distributed Neurology" },
     "points": 4,
     "visibility": 10,
     "ugliness": 10,
@@ -4394,7 +4394,7 @@
   {
     "type": "mutation",
     "id": "DEFORMED",
-    "name": "Deformed",
+    "name": { "str": "Deformed" },
     "points": -2,
     "visibility": 4,
     "ugliness": 4,
@@ -4709,7 +4709,7 @@
   {
     "type": "mutation",
     "id": "THIRST3",
-    "name": "Extremely Thirsty",
+    "name": { "str": "Extremely Thirsty" },
     "points": -5,
     "description": "You dry out seriously quickly, requiring three times as much liquid to stay hydrated.",
     "cancels": [ "NO_THIRST" ],

From 11b131974762ea351b06b4e29404b84c27502c70 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 12:04:32 +0100
Subject: [PATCH 15/16] Facial hair names to objects

---
 data/json/mutations/mutation_appearance.json | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/json/mutations/mutation_appearance.json b/data/json/mutations/mutation_appearance.json
index e9ee2d4d4de40..b86e868f03d68 100644
--- a/data/json/mutations/mutation_appearance.json
+++ b/data/json/mutations/mutation_appearance.json
@@ -554,7 +554,7 @@
   {
     "id": "FACIAL_HAIR_GOATEE",
     "type": "mutation",
-    "name": "Facial hair: goatee",
+    "name": { "str": "Facial hair: goatee" },
     "description": "You have a short beard at the tip of your chin.",
     "points": 0,
     "valid": false,
@@ -566,7 +566,7 @@
   {
     "id": "FACIAL_HAIR_CIRCLE",
     "type": "mutation",
-    "name": "Facial hair: circle beard",
+    "name": { "str": "Facial hair: circle beard" },
     "description": "You have a moustache and a short beard, that both form a circle around your lips.",
     "points": 0,
     "valid": false,
@@ -590,7 +590,7 @@
   {
     "id": "FACIAL_HAIR_ANCHOR",
     "type": "mutation",
-    "name": "Facial hair: anchor beard",
+    "name": { "str": "Facial hair: anchor beard" },
     "description": "You have a moustache and a beard starting with a strip going down from the bottom lip, then tracing the jaw lines.  It looks a bit like an anchor, thus the name.",
     "points": 0,
     "valid": false,
@@ -614,7 +614,7 @@
   {
     "id": "FACIAL_HAIR_CHEVRON",
     "type": "mutation",
-    "name": "Facial hair: chevron moustache",
+    "name": { "str": "Facial hair: chevron moustache" },
     "description": "You have a moustache that covers your entire top lip.",
     "points": 0,
     "valid": false,
@@ -638,7 +638,7 @@
   {
     "id": "FACIAL_HAIR_HORSESHOE",
     "type": "mutation",
-    "name": "Facial hair: horseshoe",
+    "name": { "str": "Facial hair: horseshoe" },
     "description": "You have a moustache with patches going down the chin from both ends, thus the name.",
     "points": 0,
     "valid": false,
@@ -650,7 +650,7 @@
   {
     "id": "FACIAL_HAIR_MUSTACHE",
     "type": "mutation",
-    "name": "Facial hair: original moustache",
+    "name": { "str": "Facial hair: original moustache" },
     "description": "You have a moustache with shortened ends, that covers only the skin above your upper lip.",
     "points": 0,
     "valid": false,
@@ -662,7 +662,7 @@
   {
     "id": "FACIAL_HAIR_MUTTONCHOPS",
     "type": "mutation",
-    "name": "Facial hair: mutton chops beard",
+    "name": { "str": "Facial hair: mutton chops beard" },
     "description": "You have long sideburns that connect to your moustache, with the tip of the chin shaven clean.",
     "points": 0,
     "valid": false,
@@ -674,7 +674,7 @@
   {
     "id": "FACIAL_HAIR_GUNSLINGER",
     "type": "mutation",
-    "name": "Facial hair: gunslinger beard",
+    "name": { "str": "Facial hair: gunslinger beard" },
     "description": "You have a horseshoe moustache and disconnected sideburns.",
     "points": 0,
     "valid": false,
@@ -686,7 +686,7 @@
   {
     "id": "FACIAL_HAIR_CHIN_STRIP",
     "type": "mutation",
-    "name": "Facial hair: chin strip",
+    "name": { "str": "Facial hair: chin strip" },
     "description": "You have a short beard in a form of a vertical patch under your bottom lip.",
     "points": 0,
     "valid": false,
@@ -710,7 +710,7 @@
   {
     "id": "FACIAL_HAIR_CHIN_STRAP",
     "type": "mutation",
-    "name": "Facial hair: chin strap",
+    "name": { "str": "Facial hair: chin strap" },
     "description": "You have beard along the jaw lines, circling the chin, and no moustache.",
     "points": 0,
     "valid": false,
@@ -722,7 +722,7 @@
   {
     "id": "FACIAL_HAIR_BEARD",
     "type": "mutation",
-    "name": "Facial hair: beard",
+    "name": { "str": "Facial hair: beard" },
     "description": "You have a moustache and a long beard, both formed by allowing free growth of hair, with no particular styling.",
     "points": 0,
     "valid": false,
@@ -746,7 +746,7 @@
   {
     "id": "FACIAL_HAIR_NECKBEARD",
     "type": "mutation",
-    "name": "Facial hair: neckbeard",
+    "name": { "str": "Facial hair: neckbeard" },
     "description": "You have a beard formed from hair grown on neck below the chin line.  No moustache included.",
     "points": 0,
     "valid": false,
@@ -818,7 +818,7 @@
   {
     "id": "FACIAL_HAIR_VANDYKE",
     "type": "mutation",
-    "name": "Facial hair: Van Dyke",
+    "name": { "str": "Facial hair: Van Dyke" },
     "description": "You have handlebar moustache with a chin strip or a small goatee.",
     "points": 0,
     "valid": false,
@@ -842,7 +842,7 @@
   {
     "id": "FACIAL_HAIR_ZAPPA",
     "type": "mutation",
-    "name": "Facial hair: The Zappa",
+    "name": { "str": "Facial hair: The Zappa" },
     "description": "You have a wide soul patch and a full moustache that extends a bit downwards at the corners of your lips.",
     "points": 0,
     "valid": false,

From 70b97124b8154924cd537ae22c68de46f07474b5 Mon Sep 17 00:00:00 2001
From: snipercup <50166150+snipercup@users.noreply.github.com>
Date: Mon, 27 Jan 2020 12:05:40 +0100
Subject: [PATCH 16/16] Facial hair names to objects

---
 data/json/mutations/mutation_appearance.json | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/json/mutations/mutation_appearance.json b/data/json/mutations/mutation_appearance.json
index b86e868f03d68..388e829323131 100644
--- a/data/json/mutations/mutation_appearance.json
+++ b/data/json/mutations/mutation_appearance.json
@@ -542,7 +542,7 @@
   {
     "id": "FACIAL_HAIR_NONE",
     "type": "mutation",
-    "name": "Facial hair: none",
+    "name": { "str": "Facial hair: none" },
     "description": "You have no hair on your face, it is shaven or simply untouched by the presence of hair.",
     "points": 0,
     "valid": false,
@@ -578,7 +578,7 @@
   {
     "id": "FACIAL_HAIR_ROYALE",
     "type": "mutation",
-    "name": "Facial hair: royale beard",
+    "name": { "str": "Facial hair: royale beard" },
     "description": "You have a moustache and a short beard forming a patch under your lips.",
     "points": 0,
     "valid": false,
@@ -602,7 +602,7 @@
   {
     "id": "FACIAL_HAIR_SHORTBOXED",
     "type": "mutation",
-    "name": "Facial hair: short boxed beard",
+    "name": { "str": "Facial hair: short boxed beard" },
     "description": "You have a moustache and a short beard with trimmed sides.  Thin patches connect them both, forming a 'box' around the lips, thus the name.",
     "points": 0,
     "valid": false,
@@ -698,7 +698,7 @@
   {
     "id": "FACIAL_HAIR_CHIN_CURTAIN",
     "type": "mutation",
-    "name": "Facial hair: chin curtain",
+    "name": { "str": "Facial hair: chin curtain" },
     "description": "You have a full beard without a moustache, restricted to the chin, sometimes called a 'lion's mane'. Much like Abraham Lincoln's beard.",
     "points": 0,
     "valid": false,
@@ -734,7 +734,7 @@
   {
     "id": "FACIAL_HAIR_HANDLEBAR",
     "type": "mutation",
-    "name": "Facial hair: handlebar moustache",
+    "name": { "str": "Facial hair: handlebar moustache" },
     "description": "You have a moustache with long flared out ends.",
     "points": 0,
     "valid": false,
@@ -758,7 +758,7 @@
   {
     "id": "FACIAL_HAIR_PENCIL",
     "type": "mutation",
-    "name": "Facial hair: pencil moustache",
+    "name": { "str": "Facial hair: pencil moustache" },
     "description": "You have a very thin moustache just above the line of the upper lip.",
     "points": 0,
     "valid": false,
@@ -770,7 +770,7 @@
   {
     "id": "FACIAL_HAIR_SHENANDOAH",
     "type": "mutation",
-    "name": "Facial hair: shenandoah",
+    "name": { "str": "Facial hair: shenandoah" },
     "description": "Long full beard with no moustache, popular among Amish community, often with two pointed ends.",
     "points": 0,
     "valid": false,
@@ -782,7 +782,7 @@
   {
     "id": "FACIAL_HAIR_SIDEBURNS",
     "type": "mutation",
-    "name": "Facial hair: sideburns",
+    "name": { "str": "Facial hair: sideburns" },
     "description": "You have patches of hair in front of your ears, that normally would connect your hair with the beard, but they are here by themselves.",
     "points": 0,
     "valid": false,
@@ -794,7 +794,7 @@
   {
     "id": "FACIAL_HAIR_SOUL_PATCH",
     "type": "mutation",
-    "name": "Facial hair: soul patch",
+    "name": { "str": "Facial hair: soul patch" },
     "description": "You have a little bit of hair in the dip under your lower lip, and no other facial hair whatsoever.",
     "points": 0,
     "valid": false,
@@ -806,7 +806,7 @@
   {
     "id": "FACIAL_HAIR_TOOTHBRUSH",
     "type": "mutation",
-    "name": "Facial hair: toothbrush moustache",
+    "name": { "str": "Facial hair: toothbrush moustache" },
     "description": "Charlie Chaplin used to have this short patch of hair just under the nose, but then that other guy used it as a characteristic, and it became unwelcomed.",
     "points": 0,
     "valid": false,
@@ -830,7 +830,7 @@
   {
     "id": "FACIAL_HAIR_WALRUS",
     "type": "mutation",
-    "name": "Facial hair: walrus",
+    "name": { "str": "Facial hair: walrus" },
     "description": "You have long thick moustache, overshadowing you lips, that somewhat resembles facial hair of a walrus.",
     "points": 0,
     "valid": false,