gemwarrior 0.10.8 → 0.11.0

data/gemwarrior.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'http', '~> 0.8.10'
   spec.add_runtime_dependency 'json', '~> 1.8.2'
   spec.add_runtime_dependency 'colorize', '~> 0.7.7'
-  spec.add_runtime_dependency 'matrext', '~> 0.4.9'
+  spec.add_runtime_dependency 'matrext', '~> 0.4.10'
   spec.add_runtime_dependency 'clocker', '~> 0.1.6'
   spec.add_runtime_dependency 'win32-sound', '~> 0.6.0'
   spec.add_runtime_dependency 'feep', '~> 0.1.3'

data/lib/gemwarrior/arena.rb

@@ -1,11 +1,14 @@
 # lib/gemwarrior/arena.rb
 # Arena series of battles
 
-require_relative 'misc/player_levels'
 require_relative 'battle'
 
 module Gemwarrior
   class Arena
+    # CONSTANTS
+    BONUS_ROX_MULTIPLIER  = 25
+    BONUS_XP_MULTIPLIER   = 10
+
     attr_accessor :world, :player
 
     def initialize(options)
@@ -21,29 +24,28 @@ module Gemwarrior
       loop do
         monster = generate_monster
         battle = Battle.new(world: world, player: player, monster: monster)
-        result = battle.start(is_arena = true)
+        result = battle.start(is_arena: true)
 
-        if result.eql?('death')
-          return 'death'
-        end
+        return 'death' if result.eql?('death')
 
         arena_monsters_vanquished += 1
 
-        puts
-        print 'Do you wish to continue fighting in the Arena? (y/n) '
+        print '  Do you wish to continue fighting in the Arena? (y/n) '
         answer = gets.chomp.downcase
 
         case answer
         when 'y', 'yes'
+          puts
           next
         else
-          bonus_rox = arena_monsters_vanquished * 25
-          bonus_xp = arena_monsters_vanquished * 10
+          bonus_rox = arena_monsters_vanquished * BONUS_ROX_MULTIPLIER
+          bonus_xp = arena_monsters_vanquished * BONUS_XP_MULTIPLIER
           player.rox = player.rox + bonus_rox
           player.xp = player.xp + bonus_xp
-          puts 'You decided you\'ve had enough of the exhausting Arena for one day and exit the main stage.'
-          puts "You defeated #{arena_monsters_vanquished} monsters!"
-          puts "You have gained #{bonus_rox} rox and #{bonus_xp} XP!"
+          puts
+          puts '  You decided you\'ve had enough of the exhausting Arena for one day and exit the main stage.'
+          puts "  You defeated #{arena_monsters_vanquished} monsters!"
+          puts "  You have gained #{bonus_rox} rox and #{bonus_xp} XP!"
 
           return print_arena_outro
         end
@@ -56,14 +58,12 @@ module Gemwarrior
       random_monster = nil
 
       loop do
-        random_monster = world.monsters[rand(0..world.monsters.length - 1)].clone
+        random_monster = GameMonsters.data[rand(0..GameMonsters.data.length - 1)].clone
 
-        unless random_monster.is_boss
-          break
-        end
+        break unless random_monster.is_boss
       end
 
-      return random_monster.clone
+      random_monster.clone
     end
 
     def print_arena_intro

data/lib/gemwarrior/battle.rb

@@ -1,16 +1,14 @@
 # lib/gemwarrior/battle.rb
 # Monster battle
 
-require_relative 'misc/player_levels'
 require_relative 'game_options'
-require_relative 'entities/items/sparkly_thing'
 
 module Gemwarrior
   class Battle
     # CONSTANTS
     ERROR_ATTACK_OPTION_INVALID = 'That will not do anything against the monster.'
     BEAST_MODE_ATTACK           = 100
-    ESCAPE_TEXT                 = '  ** POOF **'
+    ESCAPE_TEXT                 = '** POOF **'
 
     attr_accessor :world, :player, :monster, :player_is_defending
 
@@ -22,21 +20,15 @@ module Gemwarrior
     end
 
     def start(is_arena = nil, is_event = nil)
-      Music::cue([
-        { frequencies: 'G4',  duration: 50 },
-        { frequencies: 'G#4', duration: 50 },
-        { frequencies: 'G4',  duration: 50 },
-        { frequencies: 'G#4', duration: 50 },
-        { frequencies: 'G4',  duration: 50 },
-        { frequencies: 'G#4', duration: 50 }
-      ])
+      Audio.play_synth(:battle_start)
 
       # begin battle!
       print_battle_header unless is_arena
 
       if is_arena
         print '  Your opponent is now...'
-        Animation::run(phrase: "#{monster.name.upcase}!", speed: :slow)
+        Animation.run(phrase: "#{monster.name.upcase}", speed: :slow, oneline: true)
+        print "!\n"
       elsif is_event
         puts "  You are ambushed by #{monster.name}!".colorize(:yellow)
       else
@@ -55,6 +47,8 @@ module Gemwarrior
 
       # main battle loop
       loop do
+        skip_next_monster_attack = false
+
         if monster_dead?
           result = monster_death
           return result
@@ -64,12 +58,8 @@ module Gemwarrior
         end
 
         # check for near death
-        if player_near_death?
-          puts "  You are almost dead!\n".colorize(:yellow)
-        end
-        if monster_near_death?
-          puts "  #{monster.name} is almost dead!\n".colorize(:yellow)
-        end
+        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
 
@@ -92,51 +82,92 @@ module Gemwarrior
         self.player_is_defending = false
 
         # battle options prompt
-        puts '  What do you do?'
-        print '  ['.colorize(:yellow)
-        print 'F'.colorize(:green)
-        print 'ight/'.colorize(:yellow)
-        print 'A'.colorize(:green)
-        print 'ttack]['.colorize(:yellow)
-        print 'D'.colorize(:green)
-        print 'efend]['.colorize(:yellow)
-        print 'L'.colorize(:green)
-        print 'ook]['.colorize(:yellow)
-        print 'P'.colorize(:green)
-        print 'ass]['.colorize(:yellow)
-        print 'R'.colorize(:green)
-        print 'un]'.colorize(:yellow)
-        print "\n"
-        print '  [BATTLE]> '
+        print_battle_options
         player_action = STDIN.gets.chomp.downcase
 
         # player action
         case player_action
         when 'fight', 'f', 'attack', 'a'
-          puts "  You attack #{monster.name}#{player.cur_weapon_name}!"
-          dmg = calculate_damage_to(monster)
-          if dmg > 0
-            Music::cue([{ frequencies: 'A4,E4,B5', duration: 75 }])
-
-            take_damage(monster, dmg)
-            if monster_dead?
-              result = monster_death
-              return result
+          can_attack = true
+
+          # gun exception
+          if player.has_weapon_equipped?
+            if player.inventory.weapon.name.eql?('gun')
+              if player.inventory.contains_item?('bullet')
+                player.inventory.remove_item('bullet')
+              else
+                puts '  Your gun is out of bullets! Running is your best option now.'.colorize(:red)
+                can_attack = false
+              end
             end
-          else
-            Music::cue([{ frequencies: 'A4', duration: 75 }])
+          end
 
-            puts '  You miss entirely!'.colorize(:yellow)
+          if can_attack
+            puts "  You attack #{monster.name}#{player.cur_weapon_name}!"
+            dmg = calculate_damage_to(monster)
+            if dmg > 0
+              Audio.play_synth(:battle_player_attack)
+
+              take_damage(monster, dmg)
+              if monster_dead?
+                result = monster_death
+                return result
+              end
+            else
+              Audio.play_synth(:battle_player_miss)
+
+              puts '  You miss entirely!'.colorize(:yellow)
+            end
           end
         when 'defend', 'd'
           puts '  You dig in and defend this round.'
           self.player_is_defending = true
-        when 'pass', 'p'
-          puts '  You decide to pass your turn for some reason. Brave!'
+        when 'item', 'i'
+          if player.inventory.is_empty?
+            puts '  You have no items!'
+            next
+          elsif player.inventory.contains_battle_item?
+            puts '  Which item do you want to use?'
+            puts
+            b_items = player.inventory.list_battle_items
+            count = 0
+            b_items.each do |bi|
+              puts "  (#{count + 1}) #{bi.name}"
+              count += 1
+            end
+            puts '  (x) exit'
+
+            loop do
+              print_battle_prompt
+              answer = gets.chomp.downcase
+
+              case answer
+              when 'x', 'q'
+                skip_next_monster_attack = true
+                break
+              else
+                begin
+                  item = b_items[answer.to_i - 1]
+                  if item
+                    result = item.use(world)
+                    player.hp_cur += result[:data]
+                    player.inventory.remove_item(item.name) if item.consumable
+                    break
+                  end
+                rescue
+                  puts '  That is not a valid item choice.'
+                  puts
+                  next
+                end
+              end
+            end
+          else
+            puts '  You have no battle items!'
+          end
         when 'look', 'l'
           print "  #{monster.name}".colorize(:white)
           print " (#{monster.hp_cur}/#{monster.hp_max} HP): #{monster.description}\n"
-          puts "  It has some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
+          puts "  It has some distinguishing features, too: face is #{monster.face.colorize(:yellow)}, hands are #{monster.hands.colorize(:yellow)}, and mood, currently, is #{monster.mood.colorize(:yellow)}."
           if GameOptions.data['debug_mode']
             puts '  If defeated, will receive:'
             puts "  >> XP   : #{monster.xp}"
@@ -144,23 +175,25 @@ module Gemwarrior
             puts "  >> ITEMS: #{monster.inventory.list_contents}"
             next
           end
+        when 'pass', 'p'
+          puts '  You decide to pass your turn for some reason. Brave!'
         when 'run', 'r'
           if player_escape?(is_arena)
             monster.hp_cur = monster.hp_max
             puts "  You successfully elude #{monster.name}!".colorize(:green)
             print_escape_text
             print_battle_line
-            return 'escaped'
+            return
           else
             puts '  You were not able to run away! :-('.colorize(:yellow)
           end
         else
-          puts ERROR_ATTACK_OPTION_INVALID
+          puts "  #{ERROR_ATTACK_OPTION_INVALID}"
           next
         end
 
         # monster action
-        monster_attacks_player
+        monster_attacks_player unless skip_next_monster_attack
       end
     end
 
@@ -176,12 +209,12 @@ module Gemwarrior
           # base attack range
           base_atk_lo = player.atk_lo
           base_atk_hi = player.atk_hi
-          
+
           if player.has_weapon_equipped?
             base_atk_lo += player.inventory.weapon.atk_lo
             base_atk_hi += player.inventory.weapon.atk_hi
           end
-          
+
           atk_range = base_atk_lo..base_atk_hi
 
           # beast mode modifier
@@ -221,7 +254,7 @@ module Gemwarrior
       end
 
       print who_gets_wounded_start
-      Animation::run(phrase: dmg.to_s, speed: :slow, oneline: true, alpha: false, random: false)
+      Animation.run(phrase: dmg.to_s, speed: :slow, oneline: true, alpha: false, random: false)
       print who_gets_wounded_end
     end
 
@@ -245,11 +278,11 @@ module Gemwarrior
 
       dmg = calculate_damage_to(player)
       if dmg > 0
-        Music::cue([{ frequencies: 'B4,E#5,A5', duration: 75 }])
+        Audio.play_synth(:battle_monster_attack)
 
         take_damage(player, dmg)
       else
-        Music::cue([{ frequencies: 'B4', duration: 75 }])
+        Audio.play_synth(:battle_monster_miss)
 
         puts "  #{monster.name} misses entirely!".colorize(:yellow)
       end
@@ -264,39 +297,56 @@ module Gemwarrior
     end
 
     def monster_death
+      Audio.play_synth(:battle_win)
       puts "  YOU HAVE DEFEATED #{monster.name.upcase}!\n".colorize(:green)
 
       if monster.is_boss
+        # stats
         world.player.bosses_killed += 1
-        # end game boss!
-        if monster.name.eql?('Emerald')
+
+        if monster.name.eql?('emerald')
+          puts '  You just beat THE FINAL BOSS! Unbelievable!'
+          puts
+
+          reward_player(monster)
+
           # game ending: initiate
           return monster.initiate_ending(world)
-        else
-          puts '  You just beat a boss monster. Way to go!'
+        elsif monster.name.eql?('jaspern')
+          puts '  You just beat a MINIBOSS! Fantastic!'
           puts
-          puts '  You get the following spoils of war:'
-          puts "   XP : #{monster.xp}".colorize(:green)
-          puts "   ROX: #{monster.rox}".colorize(:green)
-          print_battle_line
-          player.update_stats(reason: :monster, value: monster)
+
+          reward_player(monster)
+
+          # river bridge boss: initiate
+          return monster.river_bridge_success(world)
+        else
+          reward_player(monster)
+
           world.location_by_coords(player.cur_coords).remove_monster(monster.name)
         end
       else
+        # stats
         world.player.monsters_killed += 1
-        
-        puts '  You get the following spoils of war:'
-        puts "   XP   : #{monster.xp}".colorize(:green)
-        puts "   ROX  : #{monster.rox}".colorize(:green)
-        unless monster.inventory.nil?
-          puts "   ITEMS: #{monster.inventory.list_contents}".colorize(:green) unless monster.inventory.items.empty?
-        end
-        print_battle_line
-        player.update_stats(reason: :monster, value: monster)
+
+        reward_player(monster)
+
         world.location_by_coords(player.cur_coords).remove_monster(monster.name)
       end
     end
 
+    def reward_player(monster)
+      puts '  You get the following spoils of war:'
+      puts "   XP   : #{monster.xp}".colorize(:green)
+      puts "   ROX  : #{monster.rox}".colorize(:green)
+      unless monster.inventory.nil?
+        puts "   ITEMS: #{monster.inventory.list_contents}".colorize(:green) unless monster.inventory.items.empty?
+      end
+      print_battle_line
+      world.player.update_stats(reason: :monster, value: monster)
+      puts
+    end
+
     # PLAYER
     def player_near_death?
       ((player.hp_cur.to_f / player.hp_max.to_f) < 0.10 && !GameOptions.data['god_mode'])
@@ -327,12 +377,13 @@ module Gemwarrior
           end
         end
       end
-      return false
+      false
     end
 
     # STATUS TEXT
     def print_escape_text
-      Animation::run(phrase: ESCAPE_TEXT, oneline: false)
+      print '  '
+      Animation.run(phrase: ESCAPE_TEXT, oneline: false)
     end
 
     def print_battle_line
@@ -340,6 +391,24 @@ module Gemwarrior
       print "\n"
     end
 
+    def print_battle_options
+      puts '  What do you do?'
+      print '  '
+      print "#{'['.colorize(:yellow)}"
+      print "#{'F'.colorize(:green)}#{'ight]['.colorize(:yellow)}"
+      print "#{'D'.colorize(:green)}#{'efend]['.colorize(:yellow)}"
+      print "#{'L'.colorize(:green)}#{'ook]['.colorize(:yellow)}"
+      print "#{'I'.colorize(:green)}#{'tem]['.colorize(:yellow)}"
+      print "#{'P'.colorize(:green)}#{'ass]['.colorize(:yellow)}"
+      print "#{'R'.colorize(:green)}#{'un]'.colorize(:yellow)}"
+      print "\n"
+      print_battle_prompt
+    end
+
+    def print_battle_prompt
+      print '  [BATTLE]> '
+    end
+
     def print_battle_header
       print_battle_line
       puts ' BATTLE BEGINS!'.ljust(GameOptions.data['wrap_width']).colorize(background: :red, color: :white)