gemwarrior 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8f4d5a687c7e67e55c6e675d53eed0ee81802b1
-  data.tar.gz: 64d4c7673e0956ab01a70933188160c40ef55c9f
+  metadata.gz: 853ee5c247a788f9c35ce812d79224390703382c
+  data.tar.gz: 8065711862b62cbaa590ae68a6f380ea75ab276b
 SHA512:
-  metadata.gz: 4004e73feef6f2fb37694c904ab8e3953073af5a8d67e9f868e4643ba3f20b05588bea1428caaa581efdd59079fe5bed86b41a136aef2dafde5d5159441529f4
-  data.tar.gz: 8f9a8949bf9ae1f6c3de960ecd1417dec8597b0b712059b6b681ef288bcfab407cafd7849b594d01e0b1f1388fe266d38c1e4d69738008074d3ca2c9ba44ea95
+  metadata.gz: c9f881a6cea35e551d232c84893f1a12b9203c5111337c4c428c5a55672e351139a0eeb7f858f7d2f7f37bc2ce7bc8b17dc1456ddbdaabab90637cdb99cc0d3a
+  data.tar.gz: 4c6d94b62e1dc8c93eb3d84b5be202210772320ca89b4da000a81844d6a92db1ad2f4c140495e4c7bce8caa014c82cc4a0aa60d437fe6ccb16e0a60882ef8122

data/bin/gemwarrior

@@ -8,15 +8,19 @@ require_relative '../lib/gemwarrior/game'
 GAME_NAME = "Gem Warrior"
 
 def parse_options
-  options = {}
+  options = {:god_mode => false}
 
   optparse = OptionParser.new do |opts|
     opts.on('-v', '--version', 'Display version number and exit') do
       puts "#{GAME_NAME} v#{Gemwarrior::VERSION}"
       exit
     end
+    
+    opts.on('-g', '--god', 'Set godmode to true on load') do
+      options[:god_mode] = true
+    end
   end
-  
+
   optparse.parse!()
 
   return options
@@ -35,7 +39,7 @@ end
 begin
   options = parse_options
 
-  Gemwarrior::Game.new
+  Gemwarrior::Game.new(options)
 rescue => error
   print_error(error)
   exit(false)

data/gemwarrior.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'matrext', '~> 0.2'
   spec.add_runtime_dependency 'http', '~> 0.8.10'
   spec.add_runtime_dependency 'json', '~> 1.8.2'
+  spec.add_runtime_dependency 'colorize', '~> 0.7.7'
 
   #spec.add_runtime_dependency 'feep', '~> 0.0.9'  
   #spec.add_runtime_dependency 'wordnik', '~> 4.12'

data/lib/gemwarrior/battle.rb

@@ -18,33 +18,33 @@ module Gemwarrior
     def start
       print_battle_line
       puts "You decide to attack the #{monster.name}!"
-      puts "#{monster.name} cries out: #{monster.battlecry}"
+      puts "#{monster.name} cries out: \"#{monster.battlecry}\"".colorize(:yellow)
 
       # first strike!
       if monster_strikes_first?
-        puts "#{monster.name} strikes first!"
+        puts "#{monster.name} strikes first!".colorize(:yellow)
         monster_attacks_player
       end
       
       # main battle loop
       loop do
-        if (monster.hp_cur <= 0)
+        if monster_dead?
           monster_death
           return
-        elsif (player.hp_cur <= 0 && !player.god_mode)
+        elsif player_dead?
           player_death
         end
 
         puts
-        puts "[Fight/Attack][Look][Run]"
-        puts "P :: #{player.hp_cur} HP\n"
-        puts "M :: #{monster.hp_cur} HP\n"
+        puts "[Fight/Attack][Look][Run]".colorize(:color => :white, :background => :green)
+        puts "P :: #{player.hp_cur.to_s.rjust(3)} HP\n"
+        puts "M :: #{monster.hp_cur.to_s.rjust(3)} HP\n"
         
-        if ((player.hp_cur.to_f / player.hp_max.to_f) < 0.10)
-          puts "You are almost dead!\n"
+        if player_near_death?
+          puts "You are almost dead!\n".colorize(:yellow)
         end
-        if ((monster.hp_cur.to_f / monster.hp_max.to_f) < 0.10)
-          puts "#{monster.name} is almost dead!\n"
+        if monster_near_death?
+          puts "#{monster.name} is almost dead!\n".colorize(:yellow)
         end
         
         puts 'What do you do?'
@@ -56,14 +56,14 @@ module Gemwarrior
           puts "You attack #{monster.name}#{player.cur_weapon_name}!"
           dmg = calculate_damage_to(monster)
           if dmg > 0
-            puts "You wound it for #{dmg} point(s)!"
+            puts "> You wound it for #{dmg} point(s)!".colorize(:yellow)
             take_damage(monster, dmg)
-            if (monster.hp_cur <= 0)
+            if monster_dead?
               monster_death
               return
             end
           else
-            puts "You miss entirely!"
+            puts "You miss entirely!".colorize(:yellow)
           end
         when 'look', 'l'
           puts "#{monster.name}: #{monster.description}"
@@ -71,10 +71,11 @@ module Gemwarrior
         when 'run', 'r'
           if player_escape?
             monster.hp_cur = monster.hp_max
-            puts "You successfully elude #{monster.name}!"
+            puts "You successfully elude #{monster.name}!".colorize(:green)
+            print_escape_text
             return
           else
-            puts "You were not able to run away! :-("
+            puts "You were not able to run away! :-(".colorize(:yellow)
           end
         else
           puts ERROR_ATTACK_OPTION_INVALID
@@ -123,13 +124,13 @@ module Gemwarrior
       puts "#{monster.name} attacks you!"
       dmg = calculate_damage_to(player)
       if dmg > 0
-        puts "You are wounded for #{dmg} point(s)!"
+        puts "> You are wounded for #{dmg} point(s)!".colorize(:yellow)
         take_damage(player, dmg)
-        if player.hp_cur <= 0
+        if player_dead?
           player_death
         end
       else
-        puts "#{monster.name} misses entirely!"
+        puts "#{monster.name} misses entirely!".colorize(:yellow)
       end
     end
     
@@ -142,27 +143,44 @@ module Gemwarrior
       end
     end
     
+    def monster_near_death?
+      ((monster.hp_cur.to_f / monster.hp_max.to_f) < 0.10)
+    end
+    
+    def monster_dead?
+      monster.hp_cur <= 0
+    end
+    
     def monster_death
-      puts "You have defeated #{monster.name}!"
-      puts "You have received #{monster.xp} XP!"
-      puts "You have found #{monster.rox} barterable rox on your slain opponent!"
+      puts "You have defeated #{monster.name}!".colorize(:green)
+      puts 'You get the following spoils of war:'
+      puts " XP : #{monster.xp}".colorize(:green)
+      puts " ROX: #{monster.rox}".colorize(:green)
       print_battle_line
       update_player_stats
       world.location_by_coords(player.cur_coords).remove_monster(monster.name)
     end
     
-    def player_death
-      puts "You are dead, slain by the #{monster.name}!"
-      puts 'Your adventure ends here. Try again next time!'
-      print_battle_line
-      exit(0)
-    end
-    
     def update_player_stats
       player.xp = player.xp + monster.xp
       player.rox = player.rox + monster.rox
     end
     
+    def player_near_death?
+      ((player.hp_cur.to_f / player.hp_max.to_f) < 0.10 && !player.god_mode)
+    end
+    
+    def player_dead?
+      (player.hp_cur <= 0 && !player.god_mode)
+    end
+    
+    def player_death
+      puts "You are dead, slain by the #{monster.name}!".colorize(:red)
+      puts 'Your adventure ends here. Try again next time!'.colorize(:red)
+      print_battle_line
+      exit(0)
+    end
+    
     def player_escape?
       if (player.dexterity > monster.dexterity)
         return true
@@ -177,6 +195,17 @@ module Gemwarrior
       end
     end
     
+    # STATUS TEXT
+    
+    def print_escape_text
+      escape = Thread.new do
+        print "* "
+        print "#{Matrext::process({ :phrase => 'POOF', :sl => true })}"
+        print " *\n"
+      end
+      return escape.join
+    end
+    
     def print_battle_line
       puts '**************************************'
     end

data/lib/gemwarrior/entities/location.rb

@@ -1,8 +1,6 @@
 # lib/gemwarrior/entities/location.rb
 # Place in the game
 
-require 'matrext'
-
 require_relative 'entity'
 
 module Gemwarrior

data/lib/gemwarrior/entities/player.rb

@@ -43,7 +43,7 @@ module Gemwarrior
       self.stam_max     = options.fetch(:stam_max)
       self.cur_coords   = options.fetch(:cur_coords)
 
-      self.god_mode     = false
+      self.god_mode     = options.fetch(:god_mode)
     end
 
     def check_self(show_pic = true)
@@ -117,14 +117,18 @@ module Gemwarrior
       case direction
       when 'north', 'n'
         self.cur_coords = {:x => cur_coords[:x],    :y => cur_coords[:y]+1}
+        direction_text = '^^^'
       when 'east', 'e'
         self.cur_coords = {:x => cur_coords[:x]+1,  :y => cur_coords[:y]}
+        direction_text = '>>>'
       when 'south', 's'
         self.cur_coords = {:x => cur_coords[:x],    :y => cur_coords[:y]-1}
+        direction_text = 'vvv'
       when 'west', 'w'
         self.cur_coords = {:x => cur_coords[:x]-1,  :y => cur_coords[:y]}
+        direction_text = '<<<'
       end
-      print_traveling_text
+      print_traveling_text(direction_text)
     end
 
     def attack(world, monster)
@@ -141,10 +145,10 @@ module Gemwarrior
     private
     
     # TRAVEL    
-    def print_traveling_text
+    def print_traveling_text(direction_text)
       loc = Thread.new do
         print "* "
-        print "#{Matrext::process({ :phrase => ">>>", :sl => true })}"
+        print "#{Matrext::process({ :phrase => direction_text, :sl => true })}"
         print " *\n"
       end
       return loc.join

data/lib/gemwarrior/evaluator.rb

@@ -8,8 +8,8 @@ module Gemwarrior
     # CONSTANTS
     ## MESSAGES
     PROGRAM_NAME   = 'Gem Warrior'
-    QUIT_MESSAGE   = 'Thanks for playing the game. Until next time...'
-    RESUME_MESSAGE = 'Back to adventuring!'
+    QUIT_MESSAGE   = 'Thanks for playing the game. Until next time...'.colorize(:yellow)
+    RESUME_MESSAGE = 'Back to adventuring!'.colorize(:green)
     SEPARATOR      = '=========================================================================='
     CHANGE_PARAMS  = 'Options: name'
     LIST_PARAMS    = 'Options: monsters, items, locations'
@@ -59,16 +59,18 @@ module Gemwarrior
     end
     
     def evaluate(input)
-      if input.nil?
+      case input
+      # Ctrl-D or empty command
+      when nil, ""
         return
+      # real command
+      else
+        tokens = input.split
+        unless input_valid?(input)
+          return ERROR_COMMAND_INVALID
+        end
       end
-    
-      tokens = input.split
-      
-      unless input_valid?(input)
-        return ERROR_COMMAND_INVALID
-      end
-      
+
       command = tokens.first.downcase
       param = tokens[1]
 
@@ -216,16 +218,16 @@ module Gemwarrior
     
     def input_valid?(input)
       tokens = input.split
+      command = tokens[0]
       commands_and_aliases = commands | aliases | devcmds | devaliases
-      if commands_and_aliases.include?(tokens.first.downcase)
+
+      if commands_and_aliases.include?(command.downcase)
         if tokens.size.between?(1,2)
           return true
         end
       elsif tokens.empty?
         return true
       end
-      return false
     end
-    
   end
 end

data/lib/gemwarrior/game.rb

@@ -1,6 +1,9 @@
 # lib/gemwarrior/game.rb
 # Main launching point for Gem Warrior
 
+require 'colorize'
+require 'matrext'
+
 require_relative 'entities/player'
 require_relative 'world'
 require_relative 'evaluator'
@@ -27,9 +30,10 @@ module Gemwarrior
 
     attr_accessor :world, :eval, :repl
     
-    def initialize
+    def initialize(options)
       # create new world and player
       self.world = World.new
+
       world.player = Player.new({
         :description        => PLAYER_DESC_DEFAULT,
         :level              => PLAYER_LEVEL_DEFAULT,
@@ -44,7 +48,8 @@ module Gemwarrior
         :dexterity          => PLAYER_DEXTERITY_DEFAULT,
         :inventory          => PLAYER_INVENTORY_DEFAULT,
         :rox                => PLAYER_ROX_DEFAULT,
-        :cur_coords         => world.location_coords_by_name('Home')
+        :cur_coords         => world.location_coords_by_name('Home'),
+        :god_mode           => options.fetch(:god_mode)
       })
 
       # create the console

data/lib/gemwarrior/misc/version.rb

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

data/lib/gemwarrior/repl.rb

@@ -12,8 +12,8 @@ module Gemwarrior
   class Repl
     # CONSTANTS
     ## MESSAGES
-    QUIT_MESSAGE   = 'Temporal flux detected. Shutting down...'
-    SPLASH_MESSAGE = 'Welcome to Gem Warrior, where randomized fortune is just as likely as mayhem.'
+    QUIT_MESSAGE   = 'Temporal flux detected. Shutting down...'.colorize(:red)
+    SPLASH_MESSAGE = 'Welcome to the land of *Jool*, where randomized fortune is just as likely as mayhem.'
     
     attr_accessor :world, :eval
     
@@ -50,11 +50,14 @@ module Gemwarrior
     end
     
     def print_splash_message
-      0.upto(SPLASH_MESSAGE.length-1) do print "=" end
-      print "\n"
+      puts "/-+-+-+ +-+-+-+-+-+-+-\\".colorize(:yellow)
+      puts '|G|E|M| |W|A|R|R|I|O|R|'.colorize(:yellow)
+      puts "\\-+-+-+ +-+-+-+-+-+-+-/".colorize(:yellow)
+      0.upto(SPLASH_MESSAGE.length-1) do print '=' end
+      puts
       puts SPLASH_MESSAGE
-      0.upto(SPLASH_MESSAGE.length-1) do print "=" end
-      print "\n"
+      0.upto(SPLASH_MESSAGE.length-1) do print '=' end
+      puts
     end
     
     def print_fortune
@@ -88,7 +91,7 @@ module Gemwarrior
         world.player.name,
         world.location_by_coords(world.player.cur_coords).name
       ]
-      puts (prompt_template % prompt_vars_arr)
+      puts (prompt_template % prompt_vars_arr).colorize(:color => :white, :background => :green)
     end
     
     def read_line

data/lib/gemwarrior/world.rb

@@ -36,19 +36,26 @@ module Gemwarrior
       0.upto(WORLD_DIM_HEIGHT-1) do |count_y|
         print '  '
         0.upto(WORLD_DIM_WIDTH-1) do
-          print '___'
+          print '---'
         end
         print "\n"
         print "#{(WORLD_DIM_HEIGHT-1) - count_y} "
         0.upto(WORLD_DIM_WIDTH-1) do |count_x|
-          if location_by_coords({:x => count_x, :y => (WORLD_DIM_HEIGHT-1) - count_y})
+          cur_map_coords = {:x => count_x, :y => (WORLD_DIM_HEIGHT-1) - count_y}
+          if self.player.cur_coords.eql?(cur_map_coords)
+            print '|O|'
+          elsif location_by_coords(cur_map_coords)
             print '|X|'
           else
-            print '|_|'
+            print '| |'
           end
         end
         print "\n"
       end
+      print '  '
+      0.upto(WORLD_DIM_WIDTH-1) do
+        print '---'
+      end
       puts
       print '   '
       0.upto(WORLD_DIM_WIDTH-1) do |count_x|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement