From 97f4d44202e8ed2d9e9b664dec8d30bef1280e1c Mon Sep 17 00:00:00 2001 From: kremsy Date: Wed, 21 Jan 2015 17:47:29 +0100 Subject: [PATCH] display mx karma in maplist --- core/Maps/MapCommands.php | 12 +++++++++++- core/Maps/MapList.php | 19 +++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/core/Maps/MapCommands.php b/core/Maps/MapCommands.php index c2a04c61..59767037 100644 --- a/core/Maps/MapCommands.php +++ b/core/Maps/MapCommands.php @@ -436,8 +436,18 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb */ private function showMapListKarma($best, Player $player) { /** @var \MCTeam\KarmaPlugin $karmaPlugin */ - $karmaPlugin = $this->maniaControl->getPluginManager()->getPlugin(MapList::DEFAULT_KARMA_PLUGIN); + $karmaPlugin = $this->maniaControl->getPluginManager()->getPlugin(MapList::DEFAULT_KARMA_PLUGIN); + $displayMxKarma = $this->maniaControl->getSettingManager()->getSettingValue($karmaPlugin, $karmaPlugin::SETTING_WIDGET_DISPLAY_MX); + if ($karmaPlugin) { + //Sort by Mx Karma in Maplist + if ($displayMxKarma) { //TODO + + //Sort by Local Karma in Maplist + } else { + + } + $maps = $this->maniaControl->getMapManager()->getMaps(); $mapList = array(); foreach ($maps as $map) { diff --git a/core/Maps/MapList.php b/core/Maps/MapList.php index 022cd1bb..8246d009 100644 --- a/core/Maps/MapList.php +++ b/core/Maps/MapList.php @@ -122,7 +122,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener { $height = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight(); if ($pageIndex < 0) { - $pageIndex = (int)$player->getCache($this, self::CACHE_CURRENT_PAGE); + $pageIndex = (int) $player->getCache($this, self::CACHE_CURRENT_PAGE); } $player->setCache($this, self::CACHE_CURRENT_PAGE, $pageIndex); $queueBuffer = $this->maniaControl->getMapManager()->getMapQueue()->getQueueBuffer(); @@ -441,8 +441,19 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener { // Display Karma bar if ($karmaPlugin) { - $karma = $karmaPlugin->getMapKarma($map); - $votes = $karmaPlugin->getMapVotes($map); + $displayMxKarma = $this->maniaControl->getSettingManager()->getSettingValue($karmaPlugin, $karmaPlugin::SETTING_WIDGET_DISPLAY_MX); + + //Display Mx Karma + if ($displayMxKarma && $map->mx) { + $karma = $map->mx->ratingVoteAverage / 100; + $votes = array("count" => $map->mx->ratingVoteCount); + + //Display Local Karma + } else { + $karma = $karmaPlugin->getMapKarma($map); + $votes = $karmaPlugin->getMapVotes($map); + } + if (is_numeric($karma)) { if ($this->maniaControl->getSettingManager()->getSettingValue($karmaPlugin, $karmaPlugin::SETTING_NEWKARMA) ) { @@ -692,7 +703,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener { default: if (substr($actionId, 0, strlen(self::ACTION_PAGING_CHUNKS)) === self::ACTION_PAGING_CHUNKS) { // Paging chunks - $neededPage = (int)substr($actionId, strlen(self::ACTION_PAGING_CHUNKS)); + $neededPage = (int) substr($actionId, strlen(self::ACTION_PAGING_CHUNKS)); $this->showMapList($player, null, $neededPage - 1); } break;