gemwarrior 0.9.31 → 0.9.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d55fe04a8f5043e88e3190a89d1769ab83303ee0
-  data.tar.gz: 076226766021189d922d10f5775c3ddef13dd283
+  metadata.gz: 5ba232be35f794bab630db0215b3eddeec211dad
+  data.tar.gz: a6503b7c1899de07423d637c3d1edcb01f1cda27
 SHA512:
-  metadata.gz: 91fa430b80846bde16f61f33997cd227c80f436c4efe17ed47398477045f199c0ce47a4e9216cf02fb36fde3a74c52955790561d79a643913c1f69d13f62a4ca
-  data.tar.gz: 9d71ed1c86feed2ac58a35345bb0c074c19924e1bef42752e53a98b4ecf34cb73649f033990d85fa606f15cbcadbdf7c3e34c5c0312902beeb67a2d01c3fd529
+  metadata.gz: 58f92ed5ff17659ff4778173777d13e95b6c148ee86dc04733e0031db6d01efda84b55f4008b3a931c6128f49f5a0578e1cf691880008198ebddd9338717d114
+  data.tar.gz: 3eab9d6b0d418c703bdd8ed9c3bff3166681291300c6d37a8682e6093ef221f290217364c57a6653bf28526e0eaee50eae03eb1d1be2bf18789c3caf3ed5c0c9

data/bin/gemwarrior

@@ -7,7 +7,7 @@ require_relative '../lib/gemwarrior/version'
 
 GAME_NAME = 'Gem Warrior'
 
-def parse_options
+def parse_options_cli
   options = {
     :beast_mode     => false, 
     :debug_mode     => false, 
@@ -68,8 +68,34 @@ def print_error(error)
   end
 end
 
+def get_options_file_path
+  "#{Dir.home}/.gemwarrior_options"
+end
+
+def read_options_file
+  options = []
+  if File.exist?(get_options_file_path)
+    File.open(get_options_file_path).readlines.each do |line|
+      options << line.chomp.split(':')
+    end
+    return options
+  end
+  nil
+end
+
 begin
-  options = parse_options
+  options = parse_options_cli
+
+  options_file = read_options_file
+  
+  unless options_file.nil?
+    sound_option = options_file[0][1].eql?('false') ? false : true
+    wordnik_option = options_file[1][1].eql?('false') ? false : true
+    
+    options[:sound] = sound_option
+    options[:use_wordnik] = wordnik_option
+  end
+  
   Gemwarrior::Game.new(options)
 rescue => error
   print_error(error)

data/lib/gemwarrior/game.rb

@@ -82,8 +82,8 @@ module Gemwarrior
 
     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}"
+        f.puts "sound:#{world.sound}"
+        f.puts "use_wordnik:#{world.use_wordnik}"
       end
     end
   end

data/lib/gemwarrior/misc/music.rb

@@ -7,22 +7,22 @@ module Gemwarrior
       # if Windows, use superior win32-sound library
       if OS.windows?
         require 'win32/sound'
-        threads = []
-
-        Thread.start {
+        require_relative 'musical_notes'
+        
+        Thread.start do
           sequence.each do |seq|
+            threads = []
             seq[:frequencies].split(',').each do |note|
-              threads << Thread.new {
+              threads << Thread.new do
                 Win32::Sound::play_freq(Notes::NOTE_FREQ[note], seq[:duration], 0.5)
-              }
+              end
             end
             threads.each { |th| th.join }
           end
-        }
+        end
       # otherwise, use inferior feep library
       else
         require 'feep'
-        require_relative 'musical_notes'
 
         feep_defaults = {
           frequencies:  '440',
@@ -32,7 +32,7 @@ module Gemwarrior
           notext:       true
         }
       
-        Thread.start {
+        Thread.start do
           sequence.each do |seq|
             seq = feep_defaults.merge(seq)
 
@@ -44,7 +44,7 @@ module Gemwarrior
               notext:       seq[:notext]
             })
           end
-        }
+        end
       end
     end
   end

data/lib/gemwarrior/repl.rb

@@ -120,25 +120,14 @@ module Gemwarrior
     end
 
     def print_options
-      options = read_options_file
-
       puts
       puts 'Gem Warrior Options'.colorize(:yellow)
       puts '======================='.colorize(:yellow)
-      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 '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
+      puts " (1) SOUND ENABLED: #{world.sound}"
+      puts " (2) USE WORDNIK  : #{world.use_wordnik}"
+      puts
       puts '======================='
       puts
       puts 'Enter option number to toggle value, or any other key to return to main menu.'
@@ -149,12 +138,10 @@ module Gemwarrior
       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
@@ -245,23 +232,13 @@ module Gemwarrior
       when 'e', 'x'
         puts choice
         puts MAIN_MENU_QUIT_MESSAGE
-        exit(0)
+        game.update_options_file(world)
+        exit
       else
         run_main_menu(show_choices = false)
       end
     end
 
-    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
-      end
-      nil
-    end
-
     def log_stats(duration, pl)
       puts '######################################################################'
       print 'Gem Warrior'.colorize(color: :white, background: :black)
@@ -289,8 +266,8 @@ module Gemwarrior
     def play_intro_tune
       if world.sound
         Music::cue([
-          { frequencies: 'A3,E4,C#5,E5',  duration: 300},
-          { frequencies: 'A3,E4,C#5,F#5', duration: 600}
+          { frequencies: 'A3,E4,C#5,E5',  duration: 300 },
+          { frequencies: 'A3,E4,C#5,F#5', duration: 600 }
         ])
       end
     end

data/lib/gemwarrior/version.rb

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

metadata

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