inform6lib 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a01e92e72e9235aa5b0e0a651ca36c75d91f78cb006b5e99a70946e40425063
-  data.tar.gz: acb6a79edad225ea9916ddfa0de94ffc2e27c80a4f2fe14f307d7b3624cee052
+  metadata.gz: fc0a615fe20b2f83055cddf811f048a2a49484ffadf36f6530484f17dff94ee6
+  data.tar.gz: 68f0f81e22933676a396445659d4e5ab73caadc799612c1e67f21036ad4aefa8
 SHA512:
-  metadata.gz: 5a73a47b1d651f637fea6d2c1d5d52b967bec03576ee52823aacc501ead25ed8fc5f6d308d4667b6706a804dfa8cf57727eddc8c69d9dba4efb7fe098fb95cdd
-  data.tar.gz: 20bd89c962dd677dd6cce6fef1f120403118f7e09b9edea39148e6579ec1e810f047b2eb5f81038efb746147df286b678f85b6dd89363a5b70ec2221aaff5cbe
+  metadata.gz: d8240c06d833b2ccdf0e0051a5e61c774c40178d919e9a39029d6935157e7d0b72b8553efaa11cc80f7ee9c1a65b28ec763ac4b2d92f56b536df7ed0ae230047
+  data.tar.gz: 312174cb06f649bc4d8e192fe901bfdf97b9a72d7d679bdbc6d9bbf9d9855d305ee01388cfd92706a8a7e71c7360cdf6da19d8c95ed583f65a12a96b26dd8e14

data/lib/inform/parserm.h.rb

@@ -251,11 +251,11 @@ module Parser
   @the_timers = []
   @active_timers                   # Number of timers/daemons actives
 
-  @score                           # The current score
+  @score = 0                       # The current score
   @last_score                      # Score last turn (for testing for changes)
   @notify_mode = true              # Score notification
-  @places_score                    # Contribution to score made by visiting
-  @things_score                    # Contribution made by acquisition
+  @places_score = 0                # Contribution to score made by visiting
+  @things_score = 0                # Contribution made by acquisition
 
 # ------------------------------------------------------------------------------
 #   The player
@@ -4768,7 +4768,7 @@ module Parser
     when String   then print "<string ~#{o}~>"; return true
     when NilClass then print "<illegal object number " + o + ">"; return true
     end
-    if o == player then print YOURSELF__TX; return true; end
+    if o == @player then print YOURSELF__TX; return true; end
     if defined? LanguagePrintShortName
     return true if LanguagePrintShortName(o)
     end # LanguagePrintShortName
@@ -4823,12 +4823,24 @@ module Parser
     PrefaceByArticle(o, 0); @indef_mode = i;
   end
 
+  def PrintShortName(o)
+    i = @indef_mode; @indef_mode = nil
+    PSN__(o); @indef_mode = i
+  end
+
+  def EnglishNumber(n); LanguageNumber(n); end
+
   def NumberWord(o)
     n = LanguageNumbers.find { |k, _v| k == o }
     return n.last if !n.nil? && !n.empty? # TODO: Be more syntactically precise
     return 0
   end
 
+  def RandomEntry(tab)
+    return RunTimeError(8) if !tab.respond_to?(:empty?) || tab.empty?
+    tab.sample
+  end
+
 # ----------------------------------------------------------------------------
 
   # The ParserError error class
@@ -5529,12 +5541,12 @@ class InformLibrary < Inform::Ephemeral::Object
 
   def NoteObjectAcquisitions
     return if defined?(MULTI_PLAYER)
-    player.objectloop do |i|
+    @player.objectloop do |i|
       if i.hasnt?(:moved)
         give i, :moved
         if i.has?(:scored)
-          self.score = self.score + OBJECT_SCORE
-          self.things_score = self.things_score + OBJECT_SCORE
+          @score = @score + OBJECT_SCORE
+          @things_score = @things_score + OBJECT_SCORE
         end
       end
     end
@@ -5557,7 +5569,7 @@ class InformLibrary < Inform::Ephemeral::Object
   def LoopOverScope(routine, act)
     p1 = @parser_one; sr = @scope_reason; a = @actor; al = @actors_location
     @parser_one = routine;
-    if act.nil? then @actor = act else @actor = player end
+    if act.nil? then @actor = act else @actor = @player end
     @actors_location = ScopeCeiling(@actor)
     @scope_reason = scope_reason = LOOPOVERSCOPE_REASON
     SearchScope(@actors_location, @actor, scope_reason)
@@ -5659,6 +5671,8 @@ class InformLibrary < Inform::Ephemeral::Object
     obj = @real_location if obj == thedark && prop.notin?(:initial, :short_name, :description, :life)
     return false if prop.nil?
 
+    # TODO: Is this really necessary?
+    obj.safe_refresh if obj.respond_to?(:safe_refresh)
     value = obj.&(prop)
     return print_routine_result(value) unless value.nil?
 
@@ -5679,6 +5693,7 @@ class InformLibrary < Inform::Ephemeral::Object
     end
     @the_timers << obj
     obj.&(:time_left, timer)
+    return
   end
 
   def StopTimer(obj)
@@ -5689,17 +5704,20 @@ class InformLibrary < Inform::Ephemeral::Object
     end
     @the_timers.delete(obj)
     obj.&(:time_left, 0)
+    return
   end
 
   def StartDaemon(obj)
     return false if @the_timers.include?(obj)
     RunTimeError(4) if @the_timers.length >= MAX_TIMERS
     @the_timers << obj
+    return
   end
 
   def StopDaemon(obj)
     return false unless @the_timers.include?(obj)
     @the_timers.delete(obj)
+    return
   end
 
 # ----------------------------------------------------------------------------

data/lib/inform/verblibm.h.rb

@@ -385,7 +385,7 @@ module Verbs
         if k2.nil? || k2.list_together != j.list_together
           # Omit_WL2
 
-          if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == 1
+          if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == true
             # Omit_FL2
             i += 1
             senc -= 1
@@ -446,7 +446,7 @@ module Verbs
           if listing_size == 1
             # Omit_WL2
 
-            if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == 1
+            if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == true
               # Omit_FL2
               i += 1; senc -= 1
               next
@@ -574,7 +574,7 @@ module Verbs
 
       # label Omit_WL2
 
-      if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == 1
+      if WriteBeforeEntry(j, depth, -senc, c_style, wlf_indent) == true
         # Omit_FL2
         i += 1; senc -= 1
         next
@@ -651,7 +651,7 @@ module Verbs
         if k.nil? || (k.list_together != j.list_together)
           # Omit_WL
 
-          if WriteBeforeEntry(j, depth, i - senc, c_style, wlf_indent) == 1
+          if WriteBeforeEntry(j, depth, i - senc, c_style, wlf_indent) == true
             # Omit_FL
             j = NextEntry(j, depth, lt_value, c_style, &query)
             i += 1
@@ -775,7 +775,7 @@ module Verbs
 
       # label Omit_WL
 
-      if WriteBeforeEntry(j, depth, i - senc, c_style, wlf_indent) == 1
+      if WriteBeforeEntry(j, depth, i - senc, c_style, wlf_indent) == true
         # Omit_FL
         j = NextEntry(j, depth, lt_value, c_style, &query)
         i += 1
@@ -1158,7 +1158,7 @@ module Verbs
   def Achieved(num)
     if task_done[num].nil?
       task_done[num] = true
-      score = score + TaskScore(num)
+      @score = @score + TaskScore(num)
     end
   end
 
@@ -1179,7 +1179,7 @@ module Verbs
 
   def FullScoreSub
     ScoreSub()
-    return false if score == 0 || TASKS_PROVIDED == 1
+    return false if @score == 0 || TASKS_PROVIDED == 1
     new_line
     L__M(:FullScore, 1)
     for i in 0..NUMBER_TASKS
@@ -1188,15 +1188,15 @@ module Verbs
         PrintTaskName(i)
       end
     end
-    if things_score != 0
-      PANum(things_score)
+    if @things_score != 0
+      PANum(@things_score)
       L__M(:FullScore, 2)
     end
-    if places_score != 0
-      PANum(places_score)
+    if @places_score != 0
+      PANum(@places_score)
       L__M(:FullScore, 3)
     end
-    new_line; PANum(score); L__M(:FullScore, 4)
+    new_line; PANum(@score); L__M(:FullScore, 4)
   end
 
 # ----------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform6lib
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Nels Nelson
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.24
 specification_version: 4
 summary: The Inform6 Library Ruby Port is a faithful port of the Inform6 interactive
   fiction standard library in Ruby.