X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=205a1220afc37e16d2ecd5588815deca029d6ff2;hb=a2a413e82ec27127d9b27b03afbb7da14228cf5d;hp=28a502c2619ee3fa65fb8cf27e06f47cec13a595;hpb=1f93e1d341ffdad5636b20254ac6cc932029f734;p=brisk.git
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 28a502c..205a122 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -33,20 +33,31 @@ define(BRISKIN5_SHM_DLT, 32768);
$mlang_bin5_bin5 = array(
'info_part' => array( 'it' => '
Nell\'ultima mano ha chiamato %s, il socio era %s,
',
'en' => '
In the last hand the declarer was %s, the partner was %s,
'),
- 'info_capp' => array( 'it' => 'hanno fatto cappotto EBBRAVI!.
',
- 'en' => 'and he made capot WELL DONE!.
'),
- 'info_pnt' => array( 'it' => 'dovevano fare %s punti e ne hanno fatti %d: %s.
',
- 'en' => 'they had to do %s points and they had made %d: %s.
'),
+ 'info_capp' => array( 'it' => 'hanno fatto cappotto EBBRAVI!.
',
+ 'en' => 'and they made capot WELL DONE!.
'),
+ 'info_pnt' => array( 'it' => 'dovevano fare %s punti e ne hanno fatti %d: hanno %s.
',
+ 'en' => 'they had to do %s points and they had made %d: they have %s.
'),
'info_alea' => array( 'it' => 'almeno ',
'en' => 'at least '),
'info_more' => array( 'it' => 'più di 60',
'en' => 'over 60'),
- 'info_win' => array( 'it' => 'hanno vinto',
- 'en' => 'they have win'),
- 'info_peer' => array( 'it' => 'hanno pareggiato',
- 'en' => 'they have drew'),
- 'info_lost' => array( 'it' => 'hanno perso',
- 'en' => 'they have lost'),
+ 'info_win' => array( 'it' => 'vinto',
+ 'en' => 'win'),
+ 'info_peer' => array( 'it' => 'pareggiato',
+ 'en' => 'drew'),
+ 'info_lost' => array( 'it' => 'perso',
+ 'en' => 'lost'),
+
+ 'info_alon' => array( 'it' => '
Nell\'ultima partita %s si è chiamato in mano,
',
+ 'en' => '
In the last hand %s play alone against each other,
'),
+ 'info_apnt' => array( 'it' => 'doveva fare %s punti e ne ha fatti %d: ha %s.
',
+ 'en' => 'he/she had to do %s points and they had made %d: he/she had %s.
'),
+ 'info_acap' => array( 'it' => 'ha fatto cappotto EBBRAVO!.
',
+ 'en' => 'and he/she made capot WELL DONE!.
'),
+
+ 'info_omul' => array( 'it' => ' La partita valeva %s.',
+ 'en' => ' EN: The game was worth %s.' ),
+
'info_yturn'=> array( 'it' => ' tocca a te giocare.',
'en' => ' it\'s your turn.'),
'info_turn' => array( 'it' => 'tocca a %s giocare.',
@@ -150,6 +161,7 @@ class Table_briskin5 extends Table {
var $old_reason;
var $old_asta_pnt;
+ var $old_mult;
var $old_pnt;
var $old_win;
var $old_friend;
@@ -186,6 +198,7 @@ class Table_briskin5 extends Table {
$thiz->old_reason = "";
$thiz->old_asta_pnt = -1;
+ $thiz->old_mult = -1;
$thiz->old_pnt = -1;
$thiz->old_win = -1;
$thiz->old_friend = -1;
@@ -225,6 +238,7 @@ class Table_briskin5 extends Table {
$thiz->old_reason = $from->old_reason;
$thiz->old_asta_pnt = $from->old_asta_pnt;
+ $thiz->old_mult = $from->mult;
$thiz->old_pnt = $from->old_pnt;
$thiz->old_win = $from->old_win;
$thiz->old_friend = $from->old_friend;
@@ -958,6 +972,22 @@ function locshm_exists($tok)
}
+function asta2mult($asta_pnt)
+{
+ if ($asta_pnt > 110)
+ return (5);
+ else if ($asta_pnt > 100)
+ return (4);
+ else if ($asta_pnt > 90)
+ return (3);
+ else if ($asta_pnt > 80)
+ return (2);
+ else if ($asta_pnt > 70)
+ return (1);
+ else
+ return (0);
+}
+
// rendiamo qui l'elenco dei punti come return della func
function calculate_points(&$table)
{
@@ -973,6 +1003,7 @@ function calculate_points(&$table)
$table->old_win = $table->asta_win;
$table->old_friend = $table->friend;
$table->old_asta_pnt = $table->asta_pnt;
+ $table->old_mult = $table->mult;
for ($i = 0 ; $i < (BRISKIN5_PLAYERS_N == 5 ? 40 : 24) ; $i++) {
// for ($i = 0 ; $i < 40 ; $i++) {
@@ -993,7 +1024,7 @@ function calculate_points(&$table)
}
$table->points_n++;
$table->old_pnt = $pro;
- $table->mult *= 2;
+ $table->mult += 1;
return($ret);
}
@@ -1003,6 +1034,8 @@ function calculate_points(&$table)
else
$sig = -1;
+ $gamult = asta2mult($table->asta_pnt);
+
$table->points[$table->points_n % MAX_POINTS] = array();
for ($i = 0 ; $i < BRISKIN5_PLAYERS_N ; $i++) {
if ($i == $table->asta_win)
@@ -1011,10 +1044,12 @@ function calculate_points(&$table)
$pt = 1;
else
$pt = -1;
+
+
log_wr(sprintf("PRO: pt[%d][%d] = %d", $table->points_n % MAX_POINTS, $i, $pt));
- $pt = $pt * $sig * $table->mult * ($pro == 120 ? 2 : 1);
+ $pt = $pt * $sig * ($gamult + $table->mult) * ($pro == 120 ? 2 : 1);
log_wr(sprintf("PRO:[%d][%d][%d]", $sig, $table->mult, ($pro == 120 ? 2 : 1)));
@@ -1329,18 +1364,24 @@ function show_table_info(&$room, &$table, $table_pos)
}
}
else {
- $noty .= sprintf("
Nell'ultima mano %s si è chiamato in mano,
",
+ $noty .= sprintf($mlang_bin5_bin5['info_alon'][$G_lang],
xcape($room->user[$win]->name));
if ($table->old_pnt == 120) {
- $noty .= sprintf("ha fatto cappotto EBBRAVO!.
");
+ $noty .= sprintf($mlang_bin5_bin5['info_acap'][$G_lang]);
}
else {
- $noty .= sprintf("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_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])));
}
}
+ if (($table->old_mult + asta2mult($table->old_asta_pnt)) > 1) {
+ $noty .= sprintf($mlang_bin5_bin5['info_omul'][$G_lang], multoval($table->old_mult + asta2mult($table->old_asta_pnt)));
+ }
+ $noty .= "
";
}
/* MLANG: "Fai tu il mazzo,", "Il mazzo a $unam," */
if ($table->mazzo == $table_pos)
@@ -1369,8 +1410,8 @@ function show_table_info(&$room, &$table, $table_pos)
$noty .= sprintf($mlang_bin5_bin5['info_turn'][$G_lang], $unam);
}
- if ($table->mult > 1) {
- $noty .= sprintf($mlang_bin5_bin5['info_mult'][$G_lang], multoval($table->mult));
+ if (($table->mult + asta2mult($table->asta_pnt)) > 1) {
+ $noty .= sprintf($mlang_bin5_bin5['info_mult'][$G_lang], multoval($table->mult + asta2mult($table->asta_pnt)));
}
$noty .= "
";
$ret .= show_notify($noty, 3000, $mlang_bin5_bin5['btn_bkgame'][$G_lang], 500, 400);