inform6lib 0.1.1 → 0.1.3

data/lib/inform/verblibm.h.rb

@@ -101,7 +101,7 @@ module Verbs
 
   def RunTimeError(n, p1 = nil, p2 = nil)
     if defined? DEBUG
-      print "** Library error #{n} (p1,p2) **\n** "
+      print "** Library error #{n} (#{p1},#{p2}) **\n** "
       case n
       when 1  then   print "preposition not found (this should not occur)"
       when 2  then   print "Property value not routine or string: \"#{p2}\" of \"#{p1}\"" +
@@ -1054,11 +1054,11 @@ module Verbs
 
   def RestartSub
     L__M(:Restart, 1)
-    __restart if YesOrNo()
+    __restart { L__M(:Restart, 2) } if YesOrNo()
   end
 
   def RestoreSub
-    return if self.respond_to?(:__restore) && __restore(self.method(:RMaybe))
+    return if self.respond_to?(:__restore) && __restore { RMaybe() }
     L__M(:Restore, 1)
   end
 
@@ -1067,7 +1067,7 @@ module Verbs
   end
 
   def SaveSub
-    return if self.respond_to?(:__save) && __save(self.method(:SMaybe))
+    return if self.respond_to?(:__save) && __save { SMaybe() }
     L__M(:Save, 1)
   end
 
@@ -1076,7 +1076,7 @@ module Verbs
   end
 
   def VerifySub
-    return if self.respond_to?(:__verify) && __verify(self.method(:Vmaybe))
+    return if self.respond_to?(:__verify) && __verify { Vmaybe() }
     Vwrong()
   end
 
@@ -1140,7 +1140,64 @@ module Verbs
 #   The scoring system
 # ----------------------------------------------------------------------------
 
-  # See: metaverbs.rb
+  def ScoreSub
+    if defined?(NO_SCORE)
+    return L__M(:Score, 2) if @deadflag == 0
+    else
+    L__M(:Score, 1)
+    PrintRank()
+    end # NO_SCORE
+  end
+
+  unless defined?(TaskScore)
+  def TaskScore(i)
+    task_scores[i]
+  end
+  end
+
+  def Achieved(num)
+    if task_done[num].nil?
+      task_done[num] = true
+      score = score + TaskScore(num)
+    end
+  end
+
+  def PANum(m)
+    print "  "
+    n = m
+    if n < 0    then n = -m; n = n*10; end
+    if n < 10   then print "   "; return Panuml(); end
+    if n < 100  then print "  "; return Panuml(); end
+    if n < 1000 then print " "; end
+
+    Panuml()
+  end
+
+  def Panuml
+    print m + " "
+  end
+
+  def FullScoreSub
+    ScoreSub()
+    return false if score == 0 || TASKS_PROVIDED == 1
+    new_line
+    L__M(:FullScore, 1)
+    for i in 0..NUMBER_TASKS
+      if task_done[i] == true
+        PANum(TaskScore(i))
+        PrintTaskName(i)
+      end
+    end
+    if things_score != 0
+      PANum(things_score)
+      L__M(:FullScore, 2)
+    end
+    if places_score != 0
+      PANum(places_score)
+      L__M(:FullScore, 3)
+    end
+    new_line; PANum(score); L__M(:FullScore, 4)
+  end
 
 # ----------------------------------------------------------------------------
 #   Real verbs start here: Inventory
@@ -1201,12 +1258,12 @@ module Verbs
   end
 
   def ObjectScopedBySomething(item)
-    i = item; return false unless i
+    i = item; return false if i.nil?
     Inform::Object.each do |j|
       next unless j.respond_to?(:add_to_scope)
-      return j if j.add_to_scope.include?(j)
+      return j if j.add_to_scope.include?(i)
     end
-    return false
+    false
   end
 
   def ObjectIsUntouchable(item, flag1 = nil, flag2 = nil, persona = nil)
@@ -1227,62 +1284,57 @@ module Verbs
     ancestor = CommonAncestor(persona, item)
     if ancestor.nil?
       ancestor = item
-      loop do
-        break unless ancestor && (i = ObjectScopedBySomething(ancestor)).nil?
+      i = nil
+      while !ancestor.nil? && (i = ObjectScopedBySomething(ancestor)) == false
         ancestor = parent(ancestor)
       end
-      unless i.nil?
-        return false
-        # return false if ObjectIsUntouchable(i, flag1, flag2) # TODO: FIXME
+      if i != false && !i.nil?
+        return true if ObjectIsUntouchable(i, flag1, flag2)
         # An item immediately added to scope
       end
-    else
 
-      # First, a barrier between the persona and the ancestor.  The persona
-      # can only be in a sequence of enterable objects, and only closed
-      # containers form a barrier.
+    # First, a barrier between the persona and the ancestor.  The persona
+    # can only be in a sequence of enterable objects, and only closed
+    # containers form a barrier.
 
-      if persona != ancestor
-        i = parent(persona)
-        loop do
-          break unless i != ancestor
-          if i.has?(:container) && i.hasnt?(:open)
-            return true if flag1
-            return L__M(:Take, 9, i)
-          end
-          i = parent(i)
+    elsif persona != ancestor
+      i = parent(persona)
+      while i != ancestor
+        if i.has?(:container) && i.hasnt?(:open)
+          return true if flag1
+          return L__M(:Take, 9, i)
         end
+        i = parent(i)
       end
+    end
 
-      # Second, a barrier between the item and the ancestor.  The item can
-      # be carried by someone, part of a piece of machinery, in or on top
-      # of something and so on.
+    # Second, a barrier between the item and the ancestor.  The item can
+    # be carried by someone, part of a piece of machinery, in or on top
+    # of something and so on.
 
-      if item != ancestor
-        i = parent(item)
-        loop do
-          break unless !i.nil? && i != ancestor
-          if flag2 && i.hasnt?(:container, :supporter) # && i.hasnt?(:supporter)
-            if i.has?(:animate)
-              return true if flag1
-              return L__M(:Take, 6, i)
-            end
-            if i.has?(:transparent)
-              return true if flag1
-              return L__M(:Take, 7, i)
-            end
+    i = parent(item)
+    if item != ancestor && i != @player
+      while i != ancestor
+        # break unless !i.nil? && i != ancestor
+        if flag2 && i.hasnt?(:container, :supporter) # && i.hasnt?(:supporter)
+          if i.has?(:animate)
             return true if flag1
-            return L__M(:Take, 8, item)
+            return L__M(:Take, 6, i)
           end
-          if !i.nil? && i.has?(:container) && i.hasnt?(:open)
+          if i.has?(:transparent)
             return true if flag1
-            return L__M(:Take, 9, i)
+            return L__M(:Take, 7, i)
           end
-          i = parent(i)
+          return true if flag1
+          return L__M(:Take, 8, item)
+        end
+        if !i.nil? && i.has?(:container) && i.hasnt?(:open)
+          return true if flag1
+          return L__M(:Take, 9, i)
         end
+        i = parent(i)
       end
     end
-    # if ancestor.nil?
 
     return false
   end
@@ -1328,33 +1380,32 @@ module Verbs
     end
 
     if item.has? :scenery then println L__M(:Take, 10, item); return true; end
-    if item.has? :static then println L__M(:Take, 11, item); return true; end
+    if item.has? :static then  println L__M(:Take, 11, item); return true; end
 
     # The item is now known to be available for taking.  Is the player
     # carrying too much?  If so, possibly juggle items into the rucksack
     # to make room.
 
-    k = 0; @player.objectloop { |j2| k += 1 if j2.hasnt? :worn }
-
-    if ValueOrRun(@player, :capacity) < k
-      # TODO: FIXME
-      # return L__M(:Take, 12) if SACK_OBJECT.nil?
-      #
-      # if SACK_OBJECT.parent != @player
-      #   return L__M(:Take, 12)
-      # end
-      # j = nil
-      # @player.objectloop { |k|
-      #   if k != SACK_OBJECT && k.hasnt?(:worn) && k.hasnt?(:light); j = k; end
-      # }
-      #
-      # if !j.nil?
-      #   L__M(:Take, 13, j)
-      #   @keep_silent = true; Insert j, SACK_OBJECT; keep_silent = false
-      #   return true if !j < SACK_OBJECT
-      # end
-      #
-      # return L__M(:Take, 12)
+    k = 0; @player.objectloop { |j2| k += 1 if j2.hasnt?(:worn) }
+
+    capacity_value = ValueOrRun(@player, :capacity)
+    if capacity_value < k
+      return L__M(:Take, 12) if SACK_OBJECT.nil?
+
+      return L__M(:Take, 12) if SACK_OBJECT.parent != @player
+
+      j = nil
+      @player.objectloop do |k|
+        if k != SACK_OBJECT && k.hasnt?(:worn) && k.hasnt?(:light); j = k; end
+      end
+
+      unless j.nil?
+        L__M(:Take, 13, j)
+        @keep_silent = true; Insert j, SACK_OBJECT; keep_silent = false
+        return true if !j < SACK_OBJECT
+      end
+
+      return L__M(:Take, 12)
     end
 
     # Transfer the item.
@@ -1574,7 +1625,6 @@ module Verbs
 # ----------------------------------------------------------------------------
 
   def EnterSub
-    # return go noun if noun.in?(Compass) || noun.has?(:door) # TODO: FIXME
     return invoke(:Go, noun) if noun.in?(Compass) || noun.has?(:door)
 
     return L__M(:Enter, 1, noun) if @player.in? noun
@@ -1610,15 +1660,18 @@ module Verbs
       end
     end
 
+    return L__M(:Enter, 3, noun) if noun.has?(:container) &&
+      noun.hasnt?(:open) && ImplicitOpen(noun)
     move @player, noun
+
     return true if AfterRoutines()
     return true if @keep_silent
-    Locale(noun)
     L__M(:Enter, 5, noun)
+    Locale(noun)
   end
 
   def GetOffSub
-    _invoke :Exit if parent(@player) == noun
+    return divert_to_action :Exit if parent(@player) == noun
     L__M(:GetOff, 1, noun)
   end
 
@@ -1626,7 +1679,7 @@ module Verbs
     parent_obj = parent(@player)
     return L__M(:Exit, 4, noun) if !noun.nil? && noun != parent_obj
     if parent_obj == @location || (@location == thedark && parent_obj == @real_location)
-      if @location.&(:out_to) || (@location == thedark && @real_location.&(:out_to))
+      if !@location.&(:out_to).nil? || (@location == thedark && !@real_location.&(:out_to).nil?)
         invoke :Go, $out_obj
       end
       return L__M(:Exit, 1)
@@ -1634,12 +1687,10 @@ module Verbs
     return L__M(:Exit, 2, parent_obj) if parent_obj.has?(:container) && parent_obj.hasnt?(:open)
 
     move @player, parent(parent_obj)
-    stand @player
 
-    return true if AfterRoutines()
-    return true if @keep_silent
-    L__M(:Exit, 3, parent_obj)
-    LookSub(true)
+    return true if AfterRoutines() == true
+    return true if @keep_silent == true
+    L__M(:Exit, 3, parent_obj); LookSub(true)
   end
 
   def VagueGoSub; L__M(:VagueGo); end
@@ -1647,36 +1698,36 @@ module Verbs
   def GoInSub; go $in_obj; end
 
   def GoSub
-    i = @player.parent
-    return RunTimeError(10) if i.nil?
-    RunRoutines(@player, :before) # Attempt to allow for route recollection TODO: Evaluate if necessary
-
     # first, check if any PushDir object is touchable
     return if !second.nil? && !second.in?(Compass) && ObjectIsUntouchable(second)
 
     old_loc = @location
     movewith = nil
+    i = @player.parent
     if (@location != thedark && i != @location) || (@location == thedark && i != @real_location)
       j = @location
       @location = @real_location if @location == thedark
-      k = RunRoutines(i, :before); @location = j if k != 3
-      if k
+      # Set k to 0 here if RunRoutines returns nil (Ruby quirk)
+      k = RunRoutines(i, :before); k ||= 0; @location = j if k != 3
+      if k == 1
         movewith = i; i = i.parent
       else
-        L__M(:Go,1,i) unless k
+        L__M(:Go,1,i) if k == 0
         return true
       end
     end
 
-    return L__M(:Go, 6, noun) if noun.door_dir.nil?
-
     thedir = noun.door_dir
+    thedir ||= RunRoutines(noun, :door_dir)
 
-    j = i.&(thedir)
-    return true if j == true
-    if j && j.is_a?(String) then print j.to_s; new_line; return false; end
+    j = i.&(thedir); k = ZRegion(j);
+    if k == 3 then print j.to_s; new_line; return false; end
+    if k == 2
+      j = RunRoutines(i,thedir)
+      return true if j == true
+    end
 
-    unless j
+    if k == 0 || j == false
       if i.respond_to?(:cant_go) && i.cant_go != CANTGO__TX then PrintOrRun(i, :cant_go)
       else L__M(:Go,2)
       end
@@ -1691,31 +1742,29 @@ module Verbs
         return L__M(:Go, 5, j)
       end
       k = RunRoutines(j,:door_to)
-      if k == false then return L__M(:Go, 6, j) end
-      if k == true  then return true end
+      return L__M(:Go, 6, j) if k == 0
+      return true if k == 1
       j = k
     end
-
-    orig_loc = @real_location
-
     if movewith.nil? then move @player, j else move movewith, j end
 
-    light_adjusted @player
+    orig_loc = @real_location
 
     # Special addition for ensuring location is never forgotten after player logout.
-    @player.link :location, j
-    @player.descendants.each do |o|
-      o.link :location, j if o.linked? :location
-    end
-    movewith.link :location, j if !movewith.nil? && movewith.linked?(:location)
+    # @player.link :location, j
+    # @player.descendants.each do |o|
+    #   o.link :location, j if o.linked? :location
+    # end
+    # movewith.link :location, j if !movewith.nil? && movewith.linked?(:location)
 
     @location = j; MoveFloatingObjects();
-    if OffersLight(j)
+    df = OffersLight(j);
+    if df != false
       @location = j; @real_location = j; @lightflag = true
     else
       if old_loc == thedark
         DarkToDark()
-        return true if @deadflag
+        return true if @deadflag != 0
       end
       @real_location = j
       @location = thedark; @lightflag = false
@@ -1726,13 +1775,6 @@ module Verbs
     LookSub(true)
   end
 
-  def ArrivalDir(dest, source = @real_location)
-    link = dest.links.find { |l| l.to == source }
-    return nil if link.nil?
-    # TODO: Doesn't work for door objects FIXME
-    direc = Compass.find { |dir| dir.door_dir == link.name.to_sym }
-  end
-
 # ----------------------------------------------------------------------------
 #   Describing the world.  SayWhatsOn(object) does just that (producing
 #   no text if nothing except possibly "scenery" and "concealed" items are).
@@ -1773,18 +1815,16 @@ module Verbs
         PronounNotice(obj)
       end
 
-      give obj, :workflag
-      k += 1
-      property = :initial; f2 = 0
-
       if obj.hasnt? :scenery
-        if (obj.has?(:door) || obj.has?(:container)) && obj.has?(:open) && obj.respond_to?(:when_open)
+        give obj, :workflag; k += 1
+        property = :initial; f2 = 0
+        if (obj.has?(:door) || obj.has?(:container)) && obj.has?(:open) && !obj.&(:when_open).nil?
           property = :when_open; f2 = 1
-        elsif (obj.has?(:door) || obj.has?(:container)) && obj.hasnt?(:open) && obj.respond_to?(:when_closed)
+        elsif (obj.has?(:door) || obj.has?(:container)) && obj.hasnt?(:open) && !obj.&(:when_closed).nil?
           property = :when_closed; f2 = 1
-        elsif obj.has?(:switchable) && obj.has?(:on) && obj.respond_to?(:when_on)
+        elsif obj.has?(:switchable) && obj.has?(:on) && !obj.&(:when_on).nil?
           property = :when_on; f2 = 1
-        elsif obj.has?(:switchable) && obj.hasnt?(:on) && obj.respond_to?(:when_off)
+        elsif obj.has?(:switchable) && obj.hasnt?(:on) && !obj.&(:when_off).nil?
           property = :when_off; f2 = 1
         end
 
@@ -1838,13 +1878,13 @@ module Verbs
   def LMode3Sub; @lookmode = 3; print Story; L__M(:LMode3); end  # Superbrief
 
   def ScoreArrival
-    # unless @player.visited.include?(@location)
-    #   @player.visited.push @location
-    #   if @location.has? :scored
-    #     score = score + ROOM_SCORE
-    #     places_score = places_score + ROOM_SCORE
-    #   end
-    # end
+    if @location.hasnt?(:visited)
+      give @location, :visited
+      if @location.has?(:scored)
+        @score = @score + ROOM_SCORE
+        @places_score = @places_score + ROOM_SCORE
+      end
+    end
   end
 
   def NoteArrival
@@ -1875,7 +1915,8 @@ module Verbs
     allow_abbrev = false if allow_abbrev.nil?
     return RunTimeError(10) if parent(@player).nil?
 
-    if OffersLight(@real_location)
+    df = OffersLight(@real_location)
+    if df
       @location = @real_location; @lightflag = true
     else
       @location = thedark; @lightflag = false
@@ -1927,7 +1968,6 @@ module Verbs
     end
 
     L__M(:Look, 3, @player) if @print_player_flag
-    L__M(:Look, 9, @player) if @player.respond_to?(:builder?) && @player.builder?
     new_line
 
     # TODO: FIXME
@@ -1939,7 +1979,7 @@ module Verbs
     # The room description (if visible)
 
     if @lookmode < 3 && @visibility_ceiling == @location
-      if allow_abbrev == false || @lookmode == 2 || !@player.visited.include?(@location)
+      if allow_abbrev == false || @lookmode == 2 || @location.hasnt?(:visited)
         if @location.respond_to? :describe
           RunRoutines(@location, :describe)
         else
@@ -1984,7 +2024,7 @@ module Verbs
           end
           PrintOrRun(i, :inside_description)
         end
-        nl_flag = true if Locale(i)
+        nl_flag = true if Locale(i) != 0
         j -= 1
       end
     end
@@ -2399,7 +2439,6 @@ module Verbs
   end
 
   def XTreeSub
-    raise Parser::VerbUnrecognized unless @player.builder?
     return XObj(noun, 1) unless noun.nil?
     objectloop { |i|
       XObj(i) if i.object? && parent(i).nil?
@@ -2407,7 +2446,6 @@ module Verbs
   end
 
   def GotoSub
-    raise Parser::VerbUnrecognized unless @player.builder?
     log.debug "<Goto noun> #=> #{noun}"
     if !noun.is_a?(Inform::Object)
       "[Not a safe place.]"
@@ -2419,7 +2457,6 @@ module Verbs
   end
 
   def GonearSub
-    raise Parser::VerbUnrecognized unless @player.builder?
     x = noun
     loop do
       break if parent(x).nil?
@@ -2431,7 +2468,6 @@ module Verbs
   def Print_ScL(obj); println (@x_scope_count += 1) + ": " + a(obj) + " (" + obj.id + ")"; end
 
   def ScopeSub
-    raise Parser::VerbUnrecognized unless @player.admin?
     @x_scope_count = 0
     LoopOverScope(method(:Print_ScL), noun)
     "Nothing is in scope." if @x_scope_count == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform6lib
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Nels Nelson
@@ -43,14 +43,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.8
+      version: 4.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.16
 specification_version: 4
 summary: The Inform6 Library Ruby Port is a faithful port of the Inform6 interactive
   fiction standard library in Ruby.