ifmapper 0.9.7 → 0.9.8

data/lib/IFMapper/PDFMapExporter.rb

@@ -127,18 +127,18 @@ class FXConnection
 
     if @type == LOCKED_DOOR or @type == CLOSED_DOOR
       t = p.size / 2
-      x1, y1 = [ p[t].x, p[t].y ]
-      x2, y2 = [ p[t-2].x, p[t-2].y ]
+      x1, y1 = [ p[t][0], p[t][1] ]
+      x2, y2 = [ p[t-2][0], p[t-2][1] ]
       pdf_draw_door(pdf, x1, y1, x2, y2)
     end
   end
 
   def pdf_draw_simple(pdf, opts)
-    return if not @roomB # PDF does not print unfinished complex connections
+    return if not @room[1] # PDF does not print unfinished complex connections
 
-    dir    = @roomA.exits.index(self)
-    x1, y1 = @roomA.pdf_corner(opts, self, dir)
-    x2, y2 = @roomB.pdf_corner(opts, self)
+    dir    = @room[0].exits.index(self)
+    x1, y1 = @room[0].pdf_corner(opts, self, dir)
+    x2, y2 = @room[1].pdf_corner(opts, self)
     pdf.move_to(x1, y1)
     pdf.line_to(x2, y2).stroke
     pdf_draw_arrow(pdf, opts, x1, y1, x2, y2)
@@ -174,17 +174,19 @@ class FXConnection
   end
 
   def pdf_draw_exit_text(pdf, opts)
-    if @exitAtext != 0
-      dir  = @roomA.exits.index(self)
-      x, y = @roomA.pdf_corner(opts, self, dir)
+
+    if @exitText[0] != 0
+      dir  = @room[0].exits.index(self)
+      x, y = @room[0].pdf_corner(opts, self, dir)
       pdf_draw_text( pdf, x, y, dir, 
-		   EXIT_TEXT[@exitAtext], @dir == BtoA)
+		   EXIT_TEXT[@exitText[0]], @dir == BtoA)
     end
-    if @exitBtext != 0
-      dir  = @roomB.exits.rindex(self)
-      x, y = @roomB.pdf_corner(opts, self, dir)
+
+    if @exitText[1] != 0
+      dir  = @room[1].exits.rindex(self)
+      x, y = @room[1].pdf_corner(opts, self, dir)
       pdf_draw_text( pdf, x, y, dir, 
-		    EXIT_TEXT[@exitBtext], @dir == AtoB)
+		    EXIT_TEXT[@exitText[1]], @dir == AtoB)
     end
   end
 
@@ -467,12 +469,15 @@ class FXMap
       num = pack_sections( pdf_options['width'] + 2, 
 			  pdf_options['height'] + 2 )
       pdf_draw_sections(pdf, pdf_options)
+      if pdffile !~ /\.pdf$/
+	pdffile << ".pdf"
+      end
       status "Exporting PDF file '#{pdffile}'"
       pdf.save_as(pdffile)
     rescue => e
       p e
       p e.backtrace
-      # raise e
+      raise e
     end
   end
 end

data/lib/IFMapper/Section.rb

@@ -145,14 +145,21 @@ class Section
   end
 
   #
-  # Delete a room
+  # Delete a room, leaving its connections intact
+  #
+  def delete_room_only(r)
+    @rooms.delete(r)
+  end
+
+  #
+  # Delete a room and all of its connections
   #
   def delete_room(r)
     r.exits.each { |e|
       next if not e
       delete_connection(e)
     }
-    @rooms.delete(r)
+    delete_room_only(r)
   end
 
   #

data/lib/IFMapper/TADSWriter.rb

@@ -352,7 +352,7 @@ EOF
       'Platform',
     ] + DIRECTIONS
 
-    @keyword = /^#{keywords.join('|')}$/i
+    @keyword = /^(?:#{keywords.join('|')})$/i
     start
   end
 

data/lib/IFMapper/TranscriptDialogBox.rb

@@ -1,175 +1,175 @@
-
-class TranscriptDialogBox < FXDialogBox
-
-  EXPLANATION_TEXT = [
-"Classic Mode expects a short name description for all
-locations, where all words of 5 or more characters to are
-capitalized and where there is no period.  
-Commands always begin with a > prompt.",
-"Capitalized Mode expects a short name description for all
-locations, where only the first word needs to be capitalized
-and there is no period.  
-Commands always begin with a > prompt.",
-"Moonmist mode describes locations in parenthesis, with 'You
-are...' prefixed and a period at the end, inside the parenthesis.
-Commands always begin with a > prompt.",
-"Witness mode expects locations described as normal prose, using
-'You are...' as an introductory paragraph.  When in brief mode, 
-locations are expected to be in parenthesis.
-Commands always begin with a > prompt.",
-"ADRIFT mode expects locations to be like in Classic Mode (short
-names where all words of 5 or more characters are capitalized).
-However, commands do not begin with any type of prompt but start
-with a lowercase word without any margin.",
-]
-
-  LOCATION_TEXT = [
-"
-> look
-West of House
-You are standing in an open field west of a white house, with a boarded
-front door.
-",
-"
-> look
-Women's change room
-Your heels click loudly on the tiles, echoing down the banks of lockers
-that line the sides of the room.
-",
-"
-> look
-(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.
-",
-"
-> look
-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.
-",
-"
-look
-Front of Mall
-    Although four-wheeled vehicles do pass through, this autonomous 
-spot of pavement is too narrow a place for them to stall.  It is just 
-right for bicycles and motorbikes such as yours.
-",
-  ]
-
-  LOCATION2_TEXT = [
-"
-West of House
-",
-"
-Women's change room
-",
-"
-(You are in the driveway.)
-",
-"
-(driveway entrance)
-",
-"
-Front of Mall
-",
-  ]
-
-  IDENTIFY_TYPE = [
-    'By Descriptions',
-    'By Short Name',
-  ]
-
-  SHORTNAME_TYPE = [
-    'Classic',
-    'Capitalized',
-    'Moonmist',
-    'Witness',
-    'ADRIFT',
-  ]
-
-  def copy_from(transcript)
-    @transcript = transcript
-    @type.currentNo  = transcript.identify
-    @short.currentNo = transcript.shortName
-    @exp.text  = EXPLANATION_TEXT[@short.currentNo]
-    @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
-    @exp.text  = EXPLANATION_TEXT[@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, "Transcript Style: ", 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 = 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 = FXVerticalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
-    FXLabel.new(frame, "Explanation: ", nil, 0, LAYOUT_FILL_X)
-    @exp  = FXText.new(frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    @exp.visibleRows = 4
-    @exp.visibleColumns = 60
-    @exp.backColor = mainFrame.backColor
-    @exp.disable
-
-    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 = 9
-    @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
+
+class TranscriptDialogBox < FXDialogBox
+
+  EXPLANATION_TEXT = [
+"Classic Mode expects a short name description for all
+locations, where all words of 5 or more characters to are
+capitalized and where there is no period.  
+Commands always begin with a > prompt.",
+"Capitalized Mode expects a short name description for all
+locations, where only the first word needs to be capitalized
+and there is no period.  
+Commands always begin with a > prompt.",
+"Moonmist mode describes locations in parenthesis, with 'You
+are...' prefixed and a period at the end, inside the parenthesis.
+Commands always begin with a > prompt.",
+"Witness mode expects locations described as normal prose, using
+'You are...' as an introductory paragraph.  When in brief mode, 
+locations are expected to be in parenthesis.
+Commands always begin with a > prompt.",
+"ADRIFT mode expects locations to be like in Classic Mode (short
+names where all words of 5 or more characters are capitalized).
+However, commands do not begin with any type of prompt but start
+with a lowercase word without any margin.",
+]
+
+  LOCATION_TEXT = [
+"
+> look
+West of House
+You are standing in an open field west of a white house, with a boarded
+front door.
+",
+"
+> look
+Women's change room
+Your heels click loudly on the tiles, echoing down the banks of lockers
+that line the sides of the room.
+",
+"
+> look
+(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.
+",
+"
+> look
+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.
+",
+"
+look
+Front of Mall
+    Although four-wheeled vehicles do pass through, this autonomous 
+spot of pavement is too narrow a place for them to stall.  It is just 
+right for bicycles and motorbikes such as yours.
+",
+  ]
+
+  LOCATION2_TEXT = [
+"
+West of House
+",
+"
+Women's change room
+",
+"
+(You are in the driveway.)
+",
+"
+(driveway entrance)
+",
+"
+Front of Mall
+",
+  ]
+
+  IDENTIFY_TYPE = [
+    'By Descriptions',
+    'By Short Name',
+  ]
+
+  SHORTNAME_TYPE = [
+    'Classic',
+    'Capitalized',
+    'Moonmist',
+    'Witness',
+    'ADRIFT',
+  ]
+
+  def copy_from(transcript)
+    @transcript = transcript
+    @type.currentNo  = transcript.identify
+    @short.currentNo = transcript.shortName
+    @exp.text  = EXPLANATION_TEXT[@short.currentNo]
+    @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
+    @exp.text  = EXPLANATION_TEXT[@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, "Transcript Style: ", 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 = 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 = FXVerticalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+    FXLabel.new(frame, "Explanation: ", nil, 0, LAYOUT_FILL_X)
+    @exp  = FXText.new(frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @exp.visibleRows = 4
+    @exp.visibleColumns = 60
+    @exp.backColor = mainFrame.backColor
+    @exp.disable
+
+    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 = 9
+    @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,7 +12,7 @@
 #
 class TranscriptReader
 
-  TRANSCRIPT = /^(?:Start of a transcript of|Here begins a transcript of interation with (.*)|Here begins a transcript of interation with)/
+  TRANSCRIPT = /^(?:Start of a transcript of|Here begins a transcript of interaction with (.*)|Here begins a transcript of interaction with)/
 
   #  PROMPT   = /^>\s*/
   LOOK     = /^l(ook)?/i
@@ -60,6 +60,9 @@ class TranscriptReader
     /\bblock\sthe\sway/i,
     /\byou\scan\sonly\sgo\s/i,
     /\byou\scan\sgo\sonly\s/i,
+    /\bimpenetrable\b/i,
+    /\bbars\syour\sway/i,
+    /\bthere's\s.*in\s(?:your|the)\sway/i
   ]
 
   # Closed exit replies
@@ -67,15 +70,22 @@ class TranscriptReader
     /door\s+is\s+closed/i,
   ]
 
-  # remove things like (on the bed)
+  # remove things like (on the bed) from short room name
   PREPOSITION   = "(?:in|on|under|behind|inside|\w+ing)"
   NAME_REMOVE   = /(\s+\(#{PREPOSITION}\s+.+\)|,\s+#{PREPOSITION}\s+[^\,\.]+)/
+
+  # not a room name if it has any of this.
   NAME_INVALID  = /--|[:;\*\[\]\|\+\=!\.\?\000<>]/
+
+  # Salutations and other words with periods that can appear as name of room
   SALUT         = '(Mr|Mr?s|Miss|Jr|Sr|St|Dr|Ave|Inc)'
   SALUTATIONS   = /\b#{SALUT}\./
+
+  # Maximum length of room name.  Otherwise, a sentence we ignore.
   NAME_MAXWORDS = 20
-  # word list that may be uncapitalized
-  NAME_UNCAP = /^(?:of|on|to|with|by|a|in|the|under)$/
+
+  # word list that may be uncapitalized in room name
+  NAME_UNCAP = /^(?:of|on|to|with|by|a|in|the|at|under)$/i
 
   # Default room description recognition parameters.
   DESC_MINWORDS = 20
@@ -236,25 +246,32 @@ class TranscriptReader
   #
 
   DIRS  = {
+    # SWD added variants used in e.g. YAGWAD
+    'north-east' => 1, 'south-east' => 3, 'south-west' => 5, 'north-west' => 7,
+    # Usual directions
     'north' => 0, 'northeast' => 1, 'east' => 2, 'southeast' => 3, 
-    'south' => 4, 'southwest' => 5, 'west' => 6, 'northwest' => 7
+    'south' => 4, 'southwest' => 5, 'west' => 6, 'northwest' => 7,
   }
 
-  DIR = '(' + DIRS.keys.join('|') + ')'
+  # SWD: hack: the variants with dashes must come first
+  # (so that regexes matches 'north-east' in preference to 'north'),
+  # so we manually prepend their names.  The duplication is harmless,
+  # it just makes the regexes slightly slower in the non-match case.
+  DIR = '(' + DIRS.keys.join('\b|') + ')'
   OR = '(?:and|or)'
 
   EXITS_REGEX = 
     [
     # paths lead west and north
-    /(run|bears|lead|wander|winds|go)\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i, 
+    /(run|bears|lead|wander|winds|go|continues)\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,
+    /to\s+the#{DIR}\s+#{OR}\s+(to\s+the\s+)?#{DIR}\b/i,
     # You can go south
-    /you\s+can\s+go\s+#{DIR}\b/i,
+    /you\s+can\s+go#{DIR}\b/i,
     # to the east
     /to\s+the\s+#{DIR}\b/i,
     # east-west corridor
-    /[\.\s+]#{DIR}[\/-]#{DIR}\b/i, 
+    /[\.\s+]#{DIR}[\/-]#{DIR}\s+(passage|corridor)/i, 
     # East is the postoffice
     /\b#{DIR}\s+is/i,
     # Directly north
@@ -355,7 +372,11 @@ class TranscriptReader
       end
 
       if cmd =~ UNDO
-	@moves.pop
+	if @moves.size < 2
+	  @here = nil  # out of moves, no clue where we are
+	else
+	  @moves.pop
+	end
       else
 	move = { }
 
@@ -579,7 +600,7 @@ class TranscriptReader
 	# set current room.
 	if move[:look] or not @here
 	  if move[:look] and name =~ DARKNESS
-	    @here = find_room(name, desc) unless @here.darkness
+	    @here = find_room(name, desc) if @here and not @here.darkness
 	  else
 	    @here = find_room(name, desc)
 	  end
@@ -607,7 +628,7 @@ class TranscriptReader
 	  idx = DIRMAP[dir] || ODIRMAP[dir]
 	  # Moving to a dark room is special.  We verify the exit to see
 	  # if it was already moving to a dark room (in which case it
-	  # becomes there) or if it was moving to some other room (in
+	  # becomes "there") or if it was moving to some other room (in
 	  # which case we flag it as dark and make it there)
 	  if idx and @here[idx]
 	    c = @here[idx]
@@ -831,8 +852,8 @@ class TranscriptReader
 
   def capitalize_room(line)
     words = line.split(' ')
-    words.each { |w|
-      if w =~ /^(?:of|on|in|the|a)$/i
+    words.each_with_index { |w, idx|
+      if idx > 0 and w =~ NAME_UNCAP
 	w.downcase!
       else
 	w.capitalize!
@@ -931,6 +952,9 @@ class TranscriptReader
   # Create a new room
   #
   def new_room( move, name, desc, dir = nil, from = nil, go = nil )
+    b = nil
+    dark = false
+
     if not from
       debug "FROM undefined.  Increase section #{name}"
       @section += 1
@@ -939,6 +963,7 @@ class TranscriptReader
       r.name = name
     else
 
+      darkexits = []
       if name =~ DARKNESS
 	dark = true
       else
@@ -946,11 +971,12 @@ class TranscriptReader
 	if from[dir]
 	  # oops, we had a connection there. 
 	  c = from[dir]
-	  b = c.roomB
+	  b = c.opposite(from)
 	  if b and b.name =~ DARKNESS
 	    # Was it a dark room that is now lit?  
 	    # if so, set dark flag and delete dark room
-	    @map.delete_room(b)
+	    @map.delete_connection(c)
+	    @map.delete_room_only(b)
 	    dark = true
 	    c = nil
 	  end
@@ -962,16 +988,25 @@ class TranscriptReader
       dx, dy = Room::DIR_TO_VECTOR[dir]
       x += dx
       y += dy
-      @map.shift(x, y, dx, dy) if not @map.free?(x, y) 
+      @map.shift(x, y, dx, dy) if not @map.free?(x, y)
 
-      if not @map.free?(x, y)
-	raise "Error when shifting rooms"
-      end
 
       debug "+++ New Room #{name} from #{from}"
       r = @map.new_room(x, y)
       r.name = name
       r.darkness = dark
+      if b and dark
+	b.exits.each_with_index { |de, didx| 
+	  next unless de
+	  @map.sections[@map.section].connections << de
+	  r[didx] = de
+	  if de.roomA == b
+	    de.roomA = r
+	  else
+	    de.roomB = r
+	  end
+	}
+      end
       c = nil
       if from[dir]
 	# oops, we had a connection there. 
@@ -1087,8 +1122,8 @@ class TranscriptReader
 	  if b.name =~ DARKNESS
 	    debug "*** REPLACING DARK ROOM ***"
 	    @map.delete_connection(c)
-	    @map.delete_room(b)
 	    to.darkness = true
+	    @map.delete_room(b)
 	    c = nil
 	  else
 	    if c.exitAtext != 0
@@ -1314,6 +1349,7 @@ class TranscriptReader
       loop do
 	self.step
 	Thread.pass
+	sleep 3
       end
     }
     @t.run