gemwarrior 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e003f1c361b29e19bf92a5d6041cdf41625ffee
-  data.tar.gz: 1aa44590aa8d6d79460d64910509519482dffc03
+  metadata.gz: 4a63dbf4d7fa1730e5bb7504020b668e54cb0a95
+  data.tar.gz: 4ed06ecc25c511622ef4730e7bbc5d9b2c2d1dcb
 SHA512:
-  metadata.gz: 27726ab0025e81e5a9b1863f772ff2cd5d99bb468ce1609414c4c4bf97ad1e1cac906e04923cda45183680b7e737ec96490ca1ed0fe0f48671a78a2e5b37da63
-  data.tar.gz: 9f6f72ad094d442b8064ab21c3c22ef186563a88958b9ae363e3322f52ca69de6b458a88078a5c002e0c12fdb8c737a238ccb4b15c03c610698d160516fec87f
+  metadata.gz: fa9c14bded730f4ae0f9693094e8893bb7f5f133be99422e90baabe10da96c92f04461d47a4f94e21e2af4557b08261db405c5f064c6c89f5ecd9654b42d53fe
+  data.tar.gz: d75e3ab4f36c04a6946ee6104858f91a7f6d303e92380f193d39741230fe26d02e0a226a9dfd25735db19b85b4fbadd723d0e025f0aab206197471cd1cc86977

data/bin/gemwarrior

@@ -17,6 +17,7 @@ GW_OPTS_FILE          = "#{GW_HOME}/gw_opts"
 GW_LOG_FILE           = "#{GW_HOME}/gw_log"
 GW_DEFAULT_WORLD_YAML = File.expand_path('../../data/default_world.yaml', __FILE__)
 GW_DEFAULT_WORLD_BIN  = File.expand_path('../../data/default_world.bin', __FILE__)
+GW_WRAP_WIDTH         = 80
 
 def parse_options_cli
   options = {
@@ -124,6 +125,7 @@ def init_config
   GameOptions.add 'save_file_bin_path',       GW_SAVE_FILE_BIN
   GameOptions.add 'log_file_path',            GW_LOG_FILE
   GameOptions.add 'options_file_path',        GW_OPTS_FILE
+  GameOptions.add 'wrap_width',               GW_WRAP_WIDTH
 end
 
 begin

data/lib/gemwarrior/battle.rb

@@ -9,7 +9,7 @@ module Gemwarrior
     # CONSTANTS
     ERROR_ATTACK_OPTION_INVALID = 'That will not do anything against the monster.'
     BEAST_MODE_ATTACK           = 100
-    ESCAPE_TEXT                 = '** POOF **'
+    ESCAPE_TEXT                 = '  ** POOF **'
 
     attr_accessor :world, :player, :monster, :player_is_defending
 
@@ -30,23 +30,24 @@ module Gemwarrior
         { frequencies: 'G#4', duration: 50 }
       ])
 
-      print_battle_line
+      # begin battle!
+      print_battle_header unless is_arena
 
       if is_arena
-        print 'Your opponent is now...'
+        print '  Your opponent is now...'
         Animation::run(phrase: "#{monster.name.upcase}!", speed: :slow)
       elsif is_event
-        puts "You are attacked by #{monster.name}!"
+        puts "  You are ambushed by #{monster.name}!".colorize(:yellow)
       else
-        puts "You decide to attack #{monster.name}!"
+        puts "  You decide to attack #{monster.name}!"
       end
 
-      puts "#{monster.name} cries out: \"#{monster.battlecry}\"".colorize(:yellow)
+      puts "  #{monster.name} cries out: \"#{monster.battlecry}\""
 
       # first strike!
       unless is_arena
         if monster_strikes_first?(is_event)
-          puts "#{monster.name} strikes first!".colorize(:yellow)
+          puts "  #{monster.name} strikes first!".colorize(:yellow)
           monster_attacks_player
         end
       end
@@ -63,20 +64,20 @@ module Gemwarrior
 
         # check for near death
         if player_near_death?
-          puts "You are almost dead!\n".colorize(:yellow)
+          puts "  You are almost dead!\n".colorize(:yellow)
         end
         if monster_near_death?
-          puts "#{monster.name} is almost dead!\n".colorize(:yellow)
+          puts "  #{monster.name} is almost dead!\n".colorize(:yellow)
         end
 
         puts
 
         # print health info
-        print "#{player.name.upcase.ljust(12)} :: #{player.hp_cur.to_s.rjust(3)} HP"
+        print "  #{player.name.upcase.ljust(12)} :: #{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)} :: "
         if GameOptions.data['debug_mode'] || player.special_abilities.include?(:rocking_vision)
           print "#{monster.hp_cur.to_s.rjust(3)}"
         else
@@ -90,8 +91,8 @@ module Gemwarrior
         self.player_is_defending = false
 
         # battle options prompt
-        puts 'What do you do?'
-        print '['.colorize(:yellow)
+        puts '  What do you do?'
+        print '  ['.colorize(:yellow)
         print 'F'.colorize(:green)
         print 'ight/'.colorize(:yellow)
         print 'A'.colorize(:green)
@@ -105,13 +106,13 @@ module Gemwarrior
         print 'R'.colorize(:green)
         print 'un]'.colorize(:yellow)
         print "\n"
-
+        print '  [BATTLE]> '
         player_action = STDIN.gets.chomp.downcase
 
         # player action
         case player_action
         when 'fight', 'f', 'attack', 'a'
-          puts "You attack #{monster.name}#{player.cur_weapon_name}!"
+          puts "  You attack #{monster.name}#{player.cur_weapon_name}!"
           dmg = calculate_damage_to(monster)
           if dmg > 0
             Music::cue([{ frequencies: 'A4,E4,B5', duration: 75 }])
@@ -124,32 +125,33 @@ module Gemwarrior
           else
             Music::cue([{ frequencies: 'A4', duration: 75 }])
 
-            puts 'You miss entirely!'.colorize(:yellow)
+            puts '  You miss entirely!'.colorize(:yellow)
           end
         when 'defend', 'd'
-          puts 'You dig in and defend this round.'
+          puts '  You dig in and defend this round.'
           self.player_is_defending = true
         when 'pass', 'p'
-          puts 'You decide to pass your turn for some reason. Brave!'
+          puts '  You decide to pass your turn for some reason. Brave!'
         when 'look', 'l'
-          print "#{monster.name}".colorize(:white)
+          print "  #{monster.name}".colorize(:white)
           print " (#{monster.hp_cur}/#{monster.hp_max} HP): #{monster.description}\n"
-          puts "It has some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
+          puts "  It has some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
           if GameOptions.data['debug_mode']
-            puts 'If defeated, will receive:'
-            puts " >> XP   : #{monster.xp}"
-            puts " >> ROX  : #{monster.rox}"
-            puts " >> ITEMS: #{monster.inventory.list_contents}"
+            puts '  If defeated, will receive:'
+            puts "  >> XP   : #{monster.xp}"
+            puts "  >> ROX  : #{monster.rox}"
+            puts "  >> ITEMS: #{monster.inventory.list_contents}"
             next
           end
         when 'run', 'r'
           if player_escape?(is_arena)
             monster.hp_cur = monster.hp_max
-            puts "You successfully elude #{monster.name}!".colorize(:green)
+            puts "  You successfully elude #{monster.name}!".colorize(:green)
             print_escape_text
+            print_battle_line
             return 'escaped'
           else
-            puts 'You were not able to run away! :-('.colorize(:yellow)
+            puts '  You were not able to run away! :-('.colorize(:yellow)
           end
         else
           puts ERROR_ATTACK_OPTION_INVALID
@@ -207,17 +209,19 @@ module Gemwarrior
 
     def take_damage(entity, dmg)
       entity.hp_cur = entity.hp_cur.to_i - dmg.to_i
-      who_gets_wounded = ''
+      who_gets_wounded_start = ''
 
       if entity.eql?(monster)
-        who_gets_wounded = "> You wound #{monster.name} for "
+        who_gets_wounded_start = "  > You wound #{monster.name} for "
+        who_gets_wounded_end   = " point(s)!\n".colorize(:green)
       else
-        who_gets_wounded = '> You are wounded for '
+        who_gets_wounded_start = '  > You are wounded for '.colorize(:red)
+        who_gets_wounded_end   = " point(s)!\n".colorize(:red)
       end
 
-      print who_gets_wounded
+      print who_gets_wounded_start
       Animation::run(phrase: dmg.to_s, speed: :slow, oneline: true, alpha: false, random: false)
-      print " point(s)!\n"
+      print who_gets_wounded_end
     end
 
     # MONSTER
@@ -236,7 +240,7 @@ module Gemwarrior
     end
 
     def monster_attacks_player
-      puts "#{monster.name} attacks you!"
+      puts "  #{monster.name} attacks you!".colorize(:yellow)
 
       dmg = calculate_damage_to(player)
       if dmg > 0
@@ -246,7 +250,7 @@ module Gemwarrior
       else
         Music::cue([{ frequencies: 'B4', duration: 75 }])
 
-        puts "#{monster.name} misses entirely!".colorize(:yellow)
+        puts "  #{monster.name} misses entirely!".colorize(:yellow)
       end
     end
 
@@ -259,7 +263,7 @@ module Gemwarrior
     end
 
     def monster_death
-      puts "You have defeated #{monster.name}!\n".colorize(:green)
+      puts "  YOU HAVE DEFEATED #{monster.name.upcase}!\n".colorize(:green)
 
       # stats
       world.player.monsters_killed += 1
@@ -289,19 +293,19 @@ module Gemwarrior
           gets
           return 'exit'
         else
-          puts 'You just beat a boss monster. Way to go!'
-          puts " XP : #{monster.xp}".colorize(:green)
-          puts " ROX: #{monster.rox}".colorize(:green)
+          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
           player.update_stats(reason: :monster, value: monster)
           world.location_by_coords(player.cur_coords).remove_monster(monster.name)
         end
       else
-        puts 'You get the following spoils of war:'
-        puts " XP   : #{monster.xp}".colorize(:green)
-        puts " ROX  : #{monster.rox}".colorize(:green)
+        puts '  You get the following spoils of war:'
+        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.list_contents}".colorize(:green) unless monster.inventory.items.empty?
         end
         print_battle_line
         player.update_stats(reason: :monster, value: monster)
@@ -319,7 +323,7 @@ module Gemwarrior
     end
 
     def player_death
-      puts "You are dead, slain by the #{monster.name}!".colorize(:red)
+      puts "  You are dead, slain by the #{monster.name}!".colorize(:red)
       print_battle_line
     end
 
@@ -330,6 +334,8 @@ module Gemwarrior
         else
           dex_diff = monster.dexterity - player.dexterity
           rand_dex = rand(0..dex_diff)
+          rand_dex += rand(0..1) # slight extra chance modifier
+
           if rand_dex % 2 > 0
             return true
           else
@@ -341,13 +347,19 @@ module Gemwarrior
     end
 
     # STATUS TEXT
-
     def print_escape_text
-      Animation::run(phrase: ESCAPE_TEXT, oneline: true)
+      Animation::run(phrase: ESCAPE_TEXT, oneline: false)
     end
 
     def print_battle_line
-      puts '******************************'
+      GameOptions.data['wrap_width'].times { print '*'.colorize(background: :red, color: :white) }
+      print "\n"
+    end
+
+    def print_battle_header
+      print_battle_line
+      puts ' BATTLE BEGINS!'.ljust(GameOptions.data['wrap_width']).colorize(background: :red, color: :white)
+      print_battle_line
     end
   end
 end

data/lib/gemwarrior/entities/entity.rb

@@ -1,11 +1,10 @@
 # lib/gemwarrior/entities/entity.rb
 # Base class for an interactable object
 
+require_relative '../game_options'
+
 module Gemwarrior
   class Entity
-    # CONSTANTS
-    WRAP_WIDTH = 80
-
     attr_accessor :name, :description
 
     def status
@@ -13,7 +12,7 @@ module Gemwarrior
       status_text << "#{description}\n".colorize(:white)
     end
 
-    def puts(s = '', width = WRAP_WIDTH)
+    def puts(s = '', width = GameOptions.data['wrap_width'])
       super s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") unless s.nil?
     end
   end

data/lib/gemwarrior/repl.rb

@@ -19,7 +19,6 @@ module Gemwarrior
     QUIT_MESSAGE            = 'Temporal flux detected. Shutting down...'.colorize(:red)
     MAIN_MENU_QUIT_MESSAGE  = 'Giving up so soon? Jool will be waiting...'.colorize(:yellow)
     SPLASH_MESSAGE          = 'Welcome to *Jool*, where randomized fortune is just as likely as mayhem.'
-    WRAP_WIDTH              = 80
     GITHUB_NAME             = 'michaelchadwick'
     GITHUB_PROJECT          = 'gemwarrior'
 
@@ -77,7 +76,7 @@ module Gemwarrior
       Readline.readline(prompt_text, true).to_s
     end
 
-    def puts(s = '', width = WRAP_WIDTH)
+    def puts(s = '', width = GameOptions.data['wrap_width'])
       super s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") unless s.nil?
     end
 

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Michael Chadwick