drpedia_lite 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a620a7b04a765baa2189a6eb3816710baa3bf1cf
-  data.tar.gz: 80c6facb3c96f67efe4d823836c46950a8ee834b
+  metadata.gz: 53481d0abe915467a2aecfb4db9dc1609ea8e11c
+  data.tar.gz: 09c6b00e9ff91146630b699f150be79732430846
 SHA512:
-  metadata.gz: 800affd3aef3e0edbfd095e4846efa55c036fb007474b905fd9adefeb899b0b7c6f30ceb8f2f7314c279c82c27f6fba196e5bead197ecb05d1e50d2ee00edcac
-  data.tar.gz: 5e92d03ff0bbf7fcbb9a7116e10761c37395cb7d6cd51ee70656fd699e544b98db917958416a97c6ebbad1c86ee7927dcba4352f8e0240b31980f98b873b0f0b
+  metadata.gz: 3b120077a75ec5a3d2b3271f54880db2f5c791b55c7f31d6e6da221643ec585f95a3feb27f4f3493f4349a8238433b1b41f1892d53386dbe566ac46396f94fe7
+  data.tar.gz: 8dfb85713e2576ed45088ed593fbb0fdd7eb5c52ebe85524ad0a21919231dd54909e3383772ee66365899a78ace000e0e0ae6075ed8f62071eaccd8637e70751

data/lib/RawReader.rb

@@ -11,7 +11,8 @@ class RawReader
   STATE_TRANSITION = {
     :undef         => { pattern: /== Advantage Skill ==/,                 next: :innate },
     :innate        => { pattern: /== Disadvantage Skill ==/,              next: :strain_disadv },
-    :strain_disadv => { pattern: /== Innate Skill Prerequisite ==/,       next: :innate_preq },
+    :strain_disadv => { pattern: /== Disabled Innate Skill ==/,           next: :strain_block },
+    :strain_block  => { pattern: /== Innate Skill Prerequisite ==/,       next: :innate_preq },
     :innate_preq   => { pattern: /== Profession Concentration ==/,        next: :prof_concent },
     :prof_concent  => { pattern: /== Concentration Hierarchy ==/,         next: :prof_hierarc },
     :prof_hierarc  => { pattern: /== Concentration Group ==/,             next: :conc_group },
@@ -80,6 +81,7 @@ private
     @skill_cat.each do |_junk, data|
       data[:innate] = data[:innate].to_a
       data[:innate_disadvantage] = data[:innate_disadvantage].to_a
+      data[:innate_disabled] = data[:innate_disabled].to_a
     end
   end
 
@@ -120,6 +122,7 @@ private
     case state
     when :innate then process_innate_skills line: line
     when :strain_disadv then process_innate_skills line: line, disadvantage: true
+    when :strain_block then process_innate_skills line: line, disabled: 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
@@ -139,12 +142,12 @@ private
     end
   end
 
-  def process_innate_skills line:, disadvantage: false
+  def process_innate_skills line:, disadvantage: false, disabled: false
     innate_skill = line.split(/:/)
     strain = innate_skill[0].to_sym
     skills = innate_skill[1].split(/,/)
 
-    smart_insert strain: strain, skills: skills, disadvantage: disadvantage
+    smart_insert strain: strain, skills: skills, disadvantage: disadvantage, disabled: disabled
   end
 
   def process_innate_preqs line:
@@ -344,7 +347,7 @@ private
     end
   end
 
-  def smart_insert strain: nil, skills: nil, open_skills: nil, profession_skills: nil, disadvantage: false, type: nil
+  def smart_insert strain: nil, skills: nil, open_skills: nil, profession_skills: nil, disadvantage: false, disabled: false, type: nil
     if strain and skills
       @strains.add strain
       skills.each do |_skill|
@@ -353,14 +356,27 @@ private
         @skill_cat[skill] ||= Hash.new
         @skill_cat[skill][:innate] ||= Set.new
         @skill_cat[skill][:innate_disadvantage] ||= Set.new
+        @skill_cat[skill][:innate_disabled] ||= Set.new
 
-        if !disadvantage
-          skill_cat_innate = @skill_cat[skill][:innate]
-          skill_cat_innate.add strain.to_sym
+        if disadvantage
+          @skill_cat[skill][:innate_disadvantage].add strain.to_sym
+        elsif disabled
+          @skill_cat[skill][:innate_disabled].add strain.to_sym
         else
-          skill_cat_innate = @skill_cat[skill][:innate_disadvantage]
-          skill_cat_innate.add strain.to_sym
+          @skill_cat[skill][:innate].add strain.to_sym
         end
+        # if !disadvantage
+        #   if !disabled
+        #     skill_cat_innate = @skill_cat[skill][:innate]
+        #     skill_cat_innate.add strain.to_sym
+        #   else
+        #     skill_cat_innate_disabled = @skill_cat[skill][:innate_disabled]
+        #     skill_cat_innate_disabled.add strain.to_sym
+        #   end
+        # else
+        #   skill_cat_innate = @skill_cat[skill][:innate_disadvantage]
+        #   skill_cat_innate.add strain.to_sym
+        # end
       end
     elsif open_skills
       @skill_cat[open_skills[:skill]] ||= Hash.new

data/lib/Validator.rb

@@ -110,7 +110,7 @@ private
 
       sdata.each do |stype, stdata|
         case stype
-        when :innate, :innate_disadvantage
+        when :innate, :innate_disadvantage, :innate_disabled
           stdata.each do |strain|
             is_in_strain?(strain)
           end

data/lib/input/input.txt

@@ -24,6 +24,9 @@ Yorker: Barricade, Bomb Awareness, Chase, Entertain, Interfere, Melee Weapon - S
 == Disadvantage Skill ==
 Natural Ones: Bolt Action, Scatter Shot, Gun Aficionado
 
+== Disabled Innate Skill ==
+The Red Star: Income I, Income II, Income III, Income IV, Income V
+
 == Innate Skill Prerequisite ==
 Iron Slaves: Iron Fists: Brawling
 Full Dead: Income II: Income I

metadata

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