gemwarrior 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b862fec430a2b06e6ebf4a31417d5d1d7385680f
-  data.tar.gz: 21140db445e0c8be1583517093e3e14de1f2d207
+  metadata.gz: 4adb293d5ef28ea948ddefa890aba39e892b1f67
+  data.tar.gz: abb4df914fa5da5d2300d434d9a5b3c823099f75
 SHA512:
-  metadata.gz: c921683ca5e738231745561b35a7be1a60b27e4ba583c1298550d58439f313a1a31dfdc3130240c88215beab4013f1ea02dfa60719aad8235b7fd8e4cff9ecaa
-  data.tar.gz: dcd3e22b9bd714bb235a24e1b37f7f5f5fd673f429d8e8d38b05ca6fe2b5a0a316783c34aa997bbedf4b368b0eb3e1663cfbabb2d1ace2a5662ce85f09d42ba1
+  metadata.gz: 4af0a454c2928b69af31098408600aafcbe20690db64ec49085bac65d494627daab325b5d4fb393a5d7c96f9c31fe98f63a783e02a97ddb0b74ec5b0cbd1070d
+  data.tar.gz: ce558c2829a12c6b1bc5ebd3de146ab8f1e9348bf4c4e2bc7c1e042bfd14d239f420f30b45386ede65e1e5eaa6a2054964b424f23a2b5c996592d383b181c15b

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 *.gct
 /img/
+/assets/

data/data/locations.yml

@@ -435,7 +435,7 @@
 
 -
   name:                 'Cave (Causeway)'
-  description:          'Paths lead north and west, but nothing of interest is in this causeway.'
+  description:          'Paths lead north and west as a dank, musty smell permeates your sinuses.'
   danger_level:         :moderate
   coords:
     x: 8
@@ -449,6 +449,8 @@
   monster_level_range:
     lo: 2
     hi: 3
+  items:
+  - Map
 -
   name:                 'Forest (Southeast)'
   description:          'Trees exist here, in droves.'

data/lib/gemwarrior/battle.rb

@@ -225,7 +225,18 @@ module Gemwarrior
       puts "You have defeated #{monster.name}!\n".colorize(:green)
       if monster.is_boss
         if monster.name.eql?("Emerald")
+          Music::cue([
+            {:freq_or_note => 'G3', :duration => 50},
+            {:freq_or_note => 'A3', :duration => 50},
+            {:freq_or_note => 'B3', :duration => 50},
+            {:freq_or_note => 'C4', :duration => 50},
+            {:freq_or_note => 'D4', :duration => 50},
+            {:freq_or_note => 'E4', :duration => 50},
+            {:freq_or_note => 'F#4', :duration => 50},
+            {:freq_or_note => 'G4', :duration => 50}
+          ])
           puts monster.defeated_text
+          gets
           exit(0)
         else
           puts 'You just beat a boss monster. Way to go!'

data/lib/gemwarrior/entities/item.rb

@@ -16,5 +16,15 @@ module Gemwarrior
     def use(inventory = nil)
       'That item does not do anything...yet.'
     end
+    
+    def describe
+      status_text =  name.upcase.colorize(:green)
+      status_text << "\n#{description} \n".colorize(:white)
+      status_text << "ATTACK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)} ".colorize(:white) unless atk_lo.nil?
+      status_text << "TAKEABLE? #{takeable} ".colorize(:white)
+      status_text << "USEABLE? #{useable} ".colorize(:white)
+      status_text << "EQUIPPABLE? #{equippable} ".colorize(:white)
+      status_text << "\n"
+    end
   end
 end

data/lib/gemwarrior/entities/items/map.rb

@@ -0,0 +1,25 @@
+# lib/gemwarrior/entities/items/map.rb
+# Item::Map
+
+require_relative '../item'
+
+module Gemwarrior
+  class Map < Item
+    def initialize
+      self.name         = 'map'
+      self.description  = 'The land of Jool is contained on this piece of canvas, in a useful, if not very detailed, manner.'
+      self.atk_lo       = nil
+      self.atk_hi       = nil
+      self.takeable     = true
+      self.useable      = true
+      self.equippable   = false
+      self.equipped     = false
+    end
+    
+    def use(player = nil)
+      puts 'You unfold the piece of worn canvas, and study the markings upon it.'
+      
+      {:type => 'action', :data => 'map'}
+    end
+  end
+end

data/lib/gemwarrior/entities/location.rb

@@ -29,15 +29,23 @@ module Gemwarrior
     end
     
     def status(debug_mode = false)
-      status_text =  name.ljust(26).upcase.colorize(:green)
+      status_text =  name.ljust(30).upcase.colorize(:green)
       status_text << coords.values.to_a.to_s.colorize(:white)
       status_text << " DL[#{danger_level.to_s.ljust(8)}] ".colorize(:white) if debug_mode
       status_text << " MLR[#{monster_level_range.to_s.ljust(6)}] ".colorize(:white) if debug_mode
-      status_text << " #{description}\n".colorize(:white)
+      status_text << "\n#{description}\n".colorize(:white)
     end
     
     def has_item?(item_name)
-      items.map(&:name).include?(item_name)
+      items.map{|i| i.name.downcase}.include?(item_name)
+    end
+    
+    def has_monster?(monster_name)
+      monsters_abounding.map{|m| m.name.downcase}.include?(monster_name)
+    end
+    
+    def has_boss?(boss_name)
+      bosses_abounding.map{|b| b.name.downcase}.include?(boss_name)
     end
     
     def add_item(item_name)
@@ -89,7 +97,7 @@ module Gemwarrior
       checked_for_monsters
     end
     
-    def has_monster?
+    def should_spawn_monster?
       found = false
       unless danger_level.eql?(:none)
         max = DANGER_LEVEL[danger_level]
@@ -146,7 +154,7 @@ module Gemwarrior
     end
     
     def populate_monsters(monsters_available, spawn = false)
-      if has_monster? || spawn
+      if should_spawn_monster? || spawn
         self.checked_for_monsters = true unless spawn
         self.monsters_abounding = [] unless spawn
         random_monster = nil

data/lib/gemwarrior/entities/monster.rb

@@ -19,7 +19,13 @@ module Gemwarrior
     end
     
     def describe
-      status_text =  name.upcase.ljust(26).colorize(:green)
+      status_text =  name.upcase.ljust(13).colorize(:green)
+      status_text << "#{description}\n".colorize(:white)
+      if is_boss
+        status_text << '(BOSS)'.ljust(13).colorize(:yellow)
+      else
+        status_text << ''.ljust(13)
+      end
       status_text << "LEVEL: #{level.to_s.rjust(2)}, ".colorize(:white)
       status_text << "HP: #{hp_cur.to_s.rjust(3)}/#{hp_max.to_s.rjust(3)} ".colorize(:white)
       status_text << "ATK: #{atk_lo.to_s.rjust(2)}-#{atk_hi.to_s.rjust(2)} ".colorize(:white)
@@ -27,9 +33,10 @@ module Gemwarrior
       status_text << "DEX: #{dexterity.to_s.rjust(2)} ".colorize(:white)
       status_text << "ROX: #{rox.to_s.rjust(3)} ".colorize(:white)
       status_text << "XP: #{xp.to_s.rjust(3)} ".colorize(:white)
-      status_text << "FACE: #{face.ljust(12)} ".colorize(:white)
-      status_text << "HANDS: #{hands.ljust(12)} ".colorize(:white)
-      status_text << "MOOD: #{mood.ljust(12)}".colorize(:white)
+      status_text << "\n".ljust(14)
+      status_text << "FACE: #{face} ".colorize(:white)
+      status_text << "HANDS: #{hands} ".colorize(:white)
+      status_text << "MOOD: #{mood} ".colorize(:white)
       status_text << "INV: #{inventory.list_contents}".colorize(:white)
       status_text << "\n"
     end

data/lib/gemwarrior/entities/player.rb

@@ -216,7 +216,9 @@ module Gemwarrior
       Animation::run({:oneline => false, :phrase => "* #{direction_text} *"})
       if sound
         Music::cue([
-          {:freq_or_note => 'C3,E3'}
+          {:freq_or_note => 'C3', :duration => 75},
+          {:freq_or_note => 'D3', :duration => 75},
+          {:freq_or_note => 'E3', :duration => 75}
         ])
       end
     end

data/lib/gemwarrior/evaluator.rb

@@ -65,7 +65,7 @@ module Gemwarrior
       
       self.commands = %w(character inventory rest look take use drop equip unequip go attack change help quit quit!)
       self.aliases = %w(c i r l t u d e ue g a ch h q qq)
-      self.extras = %w(exit exit! x x)
+      self.extras = %w(exit exit! x x fight f)
       self.cmd_descriptions = [
         'Display character information',
         'Look in your inventory',
@@ -111,13 +111,13 @@ module Gemwarrior
         when 'beast', 'bs'
           return world.player.beast_mode = !world.player.beast_mode
         when 'vars', 'v'
-          world.print_all_vars
+          world.print_vars
         when 'list', 'ls'
           if param1.nil?
             puts ERROR_LIST_PARAM_MISSING
             return DEBUG_LIST_PARAMS
           else
-            return world.list(param1)
+            return world.list(param1, param2)
           end
         when 'map', 'm'
           world.print_map
@@ -307,8 +307,11 @@ module Gemwarrior
               world.player.heal_damage(result[:data])
               return
             when 'action'
-              if result[:data].eql?('rest')
+              case result[:data]
+              when 'rest'
                 world.player.rest(world)
+              when 'map'
+                world.print_map
               end
             when 'arena'
               arena = Arena.new({:world => world, :player => world.player})
@@ -354,7 +357,7 @@ module Gemwarrior
             ERROR_GO_PARAM_INVALID
           end
         end
-      when 'attack', 'a'
+      when 'attack', 'a', 'fight', 'f'
         if param1.nil?
           ERROR_ATTACK_PARAM_MISSING
         else

data/lib/gemwarrior/misc/music.rb

@@ -7,12 +7,12 @@ module Gemwarrior
       defaults = {
         :freq_or_note => 440, 
         :waveform     => 'saw', 
-        :volume       => 0.5, 
+        :volume       => 0.3, 
         :duration     => 500,
         :notext       => true
       }
 
-      th = Thread.new do
+      Thread.start {
         sequence.each do |note|
           note_to_play  = note[:freq_or_note]
           waveform      = note[:waveform].nil? ? defaults[:waveform] : note[:waveform]
@@ -28,9 +28,7 @@ module Gemwarrior
             :notext       => notext
           })
         end
-      end
-      
-      return th.join
+      }
     end
   end
 end

data/lib/gemwarrior/repl.rb

@@ -18,8 +18,8 @@ module Gemwarrior
     attr_accessor :world, :eval
     
     def initialize(world, evaluator)
-      self.world = world
-      self.eval = evaluator
+      self.world  = world
+      self.eval   = evaluator
     end
 
     def start(initialCommand = nil)
@@ -42,27 +42,23 @@ module Gemwarrior
     private
     
     def clear_screen
-      if OS.windows?
-        system('cls')
-      else
-        system('clear')
-      end
+      OS.windows? ? system('cls') : system('clear')
     end
     
     def print_logo
-      puts "/-+-+-+ +-+-+-+-+-+-+-\\".colorize(:yellow)
-      puts '|G|E|M| |W|A|R|R|I|O|R|'.colorize(:yellow)
-      puts "\\-+-+-+ +-+-+-+-+-+-+-/".colorize(:yellow)
-      
       if world.sound
         Music::cue([
           {:freq_or_note => 'A3,E4,C#5,F#5', :duration => 1000}
         ])
       end
+
+      puts "/-+-+-+ +-+-+-+-+-+-+-\\".colorize(:yellow)
+      puts '|G|E|M| |W|A|R|R|I|O|R|'.colorize(:yellow)
+      puts "\\-+-+-+ +-+-+-+-+-+-+-/".colorize(:yellow)
+      puts '[[[[[[[DEBUGGING]]]]]]]'.colorize(:white) if world.debug_mode
     end
     
     def print_splash_message
-      print_logo
       SPLASH_MESSAGE.length.times do print '=' end
       puts
       puts SPLASH_MESSAGE
@@ -88,9 +84,10 @@ module Gemwarrior
     def setup_screen(initialCommand = nil)
       # welcome player to game
       clear_screen
+      print_logo
       print_splash_message
       print_fortune
-      print_help
+      print_help unless world.debug_mode
 
       # hook to do something right off the bat
       puts eval.evaluate(initialCommand) unless initialCommand.nil?
@@ -98,6 +95,9 @@ module Gemwarrior
     
     def prompt
       prompt_template = "\n[LV:%3s][XP:%3s][ROX:%3s] -- [HP:%3s/%-3s][STM:%2s/%-2s] -- [%s @ %s]"
+      if world.debug_mode
+        prompt_template += "[%s, %s, %s]"
+      end
       prompt_vars_arr = [
         world.player.level,
         world.player.xp,
@@ -109,11 +109,15 @@ module Gemwarrior
         world.player.name,
         world.location_by_coords(world.player.cur_coords).name
       ]
+      if world.debug_mode
+        prompt_vars_arr.push(world.player.cur_coords[:x], world.player.cur_coords[:y], world.player.cur_coords[:z])
+      end
       puts (prompt_template % prompt_vars_arr).colorize(:yellow)
     end
     
     def read_line
-      Readline.readline(' GW> ', true).to_s
+      prompt_text = world.debug_mode ? ' GW[D]> ' : ' GW> '
+      Readline.readline(prompt_text, true).to_s
     end
   end
 end

data/lib/gemwarrior/version.rb

@@ -2,5 +2,5 @@
 # Version of Gem Warrior
 
 module Gemwarrior
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/lib/gemwarrior/world.rb

@@ -25,7 +25,7 @@ module Gemwarrior
       self.player     = nil
     end
 
-    def print_all_vars
+    def print_vars
       puts "======================\n"
       puts "All Variables in World\n"
       puts "======================\n"
@@ -64,6 +64,14 @@ module Gemwarrior
       0.upto(WORLD_DIM_WIDTH-1) do |count_x|
         print "#{count_x}  "
       end
+      if debug_mode
+        puts
+        puts
+        puts "Current level: #{player.cur_coords[:z]}"
+        puts '| | = invalid location'
+        puts '|X| = valid location'
+        puts '|O| = player'
+      end
       return
     end
 
@@ -73,10 +81,9 @@ module Gemwarrior
         puts '[PLAYERS]'
         player.check_self(false)
       when 'monsters'
-        puts "[MONSTERS](#{monsters.length})"
+        puts "[MONSTERS](#{monsters.length})".colorize(:yellow)
         if details
-          monsters.map { |m| print m.describe unless m.is_boss}
-          monsters.map { |m| print m.describe if m.is_boss }
+          monsters.map { |m| print m.describe }
           return
         else
           monster_text =  ">> monsters: #{monsters.map(&:name).join(', ')}"
@@ -88,10 +95,10 @@ module Gemwarrior
             item_count = item_count + 1
           end
         end
-        puts "[ITEMS](#{item_count})"
+        puts "[ITEMS](#{item_count})".colorize(:yellow)
         if details
           locations.each do |l|
-            l.items.map { |i| print i.status }
+            l.items.map { |i| print i.describe }
           end
           return
         else
@@ -102,7 +109,7 @@ module Gemwarrior
           ">> #{item_list.sort.join(', ')}"
         end
       when 'locations'
-        puts "[LOCATIONS](#{locations.length})"
+        puts "[LOCATIONS](#{locations.length})".colorize(:yellow)
         if details
           locations.map { |l| print l.status(self.debug_mode) }
           return
@@ -159,18 +166,18 @@ module Gemwarrior
     end
     
     def describe_entity(point, entity_name)
-      if point.list_items.map{|i| i.downcase}.include?(entity_name)
+      if point.has_item?(entity_name)
         point.items.each do |i|
           if i.name.downcase.eql?(entity_name.downcase)
             if debug_mode
-              return i.status
+              return i.describe
             else
               return i.description
             end
           end
         end
       elsif
-        if point.list_monsters.map{|m| m.downcase}.include?(entity_name)
+        if point.has_monster?(entity_name)
           point.monsters_abounding.each do |m|
             if m.name.downcase.eql?(entity_name.downcase)
               if debug_mode
@@ -182,7 +189,7 @@ module Gemwarrior
           end
         end
       elsif
-        if point.list_bosses.map{|b| b.downcase}.include?(entity_name)
+        if point.has_boss?(entity_name)
           point.bosses_abounding.each do |b|
             if b.name.downcase.eql?(entity_name.downcase)
               if debug_mode

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -208,6 +208,7 @@ files:
 - lib/gemwarrior/entities/items/herb.rb
 - lib/gemwarrior/entities/items/keystone.rb
 - lib/gemwarrior/entities/items/ladder.rb
+- lib/gemwarrior/entities/items/map.rb
 - lib/gemwarrior/entities/items/massive_door.rb
 - lib/gemwarrior/entities/items/opalaser.rb
 - lib/gemwarrior/entities/items/pond.rb