starx 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4429a9a304a622e0c6eb4877e0093c01e35dcd
-  data.tar.gz: 0759e56a7b4fdb1bab804d03ab054ded72845b12
+  metadata.gz: 4b2343a38acde7681f1c5eedc31111515a2274a5
+  data.tar.gz: 887129f3992db20f11c5e6158e61ff4a56bc8436
 SHA512:
-  metadata.gz: f64d22914133461d841b136fe78204dcc7efae2cfdd61cc364e5c02852db3aeda9ccc1c5b29d36cfc8b1577badc766996935d06949a7dbbf56460598a607b564
-  data.tar.gz: 8d2476c806be3e80fdc7e36fe61e11b7d520fb21d033506cf934c139c01065dde0923a92108945d6de21b71c2f2539e38f67a6c67bae4515da6f95731f640d35
+  metadata.gz: e0db518483b50e22c0d74a16ef3ab7b1593a38ca6d273f7f25cdfb027a9b98cc299d99fe9380b480b9d28f21d37c2e087bf8f379805fb57da25fd6f083fabb9e
+  data.tar.gz: 22556d3ba2615f581f465eadf9ffba404af027222a09431b8788ab4b88b58ffc56311550d217044739674a79e1be7588acc1cb6e81466cb5746543c16406da04

data/bin/starx

@@ -38,13 +38,14 @@ class Starx
 			position_array = position.split('.')
 			y = position_array[0]
 			x = position_array[1]
-			if x != 0 && value == :full
-				print "*"
-			elsif x != 0 && value == :empty
-				print " "
-			elsif x != 0 && value == :player
-				print "\e[31m>\e[0m"
-			end
+                        case value
+                        when :full
+                            print '*'
+                        when :empty
+                            print " "
+                        when :player
+                            print "\e[31m>\e[0m"
+                        end
 		end
 		WIDTH.times {print '*'}
 
@@ -129,58 +130,41 @@ class Starx
 	end
 	
 	def move_up!
-		player_key = @cells.select {|_,v| v == :player}.keys[0].split('.')
-		player_x = player_key[1]
-		player_y = player_key[0].to_i
-
-		cell_x = player_x
-		cell_y = player_y - 1
-		if cell_y < 10
-			cell_y = "0#{cell_y}" 
-		else
-			cell_y.to_s
-		end
-		player_y = player_key[0]
-
-		player_new_key = "#{player_y}.#{player_x}"
-		cell_key = "#{cell_y}.#{cell_x}"
-
-		@cells.delete(player_new_key)
-		@cells.delete(cell_key)
-
-		@cells[player_new_key] = :empty
-		@cells[cell_key] = :player
+            switch_player_with(1,0)
 	end
 
 	def move_down!	
-		player_key = @cells.select {|_,v| v == :player}.keys[0].split('.')
-		player_x = player_key[1]
-		player_y = player_key[0].to_i
-
-		cell_x = player_x
-		cell_y = player_y + 1
-		if cell_y < 10
-			cell_y = "0#{cell_y}" 
-		else
-			cell_y.to_s
-		end
-		player_y = player_key[0]
+            switch_player_with(-1,0)
+	end
 
-		player_new_key = "#{player_y}.#{player_x}"
-		cell_key = "#{cell_y}.#{cell_x}"
+        def switch_player_with(y,x)
+            player_x = find_player[1].to_i
+            player_y = find_player[0].to_i
+            cell_x = player_x - x
+            cell_y = player_y - y
 
-		@cells.delete(player_new_key)
-		@cells.delete(cell_key)
+            player_x = "0#{player_x}" if player_x < 10
+            player_y = "0#{player_y}" if player_y < 10
+            cell_x = "0#{cell_x}" if cell_x < 10
+            cell_y = "0#{cell_y}" if cell_y < 10
 
-		@cells[player_new_key] = :empty
-		@cells[cell_key] = :player
-	end
+            cell_key = "#{cell_y}.#{cell_x}"
+            player_key = "#{player_y}.#{player_x}"
+
+            @cells.delete(cell_key)
+            @cells.delete(player_key)
+            @cells[player_key] = :empty
+            @cells[cell_key] = :player
+        end
+
+        def find_player
+            @cells.select {|_,v| v == :player}.keys[0].split('.')
+        end
 
 	def collision?
 		collision = false
-		player_position = @cells.select {|_,v| v == :player}.keys[0].split('.')
-		player_x = player_position[1].to_i
-		player_y = player_position[0]
+		player_x = find_player[1].to_i
+		player_y = find_player[0]
 		cell_in_front_x = player_x + 1
 		cell_in_front_x = "0#{cell_in_front_x}" if cell_in_front_x < 10
 		cell_in_front = "#{player_y}.#{cell_in_front_x}"
@@ -284,7 +268,6 @@ class Starx
                     end
                  end
 	end
-	#
 end
 
 g = Starx.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starx
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Justyna Rachowicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: justynarachowicz@gmail.com
@@ -28,17 +28,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Simple, terminal-based game written in ruby