Chroma - Unless I missed something, you are still allowing illegal swaps (not sending the tiles back to where they started). From experience, I can tell you there is more to that part than you probably think. You might want to work on that before you worry about multiple-match checking and so on, as sending tiles back can have a huge effect on everything, especially if other tiles moved in the interim.
The Match-3 my partner and I wrote was built on my gameboard engine and had a great flag system for tracking everything. You might consider something similar for yours if you are currently using tons of variables to track states. Our code supports all the standard Match-3 stuff plus bonus/special tiles, boards of any shape, disconnected boards (tiles fall across empty space to other parts of the board or are forced to follow set paths, depending on board design) and several other features, including a couple I've never seen elsewhere. You'll need a lot of flexibility in your engine to make it competitive with the current Match-3 games.
Good luck, I'm still interested in the final product.
SpaceAce
The Match-3 my partner and I wrote was built on my gameboard engine and had a great flag system for tracking everything. You might consider something similar for yours if you are currently using tons of variables to track states. Our code supports all the standard Match-3 stuff plus bonus/special tiles, boards of any shape, disconnected boards (tiles fall across empty space to other parts of the board or are forced to follow set paths, depending on board design) and several other features, including a couple I've never seen elsewhere. You'll need a lot of flexibility in your engine to make it competitive with the current Match-3 games.
Good luck, I'm still interested in the final product.
SpaceAce