beu/TrackManiaControl
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

stat fixes

Browse Source
This commit is contained in:
Steffen Schröder 2014-01-05 19:15:27 +01:00
parent 0459a945ce
commit 3a8c70a4c4
2 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/core/Statistics/StatisticCollector.php
View File

@ -155,8 +155,13 @@ class StatisticCollector implements CallbackListener {
$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_NEARMISS, $player); $this->maniaControl->statisticManager->incrementStat(self::STAT_ON_NEARMISS, $player);
break; break;
case 'LibXmlRpc_OnCapture': case 'LibXmlRpc_OnCapture':
$player = $this->maniaControl->playerManager->getPlayer($callback[1][1][0]); $logins = $callback[1][1][0];
$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_CAPTURE, $player); $logins = explode(';', $logins);
foreach ($logins as $login) {
$player = $this->maniaControl->playerManager->getPlayer($login);
if (!$player) continue;
$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_CAPTURE, $player);
}
break; break;
case 'LibXmlRpc_OnArmorEmpty': case 'LibXmlRpc_OnArmorEmpty':
$shooter = $this->maniaControl->playerManager->getPlayer($callback[1][1][0]); $shooter = $this->maniaControl->playerManager->getPlayer($callback[1][1][0]);
@ -185,8 +190,8 @@ class StatisticCollector implements CallbackListener {
case 'OnHit': case 'OnHit':
$paramsObject = json_decode($callback[1][1]); $paramsObject = json_decode($callback[1][1]);
$shooter = $this->maniaControl->playerManager->getPlayer($paramsObject->Event->Shooter->Login); $shooter = $this->maniaControl->playerManager->getPlayer($paramsObject->Event->Shooter->Login);
$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_HIT, $shooter);
$victim = $this->maniaControl->playerManager->getPlayer($paramsObject->Event->Victim->Login); $victim = $this->maniaControl->playerManager->getPlayer($paramsObject->Event->Victim->Login);
$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_HIT, $shooter);
$this->maniaControl->statisticManager->incrementStat(self::STAT_ON_GOT_HIT, $victim); $this->maniaControl->statisticManager->incrementStat(self::STAT_ON_GOT_HIT, $victim);
break; break;
case 'OnArmorEmpty': case 'OnArmorEmpty':

60
application/core/Statistics/StatisticManager.php
View File

@ -77,6 +77,7 @@ class StatisticManager {
$result = $mysqli->query($query); $result = $mysqli->query($query);
if (!$result) { if (!$result) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return null;
} }
$row = $result->fetch_object(); $row = $result->fetch_object();
@ -95,17 +96,17 @@ class StatisticManager {
$result = $mysqli->query($query); $result = $mysqli->query($query);
if (!$result) { if (!$result) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return;
} }
while ($row = $result->fetch_object()) { while ($row = $result->fetch_object()) {
$this->stats[$row->name] = $row; $this->stats[$row->name] = $row;
} }
$result->close(); $result->close();
} }
/** /**
* Returns the Stats Id * Return the Stat Id
* *
* @param $statName * @param $statName
* @return int * @return int
@ -115,9 +116,7 @@ class StatisticManager {
$stat = $this->stats[$statName]; $stat = $this->stats[$statName];
return (int) $stat->index; return (int) $stat->index;
} }
else { return null;
return null;
}
} }
/** /**
@ -128,7 +127,8 @@ class StatisticManager {
* @return array * @return array
*/ */
public function getAllPlayerStats(Player $player, $serverIndex = -1) { public function getAllPlayerStats(Player $player, $serverIndex = -1) {
$playerStats = array(); // TODO improve performence // TODO improve performance
$playerStats = array();
foreach ($this->stats as $stat) { foreach ($this->stats as $stat) {
$value = $this->getStatisticData($stat->name, $player->index, $serverIndex); $value = $this->getStatisticData($stat->name, $player->index, $serverIndex);
$playerStats[$stat->name] = array($stat, $value); $playerStats[$stat->name] = array($stat, $value);
@ -147,43 +147,31 @@ class StatisticManager {
* @param string $statType * @param string $statType
* @return bool * @return bool
*/ */
public function insertStat($statName, $player, $serverIndex = -1, $value, $statType = self::STAT_TYPE_INT) { public function insertStat($statName, Player $player, $serverIndex = -1, $value, $statType = self::STAT_TYPE_INT) {
if (!$player) return false;
if ($player->isFakePlayer()) return true;
$statId = $this->getStatId($statName); $statId = $this->getStatId($statName);
if (!$statId) return false;
if ($player == null) {
return false;
}
if ($statId == null) {
return false;
}
if ($player->isFakePlayer()) {
return true;
}
if ($serverIndex == -1) { if ($serverIndex == -1) {
$serverIndex = $this->maniaControl->server->getIndex(); $serverIndex = $this->maniaControl->server->getIndex();
} }
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "INSERT INTO `" . self::TABLE_STATISTICS . "` ( $query = "INSERT INTO `" . self::TABLE_STATISTICS . "` (
`serverIndex`, `serverIndex`,
`playerId`, `playerId`,
`statId`, `statId`,
`value` `value`
) VALUES ( ) VALUES (
?, ?, ?, ? ?, ?, ?, ?
) ON DUPLICATE KEY UPDATE ) ON DUPLICATE KEY UPDATE
`value` = `value` + VALUES(`value`);"; `value` = `value` + VALUES(`value`);";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if ($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return false; return false;
} }
$statement->bind_param('iiii', $serverIndex, $player->index, $statId, $value); $statement->bind_param('iiii', $serverIndex, $player->index, $statId, $value);
$statement->execute(); $statement->execute();
if ($statement->error) { if ($statement->error) {
@ -191,7 +179,6 @@ class StatisticManager {
$statement->close(); $statement->close();
return false; return false;
} }
$statement->close(); $statement->close();
return true; return true;
} }
@ -219,11 +206,11 @@ class StatisticManager {
public function defineStatMetaData($statName, $type = self::STAT_TYPE_INT, $statDescription = '') { public function defineStatMetaData($statName, $type = self::STAT_TYPE_INT, $statDescription = '') {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$query = "INSERT INTO `" . self::TABLE_STATMETADATA . "` ( $query = "INSERT INTO `" . self::TABLE_STATMETADATA . "` (
`name`, `name`,
`type`, `type`,
`description` `description`
) VALUES ( ) VALUES (
?, ?, ? ?, ?, ?
) ON DUPLICATE KEY UPDATE ) ON DUPLICATE KEY UPDATE
`type` = VALUES(`type`), `type` = VALUES(`type`),
`description` = VALUES(`description`);"; `description` = VALUES(`description`);";
@ -239,9 +226,7 @@ class StatisticManager {
$statement->close(); $statement->close();
return false; return false;
} }
$statement->close(); $statement->close();
return true; return true;
} }
@ -260,17 +245,14 @@ class StatisticManager {
PRIMARY KEY (`index`), PRIMARY KEY (`index`),
UNIQUE KEY `name` (`name`) UNIQUE KEY `name` (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Statistics Meta Data' AUTO_INCREMENT=1;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Statistics Meta Data' AUTO_INCREMENT=1;";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if ($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$statement->execute(); $statement->execute();
if ($statement->error) { if ($statement->error) {
trigger_error($statement->error, E_USER_ERROR); trigger_error($statement->error, E_USER_ERROR);
return false; return false;
} }
$statement->close(); $statement->close();
@ -284,21 +266,17 @@ class StatisticManager {
PRIMARY KEY (`index`), PRIMARY KEY (`index`),
UNIQUE KEY `unique` (`statId`,`playerId`,`serverIndex`) UNIQUE KEY `unique` (`statId`,`playerId`,`serverIndex`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Statistics' AUTO_INCREMENT=1;"; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Statistics' AUTO_INCREMENT=1;";
$statement = $mysqli->prepare($query); $statement = $mysqli->prepare($query);
if ($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error, E_USER_ERROR); trigger_error($mysqli->error, E_USER_ERROR);
return false; return false;
} }
$statement->execute(); $statement->execute();
if ($statement->error) { if ($statement->error) {
trigger_error($statement->error, E_USER_ERROR); trigger_error($statement->error, E_USER_ERROR);
return false; return false;
} }
$statement->close(); $statement->close();
return true; return true;
} }
} }