Switch all lifepath files to wrapped format

And change loading accordingly

src/data/gold/lifepaths/dwarf.json

@@ -1,4 +1,6 @@
 {
+  "stock": "dwarf",
+  "settings": {
     "Clansman Setting": {
       "Born Clansman": {
         "time": 20,
@@ -1937,3 +1939,4 @@
       }
     }
   }
+}

src/data/gold/lifepaths/elf.json

@@ -1,4 +1,6 @@
 {
+  "stock": "elf",
+  "settings": {
     "Wilderlands Setting": {
       "Born Wilder Elf": {
         "time": 20,
@@ -2022,3 +2024,4 @@
       }
     }
   }
+}

src/data/gold/lifepaths/man.json

@@ -1,4 +1,6 @@
 {
+  "stock": "man",
+  "settings": {
     "Peasant Setting": {
       "Born Peasant": {
         "time": 8,
@@ -11812,3 +11814,4 @@
       }
     }
   }
+}

src/data/gold/lifepaths/orc.json

@@ -1,4 +1,6 @@
 {
+  "stock": "orc",
+  "settings": {
     "Chattel Setting": {
       "Born Chattel": {
         "time": 10,
@@ -1575,3 +1577,4 @@
       }
     }
   }
+}

src/data/gold/lifepaths/roden.json

@@ -1,4 +1,6 @@
 {
+  "stock": "roden",
+  "settings": {
     "Field Setting": {
       "Born To The Fields": {
         "time": 8,
@@ -1720,3 +1722,4 @@
       }
     }
   }
+}

src/data/gold/lifepaths/wolf.json

@@ -1,4 +1,6 @@
 {
+  "stock": "wolf",
+  "settings": {
     "Wild Pack Setting": {
       "Born To The Pack": {
         "time": 1,
@@ -949,3 +951,4 @@
       }
     }
   }
+}

src/lib/data/custom.rb

@@ -3,23 +3,23 @@ require 'json'
 module Charred
   module Custom
     def load_custom(data)
-      Dir.glob("data/custom/**/*") { |file|
+      #Dir.glob("data/custom/**/*") { |file|
-        if File.file?(file)
+      #  if File.file?(file)
-          case File.extname(file)
+      #    case File.extname(file)
-          when "skills"
+      #    when "skills"
-            verbose_merge data[:skills], json_get(file)
+      #      verbose_merge data[:skills], json_get(file)
-          when "traits"
+      #    when "traits"
-            verbose_merge data[:traits], json_get(file)
+      #      verbose_merge data[:traits], json_get(file)
-          when "stock"
+      #    when "stock"
-            stock = Stock.new(json_get(file))
+      #      stock = Stock.new(json_get(file))
-            data[:stocks][stock.key] = stock # This overwrites existing data...
+      #      data[:stocks][stock.key] = stock # This overwrites existing data...
-          when "lifepaths"
+      #    when "lifepaths"
-            #
+      #      #
-          when "resources"
+      #    when "resources"
-            #
+      #      #
-          end
+      #    end
-        end
+      #  end
-      }
+      #}
       # Dir.glob("data/custom/*/") { |dir|
       #   stock_name = File.basename(dir)
 

src/lib/data/dark_elf.rb

@@ -12,7 +12,8 @@ module Charred
       verbose_merge data[:traits], traits
 
       file = File.read('data/dark_elf/lifepaths.json')
-      lifepaths = JSON.parse(file)
+      contents = JSON.parse(file)
+      lifepaths = contents["settings"]
 
       file = File.read("data/dark_elf/resources.json")
       resources = JSON.parse(file)

src/lib/data/gold.rb

@@ -18,7 +18,8 @@ module Charred
 
       gold_stocks.each do |stock|
         file = File.read("data/gold/lifepaths/#{stock}.json")
-        lifepaths[stock]  = JSON.parse(file)
+        contents = JSON.parse(file)
+        lifepaths[stock] = contents["settings"]
 
         file = File.read("data/gold/resources/#{stock}.json")
         resources[stock]  = JSON.parse(file)

src/lib/data/troll.rb

@@ -13,7 +13,8 @@ module Charred
       verbose_merge data[:traits], traits
 
       file = File.read('data/troll/lifepaths.json')
-      lifepaths = JSON.parse(file)
+      contents = JSON.parse(file)
+      lifepaths = contents["settings"]
       data[:lifepaths]['troll'] = lifepaths
 
       file = File.read("data/troll/resources.json")

src/lib/data/wizard.rb

@@ -4,7 +4,8 @@ module Charred
   module Wizard
     def load_wizard(data)
       file = File.read('data/wizard/lifepaths.json')
-      wizard_data = JSON.parse(file)
+      contents = JSON.parse(file)
+      wizard_data = contents["settings"]
 
       file = File.read('data/wizard/skills.json')
       wizard_skills = JSON.parse(file)