diff --git a/src/activities/oware/Oware.qml b/src/activities/oware/Oware.qml index ff9a62d3e..f8e21fc7f 100644 --- a/src/activities/oware/Oware.qml +++ b/src/activities/oware/Oware.qml @@ -1,285 +1,289 @@ /* GCompris - Oware.qml * * Copyright (C) 2017 Divyam Madaan * * Authors: * Frederic Mazzarol (GTK+ version) * Divyam Madaan (Qt Quick port) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../core" import "oware.js" as Activity import "." ActivityBase { id: activity onStart: focus = true onStop: {} pageComponent: Image { id: background anchors.fill: parent source: "qrc:/gcompris/src/activities/guesscount/resource/backgroundW01.svg" signal start signal stop Component.onCompleted: { activity.start.connect(start) activity.stop.connect(stop) } // Add here the QML items you need to access in javascript QtObject { id: items property Item main: activity.main property alias background: background property alias bar: bar property alias bonus: bonus property alias cellGridRepeater: cellGridRepeater property bool playerOneTurn: true property int playerOneScore: 0 property int playerTwoScore: 0 property alias playerOneLevelScore: playerOneLevelScore property alias playerTwoLevelScore: playerTwoLevelScore + property alias parentMouseArea: parentMouseArea } onStart: { Activity.start(items) } onStop: { Activity.stop() } + MouseArea { + id: parentMouseArea + anchors.fill: parent + } Item { id: boxModel width: parent.width * 0.7 height: width * 0.4 z: 2 anchors.centerIn: parent rotation: (background.width > background.height) ? 0 : 90 Image { id: board source: Activity.url + "/owareBoard.png" anchors.fill: parent } Grid { id: boardGrid columns: 6 rows: 2 anchors.horizontalCenter: board.horizontalCenter anchors.top: board.top z: 2 Repeater { id: cellGridRepeater model: 12 Rectangle { id: house color: "transparent" height: board.height/2 width: board.width * (1/6.25) property real circleRadius: width property int value property int indexValue: index GCText { text: index color: "white" anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter z: 2 rotation: (background.width > background.height) ? 0 : 270 fontSize: smallSize } // property alias seedsAnimation: grainRepeater.seedsAnimation MouseArea { id: buttonClick anchors.fill: parent onClicked: { if(items.playerOneTurn && Activity.house[index - 6] != 0 && (index - 6) >= 0 && (index - 6) <= 5) { items.playerOneTurn = !items.playerOneTurn if(Activity.playerSideEmpty) Activity.checkHunger(index - 6) else { Activity.sowSeeds(index,index - 6) } } else if(!items.playerOneTurn && Activity.house[11-index] != 0 && (11 - index) >= 6 && (11 - index) <= 11) { items.playerOneTurn = !items.playerOneTurn if(Activity.playerSideEmpty) Activity.checkHunger(11 - index) else { Activity.sowSeeds(index,11 - index) } } } } function startAnim() { - print("val",indexValue) seedsAnimation.start() } SequentialAnimation { id: seedsAnimation NumberAnimation { - target: grainRepeater.itemAt(indexValue) + target: grainRepeater.itemAt(0) to: 500 property: "x" easing.type: Easing.OutInQuad duration: 500 } NumberAnimation { - target: grainRepeater.itemAt(indexValue) + target: grainRepeater.itemAt(0) to: 500 property: "y" duration: 500 } } Repeater { id: grainRepeater model: value Image { id: grain source: Activity.url + "grain2.png" height: circleRadius * 0.2 width: circleRadius * 0.2 x: circleRadius/2 + Activity.getX(circleRadius/6, index,value) y: circleRadius/2 + Activity.getY(circleRadius/5, index,value) } } } } } Image { id: playerOneScoreBox height: board.height * 0.4 width: height source:Activity.url+"/score.png" anchors.verticalCenter: parent.verticalCenter anchors.right: boxModel.left GCText { id: playerOneScoreText color: "white" anchors.centerIn: parent fontSize: smallSize text: items.playerOneScore horizontalAlignment: Text.AlignHCenter rotation: (background.width > background.height) ? 0 : 270 wrapMode: TextEdit.WordWrap } } Image { id: playerTwoScore height: board.height * 0.4 width: height source:Activity.url+"/score.png" anchors.verticalCenter: parent.verticalCenter anchors.left: boxModel.right GCText { id: playerTwoScoreText color: "white" anchors.centerIn: parent fontSize: smallSize text: items.playerTwoScore horizontalAlignment: Text.AlignHCenter rotation: (background.width > background.height) ? 0 : 270 wrapMode: TextEdit.WordWrap } } } Image { id: tutorialImage source: "qrc:/gcompris/src/activities/guesscount/resource/backgroundW01.svg" anchors.fill: parent z: 5 Tutorial { id:tutorialSection tutorialDetails: Activity.tutorialInstructions onSkipPressed: { Activity.initLevel() tutorialImage.z = 0 playerOneLevelScore.beginTurn() } } } ScoreItem { id: playerOneLevelScore player: 1 height: Math.min(background.height/7, Math.min(background.width/7, bar.height * 1.05)) width: height * 11/8 playerScore: 0 anchors { top: background.top topMargin: 5 left: background.left leftMargin: 5 } playerImageSource: "qrc:/gcompris/src/activities/align4-2players/resource/player_1.svg" backgroundImageSource: "qrc:/gcompris/src/activities/align4-2players/resource/score_1.svg" } ScoreItem { id: playerTwoLevelScore player: 2 height: Math.min(background.height/7, Math.min(background.width/7, bar.height * 1.05)) width: height * 11/8 playerScore: 0 anchors { top: background.top topMargin: 5 right: background.right rightMargin: 5 } playerImageSource: "qrc:/gcompris/src/activities/align4-2players/resource/player_2.svg" backgroundImageSource: "qrc:/gcompris/src/activities/align4-2players/resource/score_2.svg" playerScaleOriginX: playerTwoLevelScore.width } DialogHelp { id: dialogHelp onClose: home() } Bar { id: bar content: BarEnumContent { value: tutorialSection.visible ? (help | home) : (help | home | reload)} onHelpClicked: { displayDialog(dialogHelp) } onPreviousLevelClicked: Activity.previousLevel() onNextLevelClicked: Activity.nextLevel() onHomeClicked: activity.home() - onReloadClicked: Activity.initLevel() + onReloadClicked: Activity.reset() } Bonus { id: bonus } } } diff --git a/src/activities/oware/oware.js b/src/activities/oware/oware.js index 0c14237ec..ad5e24b45 100644 --- a/src/activities/oware/oware.js +++ b/src/activities/oware/oware.js @@ -1,217 +1,234 @@ /* GCompris - oware.js * * Copyright (C) 2017 Divyam Madaan * * Authors: * Frederic Mazzarol (GTK+ version) * Divyam Madaan (Qt Quick port) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ .pragma library .import QtQuick 2.6 as Quick var currentLevel = 0 var numberOfLevel = 4 var items var url = "qrc:/gcompris/src/activities/oware/resource/" // house variable is used for storing the count of all the seeds as we play. var house = [] var scoreHouse = [0, 0] var nextPlayer = 0 var playerSideEmpty = false; var tutorialInstructions = [ { "instruction": qsTr("At the beginning of the game four seeds are placed in each house. Each player has 6 houses. The first 6 houses starting from the bottom left belong to one player and the upper 6 houses belong to the other player."), "instructionImage": "qrc:/gcompris/src/activities/oware/resource/tutorial1.png" }, { "instruction": qsTr("In each turn, a player chooses one of their 6 houses. All seeds from that house are picked and dropped one in each house counter-clockwise from the house they chose, in a process called sowing. However if the number of seeds in the house chosen is equal or more than 12, then seed is not dropped in the house from which the player picked up the seeds."), "instructionImage": "qrc:/gcompris/src/activities/oware/resource/tutorial2.png" }, { "instruction": qsTr("After a turn, if the last seed was placed into the opponent's house and brought the total number of seeds in that house to two or three, all the seeds in that house are captured and added to player's scoring house. If the previous-to-last seed dropped also brought the total seeds in an opponent's house to two or three, these are captured as well, and so on."), "instructionImage": "qrc:/gcompris/src/activities/oware/resource/tutorial3.png" }, { "instruction": qsTr("If all the houses of one player are empty, the other player has to take such a move that it gives one or more seeds to the other player to continue the game."), "instructionImage": "qrc:/gcompris/src/activities/oware/resource/tutorial4.png" }, { "instruction": qsTr("However, if the current player is unable to give any seed to the opponent, then the current player keeps all the seeds in the houses of his side and the game ends."), "instructionImage": "qrc:/gcompris/src/activities/oware/resource/tutorial5.png" } ] function start(items_) { items = items_ currentLevel = 0 initLevel() } function stop() {} +function reset() { + items.parentMouseArea.z = 0 + items.playerOneLevelScore.endTurn() + items.playerTwoLevelScore.endTurn() + items.playerOneLevelScore.beginTurn() + items.playerOneTurn = true + initLevel() +} function initLevel() { var singleHouseSeeds = 4 for (var i = 11; i >= 0; i--) house[i] = singleHouseSeeds items.playerOneScore = 0 items.playerTwoScore = 0 scoreHouse = [0, 0] setValues() } function nextLevel() { if (numberOfLevel <= ++currentLevel) { currentLevel = 0 } initLevel(); } function previousLevel() { if (--currentLevel < 0) { currentLevel = numberOfLevel - 1 } initLevel(); } function getX(radius, index, value) { var step = (2 * Math.PI) * index / value; return radius * Math.cos(step); } function getY(radius, index, value) { var step = (2 * Math.PI) * index / value; return radius * Math.sin(step); } function setValues() { for (var i = 6, j = 0; i < 12, j < 6; j++, i++) items.cellGridRepeater.itemAt(i).value = house[j] for (var i = 0, j = 11; i < 6, j > 5; j--, i++) items.cellGridRepeater.itemAt(i).value = house[j] } function checkHunger(index) { var currentPlayer = items.playerOneTurn ? 1 : 0 var canGive = false // First it's checked if the current player can satisfy the hunger of opponent. for (var j = currentPlayer * 6; j < (currentPlayer * 6 + 6); j++) { if (items.playerOneTurn && house[j] % 12 > 11 - j) { canGive = true break; } else if (!items.playerOneTurn && house[j] % 12 > 5 - j) { canGive = true; break; } } // If the player can give seeds, then the seeds are sown only when the hunger is satisfied. if (canGive && (items.playerOneTurn && house[index] % 12 > 11 - index) || (!items.playerOneTurn && house[index] % 12 > 5 - index)) { sowSeeds(index) } else if (canGive) { items.playerOneTurn = !items.playerOneTurn } // If the player cannot satisfy the hunger all the seeds in the territory are captured and game ends. else if (!canGive) { for (j = currentPlayer * 6; j < (currentPlayer * 6 + 6); j++) { scoreHouse[currentPlayer] += house[j]; house[j] = 0; items.playerTwoScore = (nextPlayer == 1) ? scoreHouse[1] : items.playerTwoScore items.playerOneScore = (nextPlayer == 0) ? scoreHouse[0] : items.playerOneScore setValues() } items.bonus.good("flower") if(items.playerTwoScore > items.playerOneScore) items.playerTwoLevelScore.win() else if(items.playerOneScore > items.playerTwoScore) items.playerOneLevelScore.win() } } function sowSeeds(actualIndex,index) { var currentPlayer = items.playerOneTurn ? 0 : 1 var nextIndex = index playerSideEmpty = false; if(!currentPlayer) { items.playerTwoLevelScore.endTurn() items.playerOneLevelScore.beginTurn() } else { items.playerOneLevelScore.endTurn() items.playerTwoLevelScore.beginTurn() } if (!playerSideEmpty) { // The seeds are sown until the picked seeds are equal to zero while (house[index]) { nextIndex = (nextIndex + 1) % 12 // If there are more than or equal to 12 seeds than we don't sow the in the pit from where we picked the seeds. if (index == nextIndex) { nextIndex = (nextIndex + 1) % 12 } // Decrement the count of seeds and sow it in the nextIndex house[index]--; house[nextIndex]++; } // The nextIndex now contains the seeds in the last pit sown. var capture = []; // The opponent's seeds are captured if they are equal to 2 or 3 if (((house[nextIndex] == 2 || house[nextIndex] == 3)) && ((currentPlayer == 1 && nextIndex > 5 && nextIndex < 12) || (currentPlayer == 0 && nextIndex >= 0 && nextIndex < 6))) { capture[nextIndex % 6] = true; } /* The seeds previous to the captured seeds are checked. If they are equal to 2 or 3 then they are captured until a pit arrives which has more than 3 seeds or 1 seed. */ while (capture[nextIndex % 6] && nextIndex % 6) { nextIndex--; if (house[nextIndex] == 2 || house[nextIndex] == 3) { capture[nextIndex % 6] = true; } } var allSeedsCaptured = true; /* Now we check if all the seeds in opponents houses which were to be captured are captured or not. If any of the house is not yet captured we set allSeedsCaptured as false */ for (var j = currentPlayer * 6; j < (currentPlayer * 6 + 6); j++) { if (!capture[j % 6] && house[j]) allSeedsCaptured = false; } // Now capture the seeds for the houses for which capture[houseIndex] = true if all seeds are not captured if (!allSeedsCaptured) { for (var j = currentPlayer * 6; j < (currentPlayer * 6 + 6); j++) { /* If opponent's houses capture is true we set the no of seeds in that house as 0 and give the seeds to the opponent. */ if (capture[j % 6]) { scoreHouse[nextPlayer] = scoreHouse[nextPlayer] + house[j]; house[j] = 0; } } } } // Now we check if the player has any more seeds or not for (var j = nextPlayer * 6; j < (nextPlayer * 6 + 6); j++) { // If any of the pits in house is not empty we set playerSideEmpty as false if (house[j]) { playerSideEmpty = false; break; } else playerSideEmpty = true } items.playerTwoScore = (nextPlayer == 1) ? scoreHouse[1] : items.playerTwoScore items.playerOneScore = (nextPlayer == 0) ? scoreHouse[0] : items.playerOneScore - items.cellGridRepeater.itemAt(actualIndex).startAnim() - print(items.cellGridRepeater.itemAt(actualIndex)) - nextPlayer = currentPlayer +// items.cellGridRepeater.itemAt(actualIndex).startAnim() + if(items.playerTwoScore >= 25) { + items.playerTwoLevelScore.win() + items.playerOneLevelScore.endTurn() + items.parentMouseArea.z = 3 + } + else if(items.playerOneScore >= 25) { + items.playerOneLevelScore.win() + items.playerTwoLevelScore.endTurn() + items.parentMouseArea.z = 3 + } + nextPlayer = currentPlayer setValues() }