dd-next-encounters 2.0.2 → 3.0.0

data/lib/dd-next-encounters.rb

@@ -1,2 +1,3 @@
 require_relative 'monsters/monsters_manual'
 require_relative 'encounters/encounters'
+require_relative 'encounters/lairs'

data/lib/encounters/encounter.rb

@@ -1,21 +1,28 @@
 class Encounter
 
-  def initialize( monster, amount )
+  attr_reader :xp_value, :id
+
+  def initialize( monster, amount, id = nil, xp_value = nil )
     @monster = monster
     @amount = amount
-    # @party_xp_level = party_xp_level
+    @xp_value = xp_value ? xp_value : encounter_xp_value.to_i
+    @id = id ? id : ( monster.key.to_s + '_' + amount.to_s ).to_sym
   end
 
   def to_s
     "#{@amount} #{@monster.name}"
   end
 
-  def encounter_xp_value
-    1.upto(@amount).map{ @monster.xp_value }.reduce(&:+) * get_encounter_multiplier
+  def to_hash
+    { id: @id, monster_key: @monster.key, amount: @amount, xp_value: @xp_value }
   end
 
   private
 
+  def encounter_xp_value
+    1.upto(@amount).map{ @monster.xp_value }.reduce(&:+) * get_encounter_multiplier
+  end
+
   def get_encounter_multiplier
     count = @amount
     mul = 1

data/lib/encounters/encounters.rb

@@ -1,49 +1,34 @@
-require_relative '../data/by_xp_encounters'
+require_relative '../data/encounters_data'
 require_relative '../data/xp_difficulty_table'
 require_relative '../../lib/monsters/monsters_manual'
 require_relative 'encounter'
 
 class Encounters
 
-  include ByXpEncounters
+  include EncountersData
   include XpDifficultyTable
   AVAILABLE_ENCOUNTER_LEVEL = REVERSED_XP_DIFFICULTY_TABLE.keys
-  @@by_xp_encounters = nil
 
   def initialize
     @monster_manual = MonstersManual.new
     @monster_manual.load
-    @by_xp_encounters = {}
-    BY_XP_ENCOUNTERS.each do |k, v|
-      @by_xp_encounters[ k ] = v.map{ |e| Encounter.new( @monster_manual.get( e[:monster_key] ), e[:amount] ) }
-    end
-  end
-
-  # encounter_level : :easy, :medium, :hard, :deadly
-  def get_party_encounter( encounter_level, *hero_level )
-    raise 'Empty party is not valid. Please provide at least one hero' if hero_level.empty?
-
-    raise "Bad encounter level : #{encounter_level.inspect}. Available encounter level : #{AVAILABLE_ENCOUNTER_LEVEL.inspect}" unless AVAILABLE_ENCOUNTER_LEVEL.include?( encounter_level )
-    raise 'Party too weak. Minimum 3 members' if hero_level.count < 3
 
-    hero_level.each do |level|
-      raise "Hero level should be an integer currently : #{level.class.to_s}" unless level.class == Integer
-      raise "Bad hero level : #{level}. Should be between 1 .. 20" if level < 1 || level > 20
+    @encounters = {}
+    @by_monster_encounters = {}
+    ENCOUNTERS.each do |e|
+      encounter = Encounter.new( @monster_manual.get( e[:monster_key] ), e[:amount], e[:id], e[:xp_value] )
+      @encounters[e[:id]] = encounter
+      @by_monster_encounters[e[:monster_key]] ||= []
+      @by_monster_encounters[e[:monster_key]] << encounter
     end
-
-    party_xp_level = hero_level.map{ |hl| XP_DIFFICULTY_TABLE[hl][encounter_level] }.reduce(&:+)
-
-    get_encounter( party_xp_level*0.6, party_xp_level*1.2 )
   end
 
-  private
+  def by_id( encounter_id )
+    @encounters[ encounter_id ]
+  end
 
-  def get_encounter( min_xp, max_xp )
-    raise 'Encounters not loaded' unless @by_xp_encounters
-    encounters = @by_xp_encounters.map{ |k_value, encounters| encounters if k_value <= max_xp && k_value >= min_xp }
-    encounters = encounters.compact.flatten
-    # p encounters.map{ |e| e.to_s }
-    encounters.sample
+  def by_monster( monster_key )
+    @by_monster_encounters[monster_key]
   end
 
 end

data/lib/encounters/lairs.rb

@@ -0,0 +1,52 @@
+require_relative '../data/lairs_data'
+require_relative 'encounters'
+require_relative '../data/xp_difficulty_table'
+
+class Lairs
+  include LairsData
+  include XpDifficultyTable
+  AVAILABLE_ENCOUNTER_LEVEL = REVERSED_XP_DIFFICULTY_TABLE.keys
+
+  MIN_PARTY_LEVEL_MUL = 0.4
+
+  # encounter_level : :easy, :medium, :hard, :deadly
+  def initialize( encounter_level, hero_levels )
+
+    @encounters = Encounters.new
+    @encounter_level = encounter_level
+    @hero_levels = hero_levels
+    check_params
+
+    @party_xp_level = hero_levels.map{ |hl| XP_DIFFICULTY_TABLE[hl][@encounter_level] }.reduce(&:+)
+
+    @lair_type = get_available_lairs.sample
+  end
+
+  def encounter
+    encounter_id = get_available_encounters.sample
+    @encounters.by_id encounter_id
+  end
+
+  private
+
+  def get_available_lairs
+    LAIRS_DATA[:by_xp_lair].select{ |k, _| k >= @party_xp_level*MIN_PARTY_LEVEL_MUL && k <= @party_xp_level }.values.flatten.uniq
+  end
+
+  def get_available_encounters
+    LAIRS_DATA[:lairs][@lair_type][:by_encounters_xp].select{ |k, _| k >= @party_xp_level*MIN_PARTY_LEVEL_MUL && k <= @party_xp_level }.values.flatten.uniq
+  end
+
+  def check_params
+    raise 'Empty party is not valid. Please provide at least one hero' if @hero_levels.empty?
+
+    raise "Bad encounter level : #{@encounter_level.inspect}. Available encounter level : #{AVAILABLE_ENCOUNTER_LEVEL.inspect}" unless AVAILABLE_ENCOUNTER_LEVEL.include?( @encounter_level )
+    raise 'Party too weak. Minimum 3 members' if @hero_levels.count < 3
+
+    @hero_levels.each do |level|
+      raise "Hero level should be an integer currently : #{level.class.to_s}" unless level.class == Integer
+      raise "Bad hero level : #{level}. Should be between 1 .. 20" if level < 1 || level > 20
+    end
+  end
+
+end

data/lib/monsters/monster.rb

@@ -13,24 +13,17 @@ end
 
 class Monster
 
-  attr_reader :challenge, :name, :type, :source, :key, :groups
+  attr_reader :challenge, :name, :type, :source, :key
   attr_accessor :xp_value, :boss
 
   def initialize( challenge, name, type, source )
     set_instance_variables(binding, *local_variables)
     @key = @name.gsub( /[ -]/, '_' ).gsub( 'é', 'e' ).delete( "()'’“”" ).downcase.to_sym
-    @groups = []
-    @accepted_bosses = []
     @boss = false
   end
 
-  def add_groups( groups )
-    @groups ||= []
-    @groups += groups
-  end
-
   def to_hash
-    { key: @key, challenge: @challenge, name: @name, type: @type, source: @source, xp_value: @xp_value, boss: @boss, groups: @groups }
+    { key: @key, challenge: @challenge, name: @name, type: @type, source: @source, xp_value: @xp_value, boss: @boss }
   end
 
 end

data/lib/monsters/monsters_manual.rb

@@ -1,12 +1,11 @@
 require 'json'
 require 'pp'
 require_relative 'monster'
-require_relative 'monsters_group'
-require_relative '../../lib/data/monsters_manual_content'
+require_relative '../data/monsters_manual_content'
 
 class MonstersManual
 
-  attr_reader :monsters, :groups
+  attr_reader :monsters
 
   include MonstersManualContent
 
@@ -15,7 +14,6 @@ class MonstersManual
     @sources = {}
     @challenges = {}
     @types = {}
-    @groups = {}
   end
 
   def load
@@ -24,7 +22,6 @@ class MonstersManual
       monster = Monster.new( m[:challenge], m[:name], m[:type], m[:source] )
       monster.xp_value = m[:xp_value]
       monster.boss = m[:boss]
-      monster.add_groups( m[:groups] )
       @monsters[ monster.key ] = monster
     end
 
@@ -32,11 +29,6 @@ class MonstersManual
     @challenges = MONSTERS_MANUAL_CONTENT[:challenges]
     @types = MONSTERS_MANUAL_CONTENT[:types]
 
-    MONSTERS_MANUAL_CONTENT[:groups].each do |k, group_hash|
-      group = MonstersGroup.new
-      group.from_hash( @monsters, group_hash )
-      @groups[k] = group
-    end
   end
 
   def save( filename )
@@ -44,8 +36,7 @@ class MonstersManual
         monsters: @monsters.map{ |_, m| m.to_hash },
         sources: @sources,
         challenges: @challenges,
-        types: @types,
-        groups: Hash[ @groups.map{ |k, g| [ k, g.to_hash ] } ]
+        types: @types
     }
     File.open( filename, 'w' ) do |f|
       f.puts 'module MonstersManualContent'
@@ -99,10 +90,6 @@ class MonstersManual
     @types[monster.type] ||= []
     @types[monster.type] << monster.key
 
-    monster.groups.each do |group|
-      @groups[group] ||= MonstersGroup.new
-      @groups[group].add_monster( monster )
-    end
   end
 
   def validate_loaded

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dd-next-encounters
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Cédric Zuger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hazard
@@ -31,14 +31,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/data/by_xp_encounters.rb
+- lib/data/encounters_data.rb
+- lib/data/lairs_data.rb
 - lib/data/monsters_manual_content.rb
 - lib/data/xp_difficulty_table.rb
 - lib/dd-next-encounters.rb
 - lib/encounters/encounter.rb
 - lib/encounters/encounters.rb
+- lib/encounters/lairs.rb
 - lib/monsters/monster.rb
-- lib/monsters/monsters_group.rb
 - lib/monsters/monsters_manual.rb
 homepage: https://github.com/czuger/dd-next-encounters
 licenses:

data/lib/data/by_xp_encounters.rb

@@ -1,98 +0,0 @@
-module ByXpEncounters
-	 BY_XP_ENCOUNTERS = 
-{50=>
-  [{:amount=>1, :monster_key=>:skeleton}, {:amount=>1, :monster_key=>:goblin}],
- 150=>
-  [{:amount=>2, :monster_key=>:skeleton}, {:amount=>2, :monster_key=>:goblin}],
- 300=>
-  [{:amount=>3, :monster_key=>:skeleton},
-   {:amount=>2, :monster_key=>:shadow},
-   {:amount=>3, :monster_key=>:goblin},
-   {:amount=>2, :monster_key=>:hobgoblin},
-   {:amount=>2, :monster_key=>:orc}],
- 400=>
-  [{:amount=>4, :monster_key=>:skeleton}, {:amount=>4, :monster_key=>:goblin}],
- 500=>
-  [{:amount=>5, :monster_key=>:skeleton}, {:amount=>5, :monster_key=>:goblin}],
- 600=>
-  [{:amount=>6, :monster_key=>:skeleton},
-   {:amount=>2, :monster_key=>:ghoul},
-   {:amount=>3, :monster_key=>:shadow},
-   {:amount=>2, :monster_key=>:specter},
-   {:amount=>6, :monster_key=>:goblin},
-   {:amount=>3, :monster_key=>:hobgoblin},
-   {:amount=>2, :monster_key=>:bugbear},
-   {:amount=>3, :monster_key=>:orc}],
- 200=>
-  [{:amount=>1, :monster_key=>:ghoul},
-   {:amount=>1, :monster_key=>:specter},
-   {:amount=>1, :monster_key=>:bugbear}],
- 1200=>
-  [{:amount=>3, :monster_key=>:ghoul},
-   {:amount=>6, :monster_key=>:shadow},
-   {:amount=>3, :monster_key=>:specter},
-   {:amount=>6, :monster_key=>:hobgoblin},
-   {:amount=>3, :monster_key=>:bugbear},
-   {:amount=>6, :monster_key=>:orc}],
- 1600=>
-  [{:amount=>4, :monster_key=>:ghoul},
-   {:amount=>4, :monster_key=>:specter},
-   {:amount=>4, :monster_key=>:bugbear}],
- 2000=>
-  [{:amount=>5, :monster_key=>:ghoul},
-   {:amount=>5, :monster_key=>:specter},
-   {:amount=>5, :monster_key=>:bugbear}],
- 2400=>
-  [{:amount=>6, :monster_key=>:ghoul},
-   {:amount=>6, :monster_key=>:specter},
-   {:amount=>6, :monster_key=>:bugbear}],
- 100=>
-  [{:amount=>1, :monster_key=>:shadow},
-   {:amount=>1, :monster_key=>:hobgoblin},
-   {:amount=>1, :monster_key=>:orc}],
- 800=>
-  [{:amount=>4, :monster_key=>:shadow},
-   {:amount=>4, :monster_key=>:hobgoblin},
-   {:amount=>4, :monster_key=>:orc}],
- 1000=>
-  [{:amount=>5, :monster_key=>:shadow},
-   {:amount=>5, :monster_key=>:hobgoblin},
-   {:amount=>5, :monster_key=>:orc}],
- 450=>
-  [{:amount=>1, :monster_key=>:ghast},
-   {:amount=>1, :monster_key=>:minotaur_skeleton}],
- 1350=>
-  [{:amount=>2, :monster_key=>:ghast},
-   {:amount=>2, :monster_key=>:minotaur_skeleton}],
- 2700=>
-  [{:amount=>3, :monster_key=>:ghast},
-   {:amount=>3, :monster_key=>:minotaur_skeleton}],
- 3600=>
-  [{:amount=>4, :monster_key=>:ghast},
-   {:amount=>4, :monster_key=>:minotaur_skeleton}],
- 4500=>
-  [{:amount=>5, :monster_key=>:ghast},
-   {:amount=>5, :monster_key=>:minotaur_skeleton}],
- 5400=>
-  [{:amount=>6, :monster_key=>:ghast},
-   {:amount=>6, :monster_key=>:minotaur_skeleton},
-   {:amount=>2, :monster_key=>:vampire_spawn}],
- 700=>[{:amount=>1, :monster_key=>:mummy}],
- 2100=>[{:amount=>2, :monster_key=>:mummy}],
- 4200=>[{:amount=>3, :monster_key=>:mummy}],
- 13000=>
-  [{:amount=>1, :monster_key=>:mummy_lord},
-   {:amount=>1, :monster_key=>:vampire_spellcaster},
-   {:amount=>1, :monster_key=>:vampire_warrior}],
- 10000=>[{:amount=>1, :monster_key=>:vampire}],
- 30000=>[{:amount=>2, :monster_key=>:vampire}],
- 60000=>[{:amount=>3, :monster_key=>:vampire}],
- 1800=>[{:amount=>1, :monster_key=>:vampire_spawn}],
- 10800=>[{:amount=>3, :monster_key=>:vampire_spawn}],
- 39000=>
-  [{:amount=>2, :monster_key=>:vampire_spellcaster},
-   {:amount=>2, :monster_key=>:vampire_warrior}],
- 78000=>
-  [{:amount=>3, :monster_key=>:vampire_spellcaster},
-   {:amount=>3, :monster_key=>:vampire_warrior}]}
-end

data/lib/monsters/monsters_group.rb

@@ -1,30 +0,0 @@
-class MonstersGroup
-
-  attr_reader :troops, :bosses
-
-  def initialize
-    @troops = []
-    @bosses = []
-    # This mean that this group is inferior to the listed groups. They wont accept
-    @groups_inferiority = []
-  end
-
-  def add_monster( monster )
-    @troops << monster unless monster.boss
-    @bosses << monster if monster.boss
-  end
-
-  # def to_s
-  #   { troops: @troops.map{ |m| m.key }, bosses: @bosses.map{ |m| m.key } }
-  # end
-
-  def to_hash
-    { troops: @troops.map{ |m| m.key }, bosses: @bosses.map{ |m| m.key } }
-  end
-
-  def from_hash( monsters, hash )
-    @troops = hash[:troops].map{ |tk| monsters[tk] }
-    @bosses = hash[:bosses].map{ |tk| monsters[tk] }
-  end
-
-end