Skip to content

Added invalid swap feature #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mizanxali wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added invalid swap feature #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0586e37
Added a feature
mizanxali Jun 21, 2020
92a4769
Added invalid swap feature
mizanxali Jun 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,19 @@ function dragEnd() {
let validMove = validMoves.includes(squareIdBeingReplaced)

if (squareIdBeingReplaced && validMove) {
squareIdBeingReplaced = null
let scoredRowOfFour = checkRowForFour();
let scoredColumnOfFour = checkColumnForFour();
let scoredRowOfThree = checkRowForThree();
let scoredColumnOfThree = checkColumnForThree();
//check if any combo was scored
if(scoredRowOfFour || scoredColumnOfFour || scoredRowOfThree || scoredColumnOfThree){
squareIdBeingReplaced = null;
}
//if no combo scored swap back to original candies
else if(!scoredRowOfFour && !scoredColumnOfFour && !scoredRowOfThree && !scoredColumnOfThree){
squares[squareIdBeingDragged].style.backgroundImage = colorBeingDragged;
squares[squareIdBeingReplaced].style.backgroundImage = colorBeingReplaced;
}
} else if (squareIdBeingReplaced && !validMove) {
squares[squareIdBeingReplaced].style.backgroundImage = colorBeingReplaced
squares[squareIdBeingDragged].style.backgroundImage = colorBeingDragged
Expand Down Expand Up @@ -115,10 +127,12 @@ function moveIntoSquareBelow() {
rowOfFour.forEach(index => {
squares[index].style.backgroundImage = ''
})
return true;
}
}
return false;
}
checkRowForFour()


//for column of Four
function checkColumnForFour() {
Expand All @@ -133,10 +147,12 @@ function moveIntoSquareBelow() {
columnOfFour.forEach(index => {
squares[index].style.backgroundImage = ''
})
return true;
}
}
return false;
}
checkColumnForFour()


//for row of Three
function checkRowForThree() {
Expand All @@ -154,10 +170,12 @@ checkColumnForFour()
rowOfThree.forEach(index => {
squares[index].style.backgroundImage = ''
})
return true;
}
}
return false;
}
checkRowForThree()


//for column of Three
function checkColumnForThree() {
Expand All @@ -172,10 +190,11 @@ checkColumnForFour()
columnOfThree.forEach(index => {
squares[index].style.backgroundImage = ''
})
return true;
}
}
return false;
}
checkColumnForThree()

// Checks carried out indefintely - Add Butotn to clear interval for best practise
window.setInterval(function(){
Expand Down