ifmapper 0.9.5 → 0.9.6

data/HISTORY.txt

@@ -1,3 +1,69 @@
+v0.9.6  What's new:
+
+	- IFM exporting had gotten broken around v0.9 due to a refactoring
+	  bug.  Fixed.
+
+	- CTRL selection was never quite working as advertised.  Now it
+	  properly does toggle selecting of rooms/connections.
+
+	- Minor improvement to the automapper.  Now places that have Dr.,
+	  St., Ave. and Inc. in them will be recognized as locations.  
+	  Previously, they were ignored due to the period.
+
+	- The automapper will now correctly parse objects from take commands
+	  when the response is something like:
+	       You take the pencil from the bag.
+	  Previously, the object was considered to be 'pencil from the bag'
+	  instead of just 'pencil'. 
+
+	- Slight improvement to the automapper room description		
+	  identification.  When comparing descriptions and a perfect match
+	  or submatch of the description cannot be found against a room, all 
+	  words in that room description will be compared for a 
+	  potential match.  A room will be matched as already present if
+	  at least 20 words match (they also have to be in the same order).  
+	  However, if multiple rooms happen to match 20 words, then the room
+	  with more words matched will be considered as the correct match.
+	  This improvement helps with locations that have identical
+	  descriptions but that perhaps only change the exit paths.
+
+	- I bug fixed the problem with TADS transcripts with the automapper
+	  crashing it.  This was supposed to be fixed in 0.9.5 but I had
+	  inadvertedly reverted the fix before release.
+
+	- Added a new mode to Automapper of transcripts.  The new
+	  mode is called Capitalized and helps map rooms where the room name
+	  uses a single capitalized sentence, like:
+	       Women's change room
+	       Western closet
+	  instead of the more standard:
+	       Women's Change Room
+	       Western Closet
+	  This format seems somewhat popular among IFComp entries, which are
+	  probably trying to follow Infocom's format, but do so incorrectly.
+
+	- Added a new ADRIFT mode to Automapper.  This mode helps map
+	  ADRIFT games, which have some weird form of transcripts, lacking a
+	  prompt.  Tested with The PK Girl mainly.
+
+	- TADS3 source code reader is now much improved.
+	  It recognizes PathPassages, TravelMessage and noTravel 
+	  exits properly. 
+	  It does not consider a missing room as a fatal error and 
+	  will properly find names of rooms when room line is split into 
+	  multiple lines.
+	  It will also display passage and stairway exits properly (previously,
+	  they were considered door exits).
+	  Also, TADS3 reader can now properly parse a t3m Makefile for
+	  sources.
+	  You should now be able to map the big TADS3 demo game 
+	  Return to Ditch Day from source, which previously would run 
+	  into some issues. 
+
+	- TADS and Inform readers now use a slightly different algorithm for
+	  laying out rooms.  This new algorithm results in smaller maps and
+	  usually less complex exits failing.
+
 v0.9.5  What's new:
 
 	- IFMapper now looks for Fox1.4 and 1.2, in that order.  Note that

data/IFMapper.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ifmapper"
-	spec.version = '0.9.5'
+	spec.version = '0.9.6'
 	spec.author = "Gonzalo Garramuno" 
 	spec.email = 'ggarram@advance.dsl.com.ar'
 	spec.homepage = 'http://www.rubyforge.org/projects/ifmapper/'
@@ -17,5 +17,5 @@ EOF
 	spec.extra_rdoc_files = ["HISTORY.txt", "TODO.txt", "IFMapper.gemspec"]
 	spec.has_rdoc = true
 	spec.rubyforge_project = 'ifmapper'
-	spec.required_ruby_version = '>= 1.6.8'
+	spec.required_ruby_version = '>= 1.8.0'
 end

data/lib/IFMapper/FXConnection.rb

@@ -345,6 +345,7 @@ class FXConnection < Connection
   # Draw any exit text if available (exit text is 'U', 'D', 'I', 'O', etc)
   #
   def draw_exit_text(dc, zoom)
+    return if zoom < 0.5
     if @exitText[0] != 0
       dir  = @room[0].exits.index(self)
       x, y = @room[0].corner(self, zoom, dir)

data/lib/IFMapper/FXMap.rb

@@ -875,10 +875,10 @@ class FXMap < Map
     w = x2 - x1
     h = y2 - y1
 
-    x1 = (x1 / WW).floor
-    y1 = (y1 / HH).floor
-    x2 = (x2 / WW).ceil
-    y2 = (y2 / HH).ceil
+    x1 = ((x1 - WS_2) / WW).floor
+    y1 = ((y1 - HS_2) / HH).floor
+    x2 = ((x2 - WS_2) / WW).ceil
+    y2 = ((y2 - HS_2) / HH).ceil
 
     @sections[@section].rooms.each { |r|
       if r.x >= x1 and r.x <= x2 and
@@ -1156,12 +1156,13 @@ class FXMap < Map
 	draw
 	return
       else
-	if event.state & SHIFTMASK == 0
+	if event.state & SHIFTMASK == 0 and
+	    event.state & CONTROLMASK == 0
 	  clear_selection
 	end
 	# Select the stuff
 	selection.update_properties(self)
-	if event.state & CONTROLMASK == 0
+	if event.state & CONTROLMASK != 0
 	  selection.selected ^= true # toggle selection
 	else
 	  selection.selected  = true
@@ -1478,10 +1479,8 @@ class FXMap < Map
   end
 
   def cannot_automap(why)
-    p '----CANNOT AUTOMAP'
     w = FXWarningBox.new(@window, "Cannot automap.\n#{why}")
     w.execute
-    p '----CANNOT AUTOMAP AFTER EXECUTE'
   end
 
 
@@ -1965,7 +1964,7 @@ class FXMap < Map
   def export_ifm(file)
     require 'IFMapper/IFMWriter'
     file += '.ifm' if file !~ /\.ifm$/
-    IFMWriter.new(map, file)
+    IFMWriter.new(self, file)
   end
 
 
@@ -2048,6 +2047,7 @@ class FXMap < Map
     begin
       @automap = TranscriptReader.new(self, file)
       @automap.properties(true)
+      @automap.start
     rescue Errno::EACCES, Errno::ENOENT => e
       dlg = FXWarningBox.new(@window, "Cannot open transcript\n#{e}")
       dlg.execute
@@ -2058,7 +2058,6 @@ class FXMap < Map
       dlg.execute
       raise
     end
-    @automap.start
     create_pathmap
     draw
     update_title

data/lib/IFMapper/FXMapFileDialog.rb

@@ -8,7 +8,7 @@ class FXMapFileDialog < FXFileDialog
   @@last_path = nil
 
   KNOWN_EXTENSIONS = [
-    "Map Files (*.map,*.ifm,*.inf,*.t)",
+    "Map Files (*.map,*.ifm,*.inf,*.t,*.t3m)",
     "All Files (*)",
   ]
 

data/lib/IFMapper/FXMapperWindow.rb

@@ -59,7 +59,7 @@ require 'IFMapper/FXRoomList'
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = '0.9.5'
+  VERSION      = '0.9.6'
   AUTHOR       = "Gonzalo Garramuno"
   TITLE = "#{PROGRAM_NAME} v#{VERSION} - Written by #{AUTHOR}"
 
@@ -84,7 +84,7 @@ class FXMapperWindow < FXMainWindow
     begin
       IFMReader.new(file, map)
     rescue => e
-      return e
+      return "#{e} #{e.backtrace}"
     end
     return map
   end
@@ -94,7 +94,7 @@ class FXMapperWindow < FXMainWindow
     begin
       TADSReader.new(file, map)
     rescue => e
-      return e
+      return "#{e} #{e.backtrace}"
     end
     return map
   end
@@ -104,7 +104,7 @@ class FXMapperWindow < FXMainWindow
     begin
       InformReader.new(file, map)
     rescue => e
-      return e
+      return "#{e} #{e.backtrace}"
     end
     return map
   end
@@ -172,13 +172,14 @@ class FXMapperWindow < FXMainWindow
       tmp = open_ifm(file, map)
     elsif file =~ /\.inf$/i
       tmp = open_inform(file, map)
-    elsif file =~ /\.t$/i
+    elsif file =~ /\.t$/i or file =~ /\.t3m$/
       tmp = open_tads(file, map)
     else
       tmp = open_map(file)
     end
 
     if not tmp.kind_of?(Map) and not tmp.kind_of?(FXMap)
+      $stderr.puts tmp
       status "Could not load '#{file}'. Error: #{tmp}." 
       if make_new_map
 	if map.close_cb
@@ -755,6 +756,43 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
+  #
+  # Find task in map
+  #
+  def find_desc_in_map(s, m, e)
+    map = current_map
+    return unless map
+
+    re = /#{s.text}/
+    matches = []
+    (0...map.sections.size).each { |p|
+      map.sections[p].rooms.each { |r|
+	next unless r.desc =~ re
+	matches.push( [p, r] )
+      }
+    }
+    idx = @search.index
+    @search.index = matches.size-1 if idx >= matches.size
+    hilite_matches(map, matches, re, @search.index)
+  end
+
+  #
+  # Find description in map
+  #
+  def find_desc_in_map_cb(s, m, e)
+    map = current_map
+    return unless map
+
+    title = "Find In Description In Map"
+    if not @search
+      @search = FXSearchDialogBox.new(self)
+    end
+    @search.proc  = method(:find_desc_in_map)
+    @search.title = title
+    @search.text  = ''
+    @search.show
+  end
+
   #
   # Pop-up color preferences
   #
@@ -803,12 +841,12 @@ class FXMapperWindow < FXMainWindow
 
   def about_cb(sender, id, event )
     FXAboutDialogBox.new(self, "About This Software...", <<"EOF").execute
-#{TITLE} - #{VERSION}
+#{PROGRAM_NAME} - #{VERSION}
+Written by Gonzalo Garramuno.
 
 FXRuby Version: #{Fox::fxrubyversion}
 
 A WYSIWYG mapping tool for interactive fiction.
-Written by Gonzalo Garramuno.
 
 ggarra@advancedsl.com.ar
 EOF
@@ -899,6 +937,8 @@ EOF
     cmd.connect(SEL_COMMAND, method(:find_object_in_map_cb))
     cmd = FXMenuCommand.new(submenu, "&Task in Map\tAlt-T\tFind Location with a Task in the Map")
     cmd.connect(SEL_COMMAND, method(:find_task_in_map_cb))
+    cmd = FXMenuCommand.new(submenu, "&Keyword in Descriptions\tAlt-D\tFind Location with Description Keyword in the Map")
+    cmd.connect(SEL_COMMAND, method(:find_desc_in_map_cb))
     FXMenuCascade.new(editmenu, "Search", nil, submenu)
 
     # Complex Connection
@@ -1189,7 +1229,8 @@ EOF
 
     cmd = FXMenuCommand.new(helpmenu, "&Resource Code", nil)
     cmd.connect(SEL_COMMAND) {
-      file = FXMapFileDialog.new(self, "Resource a Ruby File").filename
+      file = FXMapFileDialog.new(self, "Resource a Ruby File", 
+				 ['Ruby File (*.rb)']).filename
       if file != ''
 	begin
 	  Kernel.load file

data/lib/IFMapper/FXRoomDialogBox.rb

@@ -10,7 +10,7 @@ class FXRoomDialogBox < FXDialogBox
   def copy_to()
     @room.name    = @name.text
     @room.objects = @objects.text
-    @room.objects.gsub!(/[\.,\t]+/, "\n")
+    @room.objects.gsub!(/[,\t]+/, "\n")
     @room.tasks = @tasks.text
     @room.darkness = (@darkness.checkState == 1)
     @room.desc = @desc.text

data/lib/IFMapper/InformReader.rb

@@ -13,7 +13,7 @@ class InformReader
 
   # Take a quoted Inform string and return a valid ASCII one, replacing
   # Inform's special characters.
-  def self.inform_unquote(text)
+  def self.unquote(text)
     return '' unless text
     text.gsub!(/\~/, '"')
     text.gsub!(/\^/, "\n")
@@ -29,7 +29,7 @@ class InformReader
     attr_accessor :tag, :location, :enterable
 
     def name=(x)
-      @name = InformReader::inform_unquote(x)
+      @name = InformReader::unquote(x)
     end
 
     def to_s
@@ -67,7 +67,10 @@ class InformReader
       "#@name tag:#@tag"
     end
     def name=(x)
-      @name = InformReader::inform_unquote(x)
+      @name = InformReader::unquote(x)
+    end
+    def num_exits
+      return @exits.nitems
     end
     def method_missing(*x)
     end
@@ -492,20 +495,25 @@ EOF
     return best
   end
 
-  def make_room(from, to, x, y, dx = 1, dy = 0 )
+  def make_room(to, x, y, dx = 1, dy = 0)
+    if not @map.free?(x, y)
+      @map.shift(x, y, dx, dy)
+    end
+    room = @map.new_room(x, y)
+    room.name = to.name
+    desc = to.desc
+    desc.gsub!(/[\t\n]/, ' ')
+    desc.squeeze!(' ')
+    room.desc     = InformReader::unquote(desc)
+    room.darkness = !to.light
+    @tags[to.tag] = room
+    return room
+  end
+
+  def get_exit(from, to, x, y, dx = 1, dy = 0 )
     elem = @tags[to.tag]
     if elem.kind_of?(InformRoom)
-      if not @map.free?(x, y)
-	@map.shift(x, y, dx, dy)
-      end
-      room = @map.new_room(x, y)
-      room.name     =  to.name
-      desc = to.desc
-      desc.gsub!(/[\t\n]/, ' ')
-      desc.squeeze!(' ')
-      room.desc     = InformReader::inform_unquote(desc)
-      room.darkness = !to.light
-      @tags[to.tag] = room
+      room = create_room(to, x, y, dx, dy)
       return [room, Connection::FREE]
     elsif elem.kind_of?(InformDoor)
       if elem.locked
@@ -519,8 +527,8 @@ EOF
 	o.exits.each { |e|
 	  next unless e
 	  if @tags[e] == elem
-	    res = make_room( o, o, x, y, dx, dy )
-	    return [ res[0], type ]
+	    res = create_room( o, x, y, dx, dy )
+	    return [ res, type ]
 	  end
 	}
       }
@@ -530,8 +538,8 @@ EOF
 	next if @tags[tag] == from
 	@rooms.each { |o|
 	  next if o.tag != tag
-	  res = make_room( o, o, x, y, dx, dy )
-	  return [ res[0], type ]
+	  res = create_room( o, x, y, dx, dy )
+	  return [ res, type ]
 	}
       }
       
@@ -542,8 +550,9 @@ EOF
     end
   end
 
-  def create_room(r, x, y, dx = 1, dy = 0)
-    from, = make_room(r, r, x, y)
+  def create_room(r, x, y, dx = 2, dy = 0)
+    return @tags[r.tag] if @tags[r.tag].kind_of?(Room)
+    from, = make_room(r, x, y, dx, dy)
     debug "CREATE ROOM #{r.name} SET FROM TO: #{from}"
 
     r.exits.each_with_index { |e, exit|
@@ -587,7 +596,7 @@ EOF
 	x = from.x + dx
 	y = from.y + dy
 	debug "#{exit} CREATE TO #{from} -> #{to.tag}"
-	to, type = make_room(from, to, x, y, dx, dy)
+	to, type = get_exit(from, to, x, y, dx, dy)
 	next if not to
       end
 
@@ -667,14 +676,20 @@ EOF
       end
     }
 
-    return r
+    return from
   end
 
   #
   # Create all the stuff we found
   #
   def create
-    @rooms.each { |r| create_room(r, 0, 0) }
+    @rooms = @rooms.sort_by { |r| r.num_exits }
+    @rooms.reverse!
+
+    @rooms.each { |r| 
+      min, max = @map.sections[@map.section].min_max_rooms
+      create_room(r, max[0] + 2, 0)
+    }
     @rooms = []
     
     # Add objects to rooms
@@ -781,7 +796,6 @@ EOF
 
     if @map.kind_of?(FXMap)
       @map.filename   = file.sub(/\.inf$/i, '.map')
-      @map.navigation = true
       @map.options['Location Description'] = true
       @map.window.show
     end

data/lib/IFMapper/Room.rb

@@ -76,9 +76,7 @@ class Room
   # Return the number of exits present in room
   #
   def num_exits
-    num = 0
-    @exits.each { |e| num += 1 if e }
-    return num
+    return @exits.nitems
   end
 
   #