X-Git-Url: https://jasonwoof.com/gitweb/?p=hexbog.git;a=blobdiff_plain;f=main.coffee;h=a4bd4162079a66d0c706ab1cffebcc02e7b23586;hp=99d2e432e8fd783422801bcf3ccdc02f474c5fda;hb=5c9ec279c15c135b7e84501a5b2426e8f06fde60;hpb=c5ea138fb8cfce9977ce486c9fbceedebe8af2c4

diff --git a/main.coffee b/main.coffee
index 99d2e43..a4bd416 100644
--- a/main.coffee
+++ b/main.coffee
@@ -90,35 +90,36 @@ selected = []
 
 letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 letter_distribution = [
-	 9 # A
-	 2 # B
-	 2 # C
-	 4 # D
-	14 # E
-	 2 # F
-	 3 # G
-	 2 # H
-	 7 # I
-	 1 # J
-	 1 # K
-	 4 # L
-	 2 # M
-	 6 # N
-	 8 # O
-	 2 # P
-	 1 # Q
-	 6 # R
-	 7 # S
-	 6 # T
-	 2 # U
-	 2 # V
-	 2 # W
-	 1 # X
-	 2 # Y
-	 1 # Z
+	14355 # a
+	 3968 # b
+	 6325 # c
+	 7045 # d
+	20258 # e
+	 2739 # f
+	 5047 # g
+	 4372 # h
+	13053 # i
+	  516 # j
+	 2600 # k
+	 9631 # l
+	 5115 # m
+	10082 # n
+	11142 # o
+	 5292 # p
+	  287 # qu
+	12341 # r
+	16571 # s
+	10215 # t
+	 6131 # u
+	 1728 # v
+	 2184 # w
+	  619 # x
+	 3512 # y
+	  831 # z
+
 ]
 
-letter_distribution_total = letter_distribution.sum()
+letter_distribution_total = 175973 # letter_distribution.sum()
 
 
 new_letter_queue = []
@@ -242,12 +243,7 @@ init_board = ->
 
 $selection_display = null # initialized by init_html_board
 $score_display = null # initialized by init_html_board
-$definition_word = null # initialized by init_html_board
-$definition_link = null # initialized by init_html_board
-$definition_type = null # initialized by init_html_board
-$definition_language = null # initialized by init_html_board
-$definition_text = null # initialized by init_html_board
-$definition_credit = null # initialized by init_html_board
+$definition_body = null # initialized by init_html_board
 update_selection_display = ->
 	word = selected_word()
 	$selection_display.html word
@@ -355,19 +351,15 @@ activate_selection = ->
 	look_up_definition word
 
 
-definition_credited = false
 show_definition = (word, type, definition, language) ->
-	if language is 'English'
-		$definition_language.html ''
-	else
-		$definition_language.html " (#{language})"
-	$definition_type.html type
-	$definition_link.attr 'href', "http://en.wiktionary.org/wiki/#{word}"
-	$definition_word.html word.substr(0, 1).toUpperCase() + word.substr(1)
-	$definition_text.html definition
-	unless definition_credited
-		definition_credited = true
-		$definition_credit.html "Definitions &copy; <a href=\"http://en.wiktionary.org/\" target=\"_blank\">wiktionary.org</a> CC-BY-SA"
+	html = "<a href=\"http://en.wiktionary.org/wiki/#{word}\" target=\"_blank\">"
+	html += "#{word.substr(0, 1).toUpperCase() + word.substr(1)}</a>, #{type}"
+	if language isnt 'English'
+		html += " (#{language})"
+	html += ': '
+	html += definition
+	html += '<div id="definition_credit">Definition &copy;<a href="http://en.wiktionary.org/" target="_blank">wiktionary.org</a> CC-BY-SA</div>'
+	$definition_body.html html
 
 
 select_tile = (num) ->
@@ -420,12 +412,7 @@ init_html_board = ->
 	$selection_display = $('#selection')
 	$score_display = $('#score')
 	$score_display.html score
-	$definition_word = $('#definition_word')
-	$definition_type = $('#definition_type')
-	$definition_language = $('#definition_language')
-	$definition_link = $('#definition_link')
-	$definition_text = $('#definition_text')
-	$definition_credit = $('#definition_credit')
+	$definition_body = $('#definition_body')
 	$board = $('#board')
 	# make html for board
 	tile_number = 0
@@ -575,6 +562,19 @@ init_start_over_link = ->
 		if confirm "Are you sure you want to start over? There is no undo."
 			start_over()
 
+cur_tab = 'instructions'
+tabtab_height = 20
+tab_height = 150
+init_tab = (t) ->
+	$('#' + t).click ->
+		return if t is cur_tab
+		$('#' + cur_tab).removeClass('selected-tab').addClass('tab').animate({height: tabtab_height}, 1000)
+		$('#' + t).removeClass('tab').addClass('selected-tab').animate({height: tab_height}, 1000)
+		cur_tab = t
+init_tabs = ->
+	for t in ['instructions', 'definition', 'logtab', 'restart']
+		init_tab t
+
 $log = undefined
 init_log = ->
 	$log = $('#log')
@@ -584,6 +584,9 @@ log = (msg) ->
 
 init_game = ->
 	init_log()
+	if $(window).height() >= 440
+		$('#centerer').css('margin-top', '25px')
+	init_tabs()
 	init_board()
 	init_html_board()
 	init_start_over_link()