ifmapper 1.0.6 → 1.0.7

data/HISTORY.txt

@@ -1,3 +1,9 @@
+v1.0.7  - Bug fixed cutting and pasting of rooms, 
+	  which could overlap previous rooms in map and 
+	  leave rooms without new connections.
+	- Added localization to link switching with RMB.
+	- Fixed drag selection of rooms.
+
 v1.0.6  - Added new item list window.
 
 v1.0.5  - Improved PDF output in Letter box mode.

data/IFMapper.gemspec

@@ -2,8 +2,8 @@ require "rubygems"
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ifmapper"
-	spec.version = '1.0.6'
-	spec.author = "Gonzalxo Garramuno" 
+	spec.version = '1.0.7'
+	spec.author = "Gonzalo Garramuno" 
 	spec.email = 'ggarra13@gmail.com'
 	spec.homepage = 'http://www.rubyforge.org/projects/ifmapper/'
 	spec.summary = 'Interactive Fiction Mapping Tool.'

data/lib/IFMapper/FXConnection.rb

@@ -10,7 +10,7 @@ require 'IFMapper/FXConnectionDialogBox'
 #    |         W           |
 #    |   +-------------+   |
 # HH |   |             |WS2|
-#    | H |             |---|
+#    | HS |             |---|
 #    |   +-------------+   |
 #    |       |HS2          |
 #    +---------------------+
@@ -52,6 +52,7 @@ class FXConnection < Connection
   def marshal_load(vars)
     @pts = @gpts = []
     @selected = vars.shift
+    @failed = false
     super(vars)
   end
 

data/lib/IFMapper/FXMap.rb

@@ -30,6 +30,7 @@ class FXMap < Map
   attr_reader   :complexConnection
   attr_reader   :mouseButton
 
+
   # pmap is a path map (a matrix or grid used for path finding).  
   # Rooms and paths are recorded there.  Path finding is needed 
   # to draw complex connections (ie. those that are farther than one square)
@@ -155,7 +156,7 @@ class FXMap < Map
   #
   def _free_area?(x, y, w, h)
     x.upto(x+w) { |xx|
-      y.upto(x+h) { |yy|
+      y.upto(y+h) { |yy|
 	return false if @pmap.at(xx).at(yy).kind_of?(Room)
       }
     }
@@ -781,6 +782,8 @@ class FXMap < Map
   #
   def double_click_cb(selection, event)
     return unless selection
+    # If in navigation mode, we don't allow user to modify map.
+    return navigation_warning if @navigation
     if selection.kind_of?(FXRoom) or selection.kind_of?(FXConnection)
       selection.properties( self, event )
     end
@@ -919,8 +922,8 @@ class FXMap < Map
     w = x2 - x1
     h = y2 - y1
 
-    x1 = ((x1 - WS_2) / WW).floor
-    y1 = ((y1 - HS_2) / HH).floor
+    x1 = ((x1 + WS_2) / WW).floor
+    y1 = ((y1 + HS_2) / HH).floor
     x2 = ((x2 - WS_2) / WW).ceil
     y2 = ((y2 - HS_2) / HH).ceil
 
@@ -1061,7 +1064,7 @@ class FXMap < Map
     dir = Room::DIRECTIONS[idx]
     dir = dir.upcase
     if room[idx]
-      cmd = FXMenuCommand.new(submenu, "Switch with link in #{dir} Exit")
+      cmd = FXMenuCommand.new(submenu, "#{MENU_SWITCH_WITH_LINK} #{dir}")
       cmd.connect(SEL_COMMAND) { 
 	c2 = room[idx]
 	room[old_idx] = c2
@@ -1070,7 +1073,7 @@ class FXMap < Map
 	draw
       }
     else
-      cmd = FXMenuCommand.new(submenu, "Move link to #{dir} Exit")
+      cmd = FXMenuCommand.new(submenu, "#{MENU_MOVE_LINK} #{dir}")
       cmd.connect(SEL_COMMAND) { 
 	room[old_idx] = nil
 	room[idx] = c
@@ -1093,7 +1096,7 @@ class FXMap < Map
       b = c.roomB
       menu = FXMenuPane.new(@window)
       if c.dir == Connection::AtoB
-	cmd = FXMenuCommand.new(menu, "Flip Direction")
+	cmd = FXMenuCommand.new(menu, MENU_FLIP_DIRECTION)
 	cmd.connect(SEL_COMMAND) { c.flip; draw }
 	FXMenuSeparator.new(menu)
       end
@@ -1390,8 +1393,7 @@ class FXMap < Map
   # Handle 'cutting' any selected rooms and/or connections
   #
   def _cut_selected
-    rooms = @sections[@section].rooms.find_all { |r| r.selected }
-    conns = @sections[@section].connections.find_all { |c| c.selected }
+    rooms, conns = get_selection
     ############################
     # First, handle rooms...
     ############################
@@ -1399,11 +1401,13 @@ class FXMap < Map
     rooms.each { |r| @pmap[r.x][r.y] = nil }
     # Remove rooms from current section in map
     @sections[@section].rooms -= rooms
-    # Add any connections pointing to removed rooms as connection to remove
+    # Add any connections pointing to removed rooms as 
+    # connection to remove
     rooms.each { |r|
       conns += r.exits.find_all { |e| e != nil }
     }
 
+
     #########################
     # Now, handle connections
     #########################
@@ -1411,15 +1415,32 @@ class FXMap < Map
 
     # Remove connections from path map
     conns.each { |c| clean_path(c) }
+
     # Remove connections from current section in map
     @sections[@section].connections -= conns
 
-    return conns
+
+    return rooms, conns
   end
 
   def cut_selected
-    _cut_selected
+    rooms, conns = _cut_selected
+
+    # Remove room exits pointing to any removed connection
+    conns.each { |c|
+      a = c.roomA
+      b = c.roomB
+      if not rooms.member?(a)
+        a[a.exits.index(c)] = nil
+      end
+      if not rooms.member?(b)
+	idx = b.exits.rindex(c)
+	b[idx] = nil if idx
+      end
+    }
+
     modified = true
+    create_pathmap
     draw
   end
 
@@ -1427,7 +1448,8 @@ class FXMap < Map
   # Handle deleting selected rooms and/or connections
   #
   def delete_selected
-    conns = _cut_selected
+    return navigation_warning if @navigation
+    rooms, conns = _cut_selected
 
     # Remove room exits pointing to any removed connection
     conns.each { |c|
@@ -1511,6 +1533,7 @@ class FXMap < Map
 
   def self.no_maps
     @@roomlist.hide if @@roomlist
+    @@itemlist.hide if @@itemlist
     @@win.hide      if @@win
     FXRoom::no_maps
     FXConnection::no_maps
@@ -1524,6 +1547,10 @@ class FXMap < Map
     @@win.copy_from(self)      if @@win
   end
 
+  def update_itemlist
+    @@itemlist.copy_from(self) if @@itemlist
+  end
+
   #
   # Find and update all paths in path map for a room
   #
@@ -1655,6 +1682,12 @@ class FXMap < Map
 	@modified = true
 	draw
       end
+    # when KEY_u
+    #   if event.state & CONTROLMASK != 0
+    #     FXMapperWindow::undo(self)
+    #     @modified = true
+    #     draw
+    #   end
     when KEY_x
       return navigation_warning if @navigation
       if event.state & CONTROLMASK != 0

data/lib/IFMapper/FXMapperWindow.rb

@@ -46,7 +46,7 @@ require 'IFMapper/FXWarningBox'
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = '1.0.6'
+  VERSION      = '1.0.7'
   AUTHOR = "Gonzalo Garramuño"
 
   @@copy_buffer = nil
@@ -546,6 +546,7 @@ class FXMapperWindow < FXMainWindow
   # Cut selected elements
   #
   def self.cut_selected(map)
+    return map.navigation_warning if map.navigation
     FXMapperWindow::copy_selected(map)
     map.cut_selected
   end
@@ -641,6 +642,7 @@ class FXMapperWindow < FXMainWindow
   end
 
 
+
   #
   # Hilite matches after a search
   #
@@ -975,6 +977,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND, method(:cut_selected_cb))
     cmd = FXMenuCommand.new(editmenu, MENU_PASTE, nil) 
     cmd.connect(SEL_COMMAND, method(:paste_selected_cb))
+    # cmd = FXMenuCommand.new(editmenu, MENU_UNDO, nil) 
+    # cmd.connect(SEL_COMMAND, method(:undo_cb))
 
     # Select submenu
     FXMenuSeparator.new(editmenu)

data/lib/IFMapper/FXRoom.rb

@@ -11,6 +11,13 @@ class FXRoom < Room
 
   @@win = nil
 
+  def copy(b)
+    xx = b.xx
+    yy = b.yy
+    selected = b.selected
+    super b
+  end
+
   def self.no_maps
     @@win.hide if @@win
   end

data/lib/IFMapper/Room.rb

@@ -150,4 +150,12 @@ class Room
   def to_s
     "\"#{@name}\""
   end
+
+  def inspect
+    puts to_s
+    puts "Exits:"
+    @exits.each { |c|
+      puts "\t#{c}" if c != nil
+    }
+  end
 end

data/lib/IFMapper/TranscriptReader.rb

@@ -51,20 +51,21 @@ class TranscriptReader
 
   # No exit replies
   NO_EXIT = [
-    /\byou\scan't\sgo\sthat\sway\b/i,
-    /\byou\scan't\sgo\sin\sthat\sdirection\b/i,
-    /\bdoorways\slead\s/i,
-    /\bthat's\sa\swall\b/i,
-    /\bno\sexit\b/i,
-    /\bthere's\s+nothing\sin\sthat\sdirection\b/i,
-    /\bblock\sthe\sway/i,
-    /\byou\scan\sonly\sgo\s/i,
-    /\byou\scan\sgo\sonly\s/i,
-    /\bimpenetrable\b/i,
-    /\bbars\syour\sway/i,
-    /\bthere's\s.*in\s(?:your|the)\sway/i
-  ]
-
+             /\byou\scan't\sgo\sthat\sway\b/i,
+             /\byou\scan't\sgo\sin\sthat\sdirection\b/i,
+             /\bdoorways\slead\s/i,
+             /\bthat's\sa\swall\b/i,
+             /\bno\sexit\b/i,
+             /\bthere's\s+nowhere\s+to\s+go\s+in\sthat\s+direction\b/i,
+             /\bthere's\s+nothing\s+in\s+that\s+direction\b/i,
+             /\bblocks?\sthe\sway/i,
+             /\byou\scan\sonly\sgo\s/i,
+             /\byou\scan\sgo\sonly\s/i,
+             /\bimpenetrable\b/i,
+             /\bbars\syour\sway/i,
+             /\bthere's\s.*in\s(?:your|the)\sway/i
+            ]
+  
   # Closed exit replies
   CLOSED_EXIT = [
     /door\s+is\s+closed/i,

data/lib/IFMapper/locales/en/Messages.rb

@@ -14,7 +14,7 @@ EOF
 ERR_NO_FREE_ROOM   = 'Sorry. No free room in map to paste the nodes.'
 ERR_NO_MATCHES     = 'No matches for regex'
 ERR_CANNOT_AUTOMAP = 'Cannot automap.'
-ERR_READ_ONLY_MAP = "Map is in Read Only Mode.  Go to Map Information to change this."
+ERR_READ_ONLY_MAP = "Map is in Read Only Mode.\nGo to Map Information to change this."
 ERR_CANNOT_MOVE_SELECTION = 'Cannot move selection'
 ERR_CANNOT_OPEN_TRANSCRIPT = 'Cannot open transcript'
 ERR_PARSE_TRANSCRIPT = "Internal error parsing transcript\nPlease report as a bug"
@@ -48,7 +48,7 @@ FXRuby Version: #{Fox::fxrubyversion}
 
 A WYSIWYG mapping tool for interactive fiction.
 
-ggarra@advancedsl.com.ar
+ggarra13@gmail.com
 EOF
 
 MSG_SAVE_MAP = 'Save Map'
@@ -260,6 +260,7 @@ MENU_EDIT  = '&Edit'
 MENU_COPY  = "&Copy\tCtl-C\tCopy Location Data"
 MENU_CUT   = "Cu&t\tCtl-X\tCut Location"
 MENU_PASTE = "&Paste\tCtl-V\tPaste Location Data"
+MENU_UNDO  = "&Undo\tCtl-U\tUndo Last Deletion"
 
 MENU_MAP   = '&Map'
 MENU_SELECT = 'Select'
@@ -294,6 +295,9 @@ MENU_ADD_SECTION = "Add Section\t\tAdd a New Section to Map."
 MENU_RENAME_SECTION = "Rename Section\t\tRename Current Section."
 MENU_DELETE_SECTION = "Delete Section\t\tDelete Current Section from Map."
 
+MENU_FLIP_DIRECTION = "Flip Direction of Selection"
+MENU_MOVE_LINK = 'Move link to Exit'
+MENU_SWITCH_WITH_LINK = 'Switch with link'
 
 MENU_ZOOM_PERCENT = '#{v}%\t\tZoom page to #{v}%.'
 MENU_ZOOM = 'Zoom'

data/lib/IFMapper/locales/es/Messages.rb

@@ -18,11 +18,11 @@ EOF
 ERR_NO_FREE_ROOM   = 'Lo siento.  No hay espacio en el mapa para pegar las localidades.'
 ERR_NO_MATCHES     = 'No hay coincidencias para la expresión'
 ERR_CANNOT_AUTOMAP = 'No puedo mapear automáticamente.'
-ERR_READ_ONLY_MAP  = "Mapa está en Modo de Lectura Solamente.  Vaya a Datos del Mapa para cambiar esto."
+ERR_READ_ONLY_MAP  = "Mapa está en Modo de Lectura Solamente.\nVaya a Datos del Mapa para cambiar esto."
 ERR_CANNOT_MOVE_SELECTION = 'No puedo mover la selección hacia el '
 ERR_CANNOT_OPEN_TRANSCRIPT = 'No puedo abrir la transcripción'
 ERR_PARSE_TRANSCRIPT = "Error interno interpretando transcripción\nPor favor repórtelo como un fallo del software"
-ERR_COULD_NOT_OPEN_WEB_BROWSER = 'No pude abrir ningún web browser'
+ERR_COULD_NOT_OPEN_WEB_BROWSER = 'No pude abrir ningúnbweb browser'
 ERR_PATH_FOR_CONNECTION = 'El camino de la conexión'
 ERR_IS_BLOCKED = 'está bloqueado'
 
@@ -52,7 +52,7 @@ Versión de FXRuby: #{Fox::fxrubyversion}
 
 Una herramienta de mapeado para ficción interactiva.
 
-ggarra@advancedsl.com.ar
+ggarra13@gmail.com
 EOF
 
 MSG_SAVE_MAP = 'Grabar Mapa'
@@ -266,6 +266,7 @@ MENU_EDIT  = '&Editar'
 MENU_COPY  = "&Copiar\tCtl-C\tCopiar Localidad"
 MENU_CUT   = "Cor&tar\tCtl-X\tCortar Localidad"
 MENU_PASTE = "&Pegar\tCtl-V\tPegar Localidad"
+MENU_UNDO  = "&Revertir\tCtl-R\tRevertir Ultima Borrada"
 
 MENU_MAP   = '&Mapa'
 MENU_SELECT = 'Seleccionar'
@@ -300,6 +301,9 @@ MENU_ADD_SECTION = "Agregar Sección\t\tAgregar una Nueva Sección al Mapa."
 MENU_RENAME_SECTION = "Renombrar Sección\t\tRenombrar Sección Actual."
 MENU_DELETE_SECTION = "Borrar Sección\t\tBorrar Sección Actual del Mapa."
 
+MENU_FLIP_DIRECTION = "Invertir Dirección Selecionada"
+MENU_MOVE_LINK = 'Mover coneccion a salida'
+MENU_SWITCH_WITH_LINK = 'Intercambiar con conección'
 
 MENU_ZOOM_PERCENT = '#{v}%\t\tAcercamiento de la página al #{v}%.'
 MENU_ZOOM = 'Acercamiento'

metadata

@@ -1,47 +1,71 @@
 --- !ruby/object:Gem::Specification 
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  hash: 25
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
-- Gonzalxo Garramuno
+- Gonzalo Garramuno
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -03:00
+date: 2010-12-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 7
+        - 1
         version: 0.7.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fxruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: pdf-writer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: "\tInteractive Fiction Mapping Tool.\n"
 email: ggarra13@gmail.com
 executables: []
@@ -161,6 +185,7 @@ files:
 - maps/AMFV.map
 - maps/anchor.map
 - maps/Aotearoa.map
+- maps/Asgard.map
 - maps/balances.map
 - maps/ballerina.map
 - maps/bear.map
@@ -170,12 +195,14 @@ files:
 - maps/building.map
 - maps/Bureaucracy.map
 - maps/christminster.map
+- maps/Chronicler.map
 - maps/CityOfSecrets.map
 - maps/DDIV.map
 - maps/deadline.map
 - maps/delusions.map
 - maps/devours.map
 - maps/distress.map
+- maps/Divis_Mortis.map
 - maps/djinni.map
 - maps/dreamhold.map
 - maps/drift3.map
@@ -195,12 +222,12 @@ files:
 - maps/spring.map
 - maps/squarecircle.map
 - maps/Tangle.map
+- maps/The_Blind_House.map
 - maps/The_Lost_Sheep.map
 - maps/trinity.map
 - maps/Unforgotten.map
 - maps/vespers.map
 - maps/Warbler's Nest.map
-- maps/Warbler's_Nest.map
 - maps/wasp.map
 - maps/Westminster_Abbey.map
 - maps/WinterWonderland.map
@@ -292,21 +319,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 55
+      segments: 
+      - 1
+      - 8
+      - 0
       version: 1.8.0
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ifmapper
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Interactive Fiction Mapping Tool.