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

improvements

Browse Source
This commit is contained in:
kremsy 2014-01-03 19:31:30 +01:00
parent 176b9eef6d
commit 7b6ff4dcb8
3 changed files with 105 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/core/Players/PlayerManager.php
View File

@ -308,11 +308,7 @@ class PlayerManager implements CallbackListener {
$playerStatement->close(); $playerStatement->close();
// Increment the Player Join Count // Increment the Player Join Count
$success = $this->maniaControl->statisticManager->incrementStat(self::STAT_JOIN_COUNT, $player, $this->maniaControl->server->getLogin()); $this->maniaControl->statisticManager->incrementStat(self::STAT_JOIN_COUNT, $player, $this->maniaControl->server->getLogin());
if(!$success) {
trigger_error("Error while setting the JoinCount");
}
return true; return true;
} }

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

@ -183,6 +183,7 @@ class StatisticManager {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return false; return false;
} }
$statement->bind_param('iiii', $serverId, $player->index, $statId, $value); $statement->bind_param('iiii', $serverId, $player->index, $statId, $value);
$statement->execute(); $statement->execute();
if($statement->error) { if($statement->error) {

39
application/plugins/Karma.php
View File

@ -1,16 +1,16 @@
<?php <?php
use ManiaControl\ColorUtil; use FML\Controls\Frame;
use ManiaControl\ManiaControl; use FML\Controls\Gauge;
use FML\Controls\Label;
use FML\Controls\Quad;
use FML\ManiaLink;
use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager; use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ColorUtil;
use ManiaControl\ManiaControl;
use ManiaControl\Maps\Map; use ManiaControl\Maps\Map;
use ManiaControl\Players\Player; use ManiaControl\Players\Player;
use ManiaControl\Plugins\Plugin; use ManiaControl\Plugins\Plugin;
use FML\ManiaLink;
use FML\Controls\Frame;
use FML\Controls\Label;
use FML\Controls\Quad;
use FML\Controls\Gauge;
/** /**
* ManiaControl Karma Plugin * ManiaControl Karma Plugin
@ -32,6 +32,8 @@ class KarmaPlugin implements CallbackListener, Plugin {
const SETTING_WIDGET_WIDTH = 'Widget-Size: Width'; const SETTING_WIDGET_WIDTH = 'Widget-Size: Width';
const SETTING_WIDGET_HEIGHT = 'Widget-Size: Height'; const SETTING_WIDGET_HEIGHT = 'Widget-Size: Height';
const STAT_PLAYER_MAPVOTES = 'Voted Maps';
/** /**
* Private properties * Private properties
*/ */
@ -65,10 +67,12 @@ class KarmaPlugin implements CallbackListener, Plugin {
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_ONINIT, $this, 'handleOnInit');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'handleBeginMap'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_BEGINMAP, $this, 'handleBeginMap');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_1_SECOND, $this, 'handle1Second'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MC_1_SECOND, $this, 'handle1Second');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCONNECT, $this, $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCONNECT, $this, 'handlePlayerConnect');
'handlePlayerConnect');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCHAT, $this, 'handlePlayerChat'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERCHAT, $this, 'handlePlayerChat');
// Define player stats
$this->maniaControl->statisticManager->defineStatMetaData(self::STAT_PLAYER_MAPVOTES);
return true; return true;
} }
@ -127,7 +131,9 @@ class KarmaPlugin implements CallbackListener, Plugin {
* @param array $callback * @param array $callback
*/ */
public function handle1Second(array $callback) { public function handle1Second(array $callback) {
if (!$this->updateManialink) return; if(!$this->updateManialink) {
return;
}
// Get players // Get players
$players = $this->updateManialink; $players = $this->updateManialink;
@ -153,8 +159,7 @@ class KarmaPlugin implements CallbackListener, Plugin {
$karmaColor = ColorUtil::floatToStatusColor($karma); $karmaColor = ColorUtil::floatToStatusColor($karma);
$karmaGauge->setColor($karmaColor . '9'); $karmaGauge->setColor($karmaColor . '9');
$karmaLabel->setText(' ' . round($karma * 100.) . '% (' . $votes['count'] . ')'); $karmaLabel->setText(' ' . round($karma * 100.) . '% (' . $votes['count'] . ')');
} } else {
else {
$karma = 0.; $karma = 0.;
$karmaGauge->setRatio(0.); $karmaGauge->setRatio(0.);
$karmaGauge->setColor('00fb'); $karmaGauge->setColor('00fb');
@ -263,6 +268,12 @@ class KarmaPlugin implements CallbackListener, Plugin {
// Save vote // Save vote
$map = $this->maniaControl->mapManager->getCurrentMap(); $map = $this->maniaControl->mapManager->getCurrentMap();
$voted = $this->getPlayerVote($player, $map);
if(!$voted){
$this->maniaControl->statisticManager->incrementStat(self::STAT_PLAYER_MAPVOTES, $player, $this->maniaControl->server->getLogin());
}
$success = $this->savePlayerVote($player, $map, $vote); $success = $this->savePlayerVote($player, $map, $vote);
if(!$success) { if(!$success) {
return false; return false;
@ -425,7 +436,9 @@ class KarmaPlugin implements CallbackListener, Plugin {
* @param bool $forceBuild * @param bool $forceBuild
*/ */
private function buildManialink($forceBuild = false) { private function buildManialink($forceBuild = false) {
if (is_object($this->manialink) && !$forceBuild) return; if(is_object($this->manialink) && !$forceBuild) {
return;
}
$title = $this->maniaControl->settingManager->getSetting($this, self::SETTING_WIDGET_TITLE); $title = $this->maniaControl->settingManager->getSetting($this, self::SETTING_WIDGET_TITLE);
$pos_x = $this->maniaControl->settingManager->getSetting($this, self::SETTING_WIDGET_POSX); $pos_x = $this->maniaControl->settingManager->getSetting($this, self::SETTING_WIDGET_POSX);