ifmapper 0.5 → 0.6

data/lib/IFMapper/Room.rb

@@ -61,7 +61,7 @@ class Room
   end
 
   #
-  # Given to 'adjacent' rooms, return the most direct exit from this
+  # Given an 'adjacent' room, return the most direct exit from this
   # room to room b.
   #
   def exit_to(b)
@@ -86,6 +86,16 @@ class Room
     return vector_to_dir(dx, dy)
   end
 
+  #
+  # Copy a room to another
+  #
+  def copy(b)
+    @name     = b.name
+    @objects  = b.objects
+    @tasks    = b.tasks
+    @darkness = b.darkness
+  end
+
 
   def initialize(x, y, name = 'Room')
     @exits    = Array.new( DIRECTIONS.size )

data/lib/IFMapper/{Page.rb → Section.rb}

@@ -3,11 +3,13 @@
 require 'IFMapper/Connection'
 require 'IFMapper/Room'
 
-class Page
+class Section
   attr_accessor :rooms
   attr_accessor :connections
   attr_accessor :name
 
+  class ConnectionError < StandardError; end
+
   def marshal_load(v)
     @rooms       = v[0]
     @connections = v[1]
@@ -46,7 +48,9 @@ class Page
     return [ minXY, maxXY ]
   end
 
-
+  #
+  # Delete a connection from section
+  #
   def delete_connection(c)
     a = c.roomA
     if a
@@ -61,6 +65,9 @@ class Page
     @connections.delete(c)
   end
 
+  #
+  # Delete a connection at a certain index location
+  #
   def delete_connection_at( idx )
     c = @connections[idx]
 
@@ -77,6 +84,58 @@ class Page
     @connections.delete_at(idx)
   end
 
+  #
+  # Create a new connection among two rooms thru their exits
+  #
+  def new_connection( roomA, exitA, roomB, exitB = nil )
+    c = Connection.new( roomA, roomB )
+    _new_connection( c, roomA, exitA, roomB, exitB )
+  end
+
+  #
+  # Delete a room at a certain index
+  #
+  def delete_room_at(idx)
+    r = @rooms[idx]
+    r.exits.each { |e|
+      next if not e
+      delete_connection(e)
+    }
+    @rooms.delete_at(idx)
+  end
+
+  #
+  # Delete a room
+  #
+  def delete_room(r)
+    r.exits.each { |e|
+      next if not e
+      delete_connection(e)
+    }
+    @rooms.delete(r)
+  end
+
+  #
+  # Create a new room  (note: FXSection overrides this creating an
+  # FXRoom instead).
+  #
+  def new_room( x, y )
+    r = Room.new( x, y, 'New Location' )
+    return _new_room(r, x, y)
+  end
+
+  def initialize()
+    @rooms       = []
+    @connections = []
+  end
+
+  protected
+
+  def _new_room( r, x, y )
+    @rooms.push(r)
+    return r
+  end
+
   def _new_connection(c, roomA, exitA, roomB, exitB)
     exitA = roomA.exit_to(roomB) if not exitA
     if not exitA
@@ -85,14 +144,14 @@ No exit given or guessed to connect:
       Room #{roomA} (#{roomA.x}, #{roomA.y})
       Room #{roomB} (#{roomB.x}, #{roomB.y})
 EOF
-      raise err
+      raise ConnectionError, err
     end
 
     if roomA[exitA]
       if not @connections.include?(roomA[exitA])
-	raise "room exit filled but not in page"
+	raise ConnectionError, "room exit filled but not in page"
       end
-      raise "room exit #{exitA} for #{roomA} is filled" 
+      raise ConnectionError, "room exit #{exitA} for #{roomA} is filled" 
     end
 
     roomA[exitA] = c
@@ -111,7 +170,7 @@ EOF
     end
 
     if roomB and roomB[exitB] and roomB[exitB] != c
-      raise "room exit #{exitB} for #{roomB} is filled" 
+      raise ConnectionError, "room exit #{exitB} for #{roomB} is filled" 
     end
     roomB[exitB] = c if roomB
 
@@ -119,40 +178,4 @@ EOF
     return c
   end
 
-  def new_connection( roomA, exitA, roomB, exitB = nil )
-    c = Connection.new( roomA, roomB )
-    _new_connection(c, roomA, exitA, roomB, exitB )
-  end
-
-  def delete_room_at(idx)
-    r = @rooms[idx]
-    r.exits.each { |e|
-      next if not e
-      delete_connection(e)
-    }
-    @rooms.delete_at(idx)
-  end
-
-  def delete_room(r)
-    r.exits.each { |e|
-      next if not e
-      delete_connection(e)
-    }
-    @rooms.delete(r)
-  end
-
-  def _new_room( r, x, y )
-    @rooms.push(r)
-    return r
-  end
-
-  def new_room( x, y )
-    r = Room.new( x, y, 'New Location' )
-    return _new_room(r, x, y)
-  end
-
-  def initialize()
-    @rooms       = []
-    @connections = []
-  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  version: "0.5"
-date: 2005-08-12
+  version: "0.6"
+date: 2005-08-14
 summary: Interactive Fiction Mapping Tool.
 require_paths: 
   - lib
@@ -28,27 +28,30 @@ authors:
   - Gonzalo Garramuno
 files: 
   - IFMapper.rb
-  - lib/IFMapper/FXWarningBox.rb
+  - lib/IFMapper/FXMap.rb
   - lib/IFMapper/Map.rb
-  - lib/IFMapper/Connection.rb
-  - lib/IFMapper/FXMapperSettings.rb
   - lib/IFMapper/FXSpline.rb
+  - lib/IFMapper/FXSection.rb
+  - lib/IFMapper/FXRoom.rb
   - lib/IFMapper/FXMapDialogBox.rb
-  - lib/IFMapper/FXAboutDialogBox.rb
-  - lib/IFMapper/FXConnection.rb
-  - lib/IFMapper/FXPageDialogBox.rb
-  - lib/IFMapper/FXPage.rb
-  - lib/IFMapper/FXSearchDialogBox.rb
+  - lib/IFMapper/FXSectionDialogBox.rb
   - lib/IFMapper/FXMapperWindow.rb
-  - lib/IFMapper/IFMReader.rb
-  - lib/IFMapper/FXMap.rb
-  - lib/IFMapper/FXRoom.rb
-  - lib/IFMapper/Page.rb
-  - lib/IFMapper/FXMapFileDialog.rb
   - lib/IFMapper/Room.rb
+  - lib/IFMapper/Section.rb
+  - lib/IFMapper/FXConnection.rb
+  - lib/IFMapper/IFMReader.rb
+  - lib/IFMapper/FXWarningBox.rb
+  - lib/IFMapper/FXMapColorBox.rb
   - lib/IFMapper/PDFMapExporter.rb
+  - lib/IFMapper/MapPrinting.rb
+  - lib/IFMapper/FXMapperSettings.rb
+  - lib/IFMapper/Connection.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
@@ -111,6 +114,22 @@ files:
   - icons/printicon.png
   - icons/prevpage.png
   - icons/nextpage.png
+  - icons/room_n.xpm
+  - icons/room_nw.xpm
+  - icons/room_ne.xpm
+  - icons/room_se.xpm
+  - icons/room_sw.xpm
+  - icons/room_s.xpm
+  - icons/room_w.xpm
+  - icons/room_e.xpm
+  - icons/room_n.gif
+  - icons/room_s.gif
+  - icons/room_sw.gif
+  - icons/room_se.gif
+  - icons/room_ne.gif
+  - icons/room_nw.gif
+  - icons/room_e.gif
+  - icons/room_w.gif
   - HISTORY.txt
   - IFMapper.gemspec
 test_files: []