gemwarrior 0.10.8 → 0.11.0

data/lib/gemwarrior/game.rb

@@ -5,12 +5,14 @@ require 'colorize'
 require 'matrext'
 
 require_relative 'misc/animation'
-require_relative 'misc/music'
-require_relative 'world'
+require_relative 'misc/audio'
+require_relative 'misc/formatting'
 require_relative 'evaluator'
-require_relative 'repl'
-require_relative 'inventory'
+require_relative 'game_assets'
 require_relative 'game_options'
+require_relative 'inventory'
+require_relative 'repl'
+require_relative 'world'
 
 module Gemwarrior
   class Game
@@ -20,8 +22,11 @@ module Gemwarrior
     ROX_DEFAULT                   = 0
     ROX_DEBUG                     = 300
 
-    attr_accessor :world, :evaluator, :repl,
-                  :monsters, :items
+    attr_accessor :world,
+                  :evaluator,
+                  :repl,
+                  :monsters,
+                  :weapons
 
     def initialize(options)
       # set game options
@@ -33,9 +38,14 @@ module Gemwarrior
       GameOptions.add 'sound_volume', options.fetch(:sound_volume)
       GameOptions.add 'use_wordnik', options.fetch(:use_wordnik)
 
-      # add classes for monsters and items to game
+      # add classes for creatures, monsters, people, items, weapons, and armor to game
+      # also add them to the global GameAssets
+      init_creatures
       init_monsters
+      init_people
       init_items
+      init_weapons
+      init_armor
 
       # create new world based on default template
       self.world               = init_world
@@ -47,7 +57,7 @@ module Gemwarrior
       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 }
       world.emerald_beaten     = false
 
@@ -59,7 +69,7 @@ module Gemwarrior
       self.repl       = Repl.new(self, world, evaluator)
 
       # enter Jool!
-      repl.start('look', options.fetch(:extra_command),  options.fetch(:new_skip), options.fetch(:resume_skip))
+      repl.start('look', options.fetch(:extra_command), options.fetch(:new_skip), options.fetch(:resume_skip))
     end
 
     def update_options_file
@@ -73,33 +83,55 @@ module Gemwarrior
 
     private
 
+    # convert an entity filename to a class so it can be added to game asset singleton registry
+    def file_to_class(filename)
+      filename_to_string = Formatting.upstyle(filename.split('/').last.split('.')[0], no_space: true)
+      Gemwarrior.const_get(filename_to_string).new
+    end
+
+    def init_creatures
+      Dir.glob(File.expand_path('../entities/creatures/*.rb', __FILE__)).each do |creature|
+        require_relative creature
+        GameCreatures.add(file_to_class(creature))
+      end
+    end
+
     def init_monsters
-      Dir.glob(File.expand_path('../entities/monsters/*.rb', __FILE__)).each do |item|
-        require_relative item
+      Dir.glob(File.expand_path('../entities/monsters/*.rb', __FILE__)).each do |monster|
+        require_relative monster
+        GameMonsters.add(file_to_class(monster))
       end
-      Dir.glob(File.expand_path('../entities/monsters/bosses/*.rb', __FILE__)).each do |item|
-        require_relative item
+      Dir.glob(File.expand_path('../entities/monsters/bosses/*.rb', __FILE__)).each do |boss|
+        require_relative boss
+        GameMonsters.add(file_to_class(boss))
       end
+    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
-      ]
+    def init_people
+      Dir.glob(File.expand_path('../entities/people/*.rb', __FILE__)).each do |person|
+        require_relative person
+        GamePeople.add(file_to_class(person))
+      end
     end
 
     def init_items
       Dir.glob(File.expand_path('../entities/items/*.rb', __FILE__)).each do |item|
         require_relative item
+        GameItems.add(file_to_class(item))
+      end
+    end
+
+    def init_weapons
+      Dir.glob(File.expand_path('../entities/weapons/*.rb', __FILE__)).each do |weapon|
+        require_relative weapon
+        GameWeapons.add(file_to_class(weapon))
+      end
+    end
+
+    def init_armor
+      Dir.glob(File.expand_path('../entities/armor/*.rb', __FILE__)).each do |armor|
+        require_relative armor
+        GameArmor.add(file_to_class(armor))
       end
     end
 
@@ -109,7 +141,7 @@ module Gemwarrior
       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)
+            return YAML.load(f)
           end
         else
           puts "Error: cannot load #{GameOptions.data['default_world_path_yaml']}."
@@ -117,7 +149,7 @@ module Gemwarrior
       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)
+            return Marshal.load(f)
           end
         else
           puts "Error: cannot load #{GameOptions.data['default_world_path_bin']}."

data/lib/gemwarrior/game_assets.rb

@@ -0,0 +1,76 @@
+# lib/gemwarrior/game_assets.rb
+# Gem Warrior Global Assets
+## Game Armor
+## Game Creatures
+## Game Items
+## Game Monsters
+## Game People
+## Game Weapons
+
+module Gemwarrior
+  module GameArmor
+    def self.add obj
+      @@data ||= []
+      @@data.push(obj)
+    end
+
+    def self.data
+      @@data ||= []
+    end
+  end
+
+  module GameCreatures
+    def self.add obj
+      @@data ||= []
+      @@data.push(obj)
+    end
+
+    def self.data
+      @@data ||= []
+    end
+  end
+
+  module GameItems
+    def self.add obj
+      @@data ||= []
+      @@data.push(obj)
+    end
+
+    def self.data
+      @@data ||= []
+    end
+  end
+
+  module GameMonsters
+    def self.add obj
+      @@data ||= []
+      @@data.push(obj)
+    end
+
+    def self.data
+      @@data ||= []
+    end
+  end
+
+  module GamePeople
+    def self.add obj
+      @@data ||= []
+      @@data.push(obj)
+    end
+
+    def self.data
+      @@data ||= []
+    end
+  end
+
+  module GameWeapons
+    def self.add obj
+      @@data ||= []
+      @@data.push(obj)
+    end
+
+    def self.data
+      @@data ||= []
+    end
+  end
+end

data/lib/gemwarrior/inventory.rb

@@ -6,59 +6,84 @@ require_relative 'game_options'
 module Gemwarrior
   class Inventory
     # CONSTANTS
-    ERROR_ITEM_REMOVE_INVALID     = 'Your inventory does not contain that item, so you cannot drop it.'
-    ERROR_ITEM_ADD_UNTAKEABLE     = 'That would be great if you could take that thing, wouldn\'t it? Well, it\'s not so great for you right now.'
-    ERROR_ITEM_ADD_INVALID        = 'That item does not exist here.'
-    ERROR_ITEM_EQUIP_INVALID      = 'You do not possess anything called that to equip.'
-    ERROR_ITEM_EQUIP_NONWEAPON    = 'That cannot be equipped as a weapon.'
-    ERROR_ITEM_UNEQUIP_INVALID    = 'You do not possess anything called that to unequip.'
-    ERROR_ITEM_UNEQUIP_NONWEAPON  = 'That cannot be unequipped.'
-
-    attr_accessor :items, :weapon
-
-    def initialize(items = [], weapon = nil)
-      self.items = items
+    ERROR_ITEM_REMOVE_INVALID       = 'Your inventory does not contain that item, so you cannot drop it.'
+    ERROR_ITEM_ADD_UNTAKEABLE       = 'That would be great if you could take that, wouldn\'t it? Huh!'
+    ERROR_ITEM_ADD_INVALID          = 'That item cannot be added.'
+    ERROR_ITEM_DESCRIBE_INVALID     = 'That does not seem to be in the inventory.'
+    ERROR_ITEM_EQUIP_INVALID        = 'You do not possess anything called that to equip.'
+    ERROR_ITEM_EQUIP_NONARMAMENT    = 'That item cannot be equipped.'
+    ERROR_ITEM_UNEQUIP_INVALID      = 'You do not possess anything called that to unequip.'
+    ERROR_ITEM_UNEQUIP_NONARMAMENT  = 'That item cannot be unequipped.'
+
+    attr_accessor :items,
+                  :weapon,
+                  :armor
+
+    def initialize(items = [], weapon = nil, armor = nil)
+      self.items  = items
       self.weapon = weapon
+      self.armor  = armor
+    end
+
+    def is_empty?
+      self.items.nil? || self.items.empty?
     end
 
     def list_contents
-      if items.nil? || items.empty?
-        return '[empty]'
-      else
-        return "#{items.map(&:name).join ', '}"
-      end
+      is_empty? ? '[empty]' : "#{self.items.map(&:name).join(', ')}"
     end
 
     def contains_item?(item_name)
-      items.map(&:name).include?(item_name)
+      self.items.map{ |i| i.name.downcase }.include?(item_name.downcase)
+    end
+
+    def contains_battle_item?
+      battle_item_found = false
+      self.items.each do |i|
+        battle_item_found = true if i.useable_battle
+      end
+      battle_item_found
+    end
+
+    def list_battle_items
+      battle_items = []
+      self.items.each do |i|
+        battle_items.push(i) if i.useable_battle
+      end
+      battle_items
     end
 
     def describe_item(item_name)
       if contains_item?(item_name)
-        items.each do |i|
+        self.items.each do |i|
           if i.name.eql?(item_name)
             if GameOptions.data['debug_mode']
-              return i.describe
+              return i.describe_detailed
             else
-              return i.description
+              return i.describe
             end
           end
         end
       else
-        return false
+        ERROR_ITEM_DESCRIBE_INVALID
       end
     end
 
     def equip_item(item_name)
       if contains_item?(item_name)
-        items.each do |i|
+        self.items.each do |i|
           if i.name.eql?(item_name)
             if i.equippable
               i.equipped = true
-              self.weapon = i
-              return "The #{i.name} has taken charge, and been equipped."
+              if i.is_weapon
+                self.weapon = i
+                return "The #{i.name} has taken charge, and been equipped."
+              elsif i.is_armor
+                self.armor = i
+                return "The #{i.name} has fortified, and has been equipped."
+              end
             else
-              return ERROR_ITEM_EQUIP_NONWEAPON
+              return ERROR_ITEM_EQUIP_NONARMAMENT
             end
           end
         end
@@ -69,14 +94,19 @@ module Gemwarrior
 
     def unequip_item(item_name)
       if contains_item?(item_name)
-        items.each do |i|
+        self.items.each do |i|
           if i.name.eql?(item_name)
             if i.equippable
               i.equipped = false
-              self.weapon = nil
-              return "The #{i.name} has been demoted to unequipped."
+              if i.is_weapon
+                self.weapon = nil
+                return "The #{i.name} has been demoted to unequipped."
+              elsif i.is_armor
+                self.armor = nil
+                return "The #{i.name} has been demoted to unequipped."
+              end
             else
-              return ERROR_ITEM_UNEQUIP_NONWEAPON
+              return ERROR_ITEM_UNEQUIP_NONARMAMENT
             end
           end
         end
@@ -85,27 +115,31 @@ module Gemwarrior
       end
     end
 
-    def add_item(cur_loc, item_name, player)
-      cur_loc.items.each do |i|
-        if i.name.eql?(item_name)
-          if i.takeable
-            items.push(i)
-            cur_loc.remove_item(item_name)
+    def add_item(item_name, cur_loc = nil, player = nil)
+      if cur_loc.nil?
+        self.items.push(item_name)
+      else
+        cur_loc.items.each do |i|
+          if i.name.eql?(item_name)
+            if i.takeable
+              self.items.push(i)
+              cur_loc.remove_item(item_name)
 
-            # stats
-            player.items_taken += 1
+              # stats
+              player.items_taken += 1
 
-            return "Added #{item_name} to your increasing collection of bits of tid."
-          else
-            return ERROR_ITEM_ADD_UNTAKEABLE
+              return "Added #{item_name} to your increasing collection of bits of tid.".colorize(:green)
+            else
+              return ERROR_ITEM_ADD_UNTAKEABLE.colorize(:red)
+            end
           end
         end
       end
-      ERROR_ITEM_ADD_INVALID
+      ERROR_ITEM_ADD_INVALID.colorize(:red)
     end
 
     def remove_item(item_name)
-      items.delete_at(items.map(&:name).index(item_name) || items.length)
+      self.items.delete_at(self.items.map(&:name).index(item_name) || self.items.length)
       unless self.weapon.nil?
         self.weapon = nil if self.weapon.name.eql?(item_name)
       end

data/lib/gemwarrior/misc/animation.rb

@@ -1,25 +1,29 @@
 # lib/gemwarrior/misc/animation.rb
-# Animation routine
+# Animation routine using matrext
 
 module Gemwarrior
   module Animation
     def self.run(opts)
       options = {
-        oneline:  false, 
-        speed:    nil, 
-        alpha:    true, 
-        numeric:  true, 
-        random:   true
+        oneline:    false, 
+        speed:      nil, 
+        alpha:      true, 
+        numeric:    true, 
+        random:     true,
+        color:      nil,
+        background: nil
       }.merge(opts)
 
       th = Thread.new do
-        print Matrext::process({
-          phrase:   options.fetch(:phrase),
-          oneline:  options.fetch(:oneline),
-          speed:    options.fetch(:speed),
-          alpha:    options.fetch(:alpha),
-          numeric:  options.fetch(:numeric),
-          random:   options.fetch(:random)
+        print Matrext.process({
+          phrase:     options.fetch(:phrase),
+          oneline:    options.fetch(:oneline),
+          speed:      options.fetch(:speed),
+          alpha:      options.fetch(:alpha),
+          numeric:    options.fetch(:numeric),
+          random:     options.fetch(:random),
+          color:      options.fetch(:color),
+          background: options.fetch(:background)
         })
       end