ok, now OYatzee checks for what the user got (Full House and such)

2 files changed, 165 insertions, 3 deletions

diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp
index 85d9616..5c4d1f7 100644
--- a/noncore/games/oyatzee/oyatzee.cpp
+++ b/noncore/games/oyatzee/oyatzee.cpp
@@ -59,5 +59,8 @@ void OYatzee::detectPosibilities()
 {
+        posibilities.clear();
+        qDebug( "running detectPosibilities()" );
+        
         Dice *d = dw->diceList.first();
 
-        QValueList<int> numbers;
+        QValueListInt numbers;
         
@@ -67,2 +70,142 @@ void OYatzee::detectPosibilities()
         }
+        
+        //the 6 numbers
+        QValueListInt::Iterator it;
+
+        for ( int i = 1 ; i < 7 ; ++i ) // check for 1-->6
+        {
+                bool cont = false;
+                it = numbers.begin();
+                for ( ; it != numbers.end() ; ++it )
+                {
+                        if ( cont )
+                                continue;
+                
+                        if ( numbers.find( i ) != numbers.end() )
+                        {
+                                posibilities.append( i );
+                                cont = true;
+                        }
+                }
+        }
+                
+        
+        //3er, 4er, Yatzee
+        it = numbers.begin();
+        int count;
+        int temp;
+        int countFH = 0; //for the full-house-check
+
+        for ( int i = 1 ; i < 7 ; ++i ) // check for 1-->6 at least 3 times
+        {
+                count = 0;
+                temp = 0;
+                it = numbers.begin();
+                for ( ; it != numbers.end() ; ++it )
+                {
+                        if ( *it == i )
+                        {
+                                count++;
+                                temp++;
+                        }
+                        if ( temp == 2 )
+                                countFH = temp;
+                }
+                
+                if ( count >= 3 )
+                {
+                        posibilities.append( 7 );
+
+                        //now we check if it is a full house
+                        if ( count == 3 && countFH == 2 ) //aka Full House
+                                posibilities.append( 9 );
+                }
+                if ( count >= 4 )
+                        posibilities.append( 8 );
+                if ( count == 5 )                     //Yatzee
+                        posibilities.append( 12 );
+        }
+        
+        //S-Straight
+        if ( numbers.find( 3 ) != numbers.end() && numbers.find( 4 ) != numbers.end() )
+        {
+                bool isLong = false;
+                bool isShort = true;
+                //L-Straight
+                if ( numbers.find( 2 ) != numbers.end() && numbers.find( 5 ) != numbers.end() )
+                {
+                        isShort = true;
+                
+                        //12345 or 23456
+                        if ( numbers.find( 1 ) != numbers.end() || numbers.find( 6) != numbers.end() )
+                                isLong = true;
+                }
+                //1234
+                if ( numbers.find( 1 ) != numbers.end() && numbers.find( 2 ) != numbers.end() )
+                        isShort = true;
+                //3456
+                if ( numbers.find( 5 ) != numbers.end() && numbers.find( 6 ) != numbers.end() )
+                        isShort = true;
+                
+                if ( isShort )
+                        posibilities.append( 10 );
+                if ( isLong )
+                        posibilities.append( 11 );
+                }
+        
+        posibilities.append( 13 );        //Chance, well, this is allways possible
+
+        displayPossibilites();
+}
+
+void OYatzee::displayPossibilites()
+{
+        qDebug( "running displayPossibilites(), %d item", posibilities.count() );
+        
+        for ( QValueListInt::Iterator it = posibilities.begin() ; it != posibilities.end(); ++it )
+        {
+                qDebug( QString::number( *it ) );
+                switch ( *it )
+                {
+                        case Ones:
+                                qDebug( "1er" );
+                                break;
+                        case Twos:
+                                qDebug( "2er" );
+                                break;
+                        case Threes:
+                                qDebug( "3er" );
+                                break;
+                        case Fours:
+                                qDebug( "4er" );
+                                break;
+                        case Fives:
+                                qDebug( "5er" );
+                                break;
+                        case Sixes:
+                                qDebug( "6er" );
+                                break;
+                        case ThreeOfAKind:
+                                qDebug( "3oaK" );
+                                break;
+                        case FourOfAKind:
+                                qDebug( "4oaK" );
+                                break;
+                        case FullHouse:
+                                qDebug( "Full House" );
+                                break;
+                        case SStraight:
+                                qDebug( "Short S" );
+                                break;
+                        case LStraight:
+                                qDebug( "Long S" );
+                                break;
+                        case Yatzee:
+                                qDebug( "Yatzee!" );
+                                break;
+                        case Chance:
+                                qDebug( "Chance" );
+                                break;
+                }
+        }
 }
@@ -89,3 +232,4 @@ void OYatzee::slotRollDices()
         {
-                d->roll();
+                if ( !d->isSelected )
+                        d->roll();
         }
@@ -205,3 +349,2 @@ DiceWidget::DiceWidget( QWidget *parent , const char *name ) : QWidget(  parent
         {
-                d->roll();
                 hbox->addWidget( d );
diff --git a/noncore/games/oyatzee/oyatzee.h b/noncore/games/oyatzee/oyatzee.h
index 01ab36d..65a18fc 100644
--- a/noncore/games/oyatzee/oyatzee.h
+++ b/noncore/games/oyatzee/oyatzee.h
@@ -16,2 +16,3 @@ class DiceWidget;
 typedef QList<Dice> dicesList;
+typedef QValueList<int> QValueListInt;
 
@@ -27,2 +28,3 @@ class OYatzee : public QMainWindow {
 
+                        QValueListInt posibilities;     
                 
@@ -30,2 +32,17 @@ class OYatzee : public QMainWindow {
                 void setRoundsNumber( const int num );
+                
+                enum { 
+                                Ones=1, 
+                                Twos = 2,
+                                Threes = 3,
+                                Fours = 4,
+                                Fives = 5,
+                                Sixes = 6,
+                                ThreeOfAKind = 7,        //12444
+                                FourOfAKind = 8,         //14444
+                                FullHouse = 9,           //22555
+                                SStraight = 10,          //13456
+                                LStraight = 11,          //12345
+                                Yatzee = 12,             //55555
+                                Chance = 13};
 
@@ -40,2 +57,4 @@ class OYatzee : public QMainWindow {
                 void detectPosibilities();
+                void displayPossibilites();
+
 };