gemwarrior 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca163fbb7cece3ec0bc218816843eaadab24bb3d
-  data.tar.gz: 9a9d951320df240ee8fdbd6fb6e5c9d328bda03c
+  metadata.gz: a602b9554ac2652202951d150e7ee4cfd8b27aff
+  data.tar.gz: acb430f7bfee61a5b97f27f811d84f8863ab6c91
 SHA512:
-  metadata.gz: 79b84db6709a927ef8d510b5a05d627693bab51b90867c2620af5cf17ace03d5a82945c704bc6250fa81ec6f1ac877f614d6f673b663de7e14ed0c6ab2cb0624
-  data.tar.gz: 6394216a50f001837169412e2b21fe6ea0b3ab5fd5828a7f4b4f4dc5620a96f20231c22958b42ff853ec6478c79e713bbad0203bb1a233cb1422577288da115f
+  metadata.gz: 46c9e9d1a246bb61f9700b2ca58ce6b607d758fccc98fc209672d0f48a3a34fd77743fa7c9ec476228d92ebb9dd7358ae5b36b375e16ab741b8bdc4426eafee3
+  data.tar.gz: 8be49993ada5536ac37d6882c400540047322e970c485faf441cad9fcf265088e35c9809f8b649aa0334c0ea40f405e52a47797eec7be035630710b5e96e5034

data/lib/gemwarrior/battle.rb

@@ -57,6 +57,26 @@ module Gemwarrior
         puts "  #{monster.name} strikes first!".colorize(:yellow)
         monster_attacks_player
       end
+      
+      # LV4:STONE_FACE modifier prior to main battle to auto-win
+      # Doesn't work against bosses, nor if battle is an event or in the arena
+      if player.special_abilities.include?(:stone_face) && !monster.is_boss && !is_event && !is_arena
+        level_diff = (player.level - monster.level) * 4
+        chance_range = 0..(30 + level_diff)
+        roll = rand(0..100)
+
+        if GameOptions.data['debug_mode']
+          puts
+          puts "  (MOD) LV4: Stone Face"
+          puts "  Range to auto-win: #{chance_range}"
+          puts "  Auto-win roll: #{roll}"
+        end
+
+        if chance_range.include?(roll)
+          puts "  You use your STONE FACE to tell the #{monster.name} you mean business, and #{monster.name} just gives up!".colorize(:green)
+          return monster_death
+        end
+      end
 
       # main battle loop
       loop do
@@ -185,7 +205,7 @@ module Gemwarrior
             puts '  If defeated, will receive:'
             puts "  >> XP   : #{monster.xp}"
             puts "  >> ROX  : #{monster.rox}"
-            puts "  >> ITEMS: #{monster.inventory.list_contents}"
+            puts "  >> ITEMS: #{monster.inventory.contents}"
             next
           end
         when 'pass', 'p'
@@ -230,17 +250,26 @@ module Gemwarrior
 
           atk_range = base_atk_lo..base_atk_hi
 
-          # beast mode modifier
+          # DEBUG(beast mode) modifier
           if GameOptions.data['beast_mode']
             atk_range = BEAST_MODE_ATTACK..BEAST_MODE_ATTACK
-          # level 3 ability modifier
+          # LV3:ROCK_SLIDE modifier
           elsif player.special_abilities.include?(:rock_slide)
             lo_boost = rand(0..9)
+            hi_boost = lo_boost + rand(5..10)
+
+            if GameOptions.data['debug_mode']
+              puts
+              puts "  (MOD) LV3: Rock Slide"
+              puts "  Rock Slide lo_boost: #{lo_boost}"
+              puts "  Rock Slide hi_boost: #{hi_boost}"
+            end
 
-            if lo_boost >= 7
-              puts "#{player.name} uses Rock Slide for added damage!"
-              hi_boost = lo_boost + rand(0..5)
+            if lo_boost >= 6
+              puts "  You use Rock Slide for added damage!"
               atk_range = (player.atk_lo + lo_boost)..(player.atk_hi + hi_boost)
+            else
+              puts "  Rock Slide failed :(" if GameOptions.data['debug_mode']
             end
           end
 
@@ -273,7 +302,11 @@ module Gemwarrior
 
     # MONSTER
     def monster_strikes_first?(arena_battle = false, event_battle = false)
-      if (monster.dexterity > player.dexterity) || event_battle || !arena_battle
+      if event_battle || arena_battle
+        return false
+      elsif player.special_abilities.include?(:stone_face)
+        return false
+      elsif (monster.dexterity > player.dexterity)
         return true
       else
         dex_diff = player.dexterity - monster.dexterity
@@ -353,7 +386,7 @@ module Gemwarrior
       puts "   XP   : #{monster.xp}".colorize(:green)
       puts "   ROX  : #{monster.rox}".colorize(:green)
       unless monster.inventory.nil?
-        puts "   ITEMS: #{monster.inventory.list_contents}".colorize(:green) unless monster.inventory.items.empty?
+        puts "   ITEMS: #{monster.inventory.contents}".colorize(:green) unless monster.inventory.items.empty?
       end
       print_battle_line
       world.player.update_stats(reason: :monster, value: monster)

data/lib/gemwarrior/entities/creature.rb

@@ -70,7 +70,7 @@ module Gemwarrior
       desc_text << "DEFENSE   : #{defense}\n".colorize(:white)
       desc_text << "DEXTERITY : #{dexterity}\n".colorize(:white)
       desc_text << "ROX       : #{rox}\n".colorize(:white)
-      desc_text << "INVENTORY : #{inventory.list_contents}\n".colorize(:white)
+      desc_text << "INVENTORY : #{inventory.contents}\n".colorize(:white)
       desc_text
     end
     

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

@@ -23,8 +23,8 @@ module Gemwarrior
       else
         Animation.run(phrase: USE_TEXT)
         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.'.colorize(:green)
-        { type: 'rest', data: rand(5..7) }
+        puts '>> You regain all of your hit points.'.colorize(:green)
+        { type: 'rest', data: world.player.hp_max-world.player.hp_cur }
       end
     end
   end

data/lib/gemwarrior/entities/location.rb

@@ -135,6 +135,7 @@ module Gemwarrior
       if items.empty?
         []
       else
+        # build hash out of location's items
         item_hash = {}
         self.items.map(&:name).each do |i|
           i_sym = i.to_sym
@@ -145,10 +146,12 @@ module Gemwarrior
           end
         end
 
+        # one item? return single element array
         if item_hash.length == 1
-          item_hash.each do |i, q|
-            q > 1 ? "#{q} #{i}s" : i
-          end
+          i = item_hash.keys
+          q = item_hash.values.join.to_i
+          return q > 1 ? ["#{q} #{i}s"] : i
+        # multiple items? build an array of strings
         else
           item_arr = []
           item_hash.each do |i, q|

data/lib/gemwarrior/entities/monster.rb

@@ -43,7 +43,7 @@ module Gemwarrior
       desc_text << "DEX  : #{dexterity}\n".colorize(:white)
       desc_text << "ROX  : #{rox}\n".colorize(:white)
       desc_text << "XP   : #{xp}\n".colorize(:white)
-      desc_text << "INV  : #{inventory.list_contents}\n".colorize(:white)
+      desc_text << "INV  : #{inventory.contents}\n".colorize(:white)
       desc_text << "DEAD?  #{is_dead}\n".colorize(:white)
       desc_text << "TALK?  #{talkable}\n".colorize(:white)
       desc_text << "USE?   #{useable}\n".colorize(:white)

data/lib/gemwarrior/entities/player.rb

@@ -78,8 +78,8 @@ module Gemwarrior
       if special_abilities.empty?
         abilities = " none...yet(?)\n"
       else
+        abilities << "\n"
         special_abilities.each do |sp|
-          abilities << "\n"
           abilities << "  #{Formatting.upstyle(sp.to_s).ljust(15).colorize(:yellow)}: #{PlayerLevels.get_ability_description(sp)}\n"
         end
       end
@@ -309,7 +309,7 @@ module Gemwarrior
       when trigger[:reason].eql?(:xp)
         self.xp += trigger[:value]
       when trigger[:reason].eql?(:level_bump)
-        next_player_level = old_player_level + 1
+        next_player_level = old_player_level + trigger[:value]
         self.xp = PlayerLevels::get_level_stats(next_player_level)[:xp_start]
       end
 
@@ -328,24 +328,24 @@ module Gemwarrior
           new_stats = PlayerLevels::get_level_stats(level_to_get)
 
           self.level = new_stats[:level]
-          puts "You are now level #{self.level.to_s.colorize(:white)}!"
+          puts "You are now level #{self.level.to_s.colorize(:green)}!"
           self.hp_cur = new_stats[:hp_max]
           self.hp_max = new_stats[:hp_max]
-          puts "You now have #{self.hp_max.to_s.colorize(:white)} hit points!"
+          puts "You now have #{self.hp_max.to_s.colorize(:green)} hit points!"
           self.stam_cur = new_stats[:stam_max]
           self.stam_max = new_stats[:stam_max]
-          puts "You now have #{self.stam_max.to_s.colorize(:white)} stamina points!"
+          puts "You now have #{self.stam_max.to_s.colorize(:green)} stamina points!"
           self.atk_lo = new_stats[:atk_lo]
           self.atk_hi = new_stats[:atk_hi]
-          puts "You now have an attack of #{self.atk_lo.to_s.colorize(:white)}-#{self.atk_hi.to_s.colorize(:white)}!"
+          puts "You now have an attack of #{self.atk_lo.to_s.colorize(:green)}-#{self.atk_hi.to_s.colorize(:green)}!"
           self.defense = new_stats[:defense]
-          puts "You now have #{self.defense.to_s.colorize(:white)} defensive points!"
+          puts "You now have #{self.defense.to_s.colorize(:green)} defensive points!"
           self.dexterity = new_stats[:dexterity]
-          puts "You now have #{self.dexterity.to_s.colorize(:white)} dexterity points!"
+          puts "You now have #{self.dexterity.to_s.colorize(:green)} dexterity points!"
           unless new_stats[:special_abilities].nil?
             unless self.special_abilities.include?(new_stats[:special_abilities])
               self.special_abilities.push(new_stats[:special_abilities])
-              puts "You learned a new ability: #{Formatting::upstyle(new_stats[:special_abilities]).colorize(:white)}!"
+              puts "You learned a new ability: #{Formatting::upstyle(new_stats[:special_abilities]).colorize(:green)}!"
             end
           end
           STDIN.getc

data/lib/gemwarrior/evaluator.rb

@@ -23,14 +23,14 @@ module Gemwarrior
     ERROR_TALK_PARAM_UNTALKABLE           = 'That cannnot be conversed with.'
     ERROR_TALK_TO_PARAM_MISSING           = 'You cannot just "talk to". You gotta choose someone to talk to.'
     ERROR_GO_PARAM_MISSING                = 'Just wander aimlessly? A direction would be nice.'
-    ERROR_GO_PARAM_INVALID                = 'The place in that direction is far, far, FAR too dangerous. You should try a different way.'
+    ERROR_GO_PARAM_INVALID                = 'Something tells you that is not a way to go.'
     ERROR_DIRECTION_PARAM_INVALID         = 'You cannot go to that place.'
     ERROR_ATTACK_PARAM_MISSING            = 'You cannot just "attack". You gotta choose something to attack.'
     ERROR_ATTACK_PARAM_INVALID            = 'That monster does not exist here or can\'t be attacked.'
     ERROR_TAKE_PARAM_MISSING              = 'You cannot just "take". You gotta choose something to take.'
     ERROR_USE_PARAM_MISSING               = 'You cannot just "use". You gotta choose something to use.'
     ERROR_USE_PARAM_INVALID               = 'You cannot use that, as it does not exist here or in your inventory.'
-    ERROR_USE_PARAM_UNUSEABLE             = 'That object is not useable.'
+    ERROR_USE_PARAM_UNUSEABLE             = 'That is not useable.'
     ERROR_DROP_PARAM_MISSING              = 'You cannot just "drop". You gotta choose something to drop.'
     ERROR_EQUIP_PARAM_MISSING             = 'You cannot just "equip". You gotta choose something to equip.'
     ERROR_UNEQUIP_PARAM_MISSING           = 'You cannot just "unequip". You gotta choose something to unequip.'
@@ -73,7 +73,7 @@ module Gemwarrior
         'Change world global variable',
         'Teleport to coordinates (5 0 0) or name (\'Home\')',
         'Spawn random monster',
-        'Bump your character to the next level',
+        'Bump your character up *n* levels',
         'Rest, but ensure battle for testing'
       ]
 
@@ -324,7 +324,8 @@ module Gemwarrior
             return world.describe(player_cur_location)
           end
         when 'levelbump', 'lb'
-          world.player.update_stats(reason: :level_bump, value: 1)
+          new_level = param1.nil? ? 1 : param1.to_i
+          world.player.update_stats(reason: :level_bump, value: new_level)
         when 'restfight', 'rf'
           result = world.player.rest(world, 0, true)
 
@@ -476,14 +477,17 @@ module Gemwarrior
                       result = i.use(world)
                       i.number_of_uses -= 1
                       puts ">> #{i.name} can be used #{i.number_of_uses} more time(s)."
+                      break
                     else
                       return ">> #{i.name} cannot be used anymore."
                     end
                   elsif i.consumable
                     result = i.use(world)
                     world.player.inventory.remove_item(i.name)
+                    break
                   else
                     result = i.use(world)
+                    break
                   end
                 else
                   return ERROR_USE_PARAM_UNUSEABLE
@@ -499,14 +503,17 @@ module Gemwarrior
                       result = i.use(world)
                       i.number_of_uses -= 1
                       puts ">> #{i.name} can be used #{i.number_of_uses} more time(s)."
+                      break
                     else
                       return ">> #{i.name} cannot be used anymore."
                     end
                   elsif i.consumable
                     result = i.use(world)
                     location.remove_item(i.name)
+                    break
                   else
                     result = i.use(world)
+                    break
                   end
                 else
                   return ERROR_USE_PARAM_UNUSEABLE
@@ -704,7 +711,7 @@ module Gemwarrior
         player_cur_location.checked_for_monsters = false
         world.describe(player_cur_location)
       else
-        return ERROR_GO_PARAM_INVALID
+        return ERROR_GO_PARAM_INVALID.colorize(:red)
       end
     end
 
@@ -728,30 +735,26 @@ module Gemwarrior
       return
     end
 
-    def print_separator
-      puts '========================================================='
-    end
-
     def list_commands
       i = 0
-      print_separator
+      Hr.print('=')
       puts ' COMMAND     | ALIAS | DESCRIPTION '
-      print_separator
+      Hr.print('=')
       commands.each do |cmd|
         puts " #{cmd.ljust(11)} | #{aliases[i].ljust(5)} | #{cmd_descriptions[i]}"
         i += 1
       end
-      print_separator
+      Hr.print('=')
 
       if GameOptions.data['debug_mode']
         puts ' DEBUG COMMANDS'
-        print_separator
+        Hr.print('=')
         i = 0
         devcommands.each do |cmd|
           puts " #{cmd.ljust(11)} | #{devaliases[i].ljust(5)} | #{devcmd_descriptions[i]}"
           i += 1
         end
-        print_separator
+        Hr.print('=')
       end
     end
 

data/lib/gemwarrior/game.rb

@@ -10,6 +10,7 @@ require_relative 'entities/weapons/dagger'
 require_relative 'misc/animation'
 require_relative 'misc/audio'
 require_relative 'misc/formatting'
+require_relative 'misc/hr'
 require_relative 'evaluator'
 require_relative 'game_assets'
 require_relative 'game_options'

data/lib/gemwarrior/inventory.rb

@@ -30,13 +30,10 @@ module Gemwarrior
       self.items.nil? || self.items.empty?
     end
 
+    # non-English-like contents of inventory for simple lists
     def contents
-      is_empty? ? nil : list_contents
-    end
-
-    def list_contents
       if is_empty?
-        'You possess nothing.'
+        nil
       else
         item_hash = {}
         self.items.map(&:name).each do |i|
@@ -48,15 +45,54 @@ module Gemwarrior
           end
         end
 
+        # one item? return string
         if item_hash.length == 1
+          i = item_hash.keys.join
+          q = item_hash.values.join.to_i
+          return q > 1 ? "#{q} #{i}s" : i
+        # multiple items? return array of strings to mush together
+        else
+          item_arr = []
           item_hash.each do |i, q|
             if q > 1
-              return "You have #{q} #{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)}."
+              item_arr.push("#{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)} x#{q}")
             else
-              article = VOWELS.include?(i[0]) ? 'an' : 'a'
-              return "You have #{article} #{i.to_s.colorize(:yellow)}."
+              item_arr.push(i)
             end
           end
+
+          return item_arr.join(', ')
+        end
+      end
+    end
+
+    # English-like sentence summary of inventory
+    def list_contents
+      if is_empty?
+        'You possess nothing.'
+      else
+        # build hash of inventory's items
+        item_hash = {}
+        self.items.map(&:name).each do |i|
+          i_sym = i.to_sym
+          if item_hash.keys.include? i_sym
+            item_hash[i_sym] += 1
+          else
+            item_hash[i_sym] = 1
+          end
+        end
+
+        # one item? return string
+        if item_hash.length == 1
+          i = item_hash.keys.join
+          q = item_hash.values.join.to_i
+          if q > 1
+            return "You have #{q} #{i.to_s.colorize(:yellow)}#{'s'.colorize(:yellow)}."
+          else
+            article = VOWELS.include?(i[0]) ? 'an' : 'a'
+            return "You have #{article} #{i.to_s.colorize(:yellow)}."
+          end
+        # multiple items? return array of strings to mush together
         else
           item_list_text = 'You have '
           item_arr = []

data/lib/gemwarrior/misc/hr.rb

@@ -0,0 +1,58 @@
+# lib/gemwarrior/misc/hr.rb
+# Standardized, cross-platform horizontal rule
+# Cribbed extensively from https://github.com/ivantsepp/hr
+
+module Gemwarrior
+  module Hr
+    extend self
+
+    def print(*patterns)
+      Kernel.print string(*patterns)
+    end
+
+    def string(*patterns)
+      options = patterns.last.is_a?(Hash) ? patterns.pop : {}
+      column_width = get_column_width
+      output = patterns.map do |pattern|
+        pattern = pattern.to_s
+        times = (column_width / pattern.length) + 1
+        (pattern * times)[0..column_width - 1]
+      end.join
+      options = options.inject({}){|tmp,(k,v)| tmp[k.to_sym] = v.to_sym; tmp}
+      options.any? ? output.colorize(options) : output
+    end
+    
+    private
+    
+    def get_column_width
+      column_width = 0
+
+      begin
+        require 'io/console'
+        column_width = IO.console.winsize[1]
+      rescue
+        if command_exists?('tput')
+          column_width = `tput cols`.to_i
+        elsif command_exists?('stty')
+          column_width = `stty size`.split.last.to_i
+        elsif command_exists?('mode')
+          mode_output = `mode`.split
+          column_width = mode_output[mode_output.index('Columns:')+1].to_i
+        end
+      end
+
+      case
+      when column_width.nil?, column_width <= 0
+        return 80
+      else
+        return column_width
+      end
+    end
+    
+    def command_exists?(command)
+      ENV['PATH'].split(File::PATH_SEPARATOR).any? { |path|
+        (File.exist? File.join(path, "#{command}")) || (File.exist? File.join(path, "#{command}.com")) || (File.exist? File.join(path, "#{command}.exe"))
+      }
+    end
+  end
+end

data/lib/gemwarrior/misc/player_levels.rb

@@ -98,6 +98,11 @@ module Gemwarrior
         'Allows you to see the enemy hit points while in battle.'
       when :rock_slide
         'Adds a random boost to the player\'s attack in battle.'
+      when :stone_face
+        'Chance to auto-win in battle against any non-boss monster (does not work in arena or if ambushed).'
+      #when :graniton
+      #when :gleam
+      #when :break_through
       else
         'Unsure, but it\'s probably cool!'
       end

data/lib/gemwarrior/repl.rb

@@ -322,26 +322,26 @@ module Gemwarrior
 
     def log_stats(duration, pl)
       # display stats upon exit
-      puts '######################################################################'
+      Hr.print('#')
       print 'Gem Warrior'.colorize(color: :white, background: :black)
       print " v#{Gemwarrior::VERSION}".colorize(:yellow)
       print " played for #{duration[:mins].to_s.colorize(color: :white, background: :black)} min(s),"
       print " #{duration[:secs].to_s.colorize(color: :white, background: :black)} sec(s),"
       print " and #{duration[:ms].to_s.colorize(color: :white, background: :black)} ms\n"
-      puts  '----------------------------------------------------------------------'
-      print "#{pl.name.ljust(10)} killed #{pl.monsters_killed.to_s.colorize(color: :white, background: :black)} monster(s)"
+      Hr.print('-')
+      print "#{pl.name.ljust(10)} killed #{pl.monsters_killed.to_s.colorize(color: :yellow, background: :black)} monster(s)"
       print "\n".ljust(12)
-      print "killed #{pl.bosses_killed.to_s.colorize(color: :white, background: :black)} boss(es)"
+      print "killed #{pl.bosses_killed.to_s.colorize(color: :yellow, background: :black)} boss(es)"
       print "\n".ljust(12)
-      print "picked up #{pl.items_taken.to_s.colorize(color: :white, background: :black)} item(s)"
+      print "picked up #{pl.items_taken.to_s.colorize(color: :yellow, background: :black)} item(s)"
       print "\n".ljust(12)
-      print "traveled #{pl.movements_made.to_s.colorize(color: :white, background: :black)} time(s)"
+      print "traveled #{pl.movements_made.to_s.colorize(color: :yellow, background: :black)} time(s)"
       print "\n".ljust(12)
-      print "rested #{pl.rests_taken.to_s.colorize(color: :white, background: :black)} time(s)"
+      print "rested #{pl.rests_taken.to_s.colorize(color: :yellow, background: :black)} time(s)"
       print "\n".ljust(12)
-      print "died #{pl.deaths.to_s.colorize(color: :white, background: :black)} time(s)"
+      print "died #{pl.deaths.to_s.colorize(color: :yellow, background: :black)} time(s)"
       print "\n"
-      puts '######################################################################'
+      Hr.print('#')
 
       # log stats to file in home directory
       File.open(GameOptions.data['log_file_path'], 'a') do |f|

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -352,6 +352,7 @@ files:
 - lib/gemwarrior/misc/audio.rb
 - lib/gemwarrior/misc/audio_cues.rb
 - lib/gemwarrior/misc/formatting.rb
+- lib/gemwarrior/misc/hr.rb
 - lib/gemwarrior/misc/musical_notes.rb
 - lib/gemwarrior/misc/name_generator.rb
 - lib/gemwarrior/misc/player_levels.rb