Merge branch 'sbd'

diff --combined main.coffee
index b444f1a,9db18fe..7403503
--- 1/main.coffee
--- 2/main.coffee
+++ b/main.coffee
@@@ -237,12 -237,30 +237,30 @@@ init_board = -
        # (neighbors, above, down)
        init_board_layout()
  
- $selection_display = null # initialized by init_html_board
+ $big_tip = null # initialized by init_html_board
+ $little_tip = null # initialized by init_html_board
  $score_display = null # initialized by init_html_board
  $definition_body = null # initialized by init_html_board
  update_selection_display = ->
        word = selected_word()
-       $selection_display.html word
+       $big_tip.removeClass('good')
+       if word.length > 0
+               $big_tip.html word
+               if word.length < 3
+                       $little_tip.html "Click more tiles (3 minimum)"
+               else
+                       if is_word word
+                               if word.indexOf(word.substr(word.length - 1)) < word.length - 1
+                                       last = 'last '
+                               else
+                                       last = ''
+                               $little_tip.html "Click the #{last}\"#{word.substr(word.length - 1)}\" for #{score_for word} points"
+                               $big_tip.addClass('good')
+                       else
+                               $little_tip.html "\"#{word}\" is not in the word list."
+       else
+               $big_tip.html "← Click a word"
+               $little_tip.html "(tiles must be touching)"
  
        # color the selected tiles according to whether they're a word or not
        if word.length
@@@ -338,6 -356,8 +356,8 @@@ blip_selection = -
                                sliders[i] = false
                save_game()
  
+ score_for = (word) -> Math.round(Math.pow(1.7, word.length))
+ 
  activate_selection = ->
        word = selected_word()
        if word.length < 3
@@@ -348,7 -368,7 +368,7 @@@
                # FIXME make this automatically part of the selection display
                log "Not on word list: \"#{word}\""
                return
-       word_score = Math.round(Math.pow(1.7, word.length))
+       word_score = score_for word
        score += word_score
        $score_display.html score
        # FIXME make some kind of animation showing score gain
@@@ -416,7 -436,8 +436,8 @@@ $board = nul
  html_tiles = []
  init_html_board = ->
        $('#loading').remove()
-       $selection_display = $('#selection')
+       $big_tip = $('#big_tip')
+       $little_tip = $('#little_tip')
        $score_display = $('#score')
        $score_display.html score
        $definition_body = $('#definition_body')
@@@ -505,7 -526,7 +526,7 @@@ extract_wiktionary_definiton = (html) -
                if part and el.tagName is 'OL'
                        $(el).children().each (i, el) ->
                                new_def = $(el).text()
 -                              if new_def.substr(0, 9) is '(obsolete' or new_def.substr(0, 8) is "(archaic"
 +                              if new_def.substr(0, 9) is '(obsolete' or new_def.substr(0, 8) is "(archaic" or new_def.substr(0, 20) is "Alternative form of "
                                        key = 'obsolete'
                                else
                                        if part is 'verb'
@@@ -528,7 -549,7 +549,7 @@@
  
  
  look_up_definition = (word) ->
-       $definition_body.html "Looking up definition for \"#{word}\"."
+       $definition_body.html "Looking up definition for \"#{word}\"..."
        $.ajax({
                url: "http://en.wiktionary.org/w/api.php?action=parse&format=json&page=#{word}"
                jsonpCallback: "lud_#{word}" # always use the same callback for the same word so it's cacheable
@@@ -608,5 -629,6 +629,6 @@@ init_game = -
        init_board()
        init_html_board()
        init_start_over_link()
+       update_selection_display()
  
  $(init_game)