Realease

MathColoringGame/App.xaml.cs

@@ -13,6 +13,5 @@ namespace MathColoringGame
     /// </summary>
     public partial class App : Application
     {
-        
     }
 }

MathColoringGame/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MathColoringGame"
         mc:Ignorable="d"
-        Title="MainWindow" Height="780" Width="900"
+        Title="MainWindow" Height="850" Width="850"
         WindowStyle="None"
         Background="Transparent"
         AllowsTransparency="True"
@@ -14,21 +14,31 @@
     <Border CornerRadius="20"
             Background="Gray">
 
+        
+
         <Grid>
 
             <Grid.RowDefinitions>
                 <RowDefinition Height="35"/>
-                <RowDefinition Height="180"/>
+                <RowDefinition Height="220"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
 
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
-                <ColumnDefinition Width="460"/>
+                <ColumnDefinition Width="500"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
+            <Border Grid.Row="1"
+                Grid.Column="1"
+                Background="DarkGreen"
+                Width="350"
+                Height="210"
+                BorderThickness="3"
+                BorderBrush="Black"/>
 
             <Border Grid.Row="0"
+                    Grid.ColumnSpan="3"                    
                     Background="Transparent"
                     MouseDown="Border_MouseDown"/>
 
@@ -68,6 +78,7 @@
 
 
             <Button x:Name="BtnStartRoll"
+                    Margin="0,0,0,20"
                     Style="{StaticResource ModernButton}"
                     Grid.Column="1"
                     Grid.Row="1"
@@ -83,7 +94,7 @@
                     Grid.Column="1"
                     Grid.Row="2"
                     VerticalAlignment="Bottom"
-                    Margin="20"
+                    Margin="40"
                     Width="120"
                     Height="45"
                     FontSize="18"
@@ -93,33 +104,33 @@
             
             <Border Grid.Row="1"
                     Grid.Column="1"
-                    Margin="15,40"
+                    Margin="120,40"
                     VerticalAlignment="Top"
                     HorizontalAlignment="Left"
-                    Width="80"
+                    Width="100"
-                    Height="80">
+                    Height="100">
                 <Border.Background>
-                    <ImageBrush x:Name="Dice1" ImageSource="/Images/DiceSix.png"/>
+                    <ImageBrush x:Name="Dice1" ImageSource="/Images/Dice9.png"/>
                 </Border.Background>
             </Border>
-            <Border Margin="0,40,15,0"
+            <Border Margin="0,40,120,0"
                     Grid.Row="1"
                     Grid.Column="1"
                     VerticalAlignment="Top"
                     HorizontalAlignment="Right"
-                    Width="80"
+                    Width="100"
-                    Height="80">
+                    Height="100">
                 <Border.Background>
-                    <ImageBrush x:Name="Dice2" ImageSource="/Images/DiceSix.png"/>
+                    <ImageBrush x:Name="Dice2" ImageSource="/Images/Dice9.png"/>
                 </Border.Background>
             </Border>
 
             <WrapPanel
                     HorizontalAlignment="Center"
                     Grid.Column="1"
-                    Grid.Row="1">
+                    Grid.Row="0">
                 <TextBlock
-                    FontSize="20"
+                    FontSize="22"
                     FontWeight="Bold"
                     FontFamily="Comic Sans MS"
                     Text="Round: "/>
@@ -138,7 +149,7 @@
 
 
             <TextBlock
-                    Margin="0,10,0,0"
+                    Margin="0,40,0,0"
                     Grid.Row="1"
                     HorizontalAlignment="Center"
                     Text="Player 1"
@@ -150,7 +161,7 @@
                 </TextBlock.Effect>
             </TextBlock>
             <TextBlock
-                    Margin="0,10,0,0"
+                    Margin="0,40,0,0"
                     Grid.Row="1"
                     Grid.Column="2"
                     HorizontalAlignment="Center"
@@ -274,10 +285,10 @@
             </StackPanel>
 
             <StackPanel Grid.Row="2" Grid.Column="2"
-                        Margin="15,0,0,0">
+                        Margin="0,0,0,0">
                 <WrapPanel>
                     <TextBlock
-                    Margin="10,30,0,0"
+                    Margin="0,30,0,0"
                     FontSize="16"
                     Text="Result Round 1: "
                     FontFamily="Comic Sans MS"/>
@@ -295,7 +306,7 @@
 
                 <WrapPanel>
                     <TextBlock
-                    Margin="10,30,0,0"
+                    Margin="0,30,0,0"
                     FontSize="16"
                     Text="Result Round 2: "
                     FontFamily="Comic Sans MS"/>
@@ -313,7 +324,7 @@
 
                 <WrapPanel>
                     <TextBlock
-                    Margin="10,30,0,0"
+                    Margin="0,30,0,0"
                     FontSize="16"
                     Text="Result Round 3: "
                     FontFamily="Comic Sans MS"/>
@@ -331,7 +342,7 @@
 
                 <WrapPanel>
                     <TextBlock
-                    Margin="10,30,0,0"
+                    Margin="0,30,0,0"
                     FontSize="16"
                     Text="Result Round 4: "
                     FontFamily="Comic Sans MS"/>
@@ -349,7 +360,7 @@
 
                 <WrapPanel>
                     <TextBlock
-                    Margin="10,30,0,0"
+                    Margin="0,30,0,0"
                     FontSize="16"
                     Text="Result Round 5: "
                     FontFamily="Comic Sans MS"/>
@@ -367,7 +378,7 @@
 
                 <WrapPanel>
                     <TextBlock
-                    Margin="10,30,0,0"
+                    Margin="0,30,0,0"
                     FontSize="16"
                     Text="Total Result: "
                     FontFamily="Comic Sans MS"/>
@@ -383,24 +394,7 @@
                          FontFamily="Comic Sans MS"/>                  
 
                  </WrapPanel>
-                <WrapPanel>
+               
-                    <TextBlock
-                    Margin="10,30,0,0"
-                    FontSize="16"
-                    Text="dice Result: "
-                    FontFamily="Comic Sans MS"/>
-
-                    <TextBox x:Name="testbox"
-                             Text="0"
-                             Margin="0,29,0,0"
-                             FontWeight="Bold"
-                             Background="Transparent"
-                             BorderThickness="0 "
-                         FontSize="16"
-                         Height="30"
-                         FontFamily="Comic Sans MS"/>
-
-                </WrapPanel>
             </StackPanel>
 
             <Grid x:Name="Container"
@@ -411,9 +405,9 @@
                   Grid.Row="2"
                   Grid.Column="0"
                   Grid.ColumnSpan="3">
-                <Button Click="Button_Click" BorderBrush="Black" Background="Red"/>
+                <Button BorderBrush="Black" Background="Red" Click="Button_Click"/>
                 <Button Click="Button_Click" Background="Red" Grid.Row="1" BorderBrush="Black"/>
-                <Button Click="Button_Click" Background="Red" Grid.Row="2" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="Red" Grid.Row="2" BorderBrush="Black" />
                 <Button Click="Button_Click" Background="Red" Grid.Row="3" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="blue" Grid.Row="4" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="blue" Grid.Row="5" BorderBrush="Black"/>
@@ -473,6 +467,9 @@
                 <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="2" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="2" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="2" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="2" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="2" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="2" BorderBrush="Black"/>
 
                 <Button Click="Button_Click" Background="Red" Grid.Column="3" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="Red" Grid.Row="1" Grid.Column="3" BorderBrush="Black"/>
@@ -492,6 +489,9 @@
                 <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="3" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="3" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="3" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="3" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="3" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="3" BorderBrush="Black"/>
 
                 <Button Click="Button_Click" Background="Red" Grid.Column="4" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="Red" Grid.Row="1" Grid.Column="4" BorderBrush="Black"/>
@@ -511,6 +511,9 @@
                 <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="4" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="4" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="4" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="4" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="4" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="4" BorderBrush="Black"/>
 
                 <Button Click="Button_Click" Background="Red" Grid.Column="5" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="Red" Grid.Row="1" Grid.Column="5" BorderBrush="Black"/>
@@ -530,6 +533,9 @@
                 <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="5" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="5" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="5" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="5" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="5" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="5" BorderBrush="Black"/>
 
                 <Button Click="Button_Click" Background="Red" Grid.Column="6" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="Red" Grid.Row="1" Grid.Column="6" BorderBrush="Black"/>
@@ -549,6 +555,9 @@
                 <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="6" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="6" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="6" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="6" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="6" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="6" BorderBrush="Black"/>
 
                 <Button Click="Button_Click" Background="Red" Grid.Column="7" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="Red" Grid.Row="1" Grid.Column="7" BorderBrush="Black"/>
@@ -568,6 +577,9 @@
                 <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="7" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="7" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="7" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="7" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="7" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="7" BorderBrush="Black"/>
 
                 <Button Click="Button_Click" Background="Red" Grid.Column="8" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="Red" Grid.Row="1" Grid.Column="8" BorderBrush="Black"/>
@@ -587,6 +599,9 @@
                 <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="8" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="8" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="8" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="8" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="8" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="8" BorderBrush="Black"/>
 
                 <Button Click="Button_Click" Background="Red" Grid.Column="9" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="Red" Grid.Row="1" Grid.Column="9" BorderBrush="Black"/>
@@ -606,6 +621,229 @@
                 <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="9" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="9" BorderBrush="Black"/>
                 <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="9" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="9" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="9" BorderBrush="Black"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="9" BorderBrush="Black"/>
+
+                <Button Click="Button_Click" Background="Red" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="Red" Grid.Row="1" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="Red" Grid.Row="2" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="blue" Grid.Row="3" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="blue" Grid.Row="4" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="blue" Grid.Row="5" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="blue" Grid.Row="6" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="10" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="11" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="12" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="13" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="14" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="15" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="16" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="17" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="18" BorderBrush="Black" Margin="5,0,-5,0"/>
+
+                <Button Click="Button_Click" Background="White" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="1" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="2" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="3" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="4" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="5" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="6" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="7" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="8" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="9" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="10" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="11" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="12" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="13" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="14" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="15" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="16" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="17" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="18" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="19" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
+                <Button Click="Button_Click" Background="White" Grid.Row="20" Grid.Column="19" BorderBrush="Black" Margin="5,0,-5,0"/>
 
                 <Grid.RowDefinitions>
                     <RowDefinition/>
@@ -641,7 +879,9 @@
                     <ColumnDefinition/>
                     <ColumnDefinition/>
                     <ColumnDefinition/>
-                    <ColumnDefinition/>
+                    <ColumnDefinition>
+                                    
+                    </ColumnDefinition>
                     <ColumnDefinition/>
                     <ColumnDefinition/>
                     <ColumnDefinition/>
@@ -653,6 +893,7 @@
                     <ColumnDefinition/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
+                
 
             </Grid>
         </Grid>

MathColoringGame/MainWindow.xaml.cs

@@ -13,7 +13,7 @@ namespace MathColoringGame
     /// Interaction logic for MainWindow.xaml
     /// </summary>
     public partial class MainWindow : Window
-    {        
+    {
         public MainWindow()
 
         {
@@ -27,7 +27,7 @@ namespace MathColoringGame
         int diceResult;
 
         private MarkTyp[] mResults;
-        private bool mPlayer1Turn;               
+        private bool mPlayer1Turn;
 
         //Starts a new game an clear all values back to the start
         public void NewGame()
@@ -35,10 +35,10 @@ namespace MathColoringGame
         {
             cellCounter = 0;
             roundCounter = 1;
-            
+
 
             // Create a new blanck aray of free cells
-            mResults = new MarkTyp[180];
+            mResults = new MarkTyp[420];
 
             for (var i = 0; i < mResults.Length; i++)
                 mResults[i] = MarkTyp.Free;
@@ -51,7 +51,7 @@ namespace MathColoringGame
             {
                 // Change background to default values
                 button.Background = Brushes.White;
-            });            
+            });
         }
 
         // Ends the game
@@ -60,10 +60,10 @@ namespace MathColoringGame
             if (roundCounter >= 6)
             {
                 Round.Text = "5";
-                CheckWinner();                                                
+                CheckWinner();
-                ClearAll();                
+                ClearAll();
                 NewGame();
-                
+
                 mPlayer1Turn ^= true;
 
             }
@@ -78,11 +78,11 @@ namespace MathColoringGame
             {
                 MessageBox.Show("The Winner is Player 1!");
             }
-            if(endResult1 < endResult2)
+            if (endResult1 < endResult2)
             {
                 MessageBox.Show("The Winner is Player 2!");
             }
-            if(endResult1 == endResult2)
+            if (endResult1 == endResult2)
             {
                 MessageBox.Show("The Game ended in a draw!");
             }
@@ -92,7 +92,7 @@ namespace MathColoringGame
         private void ClearAll()
         {
             Round.Text = "1";
-            
+
             p1round1.Text = "0";
             p1round2.Text = "0";
             p1round3.Text = "0";
@@ -124,7 +124,7 @@ namespace MathColoringGame
 
         // add Totalresulst by Player selectet cells
         public void PlayerResult()
-        {      
+        {
             // text to int
             int p1result1 = int.Parse(p1round1.Text);
             int p1result2 = int.Parse(p1round2.Text);
@@ -148,17 +148,17 @@ namespace MathColoringGame
         // count cells by player click cell
         public void CountCells()
         {
-            
+
             if (mPlayer1Turn && roundCounter == 1)
             {
                 cellCounter++;
                 p1round1.Text = cellCounter.ToString();
-                
+
             }
             if (!(mPlayer1Turn) && roundCounter == 1)
             {
                 cellCounter++;
-                p2round1.Text = cellCounter.ToString();                
+                p2round1.Text = cellCounter.ToString();
             }
 
             if (mPlayer1Turn && roundCounter == 2)
@@ -216,6 +216,8 @@ namespace MathColoringGame
         {
             if (e.LeftButton == MouseButtonState.Pressed)
                 DragMove();
+
+
         }
         // Minimize the Window on Click MinimizeButton
         private void BtnMinimizeClick(object sender, RoutedEventArgs e)
@@ -245,82 +247,95 @@ namespace MathColoringGame
         {
             BtnStartRoll.Visibility = Visibility.Hidden;
 
-            string finalImage1 = "DiceSix.png";
+            string finalImage1 = "Dice9.png";
-            string finalImage2 = "DiceOne.png";
+            string finalImage2 = "Dice2.png";
+
 
-                        
 
             // Gernerate Numbers in Range
-            int number1 = dice.Next(1, 7);
+            int number1 = dice.Next(2, 10);
-            int number2 = dice.Next(1, 7);
+            int number2 = dice.Next(2, 10);
 
             // switch Pictures by case
             switch (number1)
             {
-                case 1:
-                    finalImage1 = "DiceOne.png";
-                    break;
                 case 2:
-                    finalImage1 = "DiceTwo.png";
+                    finalImage1 = "Dice2.png";
                     break;
                 case 3:
-                    finalImage1 = "DiceThree.png";
+                    finalImage1 = "Dice3.png";
                     break;
                 case 4:
-                    finalImage1 = "DiceFour.png";
+                    finalImage1 = "Dice4.png";
                     break;
                 case 5:
-                    finalImage1 = "DiceFive.png";
+                    finalImage1 = "Dice5.png";
                     break;
                 case 6:
-                    finalImage1 = "DiceSix.png";
+                    finalImage1 = "Dice6.png";
+                    break;
+                case 7:
+                    finalImage1 = "Dice7.png";
+                    break;
+                case 8:
+                    finalImage1 = "Dice8.png";
+                    break;
+                case 9:
+                    finalImage1 = "Dice9.png";
                     break;
                 default:
-                    finalImage1 = "DiceSix.png";
+                    finalImage1 = "Dice9.png";
                     break;
             }
             Dice1.ImageSource = new BitmapImage(new Uri("Images/" + finalImage1, UriKind.Relative));
 
             switch (number2)
             {
-                case 1:
-                    finalImage2 = "DiceOne.png";
-                    break;
                 case 2:
-                    finalImage2 = "DiceTwo.png";
+                    finalImage2 = "Dice2.png";
                     break;
                 case 3:
-                    finalImage2 = "DiceThree.png";
+                    finalImage2 = "Dice3.png";
                     break;
                 case 4:
-                    finalImage2 = "DiceFour.png";
+                    finalImage2 = "Dice4.png";
                     break;
                 case 5:
-                    finalImage2 = "DiceFive.png";
+                    finalImage2 = "Dice5.png";
                     break;
                 case 6:
-                    finalImage2 = "DiceSix.png";
+                    finalImage2 = "Dice6.png";
+                    break;
+                case 7:
+                    finalImage2 = "Dice7.png";
+                    break;
+                case 8:
+                    finalImage2 = "Dice8.png";
+                    break;
+                case 9:
+                    finalImage2 = "Dice9.png";
                     break;
                 default:
-                    finalImage2 = "DiceOne.png";
+                    finalImage2 = "Dice9.png";
                     break;
             }
             Dice2.ImageSource = new BitmapImage(new Uri("Images/" + finalImage2, UriKind.Relative));
 
             diceResult = number1 * number2;
-            testbox.Text = diceResult.ToString();
-            
             
+
+
         }
 
-        
+
 
         // Handesl Cell click event                  
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-
+           
             if (diceResult > 0 && diceResult != cellCounter)
             {
+                
                 //cast the sender to Cell
                 var button = (Button)sender;
 
@@ -329,7 +344,7 @@ namespace MathColoringGame
                 var column = Grid.GetColumn(button);
                 var row = Grid.GetRow(button);
 
-                var index = column + (row * 10);
+                var index = column + (row * 20);
 
                 // dont`t do anything if the cellalready has a value in it
                 if (mResults[index] != MarkTyp.Free)
@@ -342,32 +357,34 @@ namespace MathColoringGame
                 button.Background = mPlayer1Turn ? Brushes.Red : Brushes.Blue;
                 //count selectet cells per player
                 CountCells();
-            }                  
+            }
-                   
+
-                                             
+
         }
-        
+
         // Handel count cells
         private void BtnEndTurnClick(object sender, RoutedEventArgs e)
         {
+
             BtnStartRoll.Visibility = Visibility.Visible;
 
             diceResult = 0;
 
             // check how many cells the Player marks
-            PlayerResult();            
+            PlayerResult();
 
             //count rounds
             CountRounds();
 
             // Check if game is end
             GameEnded();
-            
+
             mPlayer1Turn ^= true;
 
             cellCounter = 0;
-        }
+        }   
-                
+
+        
     }   
 }
 

MathColoringGame/MathColoringGame.csproj

@@ -10,6 +10,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="Images\Dice2.png" />
+    <None Remove="Images\Dice3.png" />
+    <None Remove="Images\Dice4.png" />
+    <None Remove="Images\Dice5.png" />
+    <None Remove="Images\Dice6.png" />
+    <None Remove="Images\Dice7.png" />
+    <None Remove="Images\Dice8.png" />
+    <None Remove="Images\Dice9.png" />
     <None Remove="Images\DiceFive.png" />
     <None Remove="Images\DiceFour.png" />
     <None Remove="Images\DiceOne.png" />
@@ -19,6 +27,30 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Include="Images\Dice2.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\Dice3.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\Dice4.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\Dice5.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\Dice6.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\Dice7.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\Dice8.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\Dice9.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Images\DiceFive.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>