eat_the_ocean 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24c70a1744eb54e9931bf3bbb22743e84c463651
-  data.tar.gz: b97b072cac3de6046fb43839473c37b02ababcd0
+  metadata.gz: 3964a4605b4429a9d88bf7563942d64644e3dcae
+  data.tar.gz: a97020311eac19f571a48df49fd34aabbeee98e1
 SHA512:
-  metadata.gz: 06907a736ac247ccc806a228dbec7d1afe6c76528b3df102aadfd5d486a73ad9d1f9b4e0fe959b0aa5e1dcb3a6117cba633e4cdfcbfb35a28c12c76416ad8388
-  data.tar.gz: 26135eb66ea6408abb2f2cb539bae43c272605b63c6b1a4ce84234155005b3d1efeff5e9ccc9ed00ddcc21e3853b3f7c74f4b28f65f330557bf4a1cd8979c408
+  metadata.gz: 3e701f6dc0ab7a0eb22fd678461a095d30563a07bb9b91ba7c0751ad35571758040dae2470574cf5a4e6d62818071e5deb866cadc1c1d24fb7882630075f8a36
+  data.tar.gz: 69ec3110204034eea0ac92088d453445160809386d19a3b70c6705965e633567f172ae883cfd48af808236c929e3acbb5cccfaee0a8cd964af176a76dea54fcd

data/bin/battleship.rb

@@ -1,8 +1,8 @@
-require "./lib/evaluator"
-require "./lib/printer"
-require "./lib/ship"
-require "./lib/map"
-require "./lib/battleship_hardmedium"
+require "eat_the_ocean/evaluator"
+require "eat_the_ocean/printer"
+require "eat_the_ocean/ship"
+require "eat_the_ocean/map"
+require "eat_the_ocean/battleship_hardmedium"
 
 module EatTheOcean
 	class Battleship

data/bin/eat_the_ocean

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-require "./lib/evaluator"
-require "./lib/printer"
-require "./lib/ship"
-require "./lib/map"
-require "./lib/battleship_hardmedium"
+require "../lib/evaluator"
+require "../lib/printer"
+require "../lib/ship"
+require "../lib/map"
+require "../lib/battleship_hardmedium"
 
 puts EatTheOcean::Printer.title
 puts EatTheOcean::Printer.welcome

data/lib/battleship_hardmedium.rb

@@ -1,4 +1,4 @@
-require "./bin/battleship"
+require "bin/battleship"
 module EatTheOcean
 	class MediumBattleship < Battleship
 		attr_reader :user_map, :opponent_map, :user_evaluator

data/lib/eat_the_ocean/battleship_hardmedium.rb

@@ -0,0 +1,473 @@
+require "bin/battleship"
+module EatTheOcean
+	class MediumBattleship < Battleship
+		attr_reader :user_map, :opponent_map, :user_evaluator
+		attr_accessor :first_time, :opponent_ship_1x2, :opponent_ship_1x3
+
+		def initialize
+			@user_ship_1x2 = Ship.new([], 6)
+			@user_ship_1x3 = Ship.new([], 6)
+			@user_ship_1x4 = Ship.new([], 6)
+
+			@opponent_ship_1x2 = Ship.new(nil, 6)
+			@opponent_ship_1x2.random_1x2
+	    @opponent_ship_1x3 = Ship.new(@opponent_ship_1x2.coordinates, 6)
+			@opponent_ship_1x3.random_1xSize(3)
+			@opponent_ship_1x4 = Ship.new(@opponent_ship_1x2.coordinates + @opponent_ship_1x3.coordinates, 6)
+			@opponent_ship_1x4.random_1xSize(4)
+
+			@user_map = Map.new(6)
+			@opponent_map = Map.new(6)
+
+			@user_evaluator = Evaluator.new(@opponent_ship_1x2, @opponent_ship_1x3, @opponent_ship_1x4, nil, @opponent_map)
+			@opponent_evaluator = Evaluator.new(@user_ship_1x2, @user_ship_1x3, @user_ship_1x4, nil, @user_map)
+		
+			@first_time = true
+			@second_time = false
+			@third_time = false
+		end
+	 
+		def prompt_user
+			if @first_time == true
+				puts Printer.first_boat_loop
+				@first_time = false
+				@second_time = true
+				self.user_input_first_boat
+			elsif @second_time == true
+				puts Printer.second_boat_loop
+				@second_time = false
+				@third_time = true
+				self.user_input_second_boat
+			elsif @third_time == true
+				puts Printer.third_boat_loop
+				@third_time = false
+				self.user_input_third_boat
+			else
+				puts Printer.guess_opponent_coordinate
+				self.user_guess
+			end
+		end
+
+		def validate_input(aString)
+			upcased = aString.upcase
+			if upcased[/[ABCDEF][123456]/] && upcased.length == 2
+				return upcased[0..1]
+			elsif aString == "q"
+				$user_choice = "q"
+			else
+				input_invalid = true
+				while input_invalid
+					puts Printer.invalid_input
+					upcased = gets.chomp.upcase
+					if upcased[/[ABCDEF][123456]/]
+						input_invalid=false
+					end
+				end
+			end
+			upcased[0..1]
+		end
+
+		def user_input_second_boat
+			to_validate = gets.chomp
+			validated = self.validate_input(to_validate)
+			first_coordinate = validated
+
+			puts Printer.next_coordinate
+			to_validate_2 = gets.chomp
+			validated_2 = self.validate_input(to_validate_2)
+			second_coordinate = validated_2
+
+			puts Printer.next_coordinate
+			to_validate_3 = gets.chomp
+			validated_3 = self.validate_input(to_validate_3)
+			third_coordinate = validated_3
+
+			@user_ship_1x3.coordinates[0] = first_coordinate
+			@user_ship_1x3.coordinates[1] = second_coordinate
+			@user_ship_1x3.coordinates[2] = third_coordinate
+
+			unless @user_ship_1x3.straight?(@user_ship_1x3.coordinates)
+				@first_time = false
+				@second_time = true
+				puts Printer.not_in_line
+				self.prompt_user
+			end
+
+			@user_ship_1x3.other_ship_array << @user_ship_1x2.coordinates
+			@user_ship_1x3.other_ship_array.flatten!
+
+			if @user_ship_1x3.blocked?(@user_ship_1x3.coordinates)
+				@first_time = false
+				@second_time = true
+				puts Printer.blocked
+				self.prompt_user
+			end
+
+			self.prompt_user
+		end
+
+		def user_input_third_boat
+			to_validate = gets.chomp
+			validated = self.validate_input(to_validate)
+			first_coordinate = validated
+
+			puts Printer.next_coordinate
+			to_validate_2 = gets.chomp
+			validated_2 = self.validate_input(to_validate_2)
+			second_coordinate = validated_2
+
+			puts Printer.next_coordinate
+			to_validate_3 = gets.chomp
+			validated_3 = self.validate_input(to_validate_3)
+			third_coordinate = validated_3
+
+			puts Printer.next_coordinate
+			to_validate_4 = gets.chomp
+			validated_4 = self.validate_input(to_validate_4)
+			fourth_coordinate = validated_4
+
+			@user_ship_1x4.coordinates[0] = first_coordinate
+			@user_ship_1x4.coordinates[1] = second_coordinate
+			@user_ship_1x4.coordinates[2] = third_coordinate
+			@user_ship_1x4.coordinates[3] = fourth_coordinate
+
+			unless @user_ship_1x4.straight?(@user_ship_1x4.coordinates)
+				@second_time = false
+				@third_time = true
+				puts Printer.not_in_line
+				self.prompt_user
+			end
+
+			@user_ship_1x4.other_ship_array << @user_ship_1x2.coordinates
+			@user_ship_1x4.other_ship_array << @user_ship_1x3.coordinates
+			@user_ship_1x4.other_ship_array.flatten!
+
+			if @user_ship_1x4.blocked?(@user_ship_1x4.coordinates)
+				@second_time = false
+				@third_time = true
+				puts Printer.blocked
+				self.prompt_user
+			end
+
+			self.mark_initial_ship_position_on_map
+			self.show_user_map
+			puts Printer.prompt_first_guess
+			self.prompt_user
+		end
+
+		def mark_initial_ship_position_on_map
+			super
+			@user_ship_1x4.coordinates.each do |coordinate|
+				@user_map.grid_mark(coordinate, "🐳")
+			end
+		end
+
+		def show_user_map
+			super
+			@user_ship_1x4.sunk == 1 ? puts(Printer.comp_one_by_four_sunk) : nil
+		end
+
+		def show_opponent_map
+			super
+			@opponent_ship_1x4.sunk == 1 ? puts(Printer.one_by_four_sunk) : nil
+		end
+
+		def computer_guess
+			computer_coordinate = ["A", "B", "C", "D", "E", "F"].sample + rand(1..6).to_s
+			unless self.already_guessed(computer_coordinate, @opponent_evaluator)
+				self.guess(computer_coordinate, @opponent_evaluator)
+			end
+		end
+
+		def guess(aGuess, evaluator)
+			hit_or_not = evaluator.hit(aGuess)
+			if evaluator == @user_evaluator
+				hit_or_not ?  puts("\n" + Printer.user_guess_right) : puts("\n" + Printer.user_guess_wrong)
+				self.show_opponent_map
+				puts "\n"
+				self.computer_guess
+				self.show_user_map
+				puts "\n"
+				if @opponent_ship_1x2.sunk + @opponent_ship_1x3.sunk + @opponent_ship_1x4.sunk == 3
+					self.win_game
+				elsif @user_ship_1x2.sunk + @user_ship_1x3.sunk + @user_ship_1x4.sunk == 3
+					self.lose_game
+				else
+					self.prompt_user
+				end
+			else
+				hit_or_not ? puts(Printer.comp_guess_right) : puts(Printer.comp_guess_wrong + aGuess + ".")
+			end
+		end
+	end
+
+
+
+	class HardBattleship < Battleship
+		attr_reader :user_map, :opponent_map, :user_evaluator
+		attr_accessor :first_time, :opponent_ship_1x2, :opponent_ship_1x3
+
+		def initialize
+			@user_ship_1x2 = Ship.new([], 8)
+			@user_ship_1x3 = Ship.new([], 8)
+			@user_ship_1x4 = Ship.new([], 8)
+			@user_ship_1x5 = Ship.new([], 8)
+
+			@opponent_ship_1x2 = Ship.new(nil, 8)
+			@opponent_ship_1x2.random_1x2
+	    @opponent_ship_1x3 = Ship.new(@opponent_ship_1x2.coordinates, 8)
+			@opponent_ship_1x3.random_1xSize(3)
+			@opponent_ship_1x4 = Ship.new(@opponent_ship_1x2.coordinates + @opponent_ship_1x3.coordinates, 8)
+			@opponent_ship_1x4.random_1xSize(4)
+			@opponent_ship_1x5 = Ship.new(@opponent_ship_1x2.coordinates + @opponent_ship_1x3.coordinates + @opponent_ship_1x4.coordinates, 6)
+			@opponent_ship_1x5.random_1xSize(5)
+
+			@user_map = Map.new(8)
+			@opponent_map = Map.new(8)
+
+			@user_evaluator = Evaluator.new(@opponent_ship_1x2, @opponent_ship_1x3, @opponent_ship_1x4, @opponent_ship_1x5, @opponent_map)
+			@opponent_evaluator = Evaluator.new(@user_ship_1x2, @user_ship_1x3, @user_ship_1x4, @user_ship_1x5, @user_map)
+		
+			@first_time = true
+			@second_time = false
+			@third_time = false
+			@fourth_time = false
+		end
+	 
+		def prompt_user
+			if @first_time == true
+				puts Printer.first_boat_loop
+				@first_time = false
+				@second_time = true
+				self.user_input_first_boat
+			elsif @second_time == true
+				puts Printer.second_boat_loop
+				@second_time = false
+				@third_time = true
+				self.user_input_second_boat
+			elsif @third_time == true
+				puts Printer.third_boat_loop
+				@third_time = false
+				@fourth_time = true
+				self.user_input_third_boat
+			elsif @fourth_time == true
+				puts Printer.fourth_boat_loop
+				@fourth_time = false
+				self.user_input_fourth_boat
+			else
+				puts Printer.guess_opponent_coordinate
+				self.user_guess
+			end
+		end
+
+		def validate_input(aString)
+			upcased = aString.upcase
+			if upcased[/[ABCDEFGH][12345678]/] && upcased.length == 2
+				return upcased[0..1]
+			elsif aString == "q"
+				$user_choice = "q"
+			else
+				input_invalid = true
+				while input_invalid
+					puts Printer.invalid_input
+					upcased = gets.chomp.upcase
+					if upcased[/[ABCDEFGH][12345678]/]
+						input_invalid=false
+					end
+				end
+			end
+			upcased[0..1]
+		end
+
+		def user_input_second_boat
+			to_validate = gets.chomp
+			validated = self.validate_input(to_validate)
+			first_coordinate = validated
+
+			puts Printer.next_coordinate
+			to_validate_2 = gets.chomp
+			validated_2 = self.validate_input(to_validate_2)
+			second_coordinate = validated_2
+
+			puts Printer.next_coordinate
+			to_validate_3 = gets.chomp
+			validated_3 = self.validate_input(to_validate_3)
+			third_coordinate = validated_3
+
+			@user_ship_1x3.coordinates[0] = first_coordinate
+			@user_ship_1x3.coordinates[1] = second_coordinate
+			@user_ship_1x3.coordinates[2] = third_coordinate
+
+			unless @user_ship_1x3.straight?(@user_ship_1x3.coordinates)
+				@first_time = false
+				@second_time = true
+				puts Printer.not_in_line
+				self.prompt_user
+			end
+
+			@user_ship_1x3.other_ship_array << @user_ship_1x2.coordinates
+			@user_ship_1x3.other_ship_array.flatten!
+
+			if @user_ship_1x3.blocked?(@user_ship_1x3.coordinates)
+				@first_time = false
+				@second_time = true
+				puts Printer.blocked
+				self.prompt_user
+			end
+
+			self.prompt_user
+		end
+
+		def user_input_third_boat
+			to_validate = gets.chomp
+			validated = self.validate_input(to_validate)
+			first_coordinate = validated
+
+			puts Printer.next_coordinate
+			to_validate_2 = gets.chomp
+			validated_2 = self.validate_input(to_validate_2)
+			second_coordinate = validated_2
+
+			puts Printer.next_coordinate
+			to_validate_3 = gets.chomp
+			validated_3 = self.validate_input(to_validate_3)
+			third_coordinate = validated_3
+
+			puts Printer.next_coordinate
+			to_validate_4 = gets.chomp
+			validated_4 = self.validate_input(to_validate_4)
+			fourth_coordinate = validated_4
+
+			@user_ship_1x4.coordinates[0] = first_coordinate
+			@user_ship_1x4.coordinates[1] = second_coordinate
+			@user_ship_1x4.coordinates[2] = third_coordinate
+			@user_ship_1x4.coordinates[3] = fourth_coordinate
+
+			unless @user_ship_1x4.straight?(@user_ship_1x4.coordinates)
+				@second_time = false
+				@third_time = true
+				puts Printer.not_in_line
+				self.prompt_user
+			end
+
+			@user_ship_1x4.other_ship_array << @user_ship_1x2.coordinates
+			@user_ship_1x4.other_ship_array << @user_ship_1x3.coordinates
+			@user_ship_1x4.other_ship_array.flatten!
+
+			if @user_ship_1x4.blocked?(@user_ship_1x4.coordinates)
+				@second_time = false
+				@third_time = true
+				puts Printer.blocked
+				self.prompt_user
+			end
+
+			self.prompt_user
+		end
+
+		def user_input_fourth_boat
+			to_validate = gets.chomp
+			validated = self.validate_input(to_validate)
+			first_coordinate = validated
+
+			puts Printer.next_coordinate
+			to_validate_2 = gets.chomp
+			validated_2 = self.validate_input(to_validate_2)
+			second_coordinate = validated_2
+
+			puts Printer.next_coordinate
+			to_validate_3 = gets.chomp
+			validated_3 = self.validate_input(to_validate_3)
+			third_coordinate = validated_3
+
+			puts Printer.next_coordinate
+			to_validate_4 = gets.chomp
+			validated_4 = self.validate_input(to_validate_4)
+			fourth_coordinate = validated_4
+
+			puts Printer.next_coordinate
+			to_validate_5 = gets.chomp
+			validated_5 = self.validate_input(to_validate_5)
+			fifth_coordinate = validated_5
+
+			@user_ship_1x5.coordinates[0] = first_coordinate
+			@user_ship_1x5.coordinates[1] = second_coordinate
+			@user_ship_1x5.coordinates[2] = third_coordinate
+			@user_ship_1x5.coordinates[3] = fourth_coordinate
+			@user_ship_1x5.coordinates[4] = fifth_coordinate
+
+			unless @user_ship_1x5.straight?(@user_ship_1x5.coordinates)
+				@third_time = false
+				@fourth_time = true
+				puts Printer.not_in_line
+				self.prompt_user
+			end
+
+			@user_ship_1x5.other_ship_array << @user_ship_1x2.coordinates
+			@user_ship_1x5.other_ship_array << @user_ship_1x3.coordinates
+			@user_ship_1x5.other_ship_array << @user_ship_1x4.coordinates
+			@user_ship_1x5.other_ship_array.flatten!
+				
+			if @user_ship_1x5.blocked?(@user_ship_1x5.coordinates)
+				@third_time = false
+				@fourth_time = true
+				puts Printer.blocked
+				self.prompt_user
+			end
+
+			self.mark_initial_ship_position_on_map
+			self.show_user_map
+			puts Printer.prompt_first_guess
+			self.prompt_user
+		end
+
+		def mark_initial_ship_position_on_map
+			super
+			@user_ship_1x4.coordinates.each do |coordinate|
+				@user_map.grid_mark(coordinate, "🐳")
+			end
+			@user_ship_1x5.coordinates.each do |coordinate|
+				@user_map.grid_mark(coordinate, "🐋")
+			end
+		end
+
+		def show_user_map
+			super
+			@user_ship_1x4.sunk == 1 ? puts(Printer.comp_one_by_four_sunk) : nil
+			@user_ship_1x5.sunk == 1 ? puts(Printer.comp_one_by_five_sunk) : nil
+		end
+
+		def show_opponent_map
+			super
+			@opponent_ship_1x4.sunk == 1 ? puts(Printer.one_by_four_sunk) : nil
+			@opponent_ship_1x5.sunk == 1 ? puts(Printer.one_by_five_sunk) : nil
+		end
+
+		def computer_guess
+			computer_coordinate = ["A", "B", "C", "D", "E", "F", "G", "H"].sample + rand(1..8).to_s
+			unless self.already_guessed(computer_coordinate, @opponent_evaluator)
+				self.guess(computer_coordinate, @opponent_evaluator)
+			end
+		end
+
+		def guess(aGuess, evaluator)
+			hit_or_not = evaluator.hit(aGuess)
+			if evaluator == @user_evaluator
+				hit_or_not ?  puts("\n" + Printer.user_guess_right) : puts("\n" + Printer.user_guess_wrong)
+				self.show_opponent_map
+				puts "\n"
+				self.computer_guess
+				self.show_user_map
+				puts "\n"
+				if @opponent_ship_1x2.sunk + @opponent_ship_1x3.sunk + @opponent_ship_1x4.sunk + @opponent_ship_1x5.sunk == 4
+					self.win_game
+				elsif @user_ship_1x2.sunk + @user_ship_1x3.sunk + @user_ship_1x4.sunk + @user_ship_1x5.sunk == 4
+					self.lose_game
+				else
+					self.prompt_user
+				end
+			else
+				hit_or_not ? puts(Printer.comp_guess_right) : puts(Printer.comp_guess_wrong + aGuess + ".")
+			end
+		end
+	end
+end

data/lib/eat_the_ocean/printer.rb

@@ -0,0 +1,131 @@
+require 'colorize'
+module EatTheOcean
+module Printer
+	def self.invalid_input
+		"Please enter a valid letter-number combination."
+	end
+
+	def self.first_boat_loop
+		"\nPlease enter the coordinates for your octopi (1x2). Please do one coordinate at a time. They must be in a line."
+	end
+
+	def self.second_boat_loop
+		"\nPlease enter the coordinates for your dolphins (1x3). Please do one coordinate at a time. They must be in a line."
+	end
+
+	def self.third_boat_loop
+		"\nPlease enter the coordinates for your baby whales (1x4). Please do one coordinate at a time. They must be in a line."
+	end
+
+	def self.fourth_boat_loop
+		"\nPlease enter the coordinates for your adult whales (1x5). Please do one coordinate at a time. They must be in a line."
+	end
+
+	def self.next_coordinate
+		"\nNext coordinate?"
+	end
+
+	def self.not_in_line
+		"\nThat was not in a line!".colorize(:red)
+	end
+
+	def self.blocked
+		"\nThis ship is overlapping another. Not okay.".colorize(:red)
+	end
+
+	def self.title
+		"\n" * 60 +
+"EEEEEEE   AAA   TTTTTTT  TTTTTTT HH   HH EEEEEEE   OOOOO   CCCCC  EEEEEEE   AAA   NN   NN 
+EE       AAAAA    TTT      TTT   HH   HH EE       OO   OO CC    C EE       AAAAA  NNN  NN 
+EEEEE   AA   AA   TTT      TTT   HHHHHHH EEEEE    OO   OO CC      EEEEE   AA   AA NN N NN 
+EE      AAAAAAA   TTT      TTT   HH   HH EE       OO   OO CC    C EE      AAAAAAA NN  NNN 
+EEEEEEE AA   AA   TTT      TTT   HH   HH EEEEEEE   OOOO0   CCCCC  EEEEEEE AA   AA NN   NN ".colorize(:blue)
+	end
+
+	def self.welcome
+		"\n" * 5 +
+		"Would you like to play" + " (e)asy".colorize(:green) + " on a 4x4 grid, " + "(m)edium".colorize(:blue) + " on a 6x6 grid, or " + "(h)ard".colorize(:red) + " on an 8x8 grid? Also, read the (i)nstructions, or (q)uit?"
+	end
+
+	def self.user_guess_right
+		"\n" * 30 +"You scored a meal! You're closer to starving your opponent."
+	end
+
+	def self.user_guess_wrong
+		"\n" * 30 + "You missed the catch. Too bad."
+	end
+
+	def self.comp_guess_right
+		"Looks like the computer harvested a critter. Do androids even like blubber?"
+	end
+
+	def self.comp_guess_wrong
+		"The computer was too random and missed on "
+	end
+
+	def self.user_map
+		"This is your ocean:"
+	end
+
+	def self.opponent_map
+		"Here's how you've done against the computer:"
+	end
+
+	def self.you_win
+		"You have turned all the marine life in your opponent's ocean into " + "sushi".colorize(:red) + ". Congrats and bon appetit!"
+	end
+
+	def self.instructions
+		"\n" + 
+		"The goal of " + "EAT THE OCEAN".colorize(:blue)+ " is to guess the location of your opponent's swimming mammals," + " octopi".colorize(:red) + "(🐙), taking up 1x2 spaces, " + " dolphins".colorize(:light_blue) +"(🐬), taking up 1x3 spaces," + " baby whales".colorize(:blue) + "(🐳), taking up 1x4 spaces, and" + " adult whales".colorize(:blue) + "(🐋), taking up 1x5 spaces. There are only octopi and dolphins in the easy game (4x4), the addition of baby whales in the medium (6x6), and the further addition of whales in the hard (8x8). Enter any coordinates in the form of 'LETTERnumber', letters A-D and numbers 1-4. The goal is to eat your opponent's entire ocean before it can eat yours. All animals turn into " +"sushi".colorize(:red) + "(🍣) upon being discovered. Missed animals are represented by disruptions in the water," + " water droplets".colorize(:blue) +" (💦). The ocean grid is bordered by " + "big waves".colorize(:blue)+ "(🌊) and "+" Mr. Sun".colorize(:yellow)+" (🌞). Please play " + "(e)asy".colorize(:green) + "," + " (m)edium".colorize(:blue) + ", or " + "(h)ard".colorize(:red) + ". Or (q)uit.\n"
+	end
+
+	def self.whats_your_guess
+		"What's your guess?"
+	end
+
+	def self.prompt_first_guess
+		"Now you may begin the guessing game."
+	end
+
+	def self.already_guessed
+		"You've already guessed this. Please guess again."
+	end
+
+	def self.one_by_two_sunk
+		"You've eaten all the octopi...:("
+	end
+
+	def self.one_by_three_sunk
+		"You've eaten all the dolphins...:("
+	end
+
+	def self.one_by_four_sunk
+		"You've eaten all the baby whales...:("
+	end
+
+	def self.one_by_five_sunk
+		"You've eaten all the adult whales...:("
+	end
+
+	def self.comp_one_by_two_sunk
+		"The computer has eaten ALL your octopi...:("
+	end
+
+	def self.comp_one_by_three_sunk
+		"The computer has eaten ALL your dolphins...:("
+	end
+
+	def self.comp_one_by_four_sunk
+		"The computer has eaten ALL your baby whales...:("
+	end
+
+	def self.comp_one_by_five_sunk
+		"The computer has eaten ALL your adult whales...:("
+	end
+
+	def self.guess_opponent_coordinate
+		"Please guess where the computer's marine life is."		
+	end
+end
+end

data/test/battleship_test.rb

@@ -1,10 +1,10 @@
 require 'minitest/autorun'
 require 'minitest/pride'
-require './bin/battleship'
-require './lib/ship'
-require './lib/evaluator'
-require './lib/printer'
-require './lib/map'
+require 'bin/battleship'
+require 'eat_the_ocean/ship'
+require 'eat_the_ocean/evaluator'
+require 'eat_the_ocean/printer'
+require 'eat_the_ocean/map'
 module EatTheOcean
 	class BattleshipTest < MiniTest::Test
 		def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eat_the_ocean
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeffrey Gu
@@ -35,10 +35,12 @@ files:
 - bin/battleship.rb
 - bin/eat_the_ocean
 - lib/battleship_hardmedium.rb
-- lib/evaluator.rb
-- lib/map.rb
+- lib/eat_the_ocean/battleship_hardmedium.rb
+- lib/eat_the_ocean/evaluator.rb
+- lib/eat_the_ocean/map.rb
+- lib/eat_the_ocean/printer.rb
+- lib/eat_the_ocean/ship.rb
 - lib/printer.rb
-- lib/ship.rb
 - test/battleship_test.rb
 - test/evaluator_test.rb
 - test/map_test.rb