sokoban 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1e7cc5fafc2a73545dcef03810153dd37bb504
-  data.tar.gz: 9c7eee8ba0b588cffb5073c87bb2507ee54209c6
+  metadata.gz: 80e6f6e337c1eebe994d0bdfced62f199935e06e
+  data.tar.gz: b6da9f42629f9bf123a33f5f9c44fd87cefaa145
 SHA512:
-  metadata.gz: 332e0899f91d305e5b7e493ee6125caacae0aa088265c6e02d5799b8911c833b8fecddf92abcec72818692c98a7bc8ce8d4e902112a71d5d244a8365b2d3b30a
-  data.tar.gz: 902fdc58e2e3e4526094872e310a612d3ac50f381b1a0bc98ae8ef9b9813db4286a2297609e46c7716ad3bbccc58ffe3ce329a21ff963ce3b2e9e6d0009d766a
+  metadata.gz: e01076920cdd1dd199223fff53f983bb07a74ac7fe8d8c8402e61c9f19af1b9fc376dc8f525dd88b95454551ef5ff63a1ee8cb86d55cf8745c7b0da5cd58c664
+  data.tar.gz: 6715b40491d31b37e8833046f4919ed3c843b908939eecb40d63b69343baaf267d87424353e79fc65a6a4bb58fdd2f79535a6d34f28c74e0f7b6b66b2feb3ec6

data/lib/sokoban.rb

@@ -26,26 +26,11 @@ module Sokoban
     l.gsub(/\n/, '')
   end
 
-  DIRECTIONS = {
-    W: { x:  0, y: -1 }, # 1
-    A: { x: -1, y:  0 }, # 2
-    S: { x:  0, y:  1 }, # 3
-    D: { x:  1, y:  0 }  # 4
-  }
-
-  # Global variables to ease testing
-  # I still like to initialize them even though
-  # nil is the same as false in an if statement
-  $batch, $hax = false, false
-
-  # Game class separates logger and optparse from internal
-  # Level logic and handles level changes and win condition
   class Game
     def initialize
       @level = Level.new
       parse_opts
-      # --level and --resume may change lnum
-      # set @lnum after parse_opts
+      # --level and --resume opts may change lnum
       @lnum = @level.lnum
       play
     end
@@ -115,7 +100,7 @@ module Sokoban
         end
         
         opts.on("-r", "--resume", "Resume saved game") do
-          @level.load_saved_game
+          @level.load_game
           @options[:resume] = true
         end
 
@@ -154,15 +139,6 @@ module Sokoban
       @pushes = 0
     end
 
-    def moves
-      @moves.size
-    end
-
-    # The public interface to initialize()
-    def restart(lnum)
-      initialize(lnum)
-    end
-
     def play
       while free_boxes > 0
         print self
@@ -185,43 +161,15 @@ module Sokoban
       STDIN.getch
     end
 
-    def free_boxes
-      @level.scan(/o/).size
-    end
-
-    def inspect
-      s = "Level: #{@lnum} Moves: #{@moves.size} Pushes: #{@pushes} "
-      s << @moves.map {|m| DIRECTIONS.keys[m - 1].to_s }.join
-    end
-
-    def to_s
-      clear_screen
-      s = "Level: #{@lnum}\n\n"
-      s << (0...16).map {|i| @level[i * 19, 19] }.join("\n")
-      s << "\nMoves: #{@moves.size} Pushes: #{@pushes}\n> "
-    end
-
-    def load_saved_game
-      file = Zlib::GzipReader.open(SAV_FILE) {|f| f.read }
-      file = file.unpack('C' * file.size)
-      # Initialize Level with @lnum from file
-      @lnum = file.shift
-      initialize(@lnum)
-      # Rebuild @moves
-      moves = []
-      file.map {|c| moves << unpack_nibs(c) }
-      moves.flatten.map {|m| move(DIRECTIONS.keys[m - 1]) }
-    end
-
     def parse_move(input)
       # Handle multiple moves
       input.each_char {|c| parse_move(c) } if input.size > 1
       case input.downcase
       when 'b'; $batch = ! $batch
-      when 'w', 'k', '8'; move(:W) #UP)
-      when 'a', 'h', '4'; move(:A) #LEFT)
-      when 's', 'j', '2'; move(:S) #DOWN)
-      when 'd', 'l', '6'; move(:D) #RIGHT) 
+      when 'w', 'k', '8'; move(:W) # up
+      when 'a', 'h', '4'; move(:A) # left
+      when 's', 'j', '2'; move(:S) # down
+      when 'd', 'l', '6'; move(:D) # right
       when 'r'; initialize(@lnum)
       when 'u'; undo
       when 'q'; quit
@@ -229,29 +177,46 @@ module Sokoban
       end
     end
 
-  private
+    def free_boxes
+      @level.scan(/o/).size
+    end
 
-    def clear_screen
-      30.times { puts }
+    def moves
+      @moves.size
+    end
+
+    # The public interface to initialize()
+    def restart(lnum)
+      initialize(lnum)
+    end
+
+    def inspect
+      s = "Level: #{@lnum} Moves: #{moves} Pushes: #{@pushes} "
+      s << @moves.join
     end
 
-    def pack_nibs(a, b)
-      b.nil? ? (a << 4) | 0 : (a << 4) | b
+    def to_s
+      clear_screen
+      s = "Level: #{@lnum}\n\n"
+      s << (0...16).map {|i| @level[i * 19, 19] }.join("\n")
+      s << "\nMoves: #{moves} Pushes: #{@pushes}\n> "
     end
 
-    def unpack_nibs(c)
-      a, b = ("%2X" % c).split(//).map(&:to_i)
-      b.zero? ? a : [a, b]
+    def load_game
+      file = Zlib::GzipReader.open(SAV_FILE) {|f| f.read }
+      initialize(file.slice!(/\d+/).to_i)  # Init @lnum
+      file.each_char {|c| move(c.to_sym) } # Rebuild @moves
     end
 
+  private
+
     def save_game
-      file = [@lnum]
-      # @moves are 1, 2, 3, or 4 to enable easy bit packing
-      @moves.each_slice(2) {|s| file << pack_nibs(s[0], s[1]) }
-      file = file.pack('C' * file.size)
-      # Gzip becomes space-efficient when @moves is ~99
+      file = ([@lnum] << @moves).flatten.join
       Zlib::GzipWriter.open(SAV_FILE) {|f| f.write(file) }
-      # $ zcat sokoban.save.gz | hexdump
+    end
+
+    def clear_screen
+      30.times { puts }
     end
 
     def undo
@@ -298,6 +263,13 @@ module Sokoban
       @level[x + y * 19] = v
     end
 
+    DIRECTIONS = {
+      W: { x:  0, y: -1 },
+      A: { x: -1, y:  0 },
+      S: { x:  0, y:  1 },
+      D: { x:  1, y:  0 }
+    }
+
     def move(direction)
       x, y = find_player
       dx = DIRECTIONS[direction][:x]
@@ -326,8 +298,7 @@ module Sokoban
       self[x + dx, y + dy] = (dest == ' ') ? '@' : '+'
       # Update previous position
       self[x, y] = (self[x, y] == '@') ? ' ' : '.'
-      # Directions 1, 2, 3, 4
-      @moves << DIRECTIONS.keys.index(direction) + 1
+      @moves << direction.to_s
       # Save a copy of the level in case of undo
       @state << @level.dup
     end

data/lib/sokoban/version.rb

@@ -1,3 +1,3 @@
 module Sokoban
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sokoban
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Boohbah