projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into auto-maintenance
[brisk.git]
/
web
/
briskin5
/
Obj
/
briskin5.phh
diff --git
a/web/briskin5/Obj/briskin5.phh
b/web/briskin5/Obj/briskin5.phh
index
94d0788
..
e247e93
100644
(file)
--- a/
web/briskin5/Obj/briskin5.phh
+++ b/
web/briskin5/Obj/briskin5.phh
@@
-339,11
+339,9
@@
class Bin5_table extends Table {
function multer($is_new)
{
if ($is_new) {
function multer($is_new)
{
if ($is_new) {
- // return (pow(2, $this->mult) * $this->asta2mult($this->asta_pnt));
return (static::s_multer($this->mult, $this->asta_pnt));
}
else {
return (static::s_multer($this->mult, $this->asta_pnt));
}
else {
- // return (pow(2, $this->old_mult) * $this->asta2mult($this->old_asta_pnt));
return (static::s_multer($this->old_mult, $this->old_asta_pnt));
}
}
return (static::s_multer($this->old_mult, $this->old_asta_pnt));
}
}
@@
-353,6
+351,11
@@
class Bin5_table extends Table {
return (pow(2, $mult) * static::asta2mult($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
// {
// $ret = array();
// function bunch_create_old() function AND
// {
// $ret = array();
@@
-509,15
+512,15
@@
class Bin5_table extends Table {
{
GLOBAL $G_all_points, $G_dbasetype;
{
GLOBAL $G_all_points, $G_dbasetype;
- $p
ts
= array();
+ $p
nts_sav
= array();
- $this->old_act = $action;
if ($action == BIN5_RULES_ALLPASS) { // return TRUE if all correct
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++) {
$this->old_asta_win = -1;
$this->old_pnt = 0;
$this->mult_inc(1);
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
- $p
ts
[$i] = 0;
+ $p
nts_sav
[$i] = 0;
}
$game_delta = 1;
}
$game_delta = 1;
@@
-525,13
+528,17
@@
class Bin5_table extends Table {
$this->game_init(&$bri->user);
}
else if ($action == BIN5_RULES_ABANDON) { // return TRUE if all correct
$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++) {
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++) {
- $p
ts
[$i] = 0;
+ $p
nts_sav
[$i] = 0;
}
// Non si cambia mazzo se si abbandona la partita
}
// Non si cambia mazzo se si abbandona la partita
@@
-540,6
+547,7
@@
class Bin5_table extends Table {
$this->game_init(&$bri->user);
}
else if ($action == BIN5_RULES_FINISH) { // return TRUE if all correct
$this->game_init(&$bri->user);
}
else if ($action == BIN5_RULES_FINISH) { // return TRUE if all correct
+ $this->old_act = $action;
do {
$pro = 0;
do {
$pro = 0;
@@
-563,13
+571,12
@@
class Bin5_table extends Table {
$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;
$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;
- $p
ts
[$i] = 0;
+ $p
nts_sav
[$i] = 0;
}
$this->points_n++;
$this->old_pnt = $pro;
$this->mult_inc(1);
}
$this->points_n++;
$this->old_pnt = $pro;
$this->mult_inc(1);
- // return($pts);
break;
}
break;
}
@@
-578,31
+585,29
@@
class Bin5_table extends Table {
else
$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)
$this->points[$this->points_n % MAX_POINTS] = array();
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
if ($i == $this->asta_win)
- $pt = ($i == $this->friend ? 4 : 2);
+ $p
n
t = ($i == $this->friend ? 4 : 2);
else if ($i == $this->friend)
else if ($i == $this->friend)
- $pt = 1;
+ $p
n
t = 1;
else
else
- $pt = -1;
+ $p
n
t = -1;
- log_wr(sprintf("PRO: pt[%d][%d] = %d", $this->points_n % MAX_POINTS, $i, $pt));
+ log_wr(sprintf("PRO: pt[%d][%d] = %d", $this->points_n % MAX_POINTS, $i, $p
n
t));
- $pt = $pt * $sig * $this->multer(TRUE) * ($pro == 120 ? 2 : 1);
+ $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));
- log_wr(sprintf("PRO:[%d][%d][%d]", $sig, $this->multer(TRUE), ($pro == 120 ? 2 : 1)));
-
- $this->points[$this->points_n % MAX_POINTS][$i] = $pt;
- $this->total[$i] += $pt;
- $pts[$i] = $pt;
+ $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);
}
$this->points_n++;
$this->old_pnt = $pro;
$this->old_asta_win = $this->asta_win;
$this->mult_set(0);
-
- // return($pts);
} while (0);
$game_delta = 1;
}
} while (0);
$game_delta = 1;
}
@@
-621,7
+626,7
@@
class Bin5_table extends Table {
$ucodes[$i] = $user_cur->code_get();
/* pro log */
$ucodes[$i] = $user_cur->code_get();
/* pro log */
- $plist .= '|'.xcapelt($user_cur->name).'|'.$p
ts
[$i];
+ $plist .= '|'.xcapelt($user_cur->name).'|'.$p
nts_sav
[$i];
$codes .= '|'.xcapelt($user_cur->code_get());
}
$plist .= $codes;
$codes .= '|'.xcapelt($user_cur->code_get());
}
$plist .= $codes;
@@
-646,7
+651,7
@@
class Bin5_table extends Table {
require_once("../Obj/dbase_".$G_dbasetype.".phh");
if (($bdb = BriskDB::create()) != FALSE) {
require_once("../Obj/dbase_".$G_dbasetype.".phh");
if (($bdb = BriskDB::create()) != FALSE) {
- $bdb->bin5_points_save($curtime, $this, $user->table_orig, $action, $ucodes, $p
ts
);
+ $bdb->bin5_points_save($curtime, $this, $user->table_orig, $action, $ucodes, $p
nts_sav
);
unset($bdb);
}
else {
unset($bdb);
}
else {
@@
-1151,6
+1156,7
@@
class Bin5_user extends User {
class Bin5 {
static $delta_t = array();
class Bin5 {
static $delta_t = array();
+ var $brisk;// room object reference
var $user;
var $table;
var $user;
var $table;
@@
-1178,9
+1184,9
@@
class Bin5 {
exit;
}
exit;
}
+ $this->brisk = $brisk;
$user = $brisk->user;
$table = $brisk->table[$table_idx];
$user = $brisk->user;
$table = $brisk->table[$table_idx];
-
log_wr("Bin5 constructor");
for ($i = 0 ; $i < $table->player_n ; $i++) {
log_wr("Bin5 constructor");
for ($i = 0 ; $i < $table->player_n ; $i++) {
@@
-1520,6
+1526,8
@@
class Bin5 {
return TRUE;
break;
}
return TRUE;
break;
}
+ $bri->brisk->sess_cur_set($user->sess);
+
// close a previous opened index_read_ifra socket, if exists
if (($prev = $user->rd_socket_get()) != NULL) {
$s_a_p->socks_unset($user->rd_socket_get());
// close a previous opened index_read_ifra socket, if exists
if (($prev = $user->rd_socket_get()) != NULL) {
$s_a_p->socks_unset($user->rd_socket_get());
@@
-1838,6
+1846,7
@@
function show_table_info(&$bri, &$table, $table_pos)
$ret = "";
$user = $bri->user[$table->player[$table_pos]];
$ret = "";
$user = $bri->user[$table->player[$table_pos]];
+ // TAG: POINTS_MANAGEMENT
$pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
$noty = sprintf('<table class=\"points\"><tr><th></th>');
$pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
$noty = sprintf('<table class=\"points\"><tr><th></th>');