[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gcompris/gsoc_oware] src/activities/oware: Oware: Fix scores in two player and z value of seeds in 
From:       Divyam Madaan <null () kde ! org>
Date:       2017-07-31 19:24:39
Message-ID: E1dcGIx-0000XP-Nl () code ! kde ! org
[Download RAW message or body]

Git commit 84024343e52f7229d0f459be29719f34f0a30eca by Divyam Madaan.
Committed on 31/07/2017 at 19:23.
Pushed by dmadaan into branch 'gsoc_oware'.

Oware: Fix scores in two player and z value of seeds in single player

M  +2    -2    src/activities/oware/Oware.qml
M  +2    -0    src/activities/oware/oware.js

https://commits.kde.org/gcompris/84024343e52f7229d0f459be29719f34f0a30eca

diff --git a/src/activities/oware/Oware.qml b/src/activities/oware/Oware.qml
index 88a83add..e2e7c887 100644
--- a/src/activities/oware/Oware.qml
+++ b/src/activities/oware/Oware.qml
@@ -152,11 +152,11 @@ ActivityBase {
                                 items.indexValue = index
                                 items.currentMove = items.playerOneTurn ? (index - \
                6) : (11 - index)
                                 items.player = items.playerOneTurn ? 0 : 1
-                                cellGridRepeater.itemAt(index).z = 20
                                 if ((!items.computerTurn && items.playerOneTurn && \
(items.currentMove >= 0 && items.currentMove <= 5) && \
Activity.isValidMove(items.currentMove,1,Activity.house)) || (!items.playerOneTurn && \
(items.currentMove >= 6 && items.currentMove <= 11) && \
Activity.isValidMove(items.currentMove,0,Activity.house)) && \
Activity.house[items.currentMove] != 0) { +                                    \
cellGridRepeater.itemAt(items.indexValue).z = 20  firstMove()
                                     items.playerOneTurn = !items.playerOneTurn
-                                    \
Activity.seedsExhausted(Activity.house,0,Activity.scoreHouse) +//                     \
Activity.seedsExhausted(Activity.house,0,Activity.scoreHouse)  }
                             }
                         }
diff --git a/src/activities/oware/oware.js b/src/activities/oware/oware.js
index 353b0d38..34973f5b 100644
--- a/src/activities/oware/oware.js
+++ b/src/activities/oware/oware.js
@@ -130,7 +130,9 @@ function computerMove() {
     if (items.playerOneScore - items.playerTwoScore < maxDiff[currentLevel])
         randomMove()
     sowSeeds(finalMove, house, scoreHouse, 1)
+    items.cellGridRepeater.itemAt(items.indexValue).z = 0
     items.indexValue = 11 - finalMove
+    items.cellGridRepeater.itemAt(items.indexValue).z = 20
     items.cellGridRepeater.itemAt(11 - finalMove).firstMove()
     items.computerTurn = false
     items.playerTwoScore = scoreHouse[1]


[prev in list] [next in list] [prev in thread] [next in thread]