gemwarrior 0.9.37 → 0.9.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 431bad9c347069816c31bd1e177b2150a40cc659
-  data.tar.gz: edbc3792f12ad73aadef984f5579bcc4ba73371a
+  metadata.gz: 559b9c761db2f2d6c316bc3a0e5b886192c8b6d9
+  data.tar.gz: f3d2430ee5a96d78cdbb4a49305a0459888280d8
 SHA512:
-  metadata.gz: 191c3cb62106e38b149ec02cce77cd531bcb28ecaaae7180f820e7125d58f4732c51d1bfc5a1b34c78b804a97823d8bb0314c020e0a4136b6657bcecdcfcef0b
-  data.tar.gz: 45efcfcba9b601470e77382f6c30c88d4f9d1e3744547b54469518a466e475573b2464f975238c0bb813e2c0f457e3f44c59fafeef0753b708c265b56d0c0f8c
+  metadata.gz: fb0f959d0a25b6a6f46b3fc4827e6a7cd50fa231df25b15afdc38824951a6e3c1f495fb00fbb94d5da50e1fa65bc68dc0101358da35aedf4539791ab8a31a7a8
+  data.tar.gz: a0d8c7d3baadb9a4118e558c2e1c58f27c5f8f37fd7498c36624c5daf8b2924dda0632f3d908782e3d54ad06d67abb68b9043d43231ea92159fe9ee9af9d16fb

data/bin/gemwarrior

@@ -8,7 +8,12 @@ require_relative '../lib/gemwarrior/version'
 
 include Gemwarrior
 
-GAME_NAME = 'Gem Warrior'
+GAME_NAME         = 'Gem Warrior'
+GW_HOME_DIRECTORY = "#{Dir.home}/.gemwarrior"
+GW_SAVE_FILE_YAML = "#{Dir.home}/.gemwarrior/gw_sav.yaml"
+GW_SAVE_FILE_BIN  = "#{Dir.home}/.gemwarrior/gw_sav.dat"
+GW_OPTS_FILE      = "#{Dir.home}/.gemwarrior/gw_opts"
+GW_LOG_FILE       = "#{Dir.home}/.gemwarrior/gw_log"
 
 def parse_options_cli
   options = {
@@ -95,11 +100,19 @@ def read_options_file
   nil
 end
 
+def init_config
+  Dir.mkdir(GW_HOME_DIRECTORY) unless Dir.exist?(GW_HOME_DIRECTORY)
+
+  GameOptions.add 'save_file_mode', 'Y'
+  GameOptions.add 'save_file_yaml_path',  GW_SAVE_FILE_YAML
+  GameOptions.add 'save_file_bin_path',   GW_SAVE_FILE_BIN
+  GameOptions.add 'log_file_path',        GW_LOG_FILE
+  GameOptions.add 'options_file_path',    GW_OPTS_FILE
+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"
-  
+  init_config
+
   options = parse_options_cli
 
   Gemwarrior::Game.new(options)

data/data/locations.yml

@@ -92,7 +92,7 @@
   
 -
   name:                 'Metal Tunnel (South Entrance)'
-  description:          'You are in a tightly-enclosed tunnel running under the ground. The walls are made of shiny, smooth material you think may be some kindof metal. It is claustrophobic, to say the least.'
+  description:          'You are in a tightly-enclosed tunnel running under the ground. The walls are made of shiny, smooth material you think may be some kind of metal. It is claustrophobic, to say the least.'
   danger_level:         :moderate
   coords:
     x: 8

data/lib/gemwarrior/entities/creature.rb

@@ -5,18 +5,8 @@ require_relative 'entity'
 
 module Gemwarrior
   class Creature < Entity
-    attr_accessor :face, 
-                  :hands, 
-                  :mood, 
-                  :level, 
-                  :xp, 
-                  :hp_cur, 
-                  :hp_max, 
-                  :atk_lo, 
-                  :atk_hi, 
-                  :defense, 
-                  :dexterity, 
-                  :inventory, 
-                  :rox
+    attr_accessor :face, :hands, :mood,
+                  :level, :xp, :hp_cur, :hp_max, :atk_lo, :atk_hi,
+                  :defense, :dexterity, :inventory, :rox
   end
 end

data/lib/gemwarrior/entities/entity.rb

@@ -5,16 +5,15 @@ module Gemwarrior
   class Entity
     # CONSTANTS
     WRAP_WIDTH = 80
-    
-    attr_accessor :name, 
-                  :description
+
+    attr_accessor :name, :description
 
     def status
       status_text =  name.ljust(26).upcase.colorize(:green)
       status_text << "#{description}\n".colorize(:white)
     end
-    
-    def puts(s='', width=WRAP_WIDTH)
+
+    def puts(s = '', width = WRAP_WIDTH)
       super s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") unless s.nil?
     end
   end

data/lib/gemwarrior/entities/item.rb

@@ -5,16 +5,15 @@ require_relative 'entity'
 
 module Gemwarrior
   class Item < Entity
-    attr_accessor :atk_lo, 
-                  :atk_hi, 
-                  :takeable, 
-                  :useable, 
-                  :equippable, 
-                  :equipped,
-                  :consumable,
-                  :use,
-                  :used,
-                  :number_of_uses
+    attr_accessor :atk_lo, :atk_hi, :takeable, :useable, :equippable, :equipped,
+                  :consumable, :use, :used, :number_of_uses
+
+    def initialize
+      self.equipped       = false
+      self.consumable     = false
+      self.used           = false
+      self.number_of_uses = nil
+    end
 
     def use(inventory = nil)
       'That item does not do anything...yet.'
@@ -23,10 +22,12 @@ module Gemwarrior
     def describe
       status_text =  name.upcase.colorize(:green)
       status_text << "\n#{description} \n".colorize(:white)
-      status_text << "ATTACK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)} ".colorize(:white) unless atk_lo.nil?
-      status_text << "TAKEABLE? #{takeable} ".colorize(:white)
-      status_text << "USEABLE? #{useable} ".colorize(:white)
-      status_text << "EQUIPPABLE? #{equippable} ".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 << "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 << "\n"
     end
   end

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Apple < Item
     def initialize
+      super
+
       self.name         = 'apple'
       self.description  = 'Reddish-orangeish in color, this fruit looks sweet, but it is heavy and feels more like a rock you would sooner not bite into.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = false
       self.equippable   = false
-      self.equipped     = false
     end
   end
 end

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class ArenaDoor < Item
     def initialize
+      super
+
       self.name         = 'arena_door'
       self.description  = 'The Arena is massive, with its numerous columns and stone walls stretching to the sky, but its entrance door is no slouch, keeping apace. Made of reinforced granite and impossible to break down, it nevertheless opens for you while battles are in session.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = false
       self.equippable   = false
-      self.equipped     = false
     end
   end
 end

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

@@ -10,6 +10,8 @@ module Gemwarrior
     ARENA_MASTER_NAME = 'Iolita'
 
     def initialize
+      super
+
       self.name         = 'arena_master'
       self.description  = 'She wears simple clothing, but carries herself with an air of authority. You think she may be the person to talk with if you want to engage in battle.'
       self.atk_lo       = nil
@@ -17,7 +19,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -9,6 +9,8 @@ module Gemwarrior
     USE_TEXT = '** ZZZZZ **'
 
     def initialize
+      super
+
       self.name         = 'bed'
       self.description  = 'The place where you sleep when you are not adventuring.'
       self.atk_lo       = nil
@@ -16,7 +18,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Couch < Item
     def initialize
+      super
+
       self.name         = 'couch'
       self.description  = 'Ever wanted to sit on a cloud? Now is your chance.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,14 +6,15 @@ require_relative '../item'
 module Gemwarrior
   class Cup < Item
     def initialize
+      super
+
       self.name         = 'cup'
-      self.description  = 'A nice, stone mug, perfect for putting things into and then using to carry such things from place to place.'
+      self.description  = 'A nice stone mug, perfect for putting things into and then using to carry such things from place to place.'
       self.atk_lo       = nil
       self.atk_hi       = nil
       self.takeable     = true
       self.useable      = false
       self.equippable   = false
-      self.equipped     = false
     end
   end
 end

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Dagger < Item
     def initialize
+      super
+
       self.name         = 'dagger'
       self.description  = 'Flint that has been sharpened to a point, attached to a block of smooth granite by thin rope. Truly a work of art.'
       self.atk_lo       = 1
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = false
       self.equippable   = true
-      self.equipped     = false
     end
   end
 end

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Dehumidifier < Item
     def initialize
+      super
+
       self.name         = 'dehumidifier'
       self.description  = 'Petals the color of clear sky and a stem of bright white. A most curious plant.'
       self.atk_lo       = 2
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = false
       self.equippable   = true
-      self.equipped     = false
     end
   end
 end

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Feather < Item
     def initialize
+      super
+
       self.name         = 'feather'
       self.description  = 'A blue and green feather. It is soft and tender, unlike the craven bird that probably shed it.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = false
       self.equippable   = false
-      self.equipped     = false
     end
   end
 end

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

@@ -9,6 +9,8 @@ module Gemwarrior
     MOVE_TEXT = '*** SHOOOOOM ***'
 
     def initialize
+      super
+
       self.name         = 'floor_tile'
       self.description  = 'One of the floor tiles, rough-hewn but immaculate, looks...off. Pressable, even.'
       self.atk_lo       = nil
@@ -16,7 +18,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Flower < Item
     def initialize
+      super
+
       self.name         = 'flower'
       self.description  = 'Petals the color of clear sky and a stem of bright white. A most curious plant.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = false
       self.equippable   = false
-      self.equipped     = false
     end
   end
 end

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Gun < Item
     def initialize
+      super
+
       self.name         = 'gun'
       self.description  = 'Pew pew goes this firearm, you suspect.'
       self.atk_lo       = 2
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = true
       self.equippable   = true
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Herb < Item
     def initialize
+      super
+
       self.name         = 'herb'
       self.description  = 'Green and leafy, this wild herb looks edible.'
       self.atk_lo       = nil
@@ -14,7 +16,6 @@ module Gemwarrior
       self.useable      = true
       self.consumable   = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Keystone < Item
     def initialize
+      super
+
       self.name         = 'keystone'
       self.description  = 'Certainly greater than the sum of its parts, this smallish stone glows faintly and feels slick to the touch.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = false
       self.equippable   = false
-      self.equipped     = false
     end
   end
 end

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

@@ -9,6 +9,8 @@ module Gemwarrior
     USE_TEXT = '*** THUMP ***'
 
     def initialize
+      super
+
       self.name         = 'ladder'
       self.description  = 'Rickety and crudely-fashioned, this ladder descends down into the dropoff, hopefully heading towards something...anything.'
       self.atk_lo       = nil
@@ -16,7 +18,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Letter < Item
     def initialize
+      super
+
       self.name         = 'letter'
       self.description  = 'A single page of thin paper, folded at the middle, with some excellent penmanship impressed upon it.'
       self.atk_lo       = nil
@@ -13,8 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
-      self.used         = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Mace < Item
     def initialize
+      super
+
       self.name         = 'mace'
       self.description  = 'Sharp spikes atop a steel ball, affixed to a sturdy wooden handle. You could do damage with this.'
       self.atk_lo       = 4
@@ -14,7 +16,6 @@ module Gemwarrior
       self.useable      = true
       self.consumable   = false
       self.equippable   = true
-      self.equipped     = false
     end
     
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Map < Item
     def initialize
+      super
+
       self.name         = 'map'
       self.description  = 'The land of Jool is contained on this piece of canvas, in a useful, if not very detailed, manner.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class MassiveDoor < Item
     def initialize
+      super
+
       self.name         = 'massive_door'
       self.description  = 'Translucent, but not transparent, this door constructed of condensed water vapor is like nothing you have ever seen. It has no keyhole, but it does have a stone-shaped depression floating centrally within it.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Opalaser < Item
     def initialize
+      super
+
       self.name         = 'opalaser'
       self.description  = 'Gleaming with supernatural light, this object feels alien, yet familiar.'
       self.atk_lo       = 9
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = true
       self.equippable   = true
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -11,6 +11,8 @@ module Gemwarrior
     attr_accessor :switches
 
     def initialize
+      super
+
       self.name         = 'pedestal'
       self.description  = 'A pedestal about 4 feet in height rises up from the ground, with six switches arranged vertically above a large gem affixed to the top. The switches each have a word next to them in some language that looks familiar yet strange. Each letter is made of some kind of ink crudely splashed on stone, and each can be moved to arrange them in a different fashion than they are now. The large gem glitters with utter brilliance.'
       self.atk_lo       = nil
@@ -18,7 +20,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
       self.switches     = init_switches
     end
 

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

@@ -9,6 +9,8 @@ module Gemwarrior
     NEEDED_ITEMS = ['dehumidifier', 'feather', 'gun', 'stalactite']
 
     def initialize
+      super
+
       self.name         = 'pond'
       self.description  = 'This tiny pool of water self-ripples every minute or so. Small, floating insects buzz around merrily. A small plaque lays at the foot, reading: "If the right objects curious doth possess, touch the water\'s surface and you\'ll get redress."'
       self.atk_lo       = nil
@@ -16,7 +18,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Rope < Item
     def initialize
+      super
+
       self.name         = 'rope'
       self.description  = 'For some reason, a sturdy rope hangs down from a small opening in the metal tunnel\'s ceiling. It appears to hold your weight when taut.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -15,6 +15,8 @@ module Gemwarrior
     PLAYER_COMMAND_INVALID  = '>> "Huh?"'
 
     def initialize
+      super
+
       self.name         = 'small_hole'
       self.description  = 'Amongst the rubble of the alcove, a small hole, barely big enough for a rodent, exists in an absently-minded way near the bottom of the wall.'
       self.atk_lo       = nil
@@ -22,7 +24,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
     
     def use(player = nil)

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

@@ -9,6 +9,8 @@ module Gemwarrior
     USE_TEXT = '*** FOOOOSH ***'
 
     def initialize
+      super
+
       self.name         = 'snowman'
       self.description  = 'Standing solemnly in the snow, a man of snow solemnly stands.'
       self.atk_lo       = nil
@@ -16,7 +18,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class SparklyThing < Item
     def initialize
+      super
+
       self.name         = 'Sparkly Thing(tm)'
       self.description  = 'The sparkling that this thing does is unimaginably brilliant.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Spear < Item
     def initialize
+      super
+
       self.name         = 'spear'
       self.description  = 'Sharp spikes atop a steel ball, affixed to a sturdy wooden handle. You could do damage with this.'
       self.atk_lo       = 3
@@ -14,7 +16,6 @@ module Gemwarrior
       self.useable      = true
       self.consumable   = false
       self.equippable   = true
-      self.equipped     = false
     end
     
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Stalactite < Item
     def initialize
+      super
+
       self.name         = 'stalactite'
       self.description  = 'Long protrusion of cave adornment, broken off and fallen to the ground, where the stalagmites sneer at it from.'
       self.atk_lo       = 2
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = true
       self.useable      = false
       self.equippable   = true
-      self.equipped     = false
     end
   end
 end

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

@@ -6,14 +6,20 @@ require_relative '../item'
 module Gemwarrior
   class Stone < Item
     def initialize
+      super
+
       self.name         = 'stone'
       self.description  = 'A small, sharp mega pebble, suitable for tossing in amusement, and perhaps combat.'
       self.atk_lo       = 1
       self.atk_hi       = 2
       self.takeable     = true
-      self.useable      = false
+      self.useable      = true
       self.equippable   = true
-      self.equipped     = false
+    end
+    
+    def use(player = nil)
+      puts 'You toss the stone a few feet into the air, and then it falls back into your palm. The experience was truly thrilling.'
+      { type: nil, data: nil }
     end
   end
 end

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Stonemite < Item
     def initialize
+      super
+
       self.name         = 'stonemite'
       self.description  = 'Stubby cave debris that is neat to look at, as it is off-grey and sparkly, but the size makes it unusable as anything but skipping on a lake.'
       self.atk_lo       = nil

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Tent < Item
     def initialize
+      super
+
       self.name           = 'tent'
       self.description    = 'A magical, two-room suite pops up when you flick this otherwise folded piece of canvas just right, perfect for a night\'s rest.'
       self.atk_lo         = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable       = true
       self.useable        = true
       self.equippable     = false
-      self.equipped       = false
       self.number_of_uses = 5
     end
 

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Throne < Item
     def initialize
+      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.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = false
       self.equippable   = false
-      self.equipped     = false
     end
   end
 end

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Tree < Item
     def initialize
+      super
+
       self.name         = 'tree'
       self.description  = 'A mighty representation of nature, older than your father\'s father\'s second great-uncle.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = false
       self.equippable   = false
-      self.equipped     = false
     end
   end
 end

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

@@ -15,6 +15,8 @@ module Gemwarrior
     PLAYER_COMMAND_INVALID  = '>> "That means nothing to me."'
 
     def initialize
+      super
+
       self.name         = '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.'
       self.atk_lo       = nil
@@ -22,7 +24,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

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

@@ -6,6 +6,8 @@ require_relative '../item'
 module Gemwarrior
   class Waterfall < Item
     def initialize
+      super
+
       self.name         = 'waterfall'
       self.description  = 'Gallons of murky, sparkling water fall downward from an unknown spot in the sky, ending in a pool on the ground, yet never overflowing.'
       self.atk_lo       = nil
@@ -13,7 +15,6 @@ module Gemwarrior
       self.takeable     = false
       self.useable      = true
       self.equippable   = false
-      self.equipped     = false
     end
 
     def use(player = nil)

data/lib/gemwarrior/evaluator.rb

@@ -542,7 +542,7 @@ module Gemwarrior
 
     def try_to_move_player(direction)
       if world.can_move?(direction)
-        world.player.go(world.locations, direction, GameOptions.data['sound_enabled'], GameOptions.data['sound_volume'])
+        world.player.go(world.locations, direction)
         world.location_by_coords(world.player.cur_coords).checked_for_monsters = false
         world.describe(world.location_by_coords(world.player.cur_coords))
       else

data/lib/gemwarrior/game.rb

@@ -20,7 +20,7 @@ module Gemwarrior
     include PlayerLevels
 
     # CONSTANTS
-    PLAYER_DESC_DEFAULT       = 'Picked to do battle against a wizened madman for a shiny something or other for world-saving purposes.'
+    PLAYER_DESC_DEFAULT       = "Picked to do battle against a wizened madman for a shiny something\nor other for world-saving purposes."
     PLAYER_INVENTORY_DEFAULT  = Inventory.new
     PLAYER_INVENTORY_DEBUG    = Inventory.new([Herb.new])
     PLAYER_ROX_DEFAULT        = 0

data/lib/gemwarrior/inventory.rb

@@ -1,6 +1,8 @@
 # lib/gemwarrior/inventory.rb
 # Collection of items a creature possesses
 
+require_relative 'game_options'
+
 module Gemwarrior
   class Inventory
     # CONSTANTS
@@ -35,7 +37,11 @@ module Gemwarrior
       if contains_item?(item_name)
         items.each do |i|
           if i.name.eql?(item_name)
-            return i.description
+            if GameOptions.data['debug_mode']
+              return i.describe
+            else
+              return i.description
+            end
           end
         end
       else

data/lib/gemwarrior/repl.rb

@@ -37,10 +37,10 @@ module Gemwarrior
       clocker = Clocker.new
 
       at_exit do
-        pl = world.player
-        duration = clocker.stop
+        world.duration = clocker.stop
         game.update_options_file
-        log_stats(duration, pl)
+        log_stats(world.duration, world.player)
+        #save_game(world)
       end
 
       clocker.clock do
@@ -161,19 +161,19 @@ module Gemwarrior
       end
     end
 
-    def display_record_of_attempts
+    def display_log_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
         if GameOptions.data['debug_mode']
-          print 'Clear record of attempts (y/n)? '
+          print 'Clear log 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!'
+            puts 'Log of attempts: erased!'
           end
 
           puts
@@ -204,10 +204,11 @@ module Gemwarrior
       puts "      GW v#{Gemwarrior::VERSION}"
       puts '======================='
       puts ' (N)ew Game'
+      #puts ' (R)esume Game' if save_file_exist?
       puts ' (A)bout'
       puts ' (H)elp'
       puts ' (O)ptions'
-      puts ' (R)ecord of Attempts'
+      puts ' (L)og of Attempts'
       puts ' (C)heck for Updates'
       puts ' (E)xit'
       puts '======================='
@@ -226,11 +227,26 @@ module Gemwarrior
 
       case choice
       when 'n'
-        clear_screen
-        play_intro_tune
-        print_splash_message
-        print_fortune
-        return
+        #if overwrite_save?
+          clear_screen
+          play_intro_tune
+          print_splash_message
+          print_fortune
+          return
+        #else
+        #  run_main_menu
+        #end
+=begin
+      when 'r'
+        if save_file_exist?
+          result = resume_game
+          if result.nil?
+            run_main_menu
+          elsif
+            self.world = result
+          end
+        end
+=end
       when 'a'
         puts choice
         print_about_text
@@ -243,9 +259,9 @@ module Gemwarrior
         puts choice
         print_options
         run_main_menu
-      when 'r'
+      when 'l'
         puts choice
-        display_record_of_attempts
+        display_log_of_attempts
         run_main_menu
       when 'c'
         puts choice
@@ -262,10 +278,13 @@ module Gemwarrior
     end
 
     def log_stats(duration, pl)
+      # display stats upon exit
       puts '######################################################################'
       print 'Gem Warrior'.colorize(color: :white, background: :black)
       print " v#{Gemwarrior::VERSION}".colorize(:yellow)
-      print " played for #{duration[:mins].to_s.colorize(color: :white, background: :black)} mins, #{duration[:secs].to_s.colorize(color: :white, background: :black)} secs, and #{duration[:ms].to_s.colorize(color: :white, background: :black)} ms\n"
+      print " played for #{duration[:mins].to_s.colorize(color: :white, background: :black)} min(s),"
+      print " #{duration[:secs].to_s.colorize(color: :white, background: :black)} sec(s),"
+      print " and #{duration[:ms].to_s.colorize(color: :white, background: :black)} ms\n"
       puts  '----------------------------------------------------------------------'
       print "Player killed #{pl.monsters_killed.to_s.colorize(color: :white, background: :black)} monster(s)"
       print "\n".ljust(8)
@@ -285,6 +304,90 @@ module Gemwarrior
       end
     end
 
+    def save_game(world)
+      mode = GameOptions.data['save_file_mode']
+      puts 'Saving game...'
+      
+      if mode.eql? 'Y'
+        File.open(GameOptions.data['save_file_yaml_path'], 'w+') do |f|
+          f.write YAML::dump(world)
+        end
+      elsif mode.eql? 'M'
+        File.open(GameOptions.data['save_file_bin_path'], 'w+') do |f|
+          f.write Marshal::dump(world)
+        end
+      else
+        puts 'Error: Save file mode not set. Game not saved.'
+        return
+      end
+      puts 'Game saved!'
+    end
+
+    def save_file_exist?
+      mode = GameOptions.data['save_file_mode']
+      if mode.eql? 'Y'
+        File.exist?(GameOptions.data['save_file_yaml_path'])
+      elsif mode.eql? 'M'
+        File.exist?(GameOptions.data['save_file_bin_path'])
+      else
+        false
+      end
+    end
+   
+    def resume_game
+      mode = GameOptions.data['save_file_mode']
+      puts 'Resuming game...'
+
+      if save_file_exist?
+        if mode.eql? 'Y'
+          if File.exist?(GameOptions.data['save_file_yaml_path'])
+            File.open(GameOptions.data['save_file_yaml_path'], 'r') do |f|
+              return YAML::load(f)
+            end
+          else
+            puts 'No save file exists.'
+            nil
+          end
+        elsif mode.eql? 'M'
+          if File.exist?(GameOptions.data['save_file_marshal_path'])
+            File.open(GameOptions.data['save_file_marshal_path'], 'r') do |f|
+              return Marshal::load(f)
+            end
+          else
+            puts 'No save file exists.'
+            nil
+          end
+        end
+      end
+    end
+    
+    def overwrite_save?
+      mode = GameOptions.data['save_file_mode']
+      save_file_path = ''
+      
+      if mode.eql? 'Y'
+        save_file_path = GameOptions.data['save_file_yaml_path']
+      elsif mode.eql? 'M'
+        save_file_path = GameOptions.data['save_file_marshal_path']
+      end
+      
+      if File.exist?(save_file_path)
+        print 'Overwrite existing save file? (y/n) '
+        answer = gets.chomp.downcase
+          
+        case answer
+        when 'y'
+          puts 'New game started! Press any key to continue.'
+          gets
+          return true
+        else
+          puts 'New game aborted.'
+          return false
+        end
+      end
+      true
+    end
+
     def play_intro_tune
       Music::cue([
         { frequencies: 'A3,E4,C#5,E5',  duration: 300 },

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -16,12 +16,13 @@ module Gemwarrior
     WORLD_DIM_WIDTH               = 10
     WORLD_DIM_HEIGHT              = 10
 
-    attr_accessor :monsters, :locations, :player
+    attr_accessor :monsters, :locations, :player, :duration
 
     def initialize
       self.monsters   = init_monsters
       self.locations  = init_locations
       self.player     = nil
+      self.duration   = nil
     end
 
     def print_vars

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.37
+  version: 0.9.39
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os