gemwarrior 0.10.8 → 0.11.0

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -2,6 +2,7 @@
 # World where the locations, monsters, items, etc. exist
 
 require_relative 'game_options'
+require_relative 'game_assets'
 require_relative 'inventory'
 require_relative 'entities/item'
 require_relative 'entities/items/herb'
@@ -16,138 +17,19 @@ module Gemwarrior
     WORLD_DIM_WIDTH               = 10
     WORLD_DIM_HEIGHT              = 10
 
-    attr_accessor :monsters, :locations, :player, :duration, :emerald_beaten
-
-    def print_vars
-      puts "======================\n"
-      puts "All Variables in World\n"
-      puts "======================\n"
-      puts "#{list('players', true)}\n"
-      puts "#{list('monsters', true)}\n\n"
-      puts "#{list('items', true)}\n\n"
-      puts "#{list('locations', true)}\n"
-    end
-
-    def print_map(floor)
-      0.upto(WORLD_DIM_HEIGHT - 1) do |count_y|
-        print '  '
-        0.upto(WORLD_DIM_WIDTH - 1) do
-          print '---'
-        end
-        print "\n"
-        print "#{(WORLD_DIM_HEIGHT - 1) - count_y} "
-        0.upto(WORLD_DIM_WIDTH - 1) do |count_x|
-          cur_map_coords = {
-            x: count_x,
-            y: (WORLD_DIM_HEIGHT - 1) - count_y,
-            z: floor.nil? ? self.player.cur_coords[:z] : floor.to_i
-          }
-          if self.player.cur_coords.eql?(cur_map_coords)
-            print '|O|'
-          elsif location_by_coords(cur_map_coords)
-            print '|X|'
-          else
-            print '| |'
-          end
-        end
-        print "\n"
-      end
-      print '  '
-      0.upto(WORLD_DIM_WIDTH - 1) do
-        print '---'
-      end
-      puts
-      print '   '
-      0.upto(WORLD_DIM_WIDTH - 1) do |count_x|
-        print "#{count_x}  "
-      end
-      if GameOptions.data['debug_mode']
-        puts
-        puts
-        puts "Current level: #{player.cur_coords[:z]}"
-        puts '| | = invalid location'
-        puts '|X| = valid location'
-        puts '|O| = player'
-      end
-      return
-    end
-
-    def list(param, details = false)
-      case param
-      when 'players'
-        puts '[PLAYERS]'
-        player.check_self(false)
-      when 'monsters'
-        puts "[MONSTERS](#{monsters.length})".colorize(:yellow)
-        if details
-          monsters.map { |m| print m.describe }
-          return
-        else
-          ">> monsters: #{monsters.map(&:name).join(', ')}"
-        end
-      when 'items'
-        item_count = 0
-        locations.each do |l|
-          l.items.each do
-            item_count += 1
-          end
-        end
-        puts "[ITEMS](#{item_count})".colorize(:yellow)
-        if details
-          locations.each do |l|
-            l.items.map { |i| print i.describe }
-          end
-          return
-        else
-          item_list = []
-          locations.each do |l|
-            l.items.map { |i| item_list << i.name }
-          end
-          ">> #{item_list.sort.join(', ')}"
-        end
-      when 'locations'
-        puts "[LOCATIONS](#{locations.length})".colorize(:yellow)
-        if details
-          locations.map { |l| print l.status }
-          return
-        else
-          ">> #{locations.map(&:name).join(', ')}"
-        end
-      else
-        ERROR_LIST_PARAM_INVALID
-      end
-    end
-
-    def location_by_coords(coords)
-      locations.each do |l|
-        if l.coords.eql?(coords)
-          return l
-        end
-      end
-      return nil
-    end
-
-    def location_coords_by_name(name)
-      locations.each do |l|
-        if l.name.downcase.eql?(name.downcase)
-          return l.coords
-        end
-      end
-      return nil
-    end
+    attr_accessor :monsters, :locations, :weapons, :player, :duration, :emerald_beaten
 
     def describe(point)
-      desc_text = ''
-      desc_text << "[>>> #{point.name.upcase} <<<]".colorize(:cyan)
+      desc_text = "[>>> #{point.name_display.upcase} <<<]".colorize(:cyan)
 
       if GameOptions.data['debug_mode']
         desc_text << " DL[#{point.danger_level.to_s}] MLR[#{point.monster_level_range.to_s}]".colorize(:yellow)
       end
 
       desc_text << "\n"
-      desc_text << point.description.colorize(:green)
+      desc_text << point.description
 
-      point.populate_monsters(self.monsters) unless point.checked_for_monsters?
+      point.populate_monsters(GameMonsters.data) unless point.checked_for_monsters?
 
       desc_text << "\n >> Monster(s):  #{point.list_monsters.join(', ')}".colorize(:yellow) unless point.list_monsters.empty?
       desc_text << "\n >> Boss(es):    #{point.list_bosses.join(', ')}".colorize(:red) unless point.list_bosses.empty?
@@ -159,19 +41,19 @@ module Gemwarrior
         desc_text << point.list_actionable_words.colorize(color: :white, background: :grey)
       end
 
-      return desc_text
+      desc_text
     end
 
     def describe_entity(point, entity_name)
       entity_name.downcase!
 
-      if point.has_item?(entity_name)
+      if point.contains_item?(entity_name)
         point.items.each do |i|
           if i.name.downcase.eql?(entity_name)
             if GameOptions.data['debug_mode']
-              return i.describe
+              return i.describe_detailed
             else
-              return i.description
+              return i.describe
             end
           end
         end
@@ -179,9 +61,9 @@ module Gemwarrior
         point.monsters_abounding.each do |m|
           if m.name.downcase.eql?(entity_name)
             if GameOptions.data['debug_mode']
-              return m.describe
+              return m.describe_detailed
             else
-              return m.description
+              return m.describe
             end
           end
         end
@@ -189,9 +71,9 @@ module Gemwarrior
         point.bosses_abounding.each do |b|
           if b.name.downcase.eql?(entity_name)
             if GameOptions.data['debug_mode']
-              return b.describe
+              return b.describe_detailed
             else
-              return b.description
+              return b.describe
             end
           end
         end
@@ -202,6 +84,30 @@ module Gemwarrior
       end
     end
 
+    def location_by_coords(coords)
+      locations.each do |l|
+        return l if l.coords.eql?(coords)
+      end
+      nil
+    end
+
+    def location_coords_by_name(name)
+      locations.each do |l|
+        if l.name.downcase.eql?(name.downcase) or l.name_display.downcase.eql?(name.downcase)
+          return l.coords
+        end
+      end
+      nil
+    end
+
+    def location_by_name(location_name)
+      loc = locations[locations.map(&:name).index(location_name)]
+      if loc.nil?
+        loc = locations[locations.map(&:name_display).index(location_name)]
+      end
+      loc.nil? ? nil : loc
+    end
+
     def can_move?(direction)
       location_by_coords(player.cur_coords).has_loc_to_the?(direction)
     end
@@ -210,12 +116,127 @@ module Gemwarrior
       possible_combatants = location_by_coords(player.cur_coords).monsters_abounding.map(&:name) | location_by_coords(player.cur_coords).bosses_abounding.map(&:name)
 
       possible_combatants.each do |combatant|
-        if combatant.downcase.eql?(monster_name.downcase)
-          return true
+        return true if combatant.downcase.eql?(monster_name.downcase)
+      end
+      false
+    end
+
+    def list(param, details = false)
+      case param
+      when 'players'
+        puts '[PLAYERS]'.colorize(:yellow)
+        if details
+          player.check_self(false)
+        else
+          ">> players: #{player.name}"
+        end
+      when 'creatures'
+        puts "[CREATURES](#{GameCreatures.data.length})".colorize(:yellow)
+        if details
+          GameCreatures.data.map { |c| print c.describe_detailed }
+          return
+        else
+          ">> creatures: #{GameCreatures.data.map(&:name).join(', ')}"
         end
+      when 'items'
+        puts "[ITEMS](#{GameItems.data.length})".colorize(:yellow)
+        if details
+          GameItems.data.map { |i| print i.describe_detailed }
+          return
+        else
+          ">> items: #{GameItems.data.map(&:name).join(', ')}"
+        end
+      when 'locations'
+        puts "[LOCATIONS](#{locations.length})".colorize(:yellow)
+        if details
+          locations.map { |l| print l.describe_detailed }
+          return
+        else
+          ">> locations: #{locations.map(&:name).join(', ')}"
+        end
+      when 'monsters'
+        puts "[MONSTERS](#{GameMonsters.data.length})".colorize(:yellow)
+        if details
+          GameMonsters.data.map { |m| print m.describe_detailed }
+          return
+        else
+          ">> monsters: #{GameMonsters.data.map(&:name).join(', ')}"
+        end
+      when 'people'
+        puts "[PEOPLE](#{GamePeople.data.length})".colorize(:yellow)
+        if details
+          GamePeople.data.map { |p| print p.describe_detailed }
+          return
+        else
+          ">> people: #{GamePeople.data.map(&:name).join(', ')}"
+        end
+      when 'weapons'
+        puts "[WEAPONS](#{GameWeapons.data.length})".colorize(:yellow)
+        if details
+          GameWeapons.data.map { |w| print w.describe_detailed }
+          return
+        else
+          ">> weapons: #{GameWeapons.data.map(&:name).join(', ')}"
+        end
+      else
+        ERROR_LIST_PARAM_INVALID
       end
+    end
 
-      return false
+    def print_vars(show_details = false)
+      puts "======================\n"
+      puts "All Variables in World\n"
+      puts "======================\n"
+      puts "#{list('players', show_details)}\n\n"
+      puts "#{list('creatures', show_details)}\n\n"
+      puts "#{list('monsters', show_details)}\n\n"
+      puts "#{list('items', show_details)}\n\n"
+      puts "#{list('weapons', show_details)}\n\n"
+      puts "#{list('locations', show_details)}\n"
+      puts
+    end
+
+    def print_map(floor)
+      0.upto(WORLD_DIM_HEIGHT - 1) do |count_y|
+        print '  '
+        0.upto(WORLD_DIM_WIDTH - 1) do
+          print '---'
+        end
+        print "\n"
+        print "#{(WORLD_DIM_HEIGHT - 1) - count_y} "
+        0.upto(WORLD_DIM_WIDTH - 1) do |count_x|
+          cur_map_coords = {
+            x: count_x,
+            y: (WORLD_DIM_HEIGHT - 1) - count_y,
+            z: floor.nil? ? self.player.cur_coords[:z] : floor.to_i
+          }
+          if self.player.cur_coords.eql?(cur_map_coords)
+            print '|O|'
+          elsif location_by_coords(cur_map_coords)
+            print '|X|'
+          else
+            print '| |'
+          end
+        end
+        print "\n"
+      end
+      print '  '
+      0.upto(WORLD_DIM_WIDTH - 1) do
+        print '---'
+      end
+      puts
+      print '   '
+      0.upto(WORLD_DIM_WIDTH - 1) do |count_x|
+        print "#{count_x}  "
+      end
+      if GameOptions.data['debug_mode']
+        puts
+        puts
+        puts "Current level: #{player.cur_coords[:z]}"
+        puts '| | = invalid location'
+        puts '|X| = valid location'
+        puts '|O| = player'
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.11.0
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.4.10
 - !ruby/object:Gem::Dependency
   name: clocker
   requirement: !ruby/object:Gem::Requirement
@@ -274,50 +274,41 @@ files:
 - gemwarrior.gemspec
 - lib/gemwarrior/arena.rb
 - lib/gemwarrior/battle.rb
+- lib/gemwarrior/entities/armor.rb
+- lib/gemwarrior/entities/armor/iron_helmet.rb
 - lib/gemwarrior/entities/creature.rb
+- lib/gemwarrior/entities/creatures/cow.rb
+- lib/gemwarrior/entities/creatures/goat.rb
+- lib/gemwarrior/entities/creatures/pig.rb
 - lib/gemwarrior/entities/entity.rb
 - lib/gemwarrior/entities/item.rb
 - lib/gemwarrior/entities/items/apple.rb
 - lib/gemwarrior/entities/items/arena_door.rb
-- lib/gemwarrior/entities/items/arena_master.rb
 - lib/gemwarrior/entities/items/bed.rb
+- lib/gemwarrior/entities/items/bookcase.rb
+- lib/gemwarrior/entities/items/bullet.rb
 - lib/gemwarrior/entities/items/couch.rb
-- lib/gemwarrior/entities/items/cow.rb
 - lib/gemwarrior/entities/items/cup.rb
-- lib/gemwarrior/entities/items/dagger.rb
 - lib/gemwarrior/entities/items/dehumidifier.rb
-- lib/gemwarrior/entities/items/drunk_man.rb
 - lib/gemwarrior/entities/items/feather.rb
 - lib/gemwarrior/entities/items/floor_tile.rb
 - lib/gemwarrior/entities/items/flower.rb
-- lib/gemwarrior/entities/items/goat.rb
-- lib/gemwarrior/entities/items/gun.rb
 - lib/gemwarrior/entities/items/herb.rb
 - lib/gemwarrior/entities/items/keystone.rb
 - lib/gemwarrior/entities/items/ladder.rb
 - lib/gemwarrior/entities/items/letter.rb
-- lib/gemwarrior/entities/items/mace.rb
 - lib/gemwarrior/entities/items/map.rb
 - lib/gemwarrior/entities/items/massive_door.rb
-- lib/gemwarrior/entities/items/opalaser.rb
 - lib/gemwarrior/entities/items/pedestal.rb
-- lib/gemwarrior/entities/items/pig.rb
 - lib/gemwarrior/entities/items/pond.rb
-- lib/gemwarrior/entities/items/queen_ruby.rb
 - lib/gemwarrior/entities/items/rope.rb
-- lib/gemwarrior/entities/items/shifty_woman.rb
 - lib/gemwarrior/entities/items/small_hole.rb
 - lib/gemwarrior/entities/items/snowman.rb
 - lib/gemwarrior/entities/items/sparkly_thing.rb
-- lib/gemwarrior/entities/items/spear.rb
-- lib/gemwarrior/entities/items/stalactite.rb
-- lib/gemwarrior/entities/items/stone.rb
 - lib/gemwarrior/entities/items/stonemite.rb
 - lib/gemwarrior/entities/items/tent.rb
-- lib/gemwarrior/entities/items/thin_man.rb
 - lib/gemwarrior/entities/items/throne.rb
 - lib/gemwarrior/entities/items/tree.rb
-- lib/gemwarrior/entities/items/ware_hawker.rb
 - lib/gemwarrior/entities/items/waterfall.rb
 - lib/gemwarrior/entities/location.rb
 - lib/gemwarrior/entities/monster.rb
@@ -329,18 +320,37 @@ files:
 - lib/gemwarrior/entities/monsters/bloodstorm.rb
 - lib/gemwarrior/entities/monsters/bosses/emerald.rb
 - lib/gemwarrior/entities/monsters/bosses/garynetty.rb
+- lib/gemwarrior/entities/monsters/bosses/jaspern.rb
 - lib/gemwarrior/entities/monsters/citrinaga.rb
 - lib/gemwarrior/entities/monsters/coraliz.rb
 - lib/gemwarrior/entities/monsters/cubicat.rb
 - lib/gemwarrior/entities/monsters/diaman.rb
+- lib/gemwarrior/entities/people/arena_master.rb
+- lib/gemwarrior/entities/people/drunk_man.rb
+- lib/gemwarrior/entities/people/queen_ruby.rb
+- lib/gemwarrior/entities/people/rockney.rb
+- lib/gemwarrior/entities/people/shifty_woman.rb
+- lib/gemwarrior/entities/people/thin_man.rb
+- lib/gemwarrior/entities/people/ware_hawker.rb
+- lib/gemwarrior/entities/person.rb
 - lib/gemwarrior/entities/player.rb
+- lib/gemwarrior/entities/weapon.rb
+- lib/gemwarrior/entities/weapons/dagger.rb
+- lib/gemwarrior/entities/weapons/gun.rb
+- lib/gemwarrior/entities/weapons/mace.rb
+- lib/gemwarrior/entities/weapons/opalaser.rb
+- lib/gemwarrior/entities/weapons/spear.rb
+- lib/gemwarrior/entities/weapons/stalactite.rb
+- lib/gemwarrior/entities/weapons/stone.rb
 - lib/gemwarrior/evaluator.rb
 - lib/gemwarrior/game.rb
+- lib/gemwarrior/game_assets.rb
 - lib/gemwarrior/game_options.rb
 - lib/gemwarrior/inventory.rb
 - lib/gemwarrior/misc/animation.rb
+- lib/gemwarrior/misc/audio.rb
+- lib/gemwarrior/misc/audio_cues.rb
 - lib/gemwarrior/misc/formatting.rb
-- lib/gemwarrior/misc/music.rb
 - lib/gemwarrior/misc/musical_notes.rb
 - lib/gemwarrior/misc/name_generator.rb
 - lib/gemwarrior/misc/player_levels.rb
@@ -375,4 +385,6 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files: []
+test_files:
+- spec/gemwarrior_spec.rb
+- spec/spec_helper.rb