refactored Scores Structure

core/Callbacks/Structures/Common/CommonScoresStructure.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace ManiaControl\Callbacks\Structures\Common;
+
+
+use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\Models\CommonPlayerScore;
+use ManiaControl\Callbacks\Structures\ShootMania\Models\TeamScore;
+use ManiaControl\ManiaControl;
+
+/**
+ * Structure Class for the OnScores Structure Callback
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2017 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
+class CommonScoresStructure extends BaseStructure {
+	protected $responseId;
+	protected $section;
+	protected $useTeams;
+	protected $winnerTeam;
+	protected $winnerPlayer;
+	protected $teamScores   = array();
+	protected $playerScores = array();
+
+	//TODO test
+	public function __construct(ManiaControl $maniaControl, $data) {
+		parent::__construct($maniaControl, $data);
+
+		$jsonObj = $this->getPlainJsonObject();
+
+		$this->responseId = $jsonObj->responseId;
+		$this->section    = $jsonObj->section;
+		$this->useTeams   = $jsonObj->useTeams;
+		$this->winnerTeam = $jsonObj->winnerTeam;
+
+		$this->winnerPlayer = $this->maniaControl->getPlayerManager()->getPlayer($jsonObj->winnerplayer);
+
+		foreach ($jsonObj->teams as $team) {
+			if ($this instanceof \ManiaControl\Callbacks\Structures\TrackMania\OnScoresStructure) {
+				$teamScore = new \ManiaControl\Callbacks\Structures\TrackMania\Models\TeamScore();
+			} else {
+				$teamScore = new \ManiaControl\Callbacks\Structures\ShootMania\Models\TeamScore();
+			}
+
+			$teamScore->setId($team->id);
+			$teamScore->setName($team->name);
+			$teamScore->setRoundPoints($team->roundpoints);
+			$teamScore->setMatchPoints($team->matchpoints);
+			$teamScore->setMapPoints($team->mappoints);
+
+			$this->teamScores[$team->id] = $teamScore; //TODO verify that different teams have different ids
+		}
+	}
+
+	/**
+	 * Get the Winner Player Object
+	 *
+	 * @return \ManiaControl\Players\Player
+	 */
+	public function getWinnerPlayer() {
+		return $this->winnerPlayer;
+	}
+
+	/**
+	 * Get the Response Id
+	 *
+	 * @return string
+	 */
+	public function getResponseId() {
+		return $this->responseId;
+	}
+
+	/**
+	 *  < Current progress of the match. Can be "" | "EndRound" | "EndMap" | "EndMatch"
+	 *
+	 * @return string
+	 */
+	public function getSection() {
+		return $this->section;
+	}
+
+	/**
+	 * Returns if the GameMode uses Teams or not
+	 *
+	 * @return boolean
+	 */
+	public function getUseTeams() {
+		return $this->useTeams;
+	}
+
+	/**
+	 * Get the Winner Team Id
+	 *
+	 * @return int
+	 */
+	public function getWinnerTeamId() {
+		return $this->winnerTeam;
+	}
+
+	/**
+	 * Returns the TeamScores
+	 *
+	 * @return TeamScore[]
+	 */
+	public function getTeamScores() {
+		return $this->teamScores;
+	}
+
+	/**
+	 * Get the Player Scores
+	 *
+	 * @return CommonPlayerScore[]
+	 */
+	public function getPlayerScores() {
+		return $this->playerScores;
+	}
+}

core/Callbacks/Structures/Common/Models/CommonPlayerScore.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace ManiaControl\Callbacks\Structures\Common\Models;
+
+
+use ManiaControl\General\UsageInformationAble;
+use ManiaControl\General\UsageInformationTrait;
+use ManiaControl\Players\Player;
+
+class CommonPlayerScore implements UsageInformationAble {
+	use UsageInformationTrait;
+
+	protected $player;
+	protected $rank;
+	protected $roundPoints;
+	protected $mapPoints;
+
+	/**
+	 * Returns the Player
+	 *
+	 * @return \ManiaControl\Players\Player
+	 */
+	public function getPlayer() {
+		return $this->player;
+	}
+
+	/**
+	 * @param \ManiaControl\Players\Player $player
+	 */
+	public function setPlayer(Player $player) {
+		$this->player = $player;
+	}
+
+	/**
+	 * Returns the Rank
+	 *
+	 * @return int
+	 */
+	public function getRank() {
+		return $this->rank;
+	}
+
+	/**
+	 * Sets the Rank
+	 *
+	 * @param int $rank
+	 */
+	public function setRank($rank) {
+		$this->rank = $rank;
+	}
+
+	/**
+	 * Gets the Round Points
+	 *
+	 * @return int
+	 */
+	public function getRoundPoints() {
+		return $this->roundPoints;
+	}
+
+	/**
+	 * Sets the RoundPoints
+	 *
+	 * @param int $roundPoints
+	 */
+	public function setRoundPoints($roundPoints) {
+		$this->roundPoints = $roundPoints;
+	}
+
+	/**
+	 * Gets the Map Points
+	 *
+	 * @return int
+	 */
+	public function getMapPoints() {
+		return $this->mapPoints;
+	}
+
+	/**
+	 * Sets the Map Points
+	 *
+	 * @param int $mapPoints
+	 */
+	public function setMapPoints($mapPoints) {
+		$this->mapPoints = $mapPoints;
+	}
+
+}

core/Callbacks/Structures/Common/Models/CommonTeamScore.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace ManiaControl\Callbacks\Structures\Common\Models;
+
+use ManiaControl\General\UsageInformationAble;
+use ManiaControl\General\UsageInformationTrait;
+
+/**
+ * TeamScore Model
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2017 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
+class CommonTeamScore implements UsageInformationAble {
+	use UsageInformationTrait;
+
+	private $id;
+	private $name;
+	private $roundPoints;
+	private $mapPoints;
+	private $matchPoints;
+
+	/**
+	 * @return mixed
+	 */
+	public function getId() {
+		return $this->id;
+	}
+
+	/**
+	 * @param mixed $id
+	 */
+	public function setId($id) {
+		$this->id = $id;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getName() {
+		return $this->name;
+	}
+
+	/**
+	 * @param mixed $name
+	 */
+	public function setName($name) {
+		$this->name = $name;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getRoundPoints() {
+		return $this->roundPoints;
+	}
+
+	/**
+	 * @param mixed $roundPoints
+	 */
+	public function setRoundPoints($roundPoints) {
+		$this->roundPoints = $roundPoints;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getMapPoints() {
+		return $this->mapPoints;
+	}
+
+	/**
+	 * @param mixed $mapPoints
+	 */
+	public function setMapPoints($mapPoints) {
+		$this->mapPoints = $mapPoints;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getMatchPoints() {
+		return $this->matchPoints;
+	}
+
+	/**
+	 * @param mixed $matchPoints
+	 */
+	public function setMatchPoints($matchPoints) {
+		$this->matchPoints = $matchPoints;
+	}
+}