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

some todo resolves

Browse Source
This commit is contained in:
kremsy
2014-03-01 11:11:50 +01:00
committed by Steffen Schröder
parent 5dcc8e865c
commit 7c4a038722
15 changed files with 66 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/plugins/ChatMessagePlugin.php
View File

@@ -313,6 +313,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
try {
$this->maniaControl->client->kick($player->login, $message);
} catch(Exception $e) {
$this->maniaControl->errorHandler->triggerDebugNotice("ChatMessagePlugin Debug Line 316: " . $e->getMessage());
// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $player->login);
return;
@@ -333,6 +334,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
try {
$this->maniaControl->client->kick($player->login, $message);
} catch(Exception $e) {
$this->maniaControl->errorHandler->triggerDebugNotice("ChatMessagePlugin Debug Line " . $e->getLine() . ": " . $e->getMessage());
// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $player->login);
return;
@@ -354,6 +356,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
try {
$this->maniaControl->client->forceSpectator($player->login, 3);
} catch(Exception $e) {
$this->maniaControl->errorHandler->triggerDebugNotice("ChatMessagePlugin Debug Line " . $e->getLine() . ": " . $e->getMessage());
// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $player->login);
return;
@@ -363,6 +366,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
try {
$this->maniaControl->client->spectatorReleasePlayerSlot($player->login);
} catch(Exception $e) {
$this->maniaControl->errorHandler->triggerDebugNotice("ChatMessagePlugin Debug Line " . $e->getLine() . ": " . $e->getMessage());
// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
//to nothing
}
@@ -386,7 +390,7 @@ class ChatMessagePlugin implements CommandListener, Plugin {
$pid++;
}
if ($login == 'lj') {
if ($login == 'lj' && $pid > 1) {
return $player->nickname;
}
@@ -435,6 +439,6 @@ class ChatMessagePlugin implements CommandListener, Plugin {
* @return string
*/
public static function getDescription() {
return null;
return "Plugin offers various Chat-Commands like /gg /hi /afk /rq...";
}
}

38
application/plugins/DynamicPointlimitPlugin.php
View File

@@ -1,10 +1,7 @@
<?php
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\Commands\CommandListener;
use ManiaControl\ManiaControl;
use ManiaControl\Manialinks\ManialinkPageAnswerListener;
use ManiaControl\Manialinks\ManialinkManager;
use ManiaControl\Players\Player;
use ManiaControl\Players\PlayerManager;
use ManiaControl\Plugins\Plugin;
@@ -22,10 +19,11 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
const ID = 21;
const VERSION = 0.1;
const DYNPNT_MULTIPLIER = 'Pointlimit multiplier';
const DYNPNT_OFFSET = 'Pointlimit offset';
const DYNPNT_MIN = 'Minimum pointlimit';
const DYNPNT_MAX = 'Maximum pointlimit';
const DYNPNT_MULTIPLIER = 'Pointlimit multiplier';
const DYNPNT_OFFSET = 'Pointlimit offset';
const DYNPNT_MIN = 'Minimum pointlimit';
const DYNPNT_MAX = 'Maximum pointlimit';
const ACCEPT_OTHER_MODES = 'Activate in Other mode as Royal';
/**
* Prepares the Plugin
@@ -34,7 +32,11 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
* @return mixed
*/
public static function prepare(ManiaControl $maniaControl) {
// TODO: Implement prepare() method.
$maniaControl->settingManager->initSetting(get_class(), self::ACCEPT_OTHER_MODES, false);
$maniaControl->settingManager->initSetting(get_class(), self::DYNPNT_MULTIPLIER, 10);
$maniaControl->settingManager->initSetting(get_class(), self::DYNPNT_OFFSET, 0);
$maniaControl->settingManager->initSetting(get_class(), self::DYNPNT_MIN, 30);
$maniaControl->settingManager->initSetting(get_class(), self::DYNPNT_MAX, 200);
}
/**
@@ -56,13 +58,9 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERCONNECT, $this, 'changePointlimit');
$this->maniaControl->callbackManager->registerCallbackListener(PlayerManager::CB_PLAYERDISCONNECT, $this, 'changePointlimit');
$this->maniaControl->settingManager->initSetting($this, self::DYNPNT_MULTIPLIER, 10);
$this->maniaControl->settingManager->initSetting($this, self::DYNPNT_OFFSET, 0);
$this->maniaControl->settingManager->initSetting($this, self::DYNPNT_MIN, 30);
$this->maniaControl->settingManager->initSetting($this, self::DYNPNT_MAX, 200);
if($this->maniaControl->server->titleId != 'SMStormRoyal@nadeolabs') {
$error = 'This plugin only supports Royal!';
$allowOthers = $this->maniaControl->settingManager->getSetting($this, self::ACCEPT_OTHER_MODES);
if (!$allowOthers && $this->maniaControl->server->titleId != 'SMStormRoyal@nadeolabs') {
$error = 'This plugin only supports Royal (check Settings)!';
throw new Exception($error);
}
}
@@ -74,7 +72,7 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
$this->maniaControl->manialinkManager->unregisterManialinkPageAnswerListener($this);
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl = null;
unset($this->maniaControl);
}
/**
@@ -133,7 +131,7 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
/** @var Player $player */
foreach($this->maniaControl->playerManager->getPlayers() as $player) {
if($player->isSpectator) {
if ($player->isSpectator) {
$numberOfSpectators++;
} else {
$numberOfPlayers++;
@@ -144,10 +142,12 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
$min_value = $this->maniaControl->settingManager->getSetting($this, self::DYNPNT_MIN);
$max_value = $this->maniaControl->settingManager->getSetting($this, self::DYNPNT_MAX);
if($pointlimit < $min_value)
if ($pointlimit < $min_value) {
$pointlimit = $min_value;
if($pointlimit > $max_value)
}
if ($pointlimit > $max_value) {
$pointlimit = $max_value;
}
$this->maniaControl->client->setModeScriptSettings(array('S_MapPointsLimit' => $pointlimit));
}

2
application/plugins/Karma.php
View File

@@ -203,7 +203,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
// Loop players
foreach($players as $login => $player) {
// Get player vote
$vote = $this->getPlayerVote($player, $map); //TODO what is this for, vote nowhere used?
//$vote = $this->getPlayerVote($player, $map); //TODO what is this for, vote nowhere used?
// Adjust manialink for player's vote
$votesFrame = $this->manialink->votesFrame;

24
application/plugins/TeamSpeakPlugin.php
View File

@@ -6,7 +6,6 @@ use FML\Controls\Quad;
use FML\Controls\Quads\Quad_Icons64x64_1;
use FML\ManiaLink;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\Callbacks\TimerListener;
use ManiaControl\Commands\CommandListener;
use ManiaControl\ManiaControl;
@@ -52,13 +51,19 @@ class TeamSpeakPlugin implements CallbackListener, CommandListener, ManialinkPag
private $refreshInterval = 90;
/**
* Prepares the Plugin
* Prepares the Plugin (Init Settings)
*
* @param ManiaControl $maniaControl
* @return mixed
*/
public static function prepare(ManiaControl $maniaControl) {
// TODO: Implement prepare() method.
$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_SID, 1);
$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_SERVERHOST, 'ts3.somehoster.com');
$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_SERVERPORT, 9987);
$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_QUERYHOST, '');
$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_QUERYPORT, 10011);
$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_QUERYUSER, '');
$maniaControl->settingManager->initSetting(get_class(), self::TEAMSPEAK_QUERYPASS, '');
}
/**
@@ -69,7 +74,6 @@ class TeamSpeakPlugin implements CallbackListener, CommandListener, ManialinkPag
*/
public function load(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl;
$this->addConfigs();
$this->checkConfig();
$this->refreshTime = time();
@@ -82,18 +86,6 @@ class TeamSpeakPlugin implements CallbackListener, CommandListener, ManialinkPag
$this->addToMenu();
}
/**
* Function used to add the configuration options to the settings manager.
*/
private function addConfigs() {
$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_SID, 1);
$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_SERVERHOST, 'ts3.somehoster.com');
$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_SERVERPORT, 9987);
$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_QUERYHOST, '');
$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_QUERYPORT, 10011);
$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_QUERYUSER, '');
$this->maniaControl->settingManager->initSetting($this, self::TEAMSPEAK_QUERYPASS, '');
}
/**
* Function used to check certain configuration options to check if they can be used.