gemwarrior 0.10.8 → 0.11.0

data/lib/gemwarrior/entities/{items → people}/thin_man.rb

@@ -1,34 +1,29 @@
-# lib/gemwarrior/entities/items/thin_man.rb
-# Item::ThinMan
+# lib/gemwarrior/entities/people/thin_man.rb
+# Entity::Creature::Person::ThinMan
 
-require_relative '../item'
+require_relative '../person'
 
 module Gemwarrior
-  class ThinMan < Item
+  class ThinMan < Person
     def initialize
       super
 
       self.name         = 'thin_man'
+      self.name_display = 'Thin Man'
       self.description  = 'An almost shockingly gaunt man is sitting on the ground, resting against a wall. He wears a patchwork quilt of a hat, and his slender frame is covered by a simple brown tunic. His feet point comically toward the sky in brown boots while his head dips down slightly, eyes watching something in the distance you can\'t see.'
-      self.atk_lo       = nil
-      self.atk_hi       = nil
-      self.takeable     = false
-      self.useable      = true
-      self.equippable   = false
-      self.talkable     = true
     end
 
-    def use(player = nil)
+    def use(world)
       if self.used
         puts 'The thin man barely moves his head as he puts up a single grim hand, motioning you to back off.'
       else
         puts 'The thin man lifts his head up slightly, meets your gaze, and responds to your greeting:'
-        puts '>> "I may be incredibly spare right now, but I was once a strapping young person, such as yourself. Just in case you ever fall during your journey, be sure to approach unlikely sources, as you may find those who will help you."'
-        puts '>> "Now, please, allow me my peace."'
+        speak('I may be incredibly spare right now, but I was once a strapping young person, such as yourself. Just in case you ever fall during your journey, be sure to approach unlikely sources, as you may find those who will help you.')
+        speak('Now, please, allow me my peace.')
 
         self.used = true
       end
-      
+
       { type: nil, data: nil }
     end
   end

data/lib/gemwarrior/entities/people/ware_hawker.rb

@@ -0,0 +1,153 @@
+# lib/gemwarrior/entities/people/ware_hawker.rb
+# Entity::Creature::Person::WareHawker
+
+require_relative '../person'
+require_relative '../weapons/mace'
+require_relative '../weapons/spear'
+require_relative '../armor/iron_helmet'
+
+module Gemwarrior
+  class WareHawker < Person
+    # CONSTANTS
+    PRICE_IRON_HELMET       = 100
+    PRICE_MACE              = 200
+    PRICE_SPEAR             = 250
+    PLAYER_ROX_INSUFFICIENT = 'You have insufficient rox to purchase that. Quit testing me, human.'
+    PLAYER_ITEMS_ADDITIONAL = 'Will there be something else?'
+    PLAYER_COMMAND_INVALID  = 'That means nothing to me.'
+
+    def initialize
+      super
+
+      self.name         = 'ware_hawker'
+      self.name_display = 'Ware Hawker'
+      self.description  = 'A literal anthropomorphic hawk has set up shop behind a crudely-made table. Some wares are scattered atop its surface, seemingly within anyone\'s grasp, but the hawk\'s piercing eyes seem to belie this observation.'
+    end
+
+    def use(world)
+      if !self.used
+        puts 'You greet the hawk, mentioning that you are interested in the objects presented.'
+        STDIN.getc
+        puts 'The hawk speaks in a beautiful, yet commanding, tone:'
+      end
+
+      hawk_shop(world)
+    end
+
+    private
+
+    def hawk_shop(world)
+      player_rox_remaining = world.player.rox
+      amount_spent = 0
+      items_purchased = []
+
+      iron_helmet = IronHelmet.new
+      mace = Mace.new
+      spear = Spear.new
+
+      speak('I hope you have rox, human. My time affords business transactions, not idle chit chat. What do you want?')
+      STDIN.getc
+
+      puts 'A feathered arm quickly moves across the table in an arc suggesting to you that a choice is to be made. Each object has a price tag underneath it, painstakingly written in ink.'
+      puts
+
+      puts 'Hawk Shop'.colorize(:cyan)
+      puts '---------'
+      puts "(1) #{'Iron Helmet'.colorize(:yellow)} - #{PRICE_IRON_HELMET} rox"
+      puts "    #{iron_helmet.description}"
+      puts "    Defense: +#{iron_helmet.defense} (current: #{world.player.defense})"
+      puts "(2) #{'Mace'.colorize(:yellow)}        - #{PRICE_MACE} rox"
+      puts "    #{mace.description}"
+      puts "    Attack: +#{mace.atk_lo}-#{mace.atk_hi} (current: #{world.player.atk_lo}-#{world.player.atk_hi})"
+      puts "(3) #{'Spear'.colorize(:yellow)}       - #{PRICE_SPEAR} rox"
+      puts "    #{spear.description}"
+      puts "    Attack: +#{spear.atk_lo}-#{spear.atk_hi} (current: #{world.player.atk_lo}-#{world.player.atk_hi})"
+      puts
+      speak('Choose. Now.')
+
+      loop do
+        puts  " 1 - Iron Helmet (#{PRICE_IRON_HELMET})"
+        puts  " 2 - Mace        (#{PRICE_MACE})"
+        puts  " 3 - Spear       (#{PRICE_SPEAR})"
+        print ' x - leave'
+        if items_purchased.length > 0
+          print ", and buy items\n"
+        else
+          print "\n"
+        end
+        puts
+        print 'REMAINING GOLD: '
+        Animation.run(phrase: player_rox_remaining.to_s, oneline: true)
+        print "\n"
+        display_shopping_cart(items_purchased)
+        print '[HAWK]> '
+
+        choice = gets.chomp.downcase
+
+        case choice
+        when '1'
+          if player_rox_remaining >= PRICE_IRON_HELMET
+            player_rox_remaining -= PRICE_IRON_HELMET
+            items_purchased.push(IronHelmet.new)
+            amount_spent += PRICE_IRON_HELMET
+
+            speak('The iron helmet? I see.')
+            speak(PLAYER_ITEMS_ADDITIONAL)
+            next
+          else
+            speak(PLAYER_ROX_INSUFFICIENT)
+            next
+          end
+        when '2'
+          if player_rox_remaining >= PRICE_MACE
+            player_rox_remaining -= PRICE_MACE
+            items_purchased.push(Mace.new)
+            amount_spent += PRICE_MACE
+
+            speak('Yes, fine. Buy a mace.')
+            speak(PLAYER_ITEMS_ADDITIONAL)
+            next
+          else
+            speak(PLAYER_ROX_INSUFFICIENT)
+            next
+          end
+        when '3'
+          if player_rox_remaining >= PRICE_SPEAR
+            player_rox_remaining -= PRICE_SPEAR
+            items_purchased.push(Spear.new)
+            amount_spent += PRICE_SPEAR
+
+            speak('Hmm. Very well, then. If the spear is what you wish.')
+            speak(PLAYER_ITEMS_ADDITIONAL)
+            next
+          else
+            speak(PLAYER_ROX_INSUFFICIENT)
+            next
+          end
+        when 'x'
+          if items_purchased.length > 0
+            display_shopping_cart(items_purchased)
+            speak('Are you certain you wish to buy these things? (y/n)')
+            print '[HAWK]> '
+            answer = gets.chomp.downcase
+
+            return_type = nil
+            case answer
+            when 'y', 'yes'
+              world.player.rox -= amount_spent
+              speak('Take them.')
+              return_type = { type: 'purchase', data: items_purchased }
+            else
+              return_type = { type: nil, data: nil }
+            end
+          end
+          speak('Our business is complete then.')
+          return return_type
+        else
+          speak(PLAYER_COMMAND_INVALID)
+          next
+        end
+      end
+    end
+  end
+end

data/lib/gemwarrior/entities/person.rb

@@ -0,0 +1,20 @@
+# lib/gemwarrior/entities/person.rb
+# Entity::Creature::Person base class
+
+require_relative 'creature'
+
+module Gemwarrior
+  class Person < Creature
+    def initialize
+      super
+      
+      self.name         = 'person.'
+      self.name_display = Formatting::upstyle(name)
+      self.description  = 'It appears to be a person of some kind.'
+    end
+  
+    def use(world)
+      'That person does not seem to want to talk to you right now.'
+    end
+  end
+end

data/lib/gemwarrior/entities/player.rb

@@ -3,6 +3,7 @@
 
 require_relative 'creature'
 require_relative '../battle'
+require_relative '../game_assets'
 require_relative '../game_options'
 require_relative '../misc/formatting'
 require_relative '../misc/name_generator'
@@ -15,13 +16,20 @@ module Gemwarrior
     LEVEL_UP_TEXT       = '** LEVEL UP! **'
     REST_FULL_TEXT      = '** HMMMM **'
     REST_NOT_FULL_TEXT  = '** ZZZZZ **'
-  
+
     include PlayerLevels
     include Formatting
 
-    attr_accessor :stam_cur, :stam_max, :cur_coords, :special_abilities,
-                  :monsters_killed, :bosses_killed, :items_taken, :movements_made,    
-                  :rests_taken, :deaths
+    attr_accessor :stam_cur,
+                  :stam_max,
+                  :cur_coords,
+                  :special_abilities,
+                  :monsters_killed,
+                  :bosses_killed,
+                  :items_taken,
+                  :movements_made,
+                  :rests_taken,
+                  :deaths
 
     def generate_name
       NameGenerator.new('fantasy').generate_name
@@ -44,22 +52,35 @@ module Gemwarrior
         print_char_pic
       end
 
-      weapon_slot = ''
-      atk_lo = self.atk_lo
-      atk_hi = self.atk_hi
+      weapon_slot   = '(unarmed)'
+      armor_slot    = '(unarmored)'
+      base_atk_lo   = self.atk_lo
+      base_atk_hi   = self.atk_hi
+      base_defense  = self.defense
+      net_atk_lo    = nil
+      net_atk_hi    = nil
+      net_defense   = nil
+
+      # juice the weapon display
       if has_weapon_equipped?
         weapon_slot = inventory.weapon.name
-        atk_lo += inventory.weapon.atk_lo
-        atk_hi += inventory.weapon.atk_hi
-      else
-        weapon_slot = '(unarmed)'
+        net_atk_lo = base_atk_lo + inventory.weapon.atk_lo
+        net_atk_hi = base_atk_hi + inventory.weapon.atk_hi
       end
-      
+
+      # juice the armor display
+      if has_armor_equipped?
+        armor_slot = inventory.armor.name
+        net_defense = base_defense + inventory.armor.defense
+      end
+
       abilities = ''
       if special_abilities.empty?
         abilities = 'none...yet(?)'
       else
-        abilities = Formatting::upstyle(special_abilities.collect { |x| x.to_s }).join(', ')
+        special_abilities.each do |sp|
+          abilities << "  #{Formatting.upstyle(sp.to_s).ljust(15).colorize(:yellow)}: #{PlayerLevels.get_ability_description(sp)}\n"
+        end
       end
 
       self_text =  "NAME      : #{self.name}\n"
@@ -67,15 +88,27 @@ module Gemwarrior
       self_text << "EXPERIENCE: #{self.xp}\n"
       self_text << "HIT POINTS: #{self.hp_cur}/#{self.hp_max}\n"
       self_text << "WEAPON    : #{weapon_slot}\n"
-      self_text << "ATTACK    : #{atk_lo}-#{atk_hi}\n"
+      self_text << "ARMOR     : #{armor_slot}\n"
+      self_text << "ATTACK    : #{base_atk_lo}-#{base_atk_hi}"
+      self_text << " (#{net_atk_lo}-#{net_atk_hi} w/ #{weapon_slot})".colorize(:yellow) unless net_atk_lo.nil?
+      self_text << "\n"
+      self_text << "DEFENSE   : #{base_defense}"
+      self_text << " (#{net_defense} w/ #{armor_slot})".colorize(:yellow) unless net_defense.nil?
+      self_text << "\n"
       self_text << "DEXTERITY : #{self.dexterity}\n"
-      self_text << "DEFENSE   : #{self.defense}\n"
-      self_text << "ABILITIES : #{abilities}\n"
+      self_text << "ABILITIES :\n"
+      self_text << "#{abilities}"
       
       if GameOptions.data['debug_mode']
-        self_text << "  POSITION  : #{self.cur_coords.values.to_a}\n"
-        self_text << "  GOD_MODE  : #{GameOptions.data['god_mode']}\n"
-        self_text << "  BEAST_MODE: #{GameOptions.data['beast_mode']}\n"
+        self_text << ">> POSITION       : #{self.cur_coords.values.to_a}\n"
+        self_text << ">> GOD_MODE       : #{GameOptions.data['god_mode']}\n"
+        self_text << ">> BEAST_MODE     : #{GameOptions.data['beast_mode']}\n"
+        self_text << ">> MONSTERS_KILLED: #{self.monsters_killed}\n"
+        self_text << ">> BOSSES_KILLED  : #{self.bosses_killed}\n"
+        self_text << ">> ITEMS_TAKEN    : #{self.items_taken}\n"
+        self_text << ">> MOVEMENTS_MADE : #{self.movements_made}\n"
+        self_text << ">> RESTS_TAKEN    : #{self.rests_taken}\n"
+        self_text << ">> DEATHS         : #{self.deaths}\n"
       end
 
       self_text << "\n"
@@ -84,14 +117,14 @@ module Gemwarrior
 
       self_text << "\n\n"
 
-      self_text << "[Current Status]\nBreathing, non-naked, with a #{self.face.colorize(:yellow)} face, #{self.hands.colorize(:yellow)} hands, and\nfeeling, generally, #{self.mood.colorize(:yellow)}."
+      self_text << "[Current Status]\nBreathing, non-naked, with a #{self.face.colorize(:yellow)} face, #{self.hands.colorize(:yellow)} hands, and feeling, generally, #{self.mood.colorize(:yellow)}."
       
       self_text << "\n"
     end
 
     def rest(world, tent_uses = 0, ensure_fight = false)
       if ensure_fight
-        battle = Battle.new(world: world, player: self, monster: world.monsters[rand(0..world.monsters.length-1)].clone)
+        battle = Battle.new(world: world, player: self, monster: GameMonsters.data[rand(0..GameMonsters.data.length-1)].clone)
         result = battle.start(is_arena = false, is_event = true)
         if result.eql?('death')
           return 'death'
@@ -105,8 +138,6 @@ module Gemwarrior
       if cur_loc.should_spawn_monster?
         chance_of_ambush = rand(0..100)
 
-        puts "chance_of_ambush: #{chance_of_ambush}" if GameOptions.data['debug_mode']
-
         if chance_of_ambush < 25
           battle = Battle.new(world: world, player: self, monster: cur_loc.monsters_abounding[rand(0..cur_loc.monsters_abounding.length-1)].clone)
           return battle.start(is_arena = false, is_event = true)
@@ -126,27 +157,28 @@ module Gemwarrior
 
       if tent_uses > 0
         if self.at_full_hp?
+          Animation.run(phrase: REST_FULL_TEXT)
           return 'Despite feeling just fine, health-wise, you decide to set up camp for the ni--well, actually, after a few minutes you realize you don\'t need to sleep and pack things up again, ready to go.'
         else
-          Animation::run(phrase: REST_NOT_FULL_TEXT)
+          Animation.run(phrase: REST_NOT_FULL_TEXT)
           self.hp_cur = self.hp_max
 
-          status_text = "You brandish the trusty magical canvas and, with a flick of the wrist, your home for the evening is set up. Approximately #{hours} #{hours_text}, #{minutes} #{mins_text}, and #{seconds} #{secs_text} later, you wake up, fully rested, ready for adventure."
-          status_text << "\n>> You regain all of your hit points."
+          status_text = "You brandish the trusty magical canvas and, with a flick of the wrist, your home for the evening is set up. Approximately #{hours} #{hours_text}, #{minutes} #{mins_text}, and #{seconds} #{secs_text} later, you wake up, fully rested, ready for adventure.\n"
+          status_text << ">> You regain all of your hit points.".colorize(:green)
 
           return status_text
         end
       else
         if self.at_full_hp?
-          Animation::run(phrase: REST_FULL_TEXT)
+          Animation.run(phrase: REST_FULL_TEXT)
           return 'You sit down on the ground, make some notes on the back of your hand, test the air, and then return to standing, back at it all again.'
         else
-          Animation::run(phrase: REST_NOT_FULL_TEXT)
-          self.hp_cur = self.hp_cur.to_i + rand(10..15)
+          Animation.run(phrase: REST_NOT_FULL_TEXT)
+          self.hp_cur = self.hp_cur.to_i + rand(3..5)
           self.hp_cur = self.hp_max if self.hp_cur > self.hp_max
 
-          status_text = "You lie down somewhere quasi-flat and after a few moments, due to extreme exhaustion, you fall into a deep, yet troubled, slumber. Approximately #{hours} #{hours_text}, #{minutes} #{mins_text}, and #{seconds} #{secs_text} later, you wake up with a start. Upon getting to your feet you look around, notice you feel somewhat better, and wonder why you dreamt about #{WordList.new('noun-plural').get_random_value}."
-          status_text << "\n>> You regain a few hit points."
+          status_text = "You lie down somewhere quasi-flat and after a few moments, due to extreme exhaustion, you fall into a deep, yet troubled, slumber. Approximately #{hours} #{hours_text}, #{minutes} #{mins_text}, and #{seconds} #{secs_text} later, you wake up with a start. Upon getting to your feet you look around, notice you feel somewhat better, and wonder why you dreamt about #{WordList.new('noun-plural').get_random_value}.\n"
+          status_text << ">> You regain a few hit points.".colorize(:green)
 
           return status_text
         end
@@ -233,6 +265,10 @@ module Gemwarrior
       self.inventory.weapon
     end
 
+    def has_armor_equipped?
+      self.inventory.armor
+    end
+
     def cur_weapon_name
       if has_weapon_equipped?
         return " with your #{inventory.weapon.name}"
@@ -278,30 +314,40 @@ module Gemwarrior
 
       new_player_level = PlayerLevels::check_level(self.xp)
 
-      if new_player_level > old_player_level
-        Animation::run(phrase: LEVEL_UP_TEXT)
-        new_stats = PlayerLevels::get_level_stats(new_player_level)
-
-        self.level = new_stats[:level]
-        puts "You are now level #{self.level}!"
-        self.hp_cur = new_stats[:hp_max]
-        self.hp_max = new_stats[:hp_max]
-        puts "You now have #{self.hp_max} hit points!"
-        self.stam_cur = new_stats[:stam_max]
-        self.stam_max = new_stats[:stam_max]
-        puts "You now have #{self.stam_max} stamina points!"
-        self.atk_lo = new_stats[:atk_lo]
-        self.atk_hi = new_stats[:atk_hi]
-        puts "You now have an attack of #{self.atk_lo}-#{self.atk_hi}!"
-        self.defense = new_stats[:defense]
-        puts "You now have #{self.defense} defensive points!"
-        self.dexterity = new_stats[:dexterity]
-        puts "You now have #{self.dexterity} dexterity points!"
-        unless new_stats[:special_abilities].nil?
-          unless self.special_abilities.include?(new_stats[:special_abilities])
-            self.special_abilities.push(new_stats[:special_abilities])
-            puts "You learned a new ability: #{Formatting::upstyle(new_stats[:special_abilities])}!"
+      # how many levels did we go up, if any?
+      level_climb = new_player_level - old_player_level
+
+      if level_climb >= 1
+        level_to_get = old_player_level
+
+        level_climb.times do
+          level_to_get += 1
+          Audio.play_synth(:player_level_up)
+          Animation.run(phrase: LEVEL_UP_TEXT)
+          new_stats = PlayerLevels::get_level_stats(level_to_get)
+
+          self.level = new_stats[:level]
+          puts "You are now level #{self.level.to_s.colorize(:white)}!"
+          self.hp_cur = new_stats[:hp_max]
+          self.hp_max = new_stats[:hp_max]
+          puts "You now have #{self.hp_max.to_s.colorize(:white)} hit points!"
+          self.stam_cur = new_stats[:stam_max]
+          self.stam_max = new_stats[:stam_max]
+          puts "You now have #{self.stam_max.to_s.colorize(:white)} stamina points!"
+          self.atk_lo = new_stats[:atk_lo]
+          self.atk_hi = new_stats[:atk_hi]
+          puts "You now have an attack of #{self.atk_lo.to_s.colorize(:white)}-#{self.atk_hi.to_s.colorize(:white)}!"
+          self.defense = new_stats[:defense]
+          puts "You now have #{self.defense.to_s.colorize(:white)} defensive points!"
+          self.dexterity = new_stats[:dexterity]
+          puts "You now have #{self.dexterity.to_s.colorize(:white)} dexterity points!"
+          unless new_stats[:special_abilities].nil?
+            unless self.special_abilities.include?(new_stats[:special_abilities])
+              self.special_abilities.push(new_stats[:special_abilities])
+              puts "You learned a new ability: #{Formatting::upstyle(new_stats[:special_abilities]).colorize(:white)}!"
+            end
           end
+          STDIN.getc
         end
       end
     end
@@ -319,12 +365,8 @@ module Gemwarrior
     end
 
     def print_traveling_text(direction_text)
-      Music::cue([
-        { frequencies: 'C4', duration: 75 },
-        { frequencies: 'D4', duration: 75 },
-        { frequencies: 'E4', duration: 75 }
-      ])
-      Animation::run(phrase: "* #{direction_text} *", oneline: false)
+      Audio.play_synth(:player_travel)
+      Animation.run(phrase: "* #{direction_text} *", oneline: false)
     end
 
     def print_char_pic