pitchcar 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34b441fcb4b47af154322a33d400d5d44b45c991
-  data.tar.gz: 317cfcab1c9f5d4b76f39c61cf0caade4818531e
+  metadata.gz: 3c87085eb4eec9b96a86d1299c0a787e9355517a
+  data.tar.gz: 67ebc8e58b5e251de59f5ea59050526310364922
 SHA512:
-  metadata.gz: 4d2ed02d11e5532334700b213ebb56fecafdd285a674a0f157423b02b6b0afb35c5268ddede6eae2594c6a1643ab5b043bb6dc3e0734836a4bf7321a16acfb7c
-  data.tar.gz: 5bb3282a7b02b483dd02221fca414e492b77808f38cff60d695fd85f610967d76d8a4900d2f7667421fad8195384017c65973f8fc0a7c6562ab93c510bed2c6c
+  metadata.gz: 846e2794000ba3c86f7481af1f38899052af0fbbf82c6a324362b3b21c55aee72e1c8688d8762eb30bde38f064b73fd948ac49f572aa09d6728952d721be0e9c
+  data.tar.gz: 85574ef85a7d5ee3e0f9409e0c16ce6f3eb1e7f20d89d143a476159154bb467aaafd1412402213fc2fece9138ff925ff46e04f2e2e4782c1df2c0b1b1d34b4ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pitchcar (0.4.1)
+    pitchcar (0.6.0)
       bazaar
       rmagick
 

data/lib/piece.rb

@@ -3,10 +3,11 @@ require 'rmagick'
 
 module Pitchcar
   class Piece
-    TYPES = { STRAIGHT: 0, LEFT: 1, RIGHT: 2, STRAIGHT_LEFT_WALL: 3, STRAIGHT_RIGHT_WALL: 4 }
+    TYPES = { STRAIGHT: 0, LEFT: 1, RIGHT: 2, STRAIGHT_LEFT_WALL: 3, STRAIGHT_RIGHT_WALL: 4, STRAIGHT_START: 5 }
     DIRECTIONS = { NORTH: 0, EAST: 1, WEST: 2, SOUTH: 3 }
-    STRAIGHT_IMAGE, CURVE_IMAGE = Magick::ImageList.new(File.expand_path('../images/straight_tile.png', __FILE__),
-                                                        File.expand_path('../images/curve_tile.png', __FILE__)).to_a
+    STRAIGHT_IMAGE, CURVE_IMAGE, START_IMAGE = Magick::ImageList.new(File.expand_path('../images/straight_tile.png', __FILE__),
+                                                                     File.expand_path('../images/curve_tile.png', __FILE__),
+                                                                     File.expand_path('../images/start_tile.png', __FILE__)).to_a
     attr_accessor :direction, :x, :y, :type
 
     def self.starting_piece
@@ -66,11 +67,37 @@ module Pitchcar
       { x: x, y: y, type: TYPES.key(type).downcase, direction: DIRECTIONS.key(direction).downcase }
     end
 
+    # Slw N = Srw S
+    # Slw E = Srw W
+    # Slw W == Srw E
+    # Slw S = Srw N
+
     def image
+      if (type == TYPES[:STRAIGHT_LEFT_WALL] && direction == DIRECTIONS[:NORTH]) || (type == TYPES[:STRAIGHT_RIGHT_WALL] && direction == DIRECTIONS[:SOUTH])
+        return STRAIGHT_IMAGE.rotate(90)
+      elsif (type == TYPES[:STRAIGHT_LEFT_WALL] && direction == DIRECTIONS[:EAST]) || (type == TYPES[:STRAIGHT_RIGHT_WALL] && direction == DIRECTIONS[:WEST])
+        return STRAIGHT_IMAGE.rotate(180)
+      elsif (type == TYPES[:STRAIGHT_LEFT_WALL] && direction == DIRECTIONS[:WEST]) || (type == TYPES[:STRAIGHT_RIGHT_WALL] && direction == DIRECTIONS[:EAST])
+        return STRAIGHT_IMAGE
+      elsif (type == TYPES[:STRAIGHT_LEFT_WALL] && direction == DIRECTIONS[:SOUTH]) || (type == TYPES[:STRAIGHT_RIGHT_WALL] && direction == DIRECTIONS[:NORTH])
+        return STRAIGHT_IMAGE.rotate(270)
+      end
+
       case type
-      when TYPES[:STRAIGHT], TYPES[:STRAIGHT_LEFT_WALL], TYPES[:STRAIGHT_RIGHT_WALL]
+      when TYPES[:STRAIGHT]
         return STRAIGHT_IMAGE.rotate(90) if direction == DIRECTIONS[:NORTH] || direction == DIRECTIONS[:SOUTH]
-        return STRAIGHT_IMAGE
+        STRAIGHT_IMAGE
+      when TYPES[:STRAIGHT_START]
+        case direction
+        when DIRECTIONS[:NORTH]
+          START_IMAGE.rotate(270)
+        when DIRECTIONS[:EAST]
+          START_IMAGE
+        when DIRECTIONS[:WEST]
+          START_IMAGE.rotate(180)
+        when DIRECTIONS[:SOUTH]
+          START_IMAGE.rotate(90)
+        end
       when TYPES[:LEFT]
         case direction
         when DIRECTIONS[:NORTH]

data/lib/track.rb

@@ -46,7 +46,6 @@ module Pitchcar
     end
 
     def to_s
-      pieces[0].type = Piece::TYPES[:STRAIGHT_RIGHT_WALL]
       pieces.map(&:to_s).join(' ')
     end
 
@@ -69,6 +68,7 @@ module Pitchcar
     def overlaps?
       @overlaps ||= pieces.group_by { |piece| [piece.x, piece.y] }.values.any? { |set| set.size > 1 }
     end
+    require 'pry'
 
     def with_wall_combinations(pieces = PieceList.new(self.pieces)[1..-1], combinations = [])
       straight_index = pieces.find_index { |piece| piece.type == Piece::TYPES[:STRAIGHT] }
@@ -81,8 +81,16 @@ module Pitchcar
         end
         combos
       else
-        combinations << Track.new([self.pieces.first] + pieces)
+        track = Track.new([self.pieces.first] + pieces)
+        track.pieces.first.type = Piece::TYPES[:STRAIGHT_RIGHT_WALL]
+        random_right_wall = track.pieces.each_index.select do |index|
+          puts track.pieces[index].type
+          track.pieces[index].type == Piece::TYPES[:STRAIGHT_RIGHT_WALL]
+        end.sample
+        track.pieces[random_right_wall].type = Piece::TYPES[:STRAIGHT_START]
+        combinations << track
       end
+      return combinations
     end
 
     # Returns pieces list sorted from in a top-bottom left-right manner

data/lib/track_image.rb

@@ -4,7 +4,7 @@ module Pitchcar
   class TrackImage
     attr_accessor :track
     TILE_SIZE = 570
-    OFFSET_SIZE = -46
+    OFFSET_SIZE = -50
     TITLE_OFFSET = 200
     BLANK_TILE = Magick::Image.new(TILE_SIZE, TILE_SIZE) { |canvas| canvas.background_color = 'white' }
 

data/pitchcar.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'pitchcar'
-  spec.version     = '0.5.1'
+  spec.version     = '0.6.0'
   spec.date        = '2017-02-23'
   spec.summary     = 'Pitchcar Track Generator'
   spec.description = 'Generates tracks for pitchcar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pitchcar
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jonah Hirsch
@@ -50,6 +50,7 @@ files:
 - Readme.md
 - lib/boyermoore.rb
 - lib/images/curve_tile.png
+- lib/images/start_tile.png
 - lib/images/straight_tile.png
 - lib/piece.rb
 - lib/pitchcar.rb