gemwarrior 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a5c0f4d674fbc3b60e83d6e035c80c9830642b4
-  data.tar.gz: 83c0913aba4c0c8cb1449f1b0407fc2073866202
+  metadata.gz: 7d9ee449614471055090e892a1df42560c7aa007
+  data.tar.gz: 965e2ba208c084fa2a09560264bc2fc93681c85d
 SHA512:
-  metadata.gz: 6df3ec5a685a5101167ed050417d5cc49da501740ef97f6ac644431e5f84d969b013cbd5eabd49bf3e1aff0f2ec1dd438a08523eb9d04be51a7f352d3c0792a1
-  data.tar.gz: 6fb339430b354569b3aca5cf2079a801eafd5a8ca588370a529bc76123bf9ec6d738e200457fe26d517a675e5b440353cb234ab56a14f113ef6cdd23131aa9a9
+  metadata.gz: 13103d68009ab62661164fecacd8f959034078e069ce3e150935fc275659fcab5c7450a4b6496078d092f6da88731205b17301b0a11357e28a2851e41af4d0a5
+  data.tar.gz: 65b36061328f65a994f5e58fb8321a3b9b97e25aa3e5105c580751555aacb03282ad3513a965b3bde0fa662c5021e11460fef3766834b46e29c1a06b74c15cf5

data/data/locations.yml

@@ -880,6 +880,7 @@
   items:
   - Flower
   - Keystone
+  - Pond
 
 -
   name:                 'Sky Tower (Armory)'

data/lib/gemwarrior/arena.rb

@@ -38,11 +38,10 @@ module Gemwarrior
           player.xp = player.xp + bonus_xp
           puts 'You decided you\'ve had enough of the exhausting Arena for one day and exit the main stage.'
           puts "You have gained #{bonus_rox} rox and #{bonus_xp} XP!"
-          return
+
+          return print_arena_outro
         end
       end
-      
-      print_arena_outro
     end
     
     private

data/lib/gemwarrior/battle.rb

@@ -15,17 +15,18 @@ module Gemwarrior
     ## MESSAGES
     TEXT_ESCAPE                 = 'POOF'
     
-    attr_accessor :world, :player, :monster
+    attr_accessor :world, :player, :monster, :player_defending
     
     def initialize(options)
-      self.world    = options.fetch(:world)
-      self.player   = options.fetch(:player)
-      self.monster  = options.fetch(:monster)
+      self.world            = options.fetch(:world)
+      self.player           = options.fetch(:player)
+      self.monster          = options.fetch(:monster)
+      self.player_defending = false
     end
     
     def start(is_arena = nil, is_event = nil)
       print_battle_line
-      binding.pry
+
       if is_arena
         print 'Your opponent is now...'
         Animation::run({:phrase => "#{monster.name.upcase}!", :speed => :slow})
@@ -81,8 +82,21 @@ module Gemwarrior
         print "\n"
         puts
         
+        self.player_defending = false
+        
         puts 'What do you do?'
-        puts "[Fight/Attack][Look][Run]".colorize(:color => :yellow)
+        print '['.colorize(:yellow)
+        print 'F'.colorize(:green)
+        print 'ight/'.colorize(:yellow)
+        print 'A'.colorize(:green)
+        print 'ttack]['.colorize(:yellow)
+        print 'D'.colorize(:green)
+        print 'efend]['.colorize(:yellow)
+        print 'L'.colorize(:green)
+        print 'ook]['.colorize(:yellow)
+        print 'R'.colorize(:green)
+        print 'un]'.colorize(:yellow)
+        print "\n"
         
         cmd = STDIN.gets.chomp.downcase
 
@@ -100,6 +114,9 @@ module Gemwarrior
           else
             puts "You miss entirely!".colorize(:yellow)
           end
+        when 'defend', 'd'
+          puts 'You dig in and defend this round.'
+          self.player_defending = true
         when 'look', 'l'
           print "#{monster.name}".colorize(:white)
           print " (#{monster.hp_cur}/#{monster.hp_max} HP): #{monster.description}\n"
@@ -146,7 +163,9 @@ module Gemwarrior
           end
           rand(atk_range)
         else
-          rand(monster.atk_lo..monster.atk_hi)
+          dmg = rand(monster.atk_lo..monster.atk_hi)
+          dmg = dmg - (entity.defense / 2) if player_defending
+          return dmg
         end
       end
     end

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

@@ -0,0 +1,24 @@
+# lib/gemwarrior/entities/items/opalaser.rb
+# Item::Opalaser
+
+require_relative '../item'
+
+module Gemwarrior
+  class Opalaser < Item
+    def initialize
+      self.name         = 'opalaser'
+      self.description  = 'Gleaming with supernatural light, this object feels alien, yet familiar.'
+      self.atk_lo       = 10
+      self.atk_hi       = 12
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = true
+      self.equipped     = false
+    end
+    
+    def use(player = nil)
+      puts 'You pull the "trigger" on the opalaser, but nothing happens.'
+      {:type => nil, :data => nil}
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# lib/gemwarrior/entities/items/pond.rb
+# Item::Pond
+
+require_relative '../item'
+
+module Gemwarrior
+  class Pond < Item
+    # CONTACTS
+    NEEDED_ITEMS = ['dehumidifier', 'feather', 'gun', 'stalactite']
+    
+    def initialize
+      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
+      self.atk_hi       = nil
+      self.takeable     = false
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+    
+    def use(player = nil)
+      puts 'You gently place your fingers on the pond\'s rippling surface.'
+      binding.pry
+      if (NEEDED_ITEMS - player.inventory.items.map(&:name)).empty?
+        puts 'The pond water explodes with a force that knocks you back onto the ground. When you come to, you notice the depression in the ground where the pond once was now has a new curious object!'
+        self.description = 'A barren depression in the ground is all that is left of the pond.'
+        return {:type => 'item', :data => 'Opalaser'}
+      else
+        puts 'You graze your fingers within the pond for a moment, feeling the coolness. You feel zen.'
+        return {:type => nil, :data => nil}
+      end
+    end
+  end
+end

data/lib/gemwarrior/entities/location.rb

@@ -40,6 +40,14 @@ module Gemwarrior
       items.map(&:name).include?(item_name)
     end
     
+    def add_item(item_name)
+      Dir.glob('lib/gemwarrior/items/*.rb').each do |item|
+        require_relative item[item.index('/', item.index('/')+1)+1..item.length]
+      end
+
+      self.items.push(eval(item_name).new)
+    end
+    
     def remove_item(item_name)
       if has_item?(item_name)
         items.reject! { |item| item.name == item_name }

data/lib/gemwarrior/evaluator.rb

@@ -314,6 +314,9 @@ module Gemwarrior
               arena = Arena.new({:world => world, :player => world.player})
               arena.start
               #return 'You enter the arena and fight some battles. It was cool, but not as cool as if it were actually implemented.'
+            when 'item'
+              world.location_by_coords(world.player.cur_coords).add_item(result[:data])
+              return
             else
               return
             end

data/lib/gemwarrior/misc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Michael Chadwick
@@ -194,6 +194,8 @@ files:
 - lib/gemwarrior/entities/items/keystone.rb
 - lib/gemwarrior/entities/items/ladder.rb
 - lib/gemwarrior/entities/items/massive_door.rb
+- lib/gemwarrior/entities/items/opalaser.rb
+- lib/gemwarrior/entities/items/pond.rb
 - lib/gemwarrior/entities/items/rope.rb
 - lib/gemwarrior/entities/items/snowman.rb
 - lib/gemwarrior/entities/items/sparklything.rb