gemwarrior 0.8.6 → 0.8.7

data/lib/gemwarrior/game.rb

@@ -17,7 +17,7 @@ require_relative 'inventory'
 module Gemwarrior
   class Game
     include PlayerLevels
-  
+
     # CONSTANTS
     ## PLAYER DEFAULTS
     PLAYER_DESC_DEFAULT       = 'Picked to do battle against a wizened madman for a shiny something or other for world-saving purposes.'
@@ -25,13 +25,13 @@ module Gemwarrior
     PLAYER_ROX_DEFAULT        = 0
 
     attr_accessor :world, :eval, :repl
-    
+
     def initialize(options)
       # create new world and player
       self.world            = World.new
-      
+
       start_stats = PlayerLevels::get_level_stats(1)
-      
+
       world.debug_mode      = options.fetch(:debug_mode)
       world.use_wordnik     = options.fetch(:use_wordnik)
       world.sound           = options.fetch(:sound)
@@ -51,7 +51,7 @@ module Gemwarrior
         :inventory          => PLAYER_INVENTORY_DEFAULT,
         :rox                => world.debug_mode ? 300 : PLAYER_ROX_DEFAULT,
         :cur_coords         => world.location_coords_by_name('Home'),
-        
+
         :god_mode           => options.fetch(:god_mode),
         :beast_mode         => options.fetch(:beast_mode),
         :use_wordnik        => options.fetch(:use_wordnik)

data/lib/gemwarrior/inventory.rb

@@ -13,14 +13,14 @@ module Gemwarrior
     ERROR_ITEM_EQUIP_NONWEAPON    = 'That cannot be equipped as a weapon.'
     ERROR_ITEM_UNEQUIP_INVALID    = 'You do not have anything called that to unequip.'
     ERROR_ITEM_UNEQUIP_NONWEAPON  = 'That cannot be unequipped.'
-    
+
     attr_accessor :items, :weapon
-    
+
     def initialize(items = [], weapon = nil)
       self.items = items
       self.weapon = weapon
     end
-    
+
     def list_contents
       if items.nil? || items.empty?
         return contents_text = '[empty]'
@@ -28,11 +28,11 @@ module Gemwarrior
         return contents_text = "#{items.map(&:name).join ', '}"
       end
     end
-    
+
     def has_item?(item_name)
       items.map(&:name).include?(item_name)
     end
-    
+
     def describe_item(item_name)
       if has_item?(item_name)
         items.each do |i|
@@ -44,7 +44,7 @@ module Gemwarrior
         ERROR_ITEM_DESCRIBE_INVALID
       end
     end
-    
+
     def equip_item(item_name)
       if has_item?(item_name)
         items.each do |i|
@@ -62,7 +62,7 @@ module Gemwarrior
         ERROR_ITEM_EQUIP_INVALID
       end
     end
-    
+
     def unequip_item(item_name)
       if has_item?(item_name)
         items.each do |i|
@@ -80,13 +80,17 @@ module Gemwarrior
         ERROR_ITEM_UNEQUIP_INVALID
       end
     end
-    
-    def add_item(cur_loc, item_name)
+
+    def add_item(cur_loc, item_name, player)
       cur_loc.items.each do |i|
         if i.name.eql?(item_name)
           if i.takeable
             items.push(i)
             cur_loc.remove_item(item_name)
+
+            # stats
+            player.items_taken += 1
+
             return "Added #{item_name} to your increasing collection of bits of tid."
           else
             return ERROR_ITEM_ADD_UNTAKEABLE
@@ -95,7 +99,7 @@ module Gemwarrior
       end
       ERROR_ITEM_ADD_INVALID
     end
-    
+
     def remove_item(item_name)
       if has_item?(item_name)
         items.reject! { |item| item.name == item_name }

data/lib/gemwarrior/misc/animation.rb

@@ -22,7 +22,7 @@ module Gemwarrior
           :random     => options.fetch(:random)
         })
       end
-      
+
       return th.join
     end
   end

data/lib/gemwarrior/misc/music.rb

@@ -19,7 +19,7 @@ module Gemwarrior
           volume        = note[:volume].nil? ? defaults[:volume] : note[:volume]
           duration      = note[:duration].nil? ? defaults[:duration] : note[:duration]
           notext        = note[:notext].nil? ? defaults[:notext] : note[:notext]
-          
+
           Feep::Base.new({
             :freq_or_note => note_to_play, 
             :waveform     => waveform, 

data/lib/gemwarrior/misc/name_generator.rb

@@ -23,7 +23,7 @@ class NameGenerator
     end
     return names
   end
-  
+
   # generator function
   def generate_name
     chain = nil
@@ -31,7 +31,7 @@ class NameGenerator
     if (chain = markov_chain(self.type))
       return markov_name(chain)
     end
-    
+
     return ''
   end
 
@@ -42,7 +42,7 @@ class NameGenerator
     for i in 1..count
       list.push(generate_name)
     end
-    
+
     return list
   end
 
@@ -61,7 +61,7 @@ class NameGenerator
         end
       end
     end
-    
+
     return false
   end
 
@@ -92,7 +92,7 @@ class NameGenerator
         end
       end
     end
-    
+
     return scale_chain(chain)
   end
 
@@ -107,7 +107,7 @@ class NameGenerator
       chain[key] = {}
       chain[key][token] = 1
     end
-    
+
     return chain
   end
 
@@ -125,7 +125,7 @@ class NameGenerator
         table_len[key] += weighted
       end
     end
-    
+
     chain['table_len'] = table_len
 
     return chain
@@ -162,7 +162,7 @@ class NameGenerator
       t += chain_value
       return chain_key if (idx < t)
     end
-    
+
     return '-'
   end
 end

data/lib/gemwarrior/misc/player_levels.rb

@@ -63,7 +63,7 @@ module Gemwarrior
         }
       end
     end
-    
+
     def self.check_level(xp)
       if xp < 50
         1

data/lib/gemwarrior/misc/timer.rb

@@ -0,0 +1,50 @@
+# lib/gemwarrior/misc/timer.rb
+# Timer
+
+module Gemwarrior
+  class Timer
+    attr_accessor :duration_in_s, :timer_name, :background, :progress, :verbose
+
+    DEFAULTS = {
+      duration_in_s: 1, 
+      timer_name:    'Timer', 
+      background:    false,
+      progress:      false,
+      verbose:       true
+    }
+
+    def initialize(options = {})
+      options = DEFAULTS.merge(options)
+
+      self.duration_in_s  = options[:duration_in_s]
+      self.timer_name     = options[:timer_name]
+      self.background     = options[:background]
+      self.progress       = options[:progress]
+      self.verbose        = options[:verbose]
+    end
+
+    def start
+      if background
+        Thread.start { self.run }
+      else
+        self.run
+      end
+    end
+
+    def run
+      puts "#{timer_name} began at #{Time.now} for #{duration_in_s} seconds" if verbose
+
+      end_time = Time.now + duration_in_s
+
+      loop do
+        sleep 1
+        print '.' if progress
+        if Time.now >= end_time
+          print "\n"
+          puts "#{timer_name} ended at #{Time.now}" if verbose
+          return
+        end
+      end
+    end
+  end
+end

data/lib/gemwarrior/misc/wordlist.rb

@@ -18,9 +18,9 @@ module Gemwarrior
     STATIC_VERB_VALUES = [
       'accentuate', 'accompany', 'blatter', 'bully', 'collide', 'crusade', 'disallow', 'entitle', 'infest', 'lateral', 'micturate', 'mourn', 'munge', 'numb', 'outdraw', 'overstep', 'plummet', 'refill', 'refurnish', 'reroute', 'rumple', 'scupper', 'smoosh', 'spifflicate', 'straighten', 'synthesize', 'terrorize', 'unshift', 'vociferate'
     ]
-  
+
     attr_accessor :use_wordnik, :type, :limit, :words, :error
-  
+
     def initialize(use_wordnik = false, type = 'noun', limit = 10)
       self.use_wordnik  = use_wordnik
       self.type         = type
@@ -34,7 +34,7 @@ module Gemwarrior
 
       return random_value.nil? ? get_random_value : random_value
     end
-    
+
     def list_words
       words.join(',')
     end
@@ -52,7 +52,7 @@ module Gemwarrior
           error = 'invalid wordlist type'
           return
         end
-        
+
         json_return = HTTP.get(
           url, 
           :params => { 
@@ -70,7 +70,7 @@ module Gemwarrior
             :api_key => api_key
           }
         )
-        
+
         json_data = JSON.parse(json_return.to_s)
 
         if json_data.include?('type') && json_data.include?('message')
@@ -87,10 +87,10 @@ module Gemwarrior
           end
         end
       end
-      
+
       return get_static_values(type)
     end
-    
+
     def get_static_values(type = nil)
       static_values = []
       0.upto(10) do

data/lib/gemwarrior/repl.rb

@@ -3,7 +3,9 @@
 
 require 'readline'
 require 'os'
+require 'clocker'
 
+require_relative 'misc/timer'
 require_relative 'misc/wordlist'
 require_relative 'evaluator'
 require_relative 'version'
@@ -14,9 +16,9 @@ module Gemwarrior
     ## MESSAGES
     QUIT_MESSAGE   = 'Temporal flux detected. Shutting down...'.colorize(:red)
     SPLASH_MESSAGE = 'Welcome to the land of *Jool*, where randomized fortune is just as likely as mayhem.'
-    
+
     attr_accessor :world, :eval
-    
+
     def initialize(world, evaluator)
       self.world  = world
       self.eval   = evaluator
@@ -25,26 +27,41 @@ module Gemwarrior
     def start(initialCommand = nil)
       setup_screen(initialCommand)
 
-      # main loop
-      loop do
-        prompt
-        begin
-          input = read_line
-          puts eval.evaluate(input)
-        rescue Interrupt
-          puts
-          puts QUIT_MESSAGE
-          exit(0)
-        end
+      clocker = Clocker.new
+
+      at_exit do
+        pl = world.player
+        duration = clocker.stop
+        print_stats(duration, pl)
       end
+
+      clocker.clock {
+        # main loop
+        loop do
+          prompt
+          begin
+            input = read_line
+            result = eval.evaluate(input)
+            if result.eql?("exit")
+              exit
+            else
+              puts result
+            end
+          rescue Interrupt
+            puts
+            puts QUIT_MESSAGE
+            exit
+          end
+        end
+      }
     end
-    
+
     private
-    
+
     def clear_screen
       OS.windows? ? system('cls') : system('clear')
     end
-    
+
     def print_logo
       if world.sound
         Music::cue([
@@ -57,7 +74,7 @@ module Gemwarrior
       puts "\\-+-+-+ +-+-+-+-+-+-+-/".colorize(:yellow)
       puts '[[[[[[[DEBUGGING]]]]]]]'.colorize(:white) if world.debug_mode
     end
-    
+
     def print_splash_message
       SPLASH_MESSAGE.length.times do print '=' end
       puts
@@ -65,7 +82,7 @@ module Gemwarrior
       SPLASH_MESSAGE.length.times do print '=' end
       puts
     end
-    
+
     def print_fortune
       noun1_values = WordList.new(world.use_wordnik, 'noun-plural')
       noun2_values = WordList.new(world.use_wordnik, 'noun-plural')
@@ -73,7 +90,7 @@ module Gemwarrior
 
       puts "* Remember: #{noun1_values.get_random_value} and #{noun2_values.get_random_value} are the key to #{noun3_values.get_random_value} *\n\n"
     end
-    
+
     def print_help
       puts '* Basic functions: look, go, character, inventory, attack *'
       puts '* Type \'help\' for complete command list'
@@ -81,6 +98,23 @@ module Gemwarrior
       puts
     end
 
+    def print_stats(duration, pl)
+      puts  '######################################################################'
+      puts
+      print 'Gem Warrior'.colorize(:color => :white, :background => :black)
+      print " played for #{duration[:mins].to_s.colorize(:color => :white, :background => :black)} minutes, #{duration[:secs].to_s.colorize(:color => :white, :background => :black)} seconds, and #{duration[:ms].to_s.colorize(:color => :white, :background => :black)} milliseconds\n"
+      puts  '----------------------------------------------------------------------'
+      print "Player killed #{pl.monsters_killed.to_s.colorize(:color => :white, :background => :black)} monster(s)"
+      print "\n".ljust(8)
+      print "picked up #{pl.items_taken.to_s.colorize(:color => :white, :background => :black)} item(s)"
+      print "\n".ljust(8)
+      print "traveled #{pl.movements_made.to_s.colorize(:color => :white, :background => :black)} time(s)"
+      print "\n".ljust(8)
+      print "rested #{pl.rests_taken.to_s.colorize(:color => :white, :background => :black)} time(s)"
+      puts
+      puts '######################################################################'
+    end
+
     def setup_screen(initialCommand = nil)
       # welcome player to game
       clear_screen
@@ -92,7 +126,7 @@ module Gemwarrior
       # hook to do something right off the bat
       puts eval.evaluate(initialCommand) unless initialCommand.nil?
     end
-    
+
     def prompt
       prompt_template = "\n[LV:%3s][XP:%3s][ROX:%3s] -- [HP:%3s/%-3s][STM:%2s/%-2s] -- [%s @ %s]"
       if world.debug_mode
@@ -114,7 +148,7 @@ module Gemwarrior
       end
       puts (prompt_template % prompt_vars_arr).colorize(:yellow)
     end
-    
+
     def read_line
       prompt_text = world.debug_mode ? ' GW[D]> ' : ' GW> '
       Readline.readline(prompt_text, true).to_s