a_maze_ing 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2d90d1b404af1a23d3c15aa56ba2b43980a053
-  data.tar.gz: 16c989a33c190aa047ea29d4e3e1a4edac58678d
+  metadata.gz: bea18e1b9eec1221cb36c713893f99ff44cf831e
+  data.tar.gz: 40f936d618109039369390e94855df168f64be10
 SHA512:
-  metadata.gz: 2869dfccd82fe6eb394db5e1b2c80a79d97a35de8263baf0405f0a7fe611383ffc58aa8ae89d84fb3ae7f0b1d85e5a1f0560e968e26d390d648b2aa3d984e880
-  data.tar.gz: b61f4b49474ef300ea74daeed71aad0eac7ff8a17910cbc2e3c106447e3b1aecfce1aae3c2a5c0c3462197c547756eb570284e3c90651704d1cb22d2d1c7ef89
+  metadata.gz: 265c9c7436b4cded302b5aa41494810b24404bbe0e86410dc4cb44ba429c219f3914d1edba8e3983697f848f00c22591054be4dc188c016d93cfcee8f5334d43
+  data.tar.gz: 70d4e2290dd907d29e96cfffece7ada0616a2da6705b5be003b1281dc81eb665b6258148a7ca307abd276c5b535a01810030eb24efc5acb971385fef5896219e

data/lib/a_maze_ing/game_window.rb

@@ -23,13 +23,13 @@ module AMazeIng
 
   class GameWindow < Window
     $rows = $cols = ROWS
+    $target_cell_index_x = TARGET_CELL_INDEX_X
+    $target_cell_index_y = TARGET_CELL_INDEX_Y
     def initialize(full_screen, game_mode)
       @game_mode = game_mode
       super DIMENSION + SIDE_BAR, DIMENSION, full_screen, 30
       self.caption = "Maze"
 
-      
-      
       #---------------------------------------------------------------------------------#
       # create code block (update, player_draw and new_player) for different game mode  #
       #---------------------------------------------------------------------------------#
@@ -100,9 +100,6 @@ module AMazeIng
         @infor = Infor.new(PLAYER_COLOR_PRIMARY, PLAYER_COLOR_ANGRY)
       end
 
-      @target_x = (TARGET_CELL_INDEX_X * $cell_size) + $cell_size/2 - $player_size/2
-      @target_y = (TARGET_CELL_INDEX_Y * $cell_size) + $cell_size/2 - $player_size/2
-
     end # End initialize function
     
 
@@ -111,10 +108,14 @@ module AMazeIng
       $cols += 2
       @maze = Maze.new
       @maze.generate_maze
-      @new_player_lambda.call      
+      @new_player_lambda.call
+      $target_cell_index_x += 2
+      $target_cell_index_y += 2
+      @target_x = ($target_cell_index_x * $cell_size) + $cell_size/2 - $player_size/2
+      @target_y = ($target_cell_index_y * $cell_size) + $cell_size/2 - $player_size/2
     end
 
-    def draw_target(cell)
+    def draw_target
       draw_quad @target_x,                @target_y,                Color::WHITE,
                 @target_x + $player_size, @target_y,                Color::WHITE,
                 @target_x + $player_size, @target_y + $player_size, Color::WHITE,
@@ -122,7 +123,7 @@ module AMazeIng
     end
 
     def check_for_finish(player)
-      if player.cell_index_x == $cells[-1].cell_index_x and player.cell_index_y == $cells[-1].cell_index_y
+      if player.x == @target_x and player.y == @target_y
         new_round
         @infor.level += 1
         return true
@@ -132,7 +133,7 @@ module AMazeIng
     end
 
     def check_for_collision(player_1, player_2)
-      if player_2.cell_index_x == player_1.cell_index_x and player_2.cell_index_y == player_1.cell_index_y
+      if (player_2.x - player_1.x).abs < $player_size and (player_2.y - player_1.y).abs < $player_size
         new_round
         @infor.level += 1
         return true
@@ -156,7 +157,7 @@ module AMazeIng
       end
       @player_draw_lambda.call
       @infor.draw
-      draw_target($cells[-1])
+      draw_target
     end
 
     # check weather the direction player want to go to available or not

data/lib/a_maze_ing/player.rb

@@ -1,6 +1,6 @@
 module AMazeIng
   class Player
-    attr_accessor :cell_index_x, :cell_index_y, :target_x, :target_y, :is_moving, :path
+    attr_accessor :cell_index_x, :cell_index_y, :target_x, :target_y, :is_moving, :path, :x, :y
     def initialize(cell_index_x, cell_index_y, color)
       @color = color
       @cell_index_x = cell_index_x

data/lib/a_maze_ing/version.rb

@@ -1,3 +1,3 @@
 module AMazeIng
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a_maze_ing
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - at-cuongtran
@@ -88,6 +88,7 @@ files:
 - bin/setup
 - images/annoying_friend.jpg
 - images/classic.jpg
+- images/help.jpg
 - images/multiplayer.jpg
 - lib/a_maze_ing.rb
 - lib/a_maze_ing/cell.rb