From: Matteo Nastasi (mop) Date: Thu, 19 Sep 2013 06:06:10 +0000 (+0200) Subject: game_description() manage all actions (pass, abandon, finish) X-Git-Tag: tournaments-descr-refact~2 X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=c7f6e888b91ee055e4014bd1dbd075c2f5d4204a;p=brisk.git game_description() manage all actions (pass, abandon, finish) --- diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 0fa68bd..9793262 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -42,9 +42,6 @@ $mlang_bin5_bin5 = array( 'info_capp' => array( 'it' => 'hanno fatto %3$scappotto%4$s EBBRAVI!.%1$s', 'en' => 'and they made %3Dscapot%4$s WELL DONE!.%1$s'), - // br, hr, b, /b, asta_pnt, pnt, winornot - 'info_pnt' => array( 'it' => 'dovevano fare %3$s%5$d%4$s punti e ne hanno fatti %3$s%6$d%4$s: hanno %7$s.%1$s', - 'en' => 'they had to do %3$s%5$d%4$s points and they had made %3$s%6$d%4$s: they have %7$s.%1$s'), // br, hr, b, /b, old_asta_pnt, old_pnt, winornot 'info_alea' => array( 'it' => 'dovevano fare %3$salmeno %5$d%4$s punti e ne hanno fatti %3$s%6$d%4$s: hanno %7$s.%1$s', 'en' => 'they had to do %3$sat least %5$d%4$s points and they had made %3$s%6$d%4$s: they have %7$s.%1$s'), @@ -72,12 +69,16 @@ $mlang_bin5_bin5 = array( 'en' => 'and he/she made %3$scapot%4$s WELL DONE!.%2$s'), // br, hr, b, /b - 'info_omul' => array( 'it' => ' La partita valeva %3$s%5$s%3$s.', - 'en' => ' EN: The game was worth %3$s%5$s%3$s.' ), - - + 'info_omul' => array( 'it' => ' La partita valeva %3$s%5$s%4$s.', + 'en' => ' EN: The game was worth %3$s%5$s%4$s.' ), + // br, hr, b, /b + 'info_alpa' => array( 'it' => ' Hanno passato %3$stutti%4$s.', + 'en' => ' EN: Hanno passato %3$stutti%4$s.' ), + // br, hr, b, /b, aband-name + 'info_aban' => array( 'it' => ' Ha lasciato %3$s%5$s%4$s perché aveva al massimo %3$s2 punti%4$s.', + 'en' => ' EN: Ha lasciato %3$s%5$s%4$s perché aveva al massimo %3$s2 punti%4$s.'), 'info_yturn'=> array( 'it' => ' tocca a te giocare.', 'en' => ' it\'s your turn.'), @@ -481,7 +482,7 @@ class Bin5_table extends Table { $pts = array(); if ($action == BIN5_RULES_ALLPASS) { // return TRUE if all correct - $this->old_reason = "Hanno passato tutti."; + $this->old_reason = game_description(BIN5_RULES_ALLPASS, 'html'); $this->old_asta_win = -1; $this->old_pnt = 0; $this->mult_inc(1); @@ -496,7 +497,7 @@ class Bin5_table extends Table { else if ($action == BIN5_RULES_ABANDON) { // return TRUE if all correct log_wr(sprintf("GIOCO FINITO !!!")); - $this->old_reason = sprintf("Ha lasciato %s perché aveva al massimo 2 punti.", xcape($user->name)); + $this->old_reason = game_description(BIN5_RULES_ABANDON, 'html', $user->table_pos, $user->name); $this->old_asta_win = $user->table_pos; $this->old_pnt = 0; $this->mult_inc(1); @@ -1830,43 +1831,8 @@ function show_table_info(&$bri, &$table, $table_pos) log_main("TABLE_OLD_FRIEND:".$table->old_friend); $fri = $table->player[$table->old_friend]; - $wol = game_result($table->old_asta_pnt, $table->old_pnt); - - if (0 == 1) { - if ($win != $fri) { - /* MLANG: "
Nell'ultima mano ha chiamato %s, il socio era %s,
", "hanno fatto cappotto EBBRAVI!.
", "dovevano fare %s punti e ne hanno fatti %d: hanno %s.
", "
Nell'ultima mano %s si è chiamato in mano,
", "ha fatto cappotto EBBRAVO!.
", "doveva fare %s punti e ne ha fatti %d: ha %s.
", ($table->old_asta_pnt > 61 ? "almeno ".$table->old_asta_pnt : 'più di 60'), $table->old_pnt, ($wol == 1 ? "vinto" : ($wol == 0 ? "pareggiato" : "perso" */ - - $noty .= sprintf($mlang_bin5_bin5['info_part'][$G_lang], - xcape($bri->user[$win]->name), - xcape($bri->user[$fri]->name)); - if ($table->old_pnt == 120) { - $noty .= sprintf($mlang_bin5_bin5['info_capp'][$G_lang]); - } - else { - $noty .= sprintf($mlang_bin5_bin5['info_pnt'][$G_lang], - ($table->old_asta_pnt > 61 ? $mlang_bin5_bin5['info_alea'][$G_lang].$table->old_asta_pnt : - $mlang_bin5_bin5['info_more'][$G_lang]), $table->old_pnt, - ($wol == 1 ? $mlang_bin5_bin5['info_win'][$G_lang] : ($wol == 0 ? $mlang_bin5_bin5['info_peer'][$G_lang] : $mlang_bin5_bin5['info_lost'][$G_lang]))); - } - } - else { - $noty .= sprintf($mlang_bin5_bin5['info_alon'][$G_lang], - xcape($bri->user[$win]->name)); - if ($table->old_pnt == 120) { - $noty .= sprintf($mlang_bin5_bin5['info_acap'][$G_lang]); - } - else { - $noty .= sprintf($mlang_bin5_bin5['info_apnt'][$G_lang], - - ($table->old_asta_pnt > 61 ? $mlang_bin5_bin5['info_alea'][$G_lang].$table->old_asta_pnt : - $mlang_bin5_bin5['info_more'][$G_lang]), $table->old_pnt, - - ($wol == 1 ? $mlang_bin5_bin5['info_win'][$G_lang] : ($wol == 0 ? $mlang_bin5_bin5['info_peer'][$G_lang] : $mlang_bin5_bin5['info_lost'][$G_lang]))); - } - } - } // OLD VERSION $noty = game_description(BIN5_RULES_FINISH, 'html', $win, $bri->user[$win]->name, $fri, $bri->user[$fri]->name, - $wol, $table->old_pnt, $table->old_asta_pnt); + $table->old_pnt, $table->old_asta_pnt); $old_multer = $table->multer(FALSE); if ($old_multer > 1) { @@ -1992,8 +1958,8 @@ function log_points($remote_addr, $curtime, $user, $where, $mesg) } } -function game_description($act, $form, $win, $win_name, $fri, $fri_name, - $wol, $old_pnt, $old_asta_pnt) +function game_description($act, $form, $win = -1, $win_name = "?1?", $fri = -1, $fri_name "?2?", + $old_pnt = -1, $old_asta_pnt = -1) { GLOBAL $G_lang, $mlang_bin5_bin5; @@ -2012,6 +1978,18 @@ function game_description($act, $form, $win, $win_name, $fri, $fri_name, $tg_bc = ""; } + if ($act == BIN5_RULES_ALLPASS) { + return (sprintf($mlang_bin5_bin5['info_alpa'][$G_lang], + $tg_br, $tg_hr, $tg_bo, $tg_bc)); + } + else if ($act == BIN5_RULES_ABANDON) { + return (sprintf($mlang_bin5_bin5['info_alpa'][$G_lang], + $tg_br, $tg_hr, $tg_bo, $tg_bc, + $win_name)); + } + // implicit else bin5_rules_finish + $wol = game_result($old_asta_pnt, $old_pnt); + $noty = ""; if ($win != $fri) { // not alone case diff --git a/web/briskin5/stat-day.php b/web/briskin5/stat-day.php index 7218905..6d3ac74 100644 --- a/web/briskin5/stat-day.php +++ b/web/briskin5/stat-day.php @@ -1,9 +1,9 @@ array( 'it' => 'Partite normali', + 'en' => 'Normal matches' ), + 'special match' => array( 'it' => 'Partite speciali', + 'en' => 'Special matches') + ); + + ini_set("max_execution_time", "240"); require_once("../Obj/brisk.phh"); @@ -41,17 +57,17 @@ require_once("Obj/placing.phh"); function main_file($curtime) { - GLOBAL $G_alarm_passwd; + GLOBAL $G_lang, $G_alarm_passwd; $tri = array(); $mon = array(); $wee = array(); - + if (($fp = @fopen(LEGAL_PATH."/points.log", 'r')) == FALSE) { echo "Open data file error"; exit; } echo "prima
"; - + if (($fp_start = @fopen(LEGAL_PATH."/points.start", 'r')) != FALSE) { $skip = intval(fgets($fp_start)); if ($skip > 0) @@ -63,7 +79,7 @@ function main_file($curtime) echo "database connection failed"; exit; } - + $bdb->users_load(); for ($i = 0 ; $i < $bdb->count() ; $i++) { @@ -82,7 +98,7 @@ function main_file($curtime) // if not auth table, continue if (count($ar) < 15) continue; - + // echo $p++."
"; if ($ar[7] >= TABLES_AUTH_N) continue; @@ -98,11 +114,11 @@ function main_file($curtime) fwrite($fp_start, sprintf("%d\n", $curpos)); fclose($fp_start); } - + continue; } // echo $p++." ".BIN5_PLAYERS_N."
"; - + $found = FALSE; $mult = 1; for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) { @@ -125,22 +141,22 @@ function main_file($curtime) echo "WARNING: the user [".$username."] NOT EXISTS!
"; continue; } - + // echo $item->login." id)".$id." ".$ar[10+($i*2)]." mult: ".$mult."
"; $tri[$id]->add($ar[10+($i*2)] / $mult); - if ($ar[0] >= $curtime - MON_LIMIT) + if ($ar[0] >= $curtime - MON_LIMIT) $mon[$id]->add($ar[10+($i*2)] / $mult); - if ($ar[0] >= $curtime - WEE_LIMIT) + if ($ar[0] >= $curtime - WEE_LIMIT) $wee[$id]->add($ar[10+($i*2)] / $mult); } // $p++; echo $p++."
"; } fclose($fp); - + usort($tri, ptsgam_cmp); usort($mon, ptsgam_cmp); usort($wee, ptsgam_cmp); - + echo "

TRI
\n"; if (($fplo = @fopen(LEGAL_PATH."/class_tri_lo.log", 'w')) == FALSE) { @@ -156,9 +172,9 @@ function main_file($curtime) if ($tri[$i]->gam == 0.0) continue; printf("%s: %s (%d)
\n", $tri[$i]->username, $tri[$i]->snormpts(), $tri[$i]->gam); - if ($tri[$i]->gam >= TRI_MAX_GAMES) + if ($tri[$i]->gam >= TRI_MAX_GAMES) fwrite($fphi, sprintf("%s|%d|%d|\n", xcapelt($tri[$i]->username), $tri[$i]->pts, $tri[$i]->gam)); - else if ($tri[$i]->gam > TRI_MIN_GAMES) + else if ($tri[$i]->gam > TRI_MIN_GAMES) fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($tri[$i]->username), $tri[$i]->pts, $tri[$i]->gam)); } fclose($fphi); @@ -179,9 +195,9 @@ function main_file($curtime) if ($mon[$i]->gam == 0.0) continue; printf("%s: %s (%d)
\n", $mon[$i]->username, $mon[$i]->snormpts(), $mon[$i]->gam); - if ($mon[$i]->gam >= MON_MAX_GAMES) + if ($mon[$i]->gam >= MON_MAX_GAMES) fwrite($fphi, sprintf("%s|%d|%d|\n", xcapelt($mon[$i]->username), $mon[$i]->pts, $mon[$i]->gam)); - else if ($mon[$i]->gam > MON_MIN_GAMES) + else if ($mon[$i]->gam > MON_MIN_GAMES) fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($mon[$i]->username), $mon[$i]->pts, $mon[$i]->gam)); } fclose($fphi); @@ -198,12 +214,12 @@ function main_file($curtime) } for ($i = 0 ; $i < count($wee) ; $i++) { - if ($wee[$i]->gam == 0.0) + if ($wee[$i]->gam == 0.0) continue; printf("%s: %s (%d)
\n", $wee[$i]->username, $wee[$i]->snormpts(), $wee[$i]->gam); - if ($wee[$i]->gam >= WEE_MAX_GAMES) + if ($wee[$i]->gam >= WEE_MAX_GAMES) fwrite($fphi, sprintf("%s|%d|%d|\n", xcapelt($wee[$i]->username), $wee[$i]->pts, $wee[$i]->gam)); - else if ($wee[$i]->gam > WEE_MIN_GAMES) + else if ($wee[$i]->gam > WEE_MIN_GAMES) fwrite($fplo, sprintf("%s|%d|%d|\n", xcapelt($wee[$i]->username), $wee[$i]->pts, $wee[$i]->gam)); } fclose($fphi);