diff --git a/src/activities/oware/ActivityInfo.qml b/src/activities/oware/ActivityInfo.qml index 253da4eaa..84e514c03 100644 --- a/src/activities/oware/ActivityInfo.qml +++ b/src/activities/oware/ActivityInfo.qml @@ -1,35 +1,35 @@ /* GCompris - ActivityInfo.qml * * Copyright (C) 2017 Divyam Madaan * * 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 GCompris 1.0 ActivityInfo { name: "oware/Oware.qml" difficulty: 1 icon: "oware/oware.svg" author: "Divyam Madaan <divyam3897@gmail.com>" demo: true - title: "Oware activity" + title: qsTr("Oware activity") description: qsTr("Play the Oware strategy game against your friend") //intro: "put here in comment the text for the intro voice" goal: qsTr("The object of the game is to capture more seeds than one's opponent. Since the game has only 48 seeds, capturing 25 is sufficient to accomplish this. Since there are an even number of seeds, it is possible for the game to end in a draw, where each player has captured 24. The game is over when one player has captured 25 or more seeds, or both players have taken 24 seeds each (draw). If both players agree that the game has been reduced to an endless cycle, each player captures the seeds on their side of the board.") prerequisite: "" manual: qsTr("At the beginning of the game four seeds are placed in each house. Players take turns by moving the seeds. In each turn, a player chooses one of the six houses under his or her control. The player removes all seeds from this house, and distributes them, dropping one in each house counter-clockwise from the original house, in a process called sowing. Seeds are not distributed into the end scoring houses, nor into the house drawn from. That is, the starting house is left empty; if it contained 12 seeds, it is skipped, and the twelfth seed is placed in the next house. After a turn, if the last seed was placed into an opponent's house and brought its total to two or three, all the seeds in that house are captured and placed in the player's scoring house (or set aside if the board has no scoring houses). If the previous-to-last seed also brought the total seeds in an opponent's house to two or three, these are captured as well, and so on. However, if a move would capture all an opponent's seeds, the capture is forfeited, and the seeds are instead left on the board, since this would prevent the opponent from continuing the game. The proscription against capturing all an opponent's seeds is related to a more general idea, that one ought to make a move that allows the opponent to continue playing. If an opponent's houses are all empty, the current player must make a move that gives the opponent seeds. If no such move is possible, the current player captures all seeds in his/her own territory, ending the game. (Source Wikipedia <http://en.wikipedia.org/wiki/Oware>)") credit: "" section: "strategy" createdInVersion: 8000 } diff --git a/src/activities/oware/Oware.qml b/src/activities/oware/Oware.qml index 90d86a035..eb032d76b 100644 --- a/src/activities/oware/Oware.qml +++ b/src/activities/oware/Oware.qml @@ -1,406 +1,260 @@ /* 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 repeater: repeater property bool playerOneTurn: true property bool isTutorial: true - property alias tutorialTxt: tutorialTxt.text - property alias tutNum: tutorialTxt.tutNum + property alias tutorialText: tutorialSection.tutorialText + property alias tutorialNumber: tutorialSection.tutorialText + property alias tutorialSection: tutorialSection property var playerOneScore: 0 property var playerOneSeeds: 0 property var playerTwoScore: 0 property var playerTwoSeeds: 0 } onStart: { Activity.start(items) } onStop: { Activity.stop() } Image { id: board source: Activity.url + "/owareBoard.png" anchors.centerIn: parent width: parent.width * 0.7 height: width * 0.4 visible: !items.isTutorial } Grid { id:boardGrid columns: 6 rows: 2 anchors.horizontalCenter: board.horizontalCenter anchors.top: board.top visible: !items.isTutorial Repeater { id:repeater model: 12 Rectangle { color: "transparent" height: board.height/2 width: board.width * (1/6.25) property var circleRadius: width property var value: 4 GCText { text: value color: "white" anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter } - + Repeater { 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) //To move the seeds from one hole to other on button click. Not working :( states: State { name: "move" when: buttonClick.containsPress PropertyChanges { target: grain scale: 1.1 } } } } } } } ListView { id: rowButton width: boardGrid.width height: boardGrid.height * 0.25 orientation: ListView.Horizontal model: 6 anchors.horizontalCenter: board.horizontalCenter anchors.top: board.bottom interactive: false visible: !items.isTutorial delegate: Item { height: parent.height width: boardGrid.width/6 Image { id: valueImage source: Activity.url + "button" + (index + 1) + ".png" anchors.fill: parent MouseArea { id: buttonClick anchors.fill:parent hoverEnabled: true - onClicked: { -// Activity.sowSeeds(index); - items.playerOneTurn = (!items.playerOneTurn == true) ? false : true - } + onClicked: { + // Activity.sowSeeds(index); + items.playerOneTurn = (!items.playerOneTurn == true) ? false : true + } onPressed: { valueImage.source = Activity.url + "button" + (index + 1) + "Click.png"; } - onReleased: { - valueImage.source = Activity.url + "button" + (index + 1) + ".png"; - } - onEntered: { - valueImage.source = Activity.url + "button" + (index + 1) + "Notify.png"; - } - onExited: { - valueImage.source = Activity.url + "button" + (index + 1) + ".png"; - } - } + } } } } + Tutorial { + id:tutorialSection + } ScoreItem { id: playerOneLevelScore player: 1 height: Math.min(background.height/7, Math.min(background.width/7, bar.height * 1.05)) width: height * 11/8 visible: !items.isTutorial anchors { top: background.top topMargin: 5 left: background.left leftMargin: 5 } - playerImageSource: Activity.url + "stone_1.svg" - backgroundImageSource: Activity.url + "score_1.svg" + 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 visible: !items.isTutorial anchors { top: background.top topMargin: 5 right: background.right rightMargin: 5 } - playerImageSource: Activity.url + "stone_2.svg" - backgroundImageSource: Activity.url + "score_2.svg" + playerImageSource: "qrc:/gcompris/src/activities/align4-2players/resource/player_2.svg" + backgroundImageSource: "qrc:/gcompris/src/activities/align4-2players/resource/score_2.svg" } Image { id: playerOneScoreBox height: board.height * 0.4 width: height source:Activity.url+"/score.png" anchors.verticalCenter: parent.verticalCenter anchors.right: board.left visible: !items.isTutorial GCText { id: playerOneScoreText color: "white" anchors.centerIn: parent fontSize: smallSize text: items.playerOneScore horizontalAlignment: Text.AlignHCenter wrapMode: TextEdit.WordWrap } } Image { id: playerTwoScore height: board.height * 0.4 width: height source:Activity.url+"/score.png" anchors.verticalCenter: parent.verticalCenter anchors.left: board.right visible: !items.isTutorial GCText { id: playerTwoScoreText color: "white" anchors.centerIn: parent fontSize: smallSize text: items.playerTwoScore horizontalAlignment: Text.AlignHCenter wrapMode: TextEdit.WordWrap } } - Image { - id: previousTutorial - source: "qrc:/gcompris/src/core/resource/bar_previous.svg" - sourceSize.height: skipTutorial.height * 1.1 - visible: items.isTutorial && tutorialTxt.tutNum != 1 - anchors { - top: parent.top - topMargin: 5 - right: skipTutorialContainer.left - rightMargin: 5 - } - - MouseArea { - id: previousArea - width: parent.width - height: parent.height - onClicked: {Activity.tutorialPrevious()} - } - } - - Image { - id: nextTutorial - source: "qrc:/gcompris/src/core/resource/bar_next.svg" - sourceSize.height: skipTutorial.height * 1.1 - visible: items.isTutorial && tutorialTxt.tutNum != 3 - anchors { - top: parent.top - topMargin: 5 - left: skipTutorialContainer.right - leftMargin: 5 - } - - MouseArea { - id: nextArea - width: parent.width - height: parent.height - onClicked: {Activity.tutorialNext()} - } - } - - GCText { - id: skipTutorial - anchors { - horizontalCenter: parent.horizontalCenter - top: parent.top - topMargin: 5 - } - fontSizeMode: Text.Fit - minimumPixelSize: 10 - color: "white" - style: Text.Outline - styleColor: "black" - horizontalAlignment: Text.AlignHCenter - width: Math.min(implicitWidth, 0.8 * parent.width ) - height: implicitHeight - visible: items.isTutorial - text: qsTr("Skip tutorial") - z: 2 - } - - Rectangle { - id: skipTutorialContainer - anchors.top: skipTutorial.top - anchors.horizontalCenter: skipTutorial.horizontalCenter - width: skipTutorial.width + 10 - height: skipTutorial.height + 2 - opacity: 0.8 - radius: 10 - border.width: 2 - border.color: "black" - visible: items.isTutorial - gradient: Gradient { - GradientStop { position: 0.0; color: "#000" } - GradientStop { position: 0.9; color: "#666" } - GradientStop { position: 1.0; color: "#AAA" } - } - MouseArea { - id: skipArea - hoverEnabled: true - width: parent.width - height: parent.height - onEntered: {skipTutorialContainer.border.color = "#62db53"} - onExited: {skipTutorialContainer.border.color = "black"} - onClicked: {Activity.tutorialSkip()} - } - } - - GCText { - id: tutorialTxt - anchors { - horizontalCenter: parent.horizontalCenter - top: skipTutorial.bottom - topMargin: skipTutorial.height * 0.5 - } - fontSizeMode: Text.Fit - minimumPixelSize: 10 - color: "black" - horizontalAlignment: Text.AlignHLeft - width: Math.min(implicitWidth, 0.8 * parent.width ) - height: Math.min(implicitHeight, 0.25 * parent.height ) - wrapMode: TextEdit.WordWrap - visible: items.isTutorial - z: 2 - property int tutNum: 1 - } - - Rectangle { - id: tutorialTxtContainer - anchors.top: tutorialTxt.top - anchors.horizontalCenter: tutorialTxt.horizontalCenter - width: tutorialTxt.width + 20 - height: tutorialTxt.height + 2 - opacity: 0.8 - radius: 10 - border.width: 6 - color: "white" - border.color: "#87A6DD" - visible: items.isTutorial - /* - gradient: Gradient { - GradientStop { position: 0.0; color: "#000" } - GradientStop { position: 0.9; color: "#666" } - GradientStop { position: 1.0; color: "#AAA" } - }*/ - } - - Image { - id: tutorialImage - source: "qrc:/gcompris/src/activities/oware/resource/" + "tutorial" + tutorialTxt.tutNum + ".png" - property int heightNeed: background.height - tutorialTxtContainer.height - bar.height - - 2 * skipTutorialContainer.height - width: (sourceSize.width/sourceSize.height) > (0.9 * background.width / heightNeed) ? - 0.9 * background.width : (sourceSize.width * heightNeed) / sourceSize.height - fillMode: Image.PreserveAspectFit - visible: items.isTutorial - anchors { - top: tutorialTxt.bottom - topMargin: 10 - horizontalCenter: parent.horizontalCenter - } - } - // Tutorial section ends - DialogHelp { id: dialogHelp onClose: home() } Bar { id: bar - content: BarEnumContent { value: help | home | level } + content: BarEnumContent { value: items.isTutorial ? (help | home) : (help | home | level | reload)} onHelpClicked: { displayDialog(dialogHelp) } onPreviousLevelClicked: Activity.previousLevel() onNextLevelClicked: Activity.nextLevel() onHomeClicked: activity.home() + onReloadClicked: + Activity.initLevel() } Bonus { id: bonus } } } diff --git a/src/activities/oware/Tutorial.qml b/src/activities/oware/Tutorial.qml new file mode 100644 index 000000000..50e8c05d6 --- /dev/null +++ b/src/activities/oware/Tutorial.qml @@ -0,0 +1,274 @@ +/* GCompris - Tutorial.qml + * + * Copyright (C) 2017 Divyam Madaan + * + * Authors: + * Divyam Madaan + * + * 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 + +Image { + id: tutorialSection + anchors.fill: parent + source: "qrc:/gcompris/src/activities/guesscount/resource/backgroundW01.svg" + visible: items.isTutorial + property alias tutorialText: tutorialText.text + property alias tutorialNumber: tutorialText.tutorialNumber + + GCText { + id: tutorialText + anchors { + horizontalCenter: parent.horizontalCenter + top: parent.top + topMargin: 10 + } + fontSizeMode: Text.Fit + minimumPixelSize: 10 + color: "black" + horizontalAlignment: Text.AlignHLeft + width: Math.min(implicitWidth, 0.8 * parent.width ) + height: Math.min(implicitHeight, 0.25 * parent.height ) + wrapMode: TextEdit.WordWrap + visible: items.isTutorial + z: 2 + property int tutorialNumber: 1 + } + + Rectangle { + id: tutorialTextContainer + anchors.top: tutorialText.top + anchors.horizontalCenter: tutorialText.horizontalCenter + width: tutorialText.width + 20 + height: tutorialText.height + 2 + opacity: 0.8 + radius: 10 + border.width: 6 + color: "white" + border.color: "#87A6DD" + visible: items.isTutorial + } + + Rectangle { + id: previousButton + width: 120 + height: 120 + color: "#d8ffffff" + border.color: "#2a2a2a" + border.width: 3 + radius: 8 + z: 5 + anchors.right: nextButton.left + anchors.bottom: parent.bottom + visible: items.isTutorial && tutorialText.tutorialNumber != 1 + + GCText { + id: previousButtonText + anchors.centerIn: parent + text: "Previous" + wrapMode: Text.WordWrap + } + + MouseArea { + id: previousButtonArea + anchors.fill: parent + onClicked: { + tutorialPrevious() + } + } + states: [ + State { + name: "notclicked" + PropertyChanges { + target: previousButton + scale: 1.0 + } + }, + State { + name: "clicked" + when: previousButtonArea.pressed + PropertyChanges { + target: previousButton + scale: 0.9 + } + }, + State { + name: "hover" + when: previousButtonArea.containsMouse + PropertyChanges { + target: previousButton + scale: 1.1 + } + } + ] + Behavior on scale { NumberAnimation { duration: 70 } } + } + + Rectangle { + id: nextButton + width: 120 + height: 120 + color: "#d8ffffff" + border.color: "#2a2a2a" + border.width: 3 + radius: 8 + z: 5 + anchors.right: skipButton.left + anchors.bottom: parent.bottom + visible: items.isTutorial && tutorialText.tutorialNumber != 3 + + GCText { + id: nextButtonText + anchors.centerIn: parent + text: "Next" + wrapMode: Text.WordWrap + } + + MouseArea { + id: nextButtonArea + anchors.fill: parent + onClicked: { + tutorialNext() + } + } + states: [ + State { + name: "notclicked" + PropertyChanges { + target: nextButton + scale: 1.0 + } + }, + State { + name: "clicked" + when: button_area.pressed + PropertyChanges { + target: nextButton + scale: 0.9 + } + }, + State { + name: "hover" + when: nextButtonArea.containsMouse + PropertyChanges { + target: nextButton + scale: 1.1 + } + } + ] + Behavior on scale { NumberAnimation { duration: 70 } } + } + Rectangle { + id: skipButton + width: 120 + height: 120 + color: "#d8ffffff" + border.color: "#2a2a2a" + border.width: 3 + radius: 8 + z: 5 + anchors.right: parent.right + anchors.rightMargin: 15 + anchors.bottom: parent.bottom + + GCText { + id: skipTutorial + anchors.centerIn: parent + text: "Skip" + wrapMode: Text.WordWrap + } + + MouseArea { + id: skipButtonArea + anchors.fill: parent + onClicked: { + tutorialSkip() + } + } + states: [ + State { + name: "notclicked" + PropertyChanges { + target: skipButton + scale: 1.0 + } + }, + State { + name: "clicked" + when: skipButtonArea.pressed + PropertyChanges { + target: skipButton + scale: 0.9 + } + }, + State { + name: "hover" + when: skipButtonArea.containsMouse + PropertyChanges { + target: skipButton + scale: 1.1 + } + } + ] + Behavior on scale { NumberAnimation { duration: 70 } } + } + + Image { + id: tutorialImage + source: "qrc:/gcompris/src/activities/oware/resource/" + "tutorial" + tutorialText.tutorialNumber + ".png" + width: parent.width * 0.8 + fillMode: Image.PreserveAspectFit + visible: items.isTutorial + anchors { + top: tutorialText.bottom + topMargin: 10 + horizontalCenter: parent.horizontalCenter + } + } + + function tutorial() { + items.isTutorial = true + setTutorial(1) + } + + function tutorialSkip() { + items.isTutorial = false + Activity.initLevel() + } + + function tutorialNext() { + setTutorial(++tutorialNumber) + } + + function tutorialPrevious() { + setTutorial(--tutorialNumber) + } + + function setTutorial(tutorialNumber) { + if(tutorialNumber == 1) { + items.tutorialText = Activity.tutorialInstructions[0] + } + else if(tutorialNumber == 2) { + items.tutorialText = Activity.tutorialInstructions[1] + } + else if(tutorialNumber == 3) { + items.tutorialText = Activity.tutorialInstructions[2] + } + } +} diff --git a/src/activities/oware/oware.js b/src/activities/oware/oware.js index 44c2860a9..348f8d779 100644 --- a/src/activities/oware/oware.js +++ b/src/activities/oware/oware.js @@ -1,115 +1,86 @@ /* 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/" +var tutorialInstructions = [ "At the beginning of the game four seeds are placed in each house. Players take turns by moving the seeds","In each turn, a player chooses one of the six houses under his or her control. The player removes all seeds from this house, and distributes them, dropping one in each house counter-clockwise from the original house, in a process called sowing.","After a turn, if the last seed was placed into an opponent's house and brought its total to two or three, all the seeds in that house are captured and placed in the player's scoring house (or set aside if the board has no scoring houses). If the previous-to-last seed also brought the total seeds in an opponent's house to two or three, these are captured as well, and so on."] + function start(items_) { items = items_ currentLevel = 0 initLevel() - tutorial() + items.tutorialSection.tutorial() } function stop() { } function initLevel() { items.bar.level = currentLevel + 1 } 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 tutorial() { - items.isTutorial = true - setTutorial(1) -} - -function setTutorial(tutNum) { - - if(tutNum == 1) { - items.tutorialTxt = qsTr("At the beginning of the game four seeds are placed in each house. Players take turns by moving the seeds") - } - else if(tutNum == 2) { - items.tutorialTxt = qsTr("In each turn, a player chooses one of the six houses under his or her control. The player removes all seeds from this house, and distributes them, dropping one in each house counter-clockwise from the original house, in a process called sowing.") - } - else if(tutNum == 3) { - items.tutorialTxt = qsTr("After a turn, if the last seed was placed into an opponent's house and brought its total to two or three, all the seeds in that house are captured and placed in the player's scoring house (or set aside if the board has no scoring houses). If the previous-to-last seed also brought the total seeds in an opponent's house to two or three, these are captured as well, and so on.") - } -} - -function tutorialSkip() { - items.isTutorial = false - initLevel() -} - -function tutorialNext() { - setTutorial(++items.tutNum) -} - -function tutorialPrevious() { - setTutorial(--items.tutNum) -} - function sowSeeds(index) { var nbSeeds = items.repeater.itemAt(index).value if(nbSeeds == 0) return; var last,j,seeds; seeds = nbSeeds print(index) items.repeater.itemAt(index).value = 0; /* for (j = 1, last = (index + 1) % 12; j <= nbSeeds; j++) { items.repeater.itemAt(last).value += 1 last = (last + 1) % 12 seeds -= 1 if(seeds == 0 && items.repeater.itemAt(last).value != 0) { seeds = items.repeater.itemAt(last).value sowSeeds(last) }*/ } diff --git a/src/activities/oware/oware_backup.svg b/src/activities/oware/oware_backup.svg deleted file mode 100644 index cba275faa..000000000 --- a/src/activities/oware/oware_backup.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/src/activities/oware/resource/button1Click.png b/src/activities/oware/resource/button1Click.png deleted file mode 100644 index d4719ebd9..000000000 Binary files a/src/activities/oware/resource/button1Click.png and /dev/null differ diff --git a/src/activities/oware/resource/button1Notify.png b/src/activities/oware/resource/button1Notify.png deleted file mode 100644 index 4096c0969..000000000 Binary files a/src/activities/oware/resource/button1Notify.png and /dev/null differ diff --git a/src/activities/oware/resource/button2Click.png b/src/activities/oware/resource/button2Click.png deleted file mode 100644 index 72932c22b..000000000 Binary files a/src/activities/oware/resource/button2Click.png and /dev/null differ diff --git a/src/activities/oware/resource/button2Notify.png b/src/activities/oware/resource/button2Notify.png deleted file mode 100644 index b4c7bf6cb..000000000 Binary files a/src/activities/oware/resource/button2Notify.png and /dev/null differ diff --git a/src/activities/oware/resource/button3Click.png b/src/activities/oware/resource/button3Click.png deleted file mode 100644 index f192b1390..000000000 Binary files a/src/activities/oware/resource/button3Click.png and /dev/null differ diff --git a/src/activities/oware/resource/button3Notify.png b/src/activities/oware/resource/button3Notify.png deleted file mode 100644 index a4e274f11..000000000 Binary files a/src/activities/oware/resource/button3Notify.png and /dev/null differ diff --git a/src/activities/oware/resource/button4Click.png b/src/activities/oware/resource/button4Click.png deleted file mode 100644 index db5dab6bb..000000000 Binary files a/src/activities/oware/resource/button4Click.png and /dev/null differ diff --git a/src/activities/oware/resource/button4Notify.png b/src/activities/oware/resource/button4Notify.png deleted file mode 100644 index 4cfd57fa0..000000000 Binary files a/src/activities/oware/resource/button4Notify.png and /dev/null differ diff --git a/src/activities/oware/resource/button5Click.png b/src/activities/oware/resource/button5Click.png deleted file mode 100644 index 469ac5ed3..000000000 Binary files a/src/activities/oware/resource/button5Click.png and /dev/null differ diff --git a/src/activities/oware/resource/button5Notify.png b/src/activities/oware/resource/button5Notify.png deleted file mode 100644 index db07a753e..000000000 Binary files a/src/activities/oware/resource/button5Notify.png and /dev/null differ diff --git a/src/activities/oware/resource/button6Click.png b/src/activities/oware/resource/button6Click.png deleted file mode 100644 index 2fda0e2d2..000000000 Binary files a/src/activities/oware/resource/button6Click.png and /dev/null differ diff --git a/src/activities/oware/resource/button6Notify.png b/src/activities/oware/resource/button6Notify.png deleted file mode 100644 index d5c32b104..000000000 Binary files a/src/activities/oware/resource/button6Notify.png and /dev/null differ diff --git a/src/activities/oware/resource/score_1.svg b/src/activities/oware/resource/score_1.svg deleted file mode 100644 index 864e63e48..000000000 --- a/src/activities/oware/resource/score_1.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/activities/oware/resource/score_2.svg b/src/activities/oware/resource/score_2.svg deleted file mode 100644 index dd9f14be1..000000000 --- a/src/activities/oware/resource/score_2.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/activities/oware/resource/stone_1.svg b/src/activities/oware/resource/stone_1.svg deleted file mode 100644 index 7d433f7fe..000000000 --- a/src/activities/oware/resource/stone_1.svg +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/activities/oware/resource/stone_2.svg b/src/activities/oware/resource/stone_2.svg deleted file mode 100644 index abf0eb91c..000000000 --- a/src/activities/oware/resource/stone_2.svg +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -