found a bug in the shuffling routine

[e-DoKo.git] / functions.php

diff --git a/functions.php b/functions.php
index 31167e9f78de1b4dd8097f8576234596f733f534..66010aed18546a9d7573cae5c89194a12fd7c51a 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -78,6 +78,7 @@ function compare_cards($a,$b,$game)
 
   global $CARDS;
   global $RULES;
+  global $GAME;
 
   /* first map all cards to the odd number, 
    * this insure that the first card wins the trick 
@@ -93,6 +94,20 @@ function compare_cards($a,$b,$game)
     {
     case "normal":
     case "silent":
+      if($RULES["schweinchen"]=="both" && $GAME["schweinchen"])
+       {
+         if($a == 19 || $a == 20 )
+           return 1;
+         if($b == 19 || $b == 20 )
+           return 0;
+       };
+      if($RULES["schweinchen"]=="second" && $GAME["schweinchen"]==3)
+       {
+         if($a == 19 || $a == 20 )
+           return 1;
+         if($b == 19 || $b == 20 )
+           return 0;
+       };
     case "trump":
     case "heart":
     case "spade":
@@ -102,6 +117,7 @@ function compare_cards($a,$b,$game)
          return 0;        /* second one wins.*/
     }
   
+  /* normal case */
   if(is_trump($a) && is_trump($b) && $a<=$b)
     return 1;
   else if(is_trump($a) && is_trump($b) )
@@ -221,6 +237,8 @@ function check_wedding($cards)
 
 function count_trump($cards)
 {
+  global $RULES;
+
   $trump = 0;
 
   /* count each trump */
@@ -228,14 +246,23 @@ function count_trump($cards)
     if( (int)($c) <27) 
       $trump++;
 
-  /* subtract foxes */
-  if( in_array("19",$cards))
-    $trump--;
-  if( in_array("20",$cards) )
-    $trump--;
-  /* add one, in case the player has both foxes (schweinchen) */
-  if( in_array("19",$cards) && in_array("20",$cards) )
-    $trump++;
+  switch($RULES["schweinchen"])
+    {
+    case "none":
+      break;
+    case "second":
+    case "secondaftercall":
+      /* add one, in case the player has both foxes (schweinchen) */
+      if( in_array("19",$cards) && in_array("20",$cards) )
+       $trump++;
+    case "both":
+      /* subtract foxes */
+      if( in_array("19",$cards))
+       $trump--;
+      if( in_array("20",$cards) )
+       $trump--;
+      break;
+    }
 
   return $trump;
 }
@@ -388,14 +415,36 @@ function card_value($card)
 
 function  create_array_of_random_numbers()
 {
+  global $debug;
+
   $r = array();
   $a = array();
   
-  for($i=1;$i<49;$i++)
-    $a[$i]=$i;
-  
-  $r = array_rand($a,48);
-  
+  if($debug)
+    {
+      $a[ 0]=1;     $a[12]=47;   $a[24]=13;       $a[36]=37;
+      $a[ 1]=2;     $a[13]=48;   $a[25]=14;      $a[37]=38;
+      $a[ 2]=3;     $a[14]=27;   $a[26]=15;      $a[38]=39;
+      $a[ 3]=4;     $a[15]=16;   $a[27]=28;      $a[39]=40;
+      $a[ 4]=5;     $a[16]=17;   $a[28]=29;      $a[40]=41;
+      $a[ 5]=6;     $a[17]=18;   $a[29]=30;      $a[41]=42;
+      $a[ 6]=7;     $a[18]=19;   $a[30]=31;      $a[42]=43;
+      $a[ 7]=8;     $a[19]=20;   $a[31]=32;      $a[43]=44;
+      $a[ 8]=9;     $a[20]=45;   $a[32]=21;      $a[44]=33;
+      $a[ 9]=10;    $a[21]=46;   $a[33]=22;      $a[45]=34;
+      $a[10]=11;    $a[22]=35;   $a[34]=23;      $a[46]=25;
+      $a[11]=12;    $a[23]=36;   $a[35]=24;      $a[47]=26;
+
+      $r = $a;             
+    }
+  else
+    {
+      for($i=0;$i<48;$i++)
+       $a[$i]=$i+1;
+      
+      $r = shuffle($a);
+    };
+
   return $r;
 }
 
@@ -484,6 +533,9 @@ function set_gametype($gametype)
   switch($gametype)
     {
     case "normal":
+    case "wedding":
+    case "poverty":
+    case "dpoverty":
     case "trump":
     case "silent":
       $CARDS["trump"]    = array('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16', 
@@ -492,7 +544,7 @@ function set_gametype($gametype)
       $CARDS["clubs"]    = array('27','28','29','30','31','32','33','34');
       $CARDS["spades"]   = array('35','36','37','38','39','40','41','42');
       $CARDS["hearts"]   = array('43','44','45','46','47','48');
-      $CARDS["foxes"]    = array('21','22');
+      $CARDS["foxes"]    = array('19','20');
       if($RULES["dullen"]=='none')
        {
          $CARDS["trump"]    = array('3','4','5','6','7','8','9','10','11','12','13','14','15','16',