\n"; - echo "Do you want to continue playing?(This will start a new game, with $playerD as dealer.)\n"; + echo "Do you want to continue playing?(This will start a new game, with $playerA starting the game.)\n"; echo " \n"; echo " \n"; echo " \n"; -- cgit v1.2.3-18-g5258 From f0e93ad1feb9ba47dc1db80354b5f28d29b5ab27 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Thu, 4 Mar 2010 19:11:18 -0800 Subject: BUGFIX: show "It's your turn in these games" menu also when you played the last card in a game When showing the menu we test for the status the user had before he played the card. This fixes Issue #35. --- include/game.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/game.php b/include/game.php index a1c02a0..93ab461 100644 --- a/include/game.php +++ b/include/game.php @@ -47,6 +47,7 @@ global $GAME,$RULES,$CARDS; $gameid = DB_get_gameid_by_hash($me); $myname = DB_get_name('hash',$me); $mystatus = DB_get_status_by_hash($me); +$origmystatus = DB_get_status_by_hash($me); /* to show "it's your turn" menu when game has just finished */ $mypos = DB_get_pos_by_hash($me); $myhand = DB_get_handid('hash',$me); $myparty = DB_get_party_by_hash($me); @@ -2031,11 +2032,20 @@ switch($mystatus) /* output other games where it is the users turn * make sure that the people looking at old games don't see the wrong games here */ -if( $mystatus != 'gameover' ) - display_user_menu($myid); +if( $gamestatus != 'gameover' ) + { + /* game isn't over, only valid user can get here, so show menu */ + display_user_menu($myid); + } +else if( $origmystatus != 'gameover' ) + { + /* user just played the very last card, game is now over, it's still ok to show the menu though */ + display_user_menu($myid); + } else if( $mystatus == 'gameover' && - isset($_SESSION['id']) ) + isset($_SESSION['id']) ) { + /* user is looking at someone else's game, show the menu for the correct user */ display_user_menu($_SESSION['id']); } else -- cgit v1.2.3-18-g5258 From bc566c5be2acb50a04003e25d3ec9cde4e791786 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Thu, 4 Mar 2010 21:02:56 -0800 Subject: fixed typo in create statement --- create_database.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create_database.sql b/create_database.sql index fd7b22a..e9577c9 100644 --- a/create_database.sql +++ b/create_database.sql @@ -263,7 +263,7 @@ CREATE TABLE `Card_Exchange` ( /*!40000 ALTER TABLE `Hand_Card` DISABLE KEYS */; -LOCK TABLES `Hand_Card` WRITE; +LOCK TABLES `Card_Exchange` WRITE; UNLOCK TABLES; /*!40000 ALTER TABLE `Hand_Card` ENABLE KEYS */; -- cgit v1.2.3-18-g5258 From fceb0d9bc48ae848461e728abaf5065a2578da61 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Thu, 4 Mar 2010 21:43:37 -0800 Subject: CLEANUP: moved more statistics into the sortable table --- include/functions.php | 53 ++++++++++++++++++++++++++++++++++++++++++++++++--- include/stats.php | 48 ++++++---------------------------------------- 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/include/functions.php b/include/functions.php index 16d094c..173ccd4 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1156,7 +1156,8 @@ function generate_global_score_table() /* save information in an array */ while( $r = DB_fetch_array($result)) - $player[$r[0]] = array('name'=> $r[1], 'points' => 0 ,'nr' => 0); + $player[$r[0]] = array('name'=> $r[1], 'points' => 0 , 'nr' => 0, 'active' => 0, + 'response' => 0 , 'solo' => 0, 'soloavg' => 0); /* get points and generate table */ foreach($gameids as $gameid) @@ -1182,9 +1183,53 @@ function generate_global_score_table() } } + /* add number of active games */ + $result = DB_query_array_all("SELECT user_id, COUNT(*) as c " . + " FROM Hand". + " LEFT JOIN Game ON Game.id=game_id". + " WHERE Game.status IN ('pre','play')". + " GROUP BY user_id"); + + foreach($result as $res) + { + $player[$res[0]]['active'] = $res[1]; + } + + /* response time of users*/ + $result = DB_query_array_all("SELECT user_id,". + "IFNULL(AVG(if(P1.sequence in (2,3,4),". + "-timestampdiff(MINUTE,mod_date,(select mod_date from Play P2 where P1.trick_id=P2.trick_id and P2.sequence=P1.sequence-1)),NULL )),1e9) as a ". + "FROM Play P1 ". + "LEFT JOIN Hand_Card ON P1.hand_card_id=Hand_Card.id ". + "LEFT JOIN Hand ON Hand.id=Hand_Card.hand_id ". + "GROUP BY user_id "); + + foreach($result as $res) + { + $player[$res[0]]['response'] = $res[1]; + } + + /* most solos */ + $result = DB_query_array_all("SELECT user_id as uid,". + " COUNT(*), ". + " COUNT(*)/(SELECT COUNT(*) FROM Hand LEFT JOIN User ON User.id=Hand.user_id WHERE User.id=uid) as c ". + " FROM Game ". + " LEFT JOIN Hand ON Hand.position=startplayer AND Game.id=Hand.game_id ". + " WHERE type='solo' AND Game.status='gameover' ". + " GROUP BY user_id "); + + foreach($result as $res) + { + $player[$res[0]]['solo'] = $res[1]; + $player[$res[0]]['soloavg'] = $res[2]; + } + + + /* sort everything nicely */ + function cmp($a,$b) { - if($a['nr']==0 ) return 1; + if($a['nr']==0) return 1; if($b['nr']==0) return 1; $a=$a['points']/$a['nr']; @@ -1196,11 +1241,13 @@ function generate_global_score_table() } usort($player,'cmp'); + foreach($player as $pl) { /* limit to players with at least 10 games */ if($pl['nr']>10) - $return[] = array( $pl['name'], round($pl['points']/$pl['nr'],3), $pl['points'],$pl['nr']); + $return[] = array( $pl['name'], round($pl['points']/$pl['nr'],3), $pl['points'],$pl['nr'],$pl['active'], + $pl['response'],$pl['solo'],$pl['soloavg']); } return $return; diff --git a/include/stats.php b/include/stats.php index fb56df8..61e7d88 100644 --- a/include/stats.php +++ b/include/stats.php @@ -24,6 +24,9 @@ if(!isset($HOST)) exit; +/* turn warnings off (problem with two warnings in function.php */ +error_reporting(!E_ALL & ~E_NOTICE); + $name = $_SESSION["name"]; $email = DB_get_email('name',$name); @@ -190,46 +193,6 @@ if( !$content = getCache("cache/stats.html",60*60*24) ) array_unshift($result,array("Position","Number of tricks")); echo output_table($result,"Tricks at the table","stats"); - /* most solos */ - $result = DB_query_array_all("SELECT fullname as fname,". - " COUNT(*), ". - " COUNT(*)/(SELECT COUNT(*) FROM Hand LEFT JOIN User ON User.id=Hand.user_id WHERE fullname=fname) as c ". - " FROM Game ". - " LEFT JOIN Hand ON Hand.position=startplayer AND Game.id=Hand.game_id ". - " LEFT JOIN User ON User.id=Hand.user_id ". - " WHERE type='solo' AND Game.status='gameover' ". - " GROUP BY user_id ". - " ORDER BY c DESC;"); - array_unshift($result,array("Name","Number of solos","Solos/game")); - echo output_table($result,"Most solos","stats"); - - - /* most active games */ - $result = DB_query_array_all("SELECT fullname, COUNT(*) as c " . - " FROM Hand". - " LEFT JOIN User ON User.id=user_id". - " LEFT JOIN Game ON Game.id=game_id". - " WHERE Game.status IN ('pre','play')". - " GROUP BY user_id". - " ORDER BY c DESC LIMIT 7" ); - array_unshift($result,array("Name","Number of active games")); - echo output_table($result,"Active games","stats"); - - /* response time of users*/ - $result = DB_query_array_all("SELECT User.fullname,". - "IFNULL(AVG(if(P1.sequence in (2,3,4),". - "-timestampdiff(MINUTE,mod_date,(select mod_date from Play P2 where P1.trick_id=P2.trick_id and P2.sequence=P1.sequence-1)),NULL )),1e9) as a, ". - " COUNT(*) as na ". - "FROM Play P1 ". - "LEFT JOIN Hand_Card ON P1.hand_card_id=Hand_Card.id ". - "LEFT JOIN Hand ON Hand.id=Hand_Card.hand_id ". - "LEFT JOIN User ON Hand.user_id=User.id ". - "GROUP BY user_id ". - "HAVING na>8 ". - "ORDER BY a " ); - array_unshift($result,array("Name","Average minutes before response","trick count")); - echo output_table($result,"Response","stats"); - /* does the party win more often if they start @@ -244,8 +207,9 @@ if( !$content = getCache("cache/stats.html",60*60*24) ) echo " games

\n"; */ $result = generate_global_score_table(); - array_unshift($result,array("Name","Average score per game","Total Points","Number of games")); - echo output_table($result,"Points per game (need more than 10 games)","stats","ScoreTable"); + array_unshift($result,array('Name','Average score per game','Total Points','Number of games', 'Active games', + 'Response Time [min]','Number of solos','Solos/game')); + echo output_table($result,'Players (need more than 10 games)','stats','ScoreTable'); /* * how often is the last trick a non-trump trick -- cgit v1.2.3-18-g5258 From cf764594cd00e66ee812c5d63b016bf286178f67 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sat, 13 Mar 2010 11:52:36 -0800 Subject: added check in DB_open for correct DB-version --- include/db.php | 11 +++++++++-- index.php | 12 +++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/include/db.php b/include/db.php index b79da87..5503a4a 100644 --- a/include/db.php +++ b/include/db.php @@ -30,17 +30,24 @@ if(!isset($HOST)) function DB_open() { + $version_needed = 1; + global $DB,$DB_user,$DB_host,$DB_database,$DB_password; $DB = @mysql_connect($DB_host,$DB_user, $DB_password); if ( $DB ) { - mysql_select_db($DB_database) or die('Could not select database'); + mysql_select_db($DB_database) or die('Error: Could not select database'); } else { echo mysql_errno() . ": " . mysql_error(). "\n"; return -1; - } + }; + + $version = DB_get_version(); + if ($version != $version_needed) + return -2; + return 0; } diff --git a/index.php b/index.php index 83618f3..54efdcb 100644 --- a/index.php +++ b/index.php @@ -36,11 +36,17 @@ include_once("./include/functions.php"); /* the rest */ config_check(); /* open the database */ -if(DB_open()<0) +$DBopen = DB_open(); +if($DBopen<0) { output_header(); - echo "Database error, can't connect... Please wait a while and try again. ". - "If the problem doesn't go away feel free to contact $ADMIN_NAME at $ADMIN_EMAIL."; + + if($DBopen == -1) + echo "Database error, can't connect... Please wait a while and try again. ". + "If the problem doesn't go away feel free to contact $ADMIN_NAME at $ADMIN_EMAIL."; + else if ($DBopen == -2) + echo "Wrong database version, please update your database using the update.php script."; + output_footer(); exit(); } -- cgit v1.2.3-18-g5258 From 850378a3e2da48d387dc565cc6e3c2b47f12e34d Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sat, 13 Mar 2010 15:59:07 -0800 Subject: NEW FEATURE: having only low trump (fox and below) can now be a Vorbehalt The low trump can either be treated as poverty or similar to 5 nines, that is the game is canceled unless someone plays a solo. Also minor code cleanup. --- create_database.sql | 7 ++-- include/db.php | 15 ++++---- include/functions.php | 52 ++++++++++++++++++++++----- include/game.php | 98 +++++++++++++++++++++++++++++++++++---------------- include/newgame.php | 5 +-- include/output.php | 40 ++++++++++++++++++--- update_db.php | 16 +++++++-- 7 files changed, 176 insertions(+), 57 deletions(-) diff --git a/create_database.sql b/create_database.sql index e9577c9..71a6dfc 100644 --- a/create_database.sql +++ b/create_database.sql @@ -48,7 +48,7 @@ CREATE TABLE `Version` ( /*!40000 ALTER TABLE `Card` DISABLE KEYS */; LOCK TABLES `Version` WRITE; -INSERT INTO `Version` VALUES (1); +INSERT INTO `Version` VALUES (2); UNLOCK TABLES; /*!40000 ALTER TABLE `Version` ENABLE KEYS */; @@ -141,7 +141,7 @@ CREATE TABLE `Game` ( `sickness` int(11) default NULL, `startplayer` tinyint(4) default '1', `player` int(11) default NULL, - `status` enum('pre','play','gameover','cancel-timedout','cancel-nines','cancel-trump','cancel-noplay') default NULL, + `status` enum('pre','play','gameover','cancel-timedout','cancel-nines','cancel-trump','cancel-noplay','cancel-lowtrump') default NULL, `ruleset` int(11) default NULL, `session` int(11) default NULL, `id` int(11) NOT NULL auto_increment, @@ -171,6 +171,7 @@ CREATE TABLE `Rulesets` ( `dullen` enum('none','firstwins','secondwins') default 'secondwins', `schweinchen` enum ('none','both','second','secondaftercall') default 'second', `call` enum ('1st-own-card','5th-card','9-cards') default '1st-own-card', + `lowtrump` enum('poverty','cancel','none') default 'poverty', `id` int(11) NOT NULL auto_increment, UNIQUE KEY `id` (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -200,7 +201,7 @@ CREATE TABLE `Hand` ( `status` enum('start','init','check','poverty','play','gameover') default 'start', `position` tinyint(4) NOT NULL default '0', `party` enum('re','contra') default NULL, - `sickness` enum('wedding','nines','poverty','solo') default NULL, + `sickness` enum('wedding','nines','poverty','solo','lowtrump') default NULL, `solo` enum('trumpless','jack','queen','trump','club','spade','heart','silent') default NULL, `point_call` enum('120','90','60','30','0') default NULL, UNIQUE KEY `id` (`id`), diff --git a/include/db.php b/include/db.php index 5503a4a..2a927f5 100644 --- a/include/db.php +++ b/include/db.php @@ -30,7 +30,7 @@ if(!isset($HOST)) function DB_open() { - $version_needed = 1; + $version_needed = 2; global $DB,$DB_user,$DB_host,$DB_database,$DB_password; $DB = @mysql_connect($DB_host,$DB_user, $DB_password); @@ -703,14 +703,15 @@ function DB_get_hashes_by_session($session,$user) return $r; } -function DB_get_ruleset($dullen,$schweinchen,$call) +function DB_get_ruleset($dullen,$schweinchen,$call,$lowtrump) { $r = array(); $result = DB_query("SELECT id FROM Rulesets WHERE". " dullen=".DB_quote_smart($dullen)." AND ". " Rulesets.call=".DB_quote_smart($call)." AND ". - " schweinchen=".DB_quote_smart($schweinchen)); + " schweinchen=".DB_quote_smart($schweinchen)." AND ". + " lowtrump=".DB_quote_smart($lowtrump)); if($result) $r = DB_fetch_array($result); @@ -722,6 +723,7 @@ function DB_get_ruleset($dullen,$schweinchen,$call) $result = DB_query("INSERT INTO Rulesets VALUES (NULL, NULL, ". DB_quote_smart($dullen).",". DB_quote_smart($schweinchen).",". + DB_quote_smart($lowtrump).",". DB_quote_smart($call). ", NULL)"); if($result) @@ -834,9 +836,10 @@ function DB_get_RULES($gameid) " LEFT JOIN Game ON Game.ruleset=Rulesets.id ". " WHERE Game.id='$gameid'" ); - $RULES["dullen"] = $r[2]; - $RULES["schweinchen"] = $r[3]; - $RULES["call"] = $r[4]; + $RULES['dullen'] = $r[2]; + $RULES['schweinchen'] = $r[3]; + $RULES['lowtrump'] = $r[4]; + $RULES['call'] = $r[5]; return $RULES; } diff --git a/include/functions.php b/include/functions.php index 173ccd4..a06f3d4 100644 --- a/include/functions.php +++ b/include/functions.php @@ -455,6 +455,39 @@ function count_trump($cards,$status='pregame') return $trump; } +function check_low_trump($cards) +{ + global $RULES; + + if($RULES['lowtrump']=='none') + return 0; + + /* check if we have low trump */ + + $lowtrump=1; + foreach($cards as $card) + { + /* card a trump, but not a diamond? */ + if( $card<19 ) + $lowtrump=0; + } + + /* handle case where player has schweinchen */ + if( in_array("19",$cards) && in_array("20",$cards) ) + switch($RULES["schweinchen"]) + { + case "both": + case "second": + case "secondaftercall": + $lowtrump=0; + break; + case "none": + break; + } + + return $lowtrump; +} + function create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD) { global $debug; @@ -467,12 +500,12 @@ function create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD) $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[ 4]=5; $r[16]=17; $r[28]=29; $r[40]=21; $r[ 5]=18; $r[17]=6; $r[29]=30; $r[41]=42; - $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[ 6]=41; $r[18]=7; $r[30]=31; $r[42]=43; + $r[ 7]=22; $r[19]=8; $r[31]=32; $r[43]=20; + $r[ 8]=45; $r[20]=9; $r[32]=33; $r[44]=19; + $r[ 9]=46; $r[21]=10; $r[33]=44; $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; } @@ -933,7 +966,7 @@ function display_table () echo " Schweinchen.
"; if($GT=="poverty" && $party=="re") - if($sickness=="poverty") + if($sickness=="poverty" || ($RULES['lowtrump']=='poverty' && $sickness=='lowtrump')) { $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); $cards = DB_get_all_hand($userhash); @@ -948,7 +981,7 @@ function display_table () if($GT=="dpoverty") if($party=="re") - if($sickness=="poverty") + if($sickness=="poverty" || ($RULES['lowtrump']=='poverty' && $sickness=='lowtrump')) { $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); $cards = DB_get_all_hand($userhash); @@ -961,7 +994,7 @@ function display_table () else echo " $\"poverty$ \" title=\"poverty partner\" />"; else - if($sickness=="poverty") + if($sickness=="poverty" || ($RULES['lowtrump']=='poverty' && $sickness=='lowtrump')) { $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); $cards = DB_get_all_hand($userhash); @@ -1438,6 +1471,9 @@ function cancel_game($why,$gameid) case 'noplay': DB_query("UPDATE Game SET status='cancel-noplay' WHERE id=$gameid"); break; + case 'lowtrump': + DB_query("UPDATE Game SET status='cancel-lowtrump' WHERE id=$gameid"); + break; } /* set each player to gameover */ $result = DB_query("SELECT id FROM Hand WHERE game_id=".DB_quote_smart($gameid)); diff --git a/include/game.php b/include/game.php index 93ab461..3cc1d65 100644 --- a/include/game.php +++ b/include/game.php @@ -223,6 +223,7 @@ if($session) echo " 10ofhearts : {$RULES['dullen']}
\n"; echo " schweinchen: {$RULES['schweinchen']}
\n"; echo " call: {$RULES['call']}
\n"; + echo " lowtrump: {$RULES['lowtrump']}
\n"; echo "

Low trump

Scoring-related

(not yet implemented)

Welcome to E-Doko