diff --git a/index.html b/index.html
index c7b1312..6d367ce 100644
--- a/index.html
+++ b/index.html
@@ -80,7 +80,7 @@
Congratulations!
diff --git a/js/level-complete-controller.js b/js/level-complete-controller.js
index c49ff50..1525660 100644
--- a/js/level-complete-controller.js
+++ b/js/level-complete-controller.js
@@ -9,6 +9,7 @@ angular.module('level-complete', [])
$scope.completeLevel = function(event, args) {
$scope.isLevelCompleteVisible = true;
+ $scope.isFinalScreenVisible = args.isFinalLevel;
$scope.levelIndex = args.levelIndex;
};
diff --git a/js/level-data-service.js b/js/level-data-service.js
index 48ef596..95bd9fd 100644
--- a/js/level-data-service.js
+++ b/js/level-data-service.js
@@ -201,3 +201,16 @@ var alphabetCards = {
'morse': '--..'
}
};
+
+
+var finaleCards = {
+ 'outro': {
+ '1':'P',
+ '2':'F',
+ '3':' ',
+ '4':'2',
+ '5':'0',
+ '6':'1',
+ '7':'5'
+ }
+};
\ No newline at end of file
diff --git a/js/pexeso-controller.js b/js/pexeso-controller.js
index dfa2365..b1e9513 100644
--- a/js/pexeso-controller.js
+++ b/js/pexeso-controller.js
@@ -92,21 +92,22 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete'])
chainLength: 2,
cardSet: alphabetCards,
cardTypes: ['key', 'morse']
- }, {
- levelName: "05: Picture + Word",
+ },/* {
+ levelName: "09: Picture + Word",
totalCards: 4*4,
cardsPerRow: 4,
chainLength: 2,
cardSet: basicCards,
cardTypes: ['picture', 'en-US']
}, {
- levelName: "06: Picture + Foreign Word",
+ levelName: "10: Foreign Word",
totalCards: 4*4,
cardsPerRow: 4,
chainLength: 2,
cardSet: basicCards,
cardTypes: ['picture', 'oneLanguage']
}, {
+ levelName: "10: Random Word",
totalCards: 4*4,
cardsPerRow: 4,
chainLength: 2,
@@ -125,11 +126,19 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete'])
cardSet: basicCards,
cardTypes: ['picture', 'randomLanguage', 'randomLanguage']
}, {
- totalCards: 4*4,
- cardsPerRow: 4,
- chainLength: 4,
+ levelName: "10: Grand MIX",
+ totalCards: 5*5,
+ cardsPerRow: 5,
+ chainLength: 2,
cardSet: basicCards,
cardTypes: ['picture', 'randomLanguage', 'randomLanguage', 'randomLanguage']
+ },*/ {
+ levelName: "Finale",
+ totalCards: 7*1,
+ cardsPerRow: 7,
+ chainLength: 7,
+ cardSet: finaleCards,
+ cardTypes: ['1','2','3','4','5','6','7']
}
];
@@ -167,6 +176,10 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete'])
};
};
+ $scope.isFinallevel = function() {
+ return ($scope.levelIndex == $scope.levels.length - 1);
+ };
+
/**
* Generate game board.
*/
@@ -200,14 +213,19 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete'])
}
}
+ var isFinalLevel = $scope.isFinallevel();
for (var index = 0; index < totalCount; index++) {
- var coordinate = Math.floor((Math.random()* stack.length));
+ var coordinate = 0;
+
+ if (!isFinalLevel) {
+ coordinate = Math.floor((Math.random()* stack.length));
+ }
+
$scope.board.push(stack[coordinate]);
stack.splice(coordinate, 1);
}
};
-
$scope.selectionCounter = 0;
$scope.selectedCards = [];
@@ -357,7 +375,8 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete'])
*/
$scope.completeLevel = function() {
var args = {
- levelIndex: $scope.levelIndex
+ levelIndex: $scope.levelIndex,
+ isFinalLevel: $scope.isFinallevel()
};
$rootScope.$emit('completeLevel', args);
};