refactorization to manage old rules with a separated class
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sun, 19 Feb 2017 19:41:45 +0000 (20:41 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Mon, 20 Feb 2017 06:19:43 +0000 (07:19 +0100)
sql/sql.d/085-tourn-update.sql [new file with mode: 0644]
web/Obj/dbase_pgsql.phh
web/briskin5/Obj/briskin5.phh
web/briskin5/index_wr.php
web/briskin5/stat-day.php
web/briskin5/statadm.php

diff --git a/sql/sql.d/085-tourn-update.sql b/sql/sql.d/085-tourn-update.sql
new file mode 100644 (file)
index 0000000..56dd0c4
--- /dev/null
@@ -0,0 +1,7 @@
+--  from:
+--    INSERT INTO #PFX#bin5_tournaments (code, active, name) VALUES (1, 1, 'normal match');
+--    INSERT INTO #PFX#bin5_tournaments (code, active, name) VALUES (2, 1, 'special match');
+
+UPDATE #PFX#bin5_tournaments SET (name) = ('old rules: with draw') WHERE code = 1;
+UPDATE #PFX#bin5_tournaments SET (name) = ('new rules: without draw') WHERE code = 2;
+INSERT INTO #PFX#bin5_tournaments (code, active, name) VALUES (3, 1, 'special match');
index feb617c..a757c09 100644 (file)
@@ -628,7 +628,9 @@ class BriskDB
         }
         $gam_obj = pg_fetch_object($gam_pg, 0);
 
-        $table->old_reason = game_description($gam_obj->act, 'html', $gam_obj->mult,
+        // FIXME
+        $rules_name = "Rules_old_rules";
+        $table->old_reason = ${rules_name}::game_description($gam_obj->act, 'html', $gam_obj->mult,
                                               $gam_obj->asta_win, ($gam_obj->asta_win != -1 ?
                                                                    $users[$gam_obj->asta_win]['login'] : ""),
                                               $gam_obj->friend, ($gam_obj->friend != -1 ?
@@ -712,8 +714,9 @@ class BriskDB
             if (($mtc_pg  = $this->query($mtc_sql)) == FALSE || pg_numrows($mtc_pg) != 1) {
 
                 // match not exists, insert it
-                $mtc_sql = sprintf("INSERT INTO %sbin5_matches (ttok, tidx, mazzo_next, mult_next) VALUES ('%s', %d, %d, %d) RETURNING *;",
-                                   $G_dbpfx, $sql_ttok, $tidx, $table->mazzo, $table->mult);
+                // , BIN5_TOURNAMENT_NO_DRAW
+                $mtc_sql = sprintf("INSERT INTO %sbin5_matches (ttok, tidx, mazzo_next, mult_next, tcode) VALUES ('%s', %d, %d, %d, %d) RETURNING *;",
+                                   $G_dbpfx, $sql_ttok, $tidx, $table->mazzo, $table->mult, BIN5_TOURNAMENT_OLDRULES);
                 if (($mtc_pg  = $this->query($mtc_sql)) == FALSE || pg_affected_rows($mtc_pg) != 1) {
                     log_crit(sprintf("bin5_points_save: failed at insert match [%s]", $mtc_sql));
                     break;
index 1e67bf8..106946f 100644 (file)
@@ -35,6 +35,9 @@ define('BIN5_RULES_FINISH',     0);
 define('BIN5_RULES_ABANDON',    1);
 define('BIN5_RULES_ALLPASS',    2);
 
+define('BIN5_TOURNAMENT_OLDRULES', 1);
+define('BIN5_TOURNAMENT_NO_DRAW',  2);
+
 $mlang_bin5_bin5 = array(
                          // br, hr, b, /b, win, fri
                          'info_last' => array( 'it' => '%3$sultima mano%4$s',
@@ -126,6 +129,347 @@ function multoval($mult)
         return (sprintf(($G_lang == 'en' ? "%d-ple" : "%d-plo"), $mult));
 }
 
+abstract class Rules {
+    var $table;
+
+    abstract function engine(&$bri, $curtime, $action, $user);
+
+    function __construct($table)
+    {
+        $this->table = $table;
+    }
+}
+
+class Rules_old_rules extends Rules {
+    function __construct($table)
+    {
+        parent::__construct($table);
+    }
+
+    static function asta2mult($asta_pnt)
+    {
+        if ($asta_pnt > 110)
+            return (6);
+        else if ($asta_pnt > 100)
+            return (5);
+        else if ($asta_pnt > 90)
+            return (4);
+        else if ($asta_pnt > 80)
+            return (3);
+        else if ($asta_pnt > 70)
+            return (2);
+        else
+            return (1);
+    }
+    static function s_multer($mult, $pnt)
+    {
+        return (pow(2, $mult) * static::asta2mult($pnt));
+    }
+
+    static function s_point_calc($pnt_done, $mult, $pnt_req, $is_allpoints)
+    {
+        return ($pnt_done * static::s_multer($mult, $pnt_req) * ($is_allpoints ? 2 : 1));
+    }
+
+    function multer($is_new)
+    {
+        if ($is_new) {
+            return (static::s_multer($this->table->mult, $this->table->asta_pnt));
+        }
+        else {
+            return (static::s_multer($this->table->old_mult, $this->table->old_asta_pnt));
+        }
+    }
+
+    static function game_result($asta_pnt, $pnt)
+    {
+        $sixty = (BIN5_PLAYERS_N == 3 ? 30 : 60);
+        if ($asta_pnt == 61) {
+            if ($pnt > $sixty)
+                return (1);
+            else if ($pnt == $sixty)
+                return (0);
+            else
+                return (-1);
+        }
+        else {
+            if ($pnt >= $asta_pnt)
+                return (1);
+            else
+                return (-1);
+        }
+    }
+
+    function engine(&$bri, $curtime, $action, $user)
+    {
+        GLOBAL $G_all_points, $G_dbasetype;
+
+        $table = $this->table;
+        $pnts_sav = array();
+
+        if ($action == BIN5_RULES_ALLPASS) { // return TRUE if all correct
+            $table->old_act = $action;
+            $table->old_asta_win = -1;
+            $table->old_pnt = 0;
+            $table->mult_inc(1);
+            for ($i = 0 ; $i < PLAYERS_N ; $i++) {
+                $pnts_sav[$i] = 0;
+            }
+
+            $game_delta = 1;
+            // $table->game_next(1);
+            $table->game_init(&$bri->user);
+        }
+        else if ($action == BIN5_RULES_ABANDON) { // return TRUE if all correct
+            if (!($user->handpt <= 2)) {
+                return (FALSE);
+            }
+            $table->old_act = $action;
+            log_wr(sprintf("GIOCO FINITO !!!"));
+            $table->old_asta_win = $user->table_pos;
+            $table->old_pnt = 0;
+            $table->mult_inc(1);
+
+            for ($i = 0 ; $i < PLAYERS_N ; $i++) {
+                $pnts_sav[$i] = 0;
+            }
+
+            // Non si cambia mazzo se si abbandona la partita
+            $game_delta = 0;
+            // $table->game_next(0);
+            $table->game_init(&$bri->user);
+        }
+        else if ($action == BIN5_RULES_FINISH) { // return TRUE if all correct
+            $table->old_act = $action;
+            do {
+                $pro = 0;
+
+                if ($table->asta_pnt == 60)
+                    $table->asta_pnt = 61;
+
+                $table->old_reason = "";
+
+                // count points for the temporary 2 teams
+                for ($i = 0 ; $i < (BIN5_CARD_HAND * BIN5_PLAYERS_N) ; $i++) {
+                    $ctt = $table->card[$i]->value % 10;
+                    $own = $table->card[$i]->owner;
+                    if ($own == $table->asta_win || $own == $table->friend)
+                        $pro += $G_all_points[$ctt];
+                }
+
+                log_wr(sprintf("PRO: [%d]", $pro));
+
+                // PATTA case !
+                if (static::game_result($table->asta_pnt, $pro) == 0) {
+                    $table->points[$table->points_n % MAX_POINTS] = array();
+                    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+                        $table->points[$table->points_n % MAX_POINTS][$i] = 0;
+                        $pnts_sav[$i] = 0;
+                    }
+                    $table->points_n++;
+                    $table->old_pnt = $pro;
+                    $table->old_asta_win = $table->asta_win;
+                    $table->mult_inc(1);
+
+                    break;
+                    }
+
+                if (static::game_result($table->asta_pnt, $pro) == 1)
+                    $sig = 1;
+                else
+                    $sig = -1;
+
+                // TAG: POINTS_MANAGEMENT
+                $table->points[$table->points_n % MAX_POINTS] = array();
+                for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+                    if ($i == $table->asta_win)
+                        $pnt = ($i == $table->friend ? 4 : 2);
+                    else if ($i == $table->friend)
+                        $pnt = 1;
+                    else
+                        $pnt = -1;
+
+                    log_wr(sprintf("PRO: pt[%d][%d] = %d", $table->points_n % MAX_POINTS, $i, $pnt));
+
+                    $pnt_sav = static::s_point_calc($pnt * $sig,           0, $table->asta_pnt, ($pro == 120));
+                    $pnt_tab = static::s_point_calc($pnt * $sig, $table->mult, $table->asta_pnt, ($pro == 120));
+
+                    $table->points[$table->points_n % MAX_POINTS][$i] = $pnt_tab;
+                    $table->total[$i] += $pnt_tab;
+                    $pnts_sav[$i] = $pnt_sav;
+                }
+                $table->points_n++;
+                $table->old_pnt = $pro;
+                $table->old_asta_win = $table->asta_win;
+                $table->mult_set(0);
+            } while (0);
+            $game_delta = 1;
+        }
+        else {
+            return (FALSE);
+        }
+        $table->game_next($game_delta);
+
+        $plist = "$table->table_token|$user->table_orig|$table->player_n";
+        $ucodes = array();
+        $codes = "";
+        for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+            $user_cur = &$bri->user[$table->player[$i]];
+
+            /* pro db */
+            $ucodes[$i] = $user_cur->code_get();
+
+            /* pro log */
+            $plist .= '|'.xcapelt($user_cur->name).'|'.$pnts_sav[$i];
+            $codes .= '|'.xcapelt($user_cur->code_get());
+        }
+        $plist .= $codes;
+        log_legal($curtime, $user->ip, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
+
+        $table->old_asta_pnt = $table->asta_pnt;
+        // $table->old_mazzo is managed by ->game_next();
+        // $table->old_mult, $table->old_pnt, $table->old_reason and $table->old_asta_win are specific
+
+        $table->old_friend = $table->friend;
+        $table->old_tourn_pts = $table->tourn_pts;
+
+        $table->old_reason = static::game_description($action, 'html', $table->old_mult,
+                                             $table->old_asta_win,
+                                             ($table->old_asta_win != -1 ?
+                                              $bri->user[$table->player[$table->old_asta_win]]->name : ""),
+                                             $table->old_friend,
+                                             ($table->old_friend != -1 ?
+                                              $bri->user[$table->player[$table->old_friend]]->name : ""),
+                                             $table->old_pnt, $table->old_asta_pnt, $table->old_tourn_pts);
+
+
+        if ($user->table_orig < TABLES_AUTH_N) {
+            require_once("../Obj/dbase_".$G_dbasetype.".phh");
+
+            if (($bdb = BriskDB::create()) != FALSE) {
+                $bdb->bin5_points_save($curtime, $table, $user->table_orig, $action, $ucodes, $pnts_sav);
+                unset($bdb);
+            }
+            else {
+                log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", "DATABASE CONNECTION FAILED");
+            }
+            log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
+        }
+
+        $table->game_init(&$bri->user);
+
+        return (TRUE);
+    }
+
+    static function game_description($act, $form, $old_mult, $win = -1, $win_name = "?1?", $fri = -1, $fri_name = "?2?",
+                              $old_pnt = -1, $old_asta_pnt = -1, $old_tourn_pts = -1)
+    {
+        GLOBAL $G_lang, $mlang_bin5_bin5;
+
+        if ($form == 'html') {
+            $tg_br = "<br>";
+            $tg_hr = "<hr>";
+            $tg_bo = "<b>";
+            $tg_bc = "</b>";
+            $win_name = xcape($win_name);
+            $fri_name = xcape($fri_name);
+        }
+        else {
+            $tg_br = " ";
+            $tg_hr = " ";
+            $tg_bo = "";
+            $tg_bc = "";
+        }
+
+        if ($act == BIN5_RULES_OLDSCHEMA) {
+            return ("");
+        }
+        else 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_aban'][$G_lang],
+                            $tg_br, $tg_hr, $tg_bo, $tg_bc,
+                            $win_name));
+        }
+        else {
+            $wol = static::game_result($old_asta_pnt, $old_pnt);
+
+            $noty = "";
+
+            if ($win != $fri) { // not alone case
+                /* MLANG: "<hr>Nell'ultima mano ha chiamato <b>%s</b>, il socio era <b>%s</b>,<br>", "hanno fatto <b>cappotto</b> EBBRAVI!.<hr>", "dovevano fare <b>%s</b> punti e ne hanno fatti <b>%d</b>: hanno <b>%s</b>.<hr>", "<hr>Nell'ultima mano <b>%s</b> si &egrave; chiamato in mano,<br>", "ha fatto <b>cappotto</b> EBBRAVO!.<hr>", "doveva fare <b>%s</b> punti e ne ha fatti <b>%d</b>: ha <b>%s</b>.<hr>", ($table->old_asta_pnt > 61 ? "almeno ".$table->old_asta_pnt : 'pi&ugrave; di 60'), $table->old_pnt, ($wol == 1 ? "vinto" : ($wol == 0 ? "pareggiato" : "perso" */
+
+                $noty .= sprintf($mlang_bin5_bin5['info_part'][$G_lang],
+                                 $tg_br, $tg_hr, $tg_bo, $tg_bc,
+                                 $win_name,
+                                 $fri_name,
+                                 $old_tourn_pts);
+                if ($old_pnt == 120) {
+                    $noty .= sprintf($mlang_bin5_bin5['info_capp'][$G_lang],
+                                     $tg_br, $tg_hr, $tg_bo, $tg_bc );
+                }
+                else {
+                    if ($old_asta_pnt > 61) {
+                        $noty .= sprintf($mlang_bin5_bin5['info_alea'][$G_lang],
+                                         $tg_br, $tg_hr, $tg_bo, $tg_bc,
+                                         $old_asta_pnt, $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_more'][$G_lang],
+                                         $tg_br, $tg_hr, $tg_bo, $tg_bc,
+                                         $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 of if ($old_asta_pnt > 61) {
+                } // else of if ($old_pnt == 120) {
+            } // if ($win != $fri) { // not alone case
+            else {
+                $noty .= sprintf($mlang_bin5_bin5['info_alon'][$G_lang],
+                                 $tg_br, $tg_hr, $tg_bo, $tg_bc,
+                                 $win_name,
+                                 $old_tourn_pts);
+                if ($old_pnt == 120) {
+                    $noty .= sprintf($mlang_bin5_bin5['info_acap'][$G_lang],
+                                     $tg_br, $tg_hr, $tg_bo, $tg_bc);
+                }
+                else {
+                    if ($old_asta_pnt > 61) {
+                        $noty .= sprintf($mlang_bin5_bin5['info_aleaa'][$G_lang],
+                                         $tg_br, $tg_hr, $tg_bo, $tg_bc,
+                                         $old_asta_pnt, $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_morea'][$G_lang],
+                                         $tg_br, $tg_hr, $tg_bo, $tg_bc,
+                                         $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_multer = static::s_multer($old_mult, $old_asta_pnt);
+        if ($old_multer > 1) {
+            $noty .= sprintf($mlang_bin5_bin5['info_omul'][$G_lang],
+                             $tg_br, $tg_hr, $tg_bo, $tg_bc,
+                             multoval($old_multer));
+        }
+        $noty .= sprintf('%2$s', $tg_br, $tg_hr);
+
+        return ($noty);
+    }
+} // class Rules_old_rules
 
 class Card {
     var $value; /* 0 - 39 card value */
@@ -200,6 +544,7 @@ class Bin5_table extends Table {
     var $old_friend;        // the old callee idx position at table
 
     var $old_tourn_pts;     // the old tournment computed points in the hand of caller
+    var $rules;
 
     function Bin5_table()
     {
@@ -315,6 +660,9 @@ class Bin5_table extends Table {
         $thiz->old_asta_win = -1;
         $thiz->old_reason = "";
 
+        // FIXME
+        $rules_name = "Rules_old_rules";
+        $thiz->rules = new $rules_name($thiz);
         // players are rearranged in an dedicated array
         $thiz->player = array();
         for ($i = 0 ; $i < $from->player_n ; $i++)
@@ -325,41 +673,6 @@ class Bin5_table extends Table {
         return ($thiz);
     }
 
-    static function asta2mult($asta_pnt)
-    {
-        if ($asta_pnt > 110)
-            return (6);
-        else if ($asta_pnt > 100)
-            return (5);
-        else if ($asta_pnt > 90)
-            return (4);
-        else if ($asta_pnt > 80)
-            return (3);
-        else if ($asta_pnt > 70)
-            return (2);
-        else
-            return (1);
-    }
-
-    function multer($is_new)
-    {
-        if ($is_new) {
-            return (static::s_multer($this->mult, $this->asta_pnt));
-        }
-        else {
-            return (static::s_multer($this->old_mult, $this->old_asta_pnt));
-        }
-    }
-
-    static function s_multer($mult, $pnt)
-    {
-        return (pow(2, $mult) * static::asta2mult($pnt));
-    }
-
-    static function s_point_calc($pnt_done, $mult, $pnt_req, $is_allpoints)
-    {
-        return ($pnt_done * static::s_multer($mult, $pnt_req) * ($is_allpoints ? 2 : 1));
-    }
 
     //   function bunch_create_old() function AND
     //   {
@@ -514,166 +827,6 @@ class Bin5_table extends Table {
         return ($ct);
     }
 
-    function rules_engine(&$bri, $curtime, $action, $user)
-    {
-        GLOBAL $G_all_points, $G_dbasetype;
-
-        $pnts_sav = array();
-
-        if ($action == BIN5_RULES_ALLPASS) { // return TRUE if all correct
-            $this->old_act = $action;
-            $this->old_asta_win = -1;
-            $this->old_pnt = 0;
-            $this->mult_inc(1);
-            for ($i = 0 ; $i < PLAYERS_N ; $i++) {
-                $pnts_sav[$i] = 0;
-            }
-
-            $game_delta = 1;
-            // $this->game_next(1);
-            $this->game_init(&$bri->user);
-        }
-        else if ($action == BIN5_RULES_ABANDON) { // return TRUE if all correct
-            if (!($user->handpt <= 2)) {
-                return (FALSE);
-            }
-            $this->old_act = $action;
-            log_wr(sprintf("GIOCO FINITO !!!"));
-            $this->old_asta_win = $user->table_pos;
-            $this->old_pnt = 0;
-            $this->mult_inc(1);
-
-            for ($i = 0 ; $i < PLAYERS_N ; $i++) {
-                $pnts_sav[$i] = 0;
-            }
-
-            // Non si cambia mazzo se si abbandona la partita
-            $game_delta = 0;
-            // $this->game_next(0);
-            $this->game_init(&$bri->user);
-        }
-        else if ($action == BIN5_RULES_FINISH) { // return TRUE if all correct
-            $this->old_act = $action;
-            do {
-                $pro = 0;
-
-                if ($this->asta_pnt == 60)
-                    $this->asta_pnt = 61;
-
-                $this->old_reason = "";
-
-                // count points for the temporary 2 teams
-                for ($i = 0 ; $i < (BIN5_CARD_HAND * BIN5_PLAYERS_N) ; $i++) {
-                    $ctt = $this->card[$i]->value % 10;
-                    $own = $this->card[$i]->owner;
-                    if ($own == $this->asta_win || $own == $this->friend)
-                        $pro += $G_all_points[$ctt];
-                }
-
-                log_wr(sprintf("PRO: [%d]", $pro));
-
-                // PATTA case !
-                if (game_result($this->asta_pnt, $pro) == 0) {
-                    $this->points[$this->points_n % MAX_POINTS] = array();
-                    for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
-                        $this->points[$this->points_n % MAX_POINTS][$i] = 0;
-                        $pnts_sav[$i] = 0;
-                    }
-                    $this->points_n++;
-                    $this->old_pnt = $pro;
-                    $this->old_asta_win = $this->asta_win;
-                    $this->mult_inc(1);
-
-                    break;
-                }
-
-                if ($pro >= $this->asta_pnt)
-                    $sig = 1;
-                else
-                    $sig = -1;
-
-                // TAG: POINTS_MANAGEMENT
-                $this->points[$this->points_n % MAX_POINTS] = array();
-                for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
-                    if ($i == $this->asta_win)
-                        $pnt = ($i == $this->friend ? 4 : 2);
-                    else if ($i == $this->friend)
-                        $pnt = 1;
-                    else
-                        $pnt = -1;
-
-                    log_wr(sprintf("PRO: pt[%d][%d] = %d", $this->points_n % MAX_POINTS, $i, $pnt));
-
-                    $pnt_sav = static::s_point_calc($pnt * $sig,           0, $this->asta_pnt, ($pro == 120));
-                    $pnt_tab = static::s_point_calc($pnt * $sig, $this->mult, $this->asta_pnt, ($pro == 120));
-
-                    $this->points[$this->points_n % MAX_POINTS][$i] = $pnt_tab;
-                    $this->total[$i] += $pnt_tab;
-                    $pnts_sav[$i] = $pnt_sav;
-                }
-                $this->points_n++;
-                $this->old_pnt = $pro;
-                $this->old_asta_win = $this->asta_win;
-                $this->mult_set(0);
-            } while (0);
-            $game_delta = 1;
-        }
-        else {
-            return (FALSE);
-        }
-        $this->game_next($game_delta);
-
-        $plist = "$this->table_token|$user->table_orig|$this->player_n";
-        $ucodes = array();
-        $codes = "";
-        for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
-            $user_cur = &$bri->user[$this->player[$i]];
-
-            /* pro db */
-            $ucodes[$i] = $user_cur->code_get();
-
-            /* pro log */
-            $plist .= '|'.xcapelt($user_cur->name).'|'.$pnts_sav[$i];
-            $codes .= '|'.xcapelt($user_cur->code_get());
-        }
-        $plist .= $codes;
-        log_legal($curtime, $user->ip, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
-
-        $this->old_asta_pnt = $this->asta_pnt;
-        // $this->old_mazzo is managed by ->game_next();
-        // $this->old_mult, $this->old_pnt, $this->old_reason and $this->old_asta_win are specific
-
-        $this->old_friend = $this->friend;
-        $this->old_tourn_pts = $this->tourn_pts;
-
-        $this->old_reason = game_description($action, 'html', $this->old_mult,
-                                             $this->old_asta_win,
-                                             ($this->old_asta_win != -1 ?
-                                              $bri->user[$this->player[$this->old_asta_win]]->name : ""),
-                                             $this->old_friend,
-                                             ($this->old_friend != -1 ?
-                                              $bri->user[$this->player[$this->old_friend]]->name : ""),
-                                             $this->old_pnt, $this->old_asta_pnt, $this->old_tourn_pts);
-
-
-        if ($user->table_orig < TABLES_AUTH_N) {
-            require_once("../Obj/dbase_".$G_dbasetype.".phh");
-
-            if (($bdb = BriskDB::create()) != FALSE) {
-                $bdb->bin5_points_save($curtime, $this, $user->table_orig, $action, $ucodes, $pnts_sav);
-                unset($bdb);
-            }
-            else {
-                log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", "DATABASE CONNECTION FAILED");
-            }
-            log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
-        }
-
-        $this->game_init(&$bri->user);
-
-        return (TRUE);
-    }
-
     function match_continue(&$bri, $user, $match_id_s)
     {
         $ret = FALSE;
@@ -1915,7 +2068,7 @@ function show_table_info(&$bri, &$table, $table_pos)
         $noty .= sprintf($mlang_bin5_bin5['info_turn'][$G_lang], $unam);
     }
 
-    $multer = $table->multer(TRUE);
+    $multer = $table->rules->multer(TRUE);
     if ($multer > 1) {
         $noty .= sprintf($mlang_bin5_bin5['info_mult'][$G_lang], multoval($multer) );
     }
@@ -1980,25 +2133,15 @@ function briscola_show($bri, $table, $user)
     return ($ret);
 }
 
-
-function game_result($asta_pnt, $pnt)
+/* FIXME
+function game_result_new($asta_pnt, $pnt)
 {
-    $sixty = 60;
-    if ($asta_pnt == 61) {
-        if ($pnt > $sixty)
-            return (1);
-        else if ($pnt == $sixty)
-            return (0);
-        else
-            return (-1);
-    }
-    else {
-        if ($pnt >= $asta_pnt)
-            return (1);
-        else
-            return (-1);
-    }
+    if ($pnt >= $asta_pnt)
+        return (1);
+    else
+        return (-1);
 }
+*/
 
 function log_points($remote_addr, $curtime, $user, $where, $mesg)
 {
@@ -2011,113 +2154,5 @@ function log_points($remote_addr, $curtime, $user, $where, $mesg)
     }
 }
 
-function game_description($act, $form, $old_mult, $win = -1, $win_name = "?1?", $fri = -1, $fri_name = "?2?",
-                          $old_pnt = -1, $old_asta_pnt = -1, $old_tourn_pts = -1)
-{
-    GLOBAL $G_lang, $mlang_bin5_bin5;
-
-    if ($form == 'html') {
-        $tg_br = "<br>";
-        $tg_hr = "<hr>";
-        $tg_bo = "<b>";
-        $tg_bc = "</b>";
-        $win_name = xcape($win_name);
-        $fri_name = xcape($fri_name);
-    }
-    else {
-        $tg_br = " ";
-        $tg_hr = " ";
-        $tg_bo = "";
-        $tg_bc = "";
-    }
-
-    if ($act == BIN5_RULES_OLDSCHEMA) {
-        return ("");
-    }
-    else 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_aban'][$G_lang],
-                        $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                        $win_name));
-    }
-    else {
-        $wol = game_result($old_asta_pnt, $old_pnt);
-
-        $noty = "";
-
-        if ($win != $fri) { // not alone case
-            /* MLANG: "<hr>Nell'ultima mano ha chiamato <b>%s</b>, il socio era <b>%s</b>,<br>", "hanno fatto <b>cappotto</b> EBBRAVI!.<hr>", "dovevano fare <b>%s</b> punti e ne hanno fatti <b>%d</b>: hanno <b>%s</b>.<hr>", "<hr>Nell'ultima mano <b>%s</b> si &egrave; chiamato in mano,<br>", "ha fatto <b>cappotto</b> EBBRAVO!.<hr>", "doveva fare <b>%s</b> punti e ne ha fatti <b>%d</b>: ha <b>%s</b>.<hr>", ($table->old_asta_pnt > 61 ? "almeno ".$table->old_asta_pnt : 'pi&ugrave; di 60'), $table->old_pnt, ($wol == 1 ? "vinto" : ($wol == 0 ? "pareggiato" : "perso" */
-
-            $noty .= sprintf($mlang_bin5_bin5['info_part'][$G_lang],
-                             $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                             $win_name,
-                             $fri_name,
-                             $old_tourn_pts);
-            if ($old_pnt == 120) {
-                $noty .= sprintf($mlang_bin5_bin5['info_capp'][$G_lang],
-                                 $tg_br, $tg_hr, $tg_bo, $tg_bc );
-            }
-            else {
-                if ($old_asta_pnt > 61) {
-                    $noty .= sprintf($mlang_bin5_bin5['info_alea'][$G_lang],
-                                     $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                                     $old_asta_pnt, $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_more'][$G_lang],
-                                     $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                                     $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 of if ($old_asta_pnt > 61) {
-            } // else of if ($old_pnt == 120) {
-        } // if ($win != $fri) { // not alone case
-        else {
-            $noty .= sprintf($mlang_bin5_bin5['info_alon'][$G_lang],
-                             $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                             $win_name,
-                             $old_tourn_pts);
-            if ($old_pnt == 120) {
-                $noty .= sprintf($mlang_bin5_bin5['info_acap'][$G_lang],
-                                 $tg_br, $tg_hr, $tg_bo, $tg_bc);
-            }
-            else {
-                if ($old_asta_pnt > 61) {
-                    $noty .= sprintf($mlang_bin5_bin5['info_aleaa'][$G_lang],
-                                     $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                                     $old_asta_pnt, $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_morea'][$G_lang],
-                                     $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                                     $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_multer = Bin5_table::s_multer($old_mult, $old_asta_pnt);
-    if ($old_multer > 1) {
-        $noty .= sprintf($mlang_bin5_bin5['info_omul'][$G_lang],
-                         $tg_br, $tg_hr, $tg_bo, $tg_bc,
-                         multoval($old_multer));
-    }
-    $noty .= sprintf('%2$s', $tg_br, $tg_hr);
-
-    return ($noty);
-}
 
 ?>
index c9b5b80..a36c03f 100644 (file)
@@ -198,7 +198,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
 
                 /* $table->game_init(&$bin5->user); */
 
-                if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_ABANDON, $user)) {
+                if ($table->rules->engine(&$bin5, $curtime, BIN5_RULES_ABANDON, $user)) {
                     for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                         $user_cur = &$bin5->user[$table->player[$i]];
 
@@ -302,7 +302,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                         else if ($table->asta_pla_n == 0) {
                             log_wr("PASSANO TUTTI!");
 
-                            if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_ALLPASS, $user)) {
+                            if ($table->rules->engine(&$bin5, $curtime, BIN5_RULES_ALLPASS, $user)) {
                                 for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                                     $user_cur = &$bin5->user[$table->player[$i]];
 
@@ -370,7 +370,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                         $tourn_values = array(11, 10, 4,3,2, 1,1,1,1,1);
                         $table->tourn_pts = 0;
                         $seed = $a_brisco - ($a_brisco % 10);
-                        for ($i = $seed ; $i < ($seed + 10) ; $i++) {
+                        for ($i = $seed ; $i < ($seed + min(10, BIN5_CARD_HAND * BIN5_PLAYERS_N)) ; $i++) {
                             if ($table->card[$i]->owner == $table->asta_win) {
                                 $table->tourn_pts += $tourn_values[$i - $seed];
                             }
@@ -500,7 +500,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                     if ($table->turn == (BIN5_PLAYERS_N * BIN5_CARD_HAND)) { /* game finished */
                         log_wr(sprintf("GIOCO FINITO !!!"));
 
-                        if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_FINISH, $user)) {
+                        if ($table->rules->engine(&$bin5, $curtime, BIN5_RULES_FINISH, $user)) {
                             for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                                 $user_cur = &$bin5->user[$table->player[$i]];
                                 $retar[$i] .= show_table(&$bin5,&$user_cur,$user_cur->step+1,TRUE, TRUE);
index d70d208..cadeb26 100644 (file)
@@ -40,8 +40,14 @@ curl -d "pazz=$BRISK_PASS" "http://$BRISK_SITE/briskin5/stat-day.php?from=$(date
 
 $G_base = "../";
 
-$mlang_stat_day = array( 'normal match'=> array( 'it' => 'Partite normali',
-                                                 'en' => 'Normal matches' ),
+// SYNC WITH bin5_tournaments table
+$mlang_stat_day = array(
+                         'old rules: with draw'=> array( 'it' => 'Partite vecchie (con il pareggio)',
+                                                         'en' => 'Old matches (with draw)' ),
+
+                         'new rules: without draw' => array( 'it' => 'Partite nuove (senza pareggio)',
+                                                             'en' => 'New matches (without draw)'),
+
                          'special match' => array( 'it' => 'Partite speciali',
                                                    'en' => 'Special matches'),
 
@@ -427,8 +433,10 @@ SELECT p.pts AS pts
                                 ($tmt_obj->minus_one_is_old == -1 ? "td" : "th"));
                     }
                     if ($tmt_obj->minus_one_is_old != -1) {
+                        // FIXME
+                        $rules_name = "Rules_old_rules";
                         fprintf($fpexp, "<td>%s</td><td>%s</td>", $users[$gam_obj->mazzo]['login'],
-                                xcape( game_description($gam_obj->act, 'plain', $gam_obj->mult,
+                                xcape( ${rules_name}::game_description($gam_obj->act, 'plain', $gam_obj->mult,
                                                         $gam_obj->asta_win,
                                                         ($gam_obj->asta_win != -1 ?
                                                          $users[$gam_obj->asta_win]['login'] : ""),
@@ -471,7 +479,7 @@ SELECT sum(p.pts * (2^g.mult)) AS pts
             }
         }
         if ($t < $trn_n) {
-            log_crit("stat-day: t < trn_n");
+            log_crit(sprintf("stat-day: t < trn_n (%d, %d)", $t, $trn_n));
             break;
         }
         $ret = (TRUE);
index 652a11d..ee06e08 100644 (file)
@@ -30,8 +30,6 @@
 
 $G_base = "../";
 
-define('BIN5_TOURNAMENT_NORMAL', 1);
-
 ini_set("max_execution_time",  "240");
 
 require_once("../Obj/brisk.phh");