inform6lib 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c832fae34b158458f4ff2550832e9756033a725633750854d4afae675f915eab
-  data.tar.gz: 93ce34112c5b2c236ab1eb3aa0027ee8fce90e39249c1dc5b3d3d33310142e1a
+  metadata.gz: 1a01e92e72e9235aa5b0e0a651ca36c75d91f78cb006b5e99a70946e40425063
+  data.tar.gz: acb6a79edad225ea9916ddfa0de94ffc2e27c80a4f2fe14f307d7b3624cee052
 SHA512:
-  metadata.gz: 57c086700bcaeef38381113c158c6922983e2918ede45937a04615efc4cd0286df39eb8d8dbad06dcdfa2496bdc41d747fe029d6b6ce91537cc57b193b6deae8
-  data.tar.gz: ddad647de642419cdf28a6b7c790a37dc443dd705bc62a017c9ef8334a6546d34a4d5ca9abdb6da8431244a05d74f37fa8e5661aaaa1f650afd310302ad8c543
+  metadata.gz: 5a73a47b1d651f637fea6d2c1d5d52b967bec03576ee52823aacc501ead25ed8fc5f6d308d4667b6706a804dfa8cf57727eddc8c69d9dba4efb7fe098fb95cdd
+  data.tar.gz: 20bd89c962dd677dd6cce6fef1f120403118f7e09b9edea39148e6579ec1e810f047b2eb5f81038efb746147df286b678f85b6dd89363a5b70ec2221aaff5cbe

data/Rakefile

@@ -47,7 +47,7 @@ task :verify do
   system('bundle', 'exec', 'rspec', 'spec/verify_gem_spec.rb') or abort
   system('bundle', 'exec', 'rake', 'clean')
 end
-task verify: :explode
+task verify: %i[package explode]
 
 desc 'Host dev gem'
 task :devhost do

data/lib/inform/English.h.rb

@@ -28,12 +28,13 @@
 module Inform
 # The English module
 module English
-  ENGLISH_DIALECT       = true
+  DIALECT_US            = true
 
   NONSENSE              = 10
-  REPEATED_ORDER        = 20
+  REPEATED_COMMAND      = 20
   NOTHING_TO_REPEAT     = 21
   UNEXPECTED_COMMA      = 22
+  MISSING_ADDRESSEE     = 23
   CANT_TALK             = 24
   SPEECH_THERAPY        = 25
   CANNOT_UNDERSTAND     = 27
@@ -73,11 +74,18 @@ module English
       @article = article
       has :scenery
     end
+    def description
+      return true if location.respond_to?(:compass_look) && location.compass_look(self)
+      return true if self.compass_look()
+      L__M(:Look, 7, self)
+    end
+    def compass_look = false
   end
 
   Compass = Inform::Ephemeral::Object.new "compass"
   Compass.has :concealed
 
+  unless defined?(WITHOUT_DIRECTIONS)
   Compass > $n_obj  = CompassDirection.new("north") {
     name "n"
     door_dir :n_to
@@ -104,10 +112,11 @@ module English
   }
   Compass > $d_obj = CompassDirection.new("ground")
   $d_obj.with  { door_dir :d_to;  name ["d", "down", "floor", "below"] }
+  end # WITHOUT_DIRECTIONS
 
-  $in_obj = CompassDirection.new("inside")
+  Compass > $in_obj = CompassDirection.new("inside")
   $in_obj.with { door_dir :in_to; name "in" }
-  $out_obj = CompassDirection.new("outside")
+  Compass > $out_obj = CompassDirection.new("outside")
   $out_obj.with { door_dir :out_to; name "out" }
 
   # ------------------------------------------------------------------------------
@@ -278,10 +287,10 @@ module English
   def LanguageNumber(n)
     if n == 0;       print "zero"; return false; end
     if n < 0;        print "minus "; n = -n; end
-    if n >= 1000;    print LanguageNumber((n / 1000.to_f).to_i) + " thousand"; n = n % 1000; f = 1; end
+    if n >= 1000;    LanguageNumber((n / 1000.to_f).to_i); print " thousand"; n = n % 1000; f = 1; end
     if n >= 100
       print COMMA__TX if f == 1
-      print LanguageNumber((n / 100.to_f).to_i) + " hundred"
+      LanguageNumber((n / 100.to_f).to_i); print " hundred"
       n = n % 100
       f = 1
     end
@@ -333,7 +342,7 @@ module English
     i = hours % 12
     i = 12 if i == 0
     print " " if i < 10
-    print i + ":" + (mins / 10.to_f).to_i + (mins % 10)
+    print i.to_s + ":" + (mins / 10.0).to_i.to_s + (mins % 10).to_s
     if (hours / 12.to_f).to_i > 0 then print " pm" else print " am" end
   end
 
@@ -589,26 +598,6 @@ module English
               if x1.has?(:supporter); println "(getting onto " + the(x1) + ")"; end
               if x1.has?(:container); println "(getting into " + the(x1) + ")"; end
               "(entering " + the(x1) + ")\n"
-      # else # NI_BUILD_COUNT
-      # when 6 then print "(getting "
-      #         if x1.has? :supporter
-      #           print "off "
-      #         else
-      #           print "out of "
-      #         end
-      #         print the(x1;) ")"
-      # when 7 then if x1.has?(:supporter); println "(getting onto " + the(x1) + ")"; end
-      #         if x1.has?(:container); println "(getting into " + the(x1) + ")"; end
-      #         "(entering " + the(x1) + ")\n"
-      # end
-      # # defined? NI_BUILD_COUNT
-      when 8 then s = The(player) + " gets "
-              s << if x1.has? :supporter
-                "onto "
-              else
-                "into "
-              end
-              s << the(x1) + "."
       end
     when :Examine then case n
       when 1 then "Darkness, noun.  An absence of light to see by."
@@ -651,7 +640,7 @@ module English
       end
     when :Fill then     "But there's no water here to carry."
     when :FullScore then case n
-      when 1 then if @deadflag
+      when 1 then if @deadflag != 0
                 print "The score was "
               else
                 print "The score is "
@@ -805,9 +794,9 @@ module English
               "."
       when 5,6
               if x1 != @visibility_ceiling
-                if x1.has? :supporter then print "On " else print "In " end
+                if x1.has? :supporter then print "\nOn " else print "\nIn " end
                 print the(x1) + " you"
-              else print "You" end
+              else print "\nYou" end
               print " can "
               print "also " if n == 5
               print "see "
@@ -820,9 +809,7 @@ module English
               else
                 " here."
               end
-      when 7 then "You see nothing of interest in that direction."
-      when 8 then if x1.has?(:supporter); print " (on "; else; print " (in "; end
-              print the(x1) + ")"
+      when 7 then "You see nothing unexpected in that direction."
       end
     when :LookUnder then case n
       when 1 then "But it's dark."
@@ -836,26 +823,14 @@ module English
       when 3 then print " You have died "
       when 4 then print " You have won "
       when 5 then print "\nWould you like to RESTART, RESTORE a saved game"
-              # if defined? DEATH_MENTION_UNDO
-              #   print ", UNDO your last move"
-              # end
-              # # defined? DEATH_MENTION_UNDO
-              print ", give the FULL score for that game" if TASKS_PROVIDED == 0
-              # if defined? NI_BUILD_COUNT
-              #   if (@deadflag == 2 && (I7_Amusing_Provided()))
-              #     print ", see some suggestions for AMUSING things to do"
-              #   end
-              # else
-              #   if (@deadflag == 2 && AMUSING_PROVIDED == 0)
-              #     print ", see some suggestions for AMUSING things to do"
-              #   end
-              # end
-              # # defined? NI_BUILD_COUNT
-              # if defined? I7_SERIAL_COMMA
-              #   print ","
-              # end
-              # # defined? I7_SERIAL_COMMA
-              " or QUIT?"
+             if defined?(DEATH_MENTION_UNDO)
+               print ", UNDO your last move"
+             end
+             print ", give the FULL score for that game" if TASKS_PROVIDED == 0
+             if deadflag == 2 && AMUSING_PROVIDED == 0
+               print ", see some suggestions for AMUSING things to do"
+             end
+             " or QUIT?"
       when 6 then "[Your interpreter does not provide \"undo\".  Sorry!]"
       when 7 then "\"Undo\" failed.  [Not all interpreters provide it.]"
       # when 7 then "[You cannot \"undo\" any further.]"
@@ -1030,7 +1005,7 @@ module English
       when 2 then "Ok."
       end
     when :Score then case n
-      when 1 then if @deadflag
+      when 1 then if @deadflag != 0
                 print "In that game you scored "
               else
                 print "You have so far scored "
@@ -1052,14 +1027,7 @@ module English
       end
     when :Search then case n
       when 1 then "But it's dark."
-      when 2
-              print "There is nothing "
-              if x1.has? :container
-                print "in "
-              else
-                print "on "
-              end
-              the(x1) + "."
+      when 2 then "There is nothing on " + the(x1) + "."
       when 3 then print "On " + the(x1)
               WriteListFrom(child(x1), ENGLISH_BIT + TERSE_BIT + CONCEAL_BIT + ISARE_BIT)
               "."
@@ -1099,7 +1067,7 @@ module English
                   end
       end
     when :Sorry then case n
-      when 1 then if defined? ENGLISH_DIALECT then "Oh, don't apologize." else "Oh, don't apologise." end
+      when 1 then if defined? DIALECT_US then "Oh, don't apologize." else "Oh, don't apologise." end
       when 2 then A(player) + " apologizes profusely."
       end
     when :Squeeze then case n

data/lib/inform/Parser.h.rb

@@ -49,7 +49,7 @@ if defined? TARGET_ZCODE     # offsets into Z-machine header
 
 HDR_ZCODEVERSION  = 0x00     # byte
 HDR_TERPFLAGS     = 0x01     # byte
-HDR_GAMERELEASE   = 0x02     # word
+HDR_GAMERELEASE   = 0x02 unless defined?(HDR_GAMERELEASE) # word
 HDR_HIGHMEMORY    = 0x04     # word
 HDR_INITIALPC     = 0x06     # word
 HDR_DICTIONARY    = 0x08     # word
@@ -57,7 +57,7 @@ HDR_OBJECTS       = 0x0A     # word
 HDR_GLOBALS       = 0x0C     # word
 HDR_STATICMEMORY  = 0x0E     # word
 HDR_GAMEFLAGS     = 0x10     # word
-HDR_GAMESERIAL    = 0x12     # six ASCII characters
+HDR_GAMESERIAL    = 0x12 unless defined?(HDR_GAMESERIAL) # six ASCII characters
 HDR_ABBREVIATIONS = 0x18     # word
 HDR_FILELENGTH    = 0x1A     # word
 HDR_CHECKSUM      = 0x1C     # word
@@ -102,7 +102,7 @@ ROM_GAMESERIAL    = 0x36     # six ASCII characters
 end
 # ! defined? TARGET_
 
-if defined? VN_1610
+unless defined? VN_1610
   Message(fatalerror: "*** Library 6/11 needs Inform v6.10 or later to work ***")
 end
 # defined? VN_1610

data/lib/inform/VerbLib.h.rb

@@ -31,7 +31,7 @@ Default :MAX_SCORE,        0
 Default :NUMBER_TASKS,     1
 Default :OBJECT_SCORE,     4
 Default :ROOM_SCORE,       5
-Default :SACK_OBJECT,      0
+Default :SACK_OBJECT,      nil
 Default :TASKS_PROVIDED,   1
 
 # The Verbs module

data/lib/inform/infix.h.rb

@@ -708,7 +708,7 @@ if defined? DEBUG_INFIX
 #         strings of text: but you can send messages, call routines or
 #         assign values to variables, properties and array entries.
 #         ^   ~; score++~ is one way to get on in the world.
-#         ^   ~; deadflag = true~ is one way to get out of it.
+#         ^   ~; deadflag != 0 ~ is one way to get out of it.
 #         ^   ~; StopDaemon(nasty little dwarf)~ will keep you from being pestered.^
 #         Conditions like ~; score>20~ are also allowed and print
 #         either 1 (if true) or 0 (if false).^^";