diff --git a/validate.lic b/validate.lic index 0274fceaa0..d3201494cf 100644 --- a/validate.lic +++ b/validate.lic @@ -187,6 +187,16 @@ class DRYamlValidator .each { |skill| error("Skill in research_skills could not be found in crossing_training. '#{skill}'") } end + def assert_that_all_research_skills_are_valid(settings) + return unless settings.use_research + return unless settings.crossing_training + return unless settings.research_skills + + settings.research_skills + .reject { |skill| @valid_research_skills.include?(skill) } + .each { |skill| error("Skill in research_skills was not a valid research skill. '#{skill}'") } + end + def assert_that_crossing_training_skills_are_valid(settings) return unless settings.crossing_training @@ -350,6 +360,7 @@ class DRYamlValidator @valid_melee_skills = ['Offhand Weapon', 'Brawling', 'Polearms', 'Large Blunt', 'Twohanded Blunt', 'Staves', 'Small Blunt', 'Small Edged', 'Large Edged', 'Twohanded Edged'] @valid_weapon_skills = @valid_ranged_skills + @valid_melee_skills @valid_summon_skills = @valid_thrown_skills + @valid_melee_skills - ['Offhand Weapon', 'Brawling'] + @valid_research_skills = ['Arcana', 'Life Magic', 'Holy Magic', 'Lunar Magic', 'Elemental Magic', 'Arcane Magic', 'Attunement', 'Warding', 'Augmentation', 'Utility'] @all_skills = ['Scouting', 'Evasion', 'Athletics', 'Stealth', 'Perception', 'Locksmithing', 'First Aid', 'Skinning', 'Outdoorsmanship', 'Thievery', 'Backstab', 'Thanatology', 'Forging', 'Outfitting', 'Engineering',