X-Git-Url: https://jasonwoof.com/gitweb/?p=hexbog.git;a=blobdiff_plain;f=main.coffee;h=04670557f2d7211008a21202d1ba4204e240f6bd;hp=be5a85f4b05496ce5d8206c75da8f184deb9085b;hb=0b70e4b47604d7a6ee1f851c31bb5ce2f6410044;hpb=ee2ec8d8939f363a4395fce3d2d9988e493f9cc7

diff --git a/main.coffee b/main.coffee
index be5a85f..0467055 100644
--- a/main.coffee
+++ b/main.coffee
@@ -85,7 +85,6 @@ board_left_px = [] # array of pixel coordinates for left of column
 board_aboves = [] # array of tile numbers above, starting from top
 board_below = [] # tile number of next tile below or false
 
-slides = []
 selected = []
 
 letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -234,9 +233,6 @@ init_board = ->
 		new_letter_queue = (encoded.substr 0, board_tiles).split ''
 		score = parseInt(encoded.substr(board_tiles), 10)
 
-	# how far each tile needs to be slid down
-	slides = (0 for i in board)
-
 	# work out which grid spaces are connected
 	# (neighbors, above, down)
 	init_board_layout()
@@ -285,9 +281,6 @@ selected_word = ->
 	word += board[i] for i in selected
 	return word.toLowerCase()
 
-html_slide = (num) ->
-	html_tiles[num].animate {top: "#{tile_top_px[num]}px"}, slide_ms
-
 save_game = ->
 	encoded = ''
 	for t in board
@@ -296,42 +289,54 @@ save_game = ->
 	set_cookie 'hexbog', encoded, 365
 	window.location.hash = encoded
 
+# remove the selected tiles from the board, create new tiles, and slide everything into place
 blip_selection = ->
-	faders = selected.clone().num_sort()
+	faders = selected.num_sort()
 	selected = []
-	for num in faders
-		html_tiles[num].unbind('click').fadeOut fade_ms
-	timeout fade_ms, ->
-		top_tile = -1
-		new_px = 0
-		new_slide = 0
-		for fader in faders
-			cur_top = board_aboves[fader][0]
-			if cur_top is undefined
-				cur_top = fader
-			if top_tile isnt cur_top
-				new_px = -20 - tile_width
-				new_slide = 1
-				top_tile = cur_top
-			html_tiles[fader].remove()
-			dest = fader
-			aboves = board_aboves[fader].clone().reverse()
+	update_selection_display()
+	for i in faders
+		html_tiles[i].unbind('click').fadeOut fade_ms
+	timeout fade_ms + 1, ->
+		# which tiles need to be slid down
+		sliders = (false for i in board)
+
+		prev_col_top = null
+		next_new_y = null
+		for deleted in faders
+			# find the tile number of the top tile in this column
+			if board_aboves[deleted].length is 0
+				col_top = deleted
+			else
+				col_top = board_aboves[deleted][0]
+
+			# reset location where new tiles appear when we change columns
+			if prev_col_top isnt col_top
+				next_new_y = -10 - tile_width
+				prev_col_top = col_top
+
+			html_tiles[deleted].remove()
+
+			# For each each tile above the one we've deleted:
+			# 1. move it down one slot in the data scructures
+			# 2. mark it as needing to slide
+			dest = deleted
+			aboves = board_aboves[deleted].clone().reverse()
 			for above in aboves
 				html_tiles[dest] = html_tiles[above]
 				html_tiles[dest].data 'tile_number', dest
 				board[dest] = board[above]
-				slides[dest] = slides[above] + 1
+				sliders[dest] = true
 				--dest
-			new_tile top_tile, board_left_px[top_tile], new_px
-			slides[top_tile] = new_slide
-			new_px -= tile_width
-			new_px -= 50
-			new_slide += 1
-		for i in [0 .. board.length - 1]
-			if slides[i]
-				html_slide i
+			sliders[col_top] = true # the new tile needs to be slid down too
+
+			new_tile col_top, board_left_px[col_top], next_new_y
+			next_new_y -= tile_width + 50
+
+		for slide, i in sliders
+			if slide
+				html_tiles[i].animate {top: "#{tile_top_px[i]}px"}, slide_ms
+				sliders[i] = false
 		save_game()
-	update_selection_display()
 
 activate_selection = ->
 	word = selected_word()
@@ -479,6 +484,8 @@ extract_wiktionary_definiton = (html) ->
 
 	valid_parts = ["Abbreviation", "Adjective", "Adverb", "Article", "Cardinal number", "Conjunction", "Determiner", "Interjection", "Noun", "Numeral", "Particle", "Preposition", "Pronoun", "Verb"]
 
+	edit_link_regex = new RegExp(' ?\\[edit\\] ?')
+
 	elements.each (i, el) ->
 		#which tag: el.tagName
 		if el.tagName is 'H2'
@@ -487,12 +494,12 @@ extract_wiktionary_definiton = (html) ->
 			if found
 				return false # break
 			part = false # mark us not being in a definition section unless the next section finds a part of speach header
-			language = $(el).text().substr 7
+			language = $(el).text().replace(edit_link_regex, '')
 		if language and el.tagName is 'H3' or el.tagName is 'H4' # eg yak def uses one for english and one for dutch
 			part = false
-			text = $(el).text()
+			text = $(el).text().replace(edit_link_regex, '')
 			for p in valid_parts
-				if text is "[edit] #{p}"
+				if text is "#{p}"
 					part = p.toLowerCase()
 					# FIXME break
 		if part and el.tagName is 'OL'
@@ -532,6 +539,8 @@ look_up_definition = (word) ->
 				tdl = extract_wiktionary_definiton data.parse.text['*']
 				if tdl
 					show_definition word, tdl[0], tdl[1], tdl[2]
+				else
+					$definition_body.html "Oops, could't find a definition for \"#{word}\"."
 			else
 				$definition_body.html "Sorry, couldn't find a definition for \"#{word}\"."
 	})