drpedia_lite 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757fcff45e291f7385507b8dd2386ef06997478f
-  data.tar.gz: e3992d4c346db722ca46587d6acb2450b2603690
+  metadata.gz: b632299414054fb00c632cf088fce88b923e7126
+  data.tar.gz: c400b2f425de68c99495012f6b4dc52bdac7878a
 SHA512:
-  metadata.gz: 1fa6e4a81bfc515128da8e258bb8a04fc62b289615e57d9087464807f1eee474af829a1e3548ff47c1afa4e678f8a86a78ff80b84933859d9b78e5da44087904
-  data.tar.gz: 17b0f00c15f8ddb04a36195ddf61e01b9abbe61af7e39db82e6f7af0f8ef8620664bce9904662a4502de457ed026623168bffa13c2b402605c430ffc6b186885
+  metadata.gz: 5534e42cef51577195e09b5af718379eb600d9938e9b9c5a9cde9b729136e22b1180f9471c47aed9409bba596b135fc663990aad91d786588af0f6f78fca3cf8
+  data.tar.gz: accb78d939877cf2ca8c0e2d9a761149a9b0af4eefb48b72aa973aa0f5a27377f6cb066726e96a1d90570cfe4c4b5866a4d2185097bbde44013c582447aeb542

data/lib/Builder.rb

@@ -10,6 +10,7 @@ class Builder
                   skill_group: raw_reader.skill_group,
                   skill_cat: raw_reader.skill_cat,
                   advanced_cat: raw_reader.advanced_cat,
+                  concentration_cat: raw_reader.concentration_cat,
                   strains: raw_reader.strains,
                   professions: raw_reader.professions,
                   strain_stats: raw_reader.strain_stats,
@@ -22,6 +23,7 @@ class Builder
     File.open(File.join(base_output_path, 'strain_restriction.json'), 'w') { |f| f.write raw_reader.strain_restrictions.to_json }
     File.open(File.join(base_output_path, 'skill_cat.json'), 'w') { |f| f.write raw_reader.skill_cat.to_json }
     File.open(File.join(base_output_path, 'advanced_cat.json'), 'w') { |f| f.write raw_reader.advanced_cat.to_json }
+    File.open(File.join(base_output_path, 'concentration_cat.json'), 'w') { |f| f.write raw_reader.concentration_cat.to_json }
     File.open(File.join(base_output_path, 'skill_group.json'), 'w') { |f| f.write raw_reader.skill_group.to_json }
     File.open(File.join(base_output_path, 'skill_list.json'), 'w') { |f| f.write raw_reader.skill_list.to_json }
     File.open(File.join(base_output_path, 'strain_stats.json'), 'w') { |f| f.write raw_reader.strain_stats.to_json }

data/lib/RawReader.rb

@@ -1,7 +1,7 @@
 require 'set'
 
 class RawReader
-  attr_reader :skill_list, :skill_cat, :skill_group, :advanced_cat,
+  attr_reader :skill_list, :skill_cat, :skill_group, :advanced_cat, :concentration_cat,
               :strains, :strain_restrictions, :strain_stats, :strain_specs,
               :professions, :profession_concentrations, :profession_advanced
 
@@ -10,7 +10,8 @@ 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: /== Advanced Profession ==/,             next: :adv_prof },
+    :prof_concent  => { 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 },
     :strain_rtrs   => { pattern: /== Strain Stats ==/,                    next: :strain_stats }, 
@@ -27,6 +28,7 @@ class RawReader
     @skill_list = Hash.new
     @skill_cat = Hash.new
     @advanced_cat = Hash.new
+    @concentration_cat = Hash.new
     @strains = Set.new
     @strain_restrictions = Hash.new
     @skill_group = Hash.new
@@ -51,6 +53,8 @@ class RawReader
 
     #ap @skill_cat
     #ap @advanced_cat
+    #ap @profession_concentrations
+    #ap @concentration_cat
   end
 
 private
@@ -100,6 +104,7 @@ 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 :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
     when :strain_rtrs then process_strain_restrictions line: line
@@ -148,9 +153,25 @@ private
     clusters = line.split(/:/)
     right_cluster = clusters[1].split(/\,/)
 
-    @profession_concentrations[clusters[0].strip.to_sym] = right_cluster.collect{ |x| x.strip.to_sym }
+    right_cluster.each do |prof|
+      @profession_concentrations[prof.strip.to_sym] = clusters[0].split(/\,/).collect{ |x| x.strip.to_sym }
+    end
   end
 
+  def process_profession_concentration_skills line:
+    clusters = line.split(/:/)
+
+    # @concentration_cat[clusters[0].strip.to_sym] = clusters[1].split(/\,/).collect{ |x| x.strip.to_sym }
+
+    clusters[1].split(/\,/).each do |skill|
+      smart_insert profession_skills: { skill: skill.strip.to_sym,
+                                        profession: clusters[0].strip.to_sym,
+                                        cost: 0 },
+                   type: :concentration
+    end
+  end
+
+
   def process_advanced_professions line:
     if line.strip.length == 0
       @multiline_state = nil
@@ -296,6 +317,12 @@ private
           cost: cost,
           preq: preq
         }
+      when :concentration
+        @concentration_cat[skill] ||= Hash.new
+        @concentration_cat[skill][profession] = {
+          cost: cost,
+          preq: preq
+        }
       end
 
     end

data/lib/Validator.rb

@@ -6,6 +6,7 @@ class Validator
                  skill_group:, 
                  skill_cat:, 
                  advanced_cat:,
+                 concentration_cat:,
                  strains:, 
                  professions:, 
                  strain_stats:, 
@@ -16,6 +17,7 @@ class Validator
     @skill_group = skill_group
     @skill_cat = skill_cat
     @advanced_cat = advanced_cat
+    @concentration_cat = concentration_cat
     @strains = strains
     @professions = professions
     @strain_stats = strain_stats
@@ -23,9 +25,17 @@ class Validator
     @profession_concentrations = profession_concentrations
     @profession_advanced = profession_advanced
 
+    @profession_concentration_inverted = Hash.new
+    @profession_concentrations.each do |basic, data|
+      data.each do |conc|
+        @profession_concentration_inverted[conc] = true
+      end
+    end
+
     validate_non_empty
     validate_skill_name_matches cat: @skill_cat
     validate_skill_name_matches cat: @advanced_cat
+    validate_skill_name_matches cat: @concentration_cat
     validate_stats
     validate_strain_specs
     validate_profession_concentrations
@@ -73,6 +83,7 @@ private
 
   def validate_skill_name_matches cat:
     mismatches = Array.new
+
     cat.each do |skill_name, sdata|
       if !is_in_list?(skill_name)
         # puts "mismatch: #{skill_name}"
@@ -131,7 +142,9 @@ private
   end
 
   def is_in_profession? _x
-    if !@professions.include?(_x) && !@profession_advanced.keys.include?(_x)
+    if !@professions.include?(_x) && 
+       !@profession_advanced.keys.include?(_x) &&
+       !@profession_concentration_inverted.keys.include?(_x)
       puts "mismatched profession: #{_x}"
       return false
     end

data/lib/input/input.txt

@@ -1,7 +1,7 @@
 == Advantage Skill ==
 Baywalkers: Analyze Creature, Double-Tap, First Aide, Instruct, Literacy, Parry
 Diesel Jocks: Balance, Bolt Action, Forging the Future, Patch Job, Trade Ties, Melee Weapon - Standard
-Full Dead: Big Dig, Check Quality, Income I, Income II, Income III, Income IV, Income V, Lie, Literacy, Torture
+Full Dead: Big Dig I, Big Dig II, Big Dig III, Big Dig IV, Big Dig V, Check Quality, Income I, Income II, Income III, Income IV, Income V, Lie, Literacy, Torture
 Genjian: Analyze Creature, Bow, Brawling, Lore - Mon Histories, Melee Weapon - Standard, Sailing, Throwing
 Iron Slaves: Brawling, Carry, Escape Bonds, Iron Fists, Refuse, Rescue, Scrounge
 Lascarians: Alert, Blind Fighting, Chase, Chop, Force Barricade, Melee Weapon - Small, Scrounge, Take Down
@@ -30,6 +30,10 @@ Full Dead: Income II: Income I
 Full Dead: Income III: Income II
 Full Dead: Income IV: Income III
 Full Dead: Income V: Income IV
+Full Dead: Big Dig II: Big Dig I
+Full Dead: Big Dig III: Big Dig II
+Full Dead: Big Dig IV: Big Dig III
+Full Dead: Big Dig V: Big Dig IV
 Pure Blood: Income II: Income I
 Pure Blood: Income III: Income II
 Pure Blood: Income IV: Income III
@@ -40,9 +44,20 @@ Solestros: Income IV: Income III
 Solestros: Income V: Income IV
 
 == Profession Concentration ==
-Combat: Assassin, Guard, Gun Slinger, Hunter, Martial Artist, Officer, Primitive, Pugilist, Sniper, Solider, Thug
-Civilized Society: Caravan Driver, Charlatan, Doctor, Entertainer, Gambler, Hookup, Merchant, Politician, Priest, Publican, Ring Leader, Sawbones, Scoundrel, Spy, Teacher, Thief
-Crafting and Production: Cook, Distiller, Engineer, Mad Scientist, Printer, Scavenger, Tinker
+Agility Combatant, Ranged Combatant, Short Range Combatant: Assassin, Guard, Gun Slinger, Hunter, Martial Artist, Officer, Primitive, Pugilist, Sniper, Solider, Thug
+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
+
+== Profession Concentration Skills ==
+Agility Combatant: Close The Distance, Disengage, Keen Eyes
+Ranged Combatant: Heavy Ordnance, Reloading is Stupid, Improvised Thrown Weapon
+Short Range Combatant: Pole-arm Weapon Mastery, Call for Phalanx, Improvised Weapon
+Civil Servant: Savior of Life, Bearer of the Banner, Bread and Circuses
+Socialite: Hosting the Gala Event, Life of the Party, Unwanted Guest
+Resource Manager: The Dead Market, Route Management, Financial Exchange
+Consumable Producer: Extra Mile, Make A Show Of It, Resourceful Mind
+Quality Producer: Made to Order, Custom Modification, Rushed Job
+Quantity Producer: Thousand Arms Crafter, A Stitch in Time, Tchotchkes for Miles
 
 == Advanced Profession ==
 Apocatastian Templar: 
@@ -65,7 +80,7 @@ Entrepreneur:
  (and ((not (s "The Red Star")) 
   (xp_sum 100)
   (stat_sum hp_or_mp 50) 
-  (p (Caravan Driver "Hook-Up" Merchant Publican))))
+  (p ("Caravan Driver" "Hook-Up" Merchant Publican))))
 
 Free Radical: 
  (and ((s Retrograde) 
@@ -107,7 +122,7 @@ Mercenary:
 Merican Ba-Das: 
  (and ((xp_sum 100) 
   (stat_sum hp 50) 
-  (s Merican)
+  (s Mericans)
   (p Priest) 
   (p (Guard Officer "Gun Slinger" Hunter Primitive Pugilist Soldier Thug))))
 
@@ -134,8 +149,7 @@ Nephilim:
 Oni: 
  (and ((xp_sum 100) 
   (stat_sum hp_or_mp 50)
-  (s "Red Star") 
-  (p Priest) 
+  (s "The Red Star") 
   (p (Guard Officer "Gun Slinger" Primitive Soldier))))
 
 Overlord:
@@ -287,7 +301,7 @@ Hundred Fist Strike 10
 Flesh of Iron 10
 Silent Introspection 10
 Shatter Strike 10 Brawling
-Air Strike 10 Brawling
+Air Strike 0 Brawling
 
 == Mountebank ==
 Mob Mentality 10
@@ -301,14 +315,14 @@ The Change 10
 Avenging Angel 10 The Change
 Wrath 10 The Change & Brawling
 Broken Coils 10 The Change
-Meaning of Death 10 The Change & Wrath
+Meaning of Death 0 The Change & Wrath
 
 == Oni ==
 Memories of Many 10 Memories of Many
 Guardian Spirit 10 Memories of Many
 Walking Reminder 10 Memories of Many
 Shared Strength 10 Memories of Many
-Red Menace 10 Memories of Many
+Red Menace 0 Memories of Many
 
 == Overlord ==
 Henchman 10
@@ -329,7 +343,7 @@ House of Cards 10
 Simple Deduction 10
 Leap of Reason 10 Simple Deduction
 Strategy 10 
-Pure Genius 10 Educated
+Pure Genius 0 Educated
 
 == Saint ==
 Inner Peace 10
@@ -385,7 +399,7 @@ Protection Racket 10 Disguise
 Nimble Fingers 10 Pick Pockets
 Fence 10
 Running Numbers 10
-Well Shit 10
+Well Shit 0
 
 == Strain Profession Restriction ==
 Baywalkers: Sawbones, Primitive, Thug
@@ -624,7 +638,11 @@ Throwing 3
 == Farmer ==
 Alert 3 
 Analyze Creature 3 
-Animal Handler 3 
+Animal Handler I 3 
+Animal Handler II 3 Animal Handler I
+Animal Handler III 3 Animal Handler II 
+Animal Handler IV 3 Animal Handler III 
+Animal Handler V 3 Animal Handler IV 
 Brawling 6
 Brewing 3 Crop Tending
 Carry 3 
@@ -744,7 +762,11 @@ Throwing - Javelins 3
 == Jones ==
 Attach 3 
 Balance 3
-Big Dig 3 Bomb Awareness
+Big Dig I 3 Bomb Awareness
+Big Dig II 3 Big Dig I
+Big Dig III 3 Big Dig II
+Big Dig IV 3 Big Dig III
+Big Dig V 3 Big Dig IV
 Bolt Action 6 
 Bomb Awareness 3 
 Brawling 6
@@ -1168,7 +1190,7 @@ Income
 AA Alert
 AB Analyze Compound
 AC Analyze Creature
-AD Animal Handler
+AD Animal Handler I
 AE Attach
 AF Avoid
 AG Backstab
@@ -1176,7 +1198,7 @@ AH Balance
 AI Bartender's Tongue
 AJ Barricade
 AK Beg For Life
-AL Big Dig
+AL Big Dig I
 AM Black Market Connections
 AN Bless Weapon
 AO Blind Fighting
@@ -1264,6 +1286,7 @@ DO Lore - Animals - Terra Firma, Lore
 DP Lore - Faith - Church of Darwin, Lore
 DQ Lore - Faith - Cult of Fallow Hopes, Lore
 DR Lore - Faith - Final Knight, Lore
+QS Lore - Faith - Kings Court, Lore
 DS Lore - Faith - Light of Hedon, Lore
 DT Lore - Faith - Minor Cults and Sects, Lore
 DU Lore - Faith - Nuclear Family, Lore
@@ -1276,7 +1299,7 @@ EA Lore - History - Fictional Literature, Lore
 EB Lore - History - Music, Lore
 EC Lore - Medical - Diseases and Plagues, Lore
 ED Lore - Medical - Grave Mind Infection, Lore
-EE Lore - Medical - Grave Robber Processesv
+EE Lore - Medical - Grave Robber Processes, Lore
 EF Lore - Metallurgy, Lore
 EG Lore - Mining, Lore
 EH Lore - Mon Histories, Lore
@@ -1286,7 +1309,7 @@ EK Lore - Pre-Fall History Ancient, Lore
 EL Lore - Pre-Fall History Cultural, Lore
 EM Lore - Pre-Fall History Modern, Lore
 EN Lore - Pre-Fall History Religion, Lore
-EO Lore - Meditation, Lore
+QT Lore - Radiation, Lore
 EP Lore - Raider, Lore
 EQ Lore - Slaver Communities, Lore
 ER Lore - Strain - Nation of Accensor, Lore
@@ -1309,17 +1332,10 @@ FH Lore - Strain - Solestros, Lore
 FI Lore - Strain - Unborn of Teixiptla, Lore
 FJ Lore - Strain - Vegasians, Lore
 FK Lore - Strain - Yorker, Lore
-FL Lore - Tech - Combustion Power
-FM Lore - Tech - Natural Power
-FN Lore - Tech - Nuclear Power
-FO Lore - Zombie
-FP Lore - Techno Savant - Complex Electronics
-FQ Lore - Techno Savant - Doomsday Device
-FR Lore - Techno Savant - Tesla Electronics
-FS Lore - Techno Savant - Esoteric Cultural Anomalies
-FT Lore - Medicine - Biological Warfare
-FU Lore - Tech - Structural Anomalies
-FV Lore - Tech - Gizmos
+FL Lore - Tech - Combustion Power, Lore
+FM Lore - Tech - Natural Power, Lore
+FN Lore - Tech - Nuclear Power, Lore
+FO Lore - Zombie, Lore
 FW Mangle Limb
 FX Master Craftsman
 FY Medical Assistance
@@ -1370,6 +1386,14 @@ QG Mind of a Killer, Psionic Skill - Advanced
 QH Mind Shield, Psionic Skill - Advanced 
 QI Psychic Cleanse, Psionic Skill - Advanced 
 QJ Sundered Mind, Psionic Skill - Advanced
+QK Animal Handler II
+QL Animal Handler III
+QM Animal Handler IV
+QN Animal Handler V
+QO Big Dig II
+QP Big Dig III
+QQ Big Dig IV
+QR Big Dig V
 GS Refuse
 GT Repair
 GU Rescue
@@ -1532,4 +1556,31 @@ WD Walking Reminder
 WE Well Shit
 WF Windfall
 WG Wrath
-WH Wrath of the Just
+WH Wrath of the Just
+XA Close The Distance
+XB Disengage
+XC Keen Eyes
+XD Heavy Ordnance
+XE Reloading is Stupid
+XF Improvised Thrown Weapon
+XG Pole-arm Weapon Mastery
+XH Call for Phalanx
+XI Improvised Weapon
+XJ Savior of Life
+XK Bearer of the Banner
+XL Bread and Circuses
+XM Hosting the Gala Event
+XN Life of the Party
+XO Unwanted Guest
+XP The Dead Market
+XQ Route Management
+XR Financial Exchange
+XS Extra Mile
+XT Make A Show Of It
+XU Resourceful Mind
+XV Made to Order
+XW Custom Modification
+XX Rushed Job
+XY Thousand Arms Crafter
+XZ A Stitch in Time
+WI Tchotchkes for Miles

metadata

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