gemwarrior 0.15.5 → 0.15.10

data/lib/gemwarrior/repl.rb

@@ -6,7 +6,9 @@ require 'os'
 require 'clocker'
 require 'io/console'
 require 'gems'
+require 'ap'
 
+require_relative 'misc/audio'
 require_relative 'misc/timer'
 require_relative 'misc/wordlist'
 require_relative 'evaluator'
@@ -23,6 +25,7 @@ module Gemwarrior
     SPLASH_MESSAGE          = 'Welcome to *Jool*, where randomized fortune is just as likely as mayhem.'
     GITHUB_NAME             = 'michaelchadwick'
     GITHUB_PROJECT          = 'gemwarrior'
+    ERROR_SOUND_NOT_ENABLED = 'Sound is disabled! Enter \'x\' to exit'
 
     attr_accessor :game, :world, :evaluator
 
@@ -58,7 +61,7 @@ module Gemwarrior
         return [screen_width, SCREEN_WIDTH_MAX].min
       end
     end
-    
+
     def start(initial_command, extra_command, new_skip, resume_skip)
       setup_screen(initial_command, extra_command, new_skip, resume_skip)
 
@@ -114,6 +117,14 @@ module Gemwarrior
       Readline.readline(prompt_text, true).to_s
     end
 
+    def get_save_file_name
+      if save_file_exist?
+        File.open(GameOptions.data['save_file_yaml_path'], 'r') do |f|
+          return YAML.load(f)
+        end
+      end
+    end
+
     def puts(s = '', width = GameOptions.data['wrap_width'])
       super s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n") unless s.nil?
     end
@@ -138,14 +149,14 @@ module Gemwarrior
       noun2_values = WordList.new('noun-plural')
       noun3_values = WordList.new('noun-plural')
 
-      puts "* Remember: #{noun1_values.get_random_value} and #{noun2_values.get_random_value} are the key to #{noun3_values.get_random_value} *\n\n"
+      puts "* Remember: #{noun1_values.get_random_value.colorize(:yellow)} and #{noun2_values.get_random_value.colorize(:yellow)} are the key to #{noun3_values.get_random_value.colorize(:yellow)} *\n\n"
       puts
     end
 
     def print_about_text
       puts 'Gem Warrior - A Game of Fortune and Mayhem'.colorize(:yellow)
       puts '=========================================='.colorize(:yellow)
-      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 'Gem Warrior is a text adventure roguelike-lite as a RubyGem created by Michael Chadwick (mike@neb.host) 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.'
     end
@@ -209,7 +220,8 @@ module Gemwarrior
       puts 'Sound System Selection'.colorize(:yellow)
       puts '================================='.colorize(:yellow)
       puts
-      print ' (1) WIN32-SOUND '
+      win32 = ' (1) WIN32-SOUND '
+      OS.windows? ? (print win32) : (print win32.colorize(:light_black))
       print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('win32-sound')
       print "\n"
       print ' (2) FEEP        '
@@ -218,6 +230,9 @@ module Gemwarrior
       print ' (3) BLOOPS      '
       print '(SELECTED)'.colorize(:yellow) if GameOptions.data['sound_system'].eql?('bloops')
       print "\n"
+      print "\n"
+      print ' (T) TEST SOUND  '
+      print "\n"
       puts
       puts ' WIN32-SOUND : good quality; Windows-only'
       puts ' FEEP        : cross-platform; VERY SLOW and BUGGY'
@@ -232,19 +247,34 @@ module Gemwarrior
       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'
+        if OS.windows?
+          puts answer
+          GameOptions.add 'sound_system', 'win32-sound'
+        else
+          puts
+        end
         print_options_sound_sytem
       when '2'
+        puts answer
         GameOptions.add 'sound_system', 'feep'
         print_options_sound_sytem
       when '3'
+        puts answer
         GameOptions.add 'sound_system', 'bloops'
         print_options_sound_sytem
+      when 't'
+        puts answer
+        Audio.init
+        play_test_tune
+        print_errors
+        print_options_sound_sytem
       else
+        puts
         return
       end
     end
@@ -305,16 +335,62 @@ module Gemwarrior
       end
     end
 
+    def print_sound_test
+      puts
+      puts 'Gem Warrior Sound Test'.colorize(:yellow)
+      puts '================================='.colorize(:yellow)
+
+      if GameOptions.data['sound_enabled']
+        puts
+        puts 'Play all the sounds in Gemwarrior.'
+        puts
+
+        cues = Audio.get_cues
+        for cue in cues do
+          pp cue[0].to_s
+        end
+
+        puts
+        puts '================================='.colorize(:yellow)
+        puts
+        puts 'Enter sound id to play it, or enter "x" to return to the main menu.'
+      else
+        GameOptions.data['errors'] = ERROR_SOUND_NOT_ENABLED
+      end
+
+      print_errors
+
+      puts
+      print '[GW_SOUND_TEST]> '
+
+      answer = gets.chomp.downcase
+
+      # print answer
+      if answer.eql?('x')
+        return
+      else
+        Audio.play_synth(answer.to_sym)
+        print_sound_test
+      end
+    end
+
     def print_main_menu
       puts
       puts "      GW v#{Gemwarrior::VERSION}"
       puts '======================='
-      puts ' (R)esume Game'.colorize(:green) if save_file_exist?
+
+      save_file = get_save_file_name
+      if not save_file.nil?
+        recent_name = save_file.instance_variable_get(:@player).name
+        puts " #{'(R)esume Game'.colorize(:green)} as #{recent_name.colorize(:yellow)}"
+      end
+
       puts ' (N)ew Game'
       puts ' (A)bout'
       puts ' (H)elp'
       puts ' (O)ptions'
       puts ' (L)og of Attempts'
+      puts ' (S)ound Test'
       puts ' (C)heck for Updates'
       puts ' (E)xit'.colorize(:red)
       puts '======================='
@@ -349,6 +425,7 @@ module Gemwarrior
             run_main_menu
           else
             print_errors
+            play_resume_tune
             load_saved_world(result)
             return
           end
@@ -369,6 +446,10 @@ module Gemwarrior
         puts choice
         display_log_of_attempts
         run_main_menu
+      when 's'
+        puts choice
+        print_sound_test
+        run_main_menu
       when 'c'
         puts choice
         check_for_new_release
@@ -378,31 +459,52 @@ module Gemwarrior
         puts MAIN_MENU_QUIT_MESSAGE
         game.update_options_file
         exit
-      else
-        run_main_menu(show_choices: false)
+      when "\c?"  # Backspace/Delete
+        refresh_menu
+      when "\e"   # ANSI escape sequence
+        case STDIN.getch
+        when '['  # CSI
+          choice = STDIN.getch
+          puts choice
+          case choice
+          when 'A', 'B', 'C', 'D' # arrow keys
+            refresh_menu
+          end
+        end
+      else        # All other invalid options
+        refresh_menu
       end
     end
 
+    # need this to handle any non-valid input at the main menu
+    def refresh_menu
+      clear_screen
+      print_logo
+      run_main_menu
+    end
+
     def log_stats(duration, pl)
       # display stats upon exit
       Hr.print('#')
       print 'Gem Warrior'.colorize(color: :white, background: :black)
       print " v#{Gemwarrior::VERSION}".colorize(:yellow)
-      print " played for #{duration[:mins].to_s.colorize(color: :white, background: :black)} min(s),"
-      print " #{duration[:secs].to_s.colorize(color: :white, background: :black)} sec(s),"
-      print " and #{duration[:ms].to_s.colorize(color: :white, background: :black)} ms\n"
+      print " played for #{duration[:mins].to_s.colorize(color: :white, background: :black)} min(s)"
+      print ", #{duration[:secs].to_s.colorize(color: :white, background: :black)} sec(s)"
+      # print ", and #{duration[:ms].to_s.colorize(color: :white, background: :black)} ms"
+      print "\n"
       Hr.print('-')
-      print "#{pl.name.ljust(10)} killed #{pl.monsters_killed.to_s.colorize(color: :yellow, background: :black)} monster(s)"
+      print "#{pl.name.ljust(10).colorize(:green)} "
+      print "destroyed #{pl.monsters_killed.to_s.colorize(color: :yellow, background: :black)} monster(s)"
       print "\n".ljust(12)
-      print "killed #{pl.bosses_killed.to_s.colorize(color: :yellow, background: :black)} boss(es)"
+      print "destroyed #{pl.bosses_killed.to_s.colorize(color: :yellow, background: :black)} boss(es)"
       print "\n".ljust(12)
       print "picked up #{pl.items_taken.to_s.colorize(color: :yellow, background: :black)} item(s)"
       print "\n".ljust(12)
-      print "traveled #{pl.movements_made.to_s.colorize(color: :yellow, background: :black)} time(s)"
+      print "traveled  #{pl.movements_made.to_s.colorize(color: :yellow, background: :black)} time(s)"
       print "\n".ljust(12)
-      print "rested #{pl.rests_taken.to_s.colorize(color: :yellow, background: :black)} time(s)"
+      print "rested    #{pl.rests_taken.to_s.colorize(color: :yellow, background: :black)} time(s)"
       print "\n".ljust(12)
-      print "died #{pl.deaths.to_s.colorize(color: :yellow, background: :black)} time(s)"
+      print "died      #{pl.deaths.to_s.colorize(color: :yellow, background: :black)} time(s)"
       print "\n"
       Hr.print('#')
 
@@ -549,7 +651,9 @@ module Gemwarrior
 
     def print_errors
       if GameOptions.data['errors']
-        puts GameOptions.data['errors'].colorize(:red)
+        puts "\n\n"
+        puts "Errors: #{GameOptions.data['errors'].colorize(:red)}"
+        GameOptions.data['errors'] = nil
       end
     end
 
@@ -557,6 +661,14 @@ module Gemwarrior
       Audio.play_synth(:intro)
     end
 
+    def play_resume_tune
+      Audio.play_synth(:resume_game)
+    end
+
+    def play_test_tune
+      Audio.play_synth(:test)
+    end
+
     def prompt
       prompt_template =  "\n"
       prompt_template += "[LV:%2s][XP:%3s][ROX:%3s][HP:%3s/%-3s] [".colorize(:yellow)
@@ -565,6 +677,8 @@ module Gemwarrior
       prompt_template += "%s".colorize(:cyan)
       prompt_template += "]".colorize(:yellow)
       prompt_template += "[%s, %s, %s]".colorize(:yellow) if GameOptions.data['debug_mode']
+      prompt_template += "\n"
+      prompt_template += '[c:character][i:inventory][l:look][u:use][t:take]'
 
       prompt_vars_arr = [
         world.player.level,

data/lib/gemwarrior/version.rb

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

data/tests/test-save-load/save.conf

@@ -1,2 +1,2 @@
-name:mike
-age:34
+name:mike
+age:34

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.15.10
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -50,42 +50,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: matrext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: clocker
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: A fun text adventure in the form of a RubyGem!
 email: mike@codana.me
 executables: