@@ -93,7 +93,7 @@ |
||
93 | 93 | |
94 | 94 | /** |
95 | 95 | * @param int $playerId |
96 | - * @return Session |
|
96 | + * @return null|\Asylamba\Classes\Library\Session\Session |
|
97 | 97 | */ |
98 | 98 | public function getSessionByPlayerId($playerId) |
99 | 99 | { |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Asylamba\Classes\Daemon; |
4 | 4 | |
5 | 5 | use Asylamba\Classes\Daemon\Client; |
6 | - |
|
7 | 6 | use Asylamba\Classes\Redis\RedisManager; |
8 | 7 | use Asylamba\Classes\Library\Session\SessionWrapper; |
9 | - |
|
10 | 8 | use Asylamba\Classes\Library\Http\Request; |
11 | 9 | |
12 | 10 | class ClientManager |
@@ -3,12 +3,9 @@ |
||
3 | 3 | namespace Asylamba\Classes\EventListener; |
4 | 4 | |
5 | 5 | use Asylamba\Classes\Logger\AbstractLogger; |
6 | - |
|
7 | 6 | use Asylamba\Classes\Event\ProcessExceptionEvent; |
8 | 7 | use Asylamba\Classes\Event\ProcessErrorEvent; |
9 | - |
|
10 | 8 | use Asylamba\Classes\Process\ProcessGateway; |
11 | - |
|
12 | 9 | use Asylamba\Classes\Database\Database; |
13 | 10 | |
14 | 11 | class ProcessExceptionListener { |
@@ -349,6 +349,10 @@ discard block |
||
349 | 349 | $this->entityManager->commit(); |
350 | 350 | } |
351 | 351 | |
352 | + /** |
|
353 | + * @param integer $rStartPlace |
|
354 | + * @param double $duration |
|
355 | + */ |
|
352 | 356 | public function move(Commander $commander, $rDestinationPlace, $rStartPlace, $travelType, $travelLength, $duration) { |
353 | 357 | $commander->rDestinationPlace = $rDestinationPlace; |
354 | 358 | $commander->rStartPlace = $rStartPlace; |
@@ -375,6 +379,9 @@ discard block |
||
375 | 379 | ); |
376 | 380 | } |
377 | 381 | |
382 | + /** |
|
383 | + * @param boolean $isWinner |
|
384 | + */ |
|
378 | 385 | public function resultOfFight(Commander $commander, $isWinner, $enemyCommander) { |
379 | 386 | if ($isWinner == TRUE) { |
380 | 387 | $this->setEarnedExperience($commander, $enemyCommander); |
@@ -918,6 +925,12 @@ discard block |
||
918 | 925 | # HELPER |
919 | 926 | |
920 | 927 | # comeBack |
928 | + |
|
929 | + /** |
|
930 | + * @param Commander $commander |
|
931 | + * @param Place $commanderPlace |
|
932 | + * @param PlayerBonus $playerBonus |
|
933 | + */ |
|
921 | 934 | public function comeBack(Place $place, $commander, $commanderPlace, $playerBonus) { |
922 | 935 | $length = Game::getDistance($place->getXSystem(), $commanderPlace->getXSystem(), $place->getYSystem(), $commanderPlace->getYSystem()); |
923 | 936 | $duration = Game::getTimeToTravel($commanderPlace, $place, $playerBonus->bonus); |
@@ -925,6 +938,10 @@ discard block |
||
925 | 938 | $this->move($commander, $commander->rBase, $place->id, Commander::BACK, $length, $duration); |
926 | 939 | } |
927 | 940 | |
941 | + /** |
|
942 | + * @param Commander $commander |
|
943 | + * @param PlayerBonus $playerBonus |
|
944 | + */ |
|
928 | 945 | private function lootAnEmptyPlace(Place $place, $commander, $playerBonus) { |
929 | 946 | $bonus = $playerBonus->bonus->get(PlayerBonus::SHIP_CONTAINER); |
930 | 947 | |
@@ -940,6 +957,11 @@ discard block |
||
940 | 957 | LiveReport::$resources = $resourcesLooted; |
941 | 958 | } |
942 | 959 | |
960 | + /** |
|
961 | + * @param Commander $commander |
|
962 | + * @param PlayerBonus $playerBonus |
|
963 | + * @param OrbitalBase $placeBase |
|
964 | + */ |
|
943 | 965 | private function lootAPlayerPlace($commander, $playerBonus, $placeBase) { |
944 | 966 | $bonus = $playerBonus->bonus->get(PlayerBonus::SHIP_CONTAINER); |
945 | 967 | |
@@ -959,6 +981,11 @@ discard block |
||
959 | 981 | } |
960 | 982 | } |
961 | 983 | |
984 | + /** |
|
985 | + * @param Commander $commander |
|
986 | + * @param \Asylamba\Modules\Zeus\Model\Player $player |
|
987 | + * @param \Asylamba\Modules\Zeus\Model\Player $enemyPlayer |
|
988 | + */ |
|
962 | 989 | private function startFight(Place $place, $commander, $player, $enemyCommander = NULL, $enemyPlayer = NULL, $pvp = FALSE) { |
963 | 990 | if ($pvp == TRUE) { |
964 | 991 | $commander->setArmy(); |
@@ -18,7 +18,6 @@ discard block |
||
18 | 18 | use Asylamba\Classes\Worker\CTC; |
19 | 19 | use Asylamba\Classes\Exception\ErrorException; |
20 | 20 | use Asylamba\Classes\Entity\EntityManager; |
21 | - |
|
22 | 21 | use Asylamba\Modules\Athena\Model\Transaction; |
23 | 22 | use Asylamba\Modules\Ares\Model\Commander; |
24 | 23 | use Asylamba\Modules\Athena\Model\OrbitalBase; |
@@ -38,20 +37,16 @@ discard block |
||
38 | 37 | use Asylamba\Modules\Hermes\Manager\NotificationManager; |
39 | 38 | use Asylamba\Modules\Athena\Helper\OrbitalBaseHelper; |
40 | 39 | use Asylamba\Modules\Demeter\Resource\ColorResource; |
41 | - |
|
42 | 40 | use Asylamba\Modules\Athena\Model\RecyclingMission; |
43 | 41 | use Asylamba\Modules\Athena\Model\RecyclingLog; |
44 | 42 | use Asylamba\Modules\Zeus\Model\PlayerBonus; |
45 | 43 | use Asylamba\Modules\Gaia\Model\Place; |
46 | -use Asylamba\Modules\Zeus\Model\Player; |
|
47 | 44 | use Asylamba\Modules\Athena\Model\CommercialShipping; |
48 | 45 | use Asylamba\Modules\Hermes\Model\Notification; |
49 | - |
|
50 | 46 | use Asylamba\Modules\Athena\Resource\OrbitalBaseResource; |
51 | 47 | use Asylamba\Modules\Promethee\Helper\TechnologyHelper; |
52 | 48 | use Asylamba\Modules\Athena\Resource\ShipResource; |
53 | 49 | use Asylamba\Classes\Library\Flashbag; |
54 | - |
|
55 | 50 | use Asylamba\Classes\Daemon\ClientManager; |
56 | 51 | use Asylamba\Classes\Scheduler\RealTimeActionScheduler; |
57 | 52 |
@@ -3,28 +3,22 @@ |
||
3 | 3 | namespace Asylamba\Modules\Atlas\Manager; |
4 | 4 | |
5 | 5 | use Asylamba\Classes\Entity\EntityManager; |
6 | - |
|
7 | 6 | use Asylamba\Modules\Demeter\Manager\ColorManager; |
8 | 7 | use Asylamba\Modules\Hermes\Manager\ConversationManager; |
9 | 8 | use Asylamba\Modules\Hermes\Manager\ConversationMessageManager; |
10 | - |
|
11 | 9 | use Asylamba\Modules\Atlas\Routine\PlayerRoutine; |
12 | 10 | use Asylamba\Modules\Atlas\Routine\FactionRoutine; |
13 | - |
|
14 | 11 | use Asylamba\Modules\Hermes\Model\ConversationUser; |
15 | 12 | use Asylamba\Modules\Hermes\Model\ConversationMessage; |
16 | 13 | use Asylamba\Modules\Demeter\Resource\ColorResource; |
17 | 14 | use Asylamba\Modules\Athena\Helper\OrbitalBaseHelper; |
18 | 15 | use Asylamba\Modules\Zeus\Manager\PlayerManager; |
19 | - |
|
20 | 16 | use Asylamba\Modules\Zeus\Model\Player; |
21 | 17 | use Asylamba\Modules\Atlas\Model\PlayerRanking; |
22 | 18 | use Asylamba\Modules\Atlas\Model\FactionRanking; |
23 | 19 | use Asylamba\Modules\Atlas\Model\Ranking; |
24 | 20 | use Asylamba\Modules\Gaia\Model\Sector; |
25 | - |
|
26 | 21 | use Asylamba\Classes\Exception\ErrorException; |
27 | - |
|
28 | 22 | use Asylamba\Classes\Library\Utils; |
29 | 23 | |
30 | 24 | class RankingManager |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Asylamba\Modules\Atlas\Model\Ranking; |
6 | 6 | use Asylamba\Modules\Atlas\Model\FactionRanking; |
7 | 7 | use Asylamba\Modules\Demeter\Model\Color; |
8 | - |
|
9 | 8 | use Asylamba\Classes\Library\Utils; |
10 | 9 | |
11 | 10 | class FactionRoutine |
@@ -94,7 +94,7 @@ |
||
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
97 | - * @return int |
|
97 | + * @return string |
|
98 | 98 | */ |
99 | 99 | public function getType() |
100 | 100 | { |
@@ -3,14 +3,10 @@ |
||
3 | 3 | namespace Asylamba\Modules\Hephaistos\Routine; |
4 | 4 | |
5 | 5 | use Asylamba\Classes\Entity\EntityManager; |
6 | - |
|
7 | 6 | use Asylamba\Modules\Zeus\Manager\PlayerManager; |
8 | - |
|
9 | 7 | use Asylamba\Classes\Worker\API; |
10 | - |
|
11 | 8 | use Asylamba\Modules\Hermes\Model\Notification; |
12 | 9 | use Asylamba\Modules\Zeus\Model\Player; |
13 | - |
|
14 | 10 | use Asylamba\Classes\Library\Utils; |
15 | 11 | |
16 | 12 | class DailyRoutine |
@@ -539,6 +539,10 @@ |
||
539 | 539 | $this->entityManager->commit(); |
540 | 540 | } |
541 | 541 | |
542 | + /** |
|
543 | + * @param PlayerBonus $playerBonus |
|
544 | + * @param \Asylamba\Classes\Worker\ManagerSession $rsmSession |
|
545 | + */ |
|
542 | 546 | public function uCredit(Player $player, $playerBases, $playerBonus, $commanders, $rsmSession, &$factions, $transactions) { |
543 | 547 | |
544 | 548 | $popTax = 0; $nationTax = 0; |
@@ -14,7 +14,6 @@ discard block |
||
14 | 14 | use Asylamba\Classes\Library\Utils; |
15 | 15 | use Asylamba\Classes\Entity\EntityManager; |
16 | 16 | use Asylamba\Classes\Library\Session\SessionWrapper; |
17 | - |
|
18 | 17 | use Asylamba\Modules\Zeus\Model\Player; |
19 | 18 | use Asylamba\Modules\Zeus\Model\PlayerBonus; |
20 | 19 | use Asylamba\Modules\Promethee\Model\Technology; |
@@ -22,7 +21,6 @@ discard block |
||
22 | 21 | use Asylamba\Modules\Hermes\Model\Notification; |
23 | 22 | use Asylamba\Modules\Ares\Model\Commander; |
24 | 23 | use Asylamba\Modules\Athena\Model\Transaction; |
25 | - |
|
26 | 24 | use Asylamba\Modules\Demeter\Manager\ColorManager; |
27 | 25 | use Asylamba\Modules\Ares\Manager\CommanderManager; |
28 | 26 | use Asylamba\Modules\Gaia\Manager\GalaxyColorManager; |
@@ -36,12 +34,9 @@ discard block |
||
36 | 34 | use Asylamba\Modules\Promethee\Manager\TechnologyManager; |
37 | 35 | use Asylamba\Modules\Athena\Resource\ShipResource; |
38 | 36 | use Asylamba\Modules\Demeter\Model\Color; |
39 | - |
|
40 | 37 | use Asylamba\Classes\Worker\API; |
41 | - |
|
42 | 38 | use Asylamba\Classes\Library\Game; |
43 | 39 | use Asylamba\Classes\Container\ArrayList; |
44 | - |
|
45 | 40 | use Asylamba\Classes\Exception\ErrorException; |
46 | 41 | |
47 | 42 | class PlayerManager { |