gemwarrior 0.12.6 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 300296825e93c873913e9d320b57f60e8fe3b74c
-  data.tar.gz: 81572b6003715ae7c1daf54e196c49a18186c68a
+  metadata.gz: f8cb18496411a23c6f5cf358966ee637a54cf5af
+  data.tar.gz: 36a10e8a5e4169918459421761eaf6531c25e152
 SHA512:
-  metadata.gz: 12a00f13c496e14a5af47b1dc6dbe6ece42ba66035ce9d36646c0971f031eaaba51d5d17f8441fcd24f7735f318ddbfc9e67e9f87aeb9bc75c48e1bc07282f15
-  data.tar.gz: 64bb8979dce6de9d1a52483a7ffe91d8c660804f35132d950c7d6c438f6147c352141cfb3613be69cfda0d234df01af184aa6e729baf21c8f30f3712834bde34
+  metadata.gz: f431f5650418746bdad6a52e5cb12e2a9b37480fd79a21dca9866eaea193faeafbe766898973ea1770c0c7e9fc607659d7d1b3c9227e8d784b32c5106b692482
+  data.tar.gz: fa4f06e96071517d917bc055e9471dd10720f37191921d96a068bd07c7c2ceb58c7fc0fd383d4721ff3e49eb6b4ad5acb63c5d51d2b5f4ce72178880dbef8e0a

data/lib/gemwarrior/repl.rb

@@ -149,85 +149,6 @@ module Gemwarrior
       puts '* Most commands can be abbreviated to their first letter  *'
     end
 
-    def print_options
-      puts
-      puts 'Gem Warrior Options'.colorize(:yellow)
-      puts '======================='.colorize(:yellow)
-      puts 'Change whether sound is played, which sound system to use, what game volume is, or whether Wordnik is used to generate more dynamic descriptors of entities (valid WORDNIK_API_KEY environment variable must be set)'
-      puts
-      puts " (1) SOUND ENABLED : #{GameOptions.data['sound_enabled']}"
-      puts " (2) SOUND SYSTEM  : #{GameOptions.data['sound_system']}"
-      puts " (3) SOUND VOLUME  : #{GameOptions.data['sound_volume']}"
-      puts " (4) USE WORDNIK   : #{GameOptions.data['use_wordnik']}"
-      puts
-      puts '======================='
-      puts
-      puts 'Enter option number to change value, or any other key to return to main menu.'
-      print '[GAME_OPTIONS]> '
-
-      answer = STDIN.getch
-
-      case answer
-      when '1'
-        print answer
-        GameOptions.data['sound_enabled'] = !GameOptions.data['sound_enabled']
-        print_options
-      when '2'
-        print answer
-        print "\n"
-        print_sound_system_selection
-        print_options
-      when '3'
-        print answer
-        print "\n"
-        print 'Enter a volume from 0.0 to 1.0: '
-        new_vol = gets.chomp.to_f.abs
-        if new_vol >= 0.0 and new_vol <= 1.0
-          GameOptions.data['sound_volume'] = new_vol
-        else
-          puts 'Not a valid volume.'
-        end
-        print_options
-      when '4'
-        print answer
-        GameOptions.data['use_wordnik'] = !GameOptions.data['use_wordnik']
-        print_options
-      else
-        print answer
-        return
-      end
-    end
-
-    def print_sound_system_selection
-      puts
-      puts 'Sound System Selection'.colorize(:yellow)
-      puts '========================'.colorize(:yellow)
-      puts
-      print ' (1) WIN32-SOUND '
-      print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('win32-sound')
-      print "\n"
-      print ' (2) FEEP        '
-      print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('feep')
-      print "\n"
-      puts
-      puts 'Enter option number to select sound system, or any other key to exit.'
-      puts 'Note: win32-sound only works on Windows and will break the game is sound is enabled on non-Windows machines. Feep is cross-platform, but very slow and buggy, so use at your discretion!'
-      puts
-      print '[SOUND_SYSTEM]> '
-      answer = STDIN.getch.chomp.downcase
-      
-      case answer
-      when '1'
-        GameOptions.add 'sound_system', 'win32-sound'
-        print_sound_system_selection
-      when '2'
-        GameOptions.add 'sound_system', 'feep'
-        print_sound_system_selection
-      else
-        return
-      end
-    end
-
     def display_log_of_attempts
       if File.exist?(GameOptions.data['log_file_path']) and !File.zero?(GameOptions.data['log_file_path'])
         File.open(GameOptions.data['log_file_path']).readlines.each do |line|
@@ -271,18 +192,103 @@ module Gemwarrior
       end
     end
 
+    def print_options_sound_sytem
+      puts
+      puts 'Sound System Selection'.colorize(:yellow)
+      puts '================================='.colorize(:yellow)
+      puts
+      print ' (1) WIN32-SOUND '
+      print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('win32-sound')
+      print "\n"
+      print ' (2) FEEP        '
+      print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('feep')
+      print "\n"
+      puts
+      puts 'Note: WIN32-SOUND is Windows-only, and will break the game if sound is enabled on non-Windows machines.'
+      puts 'Note: FEEP is cross-platform, but VERY SLOW and BUGGY, so use at your discretion!'
+      puts
+      puts '================================='.colorize(:yellow)
+      puts
+      puts 'Enter option number to select sound system, or any other key to exit.'
+      puts
+      print '[GW_OPTS]-[SOUND_SYSTEM]> '
+      answer = STDIN.getch.chomp.downcase
+
+      case answer
+      when '1'
+        GameOptions.add 'sound_system', 'win32-sound'
+        print_options_sound_sytem
+      when '2'
+        GameOptions.add 'sound_system', 'feep'
+        print_options_sound_sytem
+      else
+        return
+      end
+    end
+
+    def print_options
+      puts
+      puts 'Gem Warrior General Options'.colorize(:yellow)
+      puts '================================='.colorize(:yellow)
+      puts
+      puts 'Change several sound (quite experimental for now) options, and whether Wordnik is used to generate more dynamic descriptors of entities (valid WORDNIK_API_KEY environment variable must be set).'
+      puts
+      puts " (1) SOUND ENABLED : #{GameOptions.data['sound_enabled']}"
+      puts " (2) SOUND SYSTEM  : #{GameOptions.data['sound_system']}"
+      puts " (3) SOUND VOLUME  : #{GameOptions.data['sound_volume']}"
+      puts " (4) USE WORDNIK   : #{GameOptions.data['use_wordnik']}"
+      puts
+      puts '================================='.colorize(:yellow)
+      puts
+      puts 'Enter option number to change value, or any other key to return to main menu.'
+      puts
+      print '[GW_OPTS]> '
+
+      answer = STDIN.getch
+
+      case answer
+      when '1'
+        print answer
+        GameOptions.data['sound_enabled'] = !GameOptions.data['sound_enabled']
+        print_options
+      when '2'
+        print answer
+        print "\n"
+        print_options_sound_sytem
+        print_options
+      when '3'
+        print answer
+        print "\n"
+        print 'Enter a volume from 0.0 to 1.0: '
+        new_vol = gets.chomp.to_f.abs
+        if new_vol >= 0.0 and new_vol <= 1.0
+          GameOptions.data['sound_volume'] = new_vol
+        else
+          puts 'Not a valid volume.'
+        end
+        print_options
+      when '4'
+        print answer
+        GameOptions.data['use_wordnik'] = !GameOptions.data['use_wordnik']
+        print_options
+      else
+        print answer
+        return
+      end
+    end
+
     def print_main_menu
       puts
       puts "      GW v#{Gemwarrior::VERSION}"
       puts '======================='
+      puts ' (R)esume Game'.colorize(:green) if save_file_exist?
       puts ' (N)ew Game'
-      puts ' (R)esume Game' if save_file_exist?
       puts ' (A)bout'
       puts ' (H)elp'
       puts ' (O)ptions'
       puts ' (L)og of Attempts'
       puts ' (C)heck for Updates'
-      puts ' (E)xit'
+      puts ' (E)xit'.colorize(:red)
       puts '======================='
       puts
     end
@@ -339,7 +345,7 @@ module Gemwarrior
         puts choice
         check_for_new_release
         run_main_menu
-      when 'e', 'x'
+      when 'e', 'x', 'q'
         puts choice
         puts MAIN_MENU_QUIT_MESSAGE
         game.update_options_file

data/lib/gemwarrior/version.rb

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

metadata

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