gemwarrior 0.15.13 → 0.15.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32da6152f4ce6dccf6acc5ef3c9a66dec1c1a1b851751f9d28efffba5accc17e
-  data.tar.gz: 8dcc14d6abd6378750629309d7e52d02c1f932c0cd950f8b59d7970d77a996e4
+  metadata.gz: c4b71d7a26b3d881e7451d4f0374a2ff847b08b2781190dc535da4be03216d93
+  data.tar.gz: 6706573b955217a0f75d5df3eaee248e0e199b8c8586d5f4a8245aa6b7a4d9fe
 SHA512:
-  metadata.gz: 0bcdafec3b61d634cee410aa8a96b15c6aa6a4aed4fee124319d827cacc3b3117538d114d063d1a1e4ebe14054faa6792465ced5962f3aafca712da640c4df46
-  data.tar.gz: afcea73e004084bca9c10d50b19c90a292a684ce033b571a0ade436dbdbb243edf5bd0ac1963199142c297fd938fb66ac0682b5b5ad25c0f6f7688cb8514d174
+  metadata.gz: 9f3e6f2d65f809e9403d3d91f3daebe3c60bde70b017e2c4db6e0cb8367365716f144baf4c9fbb0a565a24503b65eb68da17b5c49b3fcc91ef66e1660c78483e
+  data.tar.gz: a8b4a0873299d590b9bc389d15e1e28c9594f39e480447b7ffc7ba5812bddeb091cf37ab77bfc92d570902aa849866c9d4bcf0cbab38081aedee33dd2476e2c2

data/bin/gemwarrior

@@ -9,21 +9,72 @@ 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
+GW_NAME                   = 'Gem Warrior'
+GW_HOME_PATH              = "#{Dir.home}/.gemwarrior"
+GW_SAVE_FILE_YAML_PATH    = "#{GW_HOME_PATH}/gw_sav.yaml"
+GW_SAVE_FILE_BIN_PATH     = "#{GW_HOME_PATH}/gw_sav.dat"
+GW_SAVE_FILE_MODE_DEFAULT = 'Y' # YAML
+GW_OPTS_FILE_PATH         = "#{GW_HOME_PATH}/gw_opts"
+GW_LOG_FILE_PATH          = "#{GW_HOME_PATH}/gw_log"
+GW_WRAP_WIDTH_DEFAULT   = 80
+
+def print_error(error)
+  case error
+  when OptionParser::InvalidOption
+    puts "#{GW_NAME}: illegal option #{error.args.join(' ')}"
+  else
+    puts "An unexpected error occurred while running #{GW_NAME}:"
+    puts "  #{error}\n"
+  end
+end
+
+def init_config(world)
+  Dir.mkdir(GW_HOME_PATH) unless Dir.exist?(GW_HOME_PATH)
+
+  log_file_path = GW_LOG_FILE_PATH
+  options_file_path = GW_OPTS_FILE_PATH
+  save_file_mode_default = GW_SAVE_FILE_MODE_DEFAULT
+  save_file_bin_path = GW_SAVE_FILE_BIN_PATH
+  save_file_yaml_path = GW_SAVE_FILE_YAML_PATH
+  sound_system_default = OS.windows? ? 'win32-sound' : 'bloops'
+  world_yaml_path = File.expand_path("../../data/#{world}.yaml", __FILE__)
+  world_bin_path = File.expand_path("../../data/#{world}.bin", __FILE__)
+  wrap_width = GW_WRAP_WIDTH_DEFAULT
+
+  GameOptions.add 'log_file_path',       log_file_path
+  GameOptions.add 'options_file_path',   options_file_path
+  GameOptions.add 'save_file_bin_path',  save_file_bin_path
+  GameOptions.add 'save_file_mode',      save_file_mode_default
+  GameOptions.add 'save_file_yaml_path', save_file_yaml_path
+  GameOptions.add 'sound_system',        sound_system_default
+  GameOptions.add 'world_bin_path',      world_bin_path
+  GameOptions.add 'world_yaml_path',     world_yaml_path
+  GameOptions.add 'wrap_width',          wrap_width
+end
+
+def read_options_file
+  if !File.exist?(GW_OPTS_FILE_PATH)
+    File.write(GW_OPTS_FILE_PATH, "")
+  end
+
+  options = {}
+
+  File.open(GW_OPTS_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
 
 def parse_options_cli
   # default options
   options = {
     beast_mode:       false,
     debug_mode:       false,
+    extra_command:    nil,
+    fight_completion: false,
     god_mode:         false,
     new_skip:         false,
     resume_skip:      false,
@@ -31,17 +82,22 @@ def parse_options_cli
     sound_system:     'bloops',
     sound_volume:     0.3,
     use_wordnik:      false,
-    fight_completion: false,
-    extra_command:    nil
+    world_name:       'default_world'
   }
 
   # options file has next precedence
   unless (opts_file = read_options_file).nil?
+    options[:fight_completion]  = (opts_file[:fight_completion].eql?('false') ? false : true) if opts_file[:fight_completion]
+
     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]
+
+    opts_file[:world_name]      = (opts_file[:world_name]) if opts_file[:world_name]
   end
 
   # command line has next precedence
@@ -54,10 +110,18 @@ def parse_options_cli
       options[:debug_mode] = 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('-g', '--god', 'Enable debug[godmode]') do
       options[:god_mode] = true
     end
 
+    opts.on('-k', '--wordnik', 'Enable Wordnik to generate more diverse, dynamic descriptors of entities') do
+      options[:use_wordnik] = true
+    end
+
     opts.on('-n', '--new', 'Immediately start a new game, skipping main menu') do
       options[:new_skip] = true
     end
@@ -71,19 +135,15 @@ def parse_options_cli
     end
 
     opts.on('-v', '--version', 'Display version number and exit') do
-      puts "#{GAME_NAME} v#{Gemwarrior::VERSION}"
+      puts "#{GW_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
+    opts.on('-w', '--world WORLD_NAME', String, 'Build Gemwarrior with alternate world data file') do |world_name|
+      options[:world_name] = world_name
     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|
+    opts.on('-x', '--xtra COMMAND,PARAMS', String, 'Run a command, with optional params, immediately upon beginning the game') do |xc|
       options[:extra_command] = xc.gsub(',',' ')
     end
   end
@@ -93,54 +153,14 @@ def parse_options_cli
   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
 
+  init_config(options[:world_name])
+
   Gemwarrior::Game.new(options)
-rescue => error
-  print_error(error)
+rescue => e
+  print_error(e)
+  puts ("#{self.class} - #{e.class}: #{e.message}" + e.backtrace).join("\n")
   exit(false)
 end

data/data/minimal1.yaml

@@ -0,0 +1,67 @@
+--- !ruby/object:Gemwarrior::World
+locations:
+- !ruby/object:Gemwarrior::Location
+  name: home
+  name_display: Home
+  visited: true
+  description: The little, unimportant, decrepit shack that you live in. What the place lacks in decisive magnanimity is made up for in cozy squalidness. Your bed covers much of the northern corner. Your beloved family chest sits at the foot of the bed.
+  coords: &2
+    :x: 5
+    :y: 0
+    :z: 0
+  paths:
+    :north: true
+    :east: true
+    :south: false
+    :west: true
+  danger_level: :none
+  monster_level_range:
+  items:
+  - !ruby/object:Gemwarrior::Bed
+    equipped: false
+    consumable: false
+    used: false
+    used_again: false
+    number_of_uses:
+    name: bed
+    name_display: Bed
+    description: The place where you sleep when you are not adventuring.
+    takeable: false
+    talkable: false
+    useable: true
+    equippable: false
+  monsters_abounding: []
+  bosses_abounding: []
+  checked_for_monsters: false
+player: !ruby/object:Gemwarrior::Player
+  name: Player
+  description: |-
+    Picked to do battle against a wizened madman for a shiny something or other for world-saving purposes.
+  face: facey
+  hands: handsy
+  mood: moody
+  level: 1
+  xp: 0
+  hp_cur: 30
+  hp_max: 30
+  atk_lo: 1
+  atk_hi: 2
+  defense: 1
+  dexterity: 3
+  inventory: !ruby/object:Gemwarrior::Inventory
+    armor:
+    items: []
+    weapon:
+  rox: 0
+  cur_coords: *2
+  special_abilities: []
+  monsters_killed: 0
+  bosses_killed: 0
+  items_taken: 0
+  movements_made: 0
+  rests_taken: 0
+  deaths: 0
+emerald_beaten: false
+shifty_jeweled: false
+shifty_to_jewel: false
+duration:

data/data/minimal2.yaml

@@ -0,0 +1,25 @@
+--- !ruby/object:Gemwarrior::World
+locations:
+- !ruby/object:Gemwarrior::Location
+  name: home
+  name_display: Home
+  visited: true
+  description: The little, unimportant, decrepit shack that you live in. What the place lacks in decisive magnanimity is made up for in cozy squalidness. Your bed covers much of the northern corner. Your beloved family chest sits at the foot of the bed.
+  coords: &2
+    :x: 5
+    :y: 0
+    :z: 0
+  paths:
+    :north: true
+    :east: true
+    :south: false
+    :west: true
+  danger_level: :none
+  monster_level_range:
+  monsters_abounding: []
+  bosses_abounding: []
+  checked_for_monsters: false
+emerald_beaten: false
+shifty_jeweled: false
+shifty_to_jewel: false
+duration:

data/data/minimal3.yaml

@@ -0,0 +1 @@
+--- !ruby/object:Gemwarrior::World

data/gemwarrior.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   # additional
   ## runtime deps
   spec.add_runtime_dependency 'clocker', '~> 0.1.6'
-  spec.add_runtime_dependency 'colorize', '~> 0.8'
+  spec.add_runtime_dependency 'colorize', '~> 1.0'
   spec.add_runtime_dependency 'gems', '~> 1.2'
   spec.add_runtime_dependency 'http', '~> 5.1'
   spec.add_runtime_dependency 'json', '~> 2.6'

data/lib/gemwarrior/game.rb

@@ -7,6 +7,7 @@ require 'matrext'
 require_relative 'entities/armor/iron_helmet'
 require_relative 'entities/items/herb'
 require_relative 'entities/weapons/dagger'
+require_relative 'entities/player'
 require_relative 'misc/animation'
 require_relative 'misc/audio'
 require_relative 'misc/formatting'
@@ -52,7 +53,7 @@ module Gemwarrior
       init_weapons
       init_armor
 
-      # create new world based on default template
+      # create new world based on yaml/marshall data
       self.world               = init_world
 
       # update some player aspects to make more dynamic
@@ -170,20 +171,20 @@ module Gemwarrior
       mode = GameOptions.data['save_file_mode']
 
       if mode.eql?('Y')
-        if File.exist?(GameOptions.data['default_world_path_yaml'])
-          File.open(GameOptions.data['default_world_path_yaml'], 'r') do |f|
-            return YAML.load(f)
+        if File.exist?(GameOptions.data['world_yaml_path'])
+          File.open(GameOptions.data['world_yaml_path'], 'r') do |f|
+            return YAML.unsafe_load(f)
           end
         else
-          puts "Error: cannot load #{GameOptions.data['default_world_path_yaml']}."
+          puts "Error: cannot load #{GameOptions.data['world_yaml_path']}."
         end
       else
-        if File.exist?(GameOptions.data['default_world_path_bin'])
-          File.open(GameOptions.data['default_world_path_bin'], 'r') do |f|
+        if File.exist?(GameOptions.data['world_bin_path'])
+          File.open(GameOptions.data['world_bin_path'], 'r') do |f|
             return Marshal.load(f)
           end
         else
-          puts "Error: cannot load #{GameOptions.data['default_world_path_bin']}."
+          puts "Error: cannot load #{GameOptions.data['world_bin_path']}."
         end
       end
     end

data/lib/gemwarrior/repl.rb

@@ -120,7 +120,7 @@ module Gemwarrior
     def get_save_file_name
       if save_file_exist?
         File.open(GameOptions.data['save_file_yaml_path'], 'r') do |f|
-          return YAML.load(f)
+          return YAML.unsafe_load(f)
         end
       end
     end
@@ -551,7 +551,7 @@ module Gemwarrior
       if mode.eql? 'Y'
         if File.exist?(GameOptions.data['save_file_yaml_path'])
           File.open(GameOptions.data['save_file_yaml_path'], 'r') do |f|
-            return YAML.load(f)
+            return YAML.unsafe_load(f)
           end
         else
           puts 'No save file exists.'

data/lib/gemwarrior/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.15.13
+  version: 0.15.14
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clocker
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: gems
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +284,9 @@ files:
 - bin/gemwarrior
 - data/default_world.yaml
 - data/fantasy_names.yaml
+- data/minimal1.yaml
+- data/minimal2.yaml
+- data/minimal3.yaml
 - gemwarrior.gemspec
 - lib/gemwarrior/arena.rb
 - lib/gemwarrior/battle.rb
@@ -418,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: RubyGem text adventure