gemwarrior 0.12.7 → 0.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8cb18496411a23c6f5cf358966ee637a54cf5af
-  data.tar.gz: 36a10e8a5e4169918459421761eaf6531c25e152
+  metadata.gz: 87721fdd2ec0064a907a6178832b27955eecc508
+  data.tar.gz: 66045234ba9735ce29539b85bb0fa38392099151
 SHA512:
-  metadata.gz: f431f5650418746bdad6a52e5cb12e2a9b37480fd79a21dca9866eaea193faeafbe766898973ea1770c0c7e9fc607659d7d1b3c9227e8d784b32c5106b692482
-  data.tar.gz: fa4f06e96071517d917bc055e9471dd10720f37191921d96a068bd07c7c2ceb58c7fc0fd383d4721ff3e49eb6b4ad5acb63c5d51d2b5f4ce72178880dbef8e0a
+  metadata.gz: 8df7613868ebb152e5e2ddb9f8136840d67df56ce3bf50e0f9c91d0b1125aaef9bc0d760ad2bab386407f0168a9d10e65a82d3d280a6ba64cb41806d23487321
+  data.tar.gz: 18377d6edc2b4c575c70a13d4d7bda1f9d4babfd9879042d96e84a587de29adc4f986af0b5ecc069722f3b8342126afd56d07b4eea586052ce677bfc984bf94c

data/lib/gemwarrior/battle.rb

@@ -30,9 +30,8 @@ module Gemwarrior
     end
 
     def start(is_arena = false, is_event = false)
-      Audio.play_synth(:battle_start)
-
       # begin battle!
+      Audio.play_synth(:battle_start)
       print_battle_header unless is_arena
 
       # print opponent announcement, depending on reason for battle
@@ -89,6 +88,7 @@ module Gemwarrior
       loop do
         skip_next_monster_attack = false
 
+        # 1. check for death to end battle
         if monster_dead?
           result = monster_death
           return result
@@ -97,35 +97,16 @@ module Gemwarrior
           return 'death'
         end
 
-        # check for near death
-        puts "  You are almost dead!\n".colorize(:yellow)             if player_near_death?
-        puts "  #{monster.name} is almost dead!\n".colorize(:yellow)  if monster_near_death?
-
-        puts
-
-        # print health info
-        print "  #{player.name.upcase.ljust(12).colorize(:green)} :: #{player.hp_cur.to_s.rjust(3)} HP"
-        print " (LVL: #{player.level})" if GameOptions.data['debug_mode']
-        print "\n"
-
-        print "  #{monster.name.upcase.ljust(12).colorize(:red)} :: "
-        if GameOptions.data['debug_mode'] || player.special_abilities.include?(:rocking_vision)
-          print "#{monster.hp_cur.to_s.rjust(3)}"
-        else
-          print '???'
-        end
-        print ' HP'
-        print " (LVL: #{monster.level})" if GameOptions.data['debug_mode']
-        print "\n"
-        puts
+        # 2. print general info and display options prompt
+        print_near_death_info
+        print_combatants_health_info
+        print_battle_options_prompt
 
+        # 3. get player action
         self.player_is_defending = false
-
-        # battle options prompt
-        print_battle_options
         player_action = STDIN.gets.chomp.downcase
 
-        # player action
+        # 4. parse player action
         case player_action
         when 'fight', 'f', 'attack', 'a'
           can_attack = true
@@ -232,7 +213,7 @@ module Gemwarrior
           next
         end
 
-        # monster action
+        # 5. parse monster action
         monster_attacks_player unless skip_next_monster_attack
       end
     end
@@ -581,6 +562,29 @@ module Gemwarrior
     end
 
     # STATUS TEXT
+    def print_near_death_info
+      puts "  You are almost dead!\n".colorize(:yellow)             if player_near_death?
+      puts "  #{monster.name} is almost dead!\n".colorize(:yellow)  if monster_near_death?
+      puts
+    end
+
+    def print_combatants_health_info
+      print "  #{player.name.upcase.ljust(12).colorize(:green)} :: #{player.hp_cur.to_s.rjust(3)} HP"
+      print " (LVL: #{player.level})" if GameOptions.data['debug_mode']
+      print "\n"
+
+      print "  #{monster.name.upcase.ljust(12).colorize(:red)} :: "
+      if GameOptions.data['debug_mode'] || player.special_abilities.include?(:rocking_vision)
+        print "#{monster.hp_cur.to_s.rjust(3)}"
+      else
+        print '???'
+      end
+      print ' HP'
+      print " (LVL: #{monster.level})" if GameOptions.data['debug_mode']
+      print "\n"
+      puts
+    end
+
     def print_escape_text
       print '  '
       Animation.run(phrase: ESCAPE_TEXT, oneline: false)
@@ -591,7 +595,7 @@ module Gemwarrior
       print "\n"
     end
 
-    def print_battle_options
+    def print_battle_options_prompt
       puts '  What do you do?'
       print '  '
       print "#{'['.colorize(:yellow)}"

data/lib/gemwarrior/version.rb

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

metadata

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