dd-next-encounters 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5af6e145531520e7e13269f87fb25dc99bf22a8
-  data.tar.gz: 25e866bbe044c3e96d6f2fbe53687b89efc443f5
+  metadata.gz: 0c439e67e42a41fce80b6270a542ace5aa2bafac
+  data.tar.gz: d80a2449e59c665156a29747266fa99a306b6d27
 SHA512:
-  metadata.gz: cd1d9d7110ea8b8b870e9e1b203740b244172d6f26baccdb5eb2d698383828802752103e705a302d8d723a8ed416c25db1aa241644a175c043f3b1d8b9c6ca0f
-  data.tar.gz: 045fc1947d8d44e4ad67f21951cc4038759d1a4a62076550ff6cd2d21a2cabf7a76aa2d6609f34af2ef09e61c50b8d546442513bcc5f1a75c83ddd9d93d6c2ab
+  metadata.gz: 03ad46f247684c9aec0beaf7edb965cb56bff71b25c7a72fe08cec84fa4ff6e9bdcab0e4d5b845a72e5747c3df02320f3637aae489a4c6dc540aeec232df56d5
+  data.tar.gz: 218ce8c5e23c06376319d19165e31ede9ad4f65404bac2075e0a304e16ac5bc52d533f6cab5b783c6bc0bf6d02fcdf9fb099af5de31c929844c34fd660c2da8e

data/lib/encounters/encounter.rb

@@ -6,7 +6,8 @@ class Encounter
   end
 
   # Return true or false. Monster added or not
-  def add_monster_if_possible( monster )
+  def add_monster_while_possible(monster )
+    raise "monster can't be nil : #{monster.inspect}" unless monster
     if can_add_monster?( monster )
       @monsters << monster
       return true
@@ -25,6 +26,7 @@ class Encounter
   private
 
   def encounter_value( encounter )
+    raise "Encounter should not contain nil values : #{encounter.inspect}" if encounter.compact != encounter
     encounter.map{ |e| e.xp_value }.reduce(&:+) * get_encounter_multiplier( encounter )
   end
 

data/lib/encounters/lair.rb

@@ -26,27 +26,49 @@ class Lair
 
   # encounter_level : :easy, :medium, :hard, :deadly
   def get_encounter( encounter_level, *hero_level )
+    raise 'Empty party is not valid. Please provide at least one hero' if hero_level.empty?
     @monster_manual.validate_loaded
 
     raise "Bad encounter level : #{encounter_level.inspect}. Available encounter level : #{AVAILABLE_ENCOUNTER_LEVEL.inspect}" unless AVAILABLE_ENCOUNTER_LEVEL.include?( encounter_level )
-    party_xp_level = hero_level.map{ |hl| @xp_difficulty_table[hl][encounter_level] }.reduce(&:+)
+    raise 'Party too weak. Minimum 3 members' if hero_level.count < 3
+
+    hero_level.each do |level|
+      raise "Bad hero level : #{level}. Should be between 1 .. 20" if level < 1 || level > 20
+    end
 
-    encounter = Encounter.new( party_xp_level )
+    party_xp_level = hero_level.map{ |hl| @xp_difficulty_table[hl][encounter_level] }.reduce(&:+)
 
-    # Choose a random encounter type
-    encounter_type = @encounters_types.sample
-    bosses = @encounters[encounter_type][:bosses]
-    troops = @encounters[encounter_type][:troops]
+    tested_encounters_types = []
+    encounter = nil
+    loop do
 
-    # Choose a random boss
-    boss = bosses.sample if !bosses.empty? && rand( 1 .. 2 ) == 1
-    encounter.add_monster_if_possible( boss ) if boss
+      raise "Can't create an encounter for this party" if (@encounters_types-tested_encounters_types).empty?
+      encounter = Encounter.new( party_xp_level )
+
+      # Choose a random encounter type
+      encounter_type = ( @encounters_types - tested_encounters_types ).sample
+      bosses = @encounters[encounter_type][:bosses]
+      troops = @encounters[encounter_type][:troops]
+
+      # Choose a random boss
+      boss = bosses.sample if !bosses.empty? && rand( 1 .. 2 ) == 1
+      encounter.add_monster_while_possible(boss ) if boss
+
+      # Choose a random monster
+      monster = get_corresponding_monsters( troops, party_xp_level ).sample
+      # We couldn't get a monster of this type for this party. Probably the monsters are too hard
+      # Then we have to check again with another monster type
+      unless monster
+        tested_encounters_types << encounter_type
+        next
+      end
 
-    # Choose a random monster
-    monster = get_corresponding_monsters( troops, party_xp_level ).sample
+      # Will add the same monster while party_xp_level is not reached
+      loop do
+        break unless encounter.add_monster_while_possible(monster )
+      end
 
-    loop do
-      break unless encounter.add_monster_if_possible( monster )
+      break
     end
 
     encounter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dd-next-encounters
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Cédric Zuger