gemwarrior 0.15.9 → 0.15.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53cf6c29c63f888d1f27bc240cb2dd388b3c8b5b3e2775b7289c477efbc24fd3
-  data.tar.gz: d10dd5cde465184947f529db48c4521bb14221b796238a3041178b5a6ce13259
+  metadata.gz: 994ca3f7d106260f639e8cac066623c6222b509b0bdea5c42fbe53c96a85e97a
+  data.tar.gz: '05638ad1416e4da010f1fad072bec2be6695d7a1eca1d6fc03517dfcac8f1c2b'
 SHA512:
-  metadata.gz: 27bb912be2904bb2a79c8e897f5cab74344c7bd428d7f15542a9d193d769ea7996e01e67f1d69e28d13643e9ce8c8026daaa51d3ef4f5a61885fab9ff0df4288
-  data.tar.gz: a69c3f7773889d1d19610063bfd1109e633da238379e197e0018f38f053501be682186d4f3f4443e1a14302d0a360b89bb9cfa40a02c322540be64c0f3220745
+  metadata.gz: a4802863c09897f4731a4594aaf36ead9c7b77c85d64c4648e09309b6761842bada17e090b46f1e072e62aa75e60b9f378284bd46f9e2a46d6edc0f4e8b2ca94
+  data.tar.gz: 9032c9afd863ab9c14bd287a0efae3be4d308183df8b3c298665c0971a7e6a20ffcfa61b8f4cff9e4dfd6f752ab7a23b59d6e4e9fe79d34cb5701f5b31bcaa75

data/bin/gemwarrior

@@ -1,146 +1,146 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'os'
-
-require_relative '../lib/gemwarrior/game'
-require_relative '../lib/gemwarrior/game_options'
-require_relative '../lib/gemwarrior/version'
-
-include Gemwarrior
-
-GAME_NAME             = 'Gem Warrior'
-GW_HOME               = "#{Dir.home}/.gemwarrior"
-GW_SAVE_FILE_YAML     = "#{GW_HOME}/gw_sav.yaml"
-GW_SAVE_FILE_BIN      = "#{GW_HOME}/gw_sav.dat"
-GW_OPTS_FILE          = "#{GW_HOME}/gw_opts"
-GW_LOG_FILE           = "#{GW_HOME}/gw_log"
-GW_DEFAULT_WORLD_YAML = File.expand_path('../../data/default_world.yaml', __FILE__)
-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:     'bloops',
-    sound_volume:     0.3,
-    use_wordnik:      false,
-    fight_completion: false,
-    extra_command:    nil
-  }
-
-  # 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]) 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
-    end
-
-    opts.on('-d', '--debug', 'Enable debug commands in-game') do
-      options[:debug_mode] = true
-    end
-
-    opts.on('-g', '--god', 'Enable debug[godmode]') do
-      options[:god_mode] = true
-    end
-
-    opts.on('-n', '--new', 'Immediately start a new game, skipping main menu') do
-      options[:new_skip] = true
-    end
-
-    opts.on('-r', '--resume', 'Immediately resume the saved game, skipping main menu') do
-      options[:resume_skip] = true
-    end
-
-    opts.on('-s', '--sound', 'Enable sound (experimental)') do
-      options[:sound_enabled] = true
-    end
-
-    opts.on('-v', '--version', 'Display version number and exit') do
-      puts "#{GAME_NAME} v#{Gemwarrior::VERSION}"
-      exit
-    end
-
-    opts.on('-w', '--wordnik', 'Enable Wordnik to generate more diverse, dynamic descriptors of entities') do
-      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
-  end
-
-  optparse.parse!()
-
-  return options
-end
-
-def print_error(error)
-  case error
-  when OptionParser::InvalidOption
-    puts "#{GAME_NAME}: illegal option #{error.args.join(' ')}"
-  else
-    puts "An unexpected error occurred while running #{GAME_NAME}:"
-    puts "  #{error}\n"
-  end
-end
-
-def read_options_file
-  if File.exist?(GameOptions.data['options_file_path'])
-    options = {}
-    File.open(GameOptions.data['options_file_path']).readlines.each do |line|
-      kv = line.chomp.split(':')
-      options[kv[0].to_sym] = kv[1]
-    end
-
-    # check for null
-    return options[:sound_enabled] ? options : nil
-  end
-  nil
-end
-
-def init_config
-  Dir.mkdir(GW_HOME) unless Dir.exist?(GW_HOME)
-
-  sound_system_default = OS.windows? ? 'win32-sound' : 'bloops'
-  save_file_mode_default = 'Y' # YAML
-
-  GameOptions.add 'sound_system',             sound_system_default
-  GameOptions.add 'save_file_mode',           save_file_mode_default
-  GameOptions.add 'default_world_path_yaml',  GW_DEFAULT_WORLD_YAML
-  GameOptions.add 'default_world_path_bin',   GW_DEFAULT_WORLD_BIN
-  GameOptions.add 'save_file_yaml_path',      GW_SAVE_FILE_YAML
-  GameOptions.add 'save_file_bin_path',       GW_SAVE_FILE_BIN
-  GameOptions.add 'log_file_path',            GW_LOG_FILE
-  GameOptions.add 'options_file_path',        GW_OPTS_FILE
-  GameOptions.add 'wrap_width',               GW_DEFAULT_WRAP_WIDTH
-end
-
-begin
-  init_config
-
-  options = parse_options_cli
-
-  Gemwarrior::Game.new(options)
-rescue => error
-  print_error(error)
-  exit(false)
-end
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'os'
+
+require_relative '../lib/gemwarrior/game'
+require_relative '../lib/gemwarrior/game_options'
+require_relative '../lib/gemwarrior/version'
+
+include Gemwarrior
+
+GAME_NAME             = 'Gem Warrior'
+GW_HOME               = "#{Dir.home}/.gemwarrior"
+GW_SAVE_FILE_YAML     = "#{GW_HOME}/gw_sav.yaml"
+GW_SAVE_FILE_BIN      = "#{GW_HOME}/gw_sav.dat"
+GW_OPTS_FILE          = "#{GW_HOME}/gw_opts"
+GW_LOG_FILE           = "#{GW_HOME}/gw_log"
+GW_DEFAULT_WORLD_YAML = File.expand_path('../../data/default_world.yaml', __FILE__)
+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:     'bloops',
+    sound_volume:     0.3,
+    use_wordnik:      false,
+    fight_completion: false,
+    extra_command:    nil
+  }
+
+  # 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]) 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
+    end
+
+    opts.on('-d', '--debug', 'Enable debug commands in-game') do
+      options[:debug_mode] = true
+    end
+
+    opts.on('-g', '--god', 'Enable debug[godmode]') do
+      options[:god_mode] = true
+    end
+
+    opts.on('-n', '--new', 'Immediately start a new game, skipping main menu') do
+      options[:new_skip] = true
+    end
+
+    opts.on('-r', '--resume', 'Immediately resume the saved game, skipping main menu') do
+      options[:resume_skip] = true
+    end
+
+    opts.on('-s', '--sound', 'Enable sound (experimental)') do
+      options[:sound_enabled] = true
+    end
+
+    opts.on('-v', '--version', 'Display version number and exit') do
+      puts "#{GAME_NAME} v#{Gemwarrior::VERSION}"
+      exit
+    end
+
+    opts.on('-w', '--wordnik', 'Enable Wordnik to generate more diverse, dynamic descriptors of entities') do
+      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
+  end
+
+  optparse.parse!()
+
+  return options
+end
+
+def print_error(error)
+  case error
+  when OptionParser::InvalidOption
+    puts "#{GAME_NAME}: illegal option #{error.args.join(' ')}"
+  else
+    puts "An unexpected error occurred while running #{GAME_NAME}:"
+    puts "  #{error}\n"
+  end
+end
+
+def read_options_file
+  if File.exist?(GameOptions.data['options_file_path'])
+    options = {}
+    File.open(GameOptions.data['options_file_path']).readlines.each do |line|
+      kv = line.chomp.split(':')
+      options[kv[0].to_sym] = kv[1]
+    end
+
+    # check for null
+    return options[:sound_enabled] ? options : nil
+  end
+  nil
+end
+
+def init_config
+  Dir.mkdir(GW_HOME) unless Dir.exist?(GW_HOME)
+
+  sound_system_default = OS.windows? ? 'win32-sound' : 'bloops'
+  save_file_mode_default = 'Y' # YAML
+
+  GameOptions.add 'sound_system',             sound_system_default
+  GameOptions.add 'save_file_mode',           save_file_mode_default
+  GameOptions.add 'default_world_path_yaml',  GW_DEFAULT_WORLD_YAML
+  GameOptions.add 'default_world_path_bin',   GW_DEFAULT_WORLD_BIN
+  GameOptions.add 'save_file_yaml_path',      GW_SAVE_FILE_YAML
+  GameOptions.add 'save_file_bin_path',       GW_SAVE_FILE_BIN
+  GameOptions.add 'log_file_path',            GW_LOG_FILE
+  GameOptions.add 'options_file_path',        GW_OPTS_FILE
+  GameOptions.add 'wrap_width',               GW_DEFAULT_WRAP_WIDTH
+end
+
+begin
+  init_config
+
+  options = parse_options_cli
+
+  Gemwarrior::Game.new(options)
+rescue => error
+  print_error(error)
+  exit(false)
+end

data/gemwarrior.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version         = Gemwarrior::VERSION
   spec.platform        = Gem::Platform::RUBY
   spec.authors         = ['Michael Chadwick']
-  spec.email           = 'mike@codana.me'
+  spec.email           = 'mike@neb.host'
   spec.homepage        = 'http://rubygems.org/gems/gemwarrior'
   spec.summary         = 'RubyGem text adventure'
   spec.description     = 'A fun text adventure in the form of a RubyGem!'
@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths   = ['lib']
   spec.license         = 'MIT'
 
+  spec.required_ruby_version = '~> 2.0'
+
   spec.add_runtime_dependency 'os', '~> 0.9', '>= 0.9.6'
   spec.add_runtime_dependency 'http', '~> 0.8.10'
-  spec.add_runtime_dependency 'json', '~> 1.8.2'
+  spec.add_runtime_dependency 'json', '~> 2.3.0'
   spec.add_runtime_dependency 'colorize', '~> 0.8'
   spec.add_runtime_dependency 'matrext', '~> 1'
   spec.add_runtime_dependency 'clocker', '~> 0.1.6'

data/lib/gemwarrior/arena.rb

@@ -1,81 +1,81 @@
-# lib/gemwarrior/arena.rb
-# Arena series of battles
-
-require_relative 'battle'
-
-module Gemwarrior
-  class Arena
-    # CONSTANTS
-    BONUS_ROX_MULTIPLIER  = 25
-    BONUS_XP_MULTIPLIER   = 10
-
-    attr_accessor :world, :player
-
-    def initialize(options)
-      self.world    = options.fetch(:world)
-      self.player   = options.fetch(:player)
-    end
-
-    def start
-      print_arena_intro
-
-      arena_monsters_vanquished = 0
-
-      loop do
-        monster = generate_monster
-        battle = Battle.new(world: world, player: player, monster: monster)
-        result = battle.start(is_arena: true)
-
-        return 'death' if result.eql?('death')
-
-        arena_monsters_vanquished += 1
-
-        print '  Do you wish to continue fighting in the Arena? (y/n) '
-        answer = gets.chomp.downcase
-
-        case answer
-        when 'y', 'yes'
-          puts
-          next
-        else
-          bonus_rox = arena_monsters_vanquished * BONUS_ROX_MULTIPLIER
-          bonus_xp = arena_monsters_vanquished * BONUS_XP_MULTIPLIER
-          player.rox = player.rox + bonus_rox
-          player.xp = player.xp + bonus_xp
-          puts
-          puts '  You decided you\'ve had enough of the exhausting Arena for one day and exit the main stage.'
-          puts "  You defeated #{arena_monsters_vanquished} monsters!"
-          puts "  You have gained #{bonus_rox} rox and #{bonus_xp} XP!"
-
-          return print_arena_outro
-        end
-      end
-    end
-
-    private
-
-    def generate_monster
-      random_monster = nil
-
-      loop do
-        random_monster = GameMonsters.data[rand(0..GameMonsters.data.length - 1)].clone
-
-        break unless random_monster.is_boss
-      end
-
-      random_monster.clone
-    end
-
-    def print_arena_intro
-      puts '**************************'.colorize(:red)
-      puts '* YOU ENTER THE ARENA!!! *'.colorize(:red)
-      puts '**************************'.colorize(:red)
-    end
-
-    def print_arena_outro
-      puts '**************************'.colorize(:red)
-      puts '* YOU LEAVE THE ARENA!!! *'.colorize(:red)
-      puts '**************************'.colorize(:red)
-    end
-  end
-end
+# lib/gemwarrior/arena.rb
+# Arena series of battles
+
+require_relative 'battle'
+
+module Gemwarrior
+  class Arena
+    # CONSTANTS
+    BONUS_ROX_MULTIPLIER  = 25
+    BONUS_XP_MULTIPLIER   = 10
+
+    attr_accessor :world, :player
+
+    def initialize(options)
+      self.world    = options.fetch(:world)
+      self.player   = options.fetch(:player)
+    end
+
+    def start
+      print_arena_intro
+
+      arena_monsters_vanquished = 0
+
+      loop do
+        monster = generate_monster
+        battle = Battle.new(world: world, player: player, monster: monster)
+        result = battle.start(is_arena: true)
+
+        return 'death' if result.eql?('death')
+
+        arena_monsters_vanquished += 1
+
+        print '  Do you wish to continue fighting in the Arena? (y/n) '
+        answer = gets.chomp.downcase
+
+        case answer
+        when 'y', 'yes'
+          puts
+          next
+        else
+          bonus_rox = arena_monsters_vanquished * BONUS_ROX_MULTIPLIER
+          bonus_xp = arena_monsters_vanquished * BONUS_XP_MULTIPLIER
+          player.rox = player.rox + bonus_rox
+          player.xp = player.xp + bonus_xp
+          puts
+          puts '  You decided you\'ve had enough of the exhausting Arena for one day and exit the main stage.'
+          puts "  You defeated #{arena_monsters_vanquished} monsters!"
+          puts "  You have gained #{bonus_rox} rox and #{bonus_xp} XP!"
+
+          return print_arena_outro
+        end
+      end
+    end
+
+    private
+
+    def generate_monster
+      random_monster = nil
+
+      loop do
+        random_monster = GameMonsters.data[rand(0..GameMonsters.data.length - 1)].clone
+
+        break unless random_monster.is_boss
+      end
+
+      random_monster.clone
+    end
+
+    def print_arena_intro
+      puts '**************************'.colorize(:red)
+      puts '* YOU ENTER THE ARENA!!! *'.colorize(:red)
+      puts '**************************'.colorize(:red)
+    end
+
+    def print_arena_outro
+      puts '**************************'.colorize(:red)
+      puts '* YOU LEAVE THE ARENA!!! *'.colorize(:red)
+      puts '**************************'.colorize(:red)
+    end
+  end
+end