inform6lib 0.0.7 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad80c79e9fdb4cc450f44c7d9141239b309c6622c34515e31e0ffd53b4b16590
-  data.tar.gz: 726d1e9f17ae1d19863929ccb2fa058923dd9b8efded0d256a74c297b1ac416c
+  metadata.gz: c832fae34b158458f4ff2550832e9756033a725633750854d4afae675f915eab
+  data.tar.gz: 93ce34112c5b2c236ab1eb3aa0027ee8fce90e39249c1dc5b3d3d33310142e1a
 SHA512:
-  metadata.gz: aa8cb8bbeb333eb5b7038a9b2a126809f905cb2a994906802cb2329f73cbbd6da2de39398ef7b1dca0e65dfc84ee730a6c51e784e001860d661db43ba0cb6e84
-  data.tar.gz: c9eab7a76abac38d6e44fc521f3b4c8b9e0ec0129e1a0eeb18612fd765e28483bc537038a1f9078bfebf2c0020e1f3c20977a59c1cf7f6bcf0bd7acf48610afb
+  metadata.gz: 57c086700bcaeef38381113c158c6922983e2918ede45937a04615efc4cd0286df39eb8d8dbad06dcdfa2496bdc41d747fe029d6b6ce91537cc57b193b6deae8
+  data.tar.gz: ddad647de642419cdf28a6b7c790a37dc443dd705bc62a017c9ef8334a6546d34a4d5ca9abdb6da8431244a05d74f37fa8e5661aaaa1f650afd310302ad8c543

data/lib/inform/English.h.rb

@@ -66,7 +66,7 @@ module English
   # ------------------------------------------------------------------------------
 
   # The CompassDirection class
-  class CompassDirection < Inform::System::Object
+  class CompassDirection < Inform::Ephemeral::Object
     def initialize(name, number = 0, article = "the")
       super(name)
       @number = number
@@ -75,7 +75,7 @@ module English
     end
   end
 
-  Compass = Inform::System::Object.new "compass"
+  Compass = Inform::Ephemeral::Object.new "compass"
   Compass.has :concealed
 
   Compass > $n_obj  = CompassDirection.new("north") {
@@ -1268,9 +1268,9 @@ if defined? Inform::Object
       include Inform::English
     end
 
-    # The Inform::System module
-    module System
-      # The Inform::System::Object class to include the English module
+    # The Inform::Ephemeral module
+    module Ephemeral
+      # The Inform::Ephemeral::Object class to include the English module
       class Object
         include Inform::English
       end

data/lib/inform/VerbLib.h.rb

@@ -52,7 +52,7 @@ module Verbs
   end
 
   unless defined? LibraryMessages
-    LibraryMessages = Inform::System::Object.new
+    LibraryMessages = Inform::Ephemeral::Object.new
   end
 
   unless defined? NO_PLACES

data/lib/inform/parserm.h.rb

@@ -504,7 +504,7 @@ module Parser
 #  location-name on the status line can be "Darkness".
 # ----------------------------------------------------------------------------
 
-  Darkness = Inform::System::Object.new "(darkness object)"
+  Darkness = Inform::Ephemeral::Object.new "(darkness object)"
   Darkness.with do
     def short_name; DARKNESS__TX; end
     def description; L__M(:Miscellany, 17); end
@@ -574,7 +574,7 @@ module Parser
 #
 # ----------------------------------------------------------------------------
 
-  # InformParser = Inform::System::Object.new "(Inform Parser)"
+  # InformParser = Inform::Ephemeral::Object.new "(Inform Parser)"
   # def InformParser.parse_input; Parser__parse(); end
   # InformParser.has :proper
 
@@ -4676,7 +4676,7 @@ module Parser
 
     # artform = LanguageArticles
     #     + 3*WORDSIZE*LanguageContractionForms*(short_name_case + i*LanguageCases);You can see acode: 2
-    # TODO: Remove wtf
+    # TODO: Remove
     # print "acode: ", acode, "^";
     # print "artform-->acode: ", (string) (artform-->acode), "^";
     # print "artform-->0: ", (string) (artform-->0), "^";
@@ -5174,13 +5174,10 @@ end
 
 # The InformLibrary class.
 # Inform 6 defines this as an Object.
-class InformLibrary < Inform::System::Object
+class InformLibrary < Inform::Ephemeral::Object
   REGISTRY = Struct.new(:memo).new(defined?(Java) ? java.util.concurrent.ConcurrentHashMap.new : {})
-  include Inform::Context
-  include Inform::StdLib
-  include Inform::Parser
   include Inform::Rules
-  include Inform::History
+  include Inform::Parser
 
   attr_accessor :player
 
@@ -5842,7 +5839,7 @@ module Inform
 end
 
 # The LibExt class
-class LibExt < Inform::System::Object
+class LibExt < Inform::Ephemeral::Object
   attr_accessor :ext_initialise, :ext_messages
 
   def init

data/lib/inform/verblibm.h.rb

@@ -1034,7 +1034,7 @@ module Verbs
   # of using Netty.
   def YesOrNo
     loop do
-      @input = Inform::Runtime.instance.read
+      @input = __read
       DrawStatusLine() if !location.nil? && !parent(@player).nil?
       j = @input
       unless @input.empty? # at least one word entered
@@ -1359,7 +1359,6 @@ module Verbs
 
     # Transfer the item.
 
-    @player.publish L__M(:Take, 15, noun)
     move item, @player
 
     # Send "after" message to the object letting go of the item, if any.
@@ -1413,7 +1412,6 @@ module Verbs
     move noun, @player.parent
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Drop, 5, noun)
     return L__M(:Drop, 4, noun)
   end
 
@@ -1453,7 +1451,6 @@ module Verbs
       @action = :PutOn
     end
     return if @keep_silent
-    @player.publish L__M(:PutOn, 9, noun)
     return L__M(:PutOn, 7) if @multiflag
     L__M(:PutOn, 8, noun)
   end
@@ -1496,7 +1493,6 @@ module Verbs
       @action = :Insert
     end
     return true if @keep_silent
-    @player.publish L__M(:Insert, 10, noun)
     return L__M(:Insert, 8, noun) if @multiflag
     L__M(:Insert, 9, noun)
   end
@@ -1556,7 +1552,6 @@ module Verbs
   def GiveSub
     return L__M(:Give, 1, noun) if parent(noun) != @player
     if second == @player
-      @player.publish A(player) + " juggles " + a(noun) + " for a second or two."
       return L__M(:Give, 2, noun)
     end
     return false if RunLife(second, :Give)
@@ -1619,7 +1614,6 @@ module Verbs
     return true if AfterRoutines()
     return true if @keep_silent
     Locale(noun)
-    @player.publish L__M(:Enter, 8, noun)
     L__M(:Enter, 5, noun)
   end
 
@@ -1644,7 +1638,6 @@ module Verbs
 
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Exit, 5, parent_obj)
     L__M(:Exit, 3, parent_obj)
     LookSub(true)
   end
@@ -1704,7 +1697,6 @@ module Verbs
     end
 
     orig_loc = @real_location
-    @player.publish L__M(:Go, 7, noun) unless @keep_silent
 
     if movewith.nil? then move @player, j else move movewith, j end
 
@@ -1729,8 +1721,6 @@ module Verbs
       @location = thedark; @lightflag = false
     end
 
-    @player.publish L__M(:Go, 8, ArrivalDir(j, orig_loc)) unless @keep_silent
-
     return true if AfterRoutines()
     return true if @keep_silent
     LookSub(true)
@@ -2012,17 +2002,6 @@ module Verbs
     unless @keep_silent
       if noun.has? :animate
         @action = :LookAt
-        if noun.in?(@player)
-          @player.publish A(@player) + " looks at " + hisorher(@player, noun) + "."
-        elsif noun != @player
-          @player.publish A(@player) + " looks over at " + a(noun) + "."
-        end
-      else
-        if noun.in?(@player)
-          @player.publish A(@player) + " examines " + hisorher(@player, noun) + "."
-        else
-          @player.publish A(@player) + " examines " + a(noun) + "."
-        end
       end
     end
     i = noun.description
@@ -2039,7 +2018,6 @@ module Verbs
 
   def LookUnderSub
     return L__M(:LookUnder, 1) if @location == thedark
-    @player.publish L__M(:LookUnder, 3, noun)
     L__M(:LookUnder, 2)
   end
 
@@ -2052,7 +2030,6 @@ module Verbs
     return if ObjectIsUntouchable(noun)
     f = VisibleContents(noun)
     if noun.has? :supporter
-      @player.publish L__M(:Search, 8, noun) unless @keep_silent
       return L__M(:Search, 2, noun) if f == 0
       return L__M(:Search, 3, noun)
     end
@@ -2060,7 +2037,6 @@ module Verbs
     return L__M(:Search, 5, noun) if noun.hasnt?(:transparent) && noun.hasnt?(:open)
     return true if AfterRoutines()
 
-    @player.publish L__M(:Search, 8, noun) unless @keep_silent
     return L__M(:Search, 6, noun) if f == 0
     L__M(:Search, 7, noun)
   end
@@ -2077,7 +2053,6 @@ module Verbs
     take noun, :locked
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Unlock, 5, noun)
     L__M(:Unlock, 4, noun)
   end
 
@@ -2090,7 +2065,6 @@ module Verbs
     give noun, :locked
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Lock, 6, noun)
     L__M(:Lock, 5, noun)
   end
 
@@ -2101,7 +2075,6 @@ module Verbs
     give noun, :on
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:SwitchOn, 4, noun)
     L__M(:SwitchOn, 3, noun)
   end
 
@@ -2112,7 +2085,6 @@ module Verbs
     take noun, :on
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:SwitchOff, 4, noun)
     L__M(:SwitchOff, 3, noun)
   end
 
@@ -2124,7 +2096,6 @@ module Verbs
     give noun, :open
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Open, 6, noun)
     if noun.has?(:container) && noun.hasnt?(:transparent) &&
        @location != thedark &&
        VisibleContents(noun) != 0 && IndirectlyContains(noun, @player)
@@ -2140,7 +2111,6 @@ module Verbs
     take noun, :open
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Close, 4, noun)
     L__M(:Close, 3, noun)
   end
 
@@ -2150,7 +2120,6 @@ module Verbs
     take noun, :worn
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Disrobe, 3, noun)
     L__M(:Disrobe, 2, noun)
   end
 
@@ -2162,7 +2131,6 @@ module Verbs
     give noun, :worn
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Wear, 5, noun)
     L__M(:Wear, 4, noun)
   end
 
@@ -2177,7 +2145,6 @@ module Verbs
     noun.destroy
     return true if AfterRoutines()
     return true if @keep_silent
-    @player.publish L__M(:Eat, 3, noun)
     L__M(:Eat, 2, noun)
   end
 
@@ -2285,19 +2252,19 @@ module Verbs
     L__M(:PushDir, 1, noun)
   end
 
-  def RubSub; @player.publish L__M(:Rub, 2, noun); L__M(:Rub, 1, noun); end
+  def RubSub; L__M(:Rub, 1, noun); end
 
   def SetSub; L__M(:Set, 1, noun); end
 
   def SetToSub; L__M(:SetTo, 1, noun); end
 
-  def SingSub; @player.publish L__M(:Sing, 2, noun); L__M(:Sing, 1, noun); end
+  def SingSub; L__M(:Sing, 1, noun); end
 
-  def SleepSub; @player.publish L__M(:Sleep, 2, noun); L__M(:Sleep, 1, noun); end
+  def SleepSub; L__M(:Sleep, 1, noun); end
 
-  def SmellSub; @player.publish L__M(:Smell, 2, noun); L__M(:Smell, 1, noun); end
+  def SmellSub; L__M(:Smell, 1, noun); end
 
-  def SorrySub; @player.publish L__M(:Sorry, 2, noun); L__M(:Sorry, 1, noun); end
+  def SorrySub; L__M(:Sorry, 1, noun); end
 
   def SqueezeSub
     return if ObjectIsUntouchable(noun)
@@ -2321,7 +2288,6 @@ module Verbs
   end
 
   def ThinkSub
-    @player.publish L__M(:Think, 2, noun)
     L__M(:Think, 1, noun)
   end
 
@@ -2350,7 +2316,6 @@ module Verbs
     return L__M(:Touch, 3, noun) if noun == @player
     return if ObjectIsUntouchable(noun)
     return L__M(:Touch, 1, noun) if noun.has? :animate
-    @player.publish L__M(:Touch,4,noun)
     L__M(:Touch,2,noun)
   end
 
@@ -2363,7 +2328,6 @@ module Verbs
   end
 
   def WaitSub
-    @player.publish L__M(:Wait, 2, noun)
     return true if AfterRoutines()
     L__M(:Wait, 1, noun)
   end
@@ -2378,16 +2342,13 @@ module Verbs
 
   def WaveSub
     return L__M(:Wave, 1, noun) if !noun.nil? && (noun.has?(:clothing, :worn) || noun.notin?(@player))
-    @player.publish L__M(:Wave, 3, noun)
     L__M(:Wave, 2, noun)
   end
 
   def WaveHandsSub
     if noun
-      @player.publish L__M(:WaveHands, 4, noun)
       L__M(:WaveHands, 3, noun)
     else
-      @player.publish L__M(:WaveHands, 2, noun)
       L__M(:WaveHands, 1, noun)
     end
   end
@@ -2399,7 +2360,7 @@ module Verbs
 # ----------------------------------------------------------------------------
 
   def XTestMove(obj, dest)
-    if obj.is_a?(InformLibrary) || obj == LibraryMessages || obj.is_a?(Inform::System::Object)
+    if obj.is_a?(InformLibrary) || obj == LibraryMessages || obj.is_a?(Inform::Ephemeral::Object)
       println "[Can't move #{obj.name}: it's a system object.]"
       return true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inform6lib
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.1
 platform: ruby
 authors:
 - Nels Nelson