drpedia_lite 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2910f49c42c29769c98b213d473ef61cc3c327d4
-  data.tar.gz: 8dce08526ac21b282a3f3d45e107a3dd4f963aea
+  metadata.gz: e1098fcbc72b315ae70e2da0c3b7d106b7383907
+  data.tar.gz: a9ffdf450fcc34cab92047ad8c82c05b29aa0843
 SHA512:
-  metadata.gz: e064d36ce7f9d6b8a69eaacdd0c752731f6c1510c96ebed17e32f787ee3d8a0c4c3b856c17f91454f9ad185651c815153b0c699cf2a704dc12b99195b53f08c0
-  data.tar.gz: 6ab250dc20c68749947b48c8f6bd7897f70b4452f88d3143ff1402704f1bbbcdc817d62c1ede3dcea374a0b4b8be168284e7c74071c5b5df016f5916fa211efc
+  metadata.gz: 7159a184ef700b069b5572d2ec1bbf176856f2cf717958a8987cf6ea13d1b65a522bf1db3dac2fcf88c3273bb50ea46ea964c801a3b534709b6b50b0b6359dce
+  data.tar.gz: 761a9988464b198b0a41dfb6412b7e75da4d21a2170db6ad418da55aea20d105104e9335a4fdc517625cc44f518a3815129cc44ca44cf9ddfcc7e56256f7c8af

data/lib/Builder.rb

@@ -16,6 +16,8 @@ class Builder
                   strain_stats: raw_reader.strain_stats,
                   strain_specs: raw_reader.strain_specs,
                   profession_concentrations: raw_reader.profession_concentrations,
+                  profession_concentration_hierarchy: raw_reader.profession_concentration_hierarchy,
+                  profession_concentration_group: raw_reader.profession_concentration_group,
                   profession_advanced: raw_reader.profession_advanced,
                   skill_counters: raw_reader.skill_counters,
                   skill_countered: raw_reader.skill_countered
@@ -31,6 +33,8 @@ class Builder
     File.open(File.join(base_output_path, 'strain_stats.json'), 'w') { |f| f.write raw_reader.strain_stats.to_json }
     File.open(File.join(base_output_path, 'strain_specs.json'), 'w') { |f| f.write raw_reader.strain_specs.to_json }
     File.open(File.join(base_output_path, 'profession_concentrations.json'), 'w') { |f| f.write raw_reader.profession_concentrations.to_json }
+    File.open(File.join(base_output_path, 'profession_concentration_hierarchy.json'), 'w') { |f| f.write raw_reader.profession_concentration_hierarchy.to_json }
+    File.open(File.join(base_output_path, 'profession_concentration_group.json'), 'w') { |f| f.write raw_reader.profession_concentration_group.to_json }
     File.open(File.join(base_output_path, 'profession_advanced.json'), 'w') { |f| f.write raw_reader.profession_advanced.to_json }
     File.open(File.join(base_output_path, 'skill_counters.json'), 'w') { |f| f.write raw_reader.skill_counters.to_json }
     File.open(File.join(base_output_path, 'skill_countered.json'), 'w') { |f| f.write raw_reader.skill_countered.to_json }

data/lib/RawReader.rb

@@ -4,6 +4,7 @@ class RawReader
   attr_reader :skill_list, :skill_cat, :skill_group, :advanced_cat, :concentration_cat,
               :strains, :strain_restrictions, :strain_stats, :strain_specs,
               :professions, :profession_concentrations, :profession_advanced,
+              :profession_concentration_hierarchy, :profession_concentration_group,
               :skill_counters, :skill_countered
 
   STATE_TRANSITION = {
@@ -11,7 +12,9 @@ class RawReader
     :innate        => { pattern: /== Disadvantage Skill ==/,              next: :strain_disadv },
     :strain_disadv => { pattern: /== Innate Skill Prerequisite ==/,       next: :innate_preq },
     :innate_preq   => { pattern: /== Profession Concentration ==/,        next: :prof_concent },
-    :prof_concent  => { pattern: /== Profession Concentration Skills ==/, next: :conc_skills },
+    :prof_concent  => { pattern: /== Concentration Hierarchy ==/,         next: :prof_hierarc },
+    :prof_hierarc  => { pattern: /== Concentration Group ==/,             next: :conc_group },
+    :conc_group    => { pattern: /== Profession Concentration Skills ==/, next: :conc_skills },
     :conc_skills   => { pattern: /== Advanced Profession ==/,             next: :adv_prof },
     :adv_prof      => { pattern: /== Advanced Profession Skills ==/,      next: :adv_skills },
     :adv_skills    => { pattern: /== Strain Profession Restriction ==/,   next: :strain_rtrs },
@@ -41,6 +44,8 @@ class RawReader
     @professions = Set.new
     @profession_concentrations = Hash.new
     @profession_advanced = Hash.new
+    @profession_concentration_hierarchy = Hash.new
+    @profession_concentration_group = Hash.new
 
     @mutiline_state = nil
 
@@ -61,6 +66,7 @@ class RawReader
     #ap @concentration_cat
     # ap @skill_counters
     # ap @skill_countered
+    # ap @profession_concentration_group
   end
 
 private
@@ -110,6 +116,8 @@ private
     when :strain_disadv then process_innate_skills line: line, disadvantage: true
     when :innate_preq then process_innate_preqs line: line
     when :prof_concent then process_profession_concentration line: line
+    when :prof_hierarc then process_profession_concentration_hierarchy line: line
+    when :conc_group then process_profession_concentration_group line: line
     when :conc_skills then process_profession_concentration_skills line: line
     when :adv_prof then process_advanced_professions line: line
     when :adv_skills then process_profession_skills line: line, profession: profession, type: :advanced
@@ -165,6 +173,22 @@ private
     end
   end
 
+  def process_profession_concentration_hierarchy line:
+    clusters = line.split(/:/)
+    right_cluster = clusters[1].split(/\,/)
+
+    right_cluster.each do |prof|
+      @profession_concentration_hierarchy[prof.strip.to_sym] = clusters[0].strip.to_sym
+    end
+  end
+
+  def process_profession_concentration_group line:
+    clusters = line.split(/:/)
+    right_cluster = clusters[1].split(/\,/)
+
+    @profession_concentration_group[clusters[0].strip.to_sym] = right_cluster.collect { |x| x.strip.to_sym }
+  end
+
   def process_profession_concentration_skills line:
     clusters = line.split(/:/)
 

data/lib/Validator.rb

@@ -12,6 +12,8 @@ class Validator
                  strain_stats:, 
                  strain_specs:,
                  profession_concentrations:,
+                 profession_concentration_hierarchy:,
+                 profession_concentration_group:,
                  profession_advanced:,
                  skill_counters:,
                  skill_countered:
@@ -25,6 +27,7 @@ class Validator
     @strain_stats = strain_stats
     @strain_specs = strain_specs
     @profession_concentrations = profession_concentrations
+    @profession_concentration_hierarchy = profession_concentration_hierarchy
     @profession_advanced = profession_advanced
     @skill_counters = skill_counters
     @skill_countered = skill_countered
@@ -43,6 +46,7 @@ class Validator
     validate_stats
     validate_strain_specs
     validate_profession_concentrations
+    validate_profession_concentration_hierarchy
     validate_profession_advanced
     validate_non_duplicate_skill_codes
     validate_skill_counters cat: @skill_counters
@@ -59,6 +63,12 @@ private
     assert(@profession_advanced.length > 0)
   end
 
+  def validate_profession_concentration_hierarchy
+    @profession_concentration_hierarchy.each do |prof, pc|
+      is_in_profession?(prof)
+    end
+  end
+
   def validate_non_empty
     assert(@skill_list.length > 0, "Empty skill list")
     assert(@skill_cat.length > 0, "Empty processed skills")

data/lib/input/input.txt

@@ -48,6 +48,16 @@ Agility Combatant, Ranged Combatant, Short Range Combatant: Assassin, Guard, Gun
 Civil Servant, Socialite, Resource Manager: Caravan Driver, Charlatan, Doctor, Entertainer, Gambler, Hookup, Merchant, Politician, Priest, Publican, Ring Leader, Sawbones, Scoundrel, Spy, Teacher, Thief
 Consumable Producer, Quality Producer, Quantity Producer: Cook, Distiller, Engineer, Mad Scientist, Printer, Scavenger, Tinker
 
+== Concentration Hierarchy ==
+Combat: Assassin, Guard, Gun Slinger, Hunter, Martial Artist, Officer, Primitive, Pugilist, Sniper, Soldier, Thug
+Society: Caravan Driver, Charlatan, Doctor, Entertainer, Gambler, Hook-Up, Merchant, Politician, Priest, Publican, Ring Leader, Sawbones, Scoundrel, Spy, Teacher, Thief
+Production: Cook, Distiller, Engineer, Mad Scientist, Printer, Scavenger, Tinker
+
+== Concentration Group ==
+Combat: Agility Combatant, Ranged Combatant, Short Range Combatant
+Civilized Society: Civil Servant, Sociality, Resource Manager
+Crafting and Production: Consumable Producer, Quality Producer, Quantity Producer
+
 == Profession Concentration Skills ==
 Agility Combatant: Close The Distance, Disengage, Keen Eyes
 Ranged Combatant: Heavy Ordnance, Reloading is Stupid, Improvised Thrown Weapon

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drpedia_lite
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
 platform: ruby
 authors:
 - Gloria Budiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies: []
 description: Extracts skills, strains, profession, and requirement trees into JSON
 email: wahyu.g@gmail.com