gemwarrior 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dac84cb6be6c2deb411b2e3cb3753c725e50409
-  data.tar.gz: 24015aa5dccb120764bcc0be8703042701b18c93
+  metadata.gz: 2aaefc1728156bed990a2587cb84951231135d8a
+  data.tar.gz: 5060bd8a701f90534ce639095be3cd4dfc659e66
 SHA512:
-  metadata.gz: 0bbbb321bdb5c182bd65b357e98f3709f2915efddb4d77538d6259eba00a790e2669985732e4685f892e334e47d2605554ff7a5f0534dc8eae33f1cfc6249ef1
-  data.tar.gz: a94bb989a038f982b24edb879b27a68678a99b49fd452ea54e567224a0d45981ffa2b0080bdab61cf7d1dcca150ff6d8ca729ef2b861ef0b3ffc4aa6d9b4ee9c
+  metadata.gz: 03d906c73ca04bff1be05b0931414014782e0e64847fe974627d81e5cdd5817f784f06909b89eac925dc6f91ecd3a8b0a8d7ef772573da5960ad713bb7d56f80
+  data.tar.gz: 2db84ce081bad9796998db63ae4a389015229b15de8b7853522f5fc3b6b35c5f5c4bcc3d96ad60fd620a9189290310e2ecd87ee4aa43d4ce59932f8f131d08c8

data/bin/gemwarrior

@@ -13,7 +13,8 @@ def parse_options
     :god_mode     => false, 
     :beast_mode   => false, 
     :use_wordnik  => false, 
-    :sound        => false
+    :sound        => false,
+    :new_game     => false
   }
 
   optparse = OptionParser.new do |opts|
@@ -41,6 +42,10 @@ def parse_options
     opts.on('-s', '--sound', 'Turn sound on') do
       options[:sound] = true
     end
+    
+    opts.on('-n', '--new', 'Immediately start a new game, skipping main menu') do
+      options[:new_game] = true
+    end
   end
 
   optparse.parse!()

data/lib/gemwarrior/battle.rb

@@ -165,6 +165,14 @@ module Gemwarrior
         if entity.eql?(monster)
           if player.beast_mode
             atk_range = BEAST_MODE_ATTACK..BEAST_MODE_ATTACK
+          elsif player.special_abilities.include?(:rock_slide)
+            lo_boost = rand(0..9)
+
+            if lo_boost >= 7
+              puts "#{player.name} uses Rock Slide for added damage!"
+              hi_boost = lo_boost + rand(0..5)
+              atk_range = (player.atk_lo + lo_boost)..(player.atk_hi + hi_boost)
+            end
           else
             atk_range = player.atk_lo..player.atk_hi
           end
@@ -252,7 +260,7 @@ module Gemwarrior
           puts " XP : #{monster.xp}".colorize(:green)
           puts " ROX: #{monster.rox}".colorize(:green)
           print_battle_line
-          player.update_stats(monster)
+          player.update_stats({:reason => :monster, :value => monster})
           world.location_by_coords(player.cur_coords).remove_monster(monster.name)
         end
       else
@@ -263,7 +271,7 @@ module Gemwarrior
           puts " ITEMS: #{monster.inventory.list_contents}".colorize(:green) unless monster.inventory.items.empty?
         end
         print_battle_line
-        player.update_stats(monster)
+        player.update_stats({:reason => :monster, :value => monster})
         world.location_by_coords(player.cur_coords).remove_monster(monster.name)
       end
     end

data/lib/gemwarrior/entities/player.rb

@@ -3,6 +3,7 @@
 
 require_relative 'creature'
 require_relative '../battle'
+require_relative '../misc/formatting'
 require_relative '../misc/name_generator'
 require_relative '../misc/player_levels'
 require_relative '../misc/wordlist'
@@ -10,6 +11,7 @@ require_relative '../misc/wordlist'
 module Gemwarrior
   class Player < Creature
     include PlayerLevels
+    include Formatting
 
     attr_accessor :stam_cur, :stam_max, :cur_coords, 
                   :god_mode, :beast_mode, :use_wordnik, :special_abilities,
@@ -46,10 +48,10 @@ module Gemwarrior
       
       self.special_abilities  = []
 
-      self.monsters_killed  = 0
-      self.items_taken      = 0
-      self.movements_made   = 0
-      self.rests_taken      = 0
+      self.monsters_killed    = 0
+      self.items_taken        = 0
+      self.movements_made     = 0
+      self.rests_taken        = 0
     end
 
     def check_self(debug_mode = false, show_pic = true)
@@ -68,10 +70,10 @@ module Gemwarrior
       
       abilities = ''
       if special_abilities.empty?
-        abilities = 'none'
+        abilities = 'none...yet(?)'
       else
-        abilities = special_abilities.join(', ')
-      end        
+        abilities = Formatting::upstyle(special_abilities.collect { |x| x.to_s }).join(', ')
+      end
 
       self_text =  "NAME      : #{self.name}\n"
       self_text << "POSITION  : #{self.cur_coords.values.to_a}\n"
@@ -144,10 +146,7 @@ module Gemwarrior
       elsif new_name.length < 3 || new_name.length > 10
         return "'#{new_name}' is an invalid length. Make it between 3 and 10 characters, please."
       else
-        name_to_add = ""
-        name_to_add << new_name[0].upcase
-        name_to_add << new_name[1..new_name.length-1].downcase
-        self.name = name_to_add
+        self.name = Formatting::upstyle(new_name)
         return "New name, '#{name}', accepted."
       end
     end
@@ -227,16 +226,25 @@ module Gemwarrior
         self.hp_cur = self.hp_max
       end
     end
-    
-    def update_stats(monster)
+
+    def update_stats(trigger)
       old_player_level = PlayerLevels::check_level(self.xp)
 
-      self.xp = self.xp + monster.xp
-      self.rox = self.rox + monster.rox
+      case
+      when trigger[:reason].eql?(:monster)
+        monster = trigger[:value]
+        self.xp += monster.xp
+        self.rox += monster.rox
 
-      monster_items = monster.inventory.items
-      unless monster_items.nil?
-        self.inventory.items.concat monster_items unless monster_items.empty?
+        monster_items = monster.inventory.items
+        unless monster_items.nil?
+          self.inventory.items.concat monster_items unless monster_items.empty?
+        end
+      when trigger[:reason].eql?(:xp)
+        self.xp += trigger[:value].xp
+      when trigger[:reason].eql?(:level_bump)
+        next_player_level = old_player_level + 1
+        self.xp = PlayerLevels::get_level_stats(next_player_level)[:xp_start]
       end
 
       new_player_level = PlayerLevels::check_level(self.xp)
@@ -263,7 +271,7 @@ module Gemwarrior
         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: #{new_stats[:special_abilities]}!"
+            puts "You learned a new ability: #{Formatting::upstyle(new_stats[:special_abilities])}!"
           end
         end
       end

data/lib/gemwarrior/evaluator.rb

@@ -47,8 +47,8 @@ module Gemwarrior
     def initialize(world)
       self.world = world
 
-      self.devcommands = %w(god beast list vars map stat teleport spawn)
-      self.devaliases = %w(gd bs ls v m s tp sp)
+      self.devcommands = %w(god beast list vars map stat teleport spawn levelbump)
+      self.devaliases = %w(gd bs ls v m s tp sp lb)
       self.devextras = %w(st)
       self.devcmd_descriptions = [
         'Toggle god mode (i.e. invincible)',
@@ -58,12 +58,13 @@ module Gemwarrior
         'Show a map of the world',
         'Change player stat',
         'Teleport to coordinates (5 0 0) or location name (\'Home\')',
-        'Spawn random monster'
+        'Spawn random monster',
+        'Bump your character to the next experience level'
       ]
 
       self.commands = %w(character inventory rest look take use drop equip unequip go attack change help quit quit!)
       self.aliases = %w(c i r l t u d e ue g a ch h q qq)
-      self.extras = %w(exit exit! x x fight f)
+      self.extras = %w(exit exit! x xx fight f)
       self.cmd_descriptions = [
         'Display character information',
         'Look in your inventory',
@@ -244,6 +245,8 @@ module Gemwarrior
             Animation::run({:phrase => '** TELEPORT! **', :speed => :insane})
             return world.describe(world.location_by_coords(world.player.cur_coords))
           end
+        when 'levelbump', 'lb'
+          world.player.update_stats({:reason => :level_bump, :value => 1})
         end
       end
 
@@ -327,14 +330,14 @@ module Gemwarrior
               world.player.heal_damage(result[:data])
               return
             when 'xp'
-              world.player.xp += result[:data]
+              world.player.update_stats({:reason => :xp, :value => result[:data]})
               return
             when 'action'
               case result[:data]
               when 'rest'
                 world.player.rest(world)
               when 'map'
-                world.print_map
+                world.print_map(world.player.cur_coords[:z])
               end
             when 'arena'
               arena = Arena.new({:world => world, :player => world.player})

data/lib/gemwarrior/game.rb

@@ -38,6 +38,7 @@ module Gemwarrior
       world.debug_mode      = options.fetch(:debug_mode)
       world.use_wordnik     = options.fetch(:use_wordnik)
       world.sound           = options.fetch(:sound)
+      world.new_game        = options.fetch(:new_game)
 
       world.player = Player.new({
         :description        => PLAYER_DESC_DEFAULT,

data/lib/gemwarrior/misc/formatting.rb

@@ -0,0 +1,42 @@
+# lib/gemwarrior/misc/formatting.rb
+# Formatting methods for text
+
+module Gemwarrior
+  module Formatting
+    def self.upstyle(str_arr)
+      if str_arr.is_a? Array
+        str_arr_upstyled = []
+        
+        str_arr.each do |str_arr_item|
+          str_arr_item_upstyled = []
+          
+          str_arr_item.split(' ').each do |s|
+            str_arr_item_upstyled << upstyle_string(s)
+          end
+          
+          str_arr_upstyled << str_arr_item_upstyled.join(' ')
+        end
+        
+        return str_arr_upstyled
+      else
+        return upstyle_string(str_arr)
+      end
+    end
+    
+    private
+    
+    def self.upstyle_string(s)
+      s_upstyle = ''
+      s_upstyle << s[0].upcase
+      1.upto(s.length-1) do |i|
+        if s[i-1].eql?('_')
+          s_upstyle[i-1] = ' '
+          s_upstyle << s[i].upcase
+        else
+          s_upstyle << s[i].downcase
+        end
+      end
+      return s_upstyle
+    end
+  end
+end

data/lib/gemwarrior/repl.rb

@@ -172,7 +172,7 @@ module Gemwarrior
       print_logo
 
       # main menu loop until new game or exit
-      run_main_menu
+      run_main_menu unless world.new_game
 
       # hook to do something right off the bat
       puts eval.evaluate(initialCommand) unless initialCommand.nil?

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -18,7 +18,7 @@ module Gemwarrior
     ERROR_LIST_PARAM_INVALID = 'That is not something that can be listed.'
     ERROR_LOCATION_DESCRIBE_ENTITY_INVALID  = 'You do not see that here.'
 
-    attr_accessor :monsters, :locations, :player, :debug_mode, :use_wordnik, :sound
+    attr_accessor :monsters, :locations, :player, :debug_mode, :use_wordnik, :sound, :new_game
 
     def initialize
       self.monsters   = init_monsters

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -259,6 +259,7 @@ files:
 - lib/gemwarrior/game.rb
 - lib/gemwarrior/inventory.rb
 - lib/gemwarrior/misc/animation.rb
+- lib/gemwarrior/misc/formatting.rb
 - lib/gemwarrior/misc/music.rb
 - lib/gemwarrior/misc/name_generator.rb
 - lib/gemwarrior/misc/player_levels.rb
@@ -293,6 +294,4 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files:
-- spec/rubywarrior_spec.rb
-- spec/spec_helper.rb
+test_files: []