Start up the JSON work next

data/json/flags.json

@@ -1047,12 +1047,6 @@
     "context": [ "SPELL" ],
     "//": "pain altering spells can't be resisted (like with the deadened trait)"
   },
-  {
-    "id": "NON_THRESH",
-    "type": "json_flag",
-    "context": [ "mutation" ],
-    "//": "This mutation does not count toward thresholds at all."
-  },
   {
     "id": "EFFECT_FEATHER_FALL",
     "context": [  ],

data/json/flags_mutation.json

@@ -0,0 +1,54 @@
+[
+  {
+    "id": "CANNIBAL",
+    "type": "mutation_flag"
+  },
+  {
+    "id": "NO_THIRST",
+    "type": "mutation_flag"
+  },
+  {
+    "id": "NO_RADIATION",
+    "type": "mutation_flag"
+  },
+  {
+    "id": "NON_THRESH",
+    "type": "mutation_flag"
+  },
+  {
+    "id": "PSYCHOPATH",
+    "type": "mutation_flag"
+  },
+  {
+    "id": "PRED1",
+    "type": "mutation_flag",
+    "conflicts": [ "PRED2", "PRED3", "PRED4" ]
+  },
+  {
+    "id": "PRED2",
+    "type": "mutation_flag",
+    "conflicts": [ "PRED1", "PRED3", "PRED4" ]
+  },
+  {
+    "id": "PRED3",
+    "type": "mutation_flag",
+    "conflicts": [ "PRED1", "PRED2", "PRED4" ]
+  },
+  {
+    "id": "PRED4",
+    "type": "mutation_flag",
+    "conflicts": [ "PRED1", "PRED2", "PRED3" ]
+  },
+  {
+    "id": "SAPIOVORE",
+    "type": "mutation_flag"
+  },
+  {
+    "id": "SILENT_SPELL",
+    "type": "mutation_flag"
+  },
+  {
+    "id": "SUBTLE_SPELL",
+    "type": "mutation_flag"
+  }
+]

src/flag_trait.cpp

@@ -75,11 +75,6 @@ const json_trait_flag &json_trait_flag::get( const std::string &id )
 
 void json_trait_flag::load( const JsonObject &jo, const std::string & )
 {
-    // Remember these for conversion of the other shit.
-    // optional( jo, was_loaded, "inherit", inherit_, true );
-    // optional( jo, was_loaded, "craft_inherit", craft_inherit_, false );
-    // optional( jo, was_loaded, "taste_mod", taste_mod_ );
-    // jo.get_member( "context" );
     optional( jo, was_loaded, "conflicts", conflicts_ );
     optional( jo, was_loaded, "restriction", restriction_ );
 }