gemwarrior 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e27fcf7b974b83714555dab00d87663d44c56a0
-  data.tar.gz: 2a42f4c114c78a126b4e2138ea2bbccc3e5d819f
+  metadata.gz: e09f2cc3d7ed944459541f17544b4c7c64b2ec9a
+  data.tar.gz: 4e427d4e05555bd40be5843f5df7912cffcc4e1a
 SHA512:
-  metadata.gz: efe909d2639c0e2ad138cf51e919e5e83d6d617fec84c0db190f087780a4308ffe3716fec41c05d5d71f8a11f6ecb2c1351a1f4fecb11b61cb72c09dd3e4e3c7
-  data.tar.gz: d7d042bdfba9e1d6ec1ac99940e13ada832df2fb4ff5de3af3291c33cbf880a1d64855a86a079cec8a5b63b4f60604691e6eb3c7bf592df1cf776360ba2ba708
+  metadata.gz: 0ad699b34f26384773a8609b97a889854b70af93ce8b5bf3f623f542cbbe28ff736c20b4282e924dcd857c7e0742772a12ab66b3f21ac90d88ece433aaa2c49d
+  data.tar.gz: 13dbc66199d1acdf633939cf60d2c9adc9e23ebd31a634b8d95f6f041ed13f942e9143c67c2e616d64c944d71304ee240ca428d55fb0beda315671b46ff325d2

data/lib/gemwarrior/battle.rb

@@ -59,7 +59,7 @@ module Gemwarrior
           puts '  The Shifty Woman\'s perplexing speech now over, she disappears.'
           world.shifty_has_jeweled = true
         end
-      elsif monster_strikes_first?(arena_battle: is_arena, event_battle: is_event)
+      elsif monster_strikes_first?(is_arena, is_event)
         puts "  #{monster.name} strikes first!".colorize(:yellow)
         monster_attacks_player
       end
@@ -374,7 +374,6 @@ module Gemwarrior
           puts
           puts '  Monster Roll for Attack:'.colorize(:red)
           puts "  ATTEMPT_RANGE: #{attempt_success_lo}..#{attempt_success_hi}"
-          puts "  ATTEMPT_ROLL : #{attempt}"
           puts "  MUST_BEAT    : #{success_min}"
           if attempt > success_min
             puts "  ATTEMPT_ROLL : #{attempt.to_s.colorize(:green)}"
@@ -447,10 +446,23 @@ module Gemwarrior
       elsif player.special_abilities.include?(:stone_face)
         return false
       elsif (monster.dexterity > player.dexterity)
+        if GameOptions.data['debug_mode']
+          puts
+          puts "  MONSTER_DEX: #{monster.dexterity}, PLAYER_DEX: #{player.dexterity}"
+        end
+
         return true
       else
         dex_diff = player.dexterity - monster.dexterity
         rand_dex = rand(0..dex_diff)
+
+        if GameOptions.data['debug_mode']
+          puts
+          puts "  DEX_DIFF    : #{dex_diff}"
+          puts "  RAND_DEX    : #{rand_dex}"
+          puts "  RAND_DEX % 2: #{rand_dex % 2}"
+        end
+
         if rand_dex % 2 > 0
           return true
         else

data/lib/gemwarrior/entities/location.rb

@@ -195,26 +195,19 @@ module Gemwarrior
     end
 
     def populate_monsters(monsters_available = nil, spawn = false, monster_type = nil)
-      if should_spawn_monster? || spawn
-        self.checked_for_monsters = true unless spawn
-        self.monsters_abounding = [] unless spawn
+      # debug spawn
+      if spawn
         random_monster = nil
 
+        # debug spawn random monster
         if monster_type.nil?
-          # get random non-boss monster
           loop do
             random_monster = monsters_available[rand(0..monsters_available.length-1)].clone
 
-            if spawn
-              break
-            else
-              unless random_monster.is_boss || !self.monster_level_range.include?(random_monster.level)
-                break
-              end
-            end
+            monsters_abounding.push(random_monster)
+            break
           end
-
-          monsters_abounding.push(random_monster)
+        # debug spawn w/ monster_type
         else
           monster_type_to_spawn = monsters_available.find { |m| m.name.downcase == monster_type.downcase }
           if monster_type_to_spawn.nil?
@@ -224,6 +217,21 @@ module Gemwarrior
             monsters_abounding.push(monster_type_to_spawn)
           end
         end
+      # normal location spawn
+      elsif should_spawn_monster?
+        self.checked_for_monsters = true
+        self.monsters_abounding = []
+        random_monster = nil
+
+        # get random non-boss monster
+        loop do
+          random_monster = monsters_available[rand(0..monsters_available.length-1)].clone
+
+          if !random_monster.is_boss && self.monster_level_range.include?(random_monster.level)
+            monsters_abounding.push(random_monster)
+            break
+          end
+        end
       else
         return nil
       end

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Michael Chadwick