gemwarrior 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ea8f41e66cefdb26f55bab9513248528d266dd
-  data.tar.gz: f4aa74c3a8220b407c712e33e26231415b984c71
+  metadata.gz: b3e02eb07b6d2f5d85c69bff99e23d580e61326b
+  data.tar.gz: 8cc5438f267d75b010f7645d8da54d3dafa4a9c6
 SHA512:
-  metadata.gz: 796d0ac2f729bbf56141ce0c332b624d621b255d700d3612b00e19586c57480126d315d9e585aecbbed20fdf357eb5e129959574798a0a4a68b3677b5443fea2
-  data.tar.gz: a1d75556f09323bff027fa802e0efad73bebf1581f7d9351e6d8b06d494216cb468e90277e8357c2b441fc95473c3969c25935aee38233083b0512d9d66d8710
+  metadata.gz: 5736f18ee87c888f5a0f41ede0fbb6f5246735d6da39c6282e5649568de3d33cb0aa8d3470b0505c214af997ff0f542382dc016be5f169e6547cbf63536ad15b
+  data.tar.gz: d3d2fa237f23270f92bfaa0f73529708d9d755646dee38a1199952b7be1296a888c377a412f96073cb7fb04cfc23f2e427bb80ea73db0bb421f05e52c905d645

data/lib/gemwarrior/battle.rb

@@ -143,17 +143,16 @@ module Gemwarrior
     def take_damage(entity, dmg)
       entity.hp_cur = entity.hp_cur.to_i - dmg.to_i
       who_gets_wounded = ''
+      
       if entity.eql?(monster)
         who_gets_wounded = "> You wound #{monster.name} for "
       else
         who_gets_wounded = "> You are wounded for "
       end
-      hit = Thread.new do
-        print who_gets_wounded
-        print "#{Matrext::process({ :phrase => dmg.to_s, :speed => :slow, :oneline => true, :alpha => false, :random => false })}"
-        print " point(s)!\n"
-      end
-      return hit.join
+      
+      print who_gets_wounded
+      Animation::run({ :phrase => dmg.to_s, :speed => :slow, :oneline => true, :alpha => false, :random => false })
+      print " point(s)!\n"
     end
     
     # MONSTER
@@ -227,7 +226,6 @@ module Gemwarrior
       player.rox = player.rox + monster.rox
       
       monster_items = monster.inventory.items
-      binding.pry
       unless monster_items.nil?
         player.inventory.items.concat monster_items unless monster_items.empty?
       end
@@ -288,12 +286,7 @@ module Gemwarrior
     # STATUS TEXT
     
     def print_escape_text
-      escape = Thread.new do
-        print "* "
-        print "#{Matrext::process({ :phrase => TEXT_ESCAPE, :oneline => true })}"
-        print " *\n"
-      end
-      return escape.join
+      Animation::run({ :phrase => "* #{TEXT_ESCAPE} *", :oneline => true })
     end
     
     def print_battle_line

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

@@ -20,11 +20,7 @@ module Gemwarrior
       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
       
-      t = Thread.new do
-        print "#{Matrext::process({ :phrase => '*** SHOOOOOM ***', :oneline => true })}"
-        puts
-      end
-      t.join
+      Animation::run({ :phrase => '*** SHOOOOOM ***' })
       
       {:type => 'move', :data => 'Sky Tower (Entrance)'}
     end

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

@@ -20,11 +20,7 @@ module Gemwarrior
       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
 
-      t = Thread.new do
-        print "#{Matrext::process({ :phrase => '*** WHOOOOOSH ***', :oneline => true })}"
-        puts
-      end
-      t.join
+      Animation::run({ :phrase => '*** WHOOOOOSH ***' })
 
       {:type => 'move', :data => 'Sky Tower (Foyer)'}
     end

data/lib/gemwarrior/entities/player.rb

@@ -174,19 +174,14 @@ module Gemwarrior
     private
 
     def player_death
-      puts 'You\'re actions have reduced you to death.'.colorize(:red)
+      puts 'Your actions have reduced you to death.'.colorize(:red)
       puts 'Your adventure ends here. Try again next time!'.colorize(:red)
       exit(0)
     end
     
     # TRAVEL    
     def print_traveling_text(direction_text)
-      loc = Thread.new do
-        print "* "
-        print "#{Matrext::process({ :phrase => direction_text, :oneline => true })}"
-        print " *\n"
-      end
-      return loc.join
+      Animation::run({:oneline => false, :phrase => "* #{direction_text} *"})
     end
     
     # CHARACTER

data/lib/gemwarrior/evaluator.rb

@@ -113,7 +113,7 @@ module Gemwarrior
           end
         when 'map', 'm'
           world.print_map
-        when 'stat', 's'
+        when 'stat', 'st', 's'
           if param1.nil?
             puts ERROR_DEBUG_STAT_PARAM_MISSING
             return DEBUG_STAT_PARAMS
@@ -121,7 +121,7 @@ module Gemwarrior
             case param1
             when 'atk_lo'
               unless param2.nil?
-                param2.to_i!
+                param2 = param2.to_i
                 if param2.is_a? Numeric
                   if param2 >= 0
                     world.player.atk_lo = param2
@@ -130,7 +130,7 @@ module Gemwarrior
               end
             when 'atk_hi'
               unless param2.nil?
-                param2.to_i!
+                param2 = param2.to_i
                 if param2.is_a? Numeric
                   if param2 >= 0
                     world.player.atk_hi = param2
@@ -139,7 +139,7 @@ module Gemwarrior
               end
             when 'strength', 'str', 'st'
               unless param2.nil?
-                param2.to_i!
+                param2 = param2.to_i
                 if param2.is_a? Numeric
                   if param2 >= 0
                     world.player.atk_lo = param2
@@ -149,7 +149,7 @@ module Gemwarrior
               end
             when 'dexterity', 'dex', 'd'
               unless param2.nil?
-                param2.to_i!
+                param2 = param2.to_i
                 if param2.is_a? Numeric
                   if param2 >= 0
                     world.player.dexterity = param2

data/lib/gemwarrior/game.rb

@@ -6,6 +6,7 @@ require 'matrext'
 
 require_relative 'entities/player'
 require_relative 'misc/player_levels'
+require_relative 'misc/animation'
 require_relative 'world'
 require_relative 'evaluator'
 require_relative 'repl'

data/lib/gemwarrior/misc/animation.rb

@@ -0,0 +1,29 @@
+# lib/gemwarrior/animation.rb
+# Animation routine
+
+module Gemwarrior
+  module Animation
+    def self.run(opts)
+      options = {
+        :oneline => false, 
+        :speed => nil, 
+        :alpha => true, 
+        :numeric => true, 
+        :random => true
+      }.merge(opts)
+
+      th = Thread.new do
+        print Matrext::process({
+          :phrase     => options.fetch(:phrase),
+          :oneline    => options.fetch(:oneline),
+          :speed      => options.fetch(:speed),
+          :alpha      => options.fetch(:alpha),
+          :numeric    => options.fetch(:numeric),
+          :random     => options.fetch(:random)
+        })
+      end
+      
+      return th.join
+    end
+  end
+end

data/lib/gemwarrior/misc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Michael Chadwick
@@ -214,6 +214,7 @@ files:
 - lib/gemwarrior/evaluator.rb
 - lib/gemwarrior/game.rb
 - lib/gemwarrior/inventory.rb
+- lib/gemwarrior/misc/animation.rb
 - lib/gemwarrior/misc/player_levels.rb
 - lib/gemwarrior/misc/version.rb
 - lib/gemwarrior/misc/wordlist.rb