drpedia_lite 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b632299414054fb00c632cf088fce88b923e7126
-  data.tar.gz: c400b2f425de68c99495012f6b4dc52bdac7878a
+  metadata.gz: 2910f49c42c29769c98b213d473ef61cc3c327d4
+  data.tar.gz: 8dce08526ac21b282a3f3d45e107a3dd4f963aea
 SHA512:
-  metadata.gz: 5534e42cef51577195e09b5af718379eb600d9938e9b9c5a9cde9b729136e22b1180f9471c47aed9409bba596b135fc663990aad91d786588af0f6f78fca3cf8
-  data.tar.gz: accb78d939877cf2ca8c0e2d9a761149a9b0af4eefb48b72aa973aa0f5a27377f6cb066726e96a1d90570cfe4c4b5866a4d2185097bbde44013c582447aeb542
+  metadata.gz: e064d36ce7f9d6b8a69eaacdd0c752731f6c1510c96ebed17e32f787ee3d8a0c4c3b856c17f91454f9ad185651c815153b0c699cf2a704dc12b99195b53f08c0
+  data.tar.gz: 6ab250dc20c68749947b48c8f6bd7897f70b4452f88d3143ff1402704f1bbbcdc817d62c1ede3dcea374a0b4b8be168284e7c74071c5b5df016f5916fa211efc

data/lib/Builder.rb

@@ -16,7 +16,9 @@ class Builder
                   strain_stats: raw_reader.strain_stats,
                   strain_specs: raw_reader.strain_specs,
                   profession_concentrations: raw_reader.profession_concentrations,
-                  profession_advanced: raw_reader.profession_advanced
+                  profession_advanced: raw_reader.profession_advanced,
+                  skill_counters: raw_reader.skill_counters,
+                  skill_countered: raw_reader.skill_countered
 
     File.open(File.join(base_output_path, 'strains.json'), 'w') { |f| f.write raw_reader.strains.to_a.to_json }
     File.open(File.join(base_output_path, 'professions.json'), 'w') { |f| f.write raw_reader.professions.to_a.to_json }
@@ -30,5 +32,7 @@ class Builder
     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_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 }
   end
 end

data/lib/RawReader.rb

@@ -3,7 +3,8 @@ require 'set'
 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
+              :professions, :profession_concentrations, :profession_advanced,
+              :skill_counters, :skill_countered
 
   STATE_TRANSITION = {
     :undef         => { pattern: /== Advantage Skill ==/,                 next: :innate },
@@ -19,7 +20,8 @@ class RawReader
     :strain_specs  => { pattern: /== Open Skill ==/,                      next: :open },
     :open          => { pattern: /==/,                                    next: :profession },
     :profession    => { pattern: /== Skill Group ==/,                     next: :skill_group },
-    :skill_group   => { pattern: /== Skill List ==/,                      next: :list },
+    :skill_group   => { pattern: /== Skill Counters ==/,                  next: :skill_counter },
+    :skill_counter => { pattern: /== Skill List ==/,                      next: :list },
     :list          => { pattern: /./,                                     next: :list }
   }
 
@@ -32,6 +34,8 @@ class RawReader
     @strains = Set.new
     @strain_restrictions = Hash.new
     @skill_group = Hash.new
+    @skill_counters = Hash.new
+    @skill_countered = Hash.new
     @strain_specs = Hash.new
     @strain_stats = Hash.new
     @professions = Set.new
@@ -55,6 +59,8 @@ class RawReader
     #ap @advanced_cat
     #ap @profession_concentrations
     #ap @concentration_cat
+    # ap @skill_counters
+    # ap @skill_countered
   end
 
 private
@@ -113,6 +119,7 @@ private
     when :open then process_open_skills line: line
     when :profession then process_profession_skills line: line, profession: profession
     when :skill_group then process_skill_group line: line
+    when :skill_counter then process_skill_counters line: line
     when :list then process_list_skills line: line
     end
   end
@@ -171,6 +178,21 @@ private
     end
   end
 
+  def process_skill_counters line:
+    segments = line.split(':')
+    skill_name = segments[0].strip.to_sym
+    subsegs = segments[1].strip.split('|')
+
+    if subsegs[0].length > 0
+      counters = subsegs[0].strip
+      @skill_counters[skill_name] = counters.split(',').collect{ |x| x.strip.to_sym }
+    end
+
+    if subsegs[1]
+      countered_by = subsegs[1].strip
+      @skill_countered[skill_name] = countered_by.split(',').collect{ |x| x.strip.to_sym }
+    end
+  end
 
   def process_advanced_professions line:
     if line.strip.length == 0

data/lib/Validator.rb

@@ -12,7 +12,9 @@ class Validator
                  strain_stats:, 
                  strain_specs:,
                  profession_concentrations:,
-                 profession_advanced:
+                 profession_advanced:,
+                 skill_counters:,
+                 skill_countered:
     @skill_list = skill_list
     @skill_group = skill_group
     @skill_cat = skill_cat
@@ -24,6 +26,8 @@ class Validator
     @strain_specs = strain_specs
     @profession_concentrations = profession_concentrations
     @profession_advanced = profession_advanced
+    @skill_counters = skill_counters
+    @skill_countered = skill_countered
 
     @profession_concentration_inverted = Hash.new
     @profession_concentrations.each do |basic, data|
@@ -41,6 +45,9 @@ class Validator
     validate_profession_concentrations
     validate_profession_advanced
     validate_non_duplicate_skill_codes
+    validate_skill_counters cat: @skill_counters
+    validate_skill_counters cat: @skill_countered
+    validate_skill_counter_bidirectional
   end
 
 private
@@ -125,6 +132,49 @@ private
     end
   end
 
+  def validate_skill_counters cat:
+    cat.each do |s, ls|
+      if !is_in_list?(s)
+        puts "Mismatched skill counter: #{s}"
+      end
+
+      ls.each do |l|
+        if !is_in_list?(l)
+          puts "Mismatched skill counter member: #{l}"
+        end
+      end
+    end
+  end
+
+  def validate_skill_counter_bidirectional
+    @skill_counters.each do |skill_name, counters|
+      counters.each do |counter|
+        if !has_interaction? skill: skill_name, counter: counter, interaction: :a_counters_b
+          puts "Missing: skill #{skill_name} counters #{counter}, but skill #{counter} is not countered by #{skill_name}"
+        end
+      end
+    end
+
+    @skill_countered.each do |skill_name, countereds|
+      countereds.each do |countered|
+        if !has_interaction? skill: skill_name, counter: countered, interaction: :a_countered_by_b
+          puts "Missing: skill #{skill_name} is countered by #{countered}, but skill #{countered} does not counter #{skill_name}"
+        end
+      end
+    end
+  end
+
+  def has_interaction? skill:, counter:, interaction:
+    case interaction
+    when :a_counters_b
+      return true if @skill_countered[counter] && @skill_countered[counter].include?(skill)
+    when :a_countered_by_b
+      return true if @skill_counters[counter] && @skill_counters[counter].include?(skill)
+    end
+
+    return false
+  end
+
   def is_in_list? _x
     if @skill_list[_x] == nil && @skill_group[_x] == nil
       puts "mismatched skill: #{_x}"

data/lib/input/input.txt

@@ -22,7 +22,7 @@ Vegasians: Backstab, Black Market Connections, Cheat, Entertain, Lie, Literacy
 Yorker: Barricade, Bomb Awareness, Chase, Entertain, Interfere, Melee Weapon - Standard
 
 == Disadvantage Skill ==
-Natural Ones: Bolt Action
+Natural Ones: Bolt Action, Scatter Shot, Gun Aficionado
 
 == Innate Skill Prerequisite ==
 Iron Slaves: Iron Fists: Brawling
@@ -186,7 +186,7 @@ Shepherd of the Land:
 
 Survivor: 
  (and ((xp_sum 200) 
-  (stat_sum hp_and_mp 100)))
+  (stat_sum hp_or_mp 100)))
 
 Techno Savant:
  (and ((xp_sum 100)
@@ -1186,6 +1186,105 @@ Psionic Skill - Intermediate
 Psionic Skill - Advanced
 Income
 
+== Skill Counters ==
+Alert: Vanish, Fade In A Crowd, Whisper Walk, Cover of Night
+Analyze Compound: Disguise Contents
+Analyze Creature: | Disguise
+Attach: | Bomb Awareness
+Avoid: Concentrated Fire, Destroy Shield, Destroy Weapon, Destroy Armor, Disarming Shot, Scatter Shot, Sniped Shot, Knockout, Pray for Justice, Gun Aficionado, Knock Down, Nail, Agony, Blood Scent
+Balance: Knock Down, Take Down
+Barricade: | Force Barricade
+Beg For Life: Killing Blows | Refuse
+Blind Fighting: Blinding
+Blinding: | Blind Fighting, Parry
+Bomb Awareness: Attach
+Bounce: Concentrated Fire, Destroy Shield, Destroy Weapon, Destroy Armor, Sniped Shot, Scatter Shot, Disarming Shot, Gun Aficionado, Nail
+Break Armor: | Parry
+Break Shield: | Parry
+Break Weapon: | Parry
+Challenge: | Refuse, Choking Blow
+Charge: | Parry
+Charisma: | Refuse, Choking Blow
+Chase: Escape, Rescue
+Cheat: | Check Your Sleeves
+Check Status: Feign Death
+Check Your Sleeves: Cheat
+Choking Blow: Challenge, Charisma
+Concentrated Fire: | Avoid, Bounce
+Cover of Night: | Alert
+Disguise: Analyze Creature
+Destroy Armor: | Avoid, Bounce
+Destroy Shield: | Avoid, Bounce
+Destroy Weapon: | Avoid, Bounce
+Disarming Blow: | Parry
+Disarming Shot: | Avoid, Bounce
+Disguise: Analyze Creature
+Disguise Contents: | Analyze Compound
+Entertain: | Refuse
+Escape: | Chase
+Escape Bonds: Tie Binds
+Fade In A Crowd: | Alert
+Fearful Glare: | Refuse
+Feign Death: | Check Status
+First Aide: Knockout
+Force Barricade: Barricade
+Frightening Force: | Parry
+Gun Aficionado: | Avoid, Bounce
+Interrogate: | Lie
+Knock Down: | Balance, Avoid
+Knockout: | Avoid, First Aide
+Lie: Interrogate
+Mangle Limb: | Parry
+Mind Resistance: Toys in the Attic, Pyro, Enslavement, Body Puppet, Torture, Jolt, Limited Telekinesis, Memory Lapse, Mind Push, Nightmare, Paralysis, Seeing Double, Slowed Steps, Tranquility, Trickster's Mind, Berserker Mind, Body Lock, Body of Mind, Engulf, Living Death, Major Telekinesis, Propulsion, Psionic Surgeon, Sense of Sins, Maelstrom, Psychic Cleanse, Sundered Mind
+Nail: | Avoid, Bounce
+Nerve Punch: | Parry
+Parry: Break Armor, Break Weapon, Break Shield, Blinding, Charge, Disarming Blow, Frightening Force, Mangle Limb, Nerve Punch, Sever, Slaughter, Take Down, Wide Strike, Agony, Impale, Sunder Limb
+Pray for Justice: | Avoid
+Refuse: Beg For Life, Challenge, Charisma, Entertain, Fear, Fearful Glare, Agony
+Rescue: | Chase
+Scatter Shot: | Avoid, Bounce
+Sever: | Parry
+Sniped Shot: | Avoid, Bounce
+Take Down: | Balance, Parry
+Tie Binds: | Escape Bonds
+Torture: | Mind Resistance
+Vanish: | Alert
+Wide Strike: | Parry
+Jolt: | Mind Resistance
+Limited Telekinesis: | Mind Resistance
+Memory Lapse: | Mind Resistance
+Mind Push: | Mind Resistance
+Nightmare: | Mind Resistance
+Paralysis: | Mind Resistance
+Pyro: | Mind Resistance
+Seeing Double: | Mind Resistance
+Slowed Steps: | Mind Resistance
+Toys in the Attic: | Mind Resistance
+Tranquility: | Mind Resistance
+Trickster's Mind: | Mind Resistance
+Berserker Mind: | Mind Resistance
+Body Lock: | Mind Resistance
+Body of Mind: | Mind Resistance
+Body Puppet: | Mind Resistance
+Engulf: | Mind Resistance
+Living Death: | Mind Resistance
+Major Telekinesis: | Mind Resistance
+Propulsion: | Mind Resistance
+Psionic Surgeon: | Mind Resistance
+Sense of Sins: | Mind Resistance
+Whisper Walk: | Alert
+Maelstrom: | Mind Resistance
+Psychic Cleanse: | Mind Resistance
+Sundered Mind: | Mind Resistance
+Agony: | Parry, Avoid, Refuse
+Blood Scent: | Avoid
+Fear: | Refuse
+Impale: | Parry
+Sunder Limb: | Parry
+Killing Blows: | Beg For Life
+Enslavement: | Mind Resistance
+Slaughter: | Parry
+
 == Skill List ==
 AA Alert
 AB Analyze Compound
@@ -1366,7 +1465,7 @@ PL Seeing Double, Psionic Skill - Basic
 PM Slowed Steps, Psionic Skill - Basic
 PN Toys in the Attic, Psionic Skill - Basic
 PO Tranquility, Psionic Skill - Basic
-PQ Trickster’s Mind, Psionic Skill - Basic
+PQ Trickster's Mind, Psionic Skill - Basic
 PR Berserker Mind, Psionic Skill - Intermediate 
 PS Body Lock, Psionic Skill - Intermediate
 PT Body of Mind, Psionic Skill - Intermediate
@@ -1583,4 +1682,29 @@ XW Custom Modification
 XX Rushed Job
 XY Thousand Arms Crafter
 XZ A Stitch in Time
-WI Tchotchkes for Miles
+WI Tchotchkes for Miles
+YA Killing Blows
+YB Absorb
+YC Animate
+YD Blood Scent
+YE Burrow
+YF Cleave
+YG Confuse
+YH Daze
+YI Devour
+YJ Diseased
+YK Enslavement
+YL Fear
+YM Flight
+YN Frenzy
+YO Gnaw
+YP Gnaw
+YQ Impale
+YR Melt
+YS Rip Through
+YT Shatter
+YU Slaughter
+YV Snare
+YW Sunder Limb
+YX Terror
+YY Agony

metadata

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