/**** 
* Plugins
****/ 
var tween = LK.import("@upit/tween.v1");

/**** 
* Classes
****/ 
// Candy block class
var CandyBlock = Container.expand(function () {
	var self = Container.call(this);
	self.type = 0; // 0-5 for different candy types
	self.row = 0;
	self.col = 0;
	self.selected = false;
	// Attach a colored box as the candy (use different colors for types)
	var colors = [0xff6666, 0x66ccff, 0x66ff66, 0xffcc66, 0xcc66ff, 0xffffff];
	self.candyAsset = self.attachAsset('candy_' + self.type, {
		width: 180,
		height: 180,
		color: colors[self.type],
		shape: 'box',
		anchorX: 0.5,
		anchorY: 0.5
	});
	// Set candy type and update color
	self.setType = function (type) {
		self.type = type;
		self.candyAsset.color = colors[type];
	};
	// Select/deselect visual
	self.setSelected = function (selected) {
		self.selected = selected;
		self.candyAsset.alpha = selected ? 0.7 : 1;
	};
	return self;
});
// Match-3 grid class
var CandyGrid = Container.expand(function () {
	var self = Container.call(this);
	self.rows = 9;
	self.cols = 7;
	self.cellSize = 200;
	self.grid = [];
	self.selectedBlock = null;
	self.animating = false;
	// Initialize grid with random candies
	self.initGrid = function () {
		for (var r = 0; r < self.rows; r++) {
			self.grid[r] = [];
			for (var c = 0; c < self.cols; c++) {
				var block = new CandyBlock();
				block.setType(Math.floor(Math.random() * 6));
				block.row = r;
				block.col = c;
				block.x = c * self.cellSize + self.cellSize / 2;
				block.y = r * self.cellSize + self.cellSize / 2;
				self.addChild(block);
				self.grid[r][c] = block;
			}
		}
	};
	// Swap two blocks
	self.swapBlocks = function (blockA, blockB) {
		self.animating = true;
		tween(blockA, {
			x: blockB.x,
			y: blockB.y
		}, {
			duration: 300,
			onFinish: function onFinish() {
				var tempType = blockA.type;
				blockA.setType(blockB.type);
				blockB.setType(tempType);
				self.animating = false;
			}
		});
		tween(blockB, {
			x: blockA.x,
			y: blockA.y
		}, {
			duration: 300
		});
	};
	// Check for matches and return array of matched blocks
	self.findMatches = function () {
		var matches = [];
		// Horizontal
		for (var r = 0; r < self.rows; r++) {
			var count = 1;
			for (var c = 1; c < self.cols; c++) {
				if (self.grid[r][c].type === self.grid[r][c - 1].type) {
					count++;
				} else {
					if (count >= 3) {
						for (var k = 0; k < count; k++) {
							matches.push(self.grid[r][c - 1 - k]);
						}
					}
					count = 1;
				}
			}
			if (count >= 3) {
				for (var k = 0; k < count; k++) {
					matches.push(self.grid[r][self.cols - 1 - k]);
				}
			}
		}
		// Vertical
		for (var c = 0; c < self.cols; c++) {
			var count = 1;
			for (var r = 1; r < self.rows; r++) {
				if (self.grid[r][c].type === self.grid[r - 1][c].type) {
					count++;
				} else {
					if (count >= 3) {
						for (var k = 0; k < count; k++) {
							matches.push(self.grid[r - 1 - k][c]);
						}
					}
					count = 1;
				}
			}
			if (count >= 3) {
				for (var k = 0; k < count; k++) {
					matches.push(self.grid[self.rows - 1 - k][c]);
				}
			}
		}
		// Remove duplicates
		var unique = [];
		for (var i = 0; i < matches.length; i++) {
			if (unique.indexOf(matches[i]) === -1) {
				unique.push(matches[i]);
			}
		}
		return unique;
	};
	// Remove matched blocks and drop above blocks
	self.resolveMatches = function (matches) {
		for (var i = 0; i < matches.length; i++) {
			var block = matches[i];
			// Drop above blocks
			for (var r = block.row; r > 0; r--) {
				tween.to(self.grid[r][block.col], {
					y: self.grid[r][block.col].y + self.cellSize
				}, 300).start();
				self.grid[r][block.col].setType(self.grid[r - 1][block.col].type);
			}
			// New random at top
			var newBlock = self.grid[0][block.col];
			newBlock.y -= self.cellSize;
			newBlock.setType(Math.floor(Math.random() * 6));
			tween.to(newBlock, {
				y: newBlock.y + self.cellSize
			}, 300).start();
		}
		scoreDisplay.updateScore(matches.length * 10); // Add points for each match
	};
	// Handle block selection and swapping
	self.handleDown = function (x, y) {
		if (self.animating) {
			return;
		}
		var col = Math.floor(x / self.cellSize);
		var row = Math.floor(y / self.cellSize);
		if (row < 0 || row >= self.rows || col < 0 || col >= self.cols) {
			return;
		}
		var block = self.grid[row][col];
		if (!self.selectedBlock) {
			self.selectedBlock = block;
			block.setSelected(true);
		} else if (block !== self.selectedBlock && Math.abs(block.row - self.selectedBlock.row) + Math.abs(block.col - self.selectedBlock.col) === 1) {
			// Swap
			self.swapBlocks(self.selectedBlock, block);
			self.selectedBlock.setSelected(false);
			self.selectedBlock = null;
			// Check for matches
			var matches = self.findMatches();
			if (matches.length > 0) {
				self.resolveMatches(matches);
			}
		} else {
			self.selectedBlock.setSelected(false);
			self.selectedBlock = block;
			block.setSelected(true);
		}
	};
	self.initGrid();
	return self;
});
// Score tracking and display
var ScoreDisplay = Container.expand(function () {
	var self = Container.call(this);
	self.score = 0;
	var scoreText = new Text2('Score: 0', {
		size: 100,
		fill: 0xFFFFFF
	});
	scoreText.anchor.set(0.5, 0);
	self.addChild(scoreText);
	self.updateScore = function (points) {
		self.score += points;
		scoreText.setText('Score: ' + self.score);
	};
	return self;
});

/**** 
* Initialize Game
****/ 
// Center the grid
var game = new LK.Game({
	backgroundColor: 0x000000
});

/**** 
* Game Code
****/ 
// Center the grid
var grid = new CandyGrid();
grid.x = (2048 - grid.cols * grid.cellSize) / 2;
grid.y = (2732 - grid.rows * grid.cellSize) / 2;
game.addChild(grid);
var scoreDisplay = new ScoreDisplay();
scoreDisplay.x = 1024; // Center horizontally
scoreDisplay.y = 50; // Position at the top
game.addChild(scoreDisplay);
// Handle touch/click input
game.down = function (x, y, obj) {
	// Convert to grid-local coordinates
	var localX = x - grid.x;
	var localY = y - grid.y;
	grid.handleDown(localX, localY);
};
// Reset the game state
function resetGame() {
	grid.initGrid();
	scoreDisplay.updateScore(-scoreDisplay.score); // Reset score to 0
}
// Call resetGame to initialize the game state
resetGame();

===================================================================
--- original.js
+++ change.js
@@ -66,24 +66,22 @@
 		tween(blockA, {
 			x: blockB.x,
 			y: blockB.y
 		}, {
-			duration: 300
+			duration: 300,
+			onFinish: function onFinish() {
+				var tempType = blockA.type;
+				blockA.setType(blockB.type);
+				blockB.setType(tempType);
+				self.animating = false;
+			}
 		});
 		tween(blockB, {
 			x: blockA.x,
 			y: blockA.y
 		}, {
 			duration: 300
 		});
-		tweenA.onComplete = function () {
-			var tempType = blockA.type;
-			blockA.setType(blockB.type);
-			blockB.setType(tempType);
-			self.animating = false;
-		};
-		tweenA.start();
-		tweenB.start();
 	};
 	// Check for matches and return array of matched blocks
 	self.findMatches = function () {
 		var matches = [];