ifmapper 0.9.5 → 0.9.6

data/lib/IFMapper/TranscriptReader.rb

@@ -14,7 +14,7 @@ class TranscriptReader
 
   TRANSCRIPT = /^(?:Start of a transcript of|Here begins a transcript of interation with (.*)|Here begins a transcript of interation with)/
 
-  PROMPT   = /^>\s*/
+  #  PROMPT   = /^>\s*/
   LOOK     = /^l(ook)?/i
   UNDO     = /^undo$/i
   RESTART  = /^restart$/i
@@ -52,6 +52,7 @@ class TranscriptReader
   # No exit replies
   NO_EXIT = [
     /\byou\scan't\sgo\sthat\sway\b/i,
+    /\byou\scan't\sgo\sin\sthat\sdirection\b/i,
     /\bdoorways\slead\s/i,
     /\bthat's\sa\swall\b/i,
     /\bno\sexit\b/i,
@@ -68,35 +69,38 @@ class TranscriptReader
 
   # remove things like (on the bed)
   NAME_REMOVE   = /(\s+\(.+\)|,\s+[io]n\s+[^\,\.]+)/
-  NAME_INVALID  = /[:;\*\[\]\|\+\=!\.\?\000]/
-  SALUTATIONS   = /\b(Mr|Mr?s|Miss|Jr|Sr|St)\./
+  NAME_INVALID  = /--|[:;\*\[\]\|\+\=!\.\?\000]/
+  SALUT         = '(Mr|Mr?s|Miss|Jr|Sr|St|Dr|Ave|Inc)'
+  SALUTATIONS   = /\b#{SALUT}\./
   NAME_MAXWORDS = 20
   NAME_MAXUNCAP = 4  # so that lowercase "room" "end" "of" will be accepted
 
   # Default room description recognition parameters.
-  DESC_MINWORDS = 10
+  DESC_MINWORDS = 20
 
   # Ignore these words when matching words in description
   # To avoid cases, like:  An open gate  vs.  A closed gate
   DESC_IGNORE   = /(?:an|a|open(ed)?|closed?)/i
 
 
-  RESTORE_OK  = /\b(Ok|completed?|Okay)\b/
+  RESTORE_OK  = /\b(Okay|Ok|completed?|Restored)\b/
 
   ## 
-  THE = '(?:the|a|your|some of the|some)\s+'
+  THE = '(?:the|an|a|your|some of the|some)\s+'
 
   ## Regex to eliminate articles from get/take replies.
   ARTICLE = /^#{THE}/i
 
   ## Possible nessages indicating get/take succeeded
   TAKE_OBJ = '([\w\d\-\'\s]+)'
-  TAKE_FROM = '(?:\s+(up|from|out)\s+.*)?'
+  TAKE_FROM = '(?:\s+(?:up|from|out)\s+.*)$'
   TAKE_ALIAS = '(?:grab|pick\s+up|pick|pilfer|take(?:\s+up)?)'
   TAKE_OK = [ 
     /\btaken\b/i,
     /you\s+have\s+now\s+(?:got\s+)?(?:#{THE})?#{TAKE_OBJ}#{TAKE_FROM}/i,
+    /you\s+have\s+now\s+(?:got\s+)?(?:#{THE})?#{TAKE_OBJ}/i,
     /you\s+#{TAKE_ALIAS}\s+(?:#{THE})?#{TAKE_OBJ}#{TAKE_FROM}/i,
+    /you\s+#{TAKE_ALIAS}\s+(?:#{THE})?#{TAKE_OBJ}/i,
     /you\s+now\s+have\s+(?:got\s+)?(?:#{THE})?#{TAKE_OBJ}/i,
     /you\s+pick\s+up\s+(?:#{THE})?#{TAKE_OBJ}/i,
     /you\s+are\s+now\s+holding\s+(?:#{THE})?#{TAKE_OBJ}/i,
@@ -119,11 +123,21 @@ class TranscriptReader
   IDENTIFY_BY_SHORTNAME   = 1
 
   SHORTNAME_CLASSIC  = 0
-  SHORTNAME_MOONMIST = 1
-  SHORTNAME_WITNESS  = 2
+  SHORTNAME_CAPITALIZED = 1
+  SHORTNAME_MOONMIST = 2
+  SHORTNAME_WITNESS  = 3
+  SHORTNAME_ADRIFT   = 4
 
   attr_accessor :identify, :shortName, :map
 
+  def shortName=(x)
+    @shortName = x
+    if x == SHORTNAME_ADRIFT
+      @prompt = /^[a-z]/
+    else
+      @prompt = /^>\s*/
+    end
+  end
 
 
   #
@@ -244,7 +258,7 @@ class TranscriptReader
     # Directly north
     /\bDirectly\s+#{DIR}/i,
     # continues|lies|etc... east
-    /(runs|bears|leads|heads|opens|winds|continues|branches|lies|wanders|bends|curves)\s+#{DIR}\b/i,
+    /(runs|bears|leads|heads|opens|winds|continues\s+on|continues|branches|lies|wanders|bends|curves)\s+#{DIR}\b/i,
     /(running|leading|heading|opening|branching|lying|wandering|looking|bending)\s+#{DIR}\b/i,
   ]
 
@@ -312,7 +326,6 @@ class TranscriptReader
       @here.selected = true if @here
       @map.create_pathmap
       @map.zoom = @map.zoom
-      puts 'transcript zoom done'
       @map.center_view_on_room(@here) if @here
       @map.draw
     end
@@ -325,7 +338,7 @@ class TranscriptReader
     # Read all commands
     #
     loop do
-      line.sub!(PROMPT, '')
+      line.sub!(@prompt, '') if @prompt.to_s =~ />/
       line.chop!
       line.sub!(/\s+$/, '')
       cmd = line
@@ -333,14 +346,12 @@ class TranscriptReader
       # Read reply
       reply = []
       while line = @f.gets
-	break if line =~ PROMPT
+	break if line =~ @prompt
 	line.chop!
 	line.sub!(/\s+$/,'')
 	reply << line
       end
 
-      break if not line
-
       if cmd =~ UNDO
 	@moves.pop
       else
@@ -358,6 +369,8 @@ class TranscriptReader
 	@moves << move
       end
 
+      break if not line
+
     end
 
 
@@ -677,10 +690,10 @@ class TranscriptReader
 	if score == 1 and desc and room.desc
 	  # We have a description...
 	  # Try exact description match first
-	  score += 10 if room.desc == desc
+	  score += 100 if room.desc == desc
 	  
 	  # Try substring match
-	  score += 5 if room.desc.index(desc)
+	  score += 50 if room.desc.index(desc)
 	  
 	  # If we have a room where both name and desc match,
 	  # we get a better score than just description only.
@@ -693,18 +706,24 @@ class TranscriptReader
 	    dwords = room.desc.split(' ')
 	    words  = desc.split(' ')
 	    match  = true
-	    0.upto(DESC_MINWORDS) { |i|
+	    count  = 0
+	    0.upto(desc.size) { |i|
 	      # Ignore some words (like open/close, which may just mean
 	      # some doors changed state)
 	      next if words[i] =~ DESC_IGNORE
 
 	      if words[i] != dwords[i]
-		match = false
-		break
+		if count < DESC_MINWORDS
+		  match = false
+		  break
+		else
+		  next
+		end
 	      end
+	      count += 1
 	    }
 	    
-	    score += 1 if match
+	    score += count if match
 	  end
 	end
 	next if score <= bestscore
@@ -737,10 +756,10 @@ class TranscriptReader
 	if desc and room.desc
 	  # We have a description...
 	  # Try exact description match first
-	  score += 10 if room.desc == desc
+	  score += 100 if room.desc == desc
 	  
 	  # Try substring match
-	  score += 5 if room.desc.index(desc)
+	  score += 50 if room.desc.index(desc)
 	  
 	  # If we have a room where both name and desc match,
 	  # we get a better score than just description only.
@@ -753,18 +772,24 @@ class TranscriptReader
 	    dwords = room.desc.split(' ')
 	    words  = desc.split(' ')
 	    match  = true
-	    0.upto(DESC_MINWORDS) { |i|
+	    count  = 0
+	    0.upto(desc.size) { |i|
 	      # Ignore some words (like open/close, which may just mean
 	      # some doors changed state)
 	      next if words[i] =~ DESC_IGNORE
 
 	      if words[i] != dwords[i]
-		match = false
-		break
+		if count < DESC_MINWORDS
+		  match = false
+		  break
+		else
+		  next
+		end
 	      end
+	      count += 1
 	    }
 	    
-	    score += 2 if match and room.name == name
+	    score += count if match and room.name == name
 	  end
 	else
 	  # Just the name, not so good
@@ -791,12 +816,14 @@ class TranscriptReader
 
   def room_name(line)
     case @shortName
-    when SHORTNAME_CLASSIC
-      return room_name_classic(line)
+    when SHORTNAME_CAPITALIZED
+      return room_name_classic(line, false)
     when SHORTNAME_MOONMIST
       return room_name_moonmist(line)
     when SHORTNAME_WITNESS
       return room_name_witness(line)
+    else
+      return room_name_classic(line, true)
     end
   end
 
@@ -812,6 +839,12 @@ class TranscriptReader
     return words.join(' ')
   end
 
+  def room_name_alan(line)
+    return false if line !~ /^[^.]+\.$/
+    line.sub!(/\.$/, '')
+    return room_name_classic(line, true)
+  end
+
   def room_name_witness(line)
     if line =~ /^You\sare\s(?:now\s)?(?:[io]n\s)?(?:#{THE})?([\w'\d\s\-_]+)\.$/
       return false if $1 =~ /own feet/
@@ -835,7 +868,7 @@ class TranscriptReader
   #
   # Determine if line corresponds to a room name
   #
-  def room_name_classic(line)
+  def room_name_classic(line, all_capitals = true)
     # Check if user/game has created a room with that name already
     return line if find_room(line, nil)
 
@@ -869,12 +902,14 @@ class TranscriptReader
     return false if line =~ /^[A-Z\d,\.\/\-"'\s]+$/ or line =~ /\s\s/ or 
       line =~ /^".*"$/ or line =~ /^"[^"]+$/ or line =~ /^\d+\)/
 
+    return false if not all_capitals and words.size > 6
+
     # If not, check all words of 4 chars or more are capitalized
     # and that there are no 3 or more short letter words together 
     # (which means a diagram)
     num = 0
     words.each { |w|
-      return false if w =~ /^[a-z]/ and w.size > NAME_MAXUNCAP
+      return false if all_capitals and w =~ /^[a-z]/ and w.size > NAME_MAXUNCAP
       if w.size <= 2
 	num += 1
 	return false if num > 2
@@ -883,6 +918,9 @@ class TranscriptReader
       end
     }
 
+    # Restore period to salutations
+    line.sub!(/\b#{SALUT}\b/, '\1.')
+
     # Okay, it is a room.
     return line
   end
@@ -1212,7 +1250,7 @@ class TranscriptReader
 
   def destroy
     @t.kill if @t
-    @f.close
+    @f.close if @f
     GC.start
   end
 
@@ -1230,7 +1268,8 @@ class TranscriptReader
   end
 
   def initialize(map, file)
-    @shortName = 0
+    @shortName = 0 
+    @prompt    = /^>\s*/
     @identify  = 0
 
     @file     = file
@@ -1264,7 +1303,7 @@ class TranscriptReader
 	  end
 	  @map.name = capitalize_room(@map.name)
 	end
-	break if PROMPT =~ line
+	break if @prompt =~ line
       end
       parse_line(line)
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
-date: 2005-09-09
+  version: 0.9.6
+date: 2005-09-19
 summary: Interactive Fiction Mapping Tool.
 require_paths: 
   - lib
@@ -21,42 +21,42 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
     - 
       - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.8
+        version: 1.8.0
   version: 
 platform: ruby
 authors: 
   - Gonzalo Garramuno
 files: 
   - IFMapper.rbw
+  - lib/IFMapper/FXMap.rb
   - lib/IFMapper/Map.rb
   - lib/IFMapper/FXRoom.rb
   - lib/IFMapper/FXSectionDialogBox.rb
-  - lib/IFMapper/Room.rb
+  - lib/IFMapper/FXMapperWindow.rb
   - lib/IFMapper/Section.rb
+  - lib/IFMapper/FXConnection.rb
   - lib/IFMapper/FXMapColorBox.rb
   - lib/IFMapper/IFMReader.rb
   - lib/IFMapper/IFMWriter.rb
   - lib/IFMapper/FXWarningBox.rb
-  - lib/IFMapper/FXMap.rb
   - lib/IFMapper/FXMapperSettings.rb
-  - lib/IFMapper/FXConnection.rb
-  - lib/IFMapper/FXMapperWindow.rb
   - lib/IFMapper/Connection.rb
   - lib/IFMapper/MapPrinting.rb
   - lib/IFMapper/FXDCPostscript.rb
   - lib/IFMapper/FXDCPrint.rb
+  - lib/IFMapper/Room.rb
   - lib/IFMapper/PDFMapExporter.rb
   - lib/IFMapper/TranscriptReader.rb
   - lib/IFMapper/FXMapDialogBox.rb
   - lib/IFMapper/FXSpline.rb
   - lib/IFMapper/InformReader.rb
-  - lib/IFMapper/FXRoomDialogBox.rb
+  - lib/IFMapper/FXMapFileDialog.rb
   - lib/IFMapper/InformWriter.rb
   - lib/IFMapper/FXSection.rb
   - lib/IFMapper/TADSReader.rb
   - lib/IFMapper/InformReaderOld.rb
-  - lib/IFMapper/FXMapFileDialog.rb
   - lib/IFMapper/TADSWriter.rb
+  - lib/IFMapper/FXRoomDialogBox.rb
   - lib/IFMapper/FXConnectionDialogBox.rb
   - lib/IFMapper/AStar.rb
   - lib/IFMapper/TranscriptDialogBox.rb
@@ -140,6 +140,18 @@ files:
   - maps/break_in.map
   - maps/moonmist.map
   - maps/dreamhold.map
+  - maps/AMFV.map
+  - maps/wasp.map
+  - maps/Janitor.map
+  - maps/bear.map
+  - maps/zerosum.map
+  - maps/balances.map
+  - maps/fallacy.map
+  - maps/heist.map
+  - maps/pkgirl.map
+  - maps/heroes.map
+  - maps/photograph.map
+  - maps/drift3.map
   - icons/filenew.png
   - icons/fileopen.png
   - icons/filesave.png