CleverRaven · Rivet-the-Zombie · Aug 27, 2016 · Aug 17, 2016 · Aug 17, 2016 · Aug 17, 2016
diff --git a/data/json/mutations.json b/data/json/mutations.json
@@ -231,7 +231,7 @@
        "description" : "You are less likely to throw up from food poisoning, alcohol, etc.  If you throw up nevertheless, you won't suffer a residual nausea.",
        "starting_trait" : true,
        "changes_to" : ["NAUSEA"],
-  
-        "note" : "nope.  This does NOT lead to EATPOISON.  Stomach problems are part of the GI upgrades--one advantage to not having Robust Genetics.",
+  
+        "//" : "nope.  This does NOT lead to EATPOISON.  Stomach problems are part of the GI upgrades--one advantage to not having Robust Genetics.",
        "cancels" : ["WEAKSTOMACH"]
    },{
        "type" : "mutation",
@@ -390,7 +390,7 @@
        "category" : ["MUTCAT_FISH", "MUTCAT_SLIME", "MUTCAT_ALPHA", "MUTCAT_MEDICAL"]
    },{
        "type" : "mutation",
-  
-        "id" : "EAGLEEYED", "note" : "Can't change the ID as that breaks save-compatibility.",
+  
+        "id" : "EAGLEEYED", "//" : "Can't change the ID as that breaks save-compatibility.",
        "name" : "Scout",
        "points" : 1,
        "description" : "You're an excellent navigator and your ability to spot distant landmarks is unmatched.  Your sight radius on the overmap extends beyond the normal range.",
@@ -1752,7 +1752,6 @@
        "category" : ["MUTCAT_MYCUS"],
        "active"     :    true,
        "cost"       :    8,
-  
-        "time"       :    0,
        "hunger"     :    true,
        "thirst"     :    true
    },{
@@ -1785,7 +1784,6 @@
        "category" : ["MUTCAT_MYCUS"],
        "active"     :    true,
        "cost"       :    10,
-  
-        "time"       :    0,
        "hunger"     :    true,
        "thirst"     :    true,
        "fatigue"    :    true
@@ -2145,7 +2143,7 @@
        "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", "EATPOISON"],
        "prereqs2" : ["SAPROVORE", "EATPOISON"],
-  
-        "note" : "It's unlikely but possible to get EATPOISON without ALCMET.  Since EATPOISON's arguably a stronger version, it serves as both prereqs.",
+  
+        "//" : "It's unlikely but possible to get EATPOISON without ALCMET.  Since EATPOISON's arguably a stronger version, it serves as both prereqs.",
        "category" : ["MUTCAT_TROGLOBITE"],
        "valid" : false
    },{
@@ -2249,7 +2247,7 @@
        "description" : "Your guts have developed the ability to handle poisonous food.  Mostly.",
        "changes_to" : ["EATDEAD"],
        "prereqs" : ["NAUSEA", "VOMITOUS", "POISRESIST", "POISONOUS"],
-  
-        "note" : "Yes, you eventually got over the massive digestive upset.  Mutations aren't easy on a system!",
+  
+        "//" : "Yes, you eventually got over the massive digestive upset.  Mutations aren't easy on a system!",
        "prereqs2" : ["SAPROVORE", "TOLERANCE"],
        "threshreq" : ["THRESH_TROGLOBITE", "THRESH_CHIMERA", "THRESH_RAPTOR", "THRESH_RAT"],
        "category" : ["MUTCAT_TROGLOBITE", "MUTCAT_RAPTOR", "MUTCAT_RAT", "MUTCAT_CHIMERA"],
@@ -2278,7 +2276,6 @@
        "category" : ["MUTCAT_RAT"],
        "active"     :    true,
        "cost"       :    10,
-  
-        "time"       :    0,
        "hunger"     :    true,
        "thirst"     :    true,
        "fatigue"    :    true
@@ -2650,7 +2647,7 @@
        "threshreq" : ["THRESH_MEDICAL"],
        "leads_to" : ["MUT_TOUGH"],
        "changes_to" : ["CENOBITE"],
-  
-        "note" : "MASOCHIST_MED and NOPAIN don't cancel each other.  By design.  Poor painless folks...",
+  
+        "//" : "MASOCHIST_MED and NOPAIN don't cancel each other.  By design.  Poor painless folks...",
        "category" : ["MUTCAT_MEDICAL"]
    },{
        "type" : "mutation",
@@ -2665,7 +2662,7 @@
        "prereqs" : ["MASOCHIST_MED"],
        "prereqs2" : ["PAINREC3", "ADDICTIVE"],
        "threshreq" : ["THRESH_MEDICAL"],
-  
-        "note" : "CENOBITE and NOPAIN also don't cancel each other.  By design.  Poor painless cenobites...",
+  
+        "//" : "CENOBITE and NOPAIN also don't cancel each other.  By design.  Poor painless cenobites...",
        "category" : ["MUTCAT_MEDICAL"]
    },{
        "type" : "mutation",
@@ -2678,7 +2675,7 @@
        "prereqs" : ["MASOCHIST", "PAINRESIST"],
        "prereqs2" : ["PAINREC3"],
        "threshreq" : ["THRESH_MEDICAL"],
-  
-        "note" : "MASOCHIST_MED, CENOBITE, and NOPAIN don't cancel each other.  By design.  Poor painless people...",
+  
+        "//" : "MASOCHIST_MED, CENOBITE, and NOPAIN don't cancel each other.  By design.  Poor painless people...",
        "category" : ["MUTCAT_MEDICAL"]
    },{
        "type" : "mutation",
@@ -3203,7 +3200,8 @@
        "id" : "INT_UP_2",
        "name" : "Very Smart",
        "points" : 2,
-  
-        "ugliness" : 0,"description" : "You are smarter.  Intelligence + 2",
+  
+        "ugliness" : 0,
+  
+        "description" : "You are smarter.  Intelligence + 2",
        "prereqs" : ["INT_UP"],
        "changes_to" : ["INT_UP_3"],
        "passive_mods" : {
@@ -3360,7 +3358,7 @@
        "type" : "mutation",
        "id" : "MUT_JUNKIE",
        "name" : "Metallassomaiphile",
-  
-        "note" : "name courtesy of wiktionary's Greek for 'mutate'.  Greek-speakers, feel free to correct the term",
+  
+        "//" : "name courtesy of wiktionary's Greek for 'mutate'.  Greek-speakers, feel free to correct the term",
        "points" : -1,
        "visibility" : 0,
        "ugliness" : 0,
@@ -3681,8 +3679,7 @@
        "prereqs" : ["WEAKSTOMACH"],
        "changes_to" : ["VOMITOUS", "EATPOISON"],
        "category" : ["MUTCAT_ALPHA"],
-  
-        "active" : true,
-  
-        "time" : 0
+  
+        "active" : true
    },{
        "type" : "mutation",
        "id" : "VOMITOUS",
@@ -3692,8 +3689,7 @@
        "prereqs" : ["NAUSEA"],
        "changes_to" : ["EATPOISON"],
        "category" : ["MUTCAT_SLIME", "MUTCAT_RAT", "MUTCAT_MEDICAL", "MUTCAT_ELFA"],
-  
-        "active" : true,
-  
-        "time" : 0
+  
+        "active" : true
    },{
        "type" : "mutation",
        "id" : "HUNGER",
@@ -4105,7 +4101,6 @@
        "category" : ["MUTCAT_SLIME"],
        "active"     :    true,
        "cost"       :    40,
-  
-        "time"       :    0,
        "hunger"     :    true,
        "thirst"     :    true
    },{
@@ -4210,7 +4205,6 @@
        "category" : ["MUTCAT_PLANT"],
        "active"     :    true,
        "cost"       :    10,
-  
-        "time"       :    0,
        "hunger"     :    true,
        "thirst"     :    true,
        "attacks": [

diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md
@@ -49,6 +49,9 @@ groups of vehicle definitions with self-explanatory names of files:
 #raw jsons
+  
+###All files
+  
+"//" : "comment", // Preferred method of leaving comments inside json files.
+  
+
 ###BIONICS
 ```C++
 "id"           : "bio_batteries",  // Unique ID. Must be one continuous word,
@@ -376,22 +379,34 @@ Mods can modify this via "add:traits" and "remove:traits".
 "description": "Nothing gets you down!" // In-game description
 "starting_trait": true, // Can be selected at character creation (default: false)
 "valid": false,      // Can be mutated ingame (default: true)
+  
+"purifiable": false, //Sets if the mutation be purified (default: true)
+  
+"profession": true, //Trait is a starting profession special trait. (default: false)
+  
+"initial_ma_styles" : [ "style_centipede", "style_venom_snake" ], //List of starting martial arts types. One of the list is selectable at start. Only works at character creation.
 "category": ["MUTCAT_BIRD", "MUTCAT_INSECT"], // Categories containing this mutation
 "prereqs": ["SKIN_ROUGH"], // Needs these mutations before you can mutate toward this mutation
+  
+"prereqs2": ["LEAVES"], //Also need these mutations before you can mutate towards this mutation. When both set creates 2 different mutation paths, random from one is picked. Only use together with "prereqs"
+  
+"threshreq": ["THRESH_SPIDER"], //Required threshold for this mutation to be possible
 "cancels": ["ROT1", "ROT2", "ROT3"], // Cancels these mutations when mutating
 "changes_to": ["FASTHEALER2"], // Can change into these mutations when mutating further
 "leads_to": [], // Mutations that add to this one
+  
+"passive_mods" : { //increases stats with the listed value. Negative means a stat reduction
+  
+            "per_mod" : 1, //Possible values per_mod, str_mod, dex_mod, int_mod
+  
+            "str_mod" : 2
+  
+},
 "wet_protection":[{ "part": "HEAD", // Wet Protection on specific bodyparts
                    "good": 1 } ] // "neutral/good/ignored" // Good increases pos and cancels neg, neut cancels neg, ignored cancels both
 "vitamin_rates": [ [ "vitC", -1200 ] ], // How much extra vitamins do you consume per minute. Negative values mean production
+  
+"restricts_gear" : [ "TORSO" ], //list of bodyparts that get restricted by this mutation
+  
+"allow_soft_gear" : true, //If there is a list of 'restricts_gear' this sets if the location still allows items made out of soft materials (Only one of the types need to be soft for it to be considered soft). (default: false)
+  
+"destroys_gear" : true, //If true, destroys the gear in the 'restricts_gear' location when mutated into. (default: false)
 "encumbrance_always" : [ // Adds this much encumbrance to selected body parts
    [ "ARM_L", 20 ],
    [ "ARM_R", 20 ]
 ],
 "encumbrance_covered" : [ // Adds this much encumbrance to selected body parts, but only if the part is covered by not-OVERSIZE worn equipment
    [ "HAND_L", 50 ],
    [ "HAND_R", 50 ]
-  
-]
+  
+],
 "armor" : [ // Protects selected body parts this much. Resistances use syntax like `PART RESISTANCE` below.
    [
        [ "ALL" ], // Shorthand that applies the selected resistance to the entire body
@@ -401,7 +416,14 @@ Mods can modify this via "add:traits" and "remove:traits".
        [ "ARM_L", "ARM_R" ], // Overrides the above settings for those body parts
        { "bash" : 1 }        // ...and gives them those resistances instead
    ]
-  
-]
+  
+],
+  
+"active" : true, //When set the mutation is an active mutation that the player needs to activate (default: false)
+  
+"starts_active" : true, //When true, this 'active' mutation starts active (default: false, requires 'active')
+  
+"cost" : 8, // Cost to activate this mutation. Needs one of the hunger, thirst, or fatigue values set to true. (default: 0)
+  
+"time" : 100, //Sets the amount of (turns * current player speed ) time units that need to pass before the cost is to be paid again. Needs to be higher than one to have any effect. (default: 0)
+  
+"hunger" : true, //If true, activated mutation increases hunger by cost. (default: false)
+  
+"thirst" : true, //If true, activated mutation increases thirst by cost. (default: false)
+  
+"fatigue" : true, //If true, activated mutation increases fatigue by cost. (default: false)
 ```
 ###VEHICLE GROUPS
 ```C++