gemwarrior 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877ec35a557a565c6297fd1254125da52bd0f994
-  data.tar.gz: 3e81dde82503f12558cab8de01604342e1794512
+  metadata.gz: 3fd4f2829fa36f0e9733feaeb0af9a3736b4e01c
+  data.tar.gz: 4fef9b71b92f45d5922a6af56cd01733221eac6c
 SHA512:
-  metadata.gz: 57f4c3245515b5af14ab08c55247340fe6aba4c1f9ec68ba7863d4c44478c4e76f6a78c8fde8bcd31daf5b2bde0cb5f87ea208871793fd88bbe21ee3b8576463
-  data.tar.gz: b9aaa6b225669244a13d2e9405cf1961fd868b1ad150a997c33e2c9cb35024a93d4a3836bfd2233c5ba6f3a20a66f7c9ec9c34e657c941f80d3c1e2c80404e51
+  metadata.gz: 6c334208a7d95f2d6ff4f838b07b46f3de2793c6f3d050c4a0923f16d84fa035564b76a969699e67b7d91b194fc6284e84a165054f84e3718d565c48878ddca9
+  data.tar.gz: 484df509d4ea830a7f0bd538ad98e8980b5de3bbf37dbcd623f0bf5087e2bc640b715cf0e5cbd293f9bead938c12cd1819191ea32ecf048e21123917e1095d17

data/lib/gemwarrior/entities/player.rb

@@ -34,7 +34,7 @@ module Gemwarrior
       self.defense            = options.fetch(:defense)
       self.dexterity          = options.fetch(:dexterity)
 
-      self.inventory          = Inventory.new([Herb.new])
+      self.inventory          = options.fetch(:inventory)
       self.rox                = options.fetch(:rox)
 
       self.stam_cur           = options.fetch(:stam_cur)

data/lib/gemwarrior/evaluator.rb

@@ -290,9 +290,6 @@ module Gemwarrior
                   result = i.use(world.player)
                   if i.consumable
                     world.player.inventory.remove_item(i.name)
-                    return
-                  else
-                    return
                   end
                 else
                   return ERROR_USE_PARAM_UNUSEABLE
@@ -306,9 +303,6 @@ module Gemwarrior
                   result = i.use(world.player)
                   if i.consumable
                     world.location_by_coords(world.player.cur_coords).remove_item(i)
-                    return
-                  else
-                    return
                   end
                 else
                   return ERROR_USE_PARAM_UNUSEABLE
@@ -316,7 +310,7 @@ module Gemwarrior
               end
             end
           end
-
+binding.pry
           if result.nil?
             ERROR_USE_PARAM_INVALID
           else

data/lib/gemwarrior/game.rb

@@ -6,6 +6,7 @@ require 'matrext'
 require 'feep'
 
 require_relative 'entities/player'
+require_relative 'entities/items/herb'
 require_relative 'misc/player_levels'
 require_relative 'misc/animation'
 require_relative 'misc/music'
@@ -22,7 +23,9 @@ module Gemwarrior
     ## 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])
     PLAYER_ROX_DEFAULT        = 0
+    PLAYER_ROX_DEBUG          = 300
 
     attr_accessor :world, :eval, :repl
 
@@ -48,8 +51,8 @@ module Gemwarrior
         :atk_hi             => start_stats[:atk_hi],
         :defense            => start_stats[:defense],
         :dexterity          => start_stats[:dexterity],
-        :inventory          => PLAYER_INVENTORY_DEFAULT,
-        :rox                => world.debug_mode ? 300 : PLAYER_ROX_DEFAULT,
+        :inventory          => world.debug_mode ? PLAYER_INVENTORY_DEBUG : PLAYER_INVENTORY_DEFAULT,
+        :rox                => world.debug_mode ? PLAYER_ROX_DEBUG : PLAYER_ROX_DEFAULT,
         :cur_coords         => world.location_coords_by_name('Home'),
 
         :god_mode           => options.fetch(:god_mode),

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = "0.9.2"
+  VERSION = '0.9.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Michael Chadwick
@@ -288,10 +288,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: RPG as RubyGem
-test_files:
-- spec/rubywarrior_spec.rb
-- spec/spec_helper.rb
+test_files: []