replaced jukebox through mapqueue

This commit is contained in:
kremsy
2013-12-31 12:25:03 +01:00
parent 50f79ddec2
commit 060211204d
6 changed files with 239 additions and 49 deletions

View File

@ -13,22 +13,22 @@ use ManiaControl\Players\Player;
*
* @author steeffeen & kremsy
*/
class Jukebox implements CallbackListener, CommandListener {
class MapQueue implements CallbackListener, CommandListener {
/**
* Constants
*/
const CB_JUKEBOX_CHANGED = 'Jukebox.JukeBoxChanged';
const CB_MAPQUEUE_CHANGED = 'MapQueue.MapQueueBoxChanged';
const SETTING_SKIP_MAP_ON_LEAVE = 'Skip Map when the requester leaves';
const SETTING_SKIP_JUKED_ADMIN = 'Skip Map when admin leaves';
const SETTING_SKIP_MAPQUEUE_ADMIN = 'Skip Map when admin leaves';
const ADMIN_COMMAND_CLEAR_MAPQUEUE = 'clearmapqueue';
const ADMIN_COMMAND_CLEAR_JUKEBOX = 'clearjukebox';
/**
* Private properties
*/
private $maniaControl = null;
private $jukedMaps = array();
private $queuedMaps = array();
private $nextMap = null;
/**
@ -43,64 +43,65 @@ class Jukebox implements CallbackListener, CommandListener {
// Init settings
$this->maniaControl->settingManager->initSetting($this, self::SETTING_SKIP_MAP_ON_LEAVE, true);
$this->maniaControl->settingManager->initSetting($this, self::SETTING_SKIP_JUKED_ADMIN, false);
$this->maniaControl->settingManager->initSetting($this, self::SETTING_SKIP_MAPQUEUE_ADMIN, false);
//Register Admin Commands
$this->maniaControl->commandManager->registerCommandListener(self::ADMIN_COMMAND_CLEAR_JUKEBOX, $this, 'command_ClearJukebox', true);
$this->maniaControl->commandManager->registerCommandListener(self::ADMIN_COMMAND_CLEAR_MAPQUEUE, $this, 'command_ClearJukebox', true);
}
/**
* Clears the jukebox via admin command clearjukebox
* Clears the map-queue via admin command clearjukebox
* @param array $chat
* @param Player $player
*/
public function command_ClearJukebox(array $chat, Player $admin){
public function command_ClearQueuedMaps(array $chat, Player $admin){
$title = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
//Destroy jukebox list
$this->jukedMaps = array();
$this->queuedMaps = array();
$this->maniaControl->chat->sendInformation($title . ' $<' . $admin->nickname . '$> cleared the Jukebox!');
$this->maniaControl->log($title .' ' . Formatter::stripCodes($admin->nickname) . ' cleared the Jukebox');
$this->maniaControl->chat->sendInformation($title . ' $<' . $admin->nickname . '$> cleared the Queued-Map list!');
$this->maniaControl->log($title .' ' . Formatter::stripCodes($admin->nickname) . ' cleared the Queued-Map list!');
// Trigger callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_JUKEBOX_CHANGED, array('clear'));
$this->maniaControl->callbackManager->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('clear'));
}
/**
* Adds a Map to the jukebox
* Adds a Map to the map-queue
* @param $login
* @param $uid
*/
public function addMapToJukebox($login, $uid){ //TODO if from MX other message
public function addMapToMapQueue($login, $uid){ //TODO if from MX other message
$player = $this->maniaControl->playerManager->getPlayer($login);
//Check if the map is already juked
if(array_key_exists($uid, $this->jukedMaps)){
$this->maniaControl->chat->sendError('Map is already in the Jukebox', $login);
if(array_key_exists($uid, $this->queuedMaps)){
$this->maniaControl->chat->sendError('Map is already in the Map-Queue', $login);
return;
}
//TODO recently maps not able to add to jukebox setting, and management
//TODO recently maps not able to add to queue-amps setting, and management
$map = $this->maniaControl->mapManager->getMapByUid($uid);
$this->jukedMaps[$uid] = array($player, $map);
$this->queuedMaps[$uid] = array($player, $map);
$this->maniaControl->chat->sendInformation('$<' . $player->nickname . '$> added $<' . $map->name . '$> to the Jukebox!');
$this->maniaControl->chat->sendInformation('$<' . $player->nickname . '$> added $<' . $map->name . '$> to the Map-Queue');
// Trigger callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_JUKEBOX_CHANGED, array('add', $this->jukedMaps[$uid]));
$this->maniaControl->callbackManager->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('add', $this->queuedMaps[$uid]));
}
/**
* Revmoes a Map from the jukebox
* Revmoes a Map from the Map queue
* @param $login
* @param $uid
*/
public function removeFromJukebox($login, $uid){
unset($this->jukedMaps[$uid]);
public function removeFromMapQueue($login, $uid){
unset($this->queuedMaps[$uid]);
}
@ -113,15 +114,15 @@ class Jukebox implements CallbackListener, CommandListener {
if($this->maniaControl->settingManager->getSetting($this, self::SETTING_SKIP_MAP_ON_LEAVE) == TRUE){
//Skip Map if requester has left
foreach($this->jukedMaps as $jukedMap){
$player = $jukedMap[0];
foreach($this->queuedMaps as $queuedMap){
$player = $queuedMap[0];
//found player, so play this map
if($this->maniaControl->playerManager->getPlayer($player->login) != null){
break;
}
if($this->maniaControl->settingManager->getSetting($this, self::SETTING_SKIP_JUKED_ADMIN) == FALSE){
if($this->maniaControl->settingManager->getSetting($this, self::SETTING_SKIP_MAPQUEUE_ADMIN) == FALSE){
//Check if the juker is a admin
if($player->authLevel > 0){
break;
@ -129,16 +130,16 @@ class Jukebox implements CallbackListener, CommandListener {
}
// Trigger callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_JUKEBOX_CHANGED, array('skip', $jukedMap[0]));
$this->maniaControl->callbackManager->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('skip', $queuedMap[0]));
//Player not found, so remove the map from the jukebox
array_shift($this->jukedMaps);
array_shift($this->queuedMaps);
$this->maniaControl->chat->sendInformation('Juked Map skipped because $<' . $player->nickname . '$> left!');
$this->maniaControl->chat->sendInformation('Requested Map skipped because $<' . $player->nickname . '$> left!');
}
}
$this->nextMap = array_shift($this->jukedMaps);
$this->nextMap = array_shift($this->queuedMaps);
//Check if Jukebox is empty
if($this->nextMap == null)
@ -164,22 +165,22 @@ class Jukebox implements CallbackListener, CommandListener {
* Returns a list with the indexes of the juked maps
* @return array
*/
public function getJukeBoxRanking(){
public function getQueuedMapsRanking(){
$i = 1;
$jukedMaps = array();
foreach($this->jukedMaps as $map){
$queuedMaps = array();
foreach($this->queuedMaps as $map){
$map = $map[1];
$jukedMaps[$map->uid] = $i;
$queuedMaps[$map->uid] = $i;
$i++;
}
return $jukedMaps;
return $queuedMaps;
}
/**
* Dummy Function for testing
*/
public function printAllMaps(){
foreach($this->jukedMaps as $map){
foreach($this->queuedMaps as $map){
$map = $map[1];
var_dump($map->name);
}