From: Jason Woofenden Date: Sun, 13 Oct 2013 01:46:33 +0000 (-0400) Subject: Merge branch 'sbd' X-Git-Url: https://jasonwoof.com/gitweb/?p=hexbog.git;a=commitdiff_plain;h=3c38faf760ae82a88c1cd5adaa7eb1315a92fba8;hp=68b1483d4de09c4ea881b94a712f12171661d951 Merge branch 'sbd' --- diff --git a/Makefile b/Makefile index 9807ae8..962d6ff 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,8 @@ wordlist_min.js: wordlist_compressed.js main.js style.css: style.less lessc style.less style.css -index.html: main_min.js wordlist_min.js main.html style.css - bash combine.bash main.html > $@ || (rm -f $@; exit 1) +index.html: main_min.js wordlist_min.js template.html style.css + bash combine.bash template.html > $@ || (rm -f $@; exit 1) index.html.gz: index.html gzip --best -c $< > $@ diff --git a/main.coffee b/main.coffee index b444f1a..7403503 100644 --- a/main.coffee +++ b/main.coffee @@ -237,12 +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 @@ 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 @@ activate_selection = -> # 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 @@ $board = null 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') @@ -528,7 +549,7 @@ extract_wiktionary_definiton = (html) -> 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 @@ init_game = -> init_board() init_html_board() init_start_over_link() + update_selection_display() $(init_game) diff --git a/main.html b/main.html deleted file mode 100644 index d5668fc..0000000 --- a/main.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - HexBog – a simple word game - - - - - - - -
-
-
- -
Loading...
-
-
-