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

Resolved #108 Round Score Table moved, also added setting to move it

Browse Source
This commit is contained in:
kremsy 2017-07-02 18:23:33 +02:00
parent 0385276d8d
commit 46e88d3e80
2 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/MCTeam/Dedimania/DedimaniaWebHandler.php
View File

@ -116,6 +116,11 @@ class DedimaniaWebHandler implements TimerListener {
if ($serverInfo) { // No Players if ($serverInfo) { // No Players
Logger::logError("Dedimania Records could not be fetched, debuginfo:" . json_encode($data)); Logger::logError("Dedimania Records could not be fetched, debuginfo:" . json_encode($data));
} }
if (!$gameMode) {
$this->maniaControl->getChat()->sendError("Dedimania Error: Gamemode not found, try to restart map!");
}
return false; return false;
} }
@ -265,7 +270,8 @@ class DedimaniaWebHandler implements TimerListener {
$this->addRequest(self::DEDIMANIA_WARNINGSANDTTR2, array()); $this->addRequest(self::DEDIMANIA_WARNINGSANDTTR2, array());
$content = xmlrpc_encode_request(self::XMLRPC_MULTICALL, array($this->requests), array('encoding' => 'UTF-8', 'escaping' => 'cdata, non-ascii, non-print, markup', 'verbosity' => 'no_white_space')); $content = xmlrpc_encode_request(self::XMLRPC_MULTICALL, array($this->requests), array('encoding' => 'UTF-8', 'escaping' => 'cdata, non-ascii, non-print, markup',
'verbosity' => 'no_white_space'));
/* $content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><methodCall><methodName>system.multicall</methodName> /* $content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><methodCall><methodName>system.multicall</methodName>

24
plugins/MCTeam/WidgetPlugin.php
View File

@ -74,7 +74,8 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin {
// Nadeo Widget Properties // Nadeo Widget Properties
const SETTING_TM_LIVE_INFO_WIDGET_POSX = "Nadeo LiveInfo-Widget-Position: X"; const SETTING_TM_LIVE_INFO_WIDGET_POSX = "Nadeo LiveInfo-Widget-Position: X";
const SETTING_TM_LIVE_INFO_WIDGET_POSY = "Nadeo LiveInfo-Widget-Position: Y"; const SETTING_TM_LIVE_INFO_WIDGET_POSY = "Nadeo LiveInfo-Widget-Position: Y";
const SETTING_TM_ROUND_SCORE_WIDGET_POSX = "Nadeo RoundScore-Widget-Position: X";
const SETTING_TM_ROUND_SCORE_WIDGET_POSY = "Nadeo RoundScore-Widget-Position: Y";
/* /*
* Private properties * Private properties
*/ */
@ -164,6 +165,8 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin {
$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSX, -122); $this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSX, -122);
$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSY, 84); $this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSY, 84);
$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_TM_ROUND_SCORE_WIDGET_POSX, 104);
$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_TM_ROUND_SCORE_WIDGET_POSY, 65);
$this->displayWidgets(); $this->displayWidgets();
@ -179,6 +182,12 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin {
$livePosX = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSX); $livePosX = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSX);
$livePosY = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSY); $livePosY = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSY);
$uiProperties->setLiveInfoPosition($livePosX, $livePosY, 5); $uiProperties->setLiveInfoPosition($livePosX, $livePosY, 5);
//Rounds Scoretable
$roundScorePosX = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_ROUND_SCORE_WIDGET_POSX);
$roundScorePosY = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_ROUND_SCORE_WIDGET_POSY);
$uiProperties->setRoundScoresPosition($roundScorePosX, $roundScorePosY, 5);
$this->maniaControl->getModeScriptEventManager()->setTrackmaniaUIProperties((string) $uiProperties); $this->maniaControl->getModeScriptEventManager()->setTrackmaniaUIProperties((string) $uiProperties);
return true; return true;
@ -407,9 +416,11 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin {
// Set CustomUI Setting // Set CustomUI Setting
$this->maniaControl->getManialinkManager()->getCustomUIManager()->setChallengeInfoVisible(true); //TODO verify if still needed $this->maniaControl->getManialinkManager()->getCustomUIManager()->setChallengeInfoVisible(true); //TODO verify if still needed
//TrackMania //TrackMania (Set Back Nadeo Defaults)
$uiProperties = new TMUIProperties(); $uiProperties = new TMUIProperties();
$uiProperties->setMapInfoVisible(true); $uiProperties->setMapInfoVisible(true);
$uiProperties->setLiveInfoPosition(-159, 84, 5);
$uiProperties->setRoundScoresPosition(-158.5, 40, 5);
$this->maniaControl->getModeScriptEventManager()->setTrackmaniaUIProperties((string) $uiProperties); $this->maniaControl->getModeScriptEventManager()->setTrackmaniaUIProperties((string) $uiProperties);
} }
@ -560,14 +571,19 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin {
if ($setting->belongsToClass($this)) { if ($setting->belongsToClass($this)) {
$this->displayWIdgets(); $this->displayWIdgets();
//Update Nadeo Live Info Widget //Update Nadeo Default Widgets
if ($setting->setting == self::SETTING_TM_LIVE_INFO_WIDGET_POSX || $setting->setting == self::SETTING_TM_LIVE_INFO_WIDGET_POSY) { if ($setting->setting == self::SETTING_TM_LIVE_INFO_WIDGET_POSX || $setting->setting == self::SETTING_TM_LIVE_INFO_WIDGET_POSY) {
$uiProperties = new TMUIProperties(); $uiProperties = new TMUIProperties();
$livePosX = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSX); $livePosX = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSX);
$livePosY = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSY); $livePosY = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_LIVE_INFO_WIDGET_POSY);
$uiProperties->setLiveInfoPosition($livePosX, $livePosY, 5); $uiProperties->setLiveInfoPosition($livePosX, $livePosY, 5);
$this->maniaControl->getModeScriptEventManager()->setTrackmaniaUIProperties((string) $uiProperties); $this->maniaControl->getModeScriptEventManager()->setTrackmaniaUIProperties((string) $uiProperties);
} elseif ($setting->setting == self::SETTING_TM_ROUND_SCORE_WIDGET_POSX || $setting->setting == self::SETTING_TM_ROUND_SCORE_WIDGET_POSY) {
$uiProperties = new TMUIProperties();
$roundScoreX = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_ROUND_SCORE_WIDGET_POSX);
$roundScoreY = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_TM_ROUND_SCORE_WIDGET_POSY);
$uiProperties->setLiveInfoPosition($roundScoreX, $roundScoreY, 5);
$this->maniaControl->getModeScriptEventManager()->setTrackmaniaUIProperties((string) $uiProperties);
} }
} }
} }