starx 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1766004e6d683bafb2bd91cda59db189d97a615
-  data.tar.gz: 090ce82321ae8f293d5b22b30c21aee653a2d6bc
+  metadata.gz: 8938a1480f84d937813dc5f5dd87e7a9ea525bfe
+  data.tar.gz: 4146bf0e98d355b9609e1c5ee2a4df9b5a8ccd00
 SHA512:
-  metadata.gz: 4045128452861c9d176bdecb100934cebb599ce4999fe2af3265bfd4630b1b4ef831077a71a253a353e8ede19b6e97e9a24b97ac43567552966f7c4483a60b7f
-  data.tar.gz: 869a6a660d3087085ead46be40f4bf818ddce4f4780409391dda8ab674d272715db8b0a50c7717feb4bdee09e88cb3c125d6ae43ff0d92b9ff0178b0fd9f7b6d
+  metadata.gz: fbc9e1d8716759caa0f7c8ee084be3834ff0a898b5067723a87c43190022d917a9111da7384074df57484613c9f3379070da57f32e2aa51625bcff09496c869a
+  data.tar.gz: da32342dccb4df913c1d46b705bb8db88c9c18c88f0c5eba520202173e54948f721c5f6e7ce7ffd2182b84b830305f98f8adab268e69f75f9baa0deafa023412

data/bin/starx

@@ -1,65 +1,75 @@
 #!/usr/bin/env ruby
 require 'io/wait'
 
-WIDTH = %x{tput cols}.strip.to_i
-HEIGHT = %x{tput lines}.strip.to_i - 3
+WIDTH = `tput cols`.to_i
+HEIGHT = `tput lines`.to_i - 3
 
 class Starx
 	def initialize
-		system 'tput civis'
 		@cells = {}
-		for y in 1..HEIGHT
-			y = "0#{y}" if y < 10
-			for x in 1..WIDTH
-				x = "0#{x}" if x < 10
-				key = "#{y}.#{x}"
-				@cells[key] = :empty
-			end
-		end
-	
-		player_key = "#{ HEIGHT / 2 }.05"
-		@cells[player_key] = :player
-
-		display
-		puts " "
-		
+    (1..HEIGHT).each do |y|
+      (1..WIDTH).each do |x|
+          y = add_zero_if_needed(y)
+          x = add_zero_if_needed(x)
+          key = "#{y}.#{x}"
+          if key == "#{ HEIGHT / 2 }.05"
+            @cells[key] = :player
+          else
+            @cells[key] = :empty
+          end
+      end
+    end
 		@tickcount = 0
 		@score = 0
+		display
 	end
 
+  def add_zero_if_needed(value)
+    value = value.to_i
+    if value < 10
+      value = "0#{value}"
+    else
+      value.to_s
+    end
+  end
+
 	def display
-		# sort the hash so it prints out correctly
-		@cells = @cells.sort_by { |key,_| key.to_f }	
+    sort_cells
+    print_score
+		@cells.each do |_, value|
+      case value
+      when :full
+      print '*'
+      when :empty
+      print " "
+      when :player
+      print "\e[31m>\e[0m"
+      end
+		end
+    print_asterisks
+	end
 
+  def print_score
 		score_length = "SCORE: #{@score}  ".length
 		print "\e[32mSCORE:\e[0m #{@score}  "
 		(WIDTH - score_length).times {print '*'}
-		@cells.each do |position, value|
-			position_array = position.split('.')
-			y = position_array[0]
-			x = position_array[1]
-                        case value
-                        when :full
-                            print '*'
-                        when :empty
-                            print " "
-                        when :player
-                            print "\e[31m>\e[0m"
-                        end
-		end
-		WIDTH.times {print '*'}
+  end
 
-	end
+  def print_asterisks
+    WIDTH.times {print '*'}
+  end
+
+  def sort_cells
+		@cells = @cells.sort_by { |key,_| key.to_f }	
+  end
 
 	def tick
 		@tickcount += 1
 		if @tickcount >= WIDTH && @tickcount % 20 == 0
 			@score += 1 
 		end
-
 		new_cells
 		keys
-
 		if collision?
 			try_again_screen
 		else
@@ -73,108 +83,98 @@ class Starx
 			position_array = position.split('.')
 			y = position_array[0].to_i
 			x = position_array[1].to_i - 1
-			x = "0#{x}" if x < 10
-			y = "0#{y}" if y < 10
+			x = add_zero_if_needed(x)
+			y = add_zero_if_needed(y)
 			unless x.to_i == 0
 				new_key = "#{y}.#{x}"
 				new_cells[new_key] = value
 			end
 		end
 
-		# switch player cell with empty cell to the right 
-		player_before_switch = new_cells.select {|_,v| v == :player}.keys[0].split('.')
-		x_player_before_switch = player_before_switch[1].to_i
-		y_player_before_switch = player_before_switch[0]
-
-		x_cell_after_player = x_player_before_switch + 1
-
-		x_player_before_switch = "0#{x_player_before_switch}" if x_player_before_switch < 10
-		x_cell_after_player = "0#{x_cell_after_player}" if x_cell_after_player < 10
-
-		cell_after_player = "#{y_player_before_switch}.#{x_cell_after_player}"
-		player_before_switch = player_before_switch.join('.')
-
-		new_cells.delete(cell_after_player)
-		new_cells.delete(player_before_switch)
-		new_cells[cell_after_player] = :player
-		new_cells[player_before_switch] = :empty
+		@cells = new_cells
+    switch_player_with(0,1)
+    new_column
+	end
 
-		# new column
+  def new_column
 		if  @tickcount % 20 == 0 || @tickcount == 1
+      new_full_column
+		else
 			x = WIDTH
-			space = HEIGHT / 5
-			random = rand(HEIGHT - space)
-			for y in 1..random
-				y = "0#{y}" if y < 10
+      (1..HEIGHT).each do |y|
+        y = add_zero_if_needed(y)
 				key = "#{y}.#{x}"
-				new_cells[key] = :full
+				@cells[key] = :empty
 			end
-			for y in random..(random + space)
-				y = "0#{y}" if y < 10	
+		end
+  end
+  
+  def new_full_column
+			x = WIDTH
+			space = HEIGHT / 5
+			random = rand(HEIGHT - space)
+      (1..random).each do |y|
+				y = add_zero_if_needed(y)
 				key = "#{y}.#{x}"
-				new_cells[key] = :empty
+				@cells[key] = :full
 			end
-			for y in (random + space)..HEIGHT
+      (random..(random + space)).each do |y|
+				y = add_zero_if_needed(y)
 				key = "#{y}.#{x}"
-				new_cells[key] = :full
+				@cells[key] = :empty
 			end
-		else
-			x = WIDTH
-			for y in 1..HEIGHT
+      ((random + space)..HEIGHT).each do |y|
+        y = add_zero_if_needed(y)
 				key = "#{y}.#{x}"
-				new_cells[key] = :empty
+				@cells[key] = :full
 			end
-		end
-
-		@cells = new_cells
-	end
+  end
 	
 	def move_up!
-            switch_player_with(1,0)
+    switch_player_with(-1,0)
 	end
 
 	def move_down!	
-            switch_player_with(-1,0)
+    switch_player_with(1,0)
 	end
 
-        def move_forward!
-            switch_player_with(0,-1)
-        end
+  def move_forward!
+    switch_player_with(0,1)
+  end
         
-        def move_backward!
-            switch_player_with(0,1)
-        end
-
-        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
-
-            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
-
-            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 move_backward!
+    switch_player_with(0,-1)
+  end
+
+  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
+
+    player_x = add_zero_if_needed(player_x)
+    player_y = add_zero_if_needed(player_y)
+    cell_x = add_zero_if_needed(cell_x)
+    cell_y = add_zero_if_needed(cell_y)
+
+    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_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_x = add_zero_if_needed(player_x + 1)
 		cell_in_front = "#{player_y}.#{cell_in_front_x}"
 
 		value_of_cell_in_front = @cells.select {|k, v| k == cell_in_front}.values[0]
@@ -186,48 +186,49 @@ class Starx
 			
 	def keys
 		c = read_char
-			case c
-			when 'q'
-				system 'tput cnorm'
-				Process.exit! true
-			when "\e[A"
-				move_up!
-			when "\e[B"
-				move_down!
-                        when "\e[C"
-                                move_forward!
-                        when "\e[D"
-                                move_backward!
-			end
+    case c
+    when 'q'
+      quit_nicely
+    when "\e[A"
+      move_up!
+		when "\e[B"
+			move_down!
+    when "\e[C"
+      move_forward!
+    when "\e[D"
+      move_backward!
+    when "\u0003"
+      quit_nicely
+    end
 	end
 
+  def quit_nicely
+    system 'stty -raw echo'
+	 	system 'tput cnorm'
+    system 'clear'
+		Process.exit! true
+  end
+
 	def read_char
-		begin
-                    system 'stty raw -echo'
-                    if $stdin.ready?
-                        c = $stdin.getc.chr
-                        if c == "\e"
-                            extra_thread = Thread.new do
-                                c += $stdin.getc.chr
-                                c += $stdin.getc.chr
-                            end
-                        extra_thread.join 0.00001
-                        extra_thread.kill
-                        end
-                    end
-                ensure
-                    system 'stty -raw echo'
-                end
-                c
+		system 'tput civis'
+    system 'stty raw -echo'
+    if $stdin.ready?
+      c = $stdin.getc.chr
+      if c == "\e"
+        extra_thread = Thread.new do
+          c += $stdin.getc.chr
+          c += $stdin.getc.chr
         end
+        extra_thread.join 0.00001
+        extra_thread.kill
+      end
+    end
+    c
+  end
 
 	def read_char_menu
-		begin
-			system 'stty raw -echo'
-			c = $stdin.getc.chr
-		ensure
-			system 'stty -raw echo'
-		end
+	  system 'stty raw -echo'
+		c = $stdin.getc.chr
 		c
 	end
 
@@ -237,48 +238,35 @@ class Starx
 		when 'a'
 			Starx.new.play
 		when 'q'
-			system 'tput cnorm'
-			system 'clear'
-			Process.exit! true
+      quit_nicely
+    when "\u0003"
+      quit_nicely
 		else
 			try_again_screen
 		end
 	end
 
 	def try_again_screen
+    system 'stty -raw'
+		(HEIGHT / 2).times{ WIDTH.times { print '*' } }
+    (WIDTH / 2 - 10).times { print ' ' }
+		puts "\e[31m You died. Haha!\e[0m"
+    (WIDTH / 2 - 10).times { print ' ' }
+		puts "\e[32m Your score: #{@score}\e[0m"
+    (WIDTH / 2 - 10).times { print ' ' }
+		puts "To try again hit 'a'"
+    (WIDTH / 2 - 10).times { print ' ' }
+		puts "To quit hit 'q'"
 		(HEIGHT / 2).times{ WIDTH.times { print '*' } }
-		
-		num = WIDTH / 2 
-                (WIDTH / 2 - 10).times{ print ' '}
-		print "\e[31m You died. Haha!\e[0m\n"
-                puts ''
-                (WIDTH / 2 - 10).times{ print ' '}
-		print "\e[32m Your score: #{@score}\e[0m\n"
-                puts ''
-                puts ''
-                (WIDTH / 2 - 10).times{ print ' '}
-		print "To try again hit 'a'\n"
-                (WIDTH / 2 - 10).times{ print ' '}
-		print "To quit hit  'q'\n"
-
-		(HEIGHT / 2 - 1).times{ WIDTH.times { print '*' } }
-		puts ''
 		keys_menu	
-
 	end
 
 	def play
 		loop do
-                    begin
-			tick
+      tick
 			sleep 0.04
-			system 'clear'
-                    rescue Interrupt
-                        system 'tput cnorm'
-                        system 'clear'
-                        Process.exit! true
-                    end
-                 end
+		  system 'clear'
+    end
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starx
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Justyna Rachowicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: justynarachowicz@gmail.com
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Simple, terminal-based game written in ruby