ifmapper 0.8.1 → 0.8.5

data/HISTORY.txt

@@ -1,9 +1,64 @@
 
-v0.8.1 - Just some fixes to the automapper, as it was failing on some relatively
-	 simple games.
+v0.8.5 - This is mainly a bug fix release.
+	 
+	 - Improvements to the automapper:
+	 * Now it uses much, much less memory as the automapper database
+	   will now use the actual map database.  This is mainly a departure
+	   from the original Perl code.
+	 * Now it will properly recognize rooms that were created manually.
+	   This allows you to start the automapper with an already created
+	   map and also work around any rooms that the automapper does not
+	   automatically recognize.
+	 * Cut/Copy/Paste rooms will also internally copy their descriptions,
+	   so the automapper will not get confused.
+	 * Adding objects now checks if the object was already typed in
+	   manually.
+	 * Fixed a bug with in/out/down/up exits not recognizing if the exit
+	   was already drawn in the room, resulting in two identical exits.
+	 * Now saving/loading a map that has been automapped will also save its
+	   descriptions.  This allows you to keep automapping a game easily
+	   in different sessions.
+	 * Restore/Restart/Unscript was not working appropiately.  
+	   It should have allowed you to "teleport" to any new location, yet 
+	   it was creating incorrect links.
+	 * There's now better handling of rooms gone dark (previously, they
+	   were treated as a separate location and multiple dark rooms
+	   would create links to a single dark room)
+	 
+	 - .map save format now is smaller, as some useless data was getting
+	   saved, which we now skip.  Note, however, that when automapping
+	   .map size is bigger, as room descriptions get also stored now.
+
+	 - Fixed a minor display bug when room name would take 4 rows and
+	   objects would not fit in box.
+
+	 - Added some new (possibly incomplete) maps, that I did while
+	   testing the stuff.  All done with automapper: 
+	   Deadline, Dutch Dapper, Blue Doors, Inhumane, Not Just an
+	   Ordinary Ballerina.
+
+	 - Map resizing was always complaining about rooms being deleted.
+	   Fixed.
+
+	 - Fixed a nasty crashing bug that would happen if trying to load
+	   an IFM file with no windows open.
+
+	 - Fixed a nasty crashing bug when pasting and then immediately
+	   selecting pasted rooms, as the rooms were not added to the 
+	   pathmap.
+
+	 - Complex doors that are locked are now drawn with a crossed line
+	   along the middle.
+
+	 - Complex paths drawn as bsplines are now drawn with a tad less
+	   quality to improve drawing speed.
+
+v0.8.1 - Just some fixes to the automapper, as it was failing on some 
+	 relatively simple games.
 
 	 Automapper was not matching rooms with periods in them.  This was
-	 causing problems with games that had rooms like "Mr. Hellman's Bedroom".
+	 causing problems with games that had rooms like "Mr. Hellman's 
+	 Bedroom".
 
 	 Improved the handling of multiple directional commands.  A command
 	 like: 'n, e, w' is now handled properly.

data/IFMapper.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ifmapper"
-	spec.version = '0.8.1'
+	spec.version = '0.8.5'
 	spec.author = "Gonzalo Garramuno" 
 	spec.email = 'ggarram@advance.dsl.com.ar'
 	spec.homepage = 'http://www.rubyforge.org/projects/ifmapper/'

data/lib/IFMapper/Connection.rb

@@ -28,6 +28,16 @@ class Connection
     'O'
   ]
 
+
+  def marshal_load(vars)
+    @type, @dir, @roomA, @roomB,
+      @exitAtext, @exitBtext = vars
+  end
+
+  def marshal_dump
+    [ @type, @dir, @roomA, @roomB, @exitAtext, @exitBtext ]
+  end
+
   def initialize( roomA, roomB, dir = BOTH, type = FREE )
     @roomA     = roomA
     @roomB     = roomB

data/lib/IFMapper/FXConnection.rb

@@ -46,13 +46,13 @@ class FXConnection < Connection
   end
 
   def marshal_load(vars)
-    @selected, @type, @dir, @roomA, @roomB,
-      @exitAtext, @exitBtext = vars
     @pts = @gpts = []
+    @selected = vars.shift
+    super(vars)
   end
 
   def marshal_dump
-    [ @selected, @type, @dir, @roomA, @roomB, @exitAtext, @exitBtext ]
+    [ @selected ] + super
   end
 
   #
@@ -218,6 +218,20 @@ class FXConnection < Connection
     x1, y1 = [p[0].x, p[0].y]
     x2, y2 = [p[-1].x, p[-1].y]
     draw_arrow(dc, zoom, x1, y1, x2, y2)
+
+    if @type == LOCKED_DOOR
+      t = p.size / 2
+      x1, y1 = [ p[t].x, p[t].y ]
+      x2, y2 = [ p[t-2].x, p[t-2].y ]
+
+      v = [ (x2-x1), (y2-y1) ]
+      t = 10 * zoom / Math.sqrt(v[0]*v[0]+v[1]*v[1])
+      v = [ (v[0]*t).to_i, (v[1]*t).to_i ]
+      m = [ (x2+x1)/2, (y2+y1)/2 ]
+      x1, y1 = [m[0] + v[1], m[1] - v[0]]
+      x2, y2 = [m[0] - v[1], m[1] + v[0]]
+      dc.drawLine(x1, y1, x2, y2)
+    end
   end
 
   #
@@ -233,6 +247,8 @@ class FXConnection < Connection
       draw_arrow(dc, zoom, x1, y1, x2, y2)
       if @type == LOCKED_DOOR
 	v = [ (x2-x1)*0.25, (y2-y1)*0.25 ]
+	t = 10 * zoom / Math.sqrt(v[0]*v[0]+v[1]*v[1])
+	v = [ (v[0]*t).to_i, (v[1]*t).to_i ]
 	m = [ (x2+x1)/2, (y2+y1)/2 ]
 	x1, y1 = [m[0] + v[1], m[1] - v[0]]
 	x2, y2 = [m[0] - v[1], m[1] + v[0]]

data/lib/IFMapper/FXMap.rb

@@ -366,7 +366,6 @@ class FXMap < Map
   def new_room(x, y)
     @modified = true
     r = @sections[@section].new_room(x, y)
-    @automap.add(r) if @automap
     return r
   end
 
@@ -786,12 +785,16 @@ class FXMap < Map
   #
   # Based on mouse position on canvas, create a tooltip
   #
-  def update_cb(sender, sel, event)
-#     if sel == FXWindow::ID_QUERY_TIP
-#       p "tooltip"
-#     end
+  def tooltip_cb(sender, id, ptr)
+    if @tooltip_msg != ''
+      sender.text = @tooltip_msg.to_s
+      sender.show
+    else
+      sender.hide
+    end
   end
 
+
   #
   # Show some help status in status line based on cursor position
   #
@@ -804,10 +807,12 @@ class FXMap < Map
       return
     end
 
+    @tooltip_msg = ''
     sel = to_object(x, y)
     if sel
       @canvas.defaultCursor = @@cursor_arrow
       if sel.kind_of?(Room)
+	@tooltip_msg = sel.name
 	status "Click to select and move.  Double click to edit room."
       elsif sel.kind_of?(Connection)
 	status "Click to change direction of connection."
@@ -890,6 +895,7 @@ class FXMap < Map
 
     draw
     dc = FXDCWindow.new(@canvas)
+    dc.function = BLT_NOT_SRC_XOR_DST 
     dc.drawRectangle(x, y, w * @zoom, h * @zoom)
     dc.end
   end
@@ -909,6 +915,7 @@ class FXMap < Map
 	@dx = dx
 	@dy = dy
 	@scrollwindow.setPosition(pos[0], pos[1])
+	@canvas.repaint
       end
     elsif @mouseButton == LEFTBUTTON
       x = (event.last_x / @zoom).to_i
@@ -925,9 +932,13 @@ class FXMap < Map
   def mmb_release_cb(server, sel, event)
     if @mouseButton
       @canvas.ungrab
-      @mouseButton = nil
       @canvas.dragCursor = @@cursor_arrow
-      draw
+      if @mouseButton == LEFTBUTTON
+	draw
+      else
+	@canvas.repaint
+      end
+      @mouseButton = nil
     end
   end
 
@@ -1262,8 +1273,10 @@ class FXMap < Map
 			   LAYOUT_TOP|LAYOUT_LEFT,
     			   0, 0, width, height)
     @dirty = true
-    @canvas.connect(SEL_UPDATE, method(:update_cb))
-    # FXMAPFUNC(SEL_UPDATE, FXWindow::ID_QUERY_TIP, 'tooltip_cb')
+    # @canvas.connect(SEL_UPDATE, method(:update_cb))
+    if fxversion =~ /^1.4/
+      @canvas.connect(SEL_QUERY_TIP, method(:tooltip_cb))
+    end
 
     @canvas.connect(SEL_PAINT, method(:draw))
     @canvas.backColor = @options['BG Color']
@@ -1344,9 +1357,6 @@ class FXMap < Map
     # Recreate pathmap.  We need to recreate pathmap for all paths
     # as the removal of one path may help shorten the path of another.
     create_pathmap
-
-    @automap.remove(rooms) if @automap
-
     draw()
   end
 
@@ -1628,6 +1638,11 @@ class FXMap < Map
     ws_2 = WS_2 * @zoom
     hs_2 = HS_2 * @zoom
 
+    #---- dummy check to catch an ugly bug that I cannot track...
+    if @pmap.size != @width or @pmap[0].size != @height
+      puts "**********ERROR:  pmap sizes not != #{@width}x#{@height}"
+    end
+
     # First, draw horizontal lines
     (0...@height).each { |yy|
       (0..@width-2).each { |xx|

data/lib/IFMapper/FXMapDialogBox.rb

@@ -29,7 +29,7 @@ class FXMapDialogBox < FXDialogBox
 	rooms = []
 	@map.sections.each { |s|
 	  s.rooms.each { |r|
-	    if r.x <= w or r.y <= h
+	    if r.x >= w or r.y >= h
 	      rooms << [s, r]
 	    end
 	  }

data/lib/IFMapper/FXMapperWindow.rb

@@ -40,7 +40,7 @@ require 'IFMapper/FXMapColorBox'
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = 0.8
+  VERSION      = '0.8.5'
   AUTHOR       = "Gonzalo Garramuno"
   TITLE = "#{PROGRAM_NAME} v#{VERSION} - Written by #{AUTHOR}"
 
@@ -371,21 +371,42 @@ class FXMapperWindow < FXMainWindow
 
       # Add rooms
       r_to_nr = {}  # orig room to new room hash
-      sel[0].each { |r|
+      rooms = sel[0]
+      rooms.each { |r|
 	nr = map.new_room(r.x + pos[0], r.y + pos[1])
+	nr.selected = true
 	nr.copy(r) # copy the room data
 	r_to_nr[r] = nr
       }
 
-      # Add connections
-      sel[1].each { |c|
-	exitA = c.roomA.exits.index(c)
-	exitB = c.roomB.exits.rindex(c)
-	roomA = r_to_nr[c.roomA]
-	roomB = r_to_nr[c.roomB]
-	c = map.new_connection(roomA, exitA, roomB, exitB)
-	map.path_find(c)
-      }
+      if rooms.empty?
+	# Add connections only (no rooms copied)
+	sel[1].each { |c|
+	  exitA = c.roomA.exits.index(c)
+	  exitB = c.roomB.exits.rindex(c)
+	  roomA = c.roomA
+	  roomB = c.roomB
+	  sect  = map.sections[map.section]
+	  next unless sect.rooms.include?(roomA) and sect.rooms.include?(roomB)
+	  begin
+	    c = map.new_connection(roomA, exitA, roomB, exitB)
+	    c.selected = true
+	  rescue
+	  end
+	}
+      else
+	# Add connections
+	sel[1].each { |c|
+	  exitA = c.roomA.exits.index(c)
+	  exitB = c.roomB.exits.rindex(c)
+	  roomA = r_to_nr[c.roomA]
+	  roomB = r_to_nr[c.roomB]
+	  c = map.new_connection(roomA, exitA, roomB, exitB)
+	  c.selected = true
+	}
+      end
+
+      map.create_pathmap
       map.draw
     end
   end

data/lib/IFMapper/FXRoom.rb

@@ -6,11 +6,22 @@ require 'IFMapper/FXRoomDialogBox'
 # Class used to reprent an IF room
 #
 class FXRoom < Room
-  attr_accessor :x, :y, :xx, :yy
+  attr_accessor :xx, :yy
   attr_accessor :selected
 
   @@win = nil
 
+  def marshal_dump
+    super + [ @selected ]
+  end
+
+  def marshal_load(vars)
+    super(vars)
+    @selected = vars[-1]
+    @xx = x * WW + WS_2
+    @yy = y * HH + HS_2
+  end
+
   def initialize(x, y, *opts)
     @xx = x * WW + WS_2
     @yy = y * HH + HS_2
@@ -202,6 +213,7 @@ class FXRoom < Room
   # Draw text line wrapping after certain length (in chars)
   #
   def draw_text_wrap(dc, x, y, zoom, maxLen, text)
+    return if y > (@yy + H) * zoom
     if text.size > maxLen
       str = text
       fh  = dc.font.getFontHeight

data/lib/IFMapper/FXSpline.rb

@@ -32,7 +32,7 @@ class FXSpline
       x2 = x2 * x2
       y2 = p[x+2][1] - p[x+1][1]
       y2 = y2 * y2
-      num = Math.sqrt( x2 + y2 ).to_i / 8
+      num = Math.sqrt( x2 + y2 ).to_i / 16
       bspline_solve(pts, p[x..x+3], num)
     }
     return pts

data/lib/IFMapper/IFMReader.rb

@@ -53,12 +53,12 @@ class IFMReader
     # We start map at 1, 1
     @x, @y = [0, 0]
     @room  = @item = @task  = nil
-    @map.section = 0
 
     if @map.kind_of?(FXMap)
       @map.options['Edit on Creation'] = false
       @map.window.hide
     end
+    @map.section = 0
 
     @last_section = 0
     @ignore_first_section = true
@@ -545,7 +545,6 @@ class IFMReader
   #   a) Adjust map's width/height
   #   b) Shift all rooms so that no rooms are in negative locations
   #
-
   def initialize(file, map = Map.new('IFM Imported Map'))
     @tags   = {}
     @map    = map

data/lib/IFMapper/PDFMapExporter.rb

@@ -84,6 +84,21 @@ class FXConnection
     x1, y1 = [p[0][0], p[0][1]]
     x2, y2 = [p[-1][0], p[-1][1]]
     pdf_draw_arrow(pdf, opts, x1, y1, x2, y2)
+
+    if @type == LOCKED_DOOR
+      t = p.size / 2
+      x1, y1 = [ p[t].x, p[t].y ]
+      x2, y2 = [ p[t-2].x, p[t-2].y ]
+
+      v = [ (x2-x1), (y2-y1) ]
+      t = 10 / Math.sqrt(v[0]*v[0]+v[1]*v[1])
+      v = [ v[0]*t, v[1]*t ]
+      m = [ (x2+x1)/2, (y2+y1)/2 ]
+      x1, y1 = [m[0] + v[1], m[1] - v[0]]
+      x2, y2 = [m[0] - v[1], m[1] + v[0]]
+      pdf.move_to(x1, y1)
+      pdf.line_to(x2, y2).stroke
+    end
   end
 
   def pdf_draw_simple(pdf, opts)

data/lib/IFMapper/Room.rb

@@ -3,12 +3,13 @@
 # Class used to represent a Room or Location in a Map.
 #
 class Room
-  attr_accessor  :name
-  attr_accessor  :objects
-  attr_accessor  :tasks
-  attr_reader    :exits
-  attr_accessor  :darkness
-  attr_accessor  :x, :y
+  attr_accessor  :name      # Name of room
+  attr_accessor  :objects   # Objects found in room
+  attr_accessor  :tasks     # Tasks that need to be performed in room
+  attr_reader    :exits     # An array of 8 possible exits in room
+  attr_accessor  :darkness  # Is room in darkness?
+  attr_accessor  :x, :y     # Room location in grid
+  attr_accessor  :desc      # Room description
 
   DIRECTIONS = [
     'n',
@@ -32,6 +33,21 @@ class Room
     7 => [ -1, -1 ]
   }
 
+  def marshal_load(vars)
+    @name     = vars.shift
+    @objects  = vars.shift
+    @tasks    = vars.shift
+    @exits    = vars.shift
+    @darkness = vars.shift
+    @x        = vars.shift
+    @y        = vars.shift
+    @desc     = vars.shift if not vars.empty? and vars[0].kind_of?(String)
+  end
+
+  def marshal_dump
+    [ @name, @objects, @tasks, @exits, @darkness, @x, @y, @desc ]
+  end
+
   def [](dir)
     return @exits[dir]
   end
@@ -101,6 +117,7 @@ class Room
     @objects  = b.objects
     @tasks    = b.tasks
     @darkness = b.darkness
+    @desc     = b.desc
   end
 
 

data/lib/IFMapper/TranscriptReader.rb

@@ -7,15 +7,16 @@
 #
 # This code is based on Perl code by Dave Chapeskie, used in IFM,
 # albeit it has been enhanced to handle multi-line commands, room stub
-# exits, objects parsing and the ability to parse transcripts as
-# they are being spit out.
+# exits and oneway exits, objects parsing and the ability to parse 
+# transcripts as they are being spit out.
 #
 class TranscriptReader
 
   PROMPT   = /^>\s*/
   LOOK     = /^l(ook)?/i
   UNDO     = /^undo$/i
-  TELEPORT = /^(restart|restore)$/i
+  RESTART  = /^restart$/i
+  RESTORE  = /^restore$/i
   IGNORE   = /transcript/i
   OTHERS   = /^(read|inventory$|i$)/i
   UNSCRIPT = /^unscript$/i
@@ -23,8 +24,9 @@ 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|It is pitch black/i
+  DARKNESS = /^dark(ness)?$|It is pitch black/i
   DEAD     = /(You die|You have died|You are dead)/i
+  YES      = /^y(es)/i
 
   # Compass direction command -> direction mapping.
   DIRMAP = {
@@ -54,8 +56,7 @@ class TranscriptReader
 
 
   ## Change this to non-dil to print out debugging info
-  @@debug = 1
-
+  @@debug = nil
 
   def debug(*msg)
     if @@debug
@@ -66,6 +67,7 @@ class TranscriptReader
   ## 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,
   ]
 
@@ -76,6 +78,8 @@ class TranscriptReader
   #
   def take(move, objs)
     return unless @here
+    endl = ''
+    endl = "\n" if @here.objects != '' and @here.objects[-1,1] != "\n"
     objs.each { |cmd, dummy, obj|
       next if not obj
 
@@ -88,8 +92,9 @@ class TranscriptReader
 	next if not o
 	status = move[:reply].to_s
 	TAKE_OK.each { |re|
-	  if status =~ re and not @objects.has_key?(o)
-	    @here.objects << o << "\n"
+	  if status =~ re and not @objects.has_key?(o) and
+	      not @here.objects =~ /#{o}/
+	    @here.objects << endl << o << "\n"
 	    @objects[o] = 1
 	    @last_obj = o
 	    break
@@ -101,8 +106,9 @@ class TranscriptReader
 	  o, status = reply.split(':')
 	  next if not status
 	  o = @last_obj if o =~ IT
-	  if o and not @objects.has_key?(o)
-	    @here.objects << o << "\n"
+	  if o and not @objects.has_key?(o) and
+	      not @here.objects =~ /#{o}/
+	    @here.objects << endl << o << "\n"
 	    @objects[o] = 1
 	    @last_obj = o
 	  end
@@ -115,7 +121,7 @@ class TranscriptReader
   # Add a new room to the automapper
   #
   def add(room)
-    @rooms[room] = {:section => @map.section, :desc => nil }
+    @rooms << room
   end
 
   #
@@ -149,12 +155,12 @@ class TranscriptReader
 
   EXITS_REGEX = 
     [
-    # You can go south or east
-    /you\s+can\s+go\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i,
+    # (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,
     # to the east or west
-    /to\s+the\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i,
+    /to\s+the\s+#{DIR}\s+#{OR}\s+(to\s+the\s+)?#{DIR}\b/i,
     # to the east
     /to\s+the\s+#{DIR}\b/i,
     # paths lead west and north
@@ -170,6 +176,10 @@ class TranscriptReader
     /(running|leading|heading|opening|branching|lying|wandering|looking|bending)\s+#{DIR}\b/i,
   ]
 
+  # passage westwards
+  # gap in the northeast corner
+
+
   EXITS_SPECIAL = { 
     /four\s+directions/i => [0, 2, 4, 6],
     /four\s+compass\s+points/i => [0, 2, 4, 6],
@@ -256,16 +266,37 @@ class TranscriptReader
 
 
     # Step 2
+    @restart = false
     tele = nil
     @moves.each { |move|
       cmd = move[:cmd]
       next if cmd =~ IGNORE or cmd =~ OTHERS
       if cmd =~ UNSCRIPT
 	tele = 1
+	@here = nil
 	next
       end
 
-      tele = 1 if cmd =~ TELEPORT
+      if @restart and cmd =~ YES
+	@here = nil
+      else
+	@restart = false
+	tele = nil
+      end
+
+      if cmd =~ RESTART
+	@restart = true
+	tele = 1
+      end
+
+      if cmd =~ RESTORE
+	if move[:reply] =~ /Ok/
+	  @here = nil
+	  tele = 1
+	else
+	  next
+	end
+      end
 
       name = nil
       desc = ''
@@ -287,12 +318,14 @@ class TranscriptReader
 	  name = nil
 	  roomflag = false
 	  desc_gap = false
+	  @here = nil
+	  tele = 1
 	  next
 	end
 	next if startup and r !~ BLANK
 	startup = false
 
-	if not roomflag and r !~ BLANK and roomname(r)
+	if not roomflag and r !~ BLANK and room_name(r)
 	  debug "set roomflag with #{r}"
 	  roomflag = true
 	  name = r
@@ -316,6 +349,7 @@ class TranscriptReader
 	  end
 	  desc = nil if desc == ''
 
+	  puts "name: #{name}  tele:#{tele}"
 	  rooms << {
 	    :name => name,
 	    :desc => desc,
@@ -361,35 +395,84 @@ class TranscriptReader
 	  debug "\t TO: #{@here}"
 	end
 
+	# Make sure the user has not deleted the current room from map
+	# and that we are in the proper section.
+	if @here
+	  found = false
+	  @map.sections.each_with_index { |sect, idx|
+	    if sect.rooms.include?(@here)
+	      found = true
+	      if idx != @map.section
+		@map.fit
+		@map.section = idx
+	      end
+	      break
+	    end
+	  }
+	  @here = nil if not found
+	end
+
 	# If it is a look command or we don't know where we are yet,
 	# set current room.
 	if move[:look] or not @here
+	  @here = find_room(name, desc)
 	  @here = new_room(move, name, desc) unless @here
 	  @here.selected = true
 	  next
 	end
 
-	# Otherwise, assume we moved in some way.  Try to find the new room.
-	there = find_room(name, desc)
-	next if there == @here
-
+	cmd.sub!(GO, '')
+	dir = $3
+	debug "MOVED IN DIRECTION: #{dir}  CMD LEFT:#{cmd}"
 	if not cmd
 	  debug "Oops... run out of commands."
 	  break
 	end
-	cmd.sub!(GO, '')
-	dir = $3
-	debug "MOVED IN DIRECTION: #{dir}  CMD LEFT:#{cmd}"
+
+	# Otherwise, assume we moved in some way.  Try to find the new room.
+	if name =~ DARKNESS
+	  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
+	  # which case we flag it as dark and make it there)
+	  if idx and @here[idx]
+	    c = @here[idx]
+
+	    if c.roomA == @here
+	      b = c.roomB
+	    else
+	      b = c.roomA
+	    end
+
+	    if not b
+	      there = nil
+	    else
+	      if b.name !~ DARKNESS
+		b.darkness = true
+	      end
+	      there = b
+	    end
+	  else
+	    # No connection yet, create dark room
+	    there = nil
+	  end
+	else
+	  there = find_room(name, desc)
+	end
+
+	next if there == @here
+
+
+	go  = nil
 	if DIRMAP[dir]
 	  dir = DIRMAP[dir]
-	  go  = nil
 	elsif ODIRMAP[dir]
 	  go  = ODIRMAP[dir]
 	  dir = choose_dir(@here, there, go)
 	else
-	  # special move ---
+	  # special move --- teleport/death/etc.
 	  dir = choose_dir(@here, there)
-	  go  = nil
 	end
 	debug "MOVED IN DIR INDEX: #{dir}"
 
@@ -408,6 +491,7 @@ class TranscriptReader
     @moves.clear
     @map.fit
     if @map.kind_of?(FXMap)
+      @map.clear_selection
       @here.selected = true if @here
       @map.zoom = @map.zoom
       @map.center_view_on_room(@here) if @here
@@ -419,56 +503,64 @@ class TranscriptReader
   def find_room(name, desc)
     bestscore = 0
     best = nil
-    @rooms.each { |r, room|
-      score = 0
-
-
-      if 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 still no luck, try first N words
-	if score == 0
-	  dwords = room[:desc].split(' ')
-	  words  = desc.split(' ')
-	  match  = true
-	  0.upto(DESC_MINWORDS) { |i|
-	    if words[i] != dwords[i]
-	      match = false
-	      break
-	    end
-	  }
 
-	  score += 2 if match
+    @map.sections.each_with_index { |sect, idx|
+      sect.rooms.each { |room|
+	score = 0
+
+	if 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 still no luck, try first N words
+	  if score == 0
+	    dwords = room.desc.split(' ')
+	    words  = desc.split(' ')
+	    match  = true
+	    0.upto(DESC_MINWORDS) { |i|
+	      if words[i] != dwords[i]
+		match = false
+		break
+	      end
+	    }
+	    
+	    score += 2 if match and room.name == name
+	  end
+	else
+	  # Just the name, not so good
+	  score += 1 if room.name == name
 	end
-      else
-	# Just the name, not so good
-	score += 1 if r.name == name
-      end
-      next if score <= bestscore
-      bestscore = score
-      best = [r, room[:section]]
+	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
-      debug "\t ------> #{best[0]} in section #{best[1]}"
+      @map.fit
       @map.section = best[1]
     end
+    best[0].desc = desc if not best[0].desc and desc
     return best[0]
   end
-
+    
   #
   # Determine if line corresponds to a room name
   #
-  def roomname(line)
-    # Remove unwanted stuff
+  def room_name(line)
+    # 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)
+
     # Remove periods from salutations
     line.sub!(SALUTATIONS, '\1')
 
@@ -482,11 +574,24 @@ 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\/\\\-\(\)'#]/
 
+
+    # 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 w =~ /^[a-z]/ and w.size > NAME_MAXUNCAP
+      if w.size <= 2
+	num += 1
+	return false if num > 2
+      else
+	num = 0
+      end
     }
+
+    # Okay, it is a room.
     return true
   end
 
@@ -501,6 +606,25 @@ class TranscriptReader
       r = @map.new_room(0, 0)
       r.name = name
     else
+
+      if name =~ DARKNESS
+	dark = true
+      else
+	dark = false
+	if from[dir]
+	  # oops, we had a connection there. 
+	  c = from[dir]
+	  b = c.roomB
+	  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)
+	    dark = true
+	    c = nil
+	  end
+	end
+      end
+
       x = from.x
       y = from.y
       dx, dy = Room::DIR_TO_VECTOR[dir]
@@ -515,28 +639,23 @@ class TranscriptReader
       debug "+++ New Room #{name} from #{from}"
       r = @map.new_room(x, y)
       r.name = name
+      r.darkness = dark
       c = nil
       if from[dir]
 	# oops, we had a connection there. 
 	c = from[dir]
 	b = c.roomB
-	if not b
+	if c.stub?
 	  # Stub connection.  Update it.
 	  debug "\tUPDATE #{c}"
 	  odir = (dir + 4) % 8
+	  c.exitAtext = go if go
 	  c.roomB = r
 	  r[odir] = c
 	  debug "\tNOW IT IS #{c}"
-	elsif b.name =~ DARKNESS
-	  # Was it a dark room that is now lit?
-	  @map.delete_connection(c)
-	  @map.delete_room(b)
-	  r.darkness = true
-	  c = nil
 	else
 	  # Probably a link that is complex
 	  # or oneway.  Shift it to some other location
-	  exitB = b.exits.rindex(c)
 	  shift_link(from, dir)
 	  c = nil
 	end
@@ -551,7 +670,7 @@ class TranscriptReader
     parse_exits(r, desc)
 
     # Update room description
-    @rooms[r][:desc] = desc
+    r.desc = desc
     return r
   end
 
@@ -594,7 +713,8 @@ class TranscriptReader
       debug "\tMOVE #{c} DIR: #{dir}"
       if c.stub?
 	# Stub connection, fill it
-	c.roomB  = to
+	c.roomB     = to
+	c.exitAtext = go if go
 	# we still need to check the destination to[odir]...
 	if not to[odir]
 	  # nothing to do
@@ -604,7 +724,11 @@ class TranscriptReader
 	else
 	  # this end cannot be deleted.  we need to shift odir
 	  debug "\tCHOOSE NEW DIR for #{odir}"
-	  odir = choose_dir(to, from, go, dir)
+	  rgo = nil
+	  if go
+	    rgo = rgo % 2 == 0? go - 1 : go + 1
+	  end
+	  odir = choose_dir(to, from, rgo, dir)
 	  @map.delete_connection(to[odir]) if to[odir]
 	  debug "\tSHIFTED DESTINATION TO EXIT #{odir}"
 	end
@@ -658,7 +782,11 @@ class TranscriptReader
 	c.exitBtext = go if go
       else
 	# We need to change odir to something else
-	odir = choose_dir(to, from, go, dir)
+	rgo = nil
+	if go
+	  rgo = go % 2 == 0? go - 1 : go + 1
+	end
+	odir = choose_dir(to, from, rgo, dir)
 	@map.delete_connection(to[odir]) if to[odir] and to[odir].stub?
 	c = nil
       end
@@ -677,8 +805,9 @@ class TranscriptReader
       if c
 	# If so, make that connection go both ways and attach it to
 	# current direction.
-	from[dir] = c
-	c.dir = Connection::BOTH
+	from[dir]   = c
+	c.dir       = Connection::BOTH
+	c.exitAtext = go if go
       end
     end
 
@@ -707,10 +836,12 @@ class TranscriptReader
 	next if not e
 	roomA = e.roomA
 	roomB = e.roomB
-	if roomA == a and roomB == b and e.exitBtext == rgo
+	if roomA == a and roomB == b and 
+	    (e.exitBtext == rgo or e.exitAtext == go)
 	  e.exitAtext = go
 	  return idx
-	elsif roomB == a and roomA == b and e.exitAtext == rgo
+	elsif roomB == a and roomA == b and (e.exitAtext == rgo or
+					     e.exitBtext == go)
 	  e.exitBtext = go
 	  return idx
 	end
@@ -769,7 +900,7 @@ class TranscriptReader
   end
 
   def stop
-    @t.stop if @t
+    @t.kill if @t
   end
 
   def destroy
@@ -783,7 +914,6 @@ class TranscriptReader
     @map      = map
     @objects  = {}
     @moves    = []
-    @rooms    = {}
     @here     = nil
     @section  = -1
     @last_obj = nil

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
-date: 2005-08-21
+  version: 0.8.5
+date: 2005-08-24
 summary: Interactive Fiction Mapping Tool.
 require_paths: 
   - lib
@@ -28,29 +28,29 @@ authors:
   - Gonzalo Garramuno
 files: 
   - IFMapper.rbw
-  - lib/IFMapper/FXMap.rb
   - lib/IFMapper/Map.rb
-  - lib/IFMapper/FXSpline.rb
   - lib/IFMapper/FXSection.rb
-  - lib/IFMapper/FXRoom.rb
-  - lib/IFMapper/FXMapDialogBox.rb
   - lib/IFMapper/FXSectionDialogBox.rb
-  - lib/IFMapper/FXMapperWindow.rb
   - lib/IFMapper/Room.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/PDFMapExporter.rb
   - lib/IFMapper/FXMapperSettings.rb
+  - lib/IFMapper/FXMap.rb
+  - lib/IFMapper/FXRoom.rb
   - lib/IFMapper/AStar.rb
+  - lib/IFMapper/FXMapperWindow.rb
   - lib/IFMapper/Connection.rb
   - lib/IFMapper/MapPrinting.rb
   - lib/IFMapper/FXDCPostscript.rb
   - lib/IFMapper/FXDCPrint.rb
-  - lib/IFMapper/IFMReader.rb
+  - lib/IFMapper/PDFMapExporter.rb
   - lib/IFMapper/TranscriptReader.rb
+  - lib/IFMapper/FXMapDialogBox.rb
+  - lib/IFMapper/FXSpline.rb
   - lib/IFMapper/FXAboutDialogBox.rb
   - lib/IFMapper/FXSearchDialogBox.rb
   - lib/IFMapper/FXMapFileDialog.rb