gemwarrior 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f15ef7178e1ba920af4c6a4b55e3bfd4ec456a1
-  data.tar.gz: 5e533c6e248818015471b9d26f559eeb35b9d83a
+  metadata.gz: 237a4374aad8afccab2b19c7ba07355cf2ff7a6d
+  data.tar.gz: 6f64794688e51689323fe53a820c387d87622102
 SHA512:
-  metadata.gz: c5e88f32f6af852e0a2dd514d333d0adede046d26861073bc00de99b1bab73db4a3e1f6dc9034b137092479cb603ff3486a61e6564f287d4462311343160129e
-  data.tar.gz: 34b1ed6da0c662c20df89666cc97f7eef156e727659df86c5ddd8bc0b800bc6d7d1b0e6028043bdb2f31a508733d3547035711773d31c9ba595c37bc0ab888b1
+  metadata.gz: 12e7864b02068273f8e4a264ff053f5b3ad31c335578ba9d5d6634766524ae306a1b0a992b95d0d341db0b38a23be06b6b10d34248c31f2920f181ca0e3bfdfe
+  data.tar.gz: d558dd3c63779c500c7b82e9ccbd639b45e87613f99bf9b26b3b9a47b7637a935e9d6b926ae3b9ddde370dd1f4a0ee8a10f4215d9a320a37c1b30f3c2051abff

data/lib/gemwarrior/battle.rb

@@ -75,9 +75,9 @@ module Gemwarrior
         if world.debug_mode || player.special_abilities.include?(:rocking_vision)
           print "#{monster.hp_cur.to_s.rjust(3)}"
         else
-          print "???"
+          print '???'
         end
-        print " HP"
+        print ' HP'
         if world.debug_mode
           print " (LVL: #{monster.level})"
         end
@@ -117,7 +117,7 @@ module Gemwarrior
               return
             end
           else
-            puts "You miss entirely!".colorize(:yellow)
+            puts 'You miss entirely!'.colorize(:yellow)
           end
         when 'defend', 'd'
           puts 'You dig in and defend this round.'
@@ -129,7 +129,7 @@ module Gemwarrior
           print " (#{monster.hp_cur}/#{monster.hp_max} HP): #{monster.description}\n"
           puts "It has some distinguishing features, too: face is #{monster.face}, hands are #{monster.hands}, and general mood is #{monster.mood}."
           if world.debug_mode
-            puts "If defeated, will receive:"
+            puts 'If defeated, will receive:'
             puts " >> XP   : #{monster.xp}"
             puts " >> ROX  : #{monster.rox}"
             puts " >> ITEMS: #{monster.inventory.list_contents}"
@@ -142,7 +142,7 @@ module Gemwarrior
             print_escape_text
             return 'escaped'
           else
-            puts "You were not able to run away! :-(".colorize(:yellow)
+            puts 'You were not able to run away! :-('.colorize(:yellow)
           end
         else
           puts ERROR_ATTACK_OPTION_INVALID
@@ -192,7 +192,7 @@ module Gemwarrior
       if entity.eql?(monster)
         who_gets_wounded = "> You wound #{monster.name} for "
       else
-        who_gets_wounded = "> You are wounded for "
+        who_gets_wounded = '> You are wounded for '
       end
 
       print who_gets_wounded
@@ -241,7 +241,7 @@ module Gemwarrior
 
       if monster.is_boss
         # end game boss!
-        if monster.name.eql?("Emerald")
+        if monster.name.eql?('Emerald')
           Music::cue([
             {:freq_or_note => 'G3', :duration => 50},
             {:freq_or_note => 'A3', :duration => 50},
@@ -310,7 +310,7 @@ module Gemwarrior
     # STATUS TEXT
 
     def print_escape_text
-      Animation::run({ :phrase => "** POOF **", :oneline => true })
+      Animation::run({ :phrase => '** POOF **', :oneline => true })
     end
 
     def print_battle_line

data/lib/gemwarrior/entities/boss.rb

@@ -8,7 +8,7 @@ module Gemwarrior
     attr_reader :win_text
 
     def win_text
-      win_text =  'You beat #{name}! You win! '
+      win_text =  "You beat #{name}! You win!"
       win_text << 'You become the true Gem Warrior, marry Queen Ruby, and have many fine, sparkling children. '
       win_text << 'Thank you for playing. Goodbye.'
       puts win_text

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

@@ -45,23 +45,23 @@ module Gemwarrior
       puts
       Animation::run({phrase: "  Dear #{player.name},", speed: :insane})
       puts
-      Animation::run({phrase: "    Oh, my! Jool is in trouble! The evil wizard/sorceror/conjuror/rocksmith/wily ", speed: :insane})
+      Animation::run({phrase: '    Oh, my! Jool is in trouble! The evil wizard/sorceror/conjuror/rocksmith/wily ', speed: :insane})
       Animation::run({phrase: "    Emerald has absconded with our ShinyThing(tm)! It is vital that you, #{player.name}, ", speed: :insane})
-      Animation::run({phrase: "    go to his tower in the sky in order to retrieve it before he does something", speed: :insane})
-      Animation::run({phrase: "    terrible with it!", speed: :insane})
+      Animation::run({phrase: '    go to his tower in the sky in order to retrieve it before he does something', speed: :insane})
+      Animation::run({phrase: '    terrible with it!', speed: :insane})
       puts
-      Animation::run({phrase: "    Remember that one time you came to the castle, trying to sell stones you", speed: :insane})
-      Animation::run({phrase: "    pilfered from a nearby cave? Remember how I laughed and told you to leave", speed: :insane})
-      Animation::run({phrase: "    at once or I\'d have the royal guard take your head off? Ha!", speed: :insane})
+      Animation::run({phrase: '    Remember that one time you came to the castle, trying to sell stones you', speed: :insane})
+      Animation::run({phrase: '    pilfered from a nearby cave? Remember how I laughed and told you to leave', speed: :insane})
+      Animation::run({phrase: '    at once or I\'d have the royal guard take your head off? Ha!', speed: :insane})
       puts
-      Animation::run({phrase: "    What a fool I was to cast such a special person out, as a mysterious stranger", speed: :insane})
+      Animation::run({phrase: '    What a fool I was to cast such a special person out, as a mysterious stranger', speed: :insane})
       Animation::run({phrase: "    in the night told me, before mysteriously disappearing, that you, #{player.name},", speed: :insane})
-      Animation::run({phrase: "    are actually the only one who can save us (for some reason, but that's", speed: :insane})
-      Animation::run({phrase: "    mysterious strangers for you, right?)!", speed: :insane})
+      Animation::run({phrase: '    are actually the only one who can save us (for some reason, but that\'s', speed: :insane})
+      Animation::run({phrase: '    mysterious strangers for you, right?)!', speed: :insane})
       puts
-      Animation::run({phrase: "    Please, I beg of you, save Jool from the potential terror that Emerald could", speed: :insane})
+      Animation::run({phrase: '    Please, I beg of you, save Jool from the potential terror that Emerald could', speed: :insane})
       Animation::run({phrase: "    possibly wreak on all of us before it is too late! If you do, you, #{player.name},", speed: :insane})
-      Animation::run({phrase: "    will be rewarded handsomely!", speed: :insane})
+      Animation::run({phrase: '    will be rewarded handsomely!', speed: :insane})
       puts
       Animation::run({phrase: '  Sincerely,', speed: :insane});
       Animation::run({phrase: '  Queen Ruby', speed: :insane});

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

@@ -45,9 +45,9 @@ module Gemwarrior
       puts '>>"What are you in need of?"'
 
       loop do
-        puts " 1 - Herb"
-        puts " 2 - Dagger"
-        puts " x - leave"
+        puts ' 1 - Herb'
+        puts ' 2 - Dagger'
+        puts ' x - leave'
       
         choice = gets.chomp!
       

data/lib/gemwarrior/entities/monsters/bosses/emerald.rb

@@ -35,13 +35,13 @@ module Gemwarrior
     def defeated_text
       text =  "<^><^><^><^><^><^><^><^><^><^>\n"
       text <<  "You beat #{name}! You win!\n"
-      text << "You receive the "
-      text << "SparklyThing(tm)".colorize(:magenta)
-      text << " and become the true "
-      text << "Gem Warrior".colorize(:yellow)
+      text << 'You receive the '
+      text << 'SparklyThing(tm)'.colorize(:magenta)
+      text << ' and become the true '
+      text << 'Gem Warrior'.colorize(:yellow)
       text << "!\n"
-      text << "You decide to ignore "
-      text << "Queen Ruby".colorize(:red)
+      text << 'You decide to ignore '
+      text << 'Queen Ruby'.colorize(:red)
       text << " and take your spoils back home\n"
       text << "where you live out the rest of your days staring at it, wondering\n"
       text << "what it was all about.\n\n"

data/lib/gemwarrior/entities/player.rb

@@ -15,7 +15,7 @@ module Gemwarrior
 
     attr_accessor :stam_cur, :stam_max, :cur_coords, 
                   :god_mode, :beast_mode, :use_wordnik, :special_abilities,
-                  :monsters_killed, :items_taken, :movements_made, :rests_taken
+                  :monsters_killed, :items_taken, :movements_made, :rests_taken, :deaths
 
     def initialize(options)
       self.name               = generate_name
@@ -52,6 +52,7 @@ module Gemwarrior
       self.items_taken        = 0
       self.movements_made     = 0
       self.rests_taken        = 0
+      self.deaths             = 0
     end
 
     def check_self(debug_mode = false, show_pic = true)
@@ -124,9 +125,9 @@ module Gemwarrior
       minutes = rand(1..59)
       seconds = rand(1..59)
 
-      hours_text = hours == 1 ? "hour" : "hours"
-      mins_text = minutes == 1 ? "minute" : "minutes"
-      secs_text = seconds == 1 ? "second" : "seconds"
+      hours_text = hours == 1 ? 'hour' : 'hours'
+      mins_text = minutes == 1 ? 'minute' : 'minutes'
+      secs_text = seconds == 1 ? 'second' : 'seconds'
 
       Animation::run({:phrase => '** Zzzzz **'})
 
@@ -147,7 +148,7 @@ module Gemwarrior
     end
 
     def modify_name
-      print "Enter new name: "
+      print 'Enter new name: '
 
       new_name = gets.chomp!
 
@@ -309,7 +310,7 @@ module Gemwarrior
 
     # CHARACTER
     def print_char_pic
-      char_pic = ""
+      char_pic = ''
       char_pic << "************\n"
       char_pic << "*    ()    *\n"
       char_pic << "*  \\-||-/  *\n"

data/lib/gemwarrior/evaluator.rb

@@ -89,7 +89,7 @@ module Gemwarrior
     def evaluate(input)
       case input
       # Ctrl-D or empty command
-      when nil, ""
+      when nil, ''
         return
       # real command
       else
@@ -519,6 +519,7 @@ module Gemwarrior
       end
       world.player.cur_coords = world.location_coords_by_name('Home')
       world.describe(world.location_by_coords(world.player.cur_coords))
+      world.player.deaths += 1
     end
 
     def print_separator
@@ -535,7 +536,7 @@ module Gemwarrior
       print_separator
 
       if world.debug_mode
-        puts " DEBUG COMMANDS"
+        puts ' DEBUG COMMANDS'
         print_separator
         i = 0
         devcommands.each do |cmd|

data/lib/gemwarrior/repl.rb

@@ -45,7 +45,7 @@ module Gemwarrior
           begin
             input = read_line
             result = eval.evaluate(input)
-            if result.eql?("exit")
+            if result.eql?('exit')
               exit
             else
               puts result
@@ -72,9 +72,9 @@ module Gemwarrior
         ])
       end
 
-      puts "/-+-+-+ +-+-+-+-+-+-+-\\".colorize(:yellow)
+      puts '/-+-+-+ +-+-+-+-+-+-+-\\'.colorize(:yellow)
       puts '|G|E|M| |W|A|R|R|I|O|R|'.colorize(:yellow)
-      puts "\\-+-+-+ +-+-+-+-+-+-+-/".colorize(:yellow)
+      puts '\\-+-+-+ +-+-+-+-+-+-+-/'.colorize(:yellow)
       puts '[[[[[[[DEBUGGING]]]]]]]'.colorize(:white) if world.debug_mode
     end
 
@@ -112,6 +112,7 @@ module Gemwarrior
     end
     
     def print_main_menu
+      puts "      GW v#{Gemwarrior::VERSION}"
       puts '======================='
       puts ' (N)ew Game'
       puts ' (A)bout'
@@ -166,7 +167,7 @@ module Gemwarrior
     def display_log
       if File.exists?(get_log_file_path)
         File.open(get_log_file_path).readlines.each do |line|
-          puts line
+          print "#{line}"
         end
       else
         puts 'No attempts made yet!'
@@ -185,12 +186,14 @@ module Gemwarrior
       print "traveled #{pl.movements_made.to_s.colorize(:color => :white, :background => :black)} time(s)"
       print "\n".ljust(8)
       print "rested #{pl.rests_taken.to_s.colorize(:color => :white, :background => :black)} time(s)"
+      print "\n".ljust(8)
+      print "died #{pl.deaths.to_s.colorize(:color => :white, :background => :black)} time(s)"
       print "\n"
       puts '######################################################################'
       
       # log stats to file in home directory
       File.open(get_log_file_path, 'a') do |f|
-        f.write "#{Time.now} #{pl.name.rjust(10)} - LV:#{pl.level} XP:#{pl.xp} $:#{pl.rox} KIL:#{pl.monsters_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken}\n"
+        f.write "#{Time.now} #{pl.name.rjust(10)} - LV:#{pl.level} XP:#{pl.xp} $:#{pl.rox} KIL:#{pl.monsters_killed} ITM:#{pl.items_taken} MOV:#{pl.movements_made} RST:#{pl.rests_taken} DTH:#{pl.deaths}\n"
       end
     end
 

data/lib/gemwarrior/version.rb

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

data/lib/gemwarrior/world.rb

@@ -29,10 +29,10 @@ module Gemwarrior
       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"
+      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)
@@ -144,7 +144,7 @@ module Gemwarrior
     end
 
     def describe(point)
-      desc_text = ""
+      desc_text = ''
       desc_text << "[ #{point.name} ]".colorize(:green)
 
       if debug_mode
@@ -282,23 +282,23 @@ module Gemwarrior
 
       location_data.each {|l|
         locations.push(Location.new({
-          :name                 => l["name"],
-          :description          => l["description"],
-          :danger_level         => l["danger_level"],
-          :monster_level_range  => l["monster_level_range"].nil? ? nil : l["monster_level_range"]["lo"]..l["monster_level_range"]["hi"],
+          :name                 => l['name'],
+          :description          => l['description'],
+          :danger_level         => l['danger_level'],
+          :monster_level_range  => l['monster_level_range'].nil? ? nil : l['monster_level_range']['lo']..l['monster_level_range']['hi'],
           :coords               => {
-                                    :x => l["coords"]["x"], 
-                                    :y => l["coords"]["y"],
-                                    :z => l["coords"]["z"]
+                                    :x => l['coords']['x'], 
+                                    :y => l['coords']['y'],
+                                    :z => l['coords']['z']
                                    },
           :locs_connected       => {
-                                    :north => l["locs_connected"]["north"], 
-                                    :east => l["locs_connected"]["east"], 
-                                    :south => l["locs_connected"]["south"], 
-                                    :west => l["locs_connected"]["west"]
+                                    :north => l['locs_connected']['north'], 
+                                    :east => l['locs_connected']['east'], 
+                                    :south => l['locs_connected']['south'], 
+                                    :west => l['locs_connected']['west']
                                    },
-          :items                => create_item_objects(l["items"]),
-          :bosses_abounding     => create_boss_objects(l["bosses_abounding"])
+          :items                => create_item_objects(l['items']),
+          :bosses_abounding     => create_boss_objects(l['bosses_abounding'])
         }))
       }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemwarrior
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -294,4 +294,6 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RubyGem text adventure
-test_files: []
+test_files:
+- spec/rubywarrior_spec.rb
+- spec/spec_helper.rb