gemwarrior 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87bff5190da68f1454d52814bd9422db83ee0557
-  data.tar.gz: 20431dada8b12529559d785d9153a7051bb76e2c
+  metadata.gz: 300296825e93c873913e9d320b57f60e8fe3b74c
+  data.tar.gz: 81572b6003715ae7c1daf54e196c49a18186c68a
 SHA512:
-  metadata.gz: 9aaabc538029f95eb443f464c35865eb7cf184880b616058b20dc0402c80a28eb19dac63c627d2fa1c1781c181007e945ed65a867cc56bc6ec475a862806a59d
-  data.tar.gz: 18d20126876e58d3e74f89ff2e46c0687bcea02281772b5590f2a393ea6cb6e7b0397fc3a22e1526696787907b5ac69e5aa7c3bfac9a6b74181b01b84eb06a91
+  metadata.gz: 12a00f13c496e14a5af47b1dc6dbe6ece42ba66035ce9d36646c0971f031eaaba51d5d17f8441fcd24f7735f318ddbfc9e67e9f87aeb9bc75c48e1bc07282f15
+  data.tar.gz: 64bb8979dce6de9d1a52483a7ffe91d8c660804f35132d950c7d6c438f6147c352141cfb3613be69cfda0d234df01af184aa6e729baf21c8f30f3712834bde34

data/data/default_world.yaml

@@ -2080,8 +2080,8 @@ player: !ruby/object:Gemwarrior::Player
   hp_max: 30
   atk_lo: 1
   atk_hi: 2
-  defense: 5
-  dexterity: 5
+  defense: 1
+  dexterity: 1
   inventory: !ruby/object:Gemwarrior::Inventory
     armor: 
     items: []

data/lib/gemwarrior/battle.rb

@@ -7,7 +7,14 @@ module Gemwarrior
   class Battle
     # CONSTANTS
     ERROR_ATTACK_OPTION_INVALID = 'That will not do anything against the monster.'
-    BEAST_MODE_ATTACK           = 100
+    BEAST_MODE_ATTACK_LO        = 100
+    BEAST_MODE_ATTACK_HI        = 200
+    ATTEMPT_SUCCESS_LO_DEFAULT  = 0
+    ATTEMPT_SUCCESS_HI_DEFAULT  = 100
+    MISS_CAP_DEFAULT            = 20
+    LV3_MOD_LO                  = 6
+    LV5_MOD_LO                  = 7
+    LV5_MOD_HI                  = 14
     ESCAPE_TEXT                 = '** POOF **'
 
     attr_accessor :world,
@@ -58,7 +65,7 @@ module Gemwarrior
         monster_attacks_player
       end
       
-      # LV4:STONE_FACE modifier prior to main battle to auto-win
+      # LV4:STONE_FACE modifier (chance 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
@@ -68,8 +75,8 @@ module Gemwarrior
         if GameOptions.data['debug_mode']
           puts
           puts "  (MOD) LV4: Stone Face"
-          puts "  Range to auto-win: #{chance_range}"
-          puts "  Auto-win roll: #{roll}"
+          puts "  SUCCESS_RANGE: #{chance_range}"
+          puts "  SUCCESS_ROLL : #{roll}"
         end
 
         if chance_range.include?(roll)
@@ -97,11 +104,11 @@ module Gemwarrior
         puts
 
         # print health info
-        print "  #{player.name.upcase.ljust(12)} :: #{player.hp_cur.to_s.rjust(3)} HP"
+        print "  #{player.name.upcase.ljust(12).colorize(:green)} :: #{player.hp_cur.to_s.rjust(3)} HP"
         print " (LVL: #{player.level})" if GameOptions.data['debug_mode']
         print "\n"
 
-        print "  #{monster.name.upcase.ljust(12)} :: "
+        print "  #{monster.name.upcase.ljust(12).colorize(:red)} :: "
         if GameOptions.data['debug_mode'] || player.special_abilities.include?(:rocking_vision)
           print "#{monster.hp_cur.to_s.rjust(3)}"
         else
@@ -137,7 +144,7 @@ module Gemwarrior
 
           if can_attack
             puts "  You attack #{monster.name}#{player.cur_weapon_name}!"
-            dmg = calculate_damage_to(monster)
+            dmg = calculate_damage(player, monster)
             if dmg > 0
               Audio.play_synth(:battle_player_attack)
 
@@ -149,7 +156,7 @@ module Gemwarrior
             else
               Audio.play_synth(:battle_player_miss)
 
-              puts '  You miss entirely!'.colorize(:yellow)
+              puts '  You do no damage!'.colorize(:yellow)
             end
           end
         when 'defend', 'd'
@@ -233,27 +240,80 @@ module Gemwarrior
     private
 
     # NEUTRAL
-    def calculate_damage_to(entity)
-      miss = rand(0..(100 + entity.defense))
-      if miss < 15
-        0
-      else
-        if entity.eql?(monster)
-          # base attack range
+    def calculate_damage(attacker, defender)
+      # things that modify attack success and damage
+      a_dex = attacker.dexterity
+      d_dex = defender.dexterity
+      d_def = defender.defense
+
+      # player attacking monster
+      if defender.eql?(monster)
+        # attack success defined by attacker's and defender's dexterity
+        attempt_success_lo = ATTEMPT_SUCCESS_LO_DEFAULT
+        attempt_success_hi = ATTEMPT_SUCCESS_HI_DEFAULT
+
+        # success range to hit based on dexterity
+        attempt_success_hi += rand((a_dex)..(a_dex+2))
+        attempt_success_hi -= rand((d_dex)..(d_dex+2))
+
+        # compute attempt success
+        attempt = rand(attempt_success_lo..attempt_success_hi)
+        miss_cap = MISS_CAP_DEFAULT
+
+        ######################
+        # ACCURACY MODIFIERS #
+        # vvvvvvvvvvvvvvvvvv #
+        ######################
+
+        ### LV5:GRANITON modifier (more accuracy)
+        if player.special_abilities.include?(:graniton)
+          miss_cap -= rand(LV5_MOD_LO..LV5_MOD_HI)
+        end
+
+        ######################
+        # ^^^^^^^^^^^^^^^^^^ #
+        # ACCURACY MODIFIERS #
+        ######################
+
+        # number to beat for attack success
+        success_min = rand(miss_cap..miss_cap + 5)
+
+        if GameOptions.data['debug_mode']
+          puts
+          puts '  Player Roll for Attack:'.colorize(:green)
+          puts "  ATTEMPT_RANGE: #{attempt_success_lo}..#{attempt_success_hi}"
+          puts "  MUST_BEAT    : #{success_min}"
+          if attempt > success_min
+            puts "  ATTEMPT_ROLL : #{attempt.to_s.colorize(:green)}"
+          else
+            puts "  ATTEMPT_ROLL : #{attempt.to_s.colorize(:red)}"
+          end
+        end
+
+        # no miss, so attack
+        if attempt > success_min
+          # base player damage range
           base_atk_lo = player.atk_lo
           base_atk_hi = player.atk_hi
 
+          # weapon increases damage range
           if player.has_weapon_equipped?
             base_atk_lo += player.inventory.weapon.atk_lo
             base_atk_hi += player.inventory.weapon.atk_hi
           end
 
-          atk_range = base_atk_lo..base_atk_hi
+          # non-modified damage range
+          dmg_range = base_atk_lo..base_atk_hi
+
+          ####################
+          # DAMAGE MODIFIERS #
+          # vvvvvvvvvvvvvvvv #
+          ####################
 
-          # DEBUG(beast mode) modifier
+          ### DEBUG:BEAST_MODE modifier (ludicrously higher damage range)
           if GameOptions.data['beast_mode']
-            atk_range = BEAST_MODE_ATTACK..BEAST_MODE_ATTACK
-          # LV3:ROCK_SLIDE modifier
+            dmg_range = BEAST_MODE_ATTACK_LO..BEAST_MODE_ATTACK_HI
+          ### LV3:ROCK_SLIDE modifier (increased damage range)
           elsif player.special_abilities.include?(:rock_slide)
             lo_boost = rand(0..9)
             hi_boost = lo_boost + rand(5..10)
@@ -265,20 +325,114 @@ module Gemwarrior
               puts "  Rock Slide hi_boost: #{hi_boost}"
             end
 
-            if lo_boost >= 6
+            if lo_boost >= LV3_MOD_LO
               puts "  You use Rock Slide for added damage!"
-              atk_range = (player.atk_lo + lo_boost)..(player.atk_hi + hi_boost)
+              dmg_range = (player.atk_lo + lo_boost)..(player.atk_hi + hi_boost)
             else
               puts "  Rock Slide failed :(" if GameOptions.data['debug_mode']
             end
           end
 
-          # return attack range
-          return rand(atk_range)
+          ####################
+          # ^^^^^^^^^^^^^^^^ #
+          # DAMAGE MODIFIERS #
+          ####################
+
+          # get base damage to apply
+          base_dmg = rand(dmg_range)
+
+          # lower value due to defender's defense
+          dmg = base_dmg - d_def
+
+          # 50% chance of doing 1 point of damage even if you were going to do no damage
+          hail_mary = [dmg, 1].sample
+          dmg = hail_mary if dmg <= 0
+
+          if GameOptions.data['debug_mode']
+            puts
+            puts '  Player Roll for Damage:'.colorize(:green)
+            puts "  DMG_RANGE  : #{dmg_range}"
+            puts "  DMG_ROLL   : #{base_dmg}"
+            puts "  MONSTER_DEF: #{d_def}"
+            puts "  HAIL_MARY  : #{hail_mary}"
+            if dmg > 0
+              puts "  NET_DMG    : #{dmg.to_s.colorize(:green)}"
+            else
+              puts "  NET_DMG    : #{dmg.to_s.colorize(:red)}"
+            end
+          end
+
+          return dmg
+        # missed? no damage
         else
-          dmg = rand(monster.atk_lo..monster.atk_hi)
-          dmg -= (entity.defense / 2) if player_is_defending
+          return 0
+        end
+      # monster attacking player
+      else
+        # attack success defined by attacker's and defender's dexterity
+        attempt_success_lo = ATTEMPT_SUCCESS_LO_DEFAULT
+        attempt_success_hi = ATTEMPT_SUCCESS_HI_DEFAULT
+
+        # success range to hit based on dexterity
+        attempt_success_hi += rand((a_dex)..(a_dex+2))
+        attempt_success_hi -= rand((d_dex)..(d_dex+2))
+
+        # compute attempt success
+        attempt = rand(attempt_success_lo..attempt_success_hi)
+        miss_cap = MISS_CAP_DEFAULT
+
+        # number to beat for attack success
+        success_min = rand(miss_cap..miss_cap + 5)
+
+        if GameOptions.data['debug_mode']
+          puts
+          puts '  Monster Roll for Attack:'.colorize(:red)
+          puts "  ATTEMPT_RANGE: #{attempt_success_lo}..#{attempt_success_hi}"
+          puts "  ATTEMPT_ROLL : #{attempt}"
+          puts "  MUST_BEAT    : #{success_min}"
+          if attempt > success_min
+            puts "  ATTEMPT_ROLL : #{attempt.to_s.colorize(:green)}"
+          else
+            puts "  ATTEMPT_ROLL : #{attempt.to_s.colorize(:red)}"
+          end
+        end
+
+        # no miss, so attack
+        if attempt > success_min
+          dmg_range = attacker.atk_lo..attacker.atk_lo
+
+          # get base damage to apply
+          base_dmg = rand(dmg_range)
+
+          # lower value for defender's defense (and further if actively defending)
+          if player_is_defending
+            dmg = base_dmg - [(d_def * 1.5).floor, (d_def * 1.5).ceil].sample
+          else
+            dmg = base_dmg - d_def
+          end
+
+          # 25% chance of doing 1 point of damage even if monster was going to do no damage
+          hail_mary = [dmg, dmg, dmg, 1].sample
+          dmg = hail_mary if dmg <= 0
+
+          if GameOptions.data['debug_mode']
+            puts
+            puts '  Monster Roll for Damage:'.colorize(:red)
+            puts "  DMG_RANGE  : #{dmg_range}"
+            puts "  DMG_ROLL   : #{base_dmg}"
+            puts "  PLAYER_DEF : #{d_def}"
+            puts "  HAIL_MARY  : #{hail_mary}"
+            if dmg > 0
+              puts "  NET_DMG    : #{dmg.to_s.colorize(:green)}"
+            else
+              puts "  NET_DMG    : #{dmg.to_s.colorize(:red)}"
+            end
+          end
+
           return dmg
+        # missed? no damage
+        else
+          return 0
         end
       end
     end
@@ -322,7 +476,7 @@ module Gemwarrior
     def monster_attacks_player
       puts "  #{monster.name} attacks you!".colorize(:yellow)
 
-      dmg = calculate_damage_to(player)
+      dmg = calculate_damage(monster, player)
       if dmg > 0
         Audio.play_synth(:battle_monster_attack)
 
@@ -330,7 +484,7 @@ module Gemwarrior
       else
         Audio.play_synth(:battle_monster_miss)
 
-        puts "  #{monster.name} misses entirely!".colorize(:yellow)
+        puts "  #{monster.name} does no damage!".colorize(:yellow)
       end
     end
 

data/lib/gemwarrior/entities/location.rb

@@ -11,6 +11,7 @@ module Gemwarrior
     DANGER_LEVEL              = { none: 0, low: 15, moderate: 30, high: 55, assured: 100 }
     ERROR_ITEM_ADD_INVALID    = 'That item cannot be added to the location\'s inventory.'
     ERROR_ITEM_REMOVE_INVALID = 'That item cannot be removed as it does not exist here.'
+    ERROR_SPAWN_NAME_INVALID  = 'That monster does not exist in the game, and cannot be spawned.'
 
     attr_accessor :coords,
                   :paths,
@@ -193,26 +194,36 @@ module Gemwarrior
       actionable_words.join(', ')
     end
 
-    def populate_monsters(monsters_available, spawn = false)
+    def populate_monsters(monsters_available = nil, spawn = false, monster_type = nil)
       if should_spawn_monster? || spawn
         self.checked_for_monsters = true unless spawn
         self.monsters_abounding = [] unless spawn
         random_monster = nil
 
-        # get random non-boss monster
-        loop do
-          random_monster = monsters_available[rand(0..monsters_available.length-1)].clone
+        if monster_type.nil?
+          # get random non-boss monster
+          loop do
+            random_monster = monsters_available[rand(0..monsters_available.length-1)].clone
 
-          if spawn
-            break
-          else
-            unless random_monster.is_boss || !self.monster_level_range.include?(random_monster.level)
+            if spawn
               break
+            else
+              unless random_monster.is_boss || !self.monster_level_range.include?(random_monster.level)
+                break
+              end
             end
           end
-        end
 
-        monsters_abounding.push(random_monster)
+          monsters_abounding.push(random_monster)
+        else
+          monster_type_to_spawn = monsters_available.find { |m| m.name.downcase == monster_type.downcase }
+          if monster_type_to_spawn.nil?
+            puts ERROR_SPAWN_NAME_INVALID.colorize(:red)
+            puts
+          else
+            monsters_abounding.push(monster_type_to_spawn)
+          end
+        end
       else
         return nil
       end

data/lib/gemwarrior/entities/monsters/alexandrat.rb

@@ -21,7 +21,7 @@ module Gemwarrior
       self.hp_max       = hp_cur
       self.atk_lo       = rand(level..(level * 1.5).floor)
       self.atk_hi       = rand((level * 1.5).floor..(level * 2))
-      self.defense      = rand(level..(level * 1.5).floor)
+      self.defense      = rand(1..2)
       self.dexterity    = rand(1..3)
 
       self.rox          = rand((level * 2)..(level * 3))

data/lib/gemwarrior/entities/monsters/amberoo.rb

@@ -21,8 +21,8 @@ module Gemwarrior
       self.hp_max       = hp_cur
       self.atk_lo       = rand(level..(level * 2))
       self.atk_hi       = rand((level * 2)..(level * 2.5).floor)
-      self.defense      = rand((level * 2)..(level * 2.5).floor)
-      self.dexterity    = rand(3..4)
+      self.defense      = rand(2..3)
+      self.dexterity    = rand(2..4)
 
       self.rox          = rand((level * 2)..(level * 3))
       self.xp           = rand(level..(level * 2))

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

@@ -18,7 +18,7 @@ module Gemwarrior
       self.mood         = 'opaque'
 
       self.level        = rand(7..8)
-      self.hp_cur       = rand((level * 2.5).floor..(level * 3.5).floor)
+      self.hp_cur       = rand((level * 4.5).floor..(level * 5.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)

data/lib/gemwarrior/entities/monsters/diaman.rb

@@ -21,7 +21,7 @@ module Gemwarrior
       self.hp_max       = hp_cur
       self.atk_lo       = rand(level..(level * 2.5).floor)
       self.atk_hi       = rand((level * 2.5).floor..(level * 3).floor)
-      self.defense      = rand(5..7)
+      self.defense      = rand(6..7)
       self.dexterity    = rand(8..10)
 
       self.rox          = rand((level * 2)..(level * 3))

data/lib/gemwarrior/evaluator.rb

@@ -277,7 +277,7 @@ module Gemwarrior
           end
         when 'spawn', 'sp'
           player_cur_location = world.location_by_coords(world.player.cur_coords)
-          player_cur_location.populate_monsters(GameMonsters.data, spawn: true)
+          player_cur_location.populate_monsters(GameMonsters.data, true, param1)
           return world.describe(player_cur_location)
         when 'teleport', 'tp'
           if param1.nil?

data/lib/gemwarrior/misc/player_levels.rb

@@ -10,7 +10,7 @@ module Gemwarrior
           level:    1,   xp_start:   0,
           hp_max:   30,  stam_max:   20, 
           atk_lo:   1,   atk_hi:     2, 
-          defense:  5,   dexterity:  5,
+          defense:  1,   dexterity:  1,
           special_abilities: nil
         }
       when 2
@@ -18,7 +18,7 @@ module Gemwarrior
           level:    2,   xp_start:   50,
           hp_max:   35,  stam_max:   25, 
           atk_lo:   2,   atk_hi:     3, 
-          defense:  6,   dexterity:  6,
+          defense:  3,   dexterity:  3,
           special_abilities: :rocking_vision
         }
       when 3
@@ -26,7 +26,7 @@ module Gemwarrior
           level:    3,   xp_start:   120,
           hp_max:   45,  stam_max:   30, 
           atk_lo:   3,   atk_hi:     5, 
-          defense:  7,   dexterity:  8,
+          defense:  5,   dexterity:  6,
           special_abilities: :rock_slide
         }
       when 4
@@ -34,7 +34,7 @@ module Gemwarrior
           level:    4,   xp_start:   250,
           hp_max:   55,  stam_max:   35, 
           atk_lo:   5,   atk_hi:     6, 
-          defense:  8,   dexterity:  9,
+          defense:  6,   dexterity:  8,
           special_abilities: :stone_face
         }
       when 5
@@ -42,7 +42,7 @@ module Gemwarrior
           level:    5,   xp_start:   600,
           hp_max:   70,  stam_max:   45, 
           atk_lo:   7,   atk_hi:     8, 
-          defense:  10,  dexterity:  11,
+          defense:  8,  dexterity:   9,
           special_abilities: :graniton
         }
       when 6
@@ -50,7 +50,7 @@ module Gemwarrior
           level:    6,   xp_start:   1000,
           hp_max:   85,  stam_max:   60, 
           atk_lo:   8,   atk_hi:     10, 
-          defense:  13,  dexterity:  13,
+          defense:  10,  dexterity:  11,
           special_abilities: :gleam
         }
       when 7
@@ -58,7 +58,7 @@ module Gemwarrior
           level:    7,   xp_start:   1500,
           hp_max:   100, stam_max:   80, 
           atk_lo:   10,  atk_hi:     12, 
-          defense:  15,  dexterity:  16,
+          defense:  13,  dexterity:  14,
           special_abilities: :break_through
         }
       else
@@ -100,7 +100,8 @@ module Gemwarrior
         '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 :graniton
+        'Chance to be much more accurate in your attacks.'
       #when :gleam
       #when :break_through
       else

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -43,7 +43,7 @@ module Gemwarrior
       desc_text << "\n >> Path(s):     #{point.list_paths.join(', ')}".colorize(:white)
 
       if GameOptions.data['debug_mode']
-        desc_text << "\n >>> Actionable: ".colorize(color: :red, background: :grey)
+        desc_text << "\n >>> Actionable: ".colorize(color: :yellow, background: :grey)
         desc_text << point.list_actionable_words.colorize(color: :white, background: :grey)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os