gemwarrior 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8acc1c9ce2018d794446c702f93efb774610129
-  data.tar.gz: 51f0de0a987f87a73a2bc14ab8ab284aedcd8a30
+  metadata.gz: 12fc722dae2f01988303b53b5e3a1c27f0a22487
+  data.tar.gz: 502c5204a3625853f80b74f6e1951c767cda4c62
 SHA512:
-  metadata.gz: bad25daf8fff7a7c32ca98991183d4f4b7f0fb4b170dbcdd3d5eb59edf1640728edb7a3537ed25986d08c84a76555456b334ba36a4b1b0839b3d45b2d15fa2c5
-  data.tar.gz: d74d03c9e9941c7061ca5ac720c9700adc1fbe8672b79cffdeb7fa4995f77687a07b356eed65ba89767565632539b989cb43175d3df059fa397fdd2693086bdb
+  metadata.gz: f412d1d8c8e8ce60b653e35a858f12b177f756b4aac6cade2c9364b125b2745907118dd0264844166350132782ab75b24125283d1a94050e6e9e73e7ade17338
+  data.tar.gz: 9cb728e2d038b00a55162fba7eb1689e5bad4e63dccd9a6fe8f33576e0588449e863d565e2a9fe15bec48e7fba104eb3e950ff8b9203b4b65360b8489b15968e

data/data/locations.yml

@@ -690,7 +690,7 @@
 
 -
   name:                 'Plains (South of River)'
-  description:          'A raging river borders the northern side of this bucolic vista.'
+  description:          'A raging river borders the northern side of this bucolic vista. Much raucous noise comes from the east.'
   danger_level:         :low
   coords:
     x: 5
@@ -698,13 +698,65 @@
     z: 0
   locs_connected:
     north: false
-    east:  false
+    east:  true
     south: true
     west:  true
   monster_level_range:
     lo: 2
     hi: 3
-
+ 
+-
+  name:                 'Plains (South-Southeast)'
+  description:          'The river continues to flow north of you, as plains stretch out all around. The noise from the east is quite loud, and a building can be seen in the near distance.'
+  danger_level:         :low
+  coords:
+    x: 6
+    y: 3
+    z: 0
+  locs_connected:
+    north: false
+    east:  true
+    south: false
+    west:  true
+  monster_level_range:
+    lo: 2
+    hi: 3
+ 
+- 
+  name:                 'Plains (Arena Entrance)'
+  description:          'Well above the noise of the raging river nearby, the din of the mighty Arena reaches its near fever-pitch just outside. The door, and battle, beckons.'
+  danger_level:         :low
+  coords:
+    x: 7
+    y: 3
+    z: 0
+  locs_connected:
+    north: false
+    east:  true
+    south: false
+    west:  true
+  monster_level_range:
+    lo: 2
+    hi: 3
+  items:
+  - ArenaDoor
+ 
+- 
+  name:                 'Arena'
+  description:          'Dangerous and risky, the Arena allows would-be monster-slayers and adventurers fight against an infinite number of beasts in order to test their mettle and improve their skill...for a small fee, of course.'
+  danger_level:         :none
+  coords:
+    x: 8
+    y: 3
+    z: 0
+  locs_connected:
+    north: false
+    east:  false
+    south: false
+    west:  true
+  items:
+  - ArenaMaster
+  
 -
   name:                 'Plains (South of Bridge)'
   description:          'To the north of these fields lies a bridge that may be crossable.'

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

@@ -0,0 +1,19 @@
+# lib/gemwarrior/entities/items/arena_door.rb
+# Item::ArenaDoor
+
+require_relative '../item'
+
+module Gemwarrior
+  class ArenaDoor < Item
+    def initialize
+      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
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = false
+      self.equippable   = false
+      self.equipped     = false
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# lib/gemwarrior/entities/items/arena_master.rb
+# Item::ArenaMaster
+
+require_relative '../item'
+
+module Gemwarrior
+  class ArenaMaster < Item
+    # CONSTANTS
+    ARENA_FEE = 50
+  
+    def initialize
+      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
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+    
+    def use(player = nil)
+      puts 'You approach the Arena Master and ask to fight. She snickers to herself, but sees you have a good spirit about you.'
+      puts
+      
+      if player.rox >= 50
+        puts "She asks for the requisite payment: #{ARENA_FEE} rox. Do you pay up? (Y/N)"
+        answer = gets.chomp.downcase
+        case answer
+        when 'y', 'yes'
+          puts 'She pockets the money and motions toward the center of the arena. She reminds you that you will be facing an ever-worsening onslaught of monsters. Each one you dispatch nets you a bonus cache of rox in addition to whatever the monster gives you. You will also become more experienced the longer you last. Finally, you can give up at any time between battles.'
+          puts
+          puts 'She finishes by wishing you good luck!'
+          
+          return {:type => 'arena', :data => nil}
+        else
+          puts 'She gives you a dirty look, as you have obviously wasted her time. You are told not to mess around with her anymore, and she turns away from you.'
+          puts
+          return {:type => nil, :data => nil}
+        end
+      else
+        puts 'She can tell you seem particularly poor today and says to come back when that has changed.'
+        puts
+        return {:type => nil, :data => nil}
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       Animation::run({:phrase => '** ZZZZZ **'})
       puts 'You unmake the bed, get under the covers, close your eyes, and begin to think about all the things you need to do today. You realize sleep is not one of them and quickly get back up, remake the bed, and get on about your day.'
       puts '>> You regain a few hit points.'

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'Your body comes to rest somewhere below the surface of the cloudy apparatus, almost as if it were floating *amongst* the couch. The feeling is heavenly, and you actually feel somewhat better after getting back up.'
       puts '>> You regain a hit point.'
       {:type => 'rest', :data => 1}

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You slowly lower your foot onto the tile, and then gently depress it, through the floor. Your whole body begins to feel light, lifeless. You black out.'
       puts
       

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You pull the trigger on the gun, but realize there are no bullets in it. So, it does not do much except cause a barely audible *click* sound.'
       {:type => nil, :data => nil}
     end

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You place the herb in your mouth, testing its texture. The mysterious herb is easily chewable, and you are able to swallow it without much effort. Slight tingles travel up and down your spine.'
       puts '>> You regain a few hit points.'
       {:type => 'health', :data => rand(3..5)}

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You grab onto the shaky, rough-hewn, wooden ladder with all your might and start to descend, being extra careful not to loose your grip, which with every moment becomes shakier and shakier.'
       puts
 

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

@@ -16,9 +16,9 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You attempt to open the seriously massive door that separates you from Emerald himself.'
-      if inventory.has_item?('keystone')
+      if player.inventory.has_item?('keystone')
         puts 'The keystone in your inventory glows as you approach the incredibly titanic-sized door, so you naturally pull it out and thrust it into the stone-shaped depression within the cloudy obstruction. The door "opens" in a way and you can now pass through.'
         {:type => 'move', :data => 'Sky Tower (Throne Room)'}
       else

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You hold on to the rope with both hands and begin to climb upwards towards the small opening in the ceiling.'
       puts
 

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You go to touch the snowy softness of the snowman when it magically comes to life! The frozen homunculus grabs you by the wrist and tosses you to the ground, only to follow this up by jumping onto you with its full, freezing, force. Your body, and mind, go numb.'
       puts
 

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'Everything, and I mean *everything*, begins to sparkle. Huh.'
       puts
       {:type => nil, :data => nil}

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       {:type => 'action', :data => 'rest'}
     end
   end

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You move the switch from "No" to "Yes". Suddenly, a great wind picks up and you are gently lifted up by it. The ground moves away and your whole body begins to gently drift towards Emerald\'s compound high in the stratosphere.'
       puts
 

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

@@ -16,7 +16,7 @@ module Gemwarrior
       self.equipped     = false
     end
     
-    def use(inventory = nil)
+    def use(player = nil)
       puts 'You stretch out your hand and touch the waterfall. It stings you with its cold and forceful gushing. Your hand is now wet and rougher than before. In time, it will dry.'
       {:type => 'dmg', :data => rand(0..1)}
     end

data/lib/gemwarrior/evaluator.rb

@@ -36,7 +36,8 @@ module Gemwarrior
     ERROR_LIST_PARAM_INVALID            = 'You cannot list that...yet.'
     ERROR_DEBUG_STAT_PARAM_MISSING      = 'You cannot just "change stats". You gotta choose a stat to change.'
     ERROR_DEBUG_STAT_PARAM_INVALID      = 'You cannot change that stat...yet.'
-    ERROR_DEBUG_TELEPORT_PARAMS_MISSING = 'You cannot just "teleport". You gotta choose somewhere to teleport to.'
+    ERROR_DEBUG_TELEPORT_PARAMS_MISSING = 'You cannot just "teleport". You gotta specify an x AND y coordinate, at least.'
+    ERROR_DEBUG_TELEPORT_PARAMS_NEEDED  = 'You cannot just "teleport" to an x coordinate without a y coordinate.'
     ERROR_DEBUG_TELEPORT_PARAMS_INVALID = 'You cannot teleport there...yet.'
     
     attr_accessor :world, 
@@ -170,6 +171,15 @@ module Gemwarrior
                   end
                 end
               end
+            when 'rox', 'r', '$'
+              unless param2.nil?
+                param2 = param2.to_i
+                if param2.is_a? Numeric
+                  if param2 >= 0
+                    world.player.rox = param2
+                  end
+                end
+              end
             else
               return ERROR_DEBUG_STAT_PARAM_INVALID
             end
@@ -182,15 +192,34 @@ module Gemwarrior
           if param1.nil?
             return ERROR_DEBUG_TELEPORT_PARAMS_MISSING
           else
-            if (param1.to_i.to_s == param1) && (param2.to_i.to_s == param2)
-              world.player.cur_coords = {:x => param1.to_i, :y => param2.to_i, :z => param3.to_i}
+            if (param1.to_i.to_s == param1)
+              # we got at least an x coordinate
+              if (param2.to_i.to_s == param2)
+                # we got a y coordinate, too
+                x_coord = param1.to_i
+                y_coord = param2.to_i
+                # grab the z coordinate, if present, otherwise default to current level
+                z_coord = param3.to_i.to_s == param3 ? param3.to_i : world.player.cur_coords[:z]
+                
+                # check to make sure new location exists
+                if world.location_by_coords({:x => x_coord, :y => y_coord, :z => z_coord})
+                  world.player.cur_coords = {:x => x_coord, :y => y_coord, :z => z_coord}
+                else
+                  return ERROR_DEBUG_TELEPORT_PARAMS_INVALID
+                end
+              else
+                # we only got an x coordinate
+                return ERROR_DEBUG_TELEPORT_PARAMS_NEEDED
+              end
             else
+              # we got a place name instead, potentially
+              place_to_match = tokens[1..tokens.length].join(' ').downcase
               locations = []
               world.locations.each do |l|
                 locations << l.name.downcase
               end
-              if locations.include?(param1.downcase)
-                world.player.cur_coords = world.location_coords_by_name(param1)
+              if locations.include?(place_to_match)
+                world.player.cur_coords = world.location_coords_by_name(place_to_match)
               else
                 return ERROR_DEBUG_TELEPORT_PARAMS_INVALID
               end
@@ -237,7 +266,7 @@ module Gemwarrior
             location_inventory.each do |i|
               if i.name.eql?(item_name)
                 if i.useable
-                  result = i.use(world.player.inventory)
+                  result = i.use(world.player)
                 else
                   return ERROR_USE_PARAM_UNUSEABLE
                 end
@@ -249,7 +278,7 @@ module Gemwarrior
               player_inventory.each do |i|
                 if i.name.eql?(item_name)
                   if i.useable
-                    result = i.use(world.player.inventory)
+                    result = i.use(world.player)
                   else
                     return ERROR_USE_PARAM_UNUSEABLE
                   end
@@ -279,6 +308,8 @@ module Gemwarrior
               if result[:data].eql?('rest')
                 world.player.rest(world)
               end
+            when 'arena'
+              return 'You enter the arena and fight some battles. It was cool, but not as cool as if it were actually implemented.'
             else
               return
             end
@@ -362,7 +393,7 @@ module Gemwarrior
     private
     
     def print_separator
-      puts "=============================="
+      puts "=================================================="
     end
 
     def list_commands

data/lib/gemwarrior/misc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Michael Chadwick
@@ -179,6 +179,8 @@ files:
 - lib/gemwarrior/entities/entity.rb
 - lib/gemwarrior/entities/item.rb
 - lib/gemwarrior/entities/items/apple.rb
+- lib/gemwarrior/entities/items/arena_door.rb
+- lib/gemwarrior/entities/items/arena_master.rb
 - lib/gemwarrior/entities/items/bed.rb
 - lib/gemwarrior/entities/items/couch.rb
 - lib/gemwarrior/entities/items/cup.rb
@@ -248,10 +250,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: []