ifmapper 0.8 → 0.8.1

data/HISTORY.txt

@@ -1,4 +1,16 @@
 
+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".
+
+	 Improved the handling of multiple directional commands.  A command
+	 like: 'n, e, w' is now handled properly.
+
+	 Moved 'fox' requires together so it is easy to upgrade to 
+	 upcoming fox14.
+
 v0.8 - Added the ability to create linked rooms using the Numeric Keypad.
        Turn on NUM LOCK, select a single room and then use the numbers in 
        the keypad to move thru an exit or add a room in a certain direction.

data/IFMapper.gemspec

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

data/lib/IFMapper/Connection.rb

@@ -37,6 +37,7 @@ class Connection
     @exitBtext = 0
   end
 
+
   def stub?
     return true unless @roomB
     return false

data/lib/IFMapper/FXMap.rb

@@ -787,9 +787,9 @@ 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
+#     if sel == FXWindow::ID_QUERY_TIP
+#       p "tooltip"
+#     end
   end
 
   #
@@ -1216,6 +1216,8 @@ class FXMap < Map
     pix = []
     32.times { 32.times { pix << 255 << 255 << 255 << 255 } }
     pix = pix.pack('c*')
+
+
     ['n', 'ne', 'e', 'se', 's', 'sw', 'w', 'nw'].each { |d|
       eval(<<-"EOF")
       @@cursor_#{d} = FXGIFCursor.new(@window.getApp, pix)
@@ -1784,9 +1786,13 @@ class FXMap < Map
     pos = @scrollwindow.position
     w   = @scrollwindow.getViewportWidth
     h   = @scrollwindow.getViewportHeight
+    cx  = -pos[0]-5
+    cx  = 0 if cx < 0
+    cy  = -pos[1]-5
+    cy  = 0 if cy < 0
 
     dc = FXDCWindow.new(@image)
-    dc.setClipRectangle( -pos[0]-5, -pos[1]-5, w, h)
+    dc.setClipRectangle( cx, cy, w, h)
     dc.font = @font
     #dc.lineCap = CAP_ROUND
     draw_background(dc, event)
@@ -1805,7 +1811,7 @@ class FXMap < Map
 
     # Blit the off-screen image into canvas
     dc = FXDCWindow.new(@canvas)
-    dc.setClipRectangle( -pos[0]-5, -pos[1]-5, w, h)
+    dc.setClipRectangle( cx, cy, w, h)
     dc.drawImage(@image,0,0)
     dc.end
   end

data/lib/IFMapper/FXMapColorBox.rb

@@ -1,5 +1,4 @@
 
-require 'fox12/colors'
 
 class FXMapColorBox < FXDialogBox
 

data/lib/IFMapper/FXMapperWindow.rb

@@ -8,6 +8,7 @@ end
 
 begin
   require 'fox12'
+  require 'fox12/colors'
 rescue LoadError => e
   $stderr.puts "Please install the FXRuby (FOX) library v1.2 or later."
   if $rubygems
@@ -130,6 +131,7 @@ class FXMapperWindow < FXMainWindow
     end
     
     map.copy(tmp)
+    map.fit
     map.create_pathmap
     map.verify_integrity
     map.window.create

data/lib/IFMapper/FXRoom.rb

@@ -134,6 +134,7 @@ class FXRoom < Room
   #
   def draw(dc, zoom, idx, opt, data)
     draw_box(dc, zoom, idx, opt)
+    return if zoom < 0.5
     dc.font = data['font']
     x, y = draw_name(dc, zoom)
     dc.font = data['objfont']
@@ -180,7 +181,7 @@ class FXRoom < Room
     dc.drawRectangle(x, y, w, h)
 
     # Draw grey square for index
-    if opt['Location Numbers']
+    if opt['Location Numbers'] and zoom >= 0.5
       dc.foreground = opt['Box Number Color']
       x += w # Index goes at bottom right of square
       y += h 

data/lib/IFMapper/TranscriptReader.rb

@@ -20,11 +20,10 @@ class TranscriptReader
   OTHERS   = /^(read|inventory$|i$)/i
   UNSCRIPT = /^unscript$/i
   BLANK    = /^\s*$/
-  MOVE     = /^(walk|run|go)\s+/i
   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/i
+  DARKNESS = /dark|It is pitch black/i
   DEAD     = /(You die|You have died|You are dead)/i
 
   # Compass direction command -> direction mapping.
@@ -38,11 +37,15 @@ class TranscriptReader
   ODIRMAP = {"up" => 1, "u" => 1, "down" => 2, "d" => 2,
     "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
+
   # Direction list in order of positioning preference.
   DIRLIST = [ 0, 4, 2, 6, 1, 3, 5, 7 ]
 
   NAME_REMOVE   = /(\s+\(.+\)|,\s+[io]n\s+.+)/ # remove things like (on the bed)
-  NAME_INVALID  = /[\[\]\.!\?]/
+  NAME_INVALID  = /[\[\]!\.\?\000]/
+  SALUTATIONS   = /\b(Mr|Mr?s|Miss|Jr|Sr)\./
   NAME_MAXWORDS = 20
   NAME_MAXUNCAP = 4  # so that lowercase room/end will be accepted
 
@@ -51,7 +54,7 @@ class TranscriptReader
 
 
   ## Change this to non-dil to print out debugging info
-  @@debug = nil
+  @@debug = 1
 
 
   def debug(*msg)
@@ -63,7 +66,7 @@ class TranscriptReader
   ## Possible nessages indicating get/take succeeded
   TAKE_OK = [ 
     /taken/i,
-    /you\s+now\s+have\s+(got\s+)?the/i,
+    /you\s+now\s+have\s+(got\s+)?/i,
   ]
 
   IT = /^(it|them)$/
@@ -147,22 +150,24 @@ class TranscriptReader
   EXITS_REGEX = 
     [
     # You can go south or east
-    /you\s+can\s+go\s+#{DIR}\s+#{OR}\s+#{DIR}[,\.\s+]/i,
+    /you\s+can\s+go\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i,
     # You can go south
-    /you\s+can\s+go\s+#{DIR}[,\.\s+]/i,
+    /you\s+can\s+go\s+#{DIR}\b/i,
     # to the east or west
-    /to\s+the\s+#{DIR}\s+#{OR}\s+#{DIR}[,\.\s+]/i,
+    /to\s+the\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i,
     # to the east
-    /to\s+the\s+#{DIR}[,\.\s+]/i,
+    /to\s+the\s+#{DIR}\b/i,
     # paths lead west and north
-    /(run|lead|wander|winds)\s+#{DIR}\s+#{OR}\s+#{DIR}[,\.\s+]/i, 
+    /(run|lead|wander|winds)\s+#{DIR}\s+#{OR}\s+#{DIR}\b/i, 
     # east-west corridor
-    /[\.\s+]#{DIR}[\/-]#{DIR}[,\.\s+]/i, 
+    /[\.\s+]#{DIR}[\/-]#{DIR}\b/i, 
     # East is the postoffice
-    /[,\.\s+]#{DIR}\s+is/i,
+    /\b#{DIR}\s+is/i,
+    # Directly north
+    /\bDirectly\s+#{DIR}/i,
     # continues|lies|etc... east
-    /(runs|leads|heads|opens|winds|continues|branches|lies|wanders|bends|curves)\s+#{DIR}[,\.\s+]/i,
-    /(running|leading|heading|opening|branching|lying|wandering|looking|bending)\s+#{DIR}[,\.\s+]/i,
+    /(runs|leads|heads|opens|winds|continues|branches|lies|wanders|bends|curves)\s+#{DIR}\b/i,
+    /(running|leading|heading|opening|branching|lying|wandering|looking|bending)\s+#{DIR}\b/i,
   ]
 
   EXITS_SPECIAL = { 
@@ -348,7 +353,6 @@ class TranscriptReader
 
 	desc = room[:desc]
 	line = move[:line]
-	cmd  = move[:cmd]
 	
 	# If we teleported, try to find room 
 	if room[:tele]
@@ -369,28 +373,33 @@ class TranscriptReader
 	there = find_room(name, desc)
 	next if there == @here
 
-	cmd.sub!(MOVE, '')
-	if DIRMAP[cmd]
-	  dir = DIRMAP[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}"
+	if DIRMAP[dir]
+	  dir = DIRMAP[dir]
 	  go  = nil
-	  cmd = nil
-	elsif ODIRMAP[cmd]
-	  go  = ODIRMAP[cmd]
+	elsif ODIRMAP[dir]
+	  go  = ODIRMAP[dir]
 	  dir = choose_dir(@here, there, go)
-	  cmd = nil
 	else
 	  # special move ---
 	  dir = choose_dir(@here, there)
 	  go  = nil
 	end
+	debug "MOVED IN DIR INDEX: #{dir}"
 
 	@here.selected = false
 	if not there
 	  # Unvisited -- new room
-	  @here = new_room(move, name, desc, dir, @here, go, cmd)
+	  @here = new_room(move, name, desc, dir, @here, go)
 	else
 	  # Visited before -- new link
-	  new_link(move, @here, there, dir, go, cmd)
+	  break unless new_link(move, @here, there, dir, go)
 	  @here = there
 	end
       }
@@ -460,15 +469,19 @@ class TranscriptReader
     # Remove unwanted stuff
     line.sub!(NAME_REMOVE, '')
 
+    # 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/
 
-    # Check word count
+    # Check word count (if too many, not a room)
     words = line.split(' ')
     return false if words.size > NAME_MAXWORDS
 
-    # Check uncapitalized words
+    # Check if we start line with uncapitalized words or symbols
     return false if line =~ /^[ a-z\/\\\-\(\)]/
 
     words.each { |w|
@@ -480,7 +493,7 @@ class TranscriptReader
   #
   # Create a new room
   #
-  def new_room( move, name, desc, dir = nil, from = nil, go = nil, cmd = nil )
+  def new_room( move, name, desc, dir = nil, from = nil, go = nil )
     if not from
       debug "FROM undefined.  Increase section #{name}"
       @section += 1
@@ -571,19 +584,31 @@ class TranscriptReader
     end
   end
 
-  def new_link(move, from, to, dir, go, cmd)
+
+  def new_link(move, from, to, dir, go)
     odir = (dir + 4) % 8
     c = nil
+    # If we have something in the from direction
     if from[dir]
       c = from[dir]
       debug "\tMOVE #{c} DIR: #{dir}"
-      if not c.roomB
+      if c.stub?
 	# Stub connection, fill it
 	c.roomB  = to
-	debug "\tREMOVE #{to[odir]}"
-	@map.delete_connection(to[odir]) if to[odir] and to[odir].stub?
+	# we still need to check the destination to[odir]...
+	if not to[odir]
+	  # nothing to do
+	elsif to[odir].stub?
+	  @map.delete_connection(to[odir])
+	  debug "\tREMOVE #{to[odir]}"
+	else
+	  # this end cannot be deleted.  we need to shift odir
+	  debug "\tCHOOSE NEW DIR for #{odir}"
+	  odir = choose_dir(to, from, go, dir)
+	  @map.delete_connection(to[odir]) if to[odir]
+	  debug "\tSHIFTED DESTINATION TO EXIT #{odir}"
+	end
 	to[odir] = c
-	debug "\tREPLACED WITH #{c}"
       elsif c.roomB == to
 	# We already went this way.  Nothing to do.
 	debug "\tWE ALREADY PASSED THRU HERE"
@@ -594,27 +619,34 @@ class TranscriptReader
 	debug "\tSECTION: #{@map.section}"
 	debug "\tVERIFIED EXIT BOTH WAYS"
       else
-	if c.roomA == from
+	debug "\tOTHER"
+	if c.roomA == from and c.dir != Connection::BtoA
 	  b = c.roomB
 	  if b.name =~ DARKNESS
+	    debug "*** REPLACING DARK ROOM ***"
 	    @map.delete_connection(c)
 	    @map.delete_room(b)
 	    to.darkness = true
 	    c = nil
 	  else
+	    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
 	else
+	  debug "SHIFT LINK #{from} #{dir}"
 	  # We have a connection that turns.  Move the link around
 	  shift_link(from, dir)
 	  c = nil
 	end
       end
-    elsif to[odir]
+    end
+
+    if not c and to[odir]
       c = to[odir]
-      if not c.roomB
+      if c.stub?
 	debug "\tREMOVE #{to[odir]} and REPLACE with #{c}"
 	# Stub connection, fill it
 	c.roomB   = from
@@ -626,8 +658,8 @@ class TranscriptReader
 	c.exitBtext = go if go
       else
 	# We need to change odir to something else
-	# shift_link(to, odir)
-	odir = choose_dir(to, from, go)
+	odir = choose_dir(to, from, go, dir)
+	@map.delete_connection(to[odir]) if to[odir] and to[odir].stub?
 	c = nil
       end
     end
@@ -656,7 +688,8 @@ class TranscriptReader
 	c = @map.new_connection( from, dir, to, odir )
 	c.exitAtext = go if go
 	c.dir = Connection::AtoB
-      rescue
+      rescue => e
+	$stderr.puts e
       end
     end
 
@@ -665,9 +698,7 @@ class TranscriptReader
 
 
   # Choose a direction to represent up/down/in/out.
-  def choose_dir(a, b, go = nil)
-    best = nil
-    bestscore = 0
+  def choose_dir(a, b, go = nil, exitB = nil)
     if go
       rgo = go % 2 == 0? go - 1 : go + 1
       debug "#{Connection::EXIT_TEXT[go]} <=> #{Connection::EXIT_TEXT[rgo]}"
@@ -686,34 +717,63 @@ class TranscriptReader
       }
     end
 
+    # We prefer directions that travel less... so we need to figure
+    # out where we start from...
+    if b
+      x = b.x
+      y = b.y
+    else
+      x = a.x
+      y = a.y
+    end
+    if exitB
+      dx, dy = Room::DIR_TO_VECTOR[exitB]
+      x += dx
+      y += dy
+    end
+
     # No such luck... Pick a direction.
+    best = nil
+    bestscore = nil
+
     DIRLIST.each { |dir|
       # We prefer straight directions to diagonal ones
-      inc   = dir % 2 == 1 ? 1 : 3
-      rdir  = (dir + 4) % 8
-      score = 0
+      inc   = dir % 2 == 1 ? 10 : 14
+      score = 1000
       # We prefer directions where both that dir and the opposite side
       # are empty.
-      score += inc unless a[dir]
-      score += 1   unless a[rdir]
-      next if score <= bestscore
+      if (not a[dir]) or a[dir].stub?
+	score += inc
+	score += 4 if a[dir] #attaching to stubs is better
+      end
+#       rdir  = (dir + 4) % 8
+#       score += 1   unless a[rdir]
+
+      # Measure distance for that exit, we prefer shorter
+      # paths
+      dx, dy = Room::DIR_TO_VECTOR[dir]
+      dx = (a.x + dx) - x
+      dy = (a.y + dy) - y
+      d = dx * dx + dy * dy
+      score -= d
+      next if bestscore and score <= bestscore
       bestscore = score
       best = dir
     }
 
-    if bestscore == 0
-      $stderr.puts "No free exit for up/down"
+    if not bestscore
+      raise "No free exit for choose_dir"
     end
 
     return best
   end
 
   def stop
-    @t.stop
+    @t.stop if @t
   end
 
   def destroy
-    @t.kill
+    @t.kill if @t
     @f.close
     GC.start
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  version: "0.8"
-date: 2005-08-20
+  version: 0.8.1
+date: 2005-08-21
 summary: Interactive Fiction Mapping Tool.
 require_paths: 
   - lib
@@ -32,18 +32,18 @@ files:
   - 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/IFMWriter.rb
   - lib/IFMapper/FXWarningBox.rb
-  - lib/IFMapper/FXMapColorBox.rb
   - lib/IFMapper/PDFMapExporter.rb
   - lib/IFMapper/FXMapperSettings.rb
-  - lib/IFMapper/FXRoom.rb
-  - lib/IFMapper/FXConnection.rb
   - lib/IFMapper/AStar.rb
   - lib/IFMapper/Connection.rb
   - lib/IFMapper/MapPrinting.rb