Changeset 55

Timestamp:

17/01/07 18:08:53 (6 years ago)

Author:

guyru

Message:

implemented the Yahtzee Joker scoring rules.

Location:

trunk/OpenYahtzee

Files:

• ChangeLog (modified) (1 diff)
• TODO (modified) (2 diffs)
• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (6 diffs)
• src/MainFrame.cpp (modified) (5 diffs)
• src/MainFrame.h (modified) (1 diff)

trunk/OpenYahtzee/ChangeLog

@@ -13 +13 @@
 - Redesigned the Settings Dialog.
 - The main window of the game is now unresizable (fixed size).
+- Disabled the ability to undo the last move of the game (this allowed people 
+  to re-enter their score to the high score table over and over again).
+- Implemented the Yahtzee Joker scoring rules.
 
 Open Yahtzee 1.6:

trunk/OpenYahtzee/TODO

@@ -5 +5 @@
 
 - Set a better icon for the windows installer
-- Disable the ability to undo the last move of the game.
 - Add abilliy to adjust how many times (avreage) will the dice roll before they stop.
 - Multiplayer mode.
@@ -15 +14 @@
 - Make the dice roll a couple of times before they stop.
 - Change the "reset high score" toggle button to a checkbox.
+- Disable the ability to undo the last move of the game.
 
 

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -7 +7 @@
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" >
-   <View0 line="55" Type="Source" />
+   <View0 Type="Source" />
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="240" Type="Source" />
+   <View0 line="695" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" >
@@ -16 +16 @@
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" >
-   <View0 line="82" Type="Source" />
+   <View0 line="69" Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc5>
   <Doc6 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.cpp" >
-   <View0 Type="Source" />
+   <View0 line="0" Type="Source" />
   </Doc6>
   <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" >
@@ -28 +28 @@
   </Doc7>
   <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.cpp" >
-   <View0 line="0" Type="Source" />
+   <View0 Type="Source" />
   </Doc8>
   <Doc9 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreTableDB.h" >
@@ -34 +34 @@
   </Doc9>
   <Doc10 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.cpp" >
-   <View0 line="0" Type="Source" />
+   <View0 line="125" Type="Source" />
   </Doc10>
   <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/Icon.h" >
@@ -40 +40 @@
   </Doc11>
   <Doc12 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.h" >
-   <View0 line="54" Type="Source" />
+   <View0 Type="Source" />
   </Doc12>
   <Doc13 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/wxDynamicBitmap.cpp" >
-   <View0 line="0" Type="Source" />
+   <View0 Type="Source" />
   </Doc13>
   <Doc14 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.cpp" >
@@ -49 +49 @@
   </Doc14>
   <Doc15 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/wxDynamicBitmap.h" >
-   <View0 line="42" Type="Source" />
+   <View0 Type="Source" />
   </Doc15>
   <Doc16 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.rc" >

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -25 +25 @@
  ***********************************************/
 
-//#define DEBUG
+#define DEBUG
 
 #include <wx/wx.h>
@@ -567 +567 @@
                 if (dicehash[i] == 3)
                         three = true;
-        if (two && three)
+        if ((two && three) || YahtzeeJoker())
                 ((wxTextCtrl*) FindWindow(ID_FULLHOUSETEXT))->SetValue(wxT("25"));
         else
@@ -589 +589 @@
                 (dicehash[2]>=1 && dicehash[3]>=1 && dicehash[4]>=1 && dicehash[5]>=1))
                         sequence = true;
-        if (sequence)
+        if (sequence || YahtzeeJoker())
                 ((wxTextCtrl*) FindWindow(ID_SMALLSEQUENCETEXT))->SetValue(wxT("30"));
         else
@@ -610 +610 @@
                 (dicehash[1]==1 && dicehash[2]==1 && dicehash[3]==1 && dicehash[4]==1 && dicehash[5]==1))
                         sequence = true;
-        if (sequence)
+        if (sequence || YahtzeeJoker())
                 ((wxTextCtrl*) FindWindow(ID_LARGESEQUENCETEXT))->SetValue(wxT("40"));
         else
@@ -692 +692 @@
 }
 
+bool MainFrame::YahtzeeJoker()
+{
+        if ((dice[0]==dice[1]) && (dice[1]==dice[2]) && (dice[1]==dice[3]) && (dice[1]==dice[4]) && !(FindWindow(ID_ACES+dice[0])->IsEnabled()) && !(FindWindow(ID_YAHTZEE)->IsEnabled())) {
+                return true;
+        }
+        return false;
+}
+
 void MainFrame::EndofGame()
 {

trunk/OpenYahtzee/src/MainFrame.h

@@ -68 +68 @@
         void ResetRolls();
         void YahtzeeBonus();
+        bool YahtzeeJoker();
         void EndofGame();
         void HighScoreHandler(int score);