fix some lifepaths in the wizard world

CHANGELOG.md

@@ -13,10 +13,14 @@ 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)
 
+## [2.2.1] - 2019-07-28
+### Fixed
+- Wizard's Apprentice should count as Neophyte Sorcerer, and Junior Student counts as Arcane Devotee and Neophyte Sorcerer (thanks StubbsPKS!)
+
 ## [2.2.0] - 2019-07-14
 ### Added
-- Added the troll stock.
+- Added the Troll stock.
-- Dark Elf - Spite calculations for Bitter Reminders
+- Dark Elf Spite calculations include "Bitter Reminders"
 
 ### Changed
 - Wizard trait "Misunderstood" was renamed to "Outsider" to avoid conflict with Roden trait of the same name
@@ -33,11 +37,11 @@ and this project adheres to [Semantic Versioning](semver).
 - README.md and CHANGELOG.md
 
 ### Changed
-- Spite is calculated using the Grief value, and this required some updates to the 
+- Spite is calculated using the Grief value, this required some updates to stat calculation to prevent an infinite loop.
 
 ## [2.0.1] - 2019-07-10
 ### Fixed
-- First Mate LP is now selectable with 2 seafaring LPs. Previously: if Son of a Gun was the first LP, it was not selectable. Example: Son of a Gun -> Officer's Mate -> First Mate.
+- First Mate LP is now selectable with 2 seafaring LPs. Previously: if Son of a Gun was the first LP, it was not selectable. Example: Son of a Gun -> Officer's Mate -> First Mate. (thanks Dave's Not Here!)
 
 ## [2.0.0] - 2019-07-09
 ### Added

src/data/gold/lifepaths/man.json

@@ -4522,6 +4522,7 @@
         "noble setting:student",
         "noble setting:squire",
         "noble setting:arcane devotee",
+        "junior student",
         "noble setting:religious acolyte",
         "noble setting:young lady",
         "noble setting:knight",
@@ -7212,6 +7213,7 @@
         "noble setting:student",
         "noble setting:squire",
         "noble setting:arcane devotee",
+        "junior student",
         "noble setting:religious acolyte",
         "noble setting:young lady",
         "noble setting:knight",

src/data/wizard/lifepaths.json

@@ -103,6 +103,8 @@
         "augur",
         "crazy witch",
         "neophyte sorcerer",
+        "junior student",
+        "wizard's apprentice",
         "elder"
       ],
       "key_leads": [
@@ -307,6 +309,7 @@
       "requires": "Senior Student, Neophyte Sorcerer, Apt Pupil or Wizard's Apprentice",
       "requires_expr": [
         "senior student",
+        "junior student",
         "neophyte sorcerer",
         "apt pupil",
         "wizard's apprentice"
@@ -523,7 +526,8 @@
         "supplicant",
         "arcane devotee",
         "apt pupil",
-        "neophyte sorcerer"
+        "neophyte sorcerer",
+        "wizard's apprentice"
       ],
       "key_leads": [
         "City Dweller Setting",

src/lib/data/wizard.rb

@@ -88,22 +88,25 @@ module Charred
         end
       end
 
-      # backfill Apt Pupil == Neophyte Sorcerer connection
+      # backfill Neophyte Sorcerer and Arcane Devotee connections
       man.keys.each do |man_set|
         man[man_set].keys.each do |man_lp|
-          requirements = self.lifepath_requirements(man[man_set][man_lp]['requires_expr'])
+          requirements = self.lifepath_requirements(man[man_set][man_lp]["requires_expr"])
-          next if requirements.include? 'apt pupil'
+          requirements.collect! { |req| req.include?(':') ? req.split(":")[1].downcase : req.downcase }
-          requirements.each do |req|
-            setting = nil
-            req_lp = req
-            setting, req_lp = req.split(':') if req.include? ':'
 
-            next unless req_lp.downcase == 'neophyte sorcerer'
+          if requirements.include? "neophyte sorcerer"
+            if man[man_set][man_lp]["requires_expr"].include? "neophyte sorcerer"
+              man[man_set][man_lp]["requires_expr"] |= ["apt pupil", "wizard's apprentice", "junior student"]
+            else
+              puts "warning, could not add neophyte sorcerer connection to deep requirements array at #{man_set}:#{man_lp}"
+            end
+          end
 
-            if man[man_set][man_lp]['requires_expr'].include? 'neophyte sorcerer'
+          if requirements.include? "arcane devotee"
-              man[man_set][man_lp]['requires_expr'] |= ['apt pupil']
+            if man[man_set][man_lp]["requires_expr"].include? "arcane devotee"
+              man[man_set][man_lp]["requires_expr"] |= ["junior student"]
             else
-              puts "warning, could not add apt pupil to deep requirements array at #{man_set}:#{man_lp}"
+              puts "warning, could not add arcane devotee connection to deep requirements array at #{man_set}:#{man_lp}"
             end
           end
         end

src/public/js/server_settings.js

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