gemwarrior 0.9.36 → 0.9.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aea546b78bf2cba84a7ecd3e059c892dc180ae1
-  data.tar.gz: 1a55c01aed90707d339fef86724e8727906134e5
+  metadata.gz: 431bad9c347069816c31bd1e177b2150a40cc659
+  data.tar.gz: edbc3792f12ad73aadef984f5579bcc4ba73371a
 SHA512:
-  metadata.gz: c0996702785d7da641fe4d0c88551f8dc73daec3b68307e5fb5e8aa73e213c88a1b04845199af9681c853067ad35aec1a40d1fc83803586570e3c3c9c2c42a88
-  data.tar.gz: 12bb7240e97fbb57857e89abc733ebeb2c23a0c7d6afca227204d48bbc04f3da9400e1133b5f9793008c574afd6dfc2f19a6a61554ae00556acb55a7b15f1d11
+  metadata.gz: 191c3cb62106e38b149ec02cce77cd531bcb28ecaaae7180f820e7125d58f4732c51d1bfc5a1b34c78b804a97823d8bb0314c020e0a4136b6657bcecdcfcef0b
+  data.tar.gz: 45efcfcba9b601470e77382f6c30c88d4f9d1e3744547b54469518a466e475573b2464f975238c0bb813e2c0f457e3f44c59fafeef0753b708c265b56d0c0f8c

data/README.md

@@ -13,12 +13,12 @@ You take up the mantle of **1.upto(rand(5..10)) {print rand(65..90).chr}**, a gi
 
 Start in your poor, super lame cottage, where you live alone, subsisting off the sale of polished rocks you scavenge all day for in the neighboring caves. Once tasked with your quest, travel throughout the land of Jool, eventually reaching the sky tower that Emerald resides in with his stolen goods, laughing to himself, occasionally.
 
-As you travel you will discover sights and sounds of the land, all of which are new to you because you don't really get out much. Visit towns with merchants willing to trade coin for wares they bought off of other adventurers who didn't last the previous attempts at thwartion. Sleep in makeshift huts to regain your health and magic points (or the ground, if that's all that's available), which are conveniently located in your peripheral vision (i.e. the console window). Eventually, if you're skilled (and I actually code it in), you'll reach **Emerald's Sky Tower**, part him from his **ShinyThing<sup>tm</sup>**, and then do what is "right".
+As you travel you will discover sights and sounds of the land, all of which are new to you because you don't really get out much. Visit towns with merchants willing to trade coin for wares they bought off of other adventurers who didn't last the previous attempts at thwartion. Sleep in a tent (or on the ground, if that's all that's available) to regain your enumerated status points, which are conveniently located in your peripheral vision (i.e. the console window). Eventually, if you're skilled, you'll reach **Emerald's Sky Tower**, part him from his **ShinyThing<sup>tm</sup>**, and then do what is "right".
 
 ## How to Get to Jool
 
-1. `ruby -v` should return `ruby 2.`something; else install [Ruby](https://www.ruby-lang.org)
-2. `gem -v` should return `2.`something; else install [RubyGems](https://rubygems.org)
+1. `ruby -v` should return `ruby 2.something`; else install [Ruby](https://www.ruby-lang.org)
+2. `gem -v` should return `2.something`; else install [RubyGems](https://rubygems.org)
 2. `(sudo) gem install gemwarrior`  
 3. `gemwarrior`
 
@@ -26,26 +26,27 @@ Run the commands above and you'll be whisked away to Jool, ready to start or con
 
 ## Main Commands
 
-`> character` - character check for visual identity  
-`> inventory [object]` - check your inventory (or an individual item within)  
-`> rest` - take a load off and replenish hp  
-`> look      [object]` - look at current location and its items and monsters  
-`> take      [object]` - take an item from a location  
-`> use       [object]` - use an item from your inventory or current location  
-`> drop      [object]` - drop an item from your inventory  
-`> equip     [object]` - designate an item in your inventory your weapon  
-`> unequip   [object]` - stop using an item in your inventory as your weapon
-`> go        [direction]` - go in a direction, if possible (north|east|south|west work as shortcuts)
-`> attack    [monster]` - attack a monster  
+`> character`             - character check for visual identity  
+`> inventory [object]`    - check your inventory (or an individual item within)  
+`> rest`                  - take a load off and replenish hp  
+`> look      [object]`    - look at current location and its items and monsters  
+`> take      [object]`    - take an item from a location  
+`> use       [object]`    - use an item from your inventory or current location  
+`> drop      [object]`    - drop an item from your inventory  
+`> equip     [object]`    - designate an item in your inventory your weapon  
+`> unequip   [object]`    - stop using an item in your inventory as your weapon  
+`> go        [direction]` - go in a direction, if possible (north|east|south|west work as shortcuts)  
+`> attack    [monster]`   - attack a monster  
 `> change    [attribute]` - change some things about yourself  
-`> help` - display available commands  
-`> quit` - quit this nonsense w/ prompt  
-`> quit!` - quit this nonsense w/o prompt  
+`> help`                  - display available commands  
+`> version`               - display current game version  
+`> quit`                  - quit this nonsense w/ prompt  
+`> quit!`                 - quit this nonsense w/o prompt  
 
 ## In Progress, Yanno
 
-This is in beta testing right now, and if you wish to help out in an official way, please visit [the main Gem Warrior homepage](http://gw.codana.me).
+Gem Warrior is in heavy beta testing right now, and if you wish to help out in an official way, please visit [the main Gem Warrior homepage](http://gw.codana.me) for more information.
 
-## Current Issues
+## Current Issues/Requests
 
-My old list of issues/features has been moved to the [Github issues section](https://github.com/michaelchadwick/gemwarrior/issues). Feel free to add any bugs you find while playing, or any requests for new features, over there.
+The old list of issues/features has been moved to the [Github issues section](https://github.com/michaelchadwick/gemwarrior/issues). Feel free to go there to add any bugs you find while playing or any requests for new features.

data/Rakefile

@@ -4,7 +4,7 @@ require 'bundler/gem_tasks'
 # Default directory to look in is `/specs`
 # Run with `rake spec`
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = ['--color', '--format', 'nested']
+  task.rspec_opts = ['--color', '--format', 'documentation']
 end
 
-task :default => :spec
+task :default => :spec

data/bin/gemwarrior

@@ -97,6 +97,7 @@ end
 
 begin
   GameOptions.add 'log_file_path', "#{Dir.home}/.gemwarrior_log"
+  GameOptions.add 'save_file_path', "#{Dir.home}/.gemwarrior_save"
   GameOptions.add 'options_file_path', "#{Dir.home}/.gemwarrior_options"
   
   options = parse_options_cli

data/gemwarrior.gemspec

@@ -41,8 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-nc'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-remote'
-  spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'pry-byebug', '~> 3.0'
 end

data/lib/gemwarrior/battle.rb

@@ -7,11 +7,8 @@ require_relative 'game_options'
 module Gemwarrior
   class Battle
     # CONSTANTS
-    ## ERRORS
     ERROR_ATTACK_OPTION_INVALID = 'That will not do anything against the monster.'
     BEAST_MODE_ATTACK           = 100
-
-    ## MESSAGES
     ESCAPE_TEXT                 = '** POOF **'
 
     attr_accessor :world, :player, :monster, :player_is_defending

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

@@ -4,10 +4,10 @@
 require_relative '../item'
 
 module Gemwarrior
-  # CONSTANTS
-  MOVE_TEXT = '*** SHOOOOOM ***'
-
   class FloorTile < Item
+    # CONSTANTS
+    MOVE_TEXT = '*** SHOOOOOM ***'
+
     def initialize
       self.name         = 'floor_tile'
       self.description  = 'One of the floor tiles, rough-hewn but immaculate, looks...off. Pressable, even.'

data/lib/gemwarrior/entities/location.rb

@@ -7,11 +7,8 @@ require_relative '../game_options'
 module Gemwarrior
   class Location < Entity
     # CONSTANTS
-    ## HASHES
-    DANGER_LEVEL = { none: 0, low: 15, moderate: 30, high: 55, assured: 100 }
-
-    ## ERRORS
-    ERROR_LOCATION_ITEM_REMOVE_INVALID      = 'That item cannot be removed as it does not exist here.'
+    DANGER_LEVEL              = { none: 0, low: 15, moderate: 30, high: 55, assured: 100 }
+    ERROR_ITEM_REMOVE_INVALID = 'That item cannot be removed as it does not exist here.'
 
     attr_accessor :coords, :locs_connected, :danger_level, :monster_level_range, :items, 
                   :monsters_abounding, :bosses_abounding, :checked_for_monsters
@@ -61,7 +58,7 @@ module Gemwarrior
       if has_item?(item_name)
         items.reject! { |item| item.name == item_name }
       else
-        ERROR_LOCATION_ITEM_REMOVE_INVALID
+        ERROR_ITEM_REMOVE_INVALID
       end
     end
 

data/lib/gemwarrior/evaluator.rb

@@ -7,7 +7,6 @@ require_relative 'game_options'
 module Gemwarrior
   class Evaluator
     # CONSTANTS
-    ## MESSAGES
     PROGRAM_NAME                        = 'Gem Warrior'
     QUIT_MESSAGE                        = 'Thanks for playing the game. Until next time...'.colorize(:yellow)
     RESUME_MESSAGE                      = 'Back to adventuring!'.colorize(:green)
@@ -17,9 +16,7 @@ module Gemwarrior
     DEBUG_LIST_PARAMS                   = 'Options: monsters, items, locations'
     DEBUG_STAT_PARAMS                   = 'Options: atk_lo, atk_hi, strength, dexterity'
 
-    ## ERRORS
     ERROR_COMMAND_INVALID               = 'That is not something the game yet understands.'
-
     ERROR_LOOK_AT_PARAM_MISSING         = 'You cannot just "look at". You gotta choose something to look at.'
     ERROR_GO_PARAM_MISSING              = 'Just wander aimlessly? A direction would be nice.'
     ERROR_GO_PARAM_INVALID              = 'The place in that direction is far, far, FAR too dangerous. You should try a different way.'

data/lib/gemwarrior/game.rb

@@ -20,7 +20,6 @@ module Gemwarrior
     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.'
     PLAYER_INVENTORY_DEFAULT  = Inventory.new
     PLAYER_INVENTORY_DEBUG    = Inventory.new([Herb.new])

data/lib/gemwarrior/inventory.rb

@@ -4,7 +4,6 @@
 module Gemwarrior
   class Inventory
     # CONSTANTS
-    ## ERRORS
     ERROR_ITEM_REMOVE_INVALID     = 'Your inventory does not contain that item, so you cannot drop it.'
     ERROR_ITEM_ADD_UNTAKEABLE     = 'That would be great if you could take that thing, wouldn\'t it? Well, it\'s not so great for you right now.'
     ERROR_ITEM_ADD_INVALID        = 'That item does not exist here.'

data/lib/gemwarrior/repl.rb

@@ -16,7 +16,6 @@ require_relative 'version'
 module Gemwarrior
   class Repl
     # CONSTANTS
-    ## MESSAGES
     QUIT_MESSAGE            = 'Temporal flux detected. Shutting down...'.colorize(:red)
     MAIN_MENU_QUIT_MESSAGE  = 'Giving up so soon? Jool will be waiting...'.colorize(:yellow)
     SPLASH_MESSAGE          = 'Welcome to *Jool*, where randomized fortune is just as likely as mayhem.'
@@ -162,15 +161,25 @@ module Gemwarrior
       end
     end
 
-    def display_log
-      if File.exist?(GameOptions.data['log_file_path'])
+    def display_record_of_attempts
+      if File.exist?(GameOptions.data['log_file_path']) and !File.zero?(GameOptions.data['log_file_path'])
         File.open(GameOptions.data['log_file_path']).readlines.each do |line|
           print "#{line}"
         end
-        puts
+        if GameOptions.data['debug_mode']
+          print 'Clear record of attempts (y/n)? '
+          answer = gets.chomp.downcase
+
+          case answer
+          when 'y'
+            File.truncate(GameOptions.data['log_file_path'], 0)
+            puts 'Record of attempts: erased!'
+          end
+
+          puts
+        end
       else
         puts 'No attempts made yet!'
-        puts
       end
     end
 
@@ -198,7 +207,7 @@ module Gemwarrior
       puts ' (A)bout'
       puts ' (H)elp'
       puts ' (O)ptions'
-      puts ' (L)og'
+      puts ' (R)ecord of Attempts'
       puts ' (C)heck for Updates'
       puts ' (E)xit'
       puts '======================='
@@ -234,9 +243,9 @@ module Gemwarrior
         puts choice
         print_options
         run_main_menu
-      when 'l'
+      when 'r'
         puts choice
-        display_log
+        display_record_of_attempts
         run_main_menu
       when 'c'
         puts choice
@@ -324,5 +333,11 @@ module Gemwarrior
       print (prompt_template % prompt_vars_arr).colorize(:yellow)
       print "\n"
     end
+
+    def command_exists?(cmd)
+      ENV['PATH'].split(File::PATH_SEPARATOR).collect { |d| 
+        Dir.entries d if Dir.exist? d 
+      }.flatten.include?(cmd)
+    end
   end
 end

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -10,13 +10,11 @@ require_relative 'entities/location'
 module Gemwarrior
   class World
     # CONSTANTS
-    LOCATION_DATA_FILE  = File.expand_path('../../../data/locations.yml', __FILE__)
-    WORLD_DIM_WIDTH     = 10
-    WORLD_DIM_HEIGHT    = 10
-
-    ## ERRORS
-    ERROR_LIST_PARAM_INVALID = 'That is not something that can be listed.'
-    ERROR_LOCATION_DESCRIBE_ENTITY_INVALID  = 'You do not see that here.'
+    LOCATION_DATA_FILE            = File.expand_path('../../../data/locations.yml', __FILE__)
+    ERROR_LIST_PARAM_INVALID      = 'That is not something that can be listed.'
+    ERROR_DESCRIBE_ENTITY_INVALID = 'You do not see that here.'
+    WORLD_DIM_WIDTH               = 10
+    WORLD_DIM_HEIGHT              = 10
 
     attr_accessor :monsters, :locations, :player
 
@@ -206,7 +204,7 @@ module Gemwarrior
       elsif player.inventory.contains_item?(entity_name)
         player.inventory.describe_item(entity_name)
       else
-        ERROR_LOCATION_DESCRIBE_ENTITY_INVALID
+        ERROR_DESCRIBE_ENTITY_INVALID
       end
     end
 

data/spec/gemwarrior_spec.rb

@@ -1,7 +1,42 @@
 require 'spec_helper'
+include Gemwarrior
 
 describe Gemwarrior do
-  it 'has a version number' do
-    expect(Gemwarrior::VERSION).not_to be nil
+  let(:default_load_options) do
+    GameOptions.add 'log_file_path', "#{Dir.home}/.gemwarrior_log"
+    GameOptions.add 'options_file_path', "#{Dir.home}/.gemwarrior_options"
+  
+    Game.new(
+      beast_mode:     false,
+      debug_mode:     false,
+      god_mode:       false,
+      new_game:       false,
+      sound_enabled:  false,
+      sound_volume:   0.3,
+      use_wordnik:    false,
+      extra_command:  nil
+    )
+  end
+
+  describe 'basic properties' do
+    it 'has a version number' do
+      expect(VERSION).not_to be nil
+    end
+    it 'display help menu' do
+      pending
+    end
+  end
+  
+  describe 'game load' do
+    context 'default options' do
+      it 'displays the main menu' do
+        pending
+      end
+    end
+    context 'new game option enabled' do
+      it 'displays the main game prompt and runs the look command' do
+        pending
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+# binary/executable
+$LOAD_PATH.unshift File.expand_path('../../bin', __FILE__)
+# main module
+$LOAD_PATH.unshift File.expand_path('../../lib/gemwarrior', __FILE__)
 require 'pry'
-require 'gemwarrior'
+require 'game'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.36
+  version: 0.9.37
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -240,48 +240,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-remote
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement