ifmapper 0.6 → 0.7

data/lib/IFMapper/FXRoom.rb

@@ -69,17 +69,20 @@ class FXRoom < Room
     return true
   end
 
+  def update_properties(map)
+    return if not @@win or not @@win.shown?
+    @@win.map = map
+    @@win.setFocus
+    @@win.copy_from(self)
+  end
+
   # Open a new requester to change room properties
   def properties( map, event = nil )
     if not @@win
       @@win = FXRoomDialogBox.new(map, self, event, false)
-    else
-      @@win.map = map
     end
-    @@win.setFocus
     @@win.show
-    @@win.copy_from(self)
-    return
+    update_properties(map)
   end
 
   #

data/lib/IFMapper/IFMReader.rb

@@ -202,7 +202,7 @@ class IFMReader
     tag, task = get_tag
     return @task if tag == 'last'
     if task and task.kind_of?(Room)
-      raise ParseError, "Not an task tag <#{tag}:#{item}>"
+      raise ParseError, "Not a task tag <#{tag}:#{item}>"
     end
     return task
   end
@@ -448,8 +448,9 @@ class IFMReader
 	}
 
 	# Remember original room for connection
-	roomB      = @map.new_room( @x, @y )
-	roomB.name = roomname
+	roomB          = @map.new_room( @x, @y )
+	roomB.selected = false
+	roomB.name     = roomname
 	@rooms.push( roomB )
       end
 

data/lib/IFMapper/IFMWriter.rb

@@ -0,0 +1,219 @@
+
+
+
+class IFMWriter
+
+  def link(c)
+    return if @links.include?(c) # already spit out
+    a = c.roomA
+    return if not a
+    b = c.roomB
+    roomA = @elem[a]
+    roomB = @elem[b]
+    @f.puts
+    @f.print "link #{roomA} to #{roomB}"
+    directions(c, a, b)
+    @f.print ";\n"
+  end
+
+  def directions(c, a, b)
+    @links << c
+    if c.gpts.empty?
+      # simple connection
+      idx = a.next_to?(b)
+      dir = ' ' + Room::DIRECTIONS[idx]
+    else
+      # complex path
+      dir = ''
+      pts = c.gpts.dup
+      x = a.x
+      y = a.y
+      if c.roomA != a
+	pts.reverse!
+      end
+      
+      pts.each { |p|
+	dx, dy = [ p[0] - x, p[1] - y ]
+	idx = Room::vector_to_dir(dx, dy)
+	dir += " #{Room::DIRECTIONS[idx]}"
+	x = p[0]
+	y = p[1]
+      }
+      dx, dy = [ b.x - x, b.y - y ]
+      idx = Room::vector_to_dir(dx, dy)
+      dir += " #{Room::DIRECTIONS[idx]}"
+    end
+    @f.print " dir#{dir}"
+
+    if c.exitAtext != 0
+      dir = Connection::EXIT_TEXT[c.exitAtext].downcase
+      @f.print " go #{dir}"
+    end
+
+    if c.dir == Connection::AtoB
+      @f.print " oneway"
+    end
+
+    if c.type == Connection::SPECIAL
+      @f.print " style special"
+    end
+  end
+
+  def get_tag(e, t)
+    return @elem[e] if @elem.has_key?(e)
+
+    tag = t.dup
+    tag.gsub!(/[\s,\.'"#$@\/\\-]+/, '_')
+    tagname = tag
+    idx = 2
+    while @tags.include?(tagname)
+      tagname = tag + '_' + idx.to_s
+      idx += 1
+    end
+    @tags    << tagname
+    @elem[e] = tagname
+    return tagname
+  end
+
+  # hook up two rooms that are not linked
+  def nolink(a, b)
+    x = a.x
+    y = a.y
+
+    # find free room exit in a
+    exit = 0
+    a.exits.each_with_index { |e, idx|
+      next if e
+      exit = idx
+      break
+    }
+    dir = Room::DIRECTIONS[exit]
+    dx, dy = Room::DIR_TO_VECTOR[exit]
+    x += dx
+    y += dy
+    while x != b.x or y != b.y
+      dx = dy = 0
+      if b.x > x
+	dx = 1
+      elsif b.x < x
+	dx = -1
+      end
+      if b.y > y
+	dy = 1
+      elsif b.y < y
+	dy = -1
+      end
+      idx  = Room::vector_to_dir(dx, dy)
+      dir += " #{Room::DIRECTIONS[idx]}"
+      x += dx
+      y += dy
+    end
+
+    @f.print " dir #{dir} nolink"
+  end
+
+  def room(r)
+    return if @rooms.include?(r)
+    @rooms << r
+    tag = get_tag(r, r.name)
+
+    @f.puts 
+    @f.print "room \"#{r.name}\" tag #{tag}"
+    if @link
+      if @link[3]
+	nolink(@last_room, r)
+      else
+	directions(@link[0], @link[1], @link[2])
+	if @last_room and @link[1] != @last_room
+	  tag = get_tag(@link[1], @link[1].name)
+	  @f.print " from #{tag}"
+	end
+      end
+    end
+    @f.print ";\n"
+    @last_room = r
+
+    objs = r.objects.split("\n")
+    objs.each { |obj|
+      tag = get_tag(obj, obj)      
+      @f.puts "\titem \"#{obj}\" tag #{tag};"
+    }
+    tasks = r.tasks.split("\n")
+    tasks.each { |task|
+      tag = get_tag(task, task)
+      @f.puts "\ttask \"#{task}\" tag #{tag};"
+    }
+
+    r.exits.each { |c|
+      next if not c or @links.include?(c)
+      if c.roomA == c.roomB
+	# self-link
+	link(c)
+	next
+      end
+      if r == c.roomA
+	@link = [c, c.roomA, c.roomB]
+	room(c.roomB) # Recurse along this branch...
+      else
+	@link = [c, c.roomB, c.roomA]
+	room(c.roomA) # Recurse along this branch...
+      end
+    }
+  end
+
+  def sections
+    old_section = @map.section
+    @map.sections.each_with_index { |section, idx|
+      @f.puts
+      @f.puts '#' * 79
+      @f.puts
+      @f.puts "map \"#{section.name}\";" if section.name != ''
+      @map.section = idx
+      @link = nil
+      section.rooms.each { |r|
+	room(r)
+	@link << 'nolink'
+      }
+      section.connections.each { |c|
+	link(c)
+      }
+    }
+    @map.section = old_section
+  end
+
+  def header
+    @f.puts <<-"HEADER"
+#
+# IFM map for #{@map.name}
+# Created by #{@map.creator}
+# #{Time.now}
+#
+# Map created using the Interactive Fiction Mapper
+# (C) 2005 - Gonzalo Garramuno
+#
+
+title "#{@map.name}";
+
+HEADER
+
+  end
+
+
+  def export(file)
+    @f = File.open(file, 'w')
+    header
+    sections
+    @f.close
+  end
+
+  def initialize(map, file)
+    @link  = nil
+    @links = []
+    @rooms = []
+    @last_room = nil
+    @tags  = []
+    @elem  = {}
+    @map   = map
+    export(file)
+  end
+end

data/lib/IFMapper/Map.rb

@@ -14,11 +14,6 @@ class Map
   attr_accessor :width
   attr_accessor :height
 
-  def section=(x)
-    x = 0               if x < 0 
-    x = @sections.size - 1 if x >= @sections.size
-    @section = x
-  end
 
   #
   # Used for loading class with Marshal
@@ -40,6 +35,29 @@ class Map
     [ @name, @creator, @date, @section, @sections, @width, @height ] 
   end
 
+  def section=(x)
+    x = 0               if x < 0 
+    x = @sections.size - 1 if x >= @sections.size
+    @section = x
+  end
+
+  #
+  # Auxiliary debugging function to verify the integrity of the map
+  #
+  def verify_integrity
+    @sections.each { |sect|
+      sect.rooms.each { |r|
+	r.exits.each_with_index { |e, idx|
+	  next if not e
+	  if not sect.connections.include?(e)
+	    $stderr.puts "Exit #{e} in room, but not in section #{sect.name}."
+	    r.exits[idx] = nil
+	  end
+	}
+      }
+    }
+  end
+
   def initialize(name)
     @section = 0
     @name    = name

data/lib/IFMapper/MapPrinting.rb

@@ -159,3 +159,4 @@ class Map
     return num
   end
 end
+

data/lib/IFMapper/PDFMapExporter.rb

@@ -1,21 +1,23 @@
 
-begin
-  require 'tmpdir'
-rescue => e
-  raise "Please install 'tmpdir' library.  This is needed for printing."
-end
+require 'tmpdir'
 
 begin
   require 'pdf/writer'
-rescue => e
-  raise "Please install 'pdf writer' library for Acrobat PDF support."
+rescue LoadError => e
+  err = "PDF-Writer library not found.  Please install it.\n"
+  if $rubygems
+    err += "You can usually do so if you do 'gem install pdf-writer'."
+  else
+    err += "You can download it from www.rubyforge.net."
+  end
+  raise LoadError, err
 end
 
 require 'IFMapper/MapPrinting'
 
 PDF_ZOOM        = 0.5
-PDF_ROOM_WIDTH  = W  * PDF_ZOOM  # 60
-PDF_ROOM_HEIGHT = H  * PDF_ZOOM  # 37.5
+PDF_ROOM_WIDTH  = W  * PDF_ZOOM 
+PDF_ROOM_HEIGHT = H  * PDF_ZOOM 
 PDF_ROOM_WS     = WS * PDF_ZOOM
 PDF_ROOM_HS     = HS * PDF_ZOOM
 PDF_MARGIN      = 20

data/lib/IFMapper/Room.rb

@@ -11,14 +11,14 @@ class Room
   attr_accessor  :x, :y
 
   DIRECTIONS = [
-    'N',
-    'NE',
-    'E',
-    'SE',
-    'S',
-    'SW',
-    'W',
-    'NW',
+    'n',
+    'ne',
+    'e',
+    'se',
+    's',
+    'sw',
+    'w',
+    'nw',
   ]
 
   DIR_TO_VECTOR = { 
@@ -44,7 +44,7 @@ class Room
   # Return a direction from the vector of the exit that would take
   # us to the 'b' room more cleanly.
   #
-  def vector_to_dir(dx, dy)
+  def self.vector_to_dir(dx, dy)
     if dx == 0
       return 4 if dy > 0
       return 0 if dy < 0
@@ -60,6 +60,10 @@ class Room
     end
   end
 
+  def vector_to_dir(dx, dy)
+    return Room::vector_to_dir( dx, dy )
+  end
+
   #
   # Given an 'adjacent' room, return the most direct exit from this
   # room to room b.

data/lib/IFMapper/Section.rb

@@ -149,7 +149,7 @@ EOF
 
     if roomA[exitA]
       if not @connections.include?(roomA[exitA])
-	raise ConnectionError, "room exit filled but not in page"
+	raise ConnectionError, "room exit #{exitA} for #{roomA} filled but not in section"
       end
       raise ConnectionError, "room exit #{exitA} for #{roomA} is filled" 
     end
@@ -170,6 +170,7 @@ EOF
     end
 
     if roomB and roomB[exitB] and roomB[exitB] != c
+      roomA[exitA] = nil
       raise ConnectionError, "room exit #{exitB} for #{roomB} is filled" 
     end
     roomB[exitB] = c if roomB

metadata

@@ -3,12 +3,12 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  version: "0.6"
-date: 2005-08-14
+  version: "0.7"
+date: 2005-08-17
 summary: Interactive Fiction Mapping Tool.
 require_paths: 
   - lib
-email: GGarramuno@aol.com or ggarram@advance.dsl.com.ar
+email: ggarram@advance.dsl.com.ar
 homepage: http://www.rubyforge.org/projects/ifmapper/
 rubyforge_project: ifmapper
 description: Interactive Fiction Mapping Tool.
@@ -28,30 +28,33 @@ authors:
   - Gonzalo Garramuno
 files: 
   - IFMapper.rb
-  - lib/IFMapper/FXMap.rb
-  - lib/IFMapper/Map.rb
+  - lib/IFMapper/Section.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/IFMReader.rb
+  - lib/IFMapper/IFMWriter.rb
   - lib/IFMapper/FXWarningBox.rb
   - lib/IFMapper/FXMapColorBox.rb
-  - lib/IFMapper/PDFMapExporter.rb
-  - lib/IFMapper/MapPrinting.rb
   - lib/IFMapper/FXMapperSettings.rb
+  - lib/IFMapper/FXMap.rb
+  - lib/IFMapper/FXRoom.rb
+  - lib/IFMapper/FXConnection.rb
+  - lib/IFMapper/AStar.rb
+  - lib/IFMapper/FXMapperWindow.rb
   - lib/IFMapper/Connection.rb
+  - lib/IFMapper/FXDCPostscript.rb
+  - lib/IFMapper/MapPrinting.rb
+  - lib/IFMapper/FXDCPrint.rb
+  - lib/IFMapper/Map.rb
+  - lib/IFMapper/Room.rb
+  - lib/IFMapper/IFMReader.rb
+  - lib/IFMapper/PDFMapExporter.rb
   - lib/IFMapper/FXAboutDialogBox.rb
   - lib/IFMapper/FXSearchDialogBox.rb
   - lib/IFMapper/FXMapFileDialog.rb
   - lib/IFMapper/FXRoomDialogBox.rb
   - lib/IFMapper/FXConnectionDialogBox.rb
-  - lib/IFMapper/AStar.rb
   - maps/Zork_Zero.ifm
   - maps/anchor.ifm
   - maps/atrox.ifm