CHANGELOG.md

@@ -11,16 +11,6 @@ and this project adheres to [Semantic Versioning](semver).
 - Custom upload for your own data files
 - Updates to Roden and Great Wolves files (currently the data comes from Monster Burner and not Codex)
 
-## [3.0.0] - 2023-09-03
-### Added
-- Custom stocks can now be added to a server
-- Stock data moved from code to dedicated data file
-- Data files split into stock, lifepath, skills, and traits files, with designated extensions
-- "Born" lifepaths with arbitrary names
-
-### Fixed
-- Spite shade calculation
-
 ## [2.3.0] - 2019-07-28
 ### Added
 - Display emotional attribute traits on PDF

Gemfile

@@ -5,7 +5,6 @@ gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'prawn'
 gem 'prawn-templates'
-gem 'deep_merge', '~> 1.2', '>= 1.2.1'
 
 group :development do
   gem 'rerun'

Gemfile.lock

@@ -4,7 +4,6 @@ GEM
     Ascii85 (1.1.0)
     afm (0.2.2)
     daemons (1.4.1)
-    deep_merge (1.2.2)
     eventmachine (1.2.7)
     ffi (1.15.5)
     hashery (2.1.2)
@@ -59,7 +58,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  deep_merge (~> 1.2, >= 1.2.1)
   prawn
   prawn-templates
   rerun

src/app.rb

@@ -49,20 +49,24 @@ get '/traits' do
   json DATA[:traits]
 end
 
-get '/stocks' do
-  json DATA[:stocks]
-end
-
 get '/lifepaths/:stock' do
-  if DATA[:stocks].keys.include? params['stock']
+  if DATA[:stocks].include? params['stock']
     json DATA[:lifepaths][params['stock']]
   else
     404
   end
 end
 
+get '/starting_stat_pts/:stock' do
+  if DATA[:stocks].include? params['stock']
+    json DATA[:stat_pts][params['stock']]
+  else
+    404
+  end
+end
+
 get '/resources/:stock' do
-  if DATA[:stocks].keys.include? params['stock']
+  if DATA[:stocks].include? params['stock']
     json DATA[:resources][params['stock']]
   else
     404

src/data/custom/.gitignore

@@ -1 +0,0 @@
-*

src/data/dark_elf/lifepaths.json

@@ -1,6 +1,4 @@
 {
-  "stock": "elf",
-  "settings": {
   "Path Of Spite Subsetting": {
     "Griever": {
       "time": 3,
@@ -296,4 +294,3 @@
     }
   }
 }
-}

src/data/dark_elf/resources.json

@@ -1,6 +1,4 @@
-{
+[
-  "stock": "elf",
-  "resources": [
   {
     "name": "Bitter Poison",
     "type": "gear",
@@ -114,4 +112,3 @@
     ]
   }
 ]
-}

src/data/gold/lifepaths/dwarf.json

@@ -1,6 +1,4 @@
 {
-  "stock": "dwarf",
-  "settings": {
   "Clansman Setting": {
     "Born Clansman": {
       "time": 20,
@@ -17,10 +15,18 @@
       "traits": [
         1
       ],
+      "common_traits": [
+        "Accustomed To The Dark",
+        "Bearded",
+        "Greed",
+        "Oathsworn",
+        "Shaped From Earth And Stone",
+        "Stout",
+        "Tough"
+      ],
       "key_leads": [
         "Guilder Setting"
-        ],
+      ]
-        "born": true
     },
     "Tender": {
       "time": 20,
@@ -347,10 +353,18 @@
       "traits": [
         1
       ],
+      "common_traits": [
+        "Accustomed To The Dark",
+        "Bearded",
+        "Greed",
+        "Oathsworn",
+        "Shaped From Earth And Stone",
+        "Stout",
+        "Tough"
+      ],
       "key_leads": [
         "Clansman Setting"
-        ],
+      ]
-        "born": true
     },
     "Wordbearer": {
       "time": 15,
@@ -649,10 +663,18 @@
       "traits": [
         1
       ],
+      "common_traits": [
+        "Accustomed To The Dark",
+        "Bearded",
+        "Greed",
+        "Oathsworn",
+        "Shaped From Earth And Stone",
+        "Stout",
+        "Tough"
+      ],
       "key_leads": [
         "Clansman Setting"
-        ],
+      ]
-        "born": true
     },
     "Ardent": {
       "time": 21,
@@ -931,11 +953,19 @@
         2,
         "Dvergar"
       ],
+      "common_traits": [
+        "Accustomed To The Dark",
+        "Bearded",
+        "Greed",
+        "Oathsworn",
+        "Shaped From Earth And Stone",
+        "Stout",
+        "Tough"
+      ],
       "key_leads": [
         "Guilder Setting",
         "Artificer Setting"
-        ],
+      ]
-        "born": true
     },
     "Abecedart": {
       "time": 20,
@@ -1943,4 +1973,3 @@
     }
   }
 }
-}

src/data/gold/lifepaths/elf.json

@@ -1,6 +1,4 @@
 {
-  "stock": "elf",
-  "settings": {
   "Wilderlands Setting": {
     "Born Wilder Elf": {
       "time": 20,
@@ -22,10 +20,17 @@
       "traits": [
         1
       ],
+      "common_traits": [
+        "Born Under The Silver Stars",
+        "Essence Of The Earth",
+        "Fair And Statuesque",
+        "First Born",
+        "Grief",
+        "Keen Sight"
+      ],
       "key_leads": [
         "Citadel Setting"
-        ],
+      ]
-        "born": true
     },
     "Rider": {
       "time": 20,
@@ -512,6 +517,14 @@
       "traits": [
         1
       ],
+      "common_traits": [
+        "Born Under The Silver Stars",
+        "Essence Of The Earth",
+        "Fair And Statuesque",
+        "First Born",
+        "Grief",
+        "Keen Sight"
+      ],
       "key_leads": [
         "Wilderlands Setting"
       ]
@@ -1176,11 +1189,18 @@
         "Fea",
         "Aman"
       ],
+      "common_traits": [
+        "Born Under The Silver Stars",
+        "Essence Of The Earth",
+        "Fair And Statuesque",
+        "First Born",
+        "Grief",
+        "Keen Sight"
+      ],
       "key_leads": [
         "Wilderlands Setting",
         "Citadel Setting"
-        ],
+      ]
-        "born": true
     },
     "Student": {
       "time": 25,
@@ -2026,4 +2046,3 @@
     }
   }
 }
-}

src/data/gold/lifepaths/man.json

@@ -1,6 +1,4 @@
 {
-  "stock": "man",
-  "settings": {
   "Peasant Setting": {
     "Born Peasant": {
       "time": 8,
@@ -25,8 +23,7 @@
         "Professional Soldier Subsetting",
         "Seafaring Setting",
         "Religious Subsetting"
-        ],
+      ]
-        "born": true
     },
     "Farmer": {
       "time": 8,
@@ -702,7 +699,6 @@
   },
   "Villager Setting": {
     "Village Born": {
-        "born": true,
       "time": 10,
       "res": 4,
       "leads": [
@@ -2410,7 +2406,6 @@
   },
   "City Dweller Setting": {
     "City Born": {
-        "born": true,
       "time": 12,
       "res": 10,
       "leads": [
@@ -5139,8 +5134,7 @@
         "Professional Soldier Subsetting",
         "Seafaring Setting",
         "Religious Subsetting"
-        ],
+      ]
-        "born": true
     },
     "Bastard": {
       "time": 6,
@@ -7621,8 +7615,7 @@
       "key_leads": [
         "Professional Soldier Subsetting",
         "Outcast Subsetting"
-        ],
+      ]
-        "born": true
     },
     "Ditch Digging": {
       "time": 4,
@@ -9879,7 +9872,6 @@
   },
   "Seafaring Setting": {
     "Son Of A Gun": {
-        "born": true,
       "time": 8,
       "res": 3,
       "leads": [
@@ -11820,4 +11812,3 @@
     }
   }
 }
-}

src/data/gold/lifepaths/orc.json

@@ -1,6 +1,4 @@
 {
-  "stock": "orc",
-  "settings": {
   "Chattel Setting": {
     "Born Chattel": {
       "time": 10,
@@ -24,11 +22,19 @@
       "traits": [
         1
       ],
+      "common_traits": [
+        "Cannibal",
+        "Cold Black Blood",
+        "Breeder",
+        "Fanged And Clawed",
+        "Loathsome And Twisted",
+        "Lynx-eyed, Like Burning Coals",
+        "Vile Language"
+      ],
       "key_leads": [
         "Black Legion Subsetting",
         "Servant Of The Dark Blood Subsetting"
-        ],
+      ]
-        "born": true
     },
     "Cattle Slave": {
       "time": 5,
@@ -426,10 +432,18 @@
         "Born To Rule Them All",
         "Enemy Of The Sun"
       ],
+      "common_traits": [
+        "Cannibal",
+        "Cold Black Blood",
+        "Breeder",
+        "Fanged And Clawed",
+        "Loathsome And Twisted",
+        "Lynx-eyed, Like Burning Coals",
+        "Vile Language"
+      ],
       "key_leads": [
         "Servant Of The Dark Blood Subsetting"
-        ],
+      ]
-        "born": true
     },
     "The Rites": {
       "time": 3,
@@ -1579,4 +1593,3 @@
     }
   }
 }
-}

src/data/gold/lifepaths/roden.json

@@ -1,6 +1,4 @@
 {
-  "stock": "roden",
-  "settings": {
   "Field Setting": {
     "Born To The Fields": {
       "time": 8,
@@ -18,10 +16,18 @@
         3,
         "Vegetarian"
       ],
+      "common_traits": [
+        "Aecer's Likeness",
+        "Coat Of Fur",
+        "Communal",
+        "Enlarged Incisors",
+        "Quick-blooded",
+        "Tail",
+        "Large Ears"
+      ],
       "key_leads": [
         "Society Subsetting"
-        ],
+      ]
-        "born": true
     },
     "Hand": {
       "time": 3,
@@ -566,10 +572,18 @@
         3,
         "Tunnel Vision"
       ],
+      "common_traits": [
+        "Aecer's Likeness",
+        "Coat Of Fur",
+        "Communal",
+        "Enlarged Incisors",
+        "Quick-blooded",
+        "Tail",
+        "Large Ears"
+      ],
       "key_leads": [
         "Society Subsetting"
-        ],
+      ]
-        "born": true
     },
     "Pinky": {
       "time": 2,
@@ -1724,4 +1738,3 @@
     }
   }
 }
-}

src/data/gold/lifepaths/wolf.json

@@ -1,6 +1,4 @@
 {
-  "stock": "wolf",
-  "settings": {
   "Wild Pack Setting": {
     "Born To The Pack": {
       "time": 1,
@@ -21,10 +19,19 @@
       "traits": [
         2
       ],
+      "common_traits": [
+        "Crushing Jaws",
+        "Deep Fur",
+        "Great Lupine Form",
+        "Lupine Intellect",
+        "Long-legged",
+        "Wolf's Eyes",
+        "Wolf's Snout",
+        "Woodland Ear"
+      ],
       "key_leads": [
         "Captive Subsetting"
-        ],
+      ]
-        "born": true
     },
     "Yearling": {
       "time": 1,
@@ -328,10 +335,19 @@
         "Vile Language",
         "Demented"
       ],
+      "common_traits": [
+        "Crushing Jaws",
+        "Deep Fur",
+        "Great Lupine Form",
+        "Lupine Intellect",
+        "Long-legged",
+        "Wolf's Eyes",
+        "Wolf's Snout",
+        "Woodland Ear"
+      ],
       "key_leads": [
         "Captive Subsetting"
-        ],
+      ]
-        "born": true
     },
     "Caged And Beaten": {
       "time": 0.5,
@@ -953,4 +969,3 @@
     }
   }
 }
-}

src/data/gold/resources/dwarf.json

@@ -1,6 +1,4 @@
-{
+[
-  "stock": "dwarf",
-  "resources": [
   {
     "name": "Shoddy Arms",
     "rp": 5,
@@ -152,4 +150,3 @@
     "type": "gear"
   }
 ]
-}

src/data/gold/resources/elf.json

@@ -1,6 +1,4 @@
-{
+[
-  "stock": "elf",
-  "resources": [
   {
     "name": "Run Of The Mill Bow",
     "type": "gear",
@@ -176,4 +174,3 @@
     ]
   }
 ]
-}

src/data/gold/resources/man.json

@@ -1,6 +1,4 @@
-{
+[
-  "stock": "man",
-  "resources": [
   {
     "name": "Arms",
     "type": "gear",
@@ -434,4 +432,3 @@
     ]
   }
 ]
-}

src/data/gold/resources/orc.json

@@ -1,6 +1,4 @@
-{
+[
-  "stock": "orc",
-  "resources": [
   {
     "name": "Rags",
     "rp": 1,
@@ -211,4 +209,3 @@
     "type": "gear"
   }
 ]
-}

src/data/gold/resources/roden.json

@@ -1,6 +1,4 @@
-{
+[
-  "stock": "roden",
-  "resources": [
   {
     "name": "Arms",
     "rp": 5,
@@ -139,4 +137,3 @@
     ]
   }
 ]
-}

src/data/gold/resources/wolf.json

@@ -1,6 +1,4 @@
-{
+[
-  "stock": "wolf",
-  "resources": [
   {
     "name": "Territory",
     "type": "property",
@@ -42,4 +40,3 @@
     ]
   }
 ]
-}

src/data/gold/starting_stat_pts/dwarf.json

@@ -0,0 +1,114 @@
+[
+  {
+    "range": [
+      1,
+      20
+    ],
+    "m": 6,
+    "p": 13
+  },
+  {
+    "range": [
+      21,
+      30
+    ],
+    "m": 7,
+    "p": 13
+  },
+  {
+    "range": [
+      31,
+      50
+    ],
+    "m": 7,
+    "p": 14
+  },
+  {
+    "range": [
+      51,
+      76
+    ],
+    "m": 8,
+    "p": 15
+  },
+  {
+    "range": [
+      77,
+      111
+    ],
+    "m": 8,
+    "p": 16
+  },
+  {
+    "range": [
+      112,
+      151
+    ],
+    "m": 9,
+    "p": 16
+  },
+  {
+    "range": [
+      152,
+      199
+    ],
+    "m": 9,
+    "p": 17
+  },
+  {
+    "range": [
+      200,
+      245
+    ],
+    "m": 10,
+    "p": 18
+  },
+  {
+    "range": [
+      246,
+      300
+    ],
+    "m": 11,
+    "p": 17
+  },
+  {
+    "range": [
+      301,
+      345
+    ],
+    "m": 11,
+    "p": 16
+  },
+  {
+    "range": [
+      346,
+      396
+    ],
+    "m": 12,
+    "p": 15
+  },
+  {
+    "range": [
+      397,
+      445
+    ],
+    "m": 11,
+    "p": 14
+  },
+  {
+    "range": [
+      446,
+      525
+    ],
+    "m": 11,
+    "p": 13
+  },
+  {
+    "range": [
+      526,
+      600
+    ],
+    "m": 10,
+    "p": 12
+  }
+]

src/data/gold/starting_stat_pts/elf.json

@@ -0,0 +1,146 @@
+[
+  {
+    "range": [
+      1,
+      25
+    ],
+    "m": 7,
+    "p": 13
+  },
+  {
+    "range": [
+      26,
+      60
+    ],
+    "m": 8,
+    "p": 13
+  },
+  {
+    "range": [
+      61,
+      100
+    ],
+    "m": 9,
+    "p": 14
+  },
+  {
+    "range": [
+      101,
+      125
+    ],
+    "m": 9,
+    "p": 15
+  },
+  {
+    "range": [
+      126,
+      160
+    ],
+    "m": 10,
+    "p": 16
+  },
+  {
+    "range": [
+      161,
+      225
+    ],
+    "m": 10,
+    "p": 17
+  },
+  {
+    "range": [
+      226,
+      325
+    ],
+    "m": 11,
+    "p": 17
+  },
+  {
+    "range": [
+      326,
+      425
+    ],
+    "m": 12,
+    "p": 17
+  },
+  {
+    "range": [
+      426,
+      525
+    ],
+    "m": 13,
+    "p": 18
+  },
+  {
+    "range": [
+      526,
+      625
+    ],
+    "m": 13,
+    "p": 19
+  },
+  {
+    "range": [
+      626,
+      725
+    ],
+    "m": 14,
+    "p": 19
+  },
+  {
+    "range": [
+      726,
+      825
+    ],
+    "m": 14,
+    "p": 20
+  },
+  {
+    "range": [
+      826,
+      925
+    ],
+    "m": 15,
+    "p": 20
+  },
+  {
+    "range": [
+      926,
+      1025
+    ],
+    "m": 15,
+    "p": 21
+  },
+  {
+    "range": [
+      1026,
+      1125
+    ],
+    "m": 15,
+    "p": 22
+  },
+  {
+    "range": [
+      1126,
+      1225
+    ],
+    "m": 15,
+    "p": 23
+  },
+  {
+    "range": [
+      1226,
+      1325
+    ],
+    "m": 15,
+    "p": 24
+  },
+  {
+    "range": [
+      1326,
+      9999
+    ],
+    "m": 16,
+    "p": 24
+  }
+]

src/data/gold/starting_stat_pts/man.json

@@ -0,0 +1,90 @@
+[
+  {
+    "range": [
+      1,
+      10
+    ],
+    "m": 5,
+    "p": 10
+  },
+  {
+    "range": [
+      11,
+      14
+    ],
+    "m": 6,
+    "p": 13
+  },
+  {
+    "range": [
+      15,
+      16
+    ],
+    "m": 6,
+    "p": 16
+  },
+  {
+    "range": [
+      17,
+      25
+    ],
+    "m": 7,
+    "p": 16
+  },
+  {
+    "range": [
+      26,
+      29
+    ],
+    "m": 7,
+    "p": 15
+  },
+  {
+    "range": [
+      30,
+      35
+    ],
+    "m": 7,
+    "p": 14
+  },
+  {
+    "range": [
+      36,
+      40
+    ],
+    "m": 7,
+    "p": 13
+  },
+  {
+    "range": [
+      41,
+      55
+    ],
+    "m": 7,
+    "p": 12
+  },
+  {
+    "range": [
+      56,
+      65
+    ],
+    "m": 7,
+    "p": 11
+  },
+  {
+    "range": [
+      66,
+      79
+    ],
+    "m": 7,
+    "p": 10
+  },
+  {
+    "range": [
+      80,
+      100
+    ],
+    "m": 6,
+    "p": 9
+  }
+]

src/data/gold/starting_stat_pts/orc.json

@@ -0,0 +1,98 @@
+[
+  {
+    "range": [
+      1,
+      10
+    ],
+    "m": 3,
+    "p": 10
+  },
+  {
+    "range": [
+      11,
+      16
+    ],
+    "m": 4,
+    "p": 11
+  },
+  {
+    "range": [
+      17,
+      22
+    ],
+    "m": 5,
+    "p": 12
+  },
+  {
+    "range": [
+      23,
+      30
+    ],
+    "m": 5,
+    "p": 13
+  },
+  {
+    "range": [
+      31,
+      40
+    ],
+    "m": 6,
+    "p": 14
+  },
+  {
+    "range": [
+      41,
+      50
+    ],
+    "m": 6,
+    "p": 15
+  },
+  {
+    "range": [
+      51,
+      60
+    ],
+    "m": 7,
+    "p": 16
+  },
+  {
+    "range": [
+      61,
+      80
+    ],
+    "m": 7,
+    "p": 17
+  },
+  {
+    "range": [
+      81,
+      99
+    ],
+    "m": 8,
+    "p": 17
+  },
+  {
+    "range": [
+      100,
+      125
+    ],
+    "m": 8,
+    "p": 18
+  },
+  {
+    "range": [
+      126,
+      150
+    ],
+    "m": 9,
+    "p": 18
+  },
+  {
+    "range": [
+      151,
+      9999
+    ],
+    "m": 9,
+    "p": 19
+  }
+]

src/data/gold/starting_stat_pts/roden.json

@@ -0,0 +1,74 @@
+[
+  {
+    "range": [
+      1,
+      5
+    ],
+    "m": 6,
+    "p": 10
+  },
+  {
+    "range": [
+      6,
+      9
+    ],
+    "m": 7,
+    "p": 13
+  },
+  {
+    "range": [
+      10,
+      15
+    ],
+    "m": 7,
+    "p": 14
+  },
+  {
+    "range": [
+      16,
+      24
+    ],
+    "m": 8,
+    "p": 15
+  },
+  {
+    "range": [
+      25,
+      30
+    ],
+    "m": 8,
+    "p": 14
+  },
+  {
+    "range": [
+      31,
+      36
+    ],
+    "m": 7,
+    "p": 13
+  },
+  {
+    "range": [
+      37,
+      40
+    ],
+    "m": 7,
+    "p": 12
+  },
+  {
+    "range": [
+      41,
+      45
+    ],
+    "m": 7,
+    "p": 11
+  },
+  {
+    "range": [
+      46,
+      49
+    ],
+    "m": 6,
+    "p": 10
+  }
+]

src/data/gold/starting_stat_pts/wolf.json

@@ -0,0 +1,58 @@
+[
+  {
+    "range": [
+      1,
+      1.5
+    ],
+    "m": 6,
+    "p": 12
+  },
+  {
+    "range": [
+      2,
+      3.5
+    ],
+    "m": 7,
+    "p": 16
+  },
+  {
+    "range": [
+      4,
+      5.5
+    ],
+    "m": 7,
+    "p": 17
+  },
+  {
+    "range": [
+      6,
+      7.5
+    ],
+    "m": 7,
+    "p": 16
+  },
+  {
+    "range": [
+      8,
+      9.5
+    ],
+    "m": 6,
+    "p": 14
+  },
+  {
+    "range": [
+      10,
+      11.5
+    ],
+    "m": 6,
+    "p": 12
+  },
+  {
+    "range": [
+      12,
+      15.5
+    ],
+    "m": 5,
+    "p": 10
+  }
+]

src/data/gold/stocks/dwarf.json

@@ -1,130 +0,0 @@
-{
-  "key": "dwarf",
-  "name": "Dwarf",
-  "stride": 6,
-  "adjective": "dwarven",
-  "common_traits": [
-    "Accustomed To The Dark",
-    "Bearded",
-    "Greed",
-    "Oathsworn",
-    "Shaped From Earth And Stone",
-    "Stout",
-    "Tough"
-  ],
-  "starting_stats":
-  [
-    {
-      "range": [
-        1,
-        20
-      ],
-      "m": 6,
-      "p": 13
-    },
-    {
-      "range": [
-        21,
-        30
-      ],
-      "m": 7,
-      "p": 13
-    },
-    {
-      "range": [
-        31,
-        50
-      ],
-      "m": 7,
-      "p": 14
-    },
-    {
-      "range": [
-        51,
-        76
-      ],
-      "m": 8,
-      "p": 15
-    },
-    {
-      "range": [
-        77,
-        111
-      ],
-      "m": 8,
-      "p": 16
-    },
-    {
-      "range": [
-        112,
-        151
-      ],
-      "m": 9,
-      "p": 16
-    },
-    {
-      "range": [
-        152,
-        199
-      ],
-      "m": 9,
-      "p": 17
-    },
-    {
-      "range": [
-        200,
-        245
-      ],
-      "m": 10,
-      "p": 18
-    },
-    {
-      "range": [
-        246,
-        300
-      ],
-      "m": 11,
-      "p": 17
-    },
-    {
-      "range": [
-        301,
-        345
-      ],
-      "m": 11,
-      "p": 16
-    },
-    {
-      "range": [
-        346,
-        396
-      ],
-      "m": 12,
-      "p": 15
-    },
-    {
-      "range": [
-        397,
-        445
-      ],
-      "m": 11,
-      "p": 14
-    },
-    {
-      "range": [
-        446,
-        525
-      ],
-      "m": 11,
-      "p": 13
-    },
-    {
-      "range": [
-        526,
-        600
-      ],
-      "m": 10,
-      "p": 12
-    }
-  ]
-}

src/data/gold/stocks/elf.json

@@ -1,161 +0,0 @@
-{
-  "key": "elf",
-  "name": "Elf",
-  "stride": 8,
-  "adjective": "elven",
-  "common_traits": [
-    "Born Under The Silver Stars",
-    "Essence Of The Earth",
-    "Fair And Statuesque",
-    "First Born",
-    "Grief",
-    "Keen Sight"
-  ],
-  "starting_stats":
-  [
-    {
-      "range": [
-        1,
-        25
-      ],
-      "m": 7,
-      "p": 13
-    },
-    {
-      "range": [
-        26,
-        60
-      ],
-      "m": 8,
-      "p": 13
-    },
-    {
-      "range": [
-        61,
-        100
-      ],
-      "m": 9,
-      "p": 14
-    },
-    {
-      "range": [
-        101,
-        125
-      ],
-      "m": 9,
-      "p": 15
-    },
-    {
-      "range": [
-        126,
-        160
-      ],
-      "m": 10,
-      "p": 16
-    },
-    {
-      "range": [
-        161,
-        225
-      ],
-      "m": 10,
-      "p": 17
-    },
-    {
-      "range": [
-        226,
-        325
-      ],
-      "m": 11,
-      "p": 17
-    },
-    {
-      "range": [
-        326,
-        425
-      ],
-      "m": 12,
-      "p": 17
-    },
-    {
-      "range": [
-        426,
-        525
-      ],
-      "m": 13,
-      "p": 18
-    },
-    {
-      "range": [
-        526,
-        625
-      ],
-      "m": 13,
-      "p": 19
-    },
-    {
-      "range": [
-        626,
-        725
-      ],
-      "m": 14,
-      "p": 19
-    },
-    {
-      "range": [
-        726,
-        825
-      ],
-      "m": 14,
-      "p": 20
-    },
-    {
-      "range": [
-        826,
-        925
-      ],
-      "m": 15,
-      "p": 20
-    },
-    {
-      "range": [
-        926,
-        1025
-      ],
-      "m": 15,
-      "p": 21
-    },
-    {
-      "range": [
-        1026,
-        1125
-      ],
-      "m": 15,
-      "p": 22
-    },
-    {
-      "range": [
-        1126,
-        1225
-      ],
-      "m": 15,
-      "p": 23
-    },
-    {
-      "range": [
-        1226,
-        1325
-      ],
-      "m": 15,
-      "p": 24
-    },
-    {
-      "range": [
-        1326,
-        9999
-      ],
-      "m": 16,
-      "p": 24
-    }
-  ]
-}

src/data/gold/stocks/man.json

@@ -1,99 +0,0 @@
-{
-  "key": "man",
-  "name": "Man",
-  "stride": 7,
-  "adjective": "mannish",
-  "common_traits": [
-  ],
-  "starting_stats":
-  [
-    {
-      "range": [
-        1,
-        10
-      ],
-      "m": 5,
-      "p": 10
-    },
-    {
-      "range": [
-        11,
-        14
-      ],
-      "m": 6,
-      "p": 13
-    },
-    {
-      "range": [
-        15,
-        16
-      ],
-      "m": 6,
-      "p": 16
-    },
-    {
-      "range": [
-        17,
-        25
-      ],
-      "m": 7,
-      "p": 16
-    },
-    {
-      "range": [
-        26,
-        29
-      ],
-      "m": 7,
-      "p": 15
-    },
-    {
-      "range": [
-        30,
-        35
-      ],
-      "m": 7,
-      "p": 14
-    },
-    {
-      "range": [
-        36,
-        40
-      ],
-      "m": 7,
-      "p": 13
-    },
-    {
-      "range": [
-        41,
-        55
-      ],
-      "m": 7,
-      "p": 12
-    },
-    {
-      "range": [
-        56,
-        65
-      ],
-      "m": 7,
-      "p": 11
-    },
-    {
-      "range": [
-        66,
-        79
-      ],
-      "m": 7,
-      "p": 10
-    },
-    {
-      "range": [
-        80,
-        100
-      ],
-      "m": 6,
-      "p": 9
-    }
-  ]
-}

src/data/gold/stocks/orc.json

@@ -1,114 +0,0 @@
-{
-  "key": "orc",
-  "name": "Orc",
-  "stride": 7,
-  "adjective": "orcish",
-  "common_traits": [
-    "Cannibal",
-    "Cold Black Blood",
-    "Breeder",
-    "Fanged And Clawed",
-    "Loathsome And Twisted",
-    "Lynx-eyed, Like Burning Coals",
-    "Vile Language"
-  ],
-  "starting_stats":
-  [
-    {
-      "range": [
-        1,
-        10
-      ],
-      "m": 3,
-      "p": 10
-    },
-    {
-      "range": [
-        11,
-        16
-      ],
-      "m": 4,
-      "p": 11
-    },
-    {
-      "range": [
-        17,
-        22
-      ],
-      "m": 5,
-      "p": 12
-    },
-    {
-      "range": [
-        23,
-        30
-      ],
-      "m": 5,
-      "p": 13
-    },
-    {
-      "range": [
-        31,
-        40
-      ],
-      "m": 6,
-      "p": 14
-    },
-    {
-      "range": [
-        41,
-        50
-      ],
-      "m": 6,
-      "p": 15
-    },
-    {
-      "range": [
-        51,
-        60
-      ],
-      "m": 7,
-      "p": 16
-    },
-    {
-      "range": [
-        61,
-        80
-      ],
-      "m": 7,
-      "p": 17
-    },
-    {
-      "range": [
-        81,
-        99
-      ],
-      "m": 8,
-      "p": 17
-    },
-    {
-      "range": [
-        100,
-        125
-      ],
-      "m": 8,
-      "p": 18
-    },
-    {
-      "range": [
-        126,
-        150
-      ],
-      "m": 9,
-      "p": 18
-    },
-    {
-      "range": [
-        151,
-        9999
-      ],
-      "m": 9,
-      "p": 19
-    }
-  ]
-}

src/data/gold/stocks/roden.json

@@ -1,90 +0,0 @@
-{
-  "key": "roden",
-  "name": "Roden",
-  "stride": 8,
-  "adjective": "roden",
-  "common_traits": [
-    "Aecer's Likeness",
-    "Coat Of Fur",
-    "Communal",
-    "Enlarged Incisors",
-    "Quick-blooded",
-    "Tail",
-    "Large Ears"
-  ],
-  "starting_stats":
-  [
-    {
-      "range": [
-        1,
-        5
-      ],
-      "m": 6,
-      "p": 10
-    },
-    {
-      "range": [
-        6,
-        9
-      ],
-      "m": 7,
-      "p": 13
-    },
-    {
-      "range": [
-        10,
-        15
-      ],
-      "m": 7,
-      "p": 14
-    },
-    {
-      "range": [
-        16,
-        24
-      ],
-      "m": 8,
-      "p": 15
-    },
-    {
-      "range": [
-        25,
-        30
-      ],
-      "m": 8,
-      "p": 14
-    },
-    {
-      "range": [
-        31,
-        36
-      ],
-      "m": 7,
-      "p": 13
-    },
-    {
-      "range": [
-        37,
-        40
-      ],
-      "m": 7,
-      "p": 12
-    },
-    {
-      "range": [
-        41,
-        45
-      ],
-      "m": 7,
-      "p": 11
-    },
-    {
-      "range": [
-        46,
-        49
-      ],
-      "m": 6,
-      "p": 10
-    }
-  ]
-}

src/data/gold/stocks/wolf.json

@@ -1,75 +0,0 @@
-{
-  "key": "wolf",
-  "name": "Wolf",
-  "stride": 11,
-  "adjective": "wolfish",
-  "common_traits": [
-    "Crushing Jaws",
-    "Deep Fur",
-    "Great Lupine Form",
-    "Lupine Intellect",
-    "Long-legged",
-    "Wolf's Eyes",
-    "Wolf's Snout",
-    "Woodland Ear"
-  ],
-  "starting_stats":
-  [
-    {
-      "range": [
-        1,
-        1.5
-      ],
-      "m": 6,
-      "p": 12
-    },
-    {
-      "range": [
-        2,
-        3.5
-      ],
-      "m": 7,
-      "p": 16
-    },
-    {
-      "range": [
-        4,
-        5.5
-      ],
-      "m": 7,
-      "p": 17
-    },
-    {
-      "range": [
-        6,
-        7.5
-      ],
-      "m": 7,
-      "p": 16
-    },
-    {
-      "range": [
-        8,
-        9.5
-      ],
-      "m": 6,
-      "p": 14
-    },
-    {
-      "range": [
-        10,
-        11.5
-      ],
-      "m": 6,
-      "p": 12
-    },
-    {
-      "range": [
-        12,
-        15.5
-      ],
-      "m": 5,
-      "p": 10
-    }
-  ]
-}

src/data/troll/lifepaths.json

@@ -1,6 +1,4 @@
 {
-  "stock": "troll",
-  "settings": {
   "Wild Setting": {
     "Born Wild": {
       "time": 5,
@@ -14,13 +12,23 @@
       "traits": [
         1
       ],
+      "common_traits": [
+        "Black Nails",
+        "Fangs",
+        "Night Blooded",
+        "Night Eyed (Troll)",
+        "Massive Stature (Troll)",
+        "Stone's Age",
+        "Tough (Troll)",
+        "Troll Skin",
+        "Voracious Carnivore"
+      ],
       "leads": [
         "Pit"
       ],
       "key_leads": [
         "Pit Setting"
-        ],
+      ]
-        "born": true
     },
     "Bogey": {
       "time": 7,
@@ -245,13 +253,23 @@
       "traits": [
         2
       ],
+      "common_traits": [
+        "Black Nails",
+        "Fangs",
+        "Night Blooded",
+        "Night Eyed (Troll)",
+        "Massive Stature (Troll)",
+        "Stone's Age",
+        "Tough (Troll)",
+        "Troll Skin",
+        "Voracious Carnivore"
+      ],
       "leads": [
         "Pit"
       ],
       "key_leads": [
         "Pit Setting"
-        ],
+      ]
-        "born": true
     },
     "Dweller": {
       "time": 4,
@@ -379,6 +397,17 @@
         2,
         "Vile Language"
       ],
+      "common_traits": [
+        "Black Nails",
+        "Fangs",
+        "Night Blooded",
+        "Night Eyed (Troll)",
+        "Massive Stature (Troll)",
+        "Stone's Age",
+        "Tough (Troll)",
+        "Troll Skin",
+        "Voracious Carnivore"
+      ],
       "leads": [
         "Pit",
         "Cave"
@@ -386,8 +415,7 @@
       "key_leads": [
         "Pit Setting",
         "Cavedweller Setting"
-        ],
+      ]
-        "born": true
     },
     "Tortured": {
       "time": 3,
@@ -587,4 +615,3 @@
     }
   }
 }
-}

src/data/troll/resources.json

@@ -1,6 +1,4 @@
-{
+[
-  "stock": "troll",
-  "resources": [
   {
     "name": "Rags",
     "type": "gear",
@@ -57,4 +55,3 @@
     "rp": 5
   }
 ]
-}

src/data/troll/starting_stat_pts.json

@@ -0,0 +1,82 @@
+[
+  {
+    "range": [
+      1,
+      5
+    ],
+    "m": 3,
+    "p": 11
+  },
+  {
+    "range": [
+      6,
+      12
+    ],
+    "m": 4,
+    "p": 14
+  },
+  {
+    "range": [
+      13,
+      19
+    ],
+    "m": 4,
+    "p": 17
+  },
+  {
+    "range": [
+      20,
+      27
+    ],
+    "m": 4,
+    "p": 19
+  },
+  {
+    "range": [
+      28,
+      57
+    ],
+    "m": 4,
+    "p": 20
+  },
+  {
+    "range": [
+      58,
+      80
+    ],
+    "m": 4,
+    "p": 19
+  },
+  {
+    "range": [
+      81,
+      124
+    ],
+    "m": 4,
+    "p": 18
+  },
+  {
+    "range": [
+      125,
+      213
+    ],
+    "m": 5,
+    "p": 17
+  },
+  {
+    "range": [
+      214,
+      390
+    ],
+    "m": 5,
+    "p": 16
+  },
+  {
+    "range": [
+      391,
+      712
+    ],
+    "m": 6,
+    "p": 15
+  }
+]

src/data/troll/stock.json

@@ -1,100 +0,0 @@
-{
-  "key": "troll",
-  "name": "Troll",
-  "stride": 7,
-  "adjective": "trollish",
-  "common_traits": [
-    "Black Nails",
-    "Fangs",
-    "Night Blooded",
-    "Night Eyed (Troll)",
-    "Massive Stature (Troll)",
-    "Stone's Age",
-    "Tough (Troll)",
-    "Troll Skin",
-    "Voracious Carnivore"
-  ],
-  "starting_stats":
-  [
-    {
-      "range": [
-        1,
-        5
-      ],
-      "m": 3,
-      "p": 11
-    },
-    {
-      "range": [
-        6,
-        12
-      ],
-      "m": 4,
-      "p": 14
-    },
-    {
-      "range": [
-        13,
-        19
-      ],
-      "m": 4,
-      "p": 17
-    },
-    {
-      "range": [
-        20,
-        27
-      ],
-      "m": 4,
-      "p": 19
-    },
-    {
-      "range": [
-        28,
-        57
-      ],
-      "m": 4,
-      "p": 20
-    },
-    {
-      "range": [
-        58,
-        80
-      ],
-      "m": 4,
-      "p": 19
-    },
-    {
-      "range": [
-        81,
-        124
-      ],
-      "m": 4,
-      "p": 18
-    },
-    {
-      "range": [
-        125,
-        213
-      ],
-      "m": 5,
-      "p": 17
-    },
-    {
-      "range": [
-        214,
-        390
-      ],
-      "m": 5,
-      "p": 16
-    },
-    {
-      "range": [
-        391,
-        712
-      ],
-      "m": 6,
-      "p": 15
-    }
-  ]
-}

src/data/wizard/lifepaths.json

@@ -1,9 +1,6 @@
 {
-  "stock": "man",
-  "settings": {
   "Special Gifted Lifepaths": {
     "Gifted Child": {
-        "born": true,
       "time": 9,
       "res": 4,
       "leads": [
@@ -1225,4 +1222,3 @@
     }
   }
 }
-}

src/lib/data.rb

@@ -1,11 +1,7 @@
-require 'deep_merge'
-
 require_relative 'data/gold'
 require_relative 'data/wizard'
 require_relative 'data/dark_elf'
 require_relative 'data/troll'
-require_relative 'stock'
-require_relative 'data/custom'
 
 module Charred
   class Data
@@ -13,13 +9,11 @@ module Charred
     include Charred::Wizard
     include Charred::DarkElf
     include Charred::Troll
-    include Charred::Custom
 
     attr :data
 
     def initialize
       @data = {}
-      @data[:stocks] = {}
 
       puts 'loading gold'
       load_gold(@data)
@@ -33,9 +27,6 @@ module Charred
       puts 'loading trolls'
       load_troll(@data)
 
-      puts 'loading custom stocks'
-      load_custom(@data)
-
       @data[:traits] = @data[:traits].sort.to_h
       @data[:skills] = @data[:skills].sort.to_h
     end
@@ -62,9 +53,5 @@ module Charred
         []
       end
     end
-
-    def json_get(filename)
-      JSON.parse(File.read(filename))
-    end
   end
 end

src/lib/data/custom.rb

@@ -1,27 +0,0 @@
-require 'json'
-
-module Charred
-  module Custom
-    def load_custom(data)
-      Dir.glob("data/custom/**/*") { |file|
-        if File.file?(file)
-          case File.extname(file)
-          when ".skills"
-            verbose_merge data[:skills], json_get(file)
-          when ".traits"
-            verbose_merge data[:traits], json_get(file)
-          when ".stock"
-            stock = Stock.new(json_get(file))
-            data[:stocks].deep_merge!({ stock.key => stock })
-          when ".lifepaths"
-            contents = json_get(file)
-            data[:lifepaths].ko_deep_merge!({ contents["stock"] => contents["settings"]})
-          when ".resources"
-            contents = json_get(file)
-            data[:resources].ko_deep_merge!({ contents["stock"] => contents["resources"]})
-          end
-        end
-      }
-    end
-  end
-end

src/lib/data/dark_elf.rb

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

src/lib/data/gold.rb

@@ -1,5 +1,4 @@
 require 'json'
-require_relative '../stock'
 
 module Charred
   module Gold
@@ -12,29 +11,28 @@ module Charred
 
       lifepaths = {}
       resources = {}
-      stocks = {}
+      stat_pts = {}
 
-      gold_stocks = ['dwarf', 'elf', 'man', 'orc', 'roden', 'wolf']
+      stocks = ['dwarf', 'elf', 'man', 'orc', 'roden', 'wolf']
 
-      gold_stocks.each do |stock|
+      stocks.each do |stock|
         file = File.read("data/gold/lifepaths/#{stock}.json")
-        contents = JSON.parse(file)
+        lifepaths[stock]  = JSON.parse(file)
-        lifepaths[stock] = contents["settings"]
 
         file = File.read("data/gold/resources/#{stock}.json")
-        contents = JSON.parse(file)
+        resources[stock]  = JSON.parse(file)
-        resources[stock] = contents["resources"]
 
-        file = File.read("data/gold/stocks/#{stock}.json")
+        file = File.read("data/gold/starting_stat_pts/#{stock}.json")
-        stocks[stock] = Stock.new(JSON.parse(file))
+        stat_pts[stock]  = JSON.parse(file)
       end
 
       data.merge!({
+        :stocks => stocks,
         :skills => skills,
         :traits => traits,
         :lifepaths => lifepaths,
         :resources => resources,
-        :stocks => stocks
+        :stat_pts => stat_pts
       })
     end
   end

src/lib/data/troll.rb

@@ -1,9 +1,10 @@
 require 'json'
-require_relative '../stock'
 
 module Charred
   module Troll
     def load_troll(data)
+      data[:stocks] << 'troll'
+
       file = File.read('data/troll/skills.json')
       skills = JSON.parse(file)
       verbose_merge data[:skills], skills
@@ -13,18 +14,16 @@ module Charred
       verbose_merge data[:traits], traits
 
       file = File.read('data/troll/lifepaths.json')
-      contents = JSON.parse(file)
+      lifepaths = JSON.parse(file)
-      lifepaths = contents["settings"]
       data[:lifepaths]['troll'] = lifepaths
 
       file = File.read("data/troll/resources.json")
-      contents = JSON.parse(file)
+      resources = JSON.parse(file)
-      resources = contents["resources"]
       data[:resources]['troll'] = resources
 
-      file = File.read("data/troll/stock.json")
+      file = File.read("data/troll/starting_stat_pts.json")
-      stock = JSON.parse(file)
+      stats = JSON.parse(file)
-      data[:stocks]['troll'] = Stock.new(stock)
+      data[:stat_pts]['troll'] = stats
     end
   end
 end

src/lib/data/wizard.rb

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

src/lib/stock.rb

@@ -1,34 +0,0 @@
-module Charred
-  class Stock
-    @@default_stride = 7
-
-    attr :key
-    attr :name
-    attr :stride
-    attr :common_traits
-    attr :starting_stats
-
-    def initialize(h)
-      @key = h["key"]
-      @name = h["name"] || @key
-      @stride = h["stride"] || @@default_stride
-      @adjective = h["adjective"] || @key+"ish"
-      @common_traits = h["common_traits"]
-      @starting_stats = h["starting_stats"]
-    end
-
-    def as_json(options = {})
-      {
-        "key" => @key,
-        "name" => @name,
-        "stride" => @stride,
-        "adjective" => @adjective,
-        "common_traits" => @common_traits,
-        "starting_stats" => @starting_stats
-      }
-    end
-    def to_json(*a)
-      as_json.to_json(*a)
-    end
-  end
-end

src/public/js/burning-serialize.js

@@ -2,7 +2,7 @@ function loadCurrentCharacterFromStruct($scope, charStruct, burningData, appropr
     $scope.name = charStruct.name;
     $scope.gender = charStruct.gender;
     $scope.stock = charStruct.stock;
-  $scope.ensureStockLoaded($scope.stock).then(() => {
+
     // Appropriate weapons must be loaded before calculateLifepathSkills is called.
     if(serverSettings.storageType != 'server'){
       appropriateWeapons.appropriateWeapons = charStruct.approp_weapons;
@@ -173,8 +173,7 @@ function loadCurrentCharacterFromStruct($scope, charStruct, burningData, appropr
     $scope.attributeModifierQuestionResults = loadAttributeModifierQuestionResultsFromSave($scope, charStruct.attr_mod_questions);
 
     $scope.brutalLifeWithdrawn = charStruct.brutal_life_withdrawn;
-    $scope.$digest();
+
-  });
 }
 
 function convertCurrentCharacterToStruct($scope, appropriateWeapons) {

src/public/js/burning-service.js

@@ -1,4 +1,4 @@
-var DEBUG = false;
+
 /**** Class Settings (Angular Service) ****/
 function Settings() {
   this.enforceLifepathReqts = true;
@@ -218,14 +218,13 @@ function CharacterStorageService($http) {
 
   /* Load character names from server */
   this.loadCharacterNames = function(){
-    fetch("/list_chars/user1")
+    $http.get("/list_chars/user1", {'timeout': 3000} ).
-      .then((response) => response.json())
+      success(function(data,status,headers,config){
-      .then((data) => {
         myself.characterIdAndNames = data;
         console.log("Loaded saved character names");
-      })
+      }).
-      .catch((error) => {
+      error(function(data,status,headers,config){
-        console.log("Error: Loading saved character names from server failed: "+error);
+        console.log("Error: Loading saved character names from server failed: HTTP code " + status + ": " + data);
       });
   }
 
@@ -237,10 +236,6 @@ function CharacterStorageService($http) {
 /**** Class BurningDataService (Angular Service) ****/
 // This service is used to load the lifepaths, skills, traits, etc. from the server.
 function BurningDataService($http) {
-
-  // Used to reference the object from within functions and callbacks
-  var myself = this;
-
    /* JSON Data structure representing lifepaths. The structure is:
       stock:
         setting_name:
@@ -268,88 +263,122 @@ function BurningDataService($http) {
   // A hash of StartingStatPoints objects keyed by stock.
   this.startingStatPts = {};
 
-  /* Loading of stocks, skills, and traits begins on initializing the service
+  this.dataSetsLoaded = 0;
-
+  // Total data sets: 
-  /* Load stocks from server */
+  //  lifepaths: 7 (man, dwarf, elf, orc, roden, wolf, troll)
-  this.whenStocksLoaded = fetch("/stocks")
+  //  stat points: 7 (man, dwarf, elf, orc, roden, wolf, troll)
-    .then((response) => response.json())
+  //  skills
-    .then((data) => {
+  //  traits
-      if(DEBUG) {
+  //  resources: 7 (man, dwarf, elf, orc, roden, wolf. troll)
-        console.log("Loaded stock data:");
+  // TOTAL: 23
-        console.log(data);
+  this.totalDataSets = 23;
+  this.onAllDatasetsLoaded = null;
+  this.registerOnAllDatasetsLoaded = function(callback){
+    if ( this.dataSetsLoaded >= this.totalDataSets ){
+      callback();
     }
-      myself.stocks = data;
+    this.onAllDatasetsLoaded = callback;
-      for (var stock of Object.keys(data)) {
-        myself.startingStatPts[stock] = new StartingStatPoints(myself.stocks[stock].starting_stats);
   }
-    })
-    .catch((error) => {
-      console.log("Error: Getting stocks from server failed: "+error);
-    });
 
-  /* Load skills from server */
+  this.datasetLoaded = function(){
-  this.whenSkillsLoaded = fetch("/skills")
+    this.dataSetsLoaded += 1;
-    .then((response) => response.json())
+    if ( this.onAllDatasetsLoaded && (this.dataSetsLoaded >= this.totalDataSets) ){
-    .then((data) => {
+      this.onAllDatasetsLoaded();
-      myself.skills = data;
+    }
-      if(DEBUG) {
+    if ( this.dataSetsLoaded > this.totalDataSets){
-        console.log("Loaded skill data:");
+      console.log("Error: the totalDataSets setting in BurningDataService is too low! This will cause wierd errors. Please adjust it");
-        console.log(data);
     }
-    })
-    .catch((error) => {
-      console.log("Error: Getting skills from server failed: "+error);
-    });
-
-  /* Load traits from server */
-  this.whenTraitsLoaded = fetch("/traits")
-    .then((response) => response.json())
-    .then((data) => {
-      myself.traits = data;
-      if(DEBUG) {
-        console.log("Loaded trait data:");
-        console.log(data);
   }
-    })
-    .catch((error) => {
-      console.log("Error: Getting traits from server failed: "+error);
-    });
 
-  /* Lifepaths and resources defer until their stock is selected */
+  var stocks = ["man", "dwarf", "elf", "orc", "roden", "wolf", "troll"];
+  var myself = this;
 
-  this.whenLifePathsLoadedForStock = {};
   /* Load lifepaths from server */
-  this.loadLifepathsForStock = function(stock){
+  var loadLifepathsForStock = function(stock){
-    return myself.whenLifePathsLoadedForStock[stock] = fetch("/lifepaths/" + stock)
+    if( ! isValidStock(stock) ){
-      .then((response) => response.json())
+      console.log("Loading lifepaths failed: asked to load lifepaths for invalid stock " + stock);
-      .then((data) => {
+      return
+    }
+
+    $http.get("/lifepaths/" + stock, {'timeout': 3000} ).
+      success(function(data,status,headers,config){
         myself.lifepaths[stock] = data;
-        if(DEBUG) {
+        myself.datasetLoaded();
-          console.log("Loaded "+stock+" lifepaths:");
+        console.log("Loaded "+stock+" lifepaths. " + Object.keys(myself.lifepaths).length + " settings");
-          console.log(data);
+      }).
+      error(function(data,status,headers,config){
+        myself.datasetLoaded();
+        console.log("Error: Getting "+stock+" lifepaths from server failed: HTTP code " + status + ": " + data);
+      });
   }
-      })
+
-      .catch((error) => {
+  /* Load starting stat points table from server */
-        console.log("Error: Getting "+stock+" lifepaths from server failed: "+error);
+  var loadStartingStatPtsForStock = function(stock){
+    if( ! isValidStock(stock) ){
+      console.log("Loading starting stat points failed: asked to load pts for invalid stock " + stock);
+      return
+    }
+
+    $http.get("/starting_stat_pts/" + stock, {'timeout': 3000} ).
+      success(function(data,status,headers,config){
+        myself.startingStatPts[stock] = new StartingStatPoints(data);
+        myself.datasetLoaded();
+        console.log("Loaded "+stock+" starting stat points. ");
+      }).
+      error(function(data,status,headers,config){
+        myself.datasetLoaded();
+        console.log("Error: Getting "+stock+" stat points from server failed: HTTP code " + status + ": " + data);
       });
-  };
+  }
-
+
-  /* Load resources from server */
+  /* Load starting stat points table from server */
-  this.whenResourcesLoadedForStock = {};
+  var loadResourcesForStock = function(stock){
-  this.loadResourcesForStock = function(stock){
+    if( ! isValidStock(stock) ){
-    return myself.whenResourcesLoadedForStock[stock] = fetch("/resources/" + stock)
+      console.log("Loading resources failed: asked to load for invalid stock " + stock);
-      .then((response) => response.json())
+      return
-      .then((data) => {
+    }
+
+    $http.get("/resources/" + stock, {'timeout': 3000} ).
+      success(function(data,status,headers,config){
         myself.resources[stock] = data;
-        if(DEBUG) {
+        myself.datasetLoaded();
-          console.log("Loaded "+stock+" resources:");
+        console.log("Loaded "+stock+" resources. ");
-          console.log(data);
+      }).
+      error(function(data,status,headers,config){
+        myself.datasetLoaded();
+        console.log("Error: Getting "+stock+" stat points from server failed: HTTP code " + status + ": " + data);
+      });
   }
-      })
+
-      .catch((error) => {
+  for (var i = 0; i < stocks.length; i++) {
-        console.log("Error: Getting "+stock+" resources from server failed: "+error);
+    loadLifepathsForStock(stocks[i]);
+    loadStartingStatPtsForStock(stocks[i]);
+    loadResourcesForStock(stocks[i]);
+  }
+
+  /* Load skills from server */
+  $http.get("/skills", {'timeout': 3000} ).
+    success(function(data,status,headers,config){
+      myself.skills = data;
+      myself.datasetLoaded();
+      console.log("Loaded skills. ");
+    }).
+    error(function(data,status,headers,config){
+      myself.datasetLoaded();
+      console.log("Error: Getting skills from server failed: HTTP code " + status + ": " + data);
+    });
+
+  /* Load traits from server */
+  $http.get("/traits", {'timeout': 3000} ).
+    success(function(data,status,headers,config){
+      myself.traits = data;
+      myself.datasetLoaded();
+      console.log("Loaded traits. ");
+    }).
+    error(function(data,status,headers,config){
+      myself.datasetLoaded();
+      console.log("Error: Getting traits from server failed: HTTP code " + status + ": " + data);
     });
-  };
 }
 /**** End BurningDataService ****/
 

src/public/js/burning.js

@@ -160,7 +160,7 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
       }
     };
     // Setting names for use in the Add Lifepath section
-    $scope.settingNames  = [];
+    $scope.settingNames  = ["Loading..."]
     $scope.currentSettingLifepathNames  = [];
     // The currently selected lifepath
     $scope.currentSettingLifepath = "Loading...";
@@ -206,6 +206,12 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
     // Character name
     $scope.name = "";
 
+    // Character stock. One of man, dwarf, orc, elf
+    if ( ! isValidStock(stock) ){
+      console.log("Invalid stock '"+stock+"' passed to BurningCtrl.initialize. Defaulting to man");
+      stock = "man";
+    }
+
     $scope.stock = stock;
 
     // Character id (server side id)
@@ -296,7 +302,7 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
   
   }
 
-  $scope.initialize();
+  $scope.initialize("man");
 
   if ( characterStorage.currentCharacter ){
     //console.log("Loading current character");
@@ -349,6 +355,7 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
     return result;
   }
     
+
   $scope.onGenderChange = function(){
     if ($scope.name.length == 0) {
       $scope.generateName();
@@ -357,15 +364,8 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
   }
 
   $scope.onStockChange = function(){
-    if(!$scope.stock) return;
-
-    if(!$scope.stockSelected) { // Removes 'select a stock' after the first selection
-      $scope.stocks.shift();
-      $scope.stockSelected = true;
-    }
-
-    $scope.ensureStockLoaded($scope.stock).then(() => {
     var oldName = $scope.name;
+
     // Make a blank character sheet
     $scope.initialize($scope.stock);
 
@@ -374,25 +374,11 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
     } else {
       $scope.name = oldName;
     }
+
     calculateSettingNames($scope, burningData);
     calculateCurrentSettingLifepathNames($scope, burningData);
     calculateSpecialTraitsForDisplay($scope, burningData);
-      calculateGearSelectionLists($scope, burningData);
-      calculatePropertySelectionLists($scope, burningData);
-      $scope.$digest();
-    });
-  }
-
-  $scope.ensureStockLoaded = function(stock) {
-    let loadPromises = [];
-    if(!burningData.lifepaths[stock]) {
-      loadPromises.push(burningData.loadLifepathsForStock(stock));
-    }
-    if(!burningData.resources[stock]) {
-      loadPromises.push(burningData.loadResourcesForStock(stock));
   }
-    return Promise.all(loadPromises);
-  };
 
   $scope.onSettingChange = function(){
 
@@ -417,10 +403,8 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
     calculateUnspentSkillPoints($scope);
   }
 
-  burningData.whenStocksLoaded.then(() => {
+  burningData.registerOnAllDatasetsLoaded(function(){
-    $scope.stocks = [{ name: "Select a stock" }, ...Object.values(burningData.stocks)];
+    onLifepathsLoad($scope, burningData);
-    $scope.stockSelected = false;
-    $scope.$digest();
   });
 
   $scope.$on('$locationChangeStart', function(event, nextUrl, currentUrl) {
@@ -950,7 +934,7 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
     for(var key in burningData.skills){
       if ( !(key in $scope.lifepathSkills) && !(key in $scope.generalSkills) ){
         var displaySkill = burningData.skills[key];
-        if ( !displaySkill.stock || restrictionStockToValidStock(burningData.stocks, displaySkill.stock) == $scope.stock ) {
+        if ( !displaySkill.stock || restrictionStockToValidStock(displaySkill.stock) == $scope.stock ) {
           result.push(key);
         }
       }
@@ -1045,9 +1029,20 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
       return {"shade" : "", "exp" : 10 - $scope.statsByName["Will"].exp() + bonus};
     }
     else if ( "Stride" == name ){
-      // This is a hack: if stock is unselected, use 0 for stride to not throw error; it shouldn't be displayed anyway
+      var stride = 0;
-      var stride = $scope.stock ? burningData.stocks[$scope.stock].stride : 0;
+      if( $scope.stock == 'dwarf' )
+        stride = 6;
+      else if( $scope.stock == 'elf' )
+        stride = 8;
+      else if( $scope.stock == 'roden' )
+        stride = 8;
+      else if( $scope.stock == 'wolf' )
+        stride = 11;
+      else
+        stride = 7;
+
       stride += bonus;
+
       return {"shade" : "", "exp" : stride};
     }
     else if ( "Circles" == name ){
@@ -1200,6 +1195,30 @@ function BurningCtrl($scope, $http, $modal, $timeout, settings, appropriateWeapo
 
     return list;
   }
+/*
+  
+  $scope.specialTraitsForDisplay = function(){
+    var list = [];
+
+    for(var traitName in burningData.traits) {
+      var trait = burningData.traits[traitName];
+  
+      if ('restrict' in trait){
+        if ( trait.restrict.indexOf(validStockToRestrictionStock($scope.stock)) >= 0 &&  
+          (trait.restrict.indexOf("special") >= 0 || trait.restrict.indexOf("character") >= 0) ){
+          list.push(new DisplayTrait(traitName, burningData.traits));
+        }
+      } else {
+        // No restriction! As long as cost > 0 (cost 0 is for traits with no cost; not purchaseable)
+        if ( trait.cost > 0 ) {
+          list.push(new DisplayTrait(traitName, burningData.traits));
+        }
+      }
+    }
+
+    return list;
+  } 
+*/
 
   $scope.addLifepathTrait = function(traitName){
     if ( $scope.unspentTraitPoints < 1 && $scope.enforcePointLimits )
@@ -1937,31 +1956,63 @@ function calculateAge($scope){
   $scope.age = age;
 }
 
-function isSubsetting(setting) { return !Object.values(setting).some((lp) => lp.born); }
-
 function calculateSettingNames($scope, burningData){
-  let stockSettings = burningData.lifepaths[$scope.stock];
+  var settingNames = null;
-  $scope.settingNames = Object.keys(stockSettings);
 
   var lastCurrentSetting = $scope.currentSetting; 
 
-  if ($scope.enforceLifepathReqts){
+  if ( ! $scope.enforceLifepathReqts ) {
-    if ( $scope.selectedLifepaths.length == 0 ){
+    // Display all settings and subsettings
+    settingNames = [];
+    for(key in burningData.lifepaths[$scope.stock]){
+      settingNames.push(key);
+    }
+  }
+  else if ( $scope.selectedLifepaths.length == 0 ){
     // All settings are allowed. Subsettings have no Born lifepath so don't include them.
-      $scope.settingNames = $scope.settingNames.filter(s => !isSubsetting(stockSettings[s]));
+    settingNames = [];
+    for(key in burningData.lifepaths[$scope.stock]){
+      if( key.toLowerCase().indexOf("subsetting") < 0 ){
+        settingNames.push(key);
+      }
+    }
   }
   else {
     // Only settings that are leads from the last lifepath are allowed
     var lastLifepath = $scope.selectedLifepaths[$scope.selectedLifepaths.length-1];
+    settingNames = [];
+    var all = Object.keys(burningData.lifepaths[$scope.stock]);
+    for(var i = 0; i < all.length; i++){
+      //console.log("calculateSettingNames: checking if '"+all[i]+"' is allowed");
+      var setting = all[i];
 
-      // Doing this filtering instead of [lastLifepath.setting, ...lastLifepath.keyLeads] for two reasons:
+      if ( lastLifepath.setting == setting ){
-      // only presents settings present in this server and maintains relative order.
+        settingNames.push(setting);
-      $scope.settingNames = $scope.settingNames.filter(s => s == lastLifepath.setting
+        continue;
-        || (Array.isArray(lastLifepath.keyLeads) && lastLifepath.keyLeads.includes(s)));
+      }
+
+      if ( lastLifepath.leads ){
+        for(var j = 0; j < lastLifepath.keyLeads.length; j++){
+          var lead = lastLifepath.keyLeads[j];
+          //console.log("calculateSettingNames:   checking lead: '"+lead+"' is allowed");
+
+          if( setting == lead ){
+            settingNames.push(setting);
           }
         }
+      }
+    }
+  }
+
+  $scope.settingNames = settingNames;
 
-  var currentSettingNeedsUpdate = !$scope.settingNames.includes(lastCurrentSetting);
+  var currentSettingNeedsUpdate = true;
+  for(var i = 0; i < $scope.settingNames.length; i++){
+    if( $scope.settingNames[i] == lastCurrentSetting){
+      currentSettingNeedsUpdate = false;
+      break;
+    }
+  }
 
   if ( currentSettingNeedsUpdate && $scope.settingNames.length > 0 ){
     $scope.currentSetting = $scope.settingNames[0];
@@ -1974,6 +2025,13 @@ function calculatePTGS($scope) {
 }
 
 
+function isBornLifepath(lifepathName) {
+  return lifepathName.indexOf("Born") >= 0 ||
+         lifepathName == "Son Of A Gun" ||
+         lifepathName == "Gifted Child";
+}
+
+
 function calculateCurrentSettingLifepathNames($scope, burningData){
   var currentSettingLifepathNames = null;
 
@@ -1985,7 +2043,7 @@ function calculateCurrentSettingLifepathNames($scope, burningData){
     if ( $scope.selectedLifepaths.length == 0 ){
       // Only "Born" lifepaths are allowed
       for(var i = 0; i < all.length; i++){
-        if ( burningData.lifepaths[$scope.stock][$scope.currentSetting][all[i]].born ){
+        if ( isBornLifepath(all[i]) ){
           currentSettingLifepathNames.push(all[i]);
         }
       }
@@ -1995,7 +2053,7 @@ function calculateCurrentSettingLifepathNames($scope, burningData){
       for(var j = 0; j < lifepathNames.length; j++){
         var lifepathName = lifepathNames[j];
 
-        if ( burningData.lifepaths[$scope.stock][$scope.currentSetting][lifepathName].born )
+        if ( isBornLifepath(lifepathName) )
           continue;
 
         var rexpr = burningData.lifepaths[$scope.stock][$scope.currentSetting][lifepathName].requires_expr
@@ -2276,7 +2334,7 @@ function setCommonTraits($scope, burningData){
   if( $scope.selectedLifepaths.length == 0 )
     return;
 
-  var common = burningData.stocks[$scope.stock].common_traits;
+  var common = $scope.selectedLifepaths[0].commonTraits;
   if(common.length > 0){
     for(var j = 0; j < common.length; j++){
       var name = common[j];
@@ -2708,7 +2766,7 @@ function calculateSpecialTraitsForDisplay($scope, burningData){
     var trait = burningData.traits[traitName];
 
     if ('restrict' in trait){
-      if ( trait.restrict.indexOf(validStockToRestrictionStock(burningData.stocks, $scope.stock)) >= 0 &&
+      if ( trait.restrict.indexOf(validStockToRestrictionStock($scope.stock)) >= 0 &&  
         (trait.restrict.indexOf("special") >= 0 || trait.restrict.indexOf("character") >= 0) ){
         list.push(new DisplayTrait(traitName, burningData.traits));
       }
@@ -2756,12 +2814,44 @@ function calculateUnspentResourcePoints($scope){
   $scope.unspentResourcePoints = unspentResourcePoints;
 }
 
-function restrictionStockToValidStock(stocks, stockAdjective){
+function isValidStock(stock){
-  return Object.values(stocks).findLast(s => s.adjective == stockAdjective).key;
+  return stock == "man" || stock == "elf" || stock == "orc" || stock == "dwarf" || stock == "roden" || stock == "wolf" || stock =="troll";
-}
+}
-
+
-function validStockToRestrictionStock(stocks, stockName){
+function restrictionStockToValidStock(stock){
-  return stocks[stockName].adjective;
+
+  if ( stock == "mannish" )
+    return "man";
+  else if ( stock == "elven" )
+    return "elf";
+  else if ( stock == "orcish" )
+    return "orc";
+  else if ( stock == "dwarven" )
+    return "dwarf";
+  else if ( stock == "wolfish" )
+    return "wolf";
+  else if ( stock == "roden" )
+    return "roden";
+  else if ( stock == "trollish" )
+    return "troll";
+}
+
+function validStockToRestrictionStock(stock){
+
+  if ( stock == "man" )
+    return "mannish";
+  else if ( stock == "elf" )
+    return "elven";
+  else if ( stock == "orc" )
+    return "orcish";
+  else if ( stock == "dwarf" )
+    return "dwarven";
+  else if ( stock == "roden" )
+    return "roden";
+  else if ( stock == "wolf" )
+    return "wolfish";
+  else if ( stock == "troll" )
+    return "trollish";
 }
 
 function attributeModifyingQuestions($scope, attribute)

src/public/js/server_settings.js

@@ -1,5 +1,5 @@
 var serverSettings = {
-  'versionString' : '3.0.0',
+  'versionString' : '2.3.0',
   'storageType' : 'client', 
   'displayAttrMath' : 'false'
 }

src/views/partials/main.erb

@@ -94,7 +94,14 @@
               </strong>
             </div>
             <div class='col-md-2'>
-              <select class='form-control' ng-change='onStockChange()' ng-model='stock' ng-options='s.key as s.name for s in stocks'>
+              <select class='form-control' ng-change='onStockChange()' ng-model='stock'>
+                <option value='man'>Man</option>
+                <option value='dwarf'>Dwarf</option>
+                <option value='elf'>Elf</option>
+                <option value='orc'>Orc</option>
+                <option value='roden'>Roden</option>
+                <option value='wolf'>Great Wolf</option>
+                <option value='troll'>Troll</option>
               </select>
             </div>
             <div class='col-md-1'>

tests/data/custom/test.lifepaths

@@ -1,133 +0,0 @@
-{
-  "stock": "test",
-  "settings": {
-    "Test Setting": {
-      "Born Test": {
-        "time": 7,
-        "res": 5,
-        "skills": [
-          [
-            1,
-            "General"
-          ]
-        ],
-        "traits": [
-          2
-        ],
-        "leads": [
-          "Nowhere"
-        ],
-        "key_leads": [
-          "Nowhere Setting"
-        ]
-      },
-      "A thing": {
-        "time": 5,
-        "res": 2,
-        "stat": [
-          [
-            2,
-            "p"
-          ]
-        ],
-        "skills": [
-          [
-            4,
-            "Testing",
-            "Forest-wise",
-            "Stealthy"
-          ]
-        ],
-        "traits": [
-          1
-        ],
-        "leads": [
-          "Nowhere"
-        ],
-        "key_leads": [
-          "Nowhere Setting"
-        ]
-      }
-    },
-    "Nowhere Setting": {
-      "Born Nothing": {
-        "time": 0,
-        "res": 0,
-        "skills": [
-        ],
-        "traits": [
-        ],
-        "leads": [
-        ],
-        "key_leads": [
-        ]
-      },
-      "Not A Thing": {
-        "time": 15,
-        "res": 1,
-        "stat": [
-          [
-            1,
-            "pm"
-          ]
-        ],
-        "skills": [
-          [
-            2,
-            "Nothinging",
-            "Voiding"
-          ]
-        ],
-        "traits": [
-          3
-        ],
-        "leads": [
-          "Somewhere"
-        ],
-        "key_leads": [
-          "Somewhere Subsetting"
-        ]
-      }
-    },
-    "Somewhere Subsetting": {
-      "Something Special": {
-        "time": 30,
-        "res": 21,
-        "stat": [
-          [
-            1,
-            "m"
-          ],[
-            1,
-            "p"
-          ],[
-            1,
-            "pm"
-          ]
-        ],
-        "skills": [
-          [
-            7,
-            "Specializing",
-            "Soothing",
-            "History",
-            "Sorcery",
-            "Spirit Binding",
-            "Harming"
-          ]
-        ],
-        "traits": [
-          3,
-          "Stubborn",
-          "Shy"
-        ],
-        "leads": [
-          "Nowhere"
-        ],
-        "key_leads": [
-          "Nowhere Setting"
-        ]
-      }
-    }
-  }
-}

tests/data/custom/test.resources

@@ -1,25 +0,0 @@
-{
-  "stock": "test",
-  "resources": [
-    {
-      "name": "Rags",
-      "type": "gear",
-      "rp": 1
-    },
-    {
-      "name": "Riches",
-      "type": "gear",
-      "rp": 50
-    },
-    {
-      "name": "A firey soul",
-      "type": "gear",
-      "rp": 3
-    },
-    {
-      "name": "Chest or Footlocker",
-      "type": "gear",
-      "rp": 3
-    }
-  ]
-}

tests/data/custom/test.skills

@@ -1,39 +0,0 @@
-{
-  "Testing": {
-    "stock": "testish",
-    "roots": [
-      "Perception"
-    ]
-  },
-  "Nothinging": {
-    "stock": "testish",
-    "roots": [
-      "Will",
-      "Agility"
-    ]
-  },
-  "Voiding": {
-    "stock": "testish",
-    "roots": [
-      "Speed"
-    ]
-  },
-  "Specializing": {
-    "stock": "testish",
-    "roots": [
-      "Forte"
-    ]
-  },
-  "Soothing": {
-    "stock": "testish",
-    "roots": [
-      "Power"
-    ]
-  },
-  "Harming": {
-    "stock": "testish",
-    "roots": [
-      "Will"
-    ]
-  }
-}

tests/data/custom/test.stock

@@ -1,95 +0,0 @@
-{
-  "key": "test",
-  "name": "Test",
-  "stride": 9,
-  "adjective": "testish",
-  "common_traits": [
-    "Trait 1",
-    "testy",
-    "Trait #3",
-    "Night Eyed (Test)"
-  ],
-  "starting_stats":
-  [
-    {
-      "range": [
-        1,
-        10
-      ],
-      "m": 1,
-      "p": 2
-    },
-    {
-      "range": [
-        11,
-        20
-      ],
-      "m": 2,
-      "p": 4
-    },
-    {
-      "range": [
-        21,
-        30
-      ],
-      "m": 3,
-      "p": 6
-    },
-    {
-      "range": [
-        31,
-        40
-      ],
-      "m": 4,
-      "p": 8
-    },
-    {
-      "range": [
-        41,
-        50
-      ],
-      "m": 5,
-      "p": 10
-    },
-    {
-      "range": [
-        51,
-        60
-      ],
-      "m": 6,
-      "p": 12
-    },
-    {
-      "range": [
-        61,
-        70
-      ],
-      "m": 7,
-      "p": 14
-    },
-    {
-      "range": [
-        71,
-        80
-      ],
-      "m": 8,
-      "p": 16
-    },
-    {
-      "range": [
-        81,
-        90
-      ],
-      "m": 9,
-      "p": 18
-    },
-    {
-      "range": [
-        91,
-        100
-      ],
-      "m": 10,
-      "p": 20
-    }
-  ]
-}

tests/data/custom/test.traits

@@ -1,55 +0,0 @@
-{
-  "Trait 1": {
-    "cost": 0,
-    "type": "die",
-    "restrict": [
-      "testish",
-      "common"
-    ],
-    "desc": ""
-  },
-  "testy": {
-    "cost": 0,
-    "type": "die",
-    "restrict": [
-      "testish",
-      "common"
-    ],
-    "desc": ""
-  },
-  "Trait #3": {
-    "cost": 0,
-    "type": "die",
-    "restrict": [
-      "testish",
-      "common"
-    ],
-    "desc": ""
-  },
-  "Night Eyed (Test)": {
-    "cost": 1,
-    "type": "die",
-    "restrict": [
-      "testish",
-      "common"
-    ],
-    "desc": "The test version"
-  },
-  "Shy": {
-    "cost": 1,
-    "type": "character",
-    "restrict": [
-      "testish",
-      "lifepath"
-    ]
-  },
-  "Special": {
-    "cost": 3,
-    "type": "die",
-    "restrict": [
-      "testish",
-      "special"
-    ],
-    "desc": "Snowflake"
-  }
-}