X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=a338f388df0bb2822a654f3a13afb27e01d39a3a;hp=382b1488f20512864a68e6091c3e5f3b913e2d2d;hb=af2ee6fe421192cd2b42fcb4bbd09179bbce3943;hpb=880dfb2e715a3770de56fb525f5c90d28a6ccb4c

diff --git a/include/functions.php b/include/functions.php
index 382b148..a338f38 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,5 +1,5 @@
 <?php
-/* make sure that we are not called from outside the scripts, 
+/* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
@@ -171,14 +171,14 @@ function compare_cards($a,$b,$game)
     case "normal":
     case "silent":
     case "trump":
-      if($RULES["schweinchen"]=="both" && $GAME["schweinchen"])
+      if($RULES['schweinchen']=='both' && $GAME['schweinchen-who'])
 	{
 	  if($a == 19 || $a == 20 )
 	    return 1;
 	  if($b == 19 || $b == 20 )
 	    return 0;
 	};
-      if($RULES["schweinchen"]=="second" && $GAME["schweinchen"]==3)
+      if($RULES['schweinchen']=='second' && $GAME['schweinchen-second'])
 	{
 	  if($a == 19 || $a == 20 )
 	    return 1;
@@ -328,9 +328,9 @@ function count_trump($cards)
       $trump++;
 
   /* normally foxes don't count as trump, so we substract them here
-   * in case someone has schweinchen, one or two of them should count as trump 
+   * in case someone has schweinchen, one or two of them should count as trump
    * though, so we need to add one trump for those cases */
-  
+
   /* subtract foxes */
   if( in_array("19",$cards))
     $trump--;
@@ -367,17 +367,17 @@ function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
   if($debug)
     {
       $r[ 0]=1;     $r[12]=47;   $r[24]=13;       $r[36]=37;
-      $r[ 1]=2;     $r[13]=48;   $r[25]=14;	  $r[37]=38;
+      $r[ 1]=2;     $r[13]=23;   $r[25]=14;	  $r[37]=38;
       $r[ 2]=3;     $r[14]=27;   $r[26]=15;	  $r[38]=39;
       $r[ 3]=4;     $r[15]=16;   $r[27]=28;	  $r[39]=40;
       $r[ 4]=5;     $r[16]=17;   $r[28]=29;	  $r[40]=41;
       $r[ 5]=18;    $r[17]=6;    $r[29]=30;	  $r[41]=42;
-      $r[ 6]=19;    $r[18]=7;    $r[30]=31;	  $r[42]=43;
-      $r[ 7]=20;    $r[19]=8;    $r[31]=32;	  $r[43]=44;
-      $r[ 8]=45;    $r[20]=9;    $r[32]=21;	  $r[44]=33;
-      $r[ 9]=46;    $r[21]=10;   $r[33]=22;	  $r[45]=34;
-      $r[10]=35;    $r[22]=11;   $r[34]=23;	  $r[46]=25;
-      $r[11]=36;    $r[23]=12;   $r[35]=24;	  $r[47]=26;
+      $r[ 6]=21;    $r[18]=7;    $r[30]=31;	  $r[42]=43;
+      $r[ 7]=22;    $r[19]=8;    $r[31]=32;	  $r[43]=44;
+      $r[ 8]=45;    $r[20]=9;    $r[32]=19;	  $r[44]=33;
+      $r[ 9]=46;    $r[21]=10;   $r[33]=20;	  $r[45]=24;
+      $r[10]=35;    $r[22]=11;   $r[34]=48;	  $r[46]=25;
+      $r[11]=36;    $r[23]=12;   $r[35]=34;	  $r[47]=26;
     }
   else
     {
@@ -466,6 +466,7 @@ function set_gametype($gametype)
 {
   global $CARDS;
   global $RULES;
+  global $GAME;
 
   switch($gametype)
     {
@@ -488,6 +489,38 @@ function set_gametype($gametype)
 				     '17','18','19','20','21','22','23','24','25','26');
 	  $CARDS["hearts"]   = array('43','44','1','2','45','46','47','48');
 	}
+      /* do we need to reorder for Schweinchen? need to search for it because of special case for dullen above*/
+      if($RULES['schweinchen']=='both'&& $GAME['schweinchen-who'])
+	{
+	  /* find the fox and put them at the top of the stack */
+	  foreach(array('19','20') as $fox)
+	    {
+	      /* search for fox */
+	      $trump = $CARDS['trump'];
+	      $key = array_keys($trump, $fox);
+
+	      /* reorder */
+	      $foxa = array();
+	      $foxa[]=$trump[$key[0]];
+	      unset($trump[$key[0]]);
+	      $trump = array_merge($foxa,$trump);
+	      $CARDS['trump'] = $trump;
+	    }
+	}
+      else if( ($RULES['schweinchen']=='second' || $RULES['schweinchen']=='secondaftercall')
+	       && $GAME['schweinchen-who'])
+	{
+	  /* find the fox and put them at the top of the stack */
+	  $trump = $CARDS['trump'];
+	  $key = array_keys($trump, '19');
+
+	  /* reorder */
+	  $foxa = array();
+	  $foxa[]=$trump[$key[0]];
+	  unset($trump[$key[0]]);
+	  $trump = array_merge($foxa,$trump);
+	  $CARDS['trump'] = $trump;
+	}
       break;
     case "queen":
       $CARDS["trump"]    = array('3','4','5','6','7','8','9','10');
@@ -572,7 +605,7 @@ function sort_comp($a,$b)
 
   $ALL = array();
   $ALL = array_merge($CARDS["trump"],$CARDS["diamonds"],$CARDS["clubs"],
-		     $CARDS["hearts"],$CARDS["spades"],$CARDS["diamonds"]);
+		     $CARDS["hearts"],$CARDS["spades"]);
 
   return pos_array($a,$ALL)-pos_array($b,$ALL);
 }
@@ -664,6 +697,7 @@ function can_call($what,$hash)
 function display_table ()
 {
   global $gameid, $GT, $debug,$INDEX,$defaulttimezone;
+  global $RULES,$GAME,$gametype;
 
   $result = DB_query("SELECT  User.fullname as name,".
 		     "        Hand.position as position, ".
@@ -703,6 +737,10 @@ function display_table ()
 	echo "   <a href=\"".$INDEX."?action=game&me=".$hash."\">$name</a>\n";
 
       /* add hints for poverty, wedding, solo, etc */
+      if( $gametype != "solo")
+	if( $RULES["schweinchen"]=="both" && $GAME["schweinchen-who"]==$hash )
+	  echo " Schweinchen. <br />";
+
       if($GT=="poverty" && $party=="re")
 	if($sickness=="poverty")
 	  {
@@ -809,8 +847,6 @@ function display_table ()
 function display_user_menu()
 {
   global $WIKI,$myid,$INDEX;
-  echo "<div class=\"usermenu\">\n".
-    "<a href=\"".$INDEX."\"> Go to my user page </a>";
 
   $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.player from Hand".
 		     " LEFT JOIN Game On Hand.game_id=Game.id".
@@ -819,22 +855,25 @@ function display_user_menu()
 		     " AND Game.status<>'gameover'".
 		     " ORDER BY Game.session" );
   if(DB_num_rows($result))
-      echo "<hr />It's your turn in these games:<br />\n";
+      echo "It's your turn in these games:<br />\n";
 
+  $i=0;
   while( $r = DB_fetch_array($result))
     {
+      if($i==0)
+	echo "<div class=\"usermenu\">\n";
+
+      $i++;
       echo "<a href=\"".$INDEX."?action=game&me=".$r[0]."\">game ".DB_format_gameid($r[1])." </a><br />\n";
+      if($i>4)
+	{
+	  echo "...<br />\n";
+	  break;
+	}
     }
 
-  echo "<hr /> <a href=\"".$INDEX."?action=new\">Start a new game</a>\n";
-
-  echo "<hr /> <a href=\"".$INDEX."?action=prefs\">Change settings</a>\n";
-
-  echo "<hr /> <a href=\"".$INDEX."?action=stats\">Statistics</a>\n";
-
-  echo
-    "<hr />Report bugs in the <a href=\"".$WIKI."\">wiki</a>\n";
-  echo  "</div>\n";
+  if($i)
+    echo  "</div>\n";
   return;
 }
 
@@ -895,6 +934,8 @@ function generate_score_table($session)
 
 function generate_global_score_table()
 {
+  $return = array();
+
   /* get all ids */
   $gameids = DB_get_gameids_of_finished_games_by_session(0);
 
@@ -927,8 +968,7 @@ function generate_global_score_table()
 	    $player[$key]['nr']+=1;
 	}
     }
-  
-  echo "<table>\n <tr>\n";
+
   function cmp($a,$b)
   {
     if($a['nr']==0 ) return 1;
@@ -937,19 +977,20 @@ function generate_global_score_table()
     $a=$a['points']/$a['nr'];
     $b=$b['points']/$b['nr'];
 
-    if ($a == $b) 
+    if ($a == $b)
       return 0;
     return ($a > $b) ? -1 : 1;
   }
   usort($player,"cmp");
+
   foreach($player as $pl)
     {
+      /* limit to players with at least 10 games */
       if($pl['nr']>10)
-	echo "  <tr><td>",$pl['name'],"</td><td>",round($pl['points']/$pl['nr'],3),"</td></tr>\n";
+	$return[] = array( $pl['name'], round($pl['points']/$pl['nr'],3) );
     }
-  echo "</table>\n";
-    
-  return;
+
+  return $return;
 }