gruesome 0.0.3 → 0.0.4

data/README.md

@@ -15,13 +15,12 @@
 
 # Gruesome
 
-The Ruby Z-Code Emulator and IF Manager (Currently in progress). It current can
+The Ruby Z-Code Emulator and IF Manager (Currently in progress). It currently can
 play version 3 games such as the ZORK trilogy.
 
 ## Currently implemented
 
 * Majority of version 3 Z-Machine (Enough to play most games)
-* WARNING: Save and Restore are not implemented!!!!! Don't get eaten by a grue!
 
 ## To play
 

data/lib/gruesome/cli.rb

@@ -5,66 +5,66 @@ require_relative 'machine'
 require_relative 'logo'
 
 module Gruesome
-	class CLI
-		BANNER = <<-USAGE
-		Usage:
-		  gruesome play STORY_FILE
-
-		Description:
-		  The 'play' command will start a session of the story given as STORY_FILE
-
-		Example:
-		  gruesome play zork1.z3
-
-		USAGE
-
-		class << self
-			def parse_options
-				@opts = OptionParser.new do |opts|
-					opts.banner = BANNER.gsub(/^\t{2}/, '')
-
-					opts.separator ''
-					opts.separator 'Options:'
-
-					opts.on('-h', '--help', 'Display this help') do
-						puts opts
-						exit
-					end
-				end
-
-				@opts.parse!
-			end
-
-			def CLI.run
-				begin
-					parse_options
-				rescue OptionParser::InvalidOption => e
-					warn e
-					exit -1
-				end
-
-				def fail
-					puts @opts
-					exit -1
-				end
-
-				if ARGV.empty?
-					fail
-				end
-
-				case ARGV.first
-				when 'play'
-					fail unless ARGV[1]
-
-					Gruesome::Logo.print
-
-					puts
-					puts "--------------------------------------------------------------------------------"
-					puts
-
-					Gruesome::Machine.new(ARGV[1]).execute
-				end
-			end
-		end
-	end
+  class CLI
+    BANNER = <<-USAGE
+    Usage:
+      gruesome play STORY_FILE
+
+    Description:
+      The 'play' command will start a session of the story given as STORY_FILE
+
+    Example:
+      gruesome play zork1.z3
+
+    USAGE
+
+    class << self
+      def parse_options
+        @opts = OptionParser.new do |opts|
+          opts.banner = BANNER.gsub(/^    /, '')
+
+          opts.separator ''
+          opts.separator 'Options:'
+
+          opts.on('-h', '--help', 'Display this help') do
+            puts opts
+            exit
+          end
+        end
+
+        @opts.parse!
+      end
+
+      def CLI.run
+        begin
+          parse_options
+        rescue OptionParser::InvalidOption => e
+          warn e
+          exit -1
+        end
+
+        def fail
+          puts @opts
+          exit -1
+        end
+
+        if ARGV.empty?
+          fail
+        end
+
+        case ARGV.first
+        when 'play'
+          fail unless ARGV[1]
+
+          Gruesome::Logo.print
+
+          puts
+          puts "--------------------------------------------------------------------------------"
+          puts
+
+          Gruesome::Machine.new(ARGV[1]).execute
+        end
+      end
+    end
+  end
 end

data/lib/gruesome/logo.rb

@@ -3,10 +3,10 @@
 # DO NOT REMOVE ABOVE COMMENT! IT IS MAGIC!
 
 module Gruesome
-	module Logo
-		# I'm just making sure this works regardless of the unicode format this
-		# source file is saved as...
-		LOGO = <<ENDLOGO
+  module Logo
+    # I'm just making sure this works regardless of the unicode format this
+    # source file is saved as...
+    LOGO = <<ENDLOGO
         ▄▄▄▄▄                                               ▄▄▄▄▄                       
          ▀████▄                                           ▄████▀                     
            ▀████▄                                       ▄████▀                       
@@ -21,8 +21,8 @@ module Gruesome
   ▀▀▀▀▀▀    ▀▀▀   ▀▀▀   ▀▀▀▀▀     ▀▀▀▀▀▀   ▀▀▀▀▀▀     ▀▀▀▀▀   ▀▀▀   ▀▀▀   ▀▀▀▀▀▀
 ENDLOGO
 
-		def Logo.print
-			puts LOGO
-		end
-	end
+    def Logo.print
+      puts LOGO
+    end
+  end
 end

data/lib/gruesome/machine.rb

@@ -1,17 +1,17 @@
 require_relative 'z/machine'
 
 module Gruesome
-	class Machine
-		def initialize(story_file)
-			# Later, detect the type
-			#
-			# For now, assume Z-Machine
+  class Machine
+    def initialize(story_file)
+      # Later, detect the type
+      #
+      # For now, assume Z-Machine
 
-			@machine = Z::Machine.new(story_file)
-		end
+      @machine = Z::Machine.new(story_file)
+    end
 
-		def execute
-			@machine.execute
-		end
-	end
+    def execute
+      @machine.execute
+    end
+  end
 end

data/lib/gruesome/version.rb

@@ -1,3 +1,3 @@
 module Grue
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/gruesome/z/abbreviation_table.rb

@@ -7,24 +7,24 @@ require_relative 'header'
 require_relative 'zscii'
 
 module Gruesome
-	module Z
-		class AbbreviationTable
-			def initialize(memory)
-				@memory = memory
-				@header = Header.new(@memory.contents)
-			end
+  module Z
+    class AbbreviationTable
+      def initialize(memory)
+        @memory = memory
+        @header = Header.new(@memory.contents)
+      end
 
-			def lookup(alphabet, index, translation_alphabet)
-				abbrev_index = (32 * (alphabet)) + index
-				addr = @header.abbrev_tbl_addr + abbrev_index*2
+      def lookup(alphabet, index, translation_alphabet)
+        abbrev_index = (32 * (alphabet)) + index
+        addr = @header.abbrev_tbl_addr + abbrev_index*2
 
-				# this will yield a word address, which we multiply by 2
-				# to get into a byte address
-				str_addr = @memory.force_readw(addr)
-				str_addr *= 2
+        # this will yield a word address, which we multiply by 2
+        # to get into a byte address
+        str_addr = @memory.force_readw(addr)
+        str_addr *= 2
 
-				ZSCII.translate(translation_alphabet, @header.version, @memory.force_readzstr(str_addr)[1], nil)
-			end
-		end
-	end
+        ZSCII.translate(translation_alphabet, @header.version, @memory.force_readzstr(str_addr)[1], nil)
+      end
+    end
+  end
 end