gemwarrior 0.14.6 → 0.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f93a63ffbbc7334133b9ea23c40aae700d9f78
-  data.tar.gz: fa4a6078ecbc1b11687fc42861e6a955481e2e56
+  metadata.gz: 08d2a9ec1dc8918cdae9406a4f763ba1d5ec2061
+  data.tar.gz: 29756295507196dc1b0b2df0f36a8c04eec65230
 SHA512:
-  metadata.gz: 2bb197442769ca3e5b792cfea0376a1adb5f8fb88af2d7ef75ff9c1d984f8dafdfa71dedcce4a2789fb7bf8d9f3a0d2ffcf77ad88a18d714f5797b60a50c6910
-  data.tar.gz: 33e4ea84b9312a221148b674d9ec9bff3c4d47793c6b257acb320d2897cf47eb0c8feb7c969c7ab623d2b67acd7b1b1b86a861968b8a14805ef8f983599d8881
+  metadata.gz: 38454c0717ce69f971ebbea780444b0c56dede944f085d911d2ffbe353afc46052cee5b54267b538eb1e912e202a5f7473e7a65e3d695bcd2e87315b5dee627d
+  data.tar.gz: 49c8ea652e0f8676663a693741aee7056fa0b5b01cc4dd08527101050ad97d996abedf97e31203e3cdf81a7d497ad9e6e9f2d34a0bbb8a6f3dda04e9a34f8f8e

data/bin/gemwarrior

@@ -20,33 +20,31 @@ GW_DEFAULT_WORLD_BIN  = File.expand_path('../../data/default_world.bin', __FILE_
 GW_DEFAULT_WRAP_WIDTH = 80
 
 def parse_options_cli
+  # default options
   options = {
-    beast_mode:     false, 
-    debug_mode:     false, 
-    god_mode:       false, 
-    new_skip:       false,
-    resume_skip:    false,
-    sound_enabled:  false,
-    sound_system:   'feep',
-    sound_volume:   0.3,
-    use_wordnik:    false, 
-    extra_command:  nil
+    beast_mode:       false, 
+    debug_mode:       false, 
+    god_mode:         false, 
+    new_skip:         false,
+    resume_skip:      false,
+    sound_enabled:    false,
+    sound_system:     'bloops',
+    sound_volume:     0.3,
+    use_wordnik:      false,
+    fight_completion: false,
+    extra_command:    nil
   }
 
-  options_file = read_options_file
-  
-  unless options_file.nil?
-    sound_enabled_option    = options_file[0][1].eql?('false') ? false : true
-    sound_system_selected   = options_file[1][1]
-    sound_volume_option     = options_file[2][1].to_f
-    use_wordnik_option      = options_file[3][1].eql?('false') ? false : true
-
-    options[:sound_enabled] = sound_enabled_option
-    options[:sound_system]  = sound_system_selected
-    options[:sound_volume]  = sound_volume_option
-    options[:use_wordnik]   = use_wordnik_option
+  # options file has next precedence
+  unless (opts_file = read_options_file).nil?
+    options[:sound_enabled]     = (opts_file[:sound_enabled].eql?('false') ? false : true) if opts_file[:sound_enabled]
+    options[:sound_system]      = (opts_file[:sound_system].eql?('false') ? false : true) if opts_file[:sound_system]
+    options[:sound_volume]      = (opts_file[:sound_volume].to_f) if opts_file[:sound_volume]
+    options[:use_wordnik]       = (opts_file[:use_wordnik].eql?('false') ? false : true) if opts_file[:use_wordnik]
+    options[:fight_completion]  = (opts_file[:fight_completion].eql?('false') ? false : true) if opts_file[:fight_completion]
   end
 
+  # command line has next precedence
   optparse = OptionParser.new do |opts|
     opts.on('-b', '--beast', 'Enable debug[beastmode]') do
       options[:beast_mode] = true
@@ -81,6 +79,10 @@ def parse_options_cli
       options[:use_wordnik] = true
     end
 
+    opts.on('-f', '--fight-completion', 'Fighting without specifying an enemy will attack first one it finds') do
+      options[:fight_completion] = false
+    end
+
     opts.on('-x', '--extra COMMAND,PARAM1,PARAM2,PARAM3', String, 'Run a command, with optional params, immediately upon beginning the game') do |xc|
       options[:extra_command] = xc.gsub(',',' ')
     end
@@ -103,13 +105,14 @@ end
 
 def read_options_file
   if File.exist?(GameOptions.data['options_file_path'])
-    options = []
+    options = {}
     File.open(GameOptions.data['options_file_path']).readlines.each do |line|
-      options << line.chomp.split(':')
+      kv = line.chomp.split(':')
+      options[kv[0].to_sym] = kv[1]
     end
 
     # check for null
-    return options[0][0].eql?('sound_enabled') ? options : nil
+    return options[:sound_enabled] ? options : nil
   end
   nil
 end
@@ -118,7 +121,7 @@ def init_config
   Dir.mkdir(GW_HOME) unless Dir.exist?(GW_HOME)
 
   sound_system_default = OS.windows? ? 'win32-sound' : 'bloops'
-  
+
   GameOptions.add 'sound_system',             sound_system_default
   GameOptions.add 'save_file_mode',           'Y'
   GameOptions.add 'default_world_path_yaml',  GW_DEFAULT_WORLD_YAML

data/lib/gemwarrior/entities/location.rb

@@ -32,7 +32,7 @@ module Gemwarrior
       self.monster_level_range  = options.fetch(:monster_level_range)
       self.items                = options.fetch(:items)
       self.monsters_abounding   = options.fetch(:monsters_abounding)
-      self.bosses_abounding     = options.fetch[:bosses_abounding]
+      self.bosses_abounding     = options.fetch(:bosses_abounding)
       self.checked_for_monsters = false
       self.visited              = false
     end
@@ -60,6 +60,10 @@ module Gemwarrior
       self.items.map{|i| i.name.downcase}.include?(item_name.downcase)
     end
 
+    def has_any_monsters?
+      monsters_abounding.length > 0
+    end
+
     def has_monster?(monster_name)
       monsters_abounding.map{|m| m.name.downcase}.include?(monster_name.downcase)
     end

data/lib/gemwarrior/evaluator.rb

@@ -642,7 +642,16 @@ module Gemwarrior
         end
       when 'attack', 'a', 'fight', 'f'
         if param1.nil?
-          ERROR_ATTACK_PARAM_MISSING
+          if GameOptions.data['fight_completion']
+            if player_cur_location.has_any_monsters?
+              monster_param = player_cur_location.monsters_abounding[0].name
+              self.parse("attack #{monster_param}")
+            else
+              ERROR_ATTACK_PARAM_INVALID
+            end
+          else
+            ERROR_ATTACK_PARAM_MISSING
+          end
         else
           monster_name = param1
           if world.has_monster_to_attack?(monster_name)

data/lib/gemwarrior/game.rb

@@ -41,6 +41,7 @@ module Gemwarrior
       GameOptions.add 'sound_system', options.fetch(:sound_system)
       GameOptions.add 'sound_volume', options.fetch(:sound_volume)
       GameOptions.add 'use_wordnik', options.fetch(:use_wordnik)
+      GameOptions.add 'fight_completion', options.fetch(:fight_completion)
 
       # add classes for creatures, monsters, people, items, weapons, and armor to game
       # also add them to the global GameAssets
@@ -107,6 +108,7 @@ module Gemwarrior
         f.puts "sound_system:#{GameOptions.data['sound_system']}"
         f.puts "sound_volume:#{GameOptions.data['sound_volume']}"
         f.puts "use_wordnik:#{GameOptions.data['use_wordnik']}"
+        f.puts "fight_completion:#{GameOptions.data['fight_completion']}"
       end
     end
 

data/lib/gemwarrior/repl.rb

@@ -242,12 +242,13 @@ module Gemwarrior
       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 'Change several sound options, whether Wordnik is used to generate more dynamic descriptors of entities (valid WORDNIK_API_KEY environment variable must be set), and if attack/fight commands need to have a target or not (if enabled, will attack first monster in vicinty).'
       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 " (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 " (5) FIGHT COMPLETION : #{GameOptions.data['fight_completion']}"
       puts
       puts '================================='.colorize(:yellow)
       puts
@@ -282,6 +283,10 @@ module Gemwarrior
         print answer
         GameOptions.data['use_wordnik'] = !GameOptions.data['use_wordnik']
         print_options
+      when '5'
+        print answer
+        GameOptions.data['fight_completion'] = !GameOptions.data['fight_completion']
+        print_options
       else
         print answer
         return

data/lib/gemwarrior/version.rb

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

metadata

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