X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fgame.php;h=cef2c6537c2a11141a38ac387f546943f8624b1b;hp=a11e6b6eb48d64c56370b2c497dcfbaeb402e753;hb=f5d068d8b0c003324c075489a4894be2b66eb051;hpb=0edb4b26c049e07af0970e081fab699d2bdd333b diff --git a/include/game.php b/include/game.php index a11e6b6..cef2c65 100644 --- a/include/game.php +++ b/include/game.php @@ -1,4 +1,23 @@ + * + * This file is part of e-DoKo. + * + * e-DoKo is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * e-DoKo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with e-DoKo. If not, see . + * + */ + /* make sure that we are not called from outside the scripts, * use a variable defined in config.php to check this */ @@ -24,11 +43,9 @@ if(!$myid) global $GAME,$RULES,$CARDS; -/* the user has done something, update the timestamp */ -if(isset($_SESSION['id'])) - DB_update_user_timestamp($_SESSION['id']); - -/* get some information from the DB */ +/************************************** + * get some information from the DB + **************************************/ $gameid = DB_get_gameid_by_hash($me); $myname = DB_get_name('hash',$me); $mystatus = DB_get_status_by_hash($me); @@ -63,11 +80,14 @@ if( $gamestatus == 'pre' ) { /* always need to use Schweinchen to figure out for example who has poverty */ $ok=1; + /* unless the gametype is set and we know that we are in poverty were schweinchen is not valid */ + if( in_array( $gametype,array('poverty','dpoverty') )) + $ok=0; } else { /* in a game Schweinchen is not valid in all types of games */ - if( $gametype == 'normal' || $gametype == 'silent' || $gametype=='trump' || $gametype=='wedding') + if( in_array($gametype,array('normal','wedding','trump','silent') )) if( in_array($RULES['schweinchen'],array('both','second','secondaftercall')) ) $ok=1; } @@ -98,11 +118,8 @@ if($ok) */ set_gametype('normal'); -/* put everyting in a form */ -echo "
\n"; - /* handle user notes (only possible while game is running)*/ -if( $mystatus!='gameover' ) +if( $mystatus!='gameover' ) if(myisset('note')) { $note = $_REQUEST['note']; @@ -111,19 +128,21 @@ if( $mystatus!='gameover' ) DB_insert_note($note,$gameid,$myid); }; -/* make sure that we don't show the notes to the wrong person - * (e.g. other people looking at an old game) - */ -if( $mystatus != 'gameover' || - ( $mystatus == 'gameover' && - isset($_SESSION['id']) && - $myid == $_SESSION['id'])) - output_user_notes($myid,$gameid,$mystatus); - /* handle calls, output a comment to show when the call was made */ /* initialize comments */ $comment = ''; +/* get information needed to submit comment */ +$playid = DB_get_current_playid($gameid); + +/* set comment */ +if($comment != '') + DB_insert_comment($comment,$playid,$myid); +/* clear up */ +unset($comment); +/* end check for calls */ + + /* check for calls, set comment */ if(myisset('call') && $_REQUEST['call'] == '120' && can_call(120,$me)) { @@ -154,72 +173,97 @@ if(myisset('call') && $_REQUEST['call'] == '0' && can_call(0,$me)) $comment .= "Zero"; } -/* get information needed to submit comment */ -$playid = DB_get_current_playid($gameid); -/* set comment */ -if($comment != '') - DB_insert_comment($comment,$playid,$myid); -/* clear up */ -unset($comment); -/* end check for calls */ +/***************************************************************** + * 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( $gamestatus != 'gameover' && isset($_SESSION['id']) ) + { + /* game isn't over, only valid user can get here, so show menu */ + display_user_menu($myid, $me); + } +else if( $mystatus == 'gameover' && isset($_SESSION['id']) ) + { + /* user is looking at someone else's game, show the menu for the correct user */ + display_user_menu($_SESSION['id'],$me); + } +else + { + echo "
\n"; + echo "It's your turn in these games: \n"; + echo "Please log in to see this information.\n"; + echo "
\n\n"; + } -/* output extra division in case this game is part of a session */ +/***************************************************************** + * output extra division in case this game is part of a session + *****************************************************************/ if($session) { echo "
\n"; - echo "
Rules: "; + + /* output rule set */ + echo "
\n "._('Rules').":\n"; switch($RULES['dullen']) { case 'none': - echo " \"not\n"; break; + echo " \""._('no\n"; break; case 'firstwins': - echo " \"ten\n"; break; + echo " \""._('ten\n"; break; case 'secondwins': - echo " \"second\n"; break; + echo " \""._('second\n"; break; } switch($RULES['schweinchen']) { case 'none': - echo " \"no\n"; break; case 'both': - echo " \"two\n"; break; case 'second': - echo " \"second\n"; break; case 'secondaftercall': - echo " \"second\n"; break; } switch($RULES['call']) { case '1st-own-card': - echo " \"1st-own-card\"\n"; break; + echo " \""._('1st-own-card')."\"\n"; break; case '5th-card': - echo " \"5th-card\"\n"; break; + echo " \""._('5th-card')."\"\n"; break; case '9-cards': - echo " \"9-cards\"\n"; break; + echo " \""._('9-cards')."\"\n"; break; } - echo "
\n"; - echo " 10ofhearts : {$RULES['dullen']}
\n"; - echo " schweinchen: {$RULES['schweinchen']}
\n"; - echo " call: {$RULES['call']}
\n"; - echo "
\n
\n"; + echo "
\n"; + echo ' '._('10ofhearts').": {$RULES['dullen']}
\n"; + echo ' '._('schweinchen').": {$RULES['schweinchen']}
\n"; + echo ' '._('call').": {$RULES['call']}
\n"; + echo ' '._('lowtrump').": {$RULES['lowtrump']}
\n"; + echo "
\n
\n"; /* show score */ + + echo "
"; + $score = generate_score_table($session); + + /* get the last entry to show on the main page */ $tmpscore= $score; $finalscore = array_pop($tmpscore); $finalscore = $finalscore['players']; - echo "
"; if($finalscore) { - echo "Score: \n"; - /* output the final score on the front page */ + echo _('Score').": \n"; foreach($finalscore as $user=>$value) { $name = DB_get_name('userid',$user); @@ -232,10 +276,13 @@ if($session) echo " "; } + /* output all games for the score table */ echo format_score_table_html($score,$myid); echo "
\n"; - /* figure out which game in a session we are in and link to the previous and next game if possible */ + /* figure out which game in a session we are in and link to the + * previous and next game if possible + */ $hashes = DB_get_hashes_by_session($session,$myid); $next = NULL; $i = 1; @@ -257,21 +304,180 @@ if($session) else $next = NULL; + /* check for solo, add game type to session number */ + echo " Game $session.$j"; + if($GT !='normal') + echo " ($GT)"; if(isset($_SESSION['id']) && $_SESSION['id']==$myid) { if($previous) - echo "previous game    \n"; - echo "This is game number $j of $i in session $session.\n"; + echo "   "._('previous')." \n"; if($next) - echo "   next game \n"; + echo "   "._('next')." \n"; } - else - echo "This is game number $j of $i in session $session."; + if($j != $i ) + echo "   last \n"; + echo "\n
\n"; } +/* the user has done something, update the timestamp. Use $myid in + * active games and check for session-id in old games (myid might be wrong in that case) + */ +if($mystatus!='gameover') + DB_update_user_timestamp($myid); + else + if(isset($_SESSION['id'])) + DB_update_user_timestamp($_SESSION['id']); + + +/****************************************************************************** + * Output menu for selecting tricks + ******************************************************************************/ + +switch($mystatus) + { + case 'start': + break; + case 'init': + case 'check': + /* output sickness of other playes, in case they already selected and are sitting in front of the current player */ + echo "\n
    \n"; + echo "
  • Pre\n"; + + echo "
    • \n
\n"; /* end div trick, end li trick , end tricks*/ + /* end displaying sickness */ + break; + case 'poverty': + /* output pre-game trick in case user reloads, + * only needs to be done when a team has been formed */ + if($myparty=='re' || $myparty=='contra') + { + echo "\n
    \n"; + + $mygametype = DB_get_gametype_by_gameid($gameid); + + echo "
  • Pre\n"; + echo "
    • \n
\n\n"; /* end div trick, end li trick , end ul tricks */ + } + /* end output pre-game trick */ + break; + case 'play': + case 'gameover': + + echo "\n
    \n"; + + /* output vorbehalte */ + $mygametype = DB_get_gametype_by_gameid($gameid); + $mygamesolo = DB_get_solo_by_gameid($gameid); + if($mygametype != 'normal') /* only show when needed */ + if(!( $mygametype == 'solo' && $mygamesolo == 'silent') ) + echo "
  • Pre
    • \n"; + + $result = DB_query("SELECT Trick.id ". + "FROM Trick ". + "WHERE Trick.game_id='".$gameid."' ". + "GROUP BY Trick.id ". + "ORDER BY Trick.id ASC"); + $trickNR = 1; + $lasttrick = DB_get_max_trickid($gameid); + + /* output tricks */ + while($r = DB_fetch_array($result)) + { + $trick=$r[0]; + if($trick!=$lasttrick) + echo "
  • "._('Trick')." $trickNR
    • \n"; + else if($trick==$lasttrick) + echo "
  • "._('Trick')." $trickNR
    • \n"; + $trickNR++; + } + + /* if game is over, also output link to Score tab */ + if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' ) + echo "
  • "._('Score')."
    • \n"; + + /* output previous/next buttons */ + echo "
    • \n"; + echo "
    • \n"; + + echo "
\n\n"; + + break; + default: + } + + +/****************************************************************************** + * Output tricks played, table, messages, and cards (depending on game status) + ******************************************************************************/ + +/* put everyting in a form */ +echo "\n"; + /* display the table and the names */ -display_table(); +display_table_begin(); + + +/****************************** + * Output pre-trick if needed * + ******************************/ + +switch($mystatus) + { + case 'start': + break; + case 'init': + case 'check': + /* output sickness of other playes, in case they already selected and are sitting in front of the current player */ + echo "\n
\n"; + echo "
\n"; + + for($pos=1;$pos<5;$pos++) + { + $usersick = DB_get_sickness_by_pos_and_gameid($pos,$gameid); + $userid = DB_get_userid('gameid-position',$gameid,$pos); + $userstatus = DB_get_hand_status_by_userid_and_gameid($userid,$gameid); + + if($userstatus=='start' || $userstatus=='init') + echo "
still needs
to decide
\n"; /* show this to everyone */ + else + if($usersick!=NULL) /* in the init-phase we only showed players with $pos<$mypos, now we can show all */ + echo "
sick
\n"; + else + echo "
healthy
\n"; + } + echo "
\n
\n"; /* end div trick, end li trick , end tricks*/ + /* end displaying sickness */ + break; + case 'poverty': + /* output pre-game trick in case user reloads, + * only needs to be done when a team has been formed */ + if($myparty=='re' || $myparty=='contra') + { + echo "\n
    \n"; + + $mygametype = DB_get_gametype_by_gameid($gameid); + + echo "
    \n"; + + /* get information so show the cards that have been handed over in a poverty game */ + output_exchanged_cards(); + + echo "
    \n
\n\n"; /* end div trick, end li trick , end ul tricks */ + } + /* end output pre-game trick */ + break; + case 'play': + case 'gameover': + + /* taken care further down */ + break; + default: + } + + + /* mystatus gets the player through the different stages of a game. * start: does the player want to play? @@ -282,9 +488,26 @@ display_table(); * play: game in progress * gameover: are we revisiting a game */ + +/* Depending on the situation we set + * cards_status (see functions.php for possible options) + */ +$cards_status = CARDS_EMPTY; + +/* Also collect message that should be displayed to the user, so that we can show + * them after showing the table. This makes the html flow more consistent and easier + * tournament change layouts, especially for smaller displays, e.g. mobile phones + */ +$messages = array(); + + switch($mystatus) { case 'start': + /**************************************** + * ask if player wants to join the game * + ****************************************/ + /* don't ask if user has autosetup set to yest */ $skip = 0; if($PREF['autosetup']=='yes') $skip = 1; @@ -293,6 +516,7 @@ switch($mystatus) { /* asks the player, if he wants to join the game */ output_check_want_to_play($me); + $card_status = CARDS_EMPTY; break; } else @@ -301,14 +525,13 @@ switch($mystatus) if(!$skip && $_REQUEST['in'] == 'no' ) { /* cancel the game */ - $message = "Hello, \n\n". + $email_message = "Hello, \n\n". "the game has been canceled due to the request of one of the players.\n\n"; $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $user) { - $subject = 'Game '.DB_format_gameid($gameid).' canceled'; - mymail($user,$subject,$message); + mymail($user,$gameid,GAME_CANCELED,$email_message); } /* update game status */ @@ -325,9 +548,8 @@ switch($mystatus) DB_set_hand_status_by_hash($me,'init'); - /* check if everyone has reached this stage, send out email */ + /* check if everyone has reached this stage, set player in game-table to the next player */ $userids = DB_get_all_userid_by_gameid($gameid); - $ok = 1; foreach($userids as $user) { $userstat = DB_get_hand_status_by_userid_and_gameid($user,$gameid); @@ -335,70 +557,21 @@ switch($mystatus) { /* whos turn is it? */ DB_set_player_by_gameid($gameid,$user); - $ok = 0; break; } }; - if($ok) - { - /* all done, send out email unless this player is the startplayer */ - $startplayer = DB_get_startplayer_by_gameid($gameid); - if($mypos == $startplayer) - { - /* do nothing, go to next stage */ - } - else - { - /* email startplayer */ - /* - $hash = DB_get_hash_from_game_and_pos($gameid,$startplayer); - $who = DB_get_userid('hash',$hash); - DB_set_player_by_gameid($gameid,$who); - - $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n". - "Use this link to go the game: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ; - mymail($who,"Ready, set, go... (game ".DB_format_gameid($gameid).") ",$message); - */ - } - } } } case 'init': - /* here we ask the player if he is sick */ - $mycards = DB_get_hand($me); - $mycards = mysort($mycards,$gametype); - - if(!myisset('solo','wedding','poverty','nines') ) + /*************************** + * check if player is sick * + ***************************/ + if(!myisset('solo','wedding','poverty','nines','lowtrump') ) { - /* output sickness of other playes, in case the already selected and are sitting in front of the current player */ - echo "\n\n"; /* end div trick, end li trick , end tricks*/ - /* end displaying sickness */ - + $mycards = DB_get_hand($me); output_check_for_sickness($me,$mycards); - echo "
Your cards are:
\n"; - foreach($mycards as $card) - display_card($card,$PREF['cardset']); - echo "
\n"; + $card_status = CARDS_SHOW; break; } @@ -407,26 +580,24 @@ switch($mystatus) /* check if someone selected more than one sickness */ $Nsickness = 0; if($_REQUEST['solo']!='No') $Nsickness++; - if($_REQUEST['wedding'] == 'yes') $Nsickness++; - if($_REQUEST['poverty'] == 'yes') $Nsickness++; - if($_REQUEST['nines'] == 'yes') $Nsickness++; + if($_REQUEST['wedding'] == 'yes') $Nsickness++; + if($_REQUEST['poverty'] == 'yes') $Nsickness++; + if($_REQUEST['nines'] == 'yes') $Nsickness++; + if($_REQUEST['lowtrump'] == 'yes') $Nsickness++; if($Nsickness>1) { - echo "

You selected more than one sickness, please go back ". - "and answer the question again.

"; + $messages[] = "You selected more than one sickness, please go back ". + "and answer the question again."; - echo "
Your cards are:
\n"; - foreach($mycards as $card) - display_card($card,$PREF['cardset']); - echo "
\n"; + $card_status = CARDS_SHOW; break; } else { /* everything is ok, save what user said and proceed */ - echo "

Processing what you selected in the last step..."; + $messages[] = "Processing what you selected in the last step..."; /* check if this sickness needs to be handled first */ $gametype = DB_get_gametype_by_gameid($gameid); @@ -440,7 +611,7 @@ switch($mystatus) DB_set_solo_by_hash($me,$_REQUEST['solo']); DB_set_sickness_by_hash($me,'solo'); - echo "
Seems like you want to play a {$_REQUEST['solo']} solo. Got it.
\n"; + $messages[] = "
Seems like you want to play a {$_REQUEST['solo']} solo. Got it.
\n"; if($gametype == 'solo' && $startplayer<$mypos) {}/* do nothing, since someone else already is playing solo */ @@ -457,25 +628,34 @@ switch($mystatus) else if($_REQUEST['wedding'] == 'yes') { /* silent solo is set further down */ - echo "Ok, you don't want to play a silent solo...wedding was chosen.
\n"; + $messages[] = _("Ok, you don't want to play a silent solo...wedding was chosen.")."
\n"; DB_set_sickness_by_hash($me,'wedding'); } else if($_REQUEST['poverty'] == 'yes') { - echo "Don't think you can win with just a few trump...? ok, poverty chosen
\n"; + $messages[] = _("Don't think you can win with just a few trump...? Ok, poverty chosen.")."
\n"; DB_set_sickness_by_hash($me,'poverty'); } else if($_REQUEST['nines'] == 'yes') { - echo "What? You just don't want to play a game because you have a few nines? Well, if no one". - " is playing solo, this game will be canceled.
\n"; + $messages[] = _("What? You just don't want to play a game because you have a few nines? Well, if no one". + " is playing solo, this game will be canceled.")."
\n"; DB_set_sickness_by_hash($me,'nines'); } + else if($_REQUEST['lowtrump'] == 'yes') + { + if($RULES['lowtrump']=='cancel') + $messages[] = _("What? You just don't want to play a game because you have low trump? Well, if no one". + " is playing solo, this game will be canceled.")."
\n"; + else + $messages[] = _("Don't think you can win with low trumps...? Ok, poverty chosen.")."
.
\n"; - echo "

\n"; + DB_set_sickness_by_hash($me,'lowtrump'); + } /* move on to the next stage*/ DB_set_hand_status_by_hash($me,'check'); + $mystatus='check'; }; }; @@ -484,34 +664,7 @@ switch($mystatus) * this can therefore only be handled once all players finished the last stage */ - $mycards = DB_get_hand($me); - $mycards = mysort($mycards,$gametype); - - /* output sickness of other playes, in case the already selected and are sitting in front of the current player */ - echo "\n\n"; /* end div trick, end li trick , end tricks*/ - /* end displaying sickness */ - - echo "
\n"; - echo "

Checking if someone else selected solo, nines, wedding or poverty.

"; + $messages[] = _('Checking if someone else selected solo, nines, wedding or poverty.'); /* check if everyone has reached this stage */ $userids = DB_get_all_userid_by_gameid($gameid); @@ -529,10 +682,10 @@ switch($mystatus) if(!$ok) { - echo "

This step can only be handled after everyone finished the last step. ". - "Seems like this is not the case, so you need to wait a bit... ". - "you will get an email once that is the case, please use the link in ". - "that email to continue the game.

"; + $messages[] = _('This step can only be handled after everyone finished the last step. '. + 'Seems like this is not the case, so you need to wait a bit... '. + 'you will get an email once that is the case, please use the link in '. + 'that email to continue the game.'); /* display cards, if player was just at the init-phase he will still see the cards from there * we can put this one here, since the last player to finish the init state won't get here and @@ -540,13 +693,8 @@ switch($mystatus) */ if($mystatus=='check') { - /* show cards */ - echo "
Your cards are:
\n"; - foreach($mycards as $card) - display_card($card,$PREF['cardset']); - echo "
\n"; + $card_status = CARDS_SHOW; } - break; } else { @@ -554,13 +702,13 @@ switch($mystatus) * are playing, in case there are any solos this already * will have the correct information in it */ - echo "

Ok, everyone is done... figuring out what kind of game we are playing.

"; + $messages[] = _('Ok, everyone is done... figuring out what kind of game we are playing.'); $gametype = DB_get_gametype_by_gameid($gameid); $startplayer = DB_get_startplayer_by_gameid($gameid); /* check for sickness */ - $nines = 0; + $cancel = 0; $poverty = 0; $wedding = 0; $solo = 0; @@ -568,12 +716,13 @@ switch($mystatus) { $name = DB_get_name('userid',$user); $usersick = DB_get_sickness_by_userid_and_gameid($user,$gameid); - if($usersick == 'nines') + if($usersick == 'nines' || ($RULES['lowtrump']=='cancel' && $usersick=='lowtrump') ) { - $nines = $user; + $cancel = $user; + $cancelsick = $usersick; break; /* no need to check for other poverties, since only solo can win and that is already set */ } - else if($usersick == 'poverty') + else if($usersick == 'poverty' || ($RULES['lowtrump']=='poverty' && $usersick=='lowtrump')) $poverty++; else if($usersick == 'wedding') $wedding=$user; @@ -586,28 +735,43 @@ switch($mystatus) { /* do nothing */ } - else if($nines) + else if($cancel) { /* cancel game */ - $message = "Hello, \n\n". - " the game has been canceled because ".DB_get_name('userid',$nines). - " has five or more nines and nobody is playing solo.\n\n". - " To redeal either start a new game or, in case the game was part of a tournament, \n". - " go to the last game and use the link at the bottom of the page to redeal.\n\n"; + if($cancelsick == 'nines') + { + $email_message = "The game has been canceled because ".DB_get_name('userid',$cancel). + " has five or more nines and nobody is playing solo.\n\n". + "To redeal either start a new game or, in case the game was part of a tournament,\n". + "go to the last game and use the link at the bottom of the page to redeal.\n\n"; + + /* update game status */ + cancel_game('nines',$gameid); + + $messages[] = "The game has been canceled because ".DB_get_name('userid',$cancel). + " has five or more nines and nobody is playing solo."; + } + else if ($cancelsick == 'lowtrump') + { + $email_message = "The game has been canceled because ".DB_get_name('userid',$cancel). + " has low trump and nobody is playing solo.\n\n". + "To redeal either start a new game or, in case the game was part of a tournament,\n". + "go to the last game and use the link at the bottom of the page to redeal.\n\n"; + + /* update game status */ + cancel_game('lowtrump',$gameid); + + $messages[] = "The game has been canceled because ".DB_get_name('userid',$cancel). + " has low trump and nobody is playing solo."; + }; $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $user) { - $subject = 'Game '.DB_format_gameid($gameid).' canceled'; - mymail($user,$subject,$message); + mymail($user,$gameid, GAME_CANCELED, $email_message); } - /* update game status */ - cancel_game('nines',$gameid); - - echo "The game has been canceled because ".DB_get_name('userid',$nines). - " has five or more nines and nobody is playing solo.\n"; - return; + break; } else if($poverty==1) /* one person has poverty */ { @@ -617,7 +781,7 @@ switch($mystatus) if(!$who) { $firstsick = DB_get_sickness_by_pos_and_gameid(1,$gameid); - if($firstsick == 'poverty') + if($firstsick == 'poverty' || ($RULES['lowtrump']=='poverty' && $firstsick=='lowtrump')) DB_set_sickness_by_gameid($gameid,2); /* who needs to be asked first */ else DB_set_sickness_by_gameid($gameid,1); /* who needs to be asked first */ @@ -631,10 +795,10 @@ switch($mystatus) if(!$who) { $firstsick = DB_get_sickness_by_pos_and_gameid(1,$gameid); - if($firstsick == 'poverty') + if($firstsick == 'poverty' || ($RULES['lowtrump']=='poverty' && $firstsick=='lowtrump')) { - $seconsick = DB_get_sickness_by_pos_and_gameid(1,$gameid); - if($secondsick == 'poverty') + $secondsick = DB_get_sickness_by_pos_and_gameid(1,$gameid); + if($secondsick == 'poverty' || ($RULES['lowtrump']=='poverty' && $secondsick=='lowtrump')) DB_set_sickness_by_gameid($gameid,30); /* who needs to be asked first */ else DB_set_sickness_by_gameid($gameid,20); /* who needs to be asked first */ @@ -650,7 +814,7 @@ switch($mystatus) $gametype = 'wedding'; }; /* now the gametype is set correctly in the database */ - echo "

Got it :)

"; + $messages[] = _('Got it').' :)'; /* loop over all players, set re/contra if possible and start the game if possible */ $userids = DB_get_all_userid_by_gameid($gameid); @@ -694,7 +858,7 @@ switch($mystatus) case 'dpoverty': /* set person with poverty to play status */ $usersick = DB_get_sickness_by_userid_and_gameid($userid,$gameid); - if($usersick == 'poverty') + if($usersick == 'poverty' || ($RULES['lowtrump']=='poverty' && $usersick=='lowtrump')) DB_set_hand_status_by_hash($userhash,'play'); /* set status of first player to be asked to poverty */ @@ -738,14 +902,13 @@ switch($mystatus) if(DB_get_email_pref_by_hash($hash)!='emailaddict') { /* email startplayer */ - $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n". + $email_message = "It's your turn now in game ".DB_format_gameid($gameid).".\n". "Use this link to play a card: ".$HOST.$INDEX."?action=game&me=".$hash."\n\n" ; - $subject = 'Ready, set, go... (game '.DB_format_gameid($gameid).')'; - mymail($who,$subject,$message); + mymail($who,$gameid,GAME_READY,$email_message); } } else - echo "
Please, start the game.
\n"; + $messages[] = "Please, start the game.
\n"; } else { @@ -755,7 +918,7 @@ switch($mystatus) $whoid = DB_get_userid('gameid-position',$gameid,$who); if($whoid==$myid) - echo "
Please, start the game.
\n"; + $messages[] = "Please, start the game.
\n"; - break; + $card_status = CARDS_SHOW; } + break; + case 'poverty': /* user only gets here in a poverty game, several things have to be handled here: * A) ask, if user wants to take trump @@ -812,40 +975,16 @@ switch($mystatus) }; } - /* update hand */ + /* get hand */ $mycards = DB_get_hand($me); - $mycards = mysort($mycards,$gametype); - - /* output pre-game trick in case user reloads, - * only needs to be done when a team has been formed */ - if($myparty=='re' || $myparty=='contra') - { - echo "\n