gemwarrior 0.9.22 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b597259ded305d57bc41028e2129e454140255ba
-  data.tar.gz: 44653fe9f3c4f48c62d1fb93a8c872375539da68
+  metadata.gz: f98fe21d4e8bc60fc35a70412c557c61c3b58a2c
+  data.tar.gz: 8f1c02ecc713082b4049b01add40eb2d5209cc80
 SHA512:
-  metadata.gz: 335f48a60bfd59529f6aa07f3ddc1c8b014add206f872b7664ed092bda7f66de7d6e5e4e62d6638699f50270205a9a0c4650174c95cc6a060290db5f030015ba
-  data.tar.gz: 6c1a36f12a20ee9c6af50034b3e32e5842c811ec73a3c2d30d721c3f8cdacf506b9720115485f6c29ee728ddd3b9f170d7ea6b55b3edf03e63a2dd7004947f8d
+  metadata.gz: 6fd750bdd5b1791f61d6cd295e682c0b66d9abcd0e22934fda3e5d580b0eee8858dc86882e07c2a910571dea52904cfdceb8a3be3280e5be5ea114e2354b047c
+  data.tar.gz: 3f981fef70c2c9e8444e2dc5e0e4e47a52a901d775581012ac384e2d0df16443ed6ac7980cdc75d0ff578af1094fb317b86d2f6e890be357dd531a345c34851c

data/lib/gemwarrior/battle.rb

@@ -163,8 +163,13 @@ module Gemwarrior
         0
       else
         if entity.eql?(monster)
+          # base attack range
+          atk_range = player.atk_lo..player.atk_hi
+          
+          # beast mode modifier
           if player.beast_mode
             atk_range = BEAST_MODE_ATTACK..BEAST_MODE_ATTACK
+          # level 3 ability modifier
           elsif player.special_abilities.include?(:rock_slide)
             lo_boost = rand(0..9)
 
@@ -173,10 +178,10 @@ module Gemwarrior
               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
-          rand(atk_range)
+
+          # return attack range
+          return rand(atk_range)
         else
           dmg = rand(monster.atk_lo..monster.atk_hi)
           dmg = dmg - (entity.defense / 2) if player_is_defending

data/lib/gemwarrior/game.rb

@@ -62,13 +62,30 @@ module Gemwarrior
         :use_wordnik        => options.fetch(:use_wordnik)
       })
 
+      # create options file if not existing
+      update_options_file(world)
+      
       # create the console
       self.eval = Evaluator.new(world)
-      self.repl = Repl.new(world, eval)
+      self.repl = Repl.new(self, world, eval)
 
       # enter Jool!
       repl.start('look', world.extra_command)
     end
 
+    def get_log_file_path
+      "#{Dir.home}/.gemwarrior_log"
+    end
+
+    def get_options_file_path
+      "#{Dir.home}/.gemwarrior_options"
+    end
+
+    def update_options_file(world)
+      File.open(get_options_file_path, 'w') do |f|
+        f.puts "sound|#{world.sound}"
+        f.puts "use_wordnik|#{world.use_wordnik}"
+      end
+    end
   end
 end

data/lib/gemwarrior/repl.rb

@@ -23,9 +23,10 @@ module Gemwarrior
     GITHUB_NAME             = 'michaelchadwick'
     GITHUB_PROJECT          = 'gemwarrior'
 
-    attr_accessor :world, :eval
+    attr_accessor :game, :world, :eval
 
-    def initialize(world, evaluator)
+    def initialize(game, world, evaluator)
+      self.game   = game
       self.world  = world
       self.eval   = evaluator
     end
@@ -38,6 +39,7 @@ module Gemwarrior
       at_exit do
         pl = world.player
         duration = clocker.stop
+        game.update_options_file(world)
         log_stats(duration, pl)
       end
 
@@ -68,6 +70,15 @@ module Gemwarrior
       OS.windows? ? system('cls') : system('clear')
     end
 
+    def read_line
+      prompt_text = world.debug_mode ? ' GW[D]> ' : ' GW> '
+      Readline.readline(prompt_text, true).to_s
+    end
+
+    def puts(s='', width=WRAP_WIDTH)
+      super s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") unless s.nil?
+    end
+
     def print_logo
       if world.sound
         Music::cue([
@@ -98,36 +109,79 @@ module Gemwarrior
       puts
     end
 
-    def print_help
-      puts '* Basic functions: look, go, character, inventory, attack *'
-      puts '* Type \'help\' while in-game for complete list of commands *'
-      puts '* Most commands can be abbreviated to their first letter  *'
-      puts
-    end
-
     def print_about_text
       puts 'Gem Warrior - A Game of Fortune and Mayhem'
       puts '=========================================='
       puts 'Gem Warrior is a text adventure roguelike-lite as a RubyGem created by Michael Chadwick (mike@codana.me) and released as open-source on Github. Take on the task set by Queen Ruby to defeat the evil Emerald and get back the ShinyThing(tm) he stole for terrible, dastardly reasons.'
       puts
       puts 'Explore the land of Jool with the power of text, fighting enemies to improve your station, grabbing curious items that may or may not come in handy, and finally defeating Mr. Emerald himself to win the game.'
-      puts
     end
     
-    def print_main_menu
-      puts "      GW v#{Gemwarrior::VERSION}"
-      puts '======================='
-      puts ' (N)ew Game'
-      puts ' (A)bout'
-      puts ' (H)elp'
-      puts ' (L)og'
-      puts ' (C)heck for Updates'
-      puts ' (E)xit'
-      puts '======================='
+    def print_help_text
+      puts 'Gem Warrior - Some Basic Help Commands'
+      puts '======================================'
+      puts '* Basic functions: look, go, character, inventory, attack *'
+      puts '* Type \'help\' while in-game for complete list of commands *'
+      puts '* Most commands can be abbreviated to their first letter  *'
+    end
+
+    def print_options
+      options = read_options_file
+
       puts
+      puts  'Gem Warrior Options'
+      puts  '======================='
+      if options.nil?
+        puts 'No options set yet.'
+      else
+        puts 'Toggle whether sound is played, or Wordnik (system must have a working WORDNIK_API_KEY environment variable) is used to generate more dynamic descriptors of entities'
+        puts
+        count = 1
+        options.each do |op|
+          option = op[0]
+          value = op[1].eql?('true') ? 'ON' : 'OFF'
+          
+          print " #{count} #{option.ljust(12).upcase} : #{value}\n"
+          count += 1
+        end
+      end
+      puts  '======================='
+      puts
+      puts  'Enter option number to toggle value, or any other key to return to main menu.'
+      print 'Option? '
+      answer = STDIN.getch
+      
+      case answer
+      when '1'
+        print answer
+        world.sound = !world.sound
+        game.update_options_file(world)
+        print_options
+      when '2'
+        print answer
+        world.use_wordnik = !world.use_wordnik
+        game.update_options_file(world)
+        print_options
+      else
+        print answer
+        return
+      end
     end
-    
+
+    def display_log
+      if File.exists?(game.get_log_file_path)
+        File.open(game.get_log_file_path).readlines.each do |line|
+          print "#{line}"
+        end
+        puts
+      else
+        puts 'No attempts made yet!'
+        puts
+      end
+    end
+
     def check_for_new_release
+      puts 'Checking releases...'
       github = Github.new
       gw_latest_release = github.repos.releases.list GITHUB_NAME, GITHUB_PROJECT
       local_release = Gemwarrior::VERSION
@@ -137,11 +191,26 @@ module Gemwarrior
         puts "GW v#{remote_release} available! Please (E)xit and run 'gem update' before continuing."
         puts
       else
-        puts "You have the latest version. Fantastic!"
+        puts 'You have the latest version. Fantastic!'
         puts
       end
     end
-    
+
+    def print_main_menu
+      puts
+      puts "      GW v#{Gemwarrior::VERSION}"
+      puts '======================='
+      puts ' (N)ew Game'
+      puts ' (A)bout'
+      puts ' (H)elp'
+      puts ' (O)ptions'
+      puts ' (L)og'
+      puts ' (C)heck for Updates'
+      puts ' (E)xit'
+      puts '======================='
+      puts
+    end
+
     def print_main_menu_prompt
       print '> '
     end
@@ -164,7 +233,11 @@ module Gemwarrior
         run_main_menu
       when 'h'
         puts choice
-        print_help
+        print_help_text
+        run_main_menu
+      when 'o'
+        puts choice
+        print_options
         run_main_menu
       when 'l'
         puts choice
@@ -183,24 +256,23 @@ module Gemwarrior
       end
     end
 
-    def get_log_file_path
-      "#{Dir.home}/.gemwarrior"
-    end
-    
-    def display_log
-      if File.exists?(get_log_file_path)
-        File.open(get_log_file_path).readlines.each do |line|
-          print "#{line}"
+    def read_options_file
+      options = []
+      if File.exists?(game.get_options_file_path)
+        File.open(game.get_options_file_path).readlines.each do |line|
+          options << line.chomp.split('|')
         end
+        return options
       else
-        puts 'No attempts made yet!'
+        nil
       end
     end
 
     def log_stats(duration, pl)
       puts  '######################################################################'
       print 'Gem Warrior'.colorize(:color => :white, :background => :black)
-      print " played for #{duration[:mins].to_s.colorize(:color => :white, :background => :black)} minutes, #{duration[:secs].to_s.colorize(:color => :white, :background => :black)} seconds, and #{duration[:ms].to_s.colorize(:color => :white, :background => :black)} milliseconds\n"
+      print " v#{Gemwarrior::VERSION}".colorize(:yellow)
+      print " played for #{duration[:mins].to_s.colorize(:color => :white, :background => :black)} mins, #{duration[:secs].to_s.colorize(:color => :white, :background => :black)} secs, and #{duration[:ms].to_s.colorize(:color => :white, :background => :black)} ms\n"
       puts  '----------------------------------------------------------------------'
       print "Player killed #{pl.monsters_killed.to_s.colorize(:color => :white, :background => :black)} monster(s)"
       print "\n".ljust(8)
@@ -215,8 +287,8 @@ module Gemwarrior
       puts '######################################################################'
       
       # log stats to file in home directory
-      File.open(get_log_file_path, 'a') do |f|
-        f.write "#{Time.now} #{pl.name.rjust(10)} - LV:#{pl.level} XP:#{pl.xp} $:#{pl.rox} KIL:#{pl.monsters_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken} DTH:#{pl.deaths}\n"
+      File.open(game.get_log_file_path, 'a') do |f|
+        f.write "#{Time.now} #{pl.name.rjust(10)} - V:#{Gemwarrior::VERSION} LV:#{pl.level} XP:#{pl.xp} $:#{pl.rox} KIL:#{pl.monsters_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken} DTH:#{pl.deaths}\n"
       end
     end
 
@@ -225,7 +297,6 @@ module Gemwarrior
       clear_screen
       print_logo
 
-
       # main menu loop until new game or exit
       if world.new_game
         print_splash_message
@@ -261,14 +332,5 @@ module Gemwarrior
       print (prompt_template % prompt_vars_arr).colorize(:yellow)
       print "\n"
     end
-
-    def read_line
-      prompt_text = world.debug_mode ? ' GW[D]> ' : ' GW> '
-      Readline.readline(prompt_text, true).to_s
-    end
-    
-    def puts(s='', width=WRAP_WIDTH)
-      super s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") unless s.nil?
-    end
   end
 end

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
 platform: ruby
 authors:
 - Michael Chadwick
@@ -308,6 +308,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: []