gemwarrior 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced3d65d4786800951217d7551ac484b61c7fe6a
-  data.tar.gz: 4606dd2f869d32b9722f0b1825ea8873b7baa0b8
+  metadata.gz: 5dd2a134a899cfbfd6ac8cf1a0a21e39f22abe86
+  data.tar.gz: f8db94e677447ffa3568ebfe94181f4be0a504de
 SHA512:
-  metadata.gz: 79eb6e5bb961674f038aebcc10c3e1d82e4db8e3f6ededf54cb5689120c45de358f025c21d9427d9503a7713f7b9df23c2f2f76d3baffccee17a148a0b393321
-  data.tar.gz: 3e305cb3f6382ff8492083b717e4cfcfbec428aff9a36154149f696de6e97923e43e9859baeb531b5ecacc151dc97923a736aaea79518f7860e16cba14b5b8b4
+  metadata.gz: baf985a9731cff030b8cbf27693680eb063dee3a748d3bb541f4bd93eca8db3b7772b496d73d3ce3675ec6244269ba961a197fd398f22be153d29dac10f86d08
+  data.tar.gz: b4cadec0839733de6a0d064e0063b8aca37cf47980b0db968494f014d43be0b124aeff8df3cc454f1da07b1bca924e550f53fcbeb16e5749729118c53356f666

data/lib/gemwarrior/battle.rb

@@ -1,11 +1,16 @@
 # lib/gemwarrior/battle.rb
 # Monster battle
 
+require_relative 'misc/player_levels'
+
 module Gemwarrior
   class Battle
+    include PlayerLevels
+  
     # CONSTANTS
     ## ERRORS
     ERROR_ATTACK_OPTION_INVALID = 'That will not do anything against the monster.'
+    BEAST_MODE_ATTACK           = 100
     
     attr_accessor :world, :player, :monster
     
@@ -35,11 +40,6 @@ module Gemwarrior
           player_death
         end
 
-        puts
-        puts "PLAYER  :: #{player.hp_cur.to_s.rjust(3)} HP"
-        puts "MONSTER :: #{monster.hp_cur.to_s.rjust(3)} HP"
-        puts "[Fight/Attack][Look][Run]".colorize(:color => :yellow)
-        
         if player_near_death?
           puts "You are almost dead!\n".colorize(:yellow)
         end
@@ -47,6 +47,11 @@ module Gemwarrior
           puts "#{monster.name} is almost dead!\n".colorize(:yellow)
         end
         
+        puts
+        puts "PLAYER  :: #{player.hp_cur.to_s.rjust(3)} HP"
+        puts "MONSTER :: #{monster.hp_cur.to_s.rjust(3)} HP"
+        puts "[Fight/Attack][Look][Run]".colorize(:color => :yellow)
+        
         puts 'What do you do?'
         cmd = gets.chomp.downcase
         
@@ -108,7 +113,12 @@ module Gemwarrior
         0
       else
         if entity.eql?(monster)
-          rand(player.atk_lo..player.atk_hi)
+          if player.beast_mode
+            atk_range = BEAST_MODE_ATTACK..BEAST_MODE_ATTACK
+          else
+            atk_range = player.atk_lo..player.atk_hi
+          end
+          rand(atk_range)
         else
           rand(monster.atk_lo..monster.atk_hi)
         end
@@ -169,6 +179,11 @@ module Gemwarrior
           exit(0)
         else
           puts 'You just beat a boss monster. Way to go!'
+          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
       else
         puts 'You get the following spoils of war:'
@@ -181,8 +196,33 @@ module Gemwarrior
     end
     
     def update_player_stats
+      old_player_level = PlayerLevels::check_level(player.xp)
+      
       player.xp = player.xp + monster.xp
       player.rox = player.rox + monster.rox
+      
+      new_player_level = PlayerLevels::check_level(player.xp)
+      
+      if new_player_level > old_player_level
+        puts 'You leveled up!'
+        new_stats = PlayerLevels::get_level_stats(new_player_level)
+        
+        player.level = new_stats[:level]
+        puts "You are now level #{player.level}!"
+        player.hp_cur = new_stats[:hp_max]
+        player.hp_max = new_stats[:hp_max]
+        puts "You now have #{player.hp_max} hit points!"
+        player.stam_cur = new_stats[:stam_max]
+        player.stam_max = new_stats[:stam_max]
+        puts "You now have #{player.stam_max} stamina points!"
+        player.atk_lo = new_stats[:atk_lo]
+        player.atk_hi = new_stats[:atk_hi]
+        puts "You now have an attack of #{player.atk_lo}-#{player.atk_hi}!"
+        player.defense = new_stats[:defense]
+        puts "You now have #{player.defense} defensive points!"
+        player.dexterity = new_stats[:dexterity]
+        puts "You now have #{player.dexterity} dexterity points!"
+      end
     end
     
     def player_near_death?

data/lib/gemwarrior/entities/location.rb

@@ -43,6 +43,7 @@ module Gemwarrior
 
     def remove_monster(name)
       monsters_abounding.reject! { |monster| monster.name == name }
+      bosses_abounding.reject! { |monster| monster.name == name }
     end
     
     def has_loc_to_the?(direction)

data/lib/gemwarrior/entities/monsters/bosses/garynetty.rb

@@ -0,0 +1,31 @@
+# lib/gemwarrior/entities/monsters/garynetty.rb
+# Garrynetty monster
+
+require_relative '../../monster'
+
+module Gemwarrior
+  class Garynetty < Monster
+    def initialize
+      self.name         = 'Garynetty'
+      self.description  = 'Conservative, yet odd, the Garynetty is not messing around.'
+      self.face         = 'irregular'
+      self.hands        = 'sharp'
+      self.mood         = 'abrasive'
+      
+      self.level        = rand(12..15)
+      self.hp_cur       = rand((level * 2.5).floor..(level * 3.5).floor)
+      self.hp_max       = hp_cur
+      self.atk_lo       = rand((level * 2)..(level * 2.5).floor)
+      self.atk_hi       = rand((level * 2.5).floor..(level * 3).floor)
+      self.defense      = rand(7..9)
+      self.dexterity    = rand(10..12)
+
+      self.inventory    = Inventory.new
+      self.rox          = rand((level * 2)..(level * 3))
+      self.xp           = rand((level * 3)..(level * 4))
+      
+      self.battlecry    = '...?!'
+      self.is_boss      = true
+    end
+  end
+end

data/lib/gemwarrior/entities/player.rb

@@ -3,9 +3,12 @@
 
 require_relative 'creature'
 require_relative '../battle'
+require_relative '../misc/player_levels'
 
 module Gemwarrior
   class Player < Creature
+    include PlayerLevels
+  
     # CONSTANTS
     ## CHARACTER ATTRIBUTES
     CHAR_UPPER_POOL       = (65..90).map{ |i| i.chr }
@@ -31,8 +34,8 @@ module Gemwarrior
       self.xp           = options.fetch(:xp)
       self.hp_cur       = options.fetch(:hp_cur)
       self.hp_max       = options.fetch(:hp_max)
-      self.atk_lo       = options.fetch(:beast_mode) ? 40 : options.fetch(:atk_lo)
-      self.atk_hi       = options.fetch(:beast_mode) ? 40 : options.fetch(:atk_hi)
+      self.atk_lo       = options.fetch(:atk_lo)
+      self.atk_hi       = options.fetch(:atk_hi)
 
       self.defense      = options.fetch(:defense)
       self.dexterity    = options.fetch(:dexterity)
@@ -53,30 +56,30 @@ module Gemwarrior
         print_char_pic
       end
       
-      cur_weapon_name = ''
-      if inventory.weapon.nil?
-        cur_weapon_name = '(unarmed)'
-      else
-        cur_weapon_name = inventory.weapon.name
+      weapon_slot = ''
+      if has_weapon_equipped?
+        weapon_slot = inventory.weapon.name
         self.atk_lo = inventory.weapon.atk_lo
         self.atk_hi = inventory.weapon.atk_hi
+      else
+        weapon_slot = '(unarmed)'
       end
 
-      self_text =  "NAME      : #{name}\n"
-      self_text =  "POSITION  : #{cur_coords.values.to_a}\n"
-      self_text << "WEAPON    : #{cur_weapon_name}\n"
-      self_text << "LEVEL     : #{level}\n"
-      self_text << "EXPERIENCE: #{xp}\n"
-      self_text << "HIT POINTS: #{hp_cur}/#{hp_max}\n"
-      self_text << "ATTACK    : #{atk_lo}-#{atk_hi}\n"
-      self_text << "DEXTERITY : #{dexterity}\n"
-      self_text << "DEFENSE   : #{defense}\n"
-      self_text << "GOD_MODE  : #{god_mode}\n"
-      self_text << "BEAST_MODE: #{beast_mode}\n\n"
+      self_text =  "NAME      : #{self.name}\n"
+      self_text << "POSITION  : #{self.cur_coords.values.to_a}\n"
+      self_text << "WEAPON    : #{weapon_slot}\n"
+      self_text << "LEVEL     : #{self.level}\n"
+      self_text << "EXPERIENCE: #{self.xp}\n"
+      self_text << "HIT POINTS: #{self.hp_cur}/#{self.hp_max}\n"
+      self_text << "ATTACK    : #{self.atk_lo}-#{self.atk_hi}\n"
+      self_text << "DEXTERITY : #{self.dexterity}\n"
+      self_text << "DEFENSE   : #{self.defense}\n"
+      self_text << "GOD_MODE  : #{self.god_mode}\n"
+      self_text << "BEAST_MODE: #{self.beast_mode}\n\n"
       
-      self_text << "#{description}\n\n"
+      self_text << "#{self.description}\n\n"
       
-      self_text << "Current status - breathing, wearing clothing, and with a few other specific characteristics: face is #{face}, hands are #{hands}, and general mood is #{mood}.\n"
+      self_text << "Current status - breathing, wearing clothing, and with a few other specific characteristics: face is #{self.face}, hands are #{self.hands}, and general mood is #{self.mood}.\n"
     end
     
     def rest
@@ -139,12 +142,32 @@ module Gemwarrior
       battle.start
     end
     
+    def has_weapon_equipped?
+      self.inventory.weapon
+    end
+    
     def cur_weapon_name
-      unless inventory.weapon.nil?
+      if has_weapon_equipped?
         return " with your #{inventory.weapon.name}"
+      else
+        return nil
       end
     end
 
+    def switch_beast_mode
+      if self.beast_mode
+binding.pry
+        self.beast_mode = false
+        self.atk_lo = has_weapon_equipped? ? self.inventory.weapon.atk_lo : PlayerLevels::get_level_stats(self.level)[:atk_lo]
+        self.atk_hi = has_weapon_equipped? ? self.inventory.weapon.atk_hi : PlayerLevels::get_level_stats(self.level)[:atk_hi]
+      else
+        self.beast_mode = true
+        self.atk_lo = BEAST_MODE_ATTACK
+binding.pry
+        self.atk_hi = BEAST_MODE_ATTACK
+      end
+    end
+    
     private
     
     # TRAVEL    

data/lib/gemwarrior/game.rb

@@ -5,6 +5,7 @@ require 'colorize'
 require 'matrext'
 
 require_relative 'entities/player'
+require_relative 'misc/player_levels'
 require_relative 'world'
 require_relative 'evaluator'
 require_relative 'repl'
@@ -12,19 +13,11 @@ require_relative 'inventory'
 
 module Gemwarrior
   class Game
+    include PlayerLevels
+  
     # CONSTANTS
     ## PLAYER DEFAULTS
     PLAYER_DESC_DEFAULT       = 'Picked to do battle against a wizened madman for a shiny something or other for world-saving purposes.'
-    PLAYER_LEVEL_DEFAULT      = 1
-    PLAYER_XP_DEFAULT         = 0
-    PLAYER_HP_CUR_DEFAULT     = 30
-    PLAYER_HP_MAX_DEFAULT     = 30
-    PLAYER_STAM_CUR_DEFAULT   = 20
-    PLAYER_STAM_MAX_DEFAULT   = 20
-    PLAYER_ATK_LO_DEFAULT     = 1
-    PLAYER_ATK_HI_DEFAULT     = 2
-    PLAYER_DEFENSE_DEFAULT    = 5
-    PLAYER_DEXTERITY_DEFAULT  = 5
     PLAYER_INVENTORY_DEFAULT  = Inventory.new
     PLAYER_ROX_DEFAULT        = 0
 
@@ -34,18 +27,20 @@ module Gemwarrior
       # create new world and player
       self.world = World.new
 
+      start_stats = PlayerLevels::get_level_stats(1)
+      
       world.player = Player.new({
         :description        => PLAYER_DESC_DEFAULT,
-        :level              => PLAYER_LEVEL_DEFAULT,
-        :xp                 => PLAYER_XP_DEFAULT,
-        :hp_cur             => PLAYER_HP_CUR_DEFAULT,
-        :hp_max             => PLAYER_HP_MAX_DEFAULT,
-        :stam_cur           => PLAYER_STAM_CUR_DEFAULT,
-        :stam_max           => PLAYER_STAM_MAX_DEFAULT,
-        :atk_lo             => PLAYER_ATK_LO_DEFAULT,
-        :atk_hi             => PLAYER_ATK_HI_DEFAULT,
-        :defense            => PLAYER_DEFENSE_DEFAULT,
-        :dexterity          => PLAYER_DEXTERITY_DEFAULT,
+        :level              => start_stats[:level],
+        :xp                 => start_stats[:xp_start],
+        :hp_cur             => start_stats[:hp_max],
+        :hp_max             => start_stats[:hp_max],
+        :stam_cur           => start_stats[:stam_max],
+        :stam_max           => start_stats[:stam_max],
+        :atk_lo             => start_stats[:atk_lo],
+        :atk_hi             => start_stats[:atk_hi],
+        :defense            => start_stats[:defense],
+        :dexterity          => start_stats[:dexterity],
         :inventory          => PLAYER_INVENTORY_DEFAULT,
         :rox                => PLAYER_ROX_DEFAULT,
         :cur_coords         => world.location_coords_by_name('Home'),

data/lib/gemwarrior/misc/player_levels.rb

@@ -2,5 +2,77 @@
 # Stats table for each level the player can reach
 
 module Gemwarrior
-  #todo
+  module PlayerLevels
+    def self.get_level_stats(level)
+      case level
+      when 1
+        {
+          :level => 1, :xp_start => 0,
+          :hp_max => 30, :stam_max => 20, 
+          :atk_lo => 1, :atk_hi => 2, 
+          :defense => 5, :dexterity => 5
+        }
+      when 2
+        { 
+          :level => 2, :xp_start => 50,
+          :hp_max => 35, :stam_max => 25, 
+          :atk_lo => 2, :atk_hi => 3, 
+          :defense => 6, :dexterity => 6
+        }
+      when 3
+        { 
+          :level => 3, :xp_start => 120,
+          :hp_max => 45, :stam_max => 30, 
+          :atk_lo => 3, :atk_hi => 5, 
+          :defense => 7, :dexterity => 8
+        }
+      when 4
+        {
+          :level => 4, :xp_start => 250,
+          :hp_max => 55, :stam_max => 35, 
+          :atk_lo => 5, :atk_hi => 6, 
+          :defense => 8, :dexterity => 9
+        }
+      when 5
+        { 
+          :level => 5, :xp_start => 600,
+          :hp_max => 70, :stam_max => 45, 
+          :atk_lo => 7, :atk_hi => 8, 
+          :defense => 10, :dexterity => 11
+        }
+      when 6
+        { 
+          :level => 6, :xp_start => 1000,
+          :hp_max => 85, :stam_max => 60, 
+          :atk_lo => 8, :atk_hi => 10, 
+          :defense => 13, :dexterity => 13
+        }
+      when 7
+        { 
+          :level => 7, :xp_start => 1500,
+          :hp_max => 100, :stam_max => 80, 
+          :atk_lo => 10, :atk_hi => 12, 
+          :defense => 15, :dexterity => 16
+        }
+      end
+    end
+    
+    def self.check_level(xp)
+      if xp < 50
+        1
+      elsif xp < 120
+        2
+      elsif xp < 250
+        3
+      elsif xp < 600
+        4
+      elsif xp < 1000
+        5
+      elsif xp < 1500
+        6
+      elsif xp < 10000
+        7
+      end
+    end
+  end
 end

data/lib/gemwarrior/misc/version.rb

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

data/lib/gemwarrior/world.rb

@@ -195,6 +195,7 @@ module Gemwarrior
       require_relative 'entities/monsters/cubicat'
       require_relative 'entities/monsters/diaman'
       require_relative 'entities/monsters/bosses/emerald'
+      require_relative 'entities/monsters/bosses/garynetty'
       
       self.monsters = [
         Alexandrat.new, 
@@ -207,7 +208,8 @@ module Gemwarrior
         Coraliz.new, 
         Cubicat.new, 
         Diaman.new,
-        Emerald.new
+        Emerald.new,
+        Garynetty.new
       ]
     end
 
@@ -287,12 +289,52 @@ module Gemwarrior
           :name               => 'Forest', 
           :description        => 'Trees exist here, in droves.',
           :coords             => {:x => 4, :y => 0},
-          :locs_connected     => {:north => false, :east => true, :south => false, :west => false},
+          :locs_connected     => {:north => false, :east => true, :south => false, :west => true},
           :danger_level       => :low,
           :items              => [Feather.new, Tree.new],
           :bosses_abounding   => []
         })
       )
+      locations.push(Location.new({
+          :name               => 'Pain Desert (Southeast)', 
+          :description        => 'Horrible terribleness emanates from this desolate land of unkind misery.',
+          :coords             => {:x => 3, :y => 0},
+          :locs_connected     => {:north => true, :east => true, :south => false, :west => true},
+          :danger_level       => :assured,
+          :items              => [],
+          :bosses_abounding   => [Garynetty.new]
+        })
+      )
+      locations.push(Location.new({
+          :name               => 'Pain Desert (Northeast)', 
+          :description        => 'Horrible terribleness emanates from this desolate land of unkind misery.',
+          :coords             => {:x => 3, :y => 1},
+          :locs_connected     => {:north => false, :east => false, :south => true, :west => true},
+          :danger_level       => :assured,
+          :items              => [],
+          :bosses_abounding   => [Garynetty.new]
+        })
+      )
+      locations.push(Location.new({
+          :name               => 'Pain Desert (Northwest)', 
+          :description        => 'Horrible terribleness emanates from this desolate land of unkind misery.',
+          :coords             => {:x => 2, :y => 1},
+          :locs_connected     => {:north => false, :east => true, :south => true, :west => false},
+          :danger_level       => :assured,
+          :items              => [],
+          :bosses_abounding   => [Garynetty.new]
+        })
+      )
+      locations.push(Location.new({
+          :name               => 'Pain Desert (Southwest)', 
+          :description        => 'Horrible terribleness emanates from this desolate land of unkind misery.',
+          :coords             => {:x => 2, :y => 0},
+          :locs_connected     => {:north => true, :east => true, :south => false, :west => false},
+          :danger_level       => :assured,
+          :items              => [],
+          :bosses_abounding   => [Garynetty.new]
+        })
+      )
       locations.push(Location.new({
           :name               => 'Plains', 
           :description        => 'A lot of grass and nothing, but you see a mysterious tower further north, and your home to the south.',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -195,6 +195,7 @@ files:
 - lib/gemwarrior/entities/monsters/aquamarine.rb
 - lib/gemwarrior/entities/monsters/bloodstorm.rb
 - lib/gemwarrior/entities/monsters/bosses/emerald.rb
+- lib/gemwarrior/entities/monsters/bosses/garynetty.rb
 - lib/gemwarrior/entities/monsters/citrinaga.rb
 - lib/gemwarrior/entities/monsters/coraliz.rb
 - lib/gemwarrior/entities/monsters/cubicat.rb