ifmapper 0.9.9 → 1.0.0

data/lib/IFMapper/FXRoomDialogBox.rb

@@ -8,6 +8,7 @@ class FXRoomDialogBox < FXDialogBox
   attr_writer :map
 
   def copy_to()
+
     @room.name    = @name.text
     @room.objects = @objects.text
     @room.objects.gsub!(/[,\t]+/, "\n")
@@ -30,7 +31,7 @@ class FXRoomDialogBox < FXDialogBox
 
     # Select text for quick editing if it uses default location name
     @name.setCursorPos room.name.size 
-    if room.name == 'New Location'
+    if room.name == MSG_NEW_LOCATION
       self.setFocus
       @name.selectAll
       @name.setFocus
@@ -85,14 +86,14 @@ class FXRoomDialogBox < FXDialogBox
       decor = DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE
     end
 
-    super( map.window, "Room Information", decor, pos[0], pos[1], 0, 0 )
+    super( map.window, BOX_ROOM_INFORMATION, decor, pos[0], pos[1], 0, 0 )
     mainFrame = FXVerticalFrame.new(self,
 				    FRAME_SUNKEN|FRAME_THICK|
 				    LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
     frame = FXHorizontalFrame.new(mainFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
 
-    FXLabel.new(frame, "Location: ", nil, 0, LAYOUT_FILL_X)
+    FXLabel.new(frame, BOX_LOCATION, nil, 0, LAYOUT_FILL_X)
     @name = FXTextField.new(frame, 40, nil, 0, LAYOUT_FILL_ROW)
 
 
@@ -104,8 +105,8 @@ class FXRoomDialogBox < FXDialogBox
 				    LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
     frame2 = FXHorizontalFrame.new(leftFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
-    FXLabel.new(frame2, "Objects: ", nil, 0, LAYOUT_FILL_X)
-    @darkness = FXCheckButton.new(frame2, "Darkness", nil, 0,
+    FXLabel.new(frame2, BOX_OBJECTS, nil, 0, LAYOUT_FILL_X)
+    @darkness = FXCheckButton.new(frame2, BOX_DARKNESS, nil, 0,
 				  ICON_BEFORE_TEXT|LAYOUT_CENTER_X|
 				  LAYOUT_SIDE_RIGHT)
 
@@ -115,7 +116,7 @@ class FXRoomDialogBox < FXDialogBox
 
     @tasksFrame = FXVerticalFrame.new(leftFrame, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|
 				     LAYOUT_FILL_Y)
-    FXLabel.new(@tasksFrame, "Tasks: ", nil, 0, LAYOUT_FILL_X)
+    FXLabel.new(@tasksFrame, BOX_TASKS, nil, 0, LAYOUT_FILL_X)
     @tasks = FXText.new(@tasksFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @tasks.visibleRows = 8
     @tasks.visibleColumns = 40
@@ -123,7 +124,7 @@ class FXRoomDialogBox < FXDialogBox
     ######## Add description
     @descFrame = FXVerticalFrame.new(all, LAYOUT_SIDE_TOP|LAYOUT_FILL_X|
 				LAYOUT_SIDE_RIGHT|LAYOUT_FILL_Y)
-    FXLabel.new(@descFrame, "Description: ", nil, 0, LAYOUT_FILL_X)
+    FXLabel.new(@descFrame, BOX_DESCRIPTION, nil, 0, LAYOUT_FILL_X)
     @desc = FXText.new(@descFrame, nil, 0, 
 		       LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
     @desc.visibleColumns = 70
@@ -134,11 +135,13 @@ class FXRoomDialogBox < FXDialogBox
 				      LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|
 				      PACK_UNIFORM_WIDTH)
       # Accept
-      @ok = FXButton.new(buttons, "&Accept", nil, self, FXDialogBox::ID_ACCEPT,
+      @ok = FXButton.new(buttons, BUTTON_ACCEPT, nil, self, 
+			 FXDialogBox::ID_ACCEPT,
 			 FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
       
       # Cancel
-      cmd = FXButton.new(buttons, "&Cancel", nil, self, FXDialogBox::ID_CANCEL,
+      cmd = FXButton.new(buttons, BUTTON_CANCEL, nil, self, 
+			 FXDialogBox::ID_CANCEL,
 			 FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
     else
       @name.connect(SEL_CHANGED) { copy_to() }

data/lib/IFMapper/FXRoomList.rb

@@ -66,13 +66,13 @@ class FXRoomList < FXDialogBox
   end
 
   def initialize(map)
-    super(map.window.parent, "Locations", DECOR_ALL, 40, 40, 300, 400)
+    super(map.window.parent, BOX_LOCATIONS, DECOR_ALL, 40, 40, 300, 400)
   
     @box = FXIconList.new(self, nil, 0, 
 			   ICONLIST_BROWSESELECT|
 			   LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    @box.appendHeader("Section", nil, 60)
-    @box.appendHeader("Name", nil, 200)
+    @box.appendHeader(BOX_SECTION, nil, 60)
+    @box.appendHeader(BOX_NAME, nil, 200)
     @box.header.connect(SEL_COMMAND) { |sender, sel, which|
       if @box.header.arrowUp?(which)
 	dir = MAYBE

data/lib/IFMapper/FXSection.rb

@@ -19,7 +19,7 @@ class FXSection < Section
   end
 
   def new_room(x, y)
-    r = FXRoom.new( x, y, 'New Location' )
+    r = FXRoom.new( x, y, MSG_NEW_LOCATION )
     return _new_room(r, x, y)
   end
 

data/lib/IFMapper/Inform7Writer.rb

@@ -23,7 +23,7 @@ class Inform7Writer
   ]
 
   IGNORE_WORDS = [
-    'a', 'the', 'and', 'of', 'your', 'to'
+    'a', 'the', 'and', 'of', 'your', 'to', 'out', 'in'
   ]
 
   IGNORED_ARTICLES = /^(?:#{IGNORE_WORDS.join('|')})$/
@@ -36,8 +36,14 @@ class Inform7Writer
     'with',
     'is',
     'in',
-    'inside',
-  ]
+    'container',
+    'to',
+    'and',
+    'side',
+    '\s*,\s*',
+    '\s*\(\s*',
+  ] + DIRECTIONS + OTHERDIRS[1..-1]
+
   INVALID_KEYWORD = /\b(?:#{KEYWORDS.join('|')})\b/i
 
 
@@ -89,15 +95,27 @@ class Inform7Writer
 
   IS_ANIMAL = /\b(?:#{ANIMALS.join('|')})\b/i
 
-  PEOPLE = [
-    'child',
+  MALE_PEOPLE = [
+    'boy',
+    'man',
+    'sir',
+  ]
+  IS_MALE_PERSON = /\b(?:#{MALE_PEOPLE.join('|')})\b/i
+
+  FEMALE_PEOPLE = [
     'girl',
     'woman',
     'lady',
-    'boy',
-    'man',
+    'actress',
+  ]
+  IS_FEMALE_PERSON = /\b(?:#{FEMALE_PEOPLE.join('|')})\b/i
+
+  PEOPLE = MALE_PEOPLE + FEMALE_PEOPLE + [
+    'child',
     'attendant',
     'doctor',
+    'actor',
+    'character',
     'engineer',
     'bum',
     'nerd',
@@ -117,14 +135,26 @@ class Inform7Writer
     'can',
     'chest',
     'wardrobe',
+    'jacket',
+    'suit',
     'trophy case',
     'coffin',
     'briefcase',
     'suitcase',
     'bag',
+    'flask',
   ]
   IS_CONTAINER = /\b(?:#{CONTAINERS.join('|')})\b/i
 
+  #
+  # Some common lit types
+  #
+  UNLIT_TYPES = [
+    'lantern',
+    'torch',
+  ]
+  IS_LIGHT = /\b(?:#{UNLIT_TYPES.join('|')})\b/i
+
   #
   # Some common wearable types
   #
@@ -137,6 +167,8 @@ class Inform7Writer
     'gown',
     'backpack',
     'shirt',
+    'jacket',
+    'suit',
     'ring',
     'bracelet',
     'amulet',
@@ -178,6 +210,10 @@ class Inform7Writer
   def new_tag(elem, str)
     tag = str.dup
 
+    # Take text from Unicode utf-8 to iso-8859-1
+    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+    tag = utf.iconv( tag )
+
     # Remove redundant spaces
     tag.sub!(/^\s/, '')
     tag.sub!(/\s$/, '')
@@ -188,8 +224,6 @@ class Inform7Writer
 
     tag.gsub!(/__/, '_')
 
-    tag.upcase!  # All tags are uppercase
-
     # tag cannot be repeated and cannot be keyword (Doorway, Room, etc)
     # In those cases, we add a number to the tag name.
     idx = 0
@@ -217,9 +251,26 @@ class Inform7Writer
     return tag
   end
 
-  def get_tag(elem, name = elem.name)
+  def get_tag(elem, name)
     return @tags[elem] if @tags[elem]
-    return new_tag(elem, name)
+    tag = name
+    if tag =~ INVALID_KEYWORD or @tags.values.include?(tag)
+      return new_tag(elem, name)
+    else
+      @tags[elem] = tag
+    end
+    return tag
+  end
+
+  def get_room_tag(elem)
+    return @tags[elem] if @tags[elem]
+    tag = elem.name
+    if tag =~ INVALID_KEYWORD or @tags.values.include?(tag)
+      tag = new_tag(elem, elem.name)
+    else
+      @tags[elem] = tag
+    end
+    return tag
   end
 
   def get_door_name(e)
@@ -230,18 +281,24 @@ class Inform7Writer
   end
 
   def get_door_tag(e)
-    get_tag(e, get_door_name(e))
+    name = get_door_name(e)
+    name.upcase
+    get_tag(e, name)
   end
 
   def wrap_text(text, width = 75, indent = 78 - width)
-    return 'UNDER CONSTRUCTION' if not text or text == ''
-    str = inform_quote( text.dup )
+    return 'UNDER CONSTRUCTION.' if not text or text == ''
+    str = inform_quote( text )
 
     if str.size > width
       r   = ''
       while str
-	idx = str.rindex(/[ -]/, width)
-	idx = str.size unless idx
+	if str.size >= width
+	  idx = str.rindex(/[ -]/, width)
+	  idx = str.size unless idx
+	else
+	  idx = str.size
+	end
 	r << str[0..idx]
 	str = str[idx+1..-1]
 	r << "\n" << ' ' * indent if str
@@ -258,6 +315,11 @@ class Inform7Writer
   #
   def inform_quote(text)
     str = text.dup
+
+    # Take text from Unicode utf-8 to iso-8859-1
+    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+    str = utf.iconv( str )
+
     # Quote special characters
 #     str.gsub!(/@/, '@@64')
     str.gsub!(/"/, '\'')
@@ -269,11 +331,11 @@ class Inform7Writer
 
 
   def objects(r)
-    room = get_tag(r)
+    room = get_room_tag(r)
     objs = r.objects.split("\n")
     objs.each { |o|
 
-      tag = new_tag(o, o)
+      tag = get_tag(o, o)
 
       names = o.dup
       names.gsub!(/"/, '')      # remove any quotes
@@ -285,7 +347,7 @@ class Inform7Writer
       article = 'a '
       if name =~ /ves$/ or name =~ /s$/
 	article = 'some '
-      elsif name[0,1] == 'a'
+      elsif name =~ /^[aeiou]/
 	article = 'an '
       end
 
@@ -295,7 +357,15 @@ class Inform7Writer
 
       if name =~ IS_ANIMAL
 	type = 'an animal'
-      elsif name =~ IS_PERSON or name =~ /[A-Z]/
+      elsif name =~ IS_PERSON
+	article = 'a '
+	type = 'a person'
+	if name =~ IS_MALE_PERSON
+	  type = 'a male person'
+	elsif name =~ IS_FEMALE_PERSON
+	  type = 'a female person'
+	end
+      elsif name =~ /[A-Z]/
 	if name !~ /'/  # possesive, like Michael's wallet
 	  # if too many words, probably a book's title
 	  if names.size <= 3
@@ -314,6 +384,12 @@ class Inform7Writer
 
       if tag != name
 	props << "\n   The printed name of #{tag} is \"#{article}#{name}\"."
+      else
+	tag = article + tag
+      end
+
+      if name =~ IS_LIGHT
+	props << "\n   It is not lit."
       end
 
       if name =~ IS_CONTAINER
@@ -349,10 +425,10 @@ EOF
   end
 
   def door(e)
-    name = get_door_name(e)
-    tag = get_tag(e, name)
-    roomA = get_tag(e.roomA)
-    roomB = get_tag(e.roomB)
+    name  = get_door_name(e)
+    tag   = get_tag(e, name)
+    roomA = get_room_tag(e.roomA)
+    roomB = get_room_tag(e.roomB)
     dirA  = e.roomA.exits.index(e)
     dirB  = e.roomB.exits.rindex(e)
     dirA  = DIRECTIONS[dirA].downcase
@@ -378,6 +454,7 @@ EOF
 
 The #{tag} is a door. #{props}  
 The printed name of #{tag} is "a #{name}".
+Understand "#{name}" as #{tag}.
 Understand "door" as #{tag}.
 #{found_in}.
 EOF
@@ -386,7 +463,7 @@ EOF
 
 
   def room(r)
-     tag = get_tag(r)
+     tag = get_room_tag(r)
     name = r.name
 
     prop = ''
@@ -426,7 +503,7 @@ EOF
 	  e.type == Connection::LOCKED_DOOR
 	@f.print get_door_tag(e)
       else
-	@f.print get_tag(b)
+	@f.print get_room_tag(b)
       end
       @f.puts  '.'
     }

data/lib/IFMapper/InformWriter.rb

@@ -1,5 +1,6 @@
 
 
+
 class InformWriter
 
 
@@ -34,6 +35,8 @@ class InformWriter
 
   def new_tag(elem, str)
     tag = str.dup
+    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+    tag = utf.iconv( tag )
 
     # Invalid tag characters, replaced with _
     tag.gsub!(/[\s"'\/\\\-#\,.:;!\?\n\(\)]/,'_')
@@ -75,13 +78,17 @@ class InformWriter
 
   def wrap_text(text, width = 65, indent = 79 - width)
     return 'UNDER CONSTRUCTION' unless text
-    str = inform_quote( text.dup )
+    str = inform_quote( text )
 
     if text.size > width
       r   = ''
       while str
-	idx = str.rindex(/[ -]/, width)
-	idx = str.size unless idx
+	if str.size >= width
+	  idx = str.rindex(/[ -]/, width)
+	  idx = str.size unless idx
+	else
+	  idx = str.size
+	end
 	r << str[0..idx]
 	str = str[idx+1..-1]
 	r << "\n" << ' ' * indent if str
@@ -98,6 +105,11 @@ class InformWriter
   #
   def inform_quote(text)
     str = text.dup
+
+    # Take text from Unicode utf-8 to iso-8859-1
+    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+    str = utf.iconv( str )
+
     # Quote special characters
     str.gsub!(/@/, '@@64')
     str.gsub!(/"/, '@@34')

data/lib/IFMapper/Room.rb

@@ -11,17 +11,6 @@ class Room
   attr_accessor  :x, :y     # Room location in grid
   attr_accessor  :desc      # Room description
 
-  DIRECTIONS = [
-    'n',
-    'ne',
-    'e',
-    'se',
-    's',
-    'sw',
-    'w',
-    'nw',
-  ]
-
   DIR_TO_VECTOR = { 
     0 => [  0, -1 ],
     1 => [  1, -1 ],

data/lib/IFMapper/TADSWriter.rb

@@ -37,6 +37,10 @@ class TADSWriter
   def new_tag(elem, str)
     tag = str.dup
 
+    # Take text from Unicode utf-8 to iso-8859-1
+    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+    tag = utf.iconv( tag )
+
     # Invalid tag characters, replaced with _
     tag.gsub!(/[\s"'\/\\\-#\,.:;!\?\n\(\)]/,'_')
  
@@ -87,8 +91,12 @@ class TADSWriter
     if text.size > width
       r   = ''
       while str
-	idx = str.rindex(/[ -]/, width)
-	idx = str.size unless idx
+	if str.size >= width
+	  idx = str.rindex(/[ -]/, width)
+	  idx = str.size unless idx
+	else
+	  idx = str.size
+	end
 	r << str[0..idx]
 	str = str[idx+1..-1]
 	r << "\n" << ' ' * indent if str
@@ -105,6 +113,11 @@ class TADSWriter
   #
   def self.quote(text)
     str = text.dup
+
+    # Take text from Unicode utf-8 to iso-8859-1
+    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+    str = utf.iconv( str )
+
     # Quote special characters
     str.gsub!(/"/, '\"')
     str.gsub!(/'/, "\\\\'")