gemwarrior 0.10.7 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c311f05d4c6938a47b6d445678c5d097c569b3c3
-  data.tar.gz: 46052a56af92e3ad73e0e964756d75dcafad5ad8
+  metadata.gz: d718994a9f914e593cfd757f77a1794583c2a805
+  data.tar.gz: 710b04151af8c0fe27d7fe38c8c3881202a154a0
 SHA512:
-  metadata.gz: 5dffa3a34da0a0ad1b871169b8d89b9a35070db0d70625f1221eaa0b3ef31334e9609a6e500b1a8590342c0d10250b20314f3c324200383a7322af8840435c90
-  data.tar.gz: 9723c86b4a47b72c76a2517451ffee3ba2fd88effc09e452547eb06546976009d390d1e21903c53d79f6b0da8826d58c5aec53b0cf62b4afe547433ec38e1b36
+  metadata.gz: 70792929d8361fa56fdebe0b037866e2009c3313b9a84c879306fa77bdb55f1e033332658761917fe65bfb61450da2ed36525763e605c5f896181471595d7667
+  data.tar.gz: a40fc1a74bf7791469b59b79c3dcec586299067dfdb981e51369da85b980b837582a522e12a2f3942d1f7ebccfae420e1740fd9abb825501d5f4434d6988cb25

data/bin/gemwarrior

@@ -81,8 +81,8 @@ def parse_options_cli
       options[:use_wordnik] = true
     end
 
-    opts.on('-x', '--extra COMMAND', 'Run a command immediately upon beginning the game') do |xc|
-      options[:extra_command] = xc.to_s
+    opts.on('-x', '--extra COMMAND,PARAM1,PARAM2,PARAM3', String, 'Run a command, with optional params, immediately upon beginning the game') do |xc|
+      options[:extra_command] = xc.gsub(',',' ')
     end
   end
 

data/data/default_world.yaml

@@ -232,7 +232,7 @@ monsters:
       consumable: false
       used: false
       number_of_uses: 
-      name: Sparkly Thing(tm)
+      name: sparkly_thing
       description: The sparkling that this thing does is unimaginably brilliant.
       atk_lo: 
       atk_hi: 
@@ -249,6 +249,7 @@ monsters:
     Warrior\e[0m!\nYou decide to ignore \e[0;31;49mQueen Ruby\e[0m and take your spoils
     back home\nwhere you live out the rest of your days staring at it, wondering\nwhat
     it was all about.\n\nThank you for playing. Goodbye.\n<^><^><^><^><^><^><^><^><^><^>\n"
+  is_dead: false
 - !ruby/object:Gemwarrior::Garynetty
   name: Garynetty
   description: Conservative, yet odd, the Garynetty is not messing around.
@@ -2240,7 +2241,8 @@ locations:
     number_of_uses: 
     name: throne
     description: Made of what appears to be unfulfilled desires and latent, flawed
-      happiness, the well-crafted seat still looks kinda comfy.
+      happiness, the well-crafted seat still looks kinda comfy. The wizard Emerald
+      sits in it, glaring at you.
     atk_lo: 
     atk_hi: 
     takeable: false
@@ -2250,8 +2252,9 @@ locations:
   bosses_abounding:
   - !ruby/object:Gemwarrior::Emerald
     name: Emerald
-    description: A wily, beefy, tower of a man, champion of both wisdom and strength,
-      sporting a constant glint in his eyes.
+    description: A wily, beefy, tower of a man, Emerald looks to be a champion of
+      both wisdom, from what you've heard, AND strength, from what you plainly see.
+      He sports a permanent scowl as he faces you, dead-on.
     face: gleaming
     hands: tantalizing
     mood: enraged
@@ -2269,7 +2272,7 @@ locations:
         consumable: false
         used: false
         number_of_uses: 
-        name: Sparkly Thing(tm)
+        name: sparkly_thing
         description: The sparkling that this thing does is unimaginably brilliant.
         atk_lo: 
         atk_hi: 
@@ -2279,13 +2282,10 @@ locations:
       weapon: 
     rox: 35
     xp: 22
-    battlecry: 'Ha ha ha ha ha! Prepare yourself: today your whole life crumbles!'
+    battlecry: 'You have come for the SparklyThing(tm), I see. To that I say: Ha ha
+      ha ha ha! Prepare yourself fool: today your whole life crumbles!'
     is_boss: true
-    defeated_text: "<^><^><^><^><^><^><^><^><^><^>\nYou beat Emerald! You win!\nYou
-      receive the \e[0;35;49mSparklyThing(tm)\e[0m and become the true \e[0;33;49mGem
-      Warrior\e[0m!\nYou decide to ignore \e[0;31;49mQueen Ruby\e[0m and take your
-      spoils back home\nwhere you live out the rest of your days staring at it, wondering\nwhat
-      it was all about.\n\nThank you for playing. Goodbye.\n<^><^><^><^><^><^><^><^><^><^>\n"
+    is_dead: false
   checked_for_monsters: false
 - !ruby/object:Gemwarrior::Location
   name: Sky Tower (Lounge)
@@ -2391,6 +2391,37 @@ locations:
   monsters_abounding: []
   bosses_abounding: []
   checked_for_monsters: false
+- !ruby/object:Gemwarrior::Location
+  name: Queen Room
+  description: Your surroundings contain four walls with no windows, a vaulted ceiling above, and a tile floor below, all immaculately decorated. A small throne lies before you with a woman sitting on it. You must be in the presence of Queen Ruby herself.
+  coords:
+    :x: 5
+    :y: 5
+    :z: 2
+  locs_connected:
+    :north: false
+    :east: false
+    :south: false
+    :west: false
+  danger_level: :none
+  monster_level_range: 
+  items:
+  - !ruby/object:Gemwarrior::QueenRuby
+    equipped: false
+    consumable: false
+    used: false
+    number_of_uses: 
+    name: queen_ruby
+    description: Queen Ruby glimmers like she was made from the substance of her name. She wears a wan smile, and her hands are delicately intertwined as she sits patiently.
+    atk_lo: 
+    atk_hi: 
+    takeable: false
+    useable: true
+    equippable: false
+    talkable: true
+  monsters_abounding: []
+  bosses_abounding: []
+  checked_for_monsters: false
 player: !ruby/object:Gemwarrior::Player
   name: Player
   description: |-
@@ -2416,8 +2447,10 @@ player: !ruby/object:Gemwarrior::Player
   cur_coords: *2
   special_abilities: []
   monsters_killed: 0
+  bosses_killed: 0
   items_taken: 0
   movements_made: 0
   rests_taken: 0
   deaths: 0
+emerald_beaten: false
 duration:

data/gemwarrior.gemspec

@@ -23,8 +23,8 @@ 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.8'
-  spec.add_runtime_dependency 'clocker', '~> 0.1.2'
+  spec.add_runtime_dependency 'matrext', '~> 0.4.9'
+  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'
   spec.add_runtime_dependency 'gems', '~> 0.8.3'

data/lib/gemwarrior/battle.rb

@@ -3,6 +3,7 @@
 
 require_relative 'misc/player_levels'
 require_relative 'game_options'
+require_relative 'entities/items/sparkly_thing'
 
 module Gemwarrior
   class Battle
@@ -212,7 +213,7 @@ module Gemwarrior
       who_gets_wounded_start = ''
 
       if entity.eql?(monster)
-        who_gets_wounded_start = "  > You wound #{monster.name} for "
+        who_gets_wounded_start = "  > You wound #{monster.name} for ".colorize(:green)
         who_gets_wounded_end   = " point(s)!\n".colorize(:green)
       else
         who_gets_wounded_start = '  > You are wounded for '.colorize(:red)
@@ -265,35 +266,16 @@ module Gemwarrior
     def monster_death
       puts "  YOU HAVE DEFEATED #{monster.name.upcase}!\n".colorize(:green)
 
-      # stats
-      world.player.monsters_killed += 1
-
       if monster.is_boss
+        world.player.bosses_killed += 1
         # end game boss!
         if monster.name.eql?('Emerald')
-          Music::cue([
-            { frequencies: 'G3',  duration: 250 },
-            { frequencies: 'A3',  duration: 50 },
-            { frequencies: 'B3',  duration: 50 },
-            { frequencies: 'C4',  duration: 50 },
-            { frequencies: 'D4',  duration: 250 },
-            { frequencies: 'E4',  duration: 50 },
-            { frequencies: 'F#4', duration: 50 },
-            { frequencies: 'G4',  duration: 50 },
-            { frequencies: 'A4',  duration: 250 },
-            { frequencies: 'B4',  duration: 50 },
-            { frequencies: 'C5',  duration: 50 },
-            { frequencies: 'D5',  duration: 50 },
-            { frequencies: 'E5',  duration: 50 },
-            { frequencies: 'F#5', duration: 50 },
-            { frequencies: 'G5',  duration: 1000 }
-          ])
-
-          puts monster.defeated_text
-          gets
-          return 'exit'
+          # game ending: initiate
+          return monster.initiate_ending(world)
         else
           puts '  You just beat a boss monster. Way to go!'
+          puts
+          puts '  You get the following spoils of war:'
           puts "   XP : #{monster.xp}".colorize(:green)
           puts "   ROX: #{monster.rox}".colorize(:green)
           print_battle_line
@@ -301,6 +283,8 @@ module Gemwarrior
           world.location_by_coords(player.cur_coords).remove_monster(monster.name)
         end
       else
+        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)

data/lib/gemwarrior/entities/item.rb

@@ -23,15 +23,14 @@ module Gemwarrior
     def describe
       status_text =  name.upcase.colorize(:green)
       status_text << "\n#{description} \n".colorize(:white)
-      status_text << "ATTACK: #{atk_lo}-#{atk_hi} \n".colorize(:white) unless atk_lo.nil?
-      status_text << "TAKEABLE? #{takeable}\n".colorize(:white)
-      status_text << "USEABLE? #{useable}\n".colorize(:white)
-      status_text << "USED? #{used}\n".colorize(:white)
-      status_text << "EQUIPPABLE? #{equippable}\n".colorize(:white)
-      status_text << "CONSUMABLE? #{consumable}\n".colorize(:white)
+      status_text << "ATTACK:         #{atk_lo}-#{atk_hi} \n".colorize(:white) unless atk_lo.nil?
+      status_text << "TAKEABLE?       #{takeable}\n".colorize(:white)
+      status_text << "USEABLE?        #{useable}\n".colorize(:white)
+      status_text << "USED?           #{used}\n".colorize(:white)
+      status_text << "EQUIPPABLE?     #{equippable}\n".colorize(:white)
+      status_text << "CONSUMABLE?     #{consumable}\n".colorize(:white)
       status_text << "NUMBER OF USES? #{number_of_uses}\n".colorize(:white) unless number_of_uses.nil?
-      status_text << "TALKABLE? #{talkable}\n".colorize(:white)
-      status_text << "\n"
+      status_text << "TALKABLE?       #{talkable}\n".colorize(:white)
     end
   end
 end

data/lib/gemwarrior/entities/items/queen_ruby.rb

@@ -0,0 +1,62 @@
+# lib/gemwarrior/entities/items/queen_ruby.rb
+# Item::QueenRuby
+
+require_relative '../item'
+require_relative '../../misc/animation'
+
+module Gemwarrior
+  class QueenRuby < Item
+    # CONSTANTS
+    MOVE_TEXT = '*** WHOOOOOOSH ***'
+    
+    def initialize
+      super
+
+      self.name         = 'queen_ruby'
+      self.description  = 'Queen Ruby glimmers like she was made from the substance of her name. She wears a wan smile, and her hands are delicately intertwined as she sits patiently.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = false
+      self.talkable     = true
+    end
+
+    def use(player = nil)
+      puts '>> "Thank you for bringing back the ShinyThing(tm)! The land of Jool is saved!"'
+      STDIN.getch
+      puts ">> \"Please, #{player.name}, hand the ShinyThing(tm) to me, before all is lost!\""
+      puts
+      print 'Hand over the ShinyThing(tm)? (y/n) '
+      answer = gets.chomp.downcase
+      
+      case answer
+      when 'y', 'yes'
+        player.inventory.remove_item('sparkly_thing')
+        print '>> "Oh, thank you! Now that the evil Emerald is defeated, and I, Queen Ruby, have the ShinyThing(tm) again, peace can come to the land of Jool. Your reward is...'
+        STDIN.getch
+        Animation::run(phrase: '...', oneline: true)
+        STDIN.getch
+        Animation::run(phrase: '...', oneline: true)
+        STDIN.getch
+        Animation::run(phrase: '...my thanks!"', oneline: true)
+        STDIN.getch
+        puts
+        puts '>> "Now, be a dear and run on home."'
+        puts
+        STDIN.getch
+        puts 'And with that, she waves her arm in a tired, yet mystical, manner. Your mind and sight go blank, and you "poof" out of existence.'
+        puts
+        
+        Animation::run(phrase: MOVE_TEXT)
+        { type: 'move', data: 'Home' }
+      when 'n', 'no'
+        puts '>> "No? No??? Well, you are not leaving this room until you do, so think long and hard about that."'
+        { type: nil, data: nil }
+      else
+        puts '>> "Take your time and let me know when you are going to give me the ShinyThing(tm), all right?"'
+        { type: nil, data: nil }
+      end
+    end
+  end
+end

data/lib/gemwarrior/entities/items/{sparklything.rb → sparkly_thing.rb}

@@ -8,7 +8,7 @@ module Gemwarrior
     def initialize
       super
 
-      self.name         = 'Sparkly Thing(tm)'
+      self.name         = 'sparkly_thing'
       self.description  = 'The sparkling that this thing does is unimaginably brilliant.'
       self.atk_lo       = nil
       self.atk_hi       = nil

data/lib/gemwarrior/entities/items/throne.rb

@@ -9,7 +9,7 @@ module Gemwarrior
       super
 
       self.name         = 'throne'
-      self.description  = 'Made of what appears to be unfulfilled desires and latent, flawed happiness, the well-crafted seat still looks kinda comfy.'
+      self.description  = 'Made of what appears to be unfulfilled desires and latent, flawed happiness, the well-crafted seat still looks kinda comfy. The wizard Emerald sits in it, glaring at you.'
       self.atk_lo       = nil
       self.atk_hi       = nil
       self.takeable     = false

data/lib/gemwarrior/entities/monster.rb

@@ -8,7 +8,7 @@ module Gemwarrior
   class Monster < Creature
     INVENTORY_ITEMS_DEFAULT = [Herb.new]
 
-    attr_accessor :inventory, :battlecry, :is_boss
+    attr_accessor :inventory, :battlecry, :is_boss, :is_dead
 
     def initialize
       if [true, false].sample
@@ -19,25 +19,24 @@ module Gemwarrior
     end
 
     def describe
-      status_text =  name.upcase.ljust(13).colorize(:green)
-      status_text << "#{description}\n".colorize(:white)
-      if is_boss
-        status_text << '(BOSS)'.ljust(13).colorize(:yellow)
-      else
-        status_text << ''.ljust(13)
-      end
-      status_text << "LEVEL: #{level.to_s.rjust(2)}, ".colorize(:white)
-      status_text << "HP: #{hp_cur.to_s.rjust(3)}/#{hp_max.to_s.rjust(3)} ".colorize(:white)
-      status_text << "ATK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)} ".colorize(:white)
-      status_text << "DEF: #{defense.to_s.rjust(2)} ".colorize(:white)
-      status_text << "DEX: #{dexterity.to_s.rjust(2)} ".colorize(:white)
-      status_text << "ROX: #{rox.to_s.rjust(3)} ".colorize(:white)
-      status_text << "XP: #{xp.to_s.rjust(3)} ".colorize(:white)
-      status_text << "\n".ljust(14)
-      status_text << "FACE: #{face} ".colorize(:white)
-      status_text << "HANDS: #{hands} ".colorize(:white)
-      status_text << "MOOD: #{mood} ".colorize(:white)
-      status_text << "INV: #{inventory.list_contents}".colorize(:white)
+      status_text =  name.upcase.colorize(:green)
+      status_text << '(BOSS)'.ljust(13).colorize(:yellow) if is_boss
+      status_text << "\n"
+      status_text << "#{description}".colorize(:white)
+      status_text << "\n"
+
+      status_text << "DEAD? #{is_dead}\n" unless is_dead.nil?
+      status_text << "LVL  : #{level}\n".colorize(:white)
+      status_text << "HP   : #{hp_cur}/#{hp_max}\n".colorize(:white)
+      status_text << "ATK  : #{atk_lo}-#{atk_hi}\n".colorize(:white)
+      status_text << "DEF  : #{defense}\n".colorize(:white)
+      status_text << "DEX  : #{dexterity}\n".colorize(:white)
+      status_text << "ROX  : #{rox}\n".colorize(:white)
+      status_text << "XP   : #{xp}\n".colorize(:white)
+      status_text << "FACE : #{face}\n".colorize(:white)
+      status_text << "HANDS: #{hands}\n".colorize(:white)
+      status_text << "MOOD : #{mood}\n".colorize(:white)
+      status_text << "INV  : #{inventory.list_contents}".colorize(:white)
       status_text << "\n"
     end
   end

data/lib/gemwarrior/entities/monsters/bosses/emerald.rb

@@ -2,15 +2,17 @@
 # Emerald boss monster
 
 require_relative '../../monster'
-require_relative '../../items/sparklything'
+require_relative '../../items/sparkly_thing'
+require_relative '../../../misc/music'
 
 module Gemwarrior
   class Emerald < Monster
-    attr_accessor :defeated_text
+    # CONSTANTS
+    MOVE_TEXT = '*** WHOOOOOOSH ***'
 
     def initialize
       self.name           = 'Emerald'
-      self.description    = 'A wily, beefy, tower of a man, champion of both wisdom and strength, sporting a constant glint in his eyes.'
+      self.description    = 'A wily, beefy, tower of a man, Emerald looks to be a champion of both wisdom, from what you\'ve heard, AND strength, from what you plainly see. He sports a constant glint in his eyes as he faces you, dead-on.'
       self.face           = 'gleaming'
       self.hands          = 'tantalizing'
       self.mood           = 'enraged'
@@ -27,26 +29,72 @@ module Gemwarrior
       self.rox            = rand((level * 2)..(level * 3))
       self.xp             = rand(level..(level * 2))
 
-      self.battlecry      = 'Ha ha ha ha ha! Prepare yourself: today your whole life crumbles!'
+      self.battlecry      = 'You\'ve come for the SparklyThing(tm), I see. To that I say: Ha ha ha ha ha! Prepare yourself fool: today your whole life crumbles!'
       self.is_boss        = true
-      self.defeated_text  = defeated_text
+      self.is_dead        = false
     end
+    
+    def initiate_ending(world)
+      # fanfare!
+      Music::cue([
+        { frequencies: 'G3',  duration: 250 },
+        { frequencies: 'A3',  duration: 50 },
+        { frequencies: 'B3',  duration: 50 },
+        { frequencies: 'C4',  duration: 50 },
+        { frequencies: 'D4',  duration: 250 },
+        { frequencies: 'E4',  duration: 50 },
+        { frequencies: 'F#4', duration: 50 },
+        { frequencies: 'G4',  duration: 50 },
+        { frequencies: 'A4',  duration: 250 },
+        { frequencies: 'B4',  duration: 50 },
+        { frequencies: 'C5',  duration: 50 },
+        { frequencies: 'D5',  duration: 50 },
+        { frequencies: 'E5',  duration: 50 },
+        { frequencies: 'F#5', duration: 50 },
+        { frequencies: 'G5',  duration: 1000 }
+      ])
 
-    def defeated_text
-      text =  "<^><^><^><^><^><^><^><^><^><^>\n"
-      text <<  "You beat #{name}! You win!\n"
-      text << 'You receive the '
-      text << 'SparklyThing(tm)'.colorize(:magenta)
-      text << ' and become the true '
-      text << 'Gem Warrior'.colorize(:yellow)
-      text << "!\n"
-      text << 'You decide to ignore '
-      text << 'Queen Ruby'.colorize(:red)
-      text << " and take your spoils back home\n"
-      text << "where you live out the rest of your days staring at it, wondering\n"
-      text << "what it was all about.\n\n"
-      text << "Thank you for playing. Goodbye.\n"
-      text << "<^><^><^><^><^><^><^><^><^><^>\n"
+      # get reference to throne room, emerald monster, and throne item
+      throne_room = world.location_by_coords(world.location_coords_by_name('Sky Tower (Throne Room)'))
+      emerald = throne_room.bosses_abounding[0]
+      throne = throne_room.items.each { |i| i.name == 'throne' }[0]
+
+      # emerald is dead, so room and items change
+      emerald.is_dead                 = true
+      emerald.face                    = 'sullen'
+      emerald.hands                   = 'limp'
+      emerald.mood                    = 'blank'
+      emerald.hp_cur                  = 0
+      emerald.rox                     = 0
+      emerald.description             = 'Emerald slumps over in his chair, completely lifeless. The color has drained from his eyes and a pallor has been cast over his face. His reign is no more.'
+      throne_room.description         = 'Emerald\'s throne room feels much less imposing now that you have defeated him in mortal combat. Who knew?'
+      throne_room.danger_level        = :none
+      throne_room.monster_level_range = nil
+      throne_room.monsters_abounding  = []
+      throne.description              = 'The grim spectacle of Emerald\'s dead body drooping blankly in his chosen seat really brings down the market value of it, you guess.'
+      
+      # world knows you beat emerald
+      world.emerald_beaten            = true
+
+      # remove sparkly_thing from emerald
+      emerald.inventory.remove_item('sparkly_thing')
+      # give player sparkly_thing
+      world.player.inventory.items.push(SparklyThing.new)
+
+      # ending text
+      puts '<^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^>'
+      puts "You beat #{name}! You win! You receive the #{"SparklyThing(tm)".colorize(:magenta)} and become the true #{"Gem Warrior".colorize(:yellow)}!"
+      puts '<^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^><^>'
+      STDIN.getc
+
+      puts 'Suddenly, an icy feeling shoots up your back. You feel lighter than air. Blackness takes over.'
+      STDIN.getc
+
+      # onto the queen
+      Animation::run(phrase: MOVE_TEXT)
+      puts
+
+      return { type: 'move', data: 'Queen Room'}
     end
   end
 end

data/lib/gemwarrior/entities/player.rb

@@ -20,7 +20,7 @@ module Gemwarrior
     include Formatting
 
     attr_accessor :stam_cur, :stam_max, :cur_coords, :special_abilities,
-                  :monsters_killed, :items_taken, :movements_made,    
+                  :monsters_killed, :bosses_killed, :items_taken, :movements_made,    
                   :rests_taken, :deaths
 
     def generate_name
@@ -214,12 +214,18 @@ module Gemwarrior
     end
 
     def attack(world, monster)
-      battle = Battle.new(world: world, player: self, monster: monster)
-      result = battle.start
-      if result.eql?('death')
-        return 'death'
-      elsif result.eql?('exit')
-        return 'exit'
+      if monster.is_dead
+        { type: 'message', data: 'That monster is now dead forever and cannot be attacked. You must have done them a good one.' }
+      else
+        battle = Battle.new(world: world, player: self, monster: monster)
+        result = battle.start
+        if result.eql?('death')
+          return 'death'
+        elsif result.eql?('exit')
+          return 'exit'
+        else
+          return result
+        end
       end
     end
 

data/lib/gemwarrior/evaluator.rb

@@ -282,7 +282,7 @@ module Gemwarrior
       case command
       when 'character', 'c'
         # bypass puts so it prints out with newlines properly
-        print world.player.check_self(GameOptions.data['debug_mode'])
+        print world.player.check_self
       when 'inventory', 'i'
         if param1
           world.player.inventory.describe_item(param1)
@@ -572,6 +572,16 @@ module Gemwarrior
             elsif result.eql?('exit')
               return 'exit'
             end
+
+            unless result.nil?
+              case result[:type]
+              when 'message'
+                result[:data]
+              when 'move'
+                world.player.cur_coords = world.location_coords_by_name(result[:data])
+                world.describe(world.location_by_coords(world.player.cur_coords))
+              end
+            end
           else
             ERROR_ATTACK_PARAM_INVALID
           end

data/lib/gemwarrior/game.rb

@@ -39,7 +39,7 @@ module Gemwarrior
 
       # create new world based on default template
       self.world               = init_world
-      
+
       # update some player aspects to make more dynamic
       world.player.name        = world.player.generate_name
       world.player.face        = world.player.generate_face
@@ -49,6 +49,7 @@ module Gemwarrior
       world.player.rox         = GameOptions.data['debug_mode'] ? ROX_DEBUG : ROX_DEFAULT
       
       world.duration           = { mins: 0, secs: 0, ms: 0 }
+      world.emerald_beaten     = false
 
       # create options file if not existing
       update_options_file

data/lib/gemwarrior/repl.rb

@@ -331,6 +331,8 @@ module Gemwarrior
       puts  '----------------------------------------------------------------------'
       print "#{pl.name.ljust(10)} killed #{pl.monsters_killed.to_s.colorize(color: :white, background: :black)} monster(s)"
       print "\n".ljust(12)
+      print "killed #{pl.bosses_killed.to_s.colorize(color: :white, background: :black)} boss(es)"
+      print "\n".ljust(12)
       print "picked up #{pl.items_taken.to_s.colorize(color: :white, background: :black)} item(s)"
       print "\n".ljust(12)
       print "traveled #{pl.movements_made.to_s.colorize(color: :white, background: :black)} time(s)"
@@ -343,7 +345,7 @@ module Gemwarrior
 
       # log stats to file in home directory
       File.open(GameOptions.data['log_file_path'], 'a') do |f|
-        f.write "#{Time.now} #{pl.name.rjust(10)} - V:#{Gemwarrior::VERSION} LV:#{pl.level} XP:#{pl.xp} $:#{pl.rox} KIL:#{pl.monsters_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken} DTH:#{pl.deaths}\n"
+        f.write "#{Time.now} #{pl.name.rjust(10)} - V:#{Gemwarrior::VERSION} LV:#{pl.level} XP:#{pl.xp} $:#{pl.rox} MK:#{pl.monsters_killed} BK:#{pl.bosses_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken} DTH:#{pl.deaths}\n"
       end
     end
 

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -16,7 +16,7 @@ module Gemwarrior
     WORLD_DIM_WIDTH               = 10
     WORLD_DIM_HEIGHT              = 10
 
-    attr_accessor :monsters, :locations, :player, :duration
+    attr_accessor :monsters, :locations, :player, :duration, :emerald_beaten
 
     def print_vars
       puts "======================\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: clocker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: win32-sound
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +274,6 @@ files:
 - gemwarrior.gemspec
 - lib/gemwarrior/arena.rb
 - lib/gemwarrior/battle.rb
-- lib/gemwarrior/entities/boss.rb
 - lib/gemwarrior/entities/creature.rb
 - lib/gemwarrior/entities/entity.rb
 - lib/gemwarrior/entities/item.rb
@@ -304,11 +303,12 @@ files:
 - lib/gemwarrior/entities/items/pedestal.rb
 - lib/gemwarrior/entities/items/pig.rb
 - lib/gemwarrior/entities/items/pond.rb
+- lib/gemwarrior/entities/items/queen_ruby.rb
 - lib/gemwarrior/entities/items/rope.rb
 - lib/gemwarrior/entities/items/shifty_woman.rb
 - lib/gemwarrior/entities/items/small_hole.rb
 - lib/gemwarrior/entities/items/snowman.rb
-- lib/gemwarrior/entities/items/sparklything.rb
+- lib/gemwarrior/entities/items/sparkly_thing.rb
 - lib/gemwarrior/entities/items/spear.rb
 - lib/gemwarrior/entities/items/stalactite.rb
 - lib/gemwarrior/entities/items/stone.rb
@@ -375,6 +375,4 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files:
-- spec/gemwarrior_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/lib/gemwarrior/entities/boss.rb

@@ -1,18 +0,0 @@
-# lib/gemwarrior/entities/boss.rb
-# Boss monster
-
-require_relative 'monster'
-
-module Gemwarrior
-  class Boss < Monster
-    attr_reader :win_text
-
-    def win_text
-      win_text =  "You beat #{name}! You win!"
-      win_text << 'You become the true Gem Warrior, marry Queen Ruby, and have many fine, sparkling children. '
-      win_text << 'Thank you for playing. Goodbye.'
-      puts win_text
-      exit(0)
-    end
-  end
-end