destiny 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2495d4b0effe8a244327c9b09c6c0aec2f613e36
-  data.tar.gz: c8b5259d2475af0a3f21d2fa3921971111a98467
+  metadata.gz: 71528913273e887206aa8b6c88d484b3665c5886
+  data.tar.gz: b4fc818bc75a7fc1b5fef413d9e806c260d054b2
 SHA512:
-  metadata.gz: 96cff8084be0603aff5066b8fbd1c01430961f634be55d83745a141c3f955eb717e4300bce641b98b746ae9dd0a63dfd19900c108c1e78bf1614138e8c318096
-  data.tar.gz: 351e328f3821e4265f4b9031f665ede5b88a6675a3790ee36a750eaa247ff27d70d7eafc16b764251a3526307dfb679f75c5a7b1db5586e2bf5d54ea445ddb2b
+  metadata.gz: 44afd297308dafc321fb6cd8caf1d13ace7e254eb3af10ebe6baf793ab69e0da59a84e4ac61dbc7316fac2757c97cbe34cb4a7ae99c082402607d6401d3f14ed
+  data.tar.gz: 421c2281bcc2d434a8cc6fc27ad0d79f7395d01ed373139f89573045b0c6c758bc3bf9832c91b14a1c6560738307b960c2ce5209becf02d3610e5b25103eb404

data/bin/destiny

@@ -7,12 +7,12 @@ require 'destiny'
 puts # formatting
 puts " " + "_"*53
 puts "|" + " "*53 + "|"
-puts "|      Welcome to the exciting world of Destiny!      |"
+puts "|      " + "Welcome to the exciting world of Destiny!".yellow + "      |"
 puts "|" + " "*53 + "|"
 puts " " + "-"*53
 puts # formatting
 puts # formatting
-puts "Selectable options will normally be enclosed in []'s."
+puts "Selectable options will normally be enclosed in " + "[]".yellow + "'s."
 puts # formatting
 if File.exists?('../lib/save_game.json')
   puts "Would you like to start a new game?"

data/lib/choice.rb

@@ -0,0 +1,38 @@
+require 'colorize'
+
+class Choice
+  attr_reader :choices
+
+  def initialize msg, choices
+    @msg = msg
+    @choices = choices
+  end
+
+  def prompt
+    put_prompt_msg
+    get_prompt_resp
+  end
+
+  def to_s
+    @choices
+  end
+
+  def add(command, msg)
+    @choices[command] = msg
+  end
+
+  private
+  def put_prompt_msg
+    p = []
+    p << @msg
+    @choices.each do |key, description|
+      p << "[#{key}] ".yellow +  description
+    end
+    puts "#{p.join("\n")}\n"
+  end
+
+  def get_prompt_resp
+    gets.chomp
+  end
+
+end

data/lib/destiny.rb

@@ -2,6 +2,7 @@ require "json"
 require "game_mechanics"
 require "mobs"
 require "places"
+require "choice"
 
 include GameMechanics
 
@@ -37,12 +38,14 @@ class GameSelect
         puts # formatting
         puts "_"*50
         puts "Starting a new game, please answer the following questions:"
-        puts "Whould you like to play as a knight, wizard, cleric, or rogue?"
-        puts "[1]. Knight"
-        puts "[2]. Wizard"
-        puts "[3]. Cleric"
-        puts "[4]. Rogue"
-        prompt; class_choice = gets.chomp
+        c = Choice.new "Whould you like to play as a knight, wizard, cleric, or rogue?",
+          {
+            "1" => "Knight",
+            "2" => "Wizard",
+            "3" => "Cleric",
+            "4" => "Rogue"
+          }
+          class_choice = c.prompt
       end while not (class_choice == "1" or class_choice == "2" or class_choice == "3" or class_choice == "4")
       begin
         player_name = choose_name
@@ -78,16 +81,16 @@ class GameSelect
       @player = load_data
     end
   end
-  
+
 end
 
 class NewGame
   # Not using this right now. Later, I hope to support multiple characters and then
   # I will move the newgame stuff into here. Need a save file with multiple lines support first
   attr_accessor :save_slot, :char_name
-  
+
   def initialize new_game
     @new_game = new_game
   end
-  
+
 end

data/lib/dungeon_map.rb

@@ -0,0 +1,49 @@
+require 'edge_coloring_graph'
+require 'choice'
+
+DoorNames = {
+  :w => 'wooden door',
+  :i => 'iron door',
+  :c => 'crack in the wall',
+  :r => 'rusty door'
+}
+
+class DungeonMap
+  def initialize map
+    @map = map
+  end
+
+  def door_to current_location, command
+    doors = doors_at current_location
+    if doors[command.to_sym]
+      return doors[command.to_sym]
+    else
+      return current_location
+    end
+  end
+
+  def choices location
+    doors = doors_at location
+    door_choices = {}
+    doors.keys.each do |command|
+      door_choices[command.to_sym] = "Go through the #{DoorNames[command]}."
+    end
+    Choice.new 'Where will you go next?', door_choices
+  end
+
+  def doors_at location
+    doors = {}
+    @map[location].each_with_index do |door, next_room|
+      doors[door.to_sym] = next_room if door != ' '
+    end
+    doors
+  end
+
+  def to_s
+    rows = []
+    @map.each_with_index do |row, i|
+      rows << "#{i}|#{row.join '|'}"
+    end
+    rows.join "\n"
+  end
+end

data/lib/edge_coloring_graph.rb

@@ -0,0 +1,10 @@
+
+class EdgeColoringGraph
+  def initialize map
+    @edges = map
+  end
+
+  def edge(x, y)
+    @edges[x][y]
+  end
+end

data/lib/game_mechanics.rb

@@ -1,11 +1,11 @@
 module GameMechanics
-  
+
   @@save_file = '../lib/save_game.json'
-  
+
   def prompt
     print ">> "
   end
-  
+
   def yes_no
     #restrict input to valid answers, but don't worry about case
     begin
@@ -13,7 +13,7 @@ module GameMechanics
       prompt; @yes_no = STDIN.gets.chomp.downcase
     end while not (@yes_no == "yes" or @yes_no == "no")
   end
-  
+
   def save_data
     # increase level as player gets more xp!
     case
@@ -31,6 +31,12 @@ module GameMechanics
       @player.lvl = 6
     when (15001..19000).include?(@player.xp)
       @player.lvl = 7
+    when (19001..24000).include?(@player.xp)
+      @player.lvl = 8
+    when (24001..29000).include?(@player.xp)
+      @player.lvl = 9
+    when @player.xp > 29000
+      @player.lvl = 10
     end
     save_info = {
       role:       @player.class,
@@ -48,7 +54,7 @@ module GameMechanics
       f.write(save_info.to_json)
     end
   end
-  
+
   def load_data
     load_info = JSON.parse(File.read(@@save_file))
     role = load_info['role']
@@ -63,7 +69,7 @@ module GameMechanics
     end
     # Set stats based off information in load_info
     @player.lvl        = load_info['lvl']
-    @player.xp         = load_info['xp']   
+    @player.xp         = load_info['xp']
     @player.coin       = load_info['coin']
     @player.name       = load_info['name']
     @player.cur_hp     = load_info['cur_hp']
@@ -79,7 +85,7 @@ module GameMechanics
     # I was trying to do the above assignments with iteration, there has to be a way!
 #    load_info.each do |attribute, value|
 #      @player.#{attribute} = value unless attribute == "role"
-#    end  
+#    end
   end
 
   def restore_player
@@ -90,31 +96,40 @@ module GameMechanics
   end
 
   def bar_top
-    "_"*27 + " STATS " + "_"*27
+    "_"*27 + " " + "STATS" + " " + "_"*27
   end
-  
+
   def stat_bar name, xp, lvl, coin, cur_hp, cur_mana
-    "  Name: #{name} | XP: #{xp} | Lvl: #{lvl} | Coin: #{coin} | HP: #{cur_hp} | Mana: #{cur_mana}"
+    "  Name: " + "#{name}" + " | XP: #{xp} | Lvl: #{lvl} | Coin: #{coin} | HP: #{cur_hp} | Mana: #{cur_mana}"
   end
-  
+
   def bar_low
     "-"*61
   end
-  
+
   def is_even?(x)
     x % 2 == 0 ? true : false
   end
-  
+
   def player_croaks
     puts # formatting
+    if @player.class.to_s == "Wizard" and @player.spell_buff == true
+      puts "A single tear falls from Draco as he fades away..."
+      puts #formatting
+      @player.spell_buff = false
+    end
     puts "It happens to the best of us #{@player.name}."
     puts "Fortunately for you, the game of Destiny never ends."
     puts "The game will exit now and you can restart in town."
     puts # formatting
     puts "Better luck next time, eh?"
+    @player.buff_food = false
+    @player.buff_drink = false
+    @player.cur_hp = @player.hp/2
+    save_data
     exit
   end
-  
+
   def combat bad_guy
     # create an opponent
     @bad_guy = bad_guy.new
@@ -129,14 +144,16 @@ module GameMechanics
         @heal = false
         puts # formatting
         puts bar_low + "--"
-        puts " #{@player.name} - HP: #{@player.cur_hp} - Mana: #{@player.cur_mana} | - VS - | #{@bad_guy.name} - HP: #{@bad_guy.cur_hp} - Mana: #{@bad_guy.cur_mana}"
+        puts " #{@player.name} - HP: #{@player.cur_hp} - Mana: #{@player.cur_mana} |".green + " - VS - " + "| #{@bad_guy.name} - HP: #{@bad_guy.cur_hp} - Mana: #{@bad_guy.cur_mana}".red
         puts bar_low + "--"
         puts # formatting
-        puts "#{@bad_guy.name} vs. #{@player.name}, what will you do?"
-        puts "[1]. Attack."
-        puts "[2]. Run."
-        puts "[3]. Cast Heal and Attack." if @player.class.to_s == "Cleric"
-        prompt; move = gets.chomp
+        choice_opts = {
+          "1" => "Attack.",
+          "2" => "Run."
+        }
+        choice_opts["3"] = "Cast Heal and Attack." if @player.class.to_s == "Cleric"
+        c = Choice.new "#{@bad_guy.name} vs. #{@player.name}, what will you do?", choice_opts
+        move = c.prompt
         move = "4" if move == "3" and @player.class.to_s != "Cleric"
       end while not (move == "1" or move == "2" or move == "3")
       @heal = true if move == "3" # set cleric heal flag to true
@@ -151,13 +168,13 @@ module GameMechanics
           @dmg_dlt = dice(@player.dmg) + dmg_mod
         elsif @player.class.to_s == "Wizard"
           begin
-            puts "How many magic darts will you shoot?"
-            puts "[1]." # always allow wizard one dart even without enough mana
-            puts "[2]." if @player.cur_mana - 2*@player.lvl >= 0
-            puts "[3]." if @player.cur_mana - 3*@player.lvl >= 0
-          prompt; darts = gets.chomp.to_i
-          darts = 4 if darts == 2 and @player.cur_mana - 2*@player.lvl < 0
-          darts = 4 if darts == 3 and @player.cur_mana - 3*@player.lvl < 0
+            choice_opts = { "1" => "one dart" }
+            choice_opts["2"] = "two darts"   if @player.cur_mana - 2*@player.lvl >= 0
+            choice_opts["3"] = "three darts" if @player.cur_mana - 3*@player.lvl >= 0
+            c = Choice.new "How many magic darts will you shoot?", choice_opts
+            darts = c.prompt.to_i
+            darts = 4 if darts == 2 and @player.cur_mana - 2*@player.lvl < 0
+            darts = 4 if darts == 3 and @player.cur_mana - 3*@player.lvl < 0
           end while not (darts == 1 or darts == 2 or darts == 3)
           puts # formatting
           puts "#{@player.name} conjures #{darts} magic dart that zips toward the #{@bad_guy.name}." if darts == 1
@@ -176,10 +193,10 @@ module GameMechanics
             end
             @heal_amount = dice(2)*@player.lvl + heal_bonus + 1 # testing with the +1, what I am going for here
                                                                 # is to balance the heal with their lower damage and hp
-            puts "Praying intently, you add #{@heal_amount} health points as you prepare to strike."
+            puts "Praying intently, you add " + "#{@heal_amount}".green + " health points as you prepare to strike."
+            @player.cur_hp = @player.cur_hp + @heal_amount
             puts "#{@player.name}, any health points above your normal maximum will fade after combat." if @player.cur_hp > @player.hp
             puts # formatting
-            @player.cur_hp = @player.cur_hp + @heal_amount
           end
           puts "#{@player.name} brings the holy mace thundering down upon #{@bad_guy.name}!"
           puts # formatting
@@ -201,7 +218,7 @@ module GameMechanics
           @dmg_dlt = @dmg_dlt - @bad_guy.armor/4
           @dmg_dlt = 0 if @dmg_dlt < 1
           puts #formatting
-          puts "You deal #{@dmg_dlt} damage to the #{@bad_guy.name}." unless @dmg_dlt < 1
+          puts "You deal " + "#{@dmg_dlt}".green + " damage to the #{@bad_guy.name}." unless @dmg_dlt < 1
           puts # formatting
           @bad_guy.cur_hp = @bad_guy.cur_hp - @dmg_dlt
         end
@@ -227,7 +244,7 @@ module GameMechanics
           else
             dmg_taken = dice(@bad_guy.dmg) - @player.armor/4
             if @player.class.to_s == "Wizard" and @player.spell_buff == true and dmg_taken > 1
-              draco_helps = @player.lvl
+              draco_helps = @player.lvl + @player.lvl/2 # Trying a bump in mitigation as Wizard is squishy!
               dmg_taken = dmg_taken - draco_helps
               puts "Draco helps shield you absorbing some of the potential damage."
               puts # formatting
@@ -235,7 +252,7 @@ module GameMechanics
             dmg_taken = 0 if dmg_taken < 1
             @player.cur_hp = @player.cur_hp - dmg_taken
             if dmg_taken > 0
-              puts "#{@bad_guy.name} hits YOU for #{dmg_taken} damage!"
+              puts "#{@bad_guy.name} hits YOU for " + "#{dmg_taken}".red + " damage!"
               puts "OUCH!"
             else
               puts "You deflect the blow and take no damage."
@@ -276,7 +293,7 @@ module GameMechanics
             dmg_taken = dice(@bad_guy.dmg) - @player.armor/4
             dmg_taken = 0 if dmg_taken < 1
             @player.cur_hp = @player.cur_hp - dmg_taken
-            puts "#{@bad_guy.name} hits YOU for #{dmg_taken} damage!" unless dmg_taken < 1
+            puts "#{@bad_guy.name} hits YOU for " + "#{dmg_taken}".red + " damage!" unless dmg_taken < 1
             puts "OUCH!" unless dmg_taken < 1
           end
           puts #formatting
@@ -292,14 +309,14 @@ module GameMechanics
           puts "Ah, the life of a rogue, so free, so evasive!"
           puts "#{@player.name}, using your roguish powers you slip away unseen, leaving"
           puts "#{@bad_guy.name} cursing and muttering in the dark."
-        end  
+        end
         save_data
         return
       end
     end
-    
+
   end
-  
+
   def dice(sides=6,&block)
     if block_given?
       block.call(rand(1..sides))
@@ -361,7 +378,7 @@ module GameMechanics
         player_croaks
       end
       save_data
-    end 
+    end
   end
-  
-end
+
+end

data/lib/mobs.rb

@@ -91,18 +91,28 @@ class GiantRat < Mobs
   def initialize(str=12, agi=10, int=4, dmg=5, armor=6, hp=8, cur_hp=8, dodge=5, mana=0, cur_mana=0, xp=150, lvl=1, coin=1, name="Giant Rat")
     rat_type = dice(10)
     case
-    when (1..8).include?(rat_type)
+    when (1..5).include?(rat_type)
       # no change, you just get the generic giant rat
-    when (9..10).include?(rat_type)
+    when (6..9).include?(rat_type)
       # this feller is much harder to defeat
-      str      = 16
-      dmg      = 8
+      str      = 14
+      dmg      = 6
       hp       = 10
       cur_hp   = 10
       dodge    = 10
-      xp       = 400
-      coin     = 3
+      xp       = 250
+      coin     = 2
       name     = "ROUS"
+    when rat_type == 10
+      # Giant rat mini boss!
+      str      = 16
+      dmg      = 8
+      hp       = 12
+      cur_hp   = 12
+      dodge    = 15
+      xp       = 400
+      coin     = 4
+      name     = "Nuck Chorris"
     end
     super(str,agi,int,dmg,armor,hp,cur_hp,dodge,mana,cur_mana,xp,lvl,coin,name)
   end
@@ -115,9 +125,9 @@ class Goblin < Mobs
     # Should probably create a method that does the below
     goblin_type = dice(10)
     case
-    when (1..6).include?(goblin_type)
+    when (1..5).include?(goblin_type)
       # no change, you just get the generic goblin
-    when (7..10).include?(goblin_type)
+    when (6..9).include?(goblin_type)
       # this feller is stronger, but less nimble
       str      = 16
       dmg      = 6
@@ -128,6 +138,16 @@ class Goblin < Mobs
       xp       = 200
       coin     = 2
       name     = "Goblin Warrior"
+    when goblin_type == 10
+      # Mini boss goblin!
+      str      = 16
+      dmg      = 8
+      armor    = 10
+      hp       = 10
+      cur_hp   = 10
+      xp       = 300
+      coin     = 3
+      name     = "Goblin Chief"
     end
     super(str,agi,int,dmg,armor,hp,cur_hp,dodge,mana,cur_mana,xp,lvl,coin,name)
   end
@@ -139,19 +159,28 @@ class Kobold < Mobs
   def initialize(str=12, agi=8, int=8, dmg=5, armor=5, hp=6, cur_hp=6, dodge=10, mana=2, cur_mana=2, xp=150, lvl=1, coin=2, name="Kobold")
     kobold_type = dice(10)
     case
-    when (1..6).include?(kobold_type)
+    when (1..5).include?(kobold_type)
       # no change, you just get the generic kobold
-    when (7..10).include?(kobold_type)
+    when (6..9).include?(kobold_type)
       # this one has double the chance to dodge as a regular kobold
       agi      = 16
       dmg      = 6
       armor    = 6
-      hp       = 8
-      cur_hp   = 8
       dodge    = 20
       xp       = 300
       coin     = 4
       name     = "Kobold Thief"
+    when kobold_type == 10
+      # kobold mini boss!
+      str      = 16
+      agi      = 12
+      dmg      = 8
+      armor    = 8
+      hp       = 10
+      cur_hp   = 10
+      xp       = 400
+      coin     = 5
+      name     = "Kobold Berserker"
     end
     super(str,agi,int,dmg,armor,hp,cur_hp,dodge,mana,cur_mana,xp,lvl,coin,name)
   end
@@ -163,9 +192,9 @@ class Skeleton < Mobs
   def initialize(str=12, agi=10, int=8, dmg=5, armor=6, hp=8, cur_hp=8, dodge=5, mana=0, cur_mana=0, xp=200, lvl=1, coin=3, name="Skeleton")
     skeleton_type = dice(10)
     case
-    when (1..7).include?(skeleton_type)
+    when (1..5).include?(skeleton_type)
       # no change, you just get the generic skeleton
-    when (8..10).include?(skeleton_type)
+    when (6..9).include?(skeleton_type)
       # this feller is considerably tougher
       str      = 16
       dmg      = 6
@@ -173,8 +202,20 @@ class Skeleton < Mobs
       hp       = 10
       cur_hp   = 10
       xp       = 300
-      coin     = 5
+      coin     = 3
       name     = "Skeletal Knight"
+    when skeleton_type == 10
+      # skeleton mini boss!
+      str      = 14
+      agi      = 14
+      dmg      = 8
+      armor    = 8
+      hp       = 10
+      cur_hp   = 10
+      dodge    = 10
+      xp       = 400
+      coin     = 5
+      name     = "Skeleton of Geoff"
     end
     super(str,agi,int,dmg,armor,hp,cur_hp,dodge,mana,cur_mana,xp,lvl,coin,name)
   end

data/lib/places.rb

@@ -1,8 +1,10 @@
 # This file will contain the various places the player can go
 # Town, Tavern, Dungeon and options in each
+require 'choice'
+require 'dungeon_map'
 
 class Town
-  
+
   def initialize
     # Town is only available as an option in the Dungeon (to return to)
     # initialize is only called the first time, so this greeting is only seen once
@@ -10,22 +12,24 @@ class Town
     puts "You walk into town, scanning each nook and cranny. Most faces are friendly,"
     puts "some are not..."
   end
-  
+
   def choices
     move = 0
     until move == "3"
       begin
         load_data
         puts # formatting
-        puts bar_top
+        puts bar_top.yellow
         puts stat_bar(@player.name, @player.xp, @player.lvl, @player.coin, @player.cur_hp, @player.cur_mana)
-        puts bar_low
+        puts bar_low.yellow
         puts # formatting
-        puts "Please choose where you will head next:"
-        puts "[1]. The Dungeon"
-        puts "[2]. Ye Old Tavern"
-        puts "[3]. Exit Game"
-        prompt; move = gets.chomp
+        c = Choice.new "Please choose where you will head next:",
+          {
+            "1" => "The Dungeon",
+            "2" => "Ye Old Tavern",
+            "3" => "Exit Game"
+          }
+        move = c.prompt
       end while not (move == "1" or move == "2" or move == "3")
       case
       when move == "1"
@@ -43,9 +47,30 @@ class Town
 end
 
 class Dungeon
-  
+  # a sample map
+  # a map is an edge array defining a graph. Edges have colorings.
+  # TODO: make a set of maps and define them elsewhere
+  #       write an algorithm to create good maps
+  #
+
   # can get here from town, initialize just gives a one time (per visit) message
   def initialize
+
+    map = <<-MAP
+  0 1 2 3 4 5 6 7 8 9
+0| | |r| | |w| |c| | |
+1| | | | |w|c| | | | |
+2|r| | |c| |i| | |w| |
+3| | |c| | | |i| | | |
+4| |w| | | | | | | | |
+5|w|c|i| | | | | | | |
+6| | | |i| | | |w| |r|
+7|c| | | | | |w| | |i|
+8| | |w| | | | | | |c|
+9| | | | | | |r|i|c| |
+  MAP
+    @map = map.split("\n")[1..map.length].map {|line| line.split('|')[1..map.length]}
+    @dungeon_map = DungeonMap.new @map
     puts # formatting
     rand_greet = dice(3)
     rand_greet = "You have entered the dungeon! DUM DUM DUM!!" if rand_greet == 1
@@ -53,25 +78,24 @@ class Dungeon
     rand_greet = "As you enter the dungeon, you notice strange markings along the walls..." if rand_greet == 3
     puts rand_greet
   end
-  
+
   def choices
     move = 0
     load_data
-    bread_crumb = 0 # helps track how deep you go into the dungeon
-    until move == "2" and bread_crumb == 0
-      begin
-        puts # formatting
-        puts bar_top
-        puts stat_bar(@player.name, @player.xp, @player.lvl, @player.coin, @player.cur_hp, @player.cur_mana)
-        puts bar_low
-        puts # formatting
-        puts "Now #{@player.name}, what will you do next?"
-        puts "[1]. Go deeper into the dungeon."
-        puts "[2]. Return to town."
-        puts "[3]. Conjure Wizard Familiar" if @player.class.to_s == "Wizard" and @player.spell_buff == false
-        prompt; move = gets.chomp
-        move = "4" if move == "3" and (@player.class.to_s != "Wizard" or @player.spell_buff == true)
-      end while not (move == "1" or move == "2" or move == "3")
+    room_id = 0     # start at room 0
+    until move == "t" and room_id == 0
+      puts # formatting
+      puts bar_top.yellow
+      puts stat_bar(@player.name, @player.xp, @player.lvl, @player.coin, @player.cur_hp, @player.cur_mana)
+      puts bar_low.yellow
+      puts # formatting
+      c = @dungeon_map.choices room_id
+      c.add('t', 'Go back to town.') if room_id == 0
+      if @player.class.to_s == "Wizard" and
+        @player.spell_buff == false
+        c.add('f', "Conjure Wizard Familar")
+      end
+      move = c.prompt
       # apply food buff
       @player.cur_hp = @player.cur_hp + @player.lvl if @player.buff_food == true
       # prevent food buff from raising current health points above maximum
@@ -80,8 +104,9 @@ class Dungeon
       @player.cur_mana = @player.cur_mana + @player.lvl if @player.buff_drink == true
       # prevent drink buff from raising current mana points above maximum
       @player.cur_mana = @player.mana if @player.cur_mana > @player.mana
-      case
-      when move == "1"
+      new_room_id = @dungeon_map.door_to room_id, move
+      if new_room_id != room_id
+        room_id = new_room_id
         puts # formatting
         rand_msg = dice(3)
         rand_msg = "You walk further into the dark, dank, dirty, dungeon, smirking slightly at your awesome alliteration ability." if rand_msg == 1
@@ -89,30 +114,25 @@ class Dungeon
         rand_msg = "More strange markings, they seem to mean something, but what and who wrote them?" if rand_msg == 3
         puts rand_msg
         puts # formatting
-        bread_crumb = bread_crumb + 1
         random_encounter
-      when move == "2"
-        if bread_crumb <= 1
-          puts # formatting
-          puts "You make it back to town in one piece!"
-          puts # formatting
-          # remove food buffs from player when they leave the dungeon
-          @player.buff_food = false
-          @player.buff_drink = false
-          if @player.class.to_s == "Wizard" and @player.spell_buff == true
-            puts "Drako wishes you well and fades away, ready to help another day."
-            puts #formatting
-            @player.spell_buff = false
-          end
-          save_data
-          return
-        end
-        bread_crumb = bread_crumb - 1
+      elsif move == "t"  # back to town
         puts # formatting
-        puts "You head back toward town."
+        puts "You make it back to town in one piece!"
         puts # formatting
-        random_encounter
-      when move == "3"
+        # remove food buffs from player when they leave the dungeon
+        @player.buff_food = false
+        @player.buff_drink = false
+        if @player.class.to_s == "Wizard" and @player.spell_buff == true
+          puts "Drako wishes you well and fades away, ready to help another day."
+          puts #formatting
+          @player.spell_buff = false
+        end
+        save_data
+        return
+      # wizard familiar
+      elsif move == "f" and
+            @player.class.to_s == "Wizard" and
+            @player.spell_buff == false
         puts # formatting
         puts "#{@player.name} concentrates intently while waving the magic wand and casting the spell..."
         puts # formatting
@@ -127,7 +147,7 @@ class Dungeon
 end
 
 class Tavern
-  
+
   # only available as an option in the Town
   # The tavern will "heal" the player by restoring mana and hp
   def initialize
@@ -139,28 +159,30 @@ class Tavern
     puts "Some rest would probably do you good, #{@player.name}." if @player.cur_hp < @player.hp
     puts # formatting
   end
-  
+
   def choices
     move = 0
     until move == "4"
       begin
         puts # formatting
-        puts bar_top
+        puts bar_top.yellow
         puts stat_bar(@player.name, @player.xp, @player.lvl, @player.coin, @player.cur_hp, @player.cur_mana)
-        puts bar_low
+        puts bar_low.yellow
         puts # formatting
-        room_cost = @player.lvl*3
-        nourish_cost = @player.lvl*2
-        puts "What would you like to do in the tavern, #{@player.name}?"
-        puts "[1]. Buy some food.    | Cost: #{nourish_cost} coins."
-        puts "[2]. Buy a drink.      | Cost: #{nourish_cost} coins."
-        puts "[3]. Rest.             | Cost: #{room_cost} coins."
-        puts "[4]. Leave the tavern."
-        prompt; move = gets.chomp
+        room_cost = @player.lvl*2
+        nourish_cost = @player.lvl
+        c = Choice.new "What would you like to do in the tavern, #{@player.name}?",
+          {
+            "1" => "Buy some food.    | Cost: #{nourish_cost} coins.",
+            "2" => "Buy a drink.      | Cost: #{nourish_cost} coins.",
+            "3" => "Rest.             | Cost: #{room_cost} coins.",
+            "4" => "Leave the tavern."
+          }
+          move = c.prompt
       end while not (move == "1" or move == "2" or move == "3" or move == "4")
       case
       when move == "1"
-        if @player.coin >= @player.lvl*2
+        if @player.coin >= @player.lvl and @player.buff_food != true
           @player.buff_food = true
           puts # formatting
           puts "You find a seat at an open table and the waiter approaches to take your order."
@@ -169,14 +191,17 @@ class Tavern
           puts "health as you travel in the dungeon."
           puts # formatting
           puts "You order and enjoy a delicious meal, #{@player.name}, you really do feel swell!"
-          @player.coin = @player.coin - @player.lvl*2
+          @player.coin = @player.coin - @player.lvl
           save_data
+        elsif @player.buff_food == true
+          puts #formatting
+          puts "You couldn't possibly eat anymore."
         else
           puts # formatting
           puts "You can't afford a meal! Go to the dungeon and earn some money!"
         end
       when move == "2"
-        if @player.coin >= @player.lvl*2
+        if @player.coin >= @player.lvl and @player.buff_drink != true
           @player.buff_drink = true
           puts # formatting
           puts "You sally up to the bar and the barkeep approaches to take your order."
@@ -185,23 +210,29 @@ class Tavern
           puts "mana as you travel in the dungeon."
           puts # formatting
           puts "You swirl the wine, sniff, then take a sip, #{@player.name}, you really do feel superior!"
-          @player.coin = @player.coin - @player.lvl*2
+          @player.coin = @player.coin - @player.lvl
           save_data
+        elsif @player.buff_drink == true
+          puts #formatting
+          puts "You couldn't possibly drink anymore."
         else
           puts # formatting
           puts "You can't afford wine, you churl! Go to the dungeon and earn some money!"
         end
       when move == "3"
-        if @player.coin >= @player.lvl*3
+        if @player.coin >= @player.lvl*2 and (@player.cur_hp != @player.hp or @player.cur_mana != @player.mana)
           health = @player.cur_hp
           mana   = @player.cur_mana
-          @player.coin = @player.coin - @player.lvl*3
+          @player.coin = @player.coin - @player.lvl*2
           restore_player
           health = @player.cur_hp - health
           mana   = @player.cur_mana - mana
           puts # formatting
           puts "You pay for a small room and get a good night of rest."
           puts "Resting has restored #{health} health points and #{mana} points of mana."
+        elsif (@player.cur_hp == @player.hp and @player.cur_mana == @player.mana)
+          puts # formatting
+          puts "You don't really need to rest, get out there and make your own discoveries!"
         else
           puts # formatting
           puts "You can't afford a room! Hit the dungeon and earn some money!"

metadata

@@ -1,16 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: destiny
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kody Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
-dependencies: []
-description: Role playing game with distinct classes and character development
+date: 2014-03-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+description: Role playing game with distinct classes, character development, and a
+  dungeon map!
 email: kodywilson@gmail.com
 executables:
 - destiny
@@ -18,7 +39,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/destiny
+- lib/choice.rb
 - lib/destiny.rb
+- lib/dungeon_map.rb
+- lib/edge_coloring_graph.rb
 - lib/game_mechanics.rb
 - lib/mobs.rb
 - lib/places.rb