ifmapper 0.9 → 0.9.5

data/lib/IFMapper/FXRoom.rb

@@ -11,6 +11,10 @@ class FXRoom < Room
 
   @@win = nil
 
+  def self.no_maps
+    @@win.hide if @@win
+  end
+
   def marshal_dump
     super + [ @selected ]
   end
@@ -60,8 +64,8 @@ class FXRoom < Room
   # Open a modal requester to change properties
   #
   def modal_properties(map)
-    shown = @@win and @@win.shown?
-    if shown
+    if @@win and @@win.shown?
+      shown = @@win
       @@win.hide
     end
     win = FXRoomDialogBox.new(map, self, nil, true)
@@ -142,6 +146,7 @@ class FXRoom < Room
   # Main draw function for room
   #
   def draw(dc, zoom, idx, opt, data)
+    dc.font = data['objfont']
     draw_box(dc, zoom, idx, opt)
     return if zoom < 0.5
     dc.font = data['font']

data/lib/IFMapper/FXRoomDialogBox.rb

@@ -16,6 +16,7 @@ class FXRoomDialogBox < FXDialogBox
     @room.desc = @desc.text
 
     @map.draw_room(@room)
+    @map.update_roomlist
   end
 
 
@@ -142,7 +143,7 @@ class FXRoomDialogBox < FXDialogBox
     else
       @name.connect(SEL_CHANGED) { copy_to() }
       @objects.connect(SEL_CHANGED) { copy_to()}
-      @tasks.connect(SEL_CHANGED) { copy_to() }
+      @tasks.connect(SEL_CHANGED) { @room.tasks = @tasks.text }
       @darkness.connect(SEL_COMMAND) { copy_to() }
       @desc.connect(SEL_CHANGED) { @room.desc = @desc.text }
     end

data/lib/IFMapper/FXRoomList.rb

@@ -0,0 +1,95 @@
+
+#
+# Class that lists all rooms in a map and allows you to jump to them
+#
+class FXRoomList < FXDialogBox
+
+  def pick(sender, sel, ptr)
+    item = @box.currentItem
+    idx, r = @box.getItemData(item)
+
+    @map.section = idx
+    @map.clear_selection
+    r.selected = true
+    @map.center_view_on_room(r)
+    @map.draw
+  end
+
+  def copy_from(map)
+    @map = map
+    sort
+  end
+
+  def sort
+    item = @box.currentItem
+    room = nil
+    if item >= 0
+      idx, room = @box.getItemData(item)
+    end
+
+    @box.clearItems
+
+    rooms = []
+    @map.sections.each_with_index { |s, idx| 
+      s.rooms.each { |r|
+	rooms << [idx, r]
+      }
+    }
+
+    dir = @box.header.getArrowDir(0)
+    if dir != MAYBE
+      rooms = rooms.sort_by { |r| r[0] }
+    else
+      dir = @box.header.getArrowDir(1)
+      if dir != MAYBE
+	rooms = rooms.sort_by { |r| r[1].name }
+      end
+    end
+
+    if dir == Fox::TRUE
+      rooms.reverse! 
+    end
+
+    rooms.each { |r|
+      item = "#{r[0]}\t#{r[1].name}"
+      @box.appendItem(item, nil, nil, r)
+    }
+
+    if room
+      rooms.each_with_index { |r, idx|
+	if r[1] == room
+	  @box.currentItem = idx
+	  break
+	end
+      }
+    end
+  end
+
+  def initialize(map)
+    super(map.window.parent, "Locations", DECOR_ALL, 40, 40, 300, 400)
+  
+    @box = FXIconList.new(self, nil, 0, 
+			   ICONLIST_BROWSESELECT|
+			   LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @box.appendHeader("Section", nil, 60)
+    @box.appendHeader("Name", nil, 200)
+    @box.header.connect(SEL_COMMAND) { |sender, sel, which|
+      if @box.header.arrowUp?(which)
+	dir = MAYBE
+      elsif @box.header.arrowDown?(which)
+	dir = TRUE
+      else
+	dir = FALSE
+      end
+      @box.header.setArrowDir(which, dir)
+      @box.header.setArrowDir(which ^ 1, MAYBE)
+      sort
+    }
+
+    @box.connect(SEL_COMMAND, method(:pick))
+
+    create
+    copy_from(map)
+  end
+
+end

data/lib/IFMapper/PDFMapExporter.rb

@@ -104,7 +104,16 @@ class FXConnection
 
   def pdf_draw_complex( pdf, opts )
     if opts['Paths as Curves']
-      p = pdf_draw_complex_as_bspline( pdf, opts )
+      if @room[0] == @room[1]
+	dirA, dirB = dirs
+	if dirA == dirB
+	  p = pdf_draw_complex_as_lines( pdf, opts )
+	else
+	  p = pdf_draw_complex_as_bspline( pdf, opts )
+	end
+      else
+	p = pdf_draw_complex_as_bspline( pdf, opts )
+      end
     else
       p = pdf_draw_complex_as_lines( pdf, opts )
     end

data/lib/IFMapper/Room.rb

@@ -44,6 +44,7 @@ class Room
     if not vars.empty? and vars[0].kind_of?(String)
       @desc     = vars.shift
       @desc.sub!(/\n/, ' ')
+      @desc.strip!
     end
   end
 
@@ -59,6 +60,27 @@ class Room
     @exits[dir] = connection
   end
 
+  #
+  # Return the number of doors present in room
+  #
+  def num_doors
+    num = 0
+    @exits.each { |e|
+      next if not e
+      num += 1 if e.door?
+    }
+    return num
+  end
+
+  #
+  # Return the number of exits present in room
+  #
+  def num_exits
+    num = 0
+    @exits.each { |e| num += 1 if e }
+    return num
+  end
+
   #
   # Return a direction from the vector of the exit that would take
   # us to the 'b' room more cleanly.

data/lib/IFMapper/TranscriptDialogBox.rb

@@ -0,0 +1,117 @@
+
+class TranscriptDialogBox < FXDialogBox
+
+  LOCATION_TEXT = [
+"
+West of House
+You are standing in an open field west of a white house, with a boarded
+front door.
+",
+"
+(You are now in the driveway.)
+(You're sitting in the sports car.)
+You are by the front gate of the Tresyllian Castle. You can hear the ocean
+beating urgently against the rocks far below.
+",
+"
+You are now in the driveway entrance.
+You are standing at the foot of the driveway, the entrance to the Linder
+property. The entire lot is screened from the street and the neighbors by
+a wooden fence, except on the east side, which fronts on dense 
+bamboo woods.
+",
+  ]
+
+  LOCATION2_TEXT = [
+"
+West of House
+",
+"
+(You are in the driveway.)
+",
+"
+(driveway entrance)
+",
+  ]
+
+  IDENTIFY_TYPE = [
+    'By Descriptions',
+    'By Short Name',
+  ]
+
+  SHORTNAME_TYPE = [
+    'Classic',
+    'Moonmist Style',
+    'Witness Style',
+  ]
+
+  def copy_from(transcript)
+    @transcript = transcript
+    @type.currentNo  = transcript.identify
+    @short.currentNo = transcript.shortName
+    @show.text = LOCATION_TEXT[@short.currentNo]
+    @show2.text = LOCATION2_TEXT[@short.currentNo]
+    parent = transcript.map.window
+  end
+
+  def copy_to()
+    @transcript.identify  = @type.currentNo
+    @transcript.shortName = @short.currentNo
+    @show.text  = LOCATION_TEXT[@short.currentNo]
+    @show2.text = LOCATION2_TEXT[@short.currentNo]
+  end
+
+  def initialize(transcript)
+    map = transcript.map
+    pos = [40, 40]
+    maxW = map.window.width  - 390
+    maxH = map.window.height - 300
+    pos[0] = maxW if pos[0] > maxW
+    pos[1] = maxH if pos[1] > maxH
+
+    decor = DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE
+    super( map.window, 'Transcript Options', decor, pos[0], pos[1], 0, 0 )
+
+    mainFrame = FXVerticalFrame.new(self,
+				    FRAME_SUNKEN|FRAME_THICK|
+				    LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+    frame = FXHorizontalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+    FXLabel.new(frame, "Identify Locations: ", nil, 0, LAYOUT_FILL_X)
+    pane = FXPopup.new(self)
+    IDENTIFY_TYPE.each { |t|
+      FXOption.new(pane, t, nil, nil, 0, JUSTIFY_HZ_APART|ICON_AFTER_TEXT)
+    }
+    @type = FXOptionMenu.new(frame, pane, FRAME_RAISED|FRAME_THICK|
+			     JUSTIFY_HZ_APART|ICON_AFTER_TEXT|
+			     LAYOUT_CENTER_X|LAYOUT_CENTER_Y)
+
+
+    frame = FXHorizontalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+    FXLabel.new(frame, "Short Name Type: ", nil, 0, LAYOUT_FILL_X)
+    pane = FXPopup.new(self)
+    SHORTNAME_TYPE.each { |t|
+      FXOption.new(pane, t, nil, nil, 0, JUSTIFY_HZ_APART|ICON_AFTER_TEXT)
+    }
+    @short = FXOptionMenu.new(frame, pane, FRAME_RAISED|FRAME_THICK|
+			      JUSTIFY_HZ_APART|ICON_AFTER_TEXT|
+			      LAYOUT_CENTER_X|LAYOUT_CENTER_Y)
+
+    frame = FXVerticalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+    FXLabel.new(frame, "Sample Verbose Mode: ", nil, 0, LAYOUT_FILL_X)
+    @show  = FXText.new(frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @show.visibleRows = 7
+    @show.visibleColumns = 60
+    @show.disable
+    FXLabel.new(frame, "Sample Brief Mode: ", nil, 0, LAYOUT_FILL_X)
+    @show2  = FXText.new(frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @show2.visibleRows = 3
+    @show2.visibleColumns = 60
+    @show2.disable
+
+    @type.connect(SEL_COMMAND)  { copy_to }
+    @short.connect(SEL_COMMAND) { copy_to }
+
+    copy_from(transcript)
+  end
+end

data/lib/IFMapper/TranscriptReader.rb

@@ -12,6 +12,8 @@
 #
 class TranscriptReader
 
+  TRANSCRIPT = /^(?:Start of a transcript of|Here begins a transcript of interation with (.*)|Here begins a transcript of interation with)/
+
   PROMPT   = /^>\s*/
   LOOK     = /^l(ook)?/i
   UNDO     = /^undo$/i
@@ -24,7 +26,7 @@ class TranscriptReader
   TAKE     = /^(take|get)\s+(a\s+|the\s+)?(.*)/i
   DROP     = /^(drop|leave)\s+()/i
   STARTUP  = /(^[A-Z]+$|Copyright|\([cC]\)\s*\d|Trademark|Release|Version|[Ss]erial [Nn]umber|Written by)/
-  DARKNESS = /^dark(ness)?$|In the dark|It is pitch black/i
+  DARKNESS = /^dark(ness)?$|^in the dark$|^It is pitch black|^It is too dark to see anything|^You stumble around in the dark/i
   DEAD     = /(You die|You have died|You are dead)/i
   YES      = /^y(es)/i
 
@@ -42,16 +44,21 @@ class TranscriptReader
     "in" => 3, "out" => 4, 'enter' => 3, 'exit' => 4 }
 
   DIR_REX = '(' + DIRMAP.keys.join('|') + '|' + ODIRMAP.keys.join('|') + ')'
-  GO      = /^((walk|run|go)\s+)?#{DIR_REX}[.,\s]*\b/i
+  GO      = /^((walk|run|go|drive|jump)\s+)?#{DIR_REX}[.,\s]*\b/i
 
   # Direction list in order of positioning preference.
   DIRLIST = [ 0, 4, 2, 6, 1, 3, 5, 7 ]
 
   # No exit replies
   NO_EXIT = [
-    /you\s+can't\s+go\s+that\s+way/i,
-    /doorways\s+lead\s+/i,
-    /that's\s+a\s+wall/i,
+    /\byou\scan't\sgo\sthat\sway\b/i,
+    /\bdoorways\slead\s/i,
+    /\bthat's\sa\swall\b/i,
+    /\bno\sexit\b/i,
+    /\bthere's\s+nothing\sin\sthat\sdirection\b/i,
+    /\bblock\sthe\sway/i,
+    /\byou\scan\sonly\sgo\s/i,
+    /\byou\scan\sgo\sonly\s/i,
   ]
 
   # Closed exit replies
@@ -59,11 +66,12 @@ class TranscriptReader
     /door\s+is\s+closed/i,
   ]
 
-  NAME_REMOVE   = /(\s+\(.+\)|,\s+[io]n\s+.+)/ # remove things like (on the bed)
-  NAME_INVALID  = /[:;\[\]!\.\?\000]/
-  SALUTATIONS   = /\b(Mr|Mr?s|Miss|Jr|Sr)\./
+  # 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_MAXWORDS = 20
-  NAME_MAXUNCAP = 4  # so that lowercase room/end will be accepted
+  NAME_MAXUNCAP = 4  # so that lowercase "room" "end" "of" will be accepted
 
   # Default room description recognition parameters.
   DESC_MINWORDS = 10
@@ -73,10 +81,33 @@ class TranscriptReader
   DESC_IGNORE   = /(?:an|a|open(ed)?|closed?)/i
 
 
-  RESTORE_OK  = /\b(Ok|completed?)\b/
+  RESTORE_OK  = /\b(Ok|completed?|Okay)\b/
+
+  ## 
+  THE = '(?:the|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_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+#{TAKE_ALIAS}\s+(?:#{THE})?#{TAKE_OBJ}#{TAKE_FROM}/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,
+  ]
+
+  IT = /^(it|them)$/i
+
+  @@win = nil
 
-  ## Change this to non-dil to print out debugging info
-  @@debug = 1
+  ## Change this to non-nil to print out debugging info
+  @@debug = nil
 
   def debug(*msg)
     if @@debug
@@ -84,20 +115,15 @@ class TranscriptReader
     end
   end
 
-  ## 
-  THE = '\b(the|a|your|some)\b'
+  IDENTIFY_BY_DESCRIPTION = 0
+  IDENTIFY_BY_SHORTNAME   = 1
 
-  ARTICLE = /^#{THE}\s+/i
+  SHORTNAME_CLASSIC  = 0
+  SHORTNAME_MOONMIST = 1
+  SHORTNAME_WITNESS  = 2
 
-  ## Possible nessages indicating get/take succeeded
-  TAKE_OK = [ 
-    /taken/i,
-    /you\s+pick\s+up\s+the\s+?/i,
-    /you\s+now\s+have\s+(got\s+)?/i,
-    /you\s+(grab|pick|take)\s+#{THE}\s+\w+/i
-  ]
+  attr_accessor :identify, :shortName, :map
 
-  IT = /^(it|them)$/i
 
 
   #
@@ -105,26 +131,47 @@ class TranscriptReader
   #
   def take(move, objs)
     return unless @here
-    endl = ''
-    endl = "\n" if @here.objects != '' and @here.objects[-1,1] != "\n"
+    if @here.objects != '' and @here.objects[-1,1] != "\n"
+      @here.objects << "\n"
+    end
+
     objs.each { |cmd, dummy, obj|
-      next if not obj
+      next if not obj or not move[:reply]
 
       objlist = obj.split(',')
       o = objlist[0]
       if objlist.size == 1 and o != 'all'
 	# ignore 'get up'
-	next if cmd == 'get' and o == 'up'
+	next if cmd == 'get' and (o == 'up' or o == 'off')
 	o = @last_obj if o =~ IT
 	next if not o
+	if move[:reply][0] =~ /^\((.*)\)$/
+	  nobj = $1
+	  words = nobj.split(/\s+/)
+	  if words.size < 7
+	    # Acclaration, like:
+	    # > get mask
+	    # (the brown mask)
+	    # Taken.
+	    o = nobj
+	  else
+	    # too big of an aclaration... probably something like
+	    # (putting the xxx in your bag to make room)
+	  end
+	end
 	o.sub!(ARTICLE, '')
 	status = move[:reply].to_s
 	TAKE_OK.each { |re|
-	  if status =~ re and not @objects.has_key?(o) and
-	      not @here.objects =~ /\b#{o}\b/
-	    @here.objects << endl << o << "\n"
-	    @objects[o] = 1
-	    @last_obj = o
+	  if status =~ re then
+	    obj = $1 || o
+	    obj = o if obj =~ /\b(it|them)\b/
+	    @last_obj = obj
+	    # Take succeeded, change object o
+	    if not @objects.has_key?(obj) and
+		not @here.objects =~ /\b#{obj}\b/
+	      @here.objects << obj << "\n"
+	      @objects[obj] = 1
+	    end
 	    break
 	  end
 	}
@@ -133,17 +180,23 @@ class TranscriptReader
 	move[:reply].each { |reply|
 	  o, status = reply.split(':')
 	  next if not status
-	  o = @last_obj if o =~ IT
+	  next if o.split(' ').size > 6 # ignore if too many words
 	  o.sub!(ARTICLE, '')
-	  if o and not @objects.has_key?(o) and
-	      not @here.objects =~ /\b#{o}\b/
-	    @here.objects << endl << o << "\n"
-	    @objects[o] = 1
-	    @last_obj = o
-	  end
+	  TAKE_OK.each { |re|
+	    if status =~ re then
+	      if o and not @objects.has_key?(o) and
+		  not @here.objects =~ /\b#{o}\b/
+		@here.objects << o << "\n"
+		@objects[o] = 1
+	      end
+	      @last_obj = o
+	      break
+	    end
+	  }
 	}
       end
     }
+    @here.objects.squeeze("\n")
   end
 
   #
@@ -161,39 +214,29 @@ class TranscriptReader
   end
 
 
-  def parse
-    # Find first command prompt
-    while line = @f.gets
-      break if PROMPT =~ line
-    end
-    parse_line(line)
-  end
-
   #
   # Given a room description, parse it to try to find out all exits 
   # from room.
   #
 
   DIRS  = {
-    'north' => 0, 'northeast' => 1, 'east' => 2, 'southeast' => 3, 'south' => 4,
-    'southwest' => 5, 'west' => 6, 'northwest' => 7
+    'north' => 0, 'northeast' => 1, 'east' => 2, 'southeast' => 3, 
+    'south' => 4, 'southwest' => 5, 'west' => 6, 'northwest' => 7
   }
 
   DIR = '(' + DIRS.keys.join('|') + ')'
-  OR = '(and|or)'
+  OR = '(?:and|or)'
 
   EXITS_REGEX = 
     [
-    # (You can) go south or east
-    /\s+go\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i,
-    # You can go south
-    /you\s+can\s+go\s+#{DIR}\b/i,
+    # paths lead west and north
+    /(run|bears|lead|wander|winds|go)\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i, 
     # to the east or west
     /to\s+the\s+#{DIR}\s+#{OR}\s+(to\s+the\s+)?#{DIR}\b/i,
+    # You can go south
+    /you\s+can\s+go\s+#{DIR}\b/i,
     # to the east
     /to\s+the\s+#{DIR}\b/i,
-    # paths lead west and north
-    /(run|bears|lead|wander|winds)\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i, 
     # east-west corridor
     /[\.\s+]#{DIR}[\/-]#{DIR}\b/i, 
     # East is the postoffice
@@ -248,15 +291,34 @@ class TranscriptReader
     # Add a 'stub' for the new connection
     exits.each { |exit|
       next if r[exit]
-      c = @map.new_connection( r, exit, nil )
-      c.dir = Connection::AtoB
-      debug "\tADDED STUB #{c}"
+      begin
+	c = @map.new_connection( r, exit, nil )
+	c.dir = Connection::AtoB
+	debug "\tADDED STUB #{c}"
+      rescue ConnectionError
+      end
     }
   end
 
+
   def parse_line(line)
     return unless line
+    @map.mutex.synchronize do
+      _parse_line(line)
+    end
+
+    if @map.kind_of?(FXMap)
+      @map.clear_selection
+      @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
+  end
 
+  def _parse_line(line)
     @moves.clear
 
     #
@@ -286,7 +348,10 @@ class TranscriptReader
 
 	# Replace all 'THEN' in command for periods
 	cmd.sub!(THEN, '.')
-	cmd.sub!(/\s*\.+\s*/, '.') # and multiple periods for just one
+	# and all ANDs for commas
+	cmd.sub!(/\band\b/i,',')
+	# and multiple periods for just one
+	cmd.sub!(/\s*\.+\s*/, '.') 
 
 	move[:cmd]   = cmd
 	move[:reply] = reply
@@ -336,7 +401,6 @@ class TranscriptReader
       startup = false
       rooms = []
       move[:reply].each { |r|
-	puts "LINE: #{r}"
 	tele = 1 if r =~ DEAD
 
 	if r =~ STARTUP
@@ -357,11 +421,11 @@ class TranscriptReader
 	next if startup and r !~ BLANK
 	startup = false
 
-	if not roomflag and r !~ BLANK and room_name(r)
-	  debug "set roomflag with #{r}"
+	if not roomflag and r !~ BLANK and n = room_name(r)
+	  debug "Found room #{n}"
 	  roomflag = true
 	  desc_gap = false
-	  name = r
+	  name = n
 	  desc = ''
 	  next
 	end
@@ -373,13 +437,11 @@ class TranscriptReader
 
 
 	if roomflag and r !~ BLANK
-	  puts "ADD TO DESC: #{r}"
 	  desc << r << "\n"
 	  next
 	end
 
 	if r =~ BLANK and roomflag
-	  puts "DONE DESC"
 	  if desc.count("\n") == 1 and desc =~ /\?$/
 	    # A "What next?" type of prompt, not a room description
 	    desc = ''
@@ -388,9 +450,9 @@ class TranscriptReader
 	    desc = nil
 	  else
 	    desc.gsub!(/\n/, ' ')
+	    desc.strip!
 	  end
 
-	  puts "DESC: #{desc}"
 	  rooms << {
 	    :name => name,
 	    :desc => desc,
@@ -403,6 +465,17 @@ class TranscriptReader
 	  tele = nil
 	end
       }
+      
+      # Oops, there was no newline between room description and prompt and
+      # we missed the last room.
+      # This happens for example with Magnetic Scrolls transcripts.
+      if name
+	rooms << {
+	  :name => name,
+	  :desc => desc,
+	  :tele => tele
+	}
+      end
 
       if not rooms.empty?
 	move[:rooms] = rooms
@@ -439,7 +512,7 @@ class TranscriptReader
 	    end
 
 	    # Check if there is a closed door
-	    if @here[dir].type == Connection::FREE
+	    if @here[dir] and @here[dir].type == Connection::FREE
 	      CLOSED_EXIT.each { |re|
 		if move[:reply][0] =~ re
 		  # If so, flag it
@@ -512,6 +585,8 @@ class TranscriptReader
 	  break
 	end
 
+	sect  = @map.section
+
 	# Otherwise, assume we moved in some way.  Try to find the new room.
 	if name =~ DARKNESS
 	  idx = DIRMAP[dir] || ODIRMAP[dir]
@@ -556,7 +631,8 @@ class TranscriptReader
 	  dir = choose_dir(@here, there, go)
 	else
 	  # special move --- teleport/death/etc.
-	  dir = choose_dir(@here, there, 0)
+	  go  = 0
+	  dir = choose_dir(@here, there, go)
 	end
 	debug "MOVED IN DIR INDEX: #{dir}"
 
@@ -566,7 +642,9 @@ class TranscriptReader
 	  @here = new_room(move, name, desc, dir, @here, go)
 	else
 	  # Visited before -- new link
-	  new_link(move, @here, there, dir, go)
+	  if sect == @map.section # don't conn
+	    new_link(move, @here, there, dir, go)
+	  end
 	  @here = there
 	end
       }
@@ -575,17 +653,80 @@ class TranscriptReader
     @moves.clear
     @map.fit
     if @map.kind_of?(FXMap)
-      @map.clear_selection
-      @here.selected = true if @here
-      @map.create_pathmap
-      @map.zoom = @map.zoom
-      @map.center_view_on_room(@here) if @here
-      @map.verify_integrity
-      @map.draw
     end
   end
 
   def find_room(name, desc)
+    case @identify
+    when IDENTIFY_BY_DESCRIPTION
+      return find_room_by_desc(name, desc)
+    when IDENTIFY_BY_SHORTNAME
+      return find_room_by_name(name, desc)
+    end
+  end
+
+  def find_room_by_name(name, desc)
+    bestscore = 0
+    best = nil
+
+    @map.sections.each_with_index { |sect, idx|
+      sect.rooms.each { |room|
+	score = 0
+	score += 1 if room.name == name
+
+	if score == 1 and desc and room.desc
+	  # We have a description...
+	  # Try exact description match first
+	  score += 10 if room.desc == desc
+	  
+	  # Try substring match
+	  score += 5 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.
+	  # This is to help, for example, Trinity, where two rooms have
+	  # the exact description but different name.
+	  score += 1 if room.name == name and score > 0
+
+	  # If still no luck, try first N words
+	  if score == 1
+	    dwords = room.desc.split(' ')
+	    words  = desc.split(' ')
+	    match  = true
+	    0.upto(DESC_MINWORDS) { |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
+	      end
+	    }
+	    
+	    score += 1 if match
+	  end
+	end
+	next if score <= bestscore
+	bestscore = score
+	best = [room, idx]
+      }
+    }
+
+    return nil if not best
+      
+    # Make sure we are in the right section
+    if best[1] != @map.section
+      @map.fit
+      @map.section = best[1]
+    end
+    if desc and (not best[0].desc or best[0].desc == '')
+      best[0].desc = desc
+    end
+    return best[0]
+  end
+
+  def find_room_by_desc(name, desc)
     bestscore = 0
     best = nil
 
@@ -642,32 +783,77 @@ class TranscriptReader
       @map.fit
       @map.section = best[1]
     end
-    puts "DESC: #{desc} RDESC:#{best[0].desc}"
     if desc and (not best[0].desc or best[0].desc == '')
       best[0].desc = desc
-      puts "CHANGED: #{best[0].desc}"
     end
     return best[0]
   end
+
+  def room_name(line)
+    case @shortName
+    when SHORTNAME_CLASSIC
+      return room_name_classic(line)
+    when SHORTNAME_MOONMIST
+      return room_name_moonmist(line)
+    when SHORTNAME_WITNESS
+      return room_name_witness(line)
+    end
+  end
+
+  def capitalize_room(line)
+    words = line.split(' ')
+    words.each { |w|
+      if w =~ /^(?:of|on|in|the|a)$/i
+	w.downcase!
+      else
+	w.capitalize!
+      end
+    }
+    return words.join(' ')
+  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/
+      return $1
+    elsif line =~ /^\(([\w\d\s_]+)\)$/
+      return $1
+    else
+      return false
+    end
+  end
+
+  def room_name_moonmist(line)
+    return false if line =~ /^\(You are not holding it.\)$/
+    if line =~ /^\(You\sare\s(?:now\s)?(?:[io]n\s)?(?:#{THE})?([\w'\d\s\-_]+)\.\)$/
+      return capitalize_room( $1 )
+    else
+      return false
+    end
+  end
     
   #
   # Determine if line corresponds to a room name
   #
-  def room_name(line)
+  def room_name_classic(line)
     # Check if user/game has created a room with that name already
-    return true if find_room(line, nil)
+    return line if find_room(line, nil)
+
+    # We have a room if we match darkness
+    return line if line =~ DARKNESS
 
     # Remove unwanted stuff line (on the bed)
     line.sub!(NAME_REMOVE, '')
 
     # Check if user/game has created a room with that name already
-    return true if find_room(line, nil)
+    return line if find_room(line, nil)
 
     # Remove periods from salutations
     line.sub!(SALUTATIONS, '\1')
 
     # quick check for invalid format
     return false if line =~ NAME_INVALID
+
     # Qucik check for word characters
     return false unless line =~ /\w/
 
@@ -676,8 +862,12 @@ class TranscriptReader
     return false if words.size > NAME_MAXWORDS
 
     # Check if we start line with uncapitalized words or symbols
-    return false if line =~ /^[ a-z\/\\\-\(\)'#]/
+    return false if line =~ /^[ a-z\/\\\-\(\)']/
 
+    # Check if line holds only capitalized words or several spaces together
+    # or a quote or a 1) line.  If so, not a room.
+    return false if line =~ /^[A-Z\d,\.\/\-"'\s]+$/ or line =~ /\s\s/ or 
+      line =~ /^".*"$/ or line =~ /^"[^"]+$/ or line =~ /^\d+\)/
 
     # If not, check all words of 4 chars or more are capitalized
     # and that there are no 3 or more short letter words together 
@@ -694,7 +884,7 @@ class TranscriptReader
     }
 
     # Okay, it is a room.
-    return true
+    return line
   end
 
   #
@@ -752,6 +942,7 @@ class TranscriptReader
 	  debug "\tUPDATE #{c}"
 	  odir = (dir + 4) % 8
 	  c.exitAtext = go if go
+	  c.type  = Connection::SPECIAL if go == 0
 	  c.roomB = r
 	  r[odir] = c
 	  debug "\tNOW IT IS #{c}"
@@ -766,7 +957,8 @@ class TranscriptReader
 	begin
 	  c = @map.new_connection( from, dir, r )
 	  c.exitAtext = go if go
-	  c.dir = Connection::AtoB
+	  c.type = Connection::SPECIAL if go == 0
+	  c.dir  = Connection::AtoB
 	rescue Section::ConnectionError
 	end
       end
@@ -820,6 +1012,7 @@ class TranscriptReader
 	# Stub connection, fill it
 	c.roomB     = to
 	c.exitAtext = go if go
+	c.type      = Connection::SPECIAL if go == 0
 	# we still need to check the destination to[odir]...
 	if not to[odir]
 	  # nothing to do
@@ -830,7 +1023,7 @@ class TranscriptReader
 	  # this end cannot be deleted.  we need to shift odir
 	  debug "\tCHOOSE NEW DIR for #{odir}"
 	  rgo = nil
-	  if go
+	  if go and go > 0
 	    rgo = rgo % 2 == 0? go - 1 : go + 1
 	  end
 	  odir = choose_dir(to, from, rgo, dir)
@@ -849,7 +1042,7 @@ class TranscriptReader
 	debug "\tVERIFIED EXIT BOTH WAYS"
       else
 	debug "\tOTHER"
-	if c.roomA == from and c.dir != Connection::BtoA
+	if c.roomA == from
 	  b = c.roomB
 	  if b.name =~ DARKNESS
 	    debug "*** REPLACING DARK ROOM ***"
@@ -859,15 +1052,17 @@ class TranscriptReader
 	    c = nil
 	  else
 	    if c.exitAtext != 0
+	      # if it was an up/down/in/out dir, we shift it
 	      shift_link(from, dir)
 	      c = nil
 	    else
+	      # else, we really have a problem in the map
 	      debug "*** CANNOT AUTOMAP --- MAZE ***"
 	      dir = Room::DIRECTIONS[dir]
 	      @map.cannot_automap "Maze detected.\n'#{from}' #{dir} leads to '#{c.roomB}',\nnot to this '#{to}'."
+	      # self.stop
+	      return nil
 	    end
-	    # self.stop
-	    return nil
 	  end
 	else
 	  debug "SHIFT LINK #{from} #{dir}"
@@ -888,12 +1083,14 @@ class TranscriptReader
 	from[dir] = c
 	c.dir = Connection::BtoA
 	c.exitBtext = go if go
+	c.type  = Connection::SPECIAL if go == 0
       elsif c.roomB == from
 	c.exitBtext = go if go
+	c.type  = Connection::SPECIAL if go == 0
       else
 	# We need to change odir to something else
 	rgo = nil
-	if go
+	if go and go > 0
 	  rgo = go % 2 == 0? go - 1 : go + 1
 	end
 	odir = choose_dir(to, from, rgo, dir)
@@ -918,6 +1115,7 @@ class TranscriptReader
 	from[dir]   = c
 	c.dir       = Connection::BOTH
 	c.exitAtext = go if go
+	c.type  = Connection::SPECIAL if go == 0
       end
     end
 
@@ -1018,7 +1216,23 @@ class TranscriptReader
     GC.start
   end
 
+
+  def properties(modal = false)
+    require 'IFMapper/TranscriptDialogBox'
+    if not @@win
+      @@win = TranscriptDialogBox.new(self)
+    else
+      @@win.copy_from(self)
+    end
+    if modal
+      @@win.execute
+    end
+  end
+
   def initialize(map, file)
+    @shortName = 0
+    @identify  = 0
+
     @file     = file
     @map      = map
     @objects  = {}
@@ -1026,12 +1240,6 @@ class TranscriptReader
     @here     = nil
     @section  = -1
     @last_obj = nil
-
-    @f = File.open(@file, 'r')
-    while line = @f.gets
-      break if PROMPT =~ line
-    end
-    parse
   end
 
   # Step one user command at a time
@@ -1045,6 +1253,22 @@ class TranscriptReader
   end
 
   def start
+    if not @f
+      @f = File.open(@file, 'r')
+      while line = @f.gets
+	if @map.name =~ /^Empty Map/ and line =~ TRANSCRIPT
+	  if $1
+	    @map.name = $1
+	  else
+	    @map.name = @f.gets.strip
+	  end
+	  @map.name = capitalize_room(@map.name)
+	end
+	break if PROMPT =~ line
+      end
+      parse_line(line)
+    end
+
     @t = Thread.new { 
       loop do
 	self.step