gemwarrior 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7e88f25ec32e8547f6300380c1b28db29d70ddd
-  data.tar.gz: e52a393b60fdac5aae3d74e5e79d66a8d627ebe1
+  metadata.gz: 410ff3b3615c76977920cc1352066588ae94b2aa
+  data.tar.gz: bb43488f8f1cdf2d5afc060782995a999cc9997f
 SHA512:
-  metadata.gz: a655cc40acff93a91e3b17d41f53a35ec9bb46efad7316f9cce1d255150a63233489ceebfb313629cf559745d521e0f7c6ae27ca6e2502d1074d260618ca19a7
-  data.tar.gz: 59c4e5452954b732e45ab09e69a04267f68ffa187ca514d2e38e5aa56e7d793ff6627cd9cc388296ac719480c03a89315122a5f29dcdbf543ed290adbedda645
+  metadata.gz: 62800096ddfafa1ca85ea279cdd266d350868812368ef20732cbb51defc9ec6f866e557aecb3a36508d4fd3dc2c684e48e2684267700320d8f687ec6b225538c
+  data.tar.gz: f1e6fc509b3bf9793bbdea8b785d7126ca4e9f51b7d4bbb20d8a12794242586890e2b67d304a0c608199159752d0e31bbc2a2e3dceb26b4f5588546cd5d6bd60

data/bin/gemwarrior

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
-require_relative '../lib/gemwarrior'
+
 require_relative '../lib/gemwarrior/version'
+require_relative '../lib/gemwarrior/game'
 
 def parse_options
   opts.on('-v', '--version', 'Display version number and exit') do
@@ -22,7 +23,7 @@ def print_error(error)
 end
 
 begin
-  Gemwarrior::Base.new
+  Gemwarrior::Game.new
 rescue => error
   print_error(error)
   exit(false)

data/lib/gemwarrior/constants.rb

@@ -5,7 +5,8 @@ module Gemwarrior
   PROGRAM_NAME = 'Gem Warrior'
   SPLASH_MESSAGE = 'Welcome to Gem Warrior, where randomized fortune is just as likely as mayhem.'
   QUIT_MESSAGE = 'Thanks for playing the game. Until next time...'
-  SEPARATOR = '====================================================='
+  RESUME_MESSAGE = 'Back to adventuring!'
+  SEPARATOR = '==========================================================='
   CHANGE_PARAMS = 'Options: name'
   
   DANGER_LEVEL = {:none => 0, :low => 15, :moderate => 30, :high => 55, :assured => 100}
@@ -13,11 +14,13 @@ module Gemwarrior
   module Errors
     ERROR_COMMAND_INVALID = 'That\'s not something the game yet understands.'
     ERROR_INVENTORY_EMPTY = '...and find you currently have diddly-squat, which is nothing.'
+    ERROR_INVENTORY_REMOVE_INVALID = 'Your inventory does not contain that item, so you can\'t drop it.'
     ERROR_ITEM_LOC_INVALID = 'You don\'t see that there.'
     ERROR_ITEM_INVENTORY_INVALID = 'You don\'t possess that.'
     ERROR_TAKE_PARAM_MISSING = 'You can\'t just take. You gotta choose something.'
     ERROR_TAKE_ITEM_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_TAKE_ITEM_INVALID = 'That item doesn\'t exist here.'
+    ERROR_DROP_PARAM_MISSING = 'You can\'t just drop indiscriminately. You gotta choose something.'
     ERROR_GO_DIR_MISSING = 'Just wander aimlessly? A direction would be nice.'
     ERROR_GO_DIR_INVALID = 'The place in that direction is far, far, FAR too dangerous. You should try a different way.'
     ERROR_CHANGE_PARAM_MISSING = 'Ch-ch-changes...aren\'t happening because you didn\'t specify what to change.'

data/lib/gemwarrior/evaluator.rb

@@ -7,41 +7,49 @@ require_relative 'constants'
 
 module Gemwarrior  
   class Evaluator
+    private
+    
+    def print_separator
+      puts SEPARATOR
+    end
+    
+    def list_commands
+      i = 0
+      print_separator
+      @commands.each do |cmd|
+        puts " #{cmd}, #{@aliases[i]}\n -- #{@descriptions[i]}"
+        i = i + 1
+      end
+      print_separator
+    end
+    
+    public
+  
     include Errors
 
     def initialize(world)
       @world = world
-      @commands = %w(character inventory rest look take world monsters go change help quit exit)
-      @aliases = %w(c i r l t w m g ch h q x)
+      @commands = %w(character inventory rest look take drop world monsters go change help quit exit quit! exit!)
+      @aliases = %w(c i r l t d w m g ch h q x qq xx)
       @descriptions = [
         'Display character information',
         'Look in your inventory',
         'Take a load off and regain stamina',
         'Look around your current location',
+        'Take item',
+        'Drop item',
         'List all locations in the world',
         'List all the monsters in the world',
-        'Go in a directions',
+        'Go in a direction',
         'Change something',
         'This help menu',
-        'Quit the game',
-        'Exit the game (very different, of course)'
+        'Quit w/ confirmation',
+        'Exit w/ confirmation (very different, of course)',
+        'Quit w/o confirmation',
+        'Exit w/o confirmation (very, very different, of course)'
       ]
     end
     
-    def print_separator
-      SEPARATOR
-    end
-    
-    def list_commands
-      i = 0
-      print_separator
-      @commands.each do |cmd|
-        puts "#{cmd}, #{@aliases[i]} - #{@descriptions[i]}"
-        i = i + 1
-      end
-      print_separator
-    end
-    
     def evaluate(input)
       if input.nil?
         return
@@ -57,39 +65,45 @@ module Gemwarrior
       param = tokens[1]
 
       case command
-      when @commands[0], @aliases[0] # character
+      when 'character', 'c'
         @world.player.check_self
-      when @commands[1], @aliases[1] # inventory
+      when 'inventory', 'i'
         if param
           @world.player.inventory.describe_item(param)
         else
           @world.player.list_inventory
         end
-      when @commands[2], @aliases[2] # rest
+      when 'rest', 'r'
         @world.player.rest
-      when @commands[3], @aliases[3] # look
+      when 'look', 'l'
         if param
           @world.player.cur_loc.describe_item(param)
         else
           @world.player.cur_loc.describe
         end
-      when @commands[4], @aliases[4] # take
-        unless param.nil?
-          @world.player.inventory.add_item(@world.player.cur_loc, param)
-        else
+      when 'take', 't'
+        if param.nil?
           ERROR_TAKE_PARAM_MISSING
+        else
+          @world.player.inventory.add_item(@world.player.cur_loc, param)
         end
-      when @commands[5], @aliases[5] # world
+      when 'drop', 'd'
+        if param.nil?
+          ERROR_DROP_PARAM_MISSING
+        else
+          @world.player.inventory.remove_item(param)
+        end  
+      when 'world', 'world'
         @world.list_locations
-      when @commands[6], @aliases[6] # monsters
+      when 'monsters', 'm'
         @world.list_monsters
-      when @commands[7], @aliases[7] # go
+      when 'go', 'g'
         if param.nil?
           ERROR_GO_DIR_MISSING
         else
           @world.player.go(@world.locations, param)
         end
-      when @commands[8], @aliases[8] # change
+      when 'change', 'ch'
         if param.nil?
           puts ERROR_CHANGE_PARAM_MISSING
           puts CHANGE_PARAMS
@@ -101,9 +115,18 @@ module Gemwarrior
             ERROR_CHANGE_PARAM_INVALID
           end
         end
-      when @commands[9], @aliases[9] # help
+      when 'help', 'h'
         list_commands
-      when @commands[10..11], @aliases[10] # quit/exit
+      when 'quit', 'exit', 'q', 'x'
+        puts "You sure you want to quit? (y/n): "
+        response = gets.chomp
+        if (response.downcase.eql?("y") || response.downcase.eql?("yes"))
+          puts QUIT_MESSAGE
+          exit(0)
+        else
+          puts RESUME_MESSAGE
+        end
+      when 'qq', 'xx'
         puts QUIT_MESSAGE
         exit(0)
       else

data/lib/gemwarrior/inventory.rb

@@ -50,9 +50,9 @@ module Gemwarrior
     end
     
     def remove_item(item_name)
-      if inventory.include?(item_name)
-        @inventory.delete(item_name)
-        puts "#{item} has been thrown on the ground, but far out of reach, and you're much too lazy to go get it now, so it's as good as gone.\n"
+      if @inventory.map(&:name).include?(item_name)
+        @inventory.reject! { |item| item.name == item_name }
+        puts "The #{item_name} has been thrown on the ground, but far out of reach, and you're much too lazy to go get it now, so it's as good as gone.\n"
       else
         puts ERROR_INVENTORY_REMOVE_INVALID
       end

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -116,7 +116,6 @@ files:
 - Rakefile
 - bin/gemwarrior
 - gemwarrior.gemspec
-- lib/gemwarrior.rb
 - lib/gemwarrior/constants.rb
 - lib/gemwarrior/creature.rb
 - lib/gemwarrior/evaluator.rb

data/lib/gemwarrior.rb

@@ -1,9 +0,0 @@
-# lib/gemwarrior.rb
-
-require_relative 'gemwarrior/game'
-
-module Gemwarrior
-  class Base
-    Game.new
-  end
-end