gemwarrior 0.9.39 → 0.10.0

data/lib/gemwarrior/entities/player.rb

@@ -20,39 +20,23 @@ module Gemwarrior
     include Formatting
 
     attr_accessor :stam_cur, :stam_max, :cur_coords, :special_abilities,
-                  :monsters_killed, :items_taken, :movements_made, :rests_taken, :deaths
-
-    def initialize(options)
-      self.name               = generate_name
-      self.description        = options.fetch(:description)
-
-      self.face               = generate_face
-      self.hands              = generate_hands
-      self.mood               = generate_mood
-
-      self.level              = options.fetch(:level)
-      self.xp                 = options.fetch(:xp)
-      self.hp_cur             = options.fetch(:hp_cur)
-      self.hp_max             = options.fetch(:hp_max)
-      self.atk_lo             = options.fetch(:atk_lo)
-      self.atk_hi             = options.fetch(:atk_hi)
-
-      self.defense            = options.fetch(:defense)
-      self.dexterity          = options.fetch(:dexterity)
-
-      self.inventory          = options.fetch(:inventory)
-      self.rox                = options.fetch(:rox)
-
-      self.stam_cur           = options.fetch(:stam_cur)
-      self.stam_max           = options.fetch(:stam_max)
-      self.cur_coords         = options.fetch(:cur_coords)
-      self.special_abilities  = []
-
-      self.monsters_killed    = 0
-      self.items_taken        = 0
-      self.movements_made     = 0
-      self.rests_taken        = 0
-      self.deaths             = 0
+                  :monsters_killed, :items_taken, :movements_made,    
+                  :rests_taken, :deaths
+
+    def generate_name
+      NameGenerator.new('fantasy').generate_name
+    end
+
+    def generate_face
+      WordList.new('adjective').get_random_value
+    end
+
+    def generate_hands
+      WordList.new('adjective').get_random_value
+    end
+
+    def generate_mood
+      WordList.new('adjective').get_random_value
     end
 
     def check_self(show_pic = true)
@@ -77,20 +61,21 @@ module Gemwarrior
       else
         abilities = Formatting::upstyle(special_abilities.collect { |x| x.to_s }).join(', ')
       end
+
       self_text =  "NAME      : #{self.name}\n"
-      self_text << "POSITION  : #{self.cur_coords.values.to_a}\n" if GameOptions.data['debug_mode']
-      self_text << "WEAPON    : #{weapon_slot}\n"
       self_text << "LEVEL     : #{self.level}\n"
       self_text << "EXPERIENCE: #{self.xp}\n"
       self_text << "HIT POINTS: #{self.hp_cur}/#{self.hp_max}\n"
+      self_text << "WEAPON    : #{weapon_slot}\n"
       self_text << "ATTACK    : #{atk_lo}-#{atk_hi}\n"
       self_text << "DEXTERITY : #{self.dexterity}\n"
       self_text << "DEFENSE   : #{self.defense}\n"
       self_text << "ABILITIES : #{abilities}\n"
       
       if GameOptions.data['debug_mode']
-        self_text << "GOD_MODE  : #{GameOptions.data['god_mode']}\n"
-        self_text << "BEAST_MODE: #{GameOptions.data['beast_mode']}\n"
+        self_text << "  POSITION  : #{self.cur_coords.values.to_a}\n"
+        self_text << "  GOD_MODE  : #{GameOptions.data['god_mode']}\n"
+        self_text << "  BEAST_MODE: #{GameOptions.data['beast_mode']}\n"
       end
 
       self_text << "\n"
@@ -99,7 +84,7 @@ module Gemwarrior
 
       self_text << "\n\n"
 
-      self_text << "[Current Status]\nBreathing, non-naked, with a #{self.face.colorize(:yellow)} face, #{self.hands.colorize(:yellow)} hands, and feeling, generally, #{self.mood.colorize(:yellow)}."
+      self_text << "[Current Status]\nBreathing, non-naked, with a #{self.face.colorize(:yellow)} face, #{self.hands.colorize(:yellow)} hands, and\nfeeling, generally, #{self.mood.colorize(:yellow)}."
       
       self_text << "\n"
     end
@@ -225,10 +210,6 @@ module Gemwarrior
       # stats
       self.movements_made += 1
     end
-    
-    def at_full_hp?
-      self.hp_cur == self.hp_max
-    end
 
     def attack(world, monster)
       battle = Battle.new(world: world, player: self, monster: monster)
@@ -317,6 +298,10 @@ module Gemwarrior
       end
     end
 
+    def at_full_hp?
+      self.hp_cur == self.hp_max
+    end
+
     private
 
     def player_death
@@ -325,7 +310,6 @@ module Gemwarrior
       return 'death'
     end
 
-    # TRAVEL
     def print_traveling_text(direction_text)
       Music::cue([
         { frequencies: 'C4', duration: 75 },
@@ -335,7 +319,6 @@ module Gemwarrior
       Animation::run(phrase: "* #{direction_text} *", oneline: false)
     end
 
-    # CHARACTER
     def print_char_pic
       char_pic = ''
       char_pic << "************\n"
@@ -351,25 +334,5 @@ module Gemwarrior
     def print_battle_line
       puts '**************************************'
     end
-
-    # INIT
-    def generate_name
-      NameGenerator.new('fantasy').generate_name
-    end
-
-    def generate_face
-      face_descriptors = WordList.new('adjective')
-      face_descriptors.get_random_value
-    end
-
-    def generate_hands
-      hand_descriptors = WordList.new('adjective')
-      hand_descriptors.get_random_value
-    end
-
-    def generate_mood
-      mood_descriptors = WordList.new('adjective')
-      mood_descriptors.get_random_value
-    end
   end
 end

data/lib/gemwarrior/evaluator.rb

@@ -112,9 +112,11 @@ module Gemwarrior
       if GameOptions.data['debug_mode']
         case command
         when 'god', 'gd'
-          return GameOptions.data['god_mode'] = !GameOptions.data['god_mode']
+          GameOptions.data['god_mode'] = !GameOptions.data['god_mode']
+          return "God mode set to #{GameOptions.data['god_mode']}"
         when 'beast', 'bs'
-          return GameOptions.data['beast_mode'] = !GameOptions.data['beast_mode']
+          GameOptions.data['beast_mode'] = !GameOptions.data['beast_mode']
+          return "Beast mode set to #{GameOptions.data['beast_mode']}"
         when 'vars', 'vs'
           world.print_vars
         when 'list', 'ls'
@@ -522,7 +524,7 @@ module Gemwarrior
       when 'version', 'v'
         Gemwarrior::VERSION
       when 'quit', 'exit', 'q', 'x'
-        puts 'You sure you want to quit? (y/n): '
+        print 'You sure you want to quit? (y/n) '
         response = gets.chomp.downcase
         if (response.eql?('y') || response.eql?('yes'))
           puts QUIT_MESSAGE

data/lib/gemwarrior/game.rb

@@ -4,9 +4,6 @@
 require 'colorize'
 require 'matrext'
 
-require_relative 'entities/player'
-require_relative 'entities/items/herb'
-require_relative 'misc/player_levels'
 require_relative 'misc/animation'
 require_relative 'misc/music'
 require_relative 'world'
@@ -17,16 +14,14 @@ require_relative 'game_options'
 
 module Gemwarrior
   class Game
-    include PlayerLevels
-
     # CONSTANTS
-    PLAYER_DESC_DEFAULT       = "Picked to do battle against a wizened madman for a shiny something\nor other for world-saving purposes."
-    PLAYER_INVENTORY_DEFAULT  = Inventory.new
-    PLAYER_INVENTORY_DEBUG    = Inventory.new([Herb.new])
-    PLAYER_ROX_DEFAULT        = 0
-    PLAYER_ROX_DEBUG          = 300
+    INVENTORY_DEFAULT             = Inventory.new
+    INVENTORY_DEBUG               = Inventory.new([Herb.new])
+    ROX_DEFAULT                   = 0
+    ROX_DEBUG                     = 300
 
-    attr_accessor :world, :evaluator, :repl
+    attr_accessor :world, :evaluator, :repl,
+                  :monsters, :items
 
     def initialize(options)
       # set game options
@@ -36,38 +31,33 @@ module Gemwarrior
       GameOptions.add 'sound_enabled', options.fetch(:sound_enabled)
       GameOptions.add 'sound_volume', options.fetch(:sound_volume)
       GameOptions.add 'use_wordnik', options.fetch(:use_wordnik)
+
+      # add classes for monsters and items to game
+      init_monsters
+      init_items
+
+      # create new world based on default template
+      self.world               = init_world
       
-      # create new world and player
-      start_stats  = PlayerLevels::get_level_stats(1)
-
-      self.world   = World.new
-
-      world.player = Player.new({
-        description:  PLAYER_DESC_DEFAULT,
-        level:        start_stats[:level],
-        xp:           start_stats[:xp_start],
-        hp_cur:       start_stats[:hp_max],
-        hp_max:       start_stats[:hp_max],
-        stam_cur:     start_stats[:stam_max],
-        stam_max:     start_stats[:stam_max],
-        atk_lo:       start_stats[:atk_lo],
-        atk_hi:       start_stats[:atk_hi],
-        defense:      start_stats[:defense],
-        dexterity:    start_stats[:dexterity],
-        inventory:    GameOptions.data['debug_mode'] ? PLAYER_INVENTORY_DEBUG : PLAYER_INVENTORY_DEFAULT,
-        rox:          GameOptions.data['debug_mode'] ? PLAYER_ROX_DEBUG : PLAYER_ROX_DEFAULT,
-        cur_coords:   world.location_coords_by_name('Home')
-      })
+      # update some player aspects to make more dynamic
+      world.player.name        = world.player.generate_name
+      world.player.face        = world.player.generate_face
+      world.player.hands       = world.player.generate_hands
+      world.player.mood        = world.player.generate_mood
+      world.player.inventory   = GameOptions.data['debug_mode'] ? INVENTORY_DEBUG : INVENTORY_DEFAULT
+      world.player.rox         = GameOptions.data['debug_mode'] ? ROX_DEBUG : ROX_DEFAULT
+      
+      world.duration           = { mins: 0, secs: 0, ms: 0 }
 
       # create options file if not existing
       update_options_file
-      
+
       # create the console
       self.evaluator  = Evaluator.new(world)
       self.repl       = Repl.new(self, world, evaluator)
 
       # enter Jool!
-      repl.start('look', options.fetch(:extra_command),  options.fetch(:new_game))
+      repl.start('look', options.fetch(:extra_command),  options.fetch(:new_skip), options.fetch(:resume_skip))
     end
 
     def update_options_file
@@ -77,5 +67,59 @@ module Gemwarrior
         f.puts "use_wordnik:#{GameOptions.data['use_wordnik']}"
       end
     end
+
+    private
+
+    def init_monsters
+      Dir.glob(File.expand_path('../entities/monsters/*.rb', __FILE__)).each do |item|
+        require_relative item
+      end
+      Dir.glob(File.expand_path('../entities/monsters/bosses/*.rb', __FILE__)).each do |item|
+        require_relative item
+      end
+
+      self.monsters = [
+        Alexandrat.new,
+        Amberoo.new,
+        Amethystle.new,
+        Apatiger.new,
+        Aquamarine.new,
+        Bloodstorm.new,
+        Citrinaga.new,
+        Coraliz.new,
+        Cubicat.new,
+        Diaman.new,
+        Emerald.new,
+        Garynetty.new
+      ]
+    end
+
+    def init_items
+      Dir.glob(File.expand_path('../entities/items/*.rb', __FILE__)).each do |item|
+        require_relative item
+      end
+    end
+
+    def init_world
+      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)
+          end
+        else
+          puts "Error: cannot load #{GameOptions.data['default_world_path_yaml']}."
+        end
+      else
+        if File.exist?(GameOptions.data['default_world_path_bin'])
+          File.open(GameOptions.data['default_world_path_bin'], 'r') do |f|
+            return Marshal::load(f)
+          end
+        else
+          puts "Error: cannot load #{GameOptions.data['default_world_path_bin']}."
+        end
+      end
+    end
   end
 end

data/lib/gemwarrior/misc/name_generator.rb

@@ -17,7 +17,7 @@ class NameGenerator
   # load sample names
   def get_name_set(type)
     names = []
-    names_data = YAML.load_file(File.expand_path("../../../../data/#{type}_names.yml", __FILE__))
+    names_data = YAML.load_file(File.expand_path("../../../../data/#{type}_names.yaml", __FILE__))
     names_data.each do |n|
       names.push(n)
     end

data/lib/gemwarrior/repl.rb

@@ -31,16 +31,16 @@ module Gemwarrior
       self.evaluator    = evaluator
     end
 
-    def start(initial_command, extra_command, new_game)
-      setup_screen(initial_command, extra_command, new_game)
+    def start(initial_command, extra_command, new_skip, resume_skip)
+      setup_screen(initial_command, extra_command, new_skip, resume_skip)
 
       clocker = Clocker.new
 
       at_exit do
-        world.duration = clocker.stop
+        update_duration(clocker.stop)
         game.update_options_file
         log_stats(world.duration, world.player)
-        #save_game(world)
+        save_game(world)
       end
 
       clocker.clock do
@@ -167,7 +167,7 @@ module Gemwarrior
           print "#{line}"
         end
         if GameOptions.data['debug_mode']
-          print 'Clear log of attempts (y/n)? '
+          print 'Clear log of attempts? (y/n) '
           answer = gets.chomp.downcase
 
           case answer
@@ -204,7 +204,7 @@ module Gemwarrior
       puts "      GW v#{Gemwarrior::VERSION}"
       puts '======================='
       puts ' (N)ew Game'
-      #puts ' (R)esume Game' if save_file_exist?
+      puts ' (R)esume Game' if save_file_exist?
       puts ' (A)bout'
       puts ' (H)elp'
       puts ' (O)ptions'
@@ -227,16 +227,15 @@ module Gemwarrior
 
       case choice
       when 'n'
-        #if overwrite_save?
+        if overwrite_save?
           clear_screen
           play_intro_tune
           print_splash_message
           print_fortune
           return
-        #else
-        #  run_main_menu
-        #end
-=begin
+        else
+          run_main_menu
+        end
       when 'r'
         if save_file_exist?
           result = resume_game
@@ -244,9 +243,10 @@ module Gemwarrior
             run_main_menu
           elsif
             self.world = result
+            self.evaluator = Evaluator.new(self.world)
+            return
           end
         end
-=end
       when 'a'
         puts choice
         print_about_text
@@ -286,14 +286,14 @@ module Gemwarrior
       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"
       puts  '----------------------------------------------------------------------'
-      print "Player killed #{pl.monsters_killed.to_s.colorize(color: :white, background: :black)} monster(s)"
-      print "\n".ljust(8)
+      print "#{pl.name.ljust(10)} killed #{pl.monsters_killed.to_s.colorize(color: :white, background: :black)} monster(s)"
+      print "\n".ljust(12)
       print "picked up #{pl.items_taken.to_s.colorize(color: :white, background: :black)} item(s)"
-      print "\n".ljust(8)
+      print "\n".ljust(12)
       print "traveled #{pl.movements_made.to_s.colorize(color: :white, background: :black)} time(s)"
-      print "\n".ljust(8)
+      print "\n".ljust(12)
       print "rested #{pl.rests_taken.to_s.colorize(color: :white, background: :black)} time(s)"
-      print "\n".ljust(8)
+      print "\n".ljust(12)
       print "died #{pl.deaths.to_s.colorize(color: :white, background: :black)} time(s)"
       print "\n"
       puts '######################################################################'
@@ -307,13 +307,13 @@ module Gemwarrior
     def save_game(world)
       mode = GameOptions.data['save_file_mode']
       puts 'Saving game...'
-      
+
       if mode.eql? 'Y'
-        File.open(GameOptions.data['save_file_yaml_path'], 'w+') do |f|
+        File.open(GameOptions.data['save_file_yaml_path'], 'w') do |f|
           f.write YAML::dump(world)
         end
       elsif mode.eql? 'M'
-        File.open(GameOptions.data['save_file_bin_path'], 'w+') do |f|
+        File.open(GameOptions.data['save_file_bin_path'], 'w') do |f|
           f.write Marshal::dump(world)
         end
       else
@@ -338,29 +338,27 @@ module Gemwarrior
       mode = GameOptions.data['save_file_mode']
       puts 'Resuming game...'
 
-      if save_file_exist?
-        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)
-            end
-          else
-            puts 'No save file exists.'
-            nil
+      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)
           end
-        elsif mode.eql? 'M'
-          if File.exist?(GameOptions.data['save_file_marshal_path'])
-            File.open(GameOptions.data['save_file_marshal_path'], 'r') do |f|
-              return Marshal::load(f)
-            end
-          else
-            puts 'No save file exists.'
-            nil
+        else
+          puts 'No save file exists.'
+          nil
+        end
+      elsif mode.eql? 'M'
+        if File.exist?(GameOptions.data['save_file_marshal_path'])
+          File.open(GameOptions.data['save_file_marshal_path'], 'r') do |f|
+            return Marshal::load(f)
           end
+        else
+          puts 'No save file exists.'
+          nil
         end
       end
     end
-    
+
     def overwrite_save?
       mode = GameOptions.data['save_file_mode']
       save_file_path = ''
@@ -388,6 +386,26 @@ module Gemwarrior
       true
     end
 
+    def update_duration(new_duration)
+      new_mins = new_duration[:mins]
+      new_secs = new_duration[:secs]
+      new_ms   = new_duration[:ms]
+
+      world.duration[:mins] += new_mins
+      world.duration[:secs] += new_secs
+      world.duration[:ms]   += new_ms
+
+      if world.duration[:ms] > 1000
+        world.duration[:secs] += world.duration[:ms] / 1000
+        world.duration[:ms] = world.duration[:ms] % 1000
+      end
+
+      if world.duration[:secs] > 60
+        world.duration[:mins] += world.duration[:secs] / 60
+        world.duration[:secs] = world.duration[:secs] % 60
+      end
+    end
+
     def play_intro_tune
       Music::cue([
         { frequencies: 'A3,E4,C#5,E5',  duration: 300 },
@@ -395,16 +413,24 @@ module Gemwarrior
       ])
     end
 
-    def setup_screen(initial_command = nil, extra_command = nil, new_game = false)
+    def setup_screen(initial_command = nil, extra_command = nil, new_skip = false, resume_skip = false)
       # welcome player to game
       clear_screen
       print_logo
 
       # main menu loop until new game or exit
-      if new_game
+      if new_skip
         play_intro_tune
         print_splash_message
         print_fortune
+      elsif resume_skip
+        result = resume_game
+        if result.nil?
+          run_main_menu
+        elsif
+          self.world = result
+          self.evaluator = Evaluator.new(self.world)
+        end
       else
         run_main_menu
       end