@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
140 | - * @return bool |
|
140 | + * @return integer |
|
141 | 141 | */ |
142 | 142 | public function getAlive() |
143 | 143 | { |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | /** |
159 | - * @return bool |
|
159 | + * @return integer |
|
160 | 160 | */ |
161 | 161 | public function getIsWinner() |
162 | 162 | { |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | } |
195 | 195 | |
196 | 196 | /** |
197 | - * @return array |
|
197 | + * @return integer |
|
198 | 198 | */ |
199 | 199 | public function getPlayers() |
200 | 200 | { |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | //Kern je connais pas le type non plus, je suppose que c'est un tableau d'int avec les id |
227 | 227 | /** |
228 | - * @return array |
|
228 | + * @return integer |
|
229 | 229 | */ |
230 | 230 | public function getActivePlayers() |
231 | 231 | { |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | } |
283 | 283 | |
284 | 284 | /** |
285 | - * @return array |
|
285 | + * @return integer |
|
286 | 286 | */ |
287 | 287 | public function getSectors() |
288 | 288 | { |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | } |
321 | 321 | |
322 | 322 | /** |
323 | - * @return bool |
|
323 | + * @return integer |
|
324 | 324 | */ |
325 | 325 | public function getIsClosed() |
326 | 326 | { |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | } |
340 | 340 | |
341 | 341 | /** |
342 | - * @return string |
|
342 | + * @return integer |
|
343 | 343 | */ |
344 | 344 | public function getDescription() |
345 | 345 | { |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | } |
701 | 701 | |
702 | 702 | /** |
703 | - * @return int |
|
703 | + * @return string |
|
704 | 704 | */ |
705 | 705 | public function getCampaignDesc() |
706 | 706 | { |
@@ -59,8 +59,6 @@ discard block |
||
59 | 59 | |
60 | 60 | /** |
61 | 61 | * @param Container $container |
62 | - * @param int $serverCycleTimeout |
|
63 | - * @param int $port |
|
64 | 62 | */ |
65 | 63 | public function __construct(Container $container) |
66 | 64 | { |
@@ -121,6 +119,9 @@ discard block |
||
121 | 119 | } |
122 | 120 | } |
123 | 121 | |
122 | + /** |
|
123 | + * @param resource $input |
|
124 | + */ |
|
124 | 125 | protected function treatHttpInput($input) |
125 | 126 | { |
126 | 127 | $client = $request = $response = null; |
@@ -255,6 +256,9 @@ discard block |
||
255 | 256 | unset($this->outputs[$name]); |
256 | 257 | } |
257 | 258 | |
259 | + /** |
|
260 | + * @param string $debug |
|
261 | + */ |
|
258 | 262 | public static function debug($debug) |
259 | 263 | { |
260 | 264 | ob_start(); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | /** |
27 | 27 | * @param AbstractLogger $logger |
28 | - * @param Session $session |
|
28 | + * @param SessionWrapper $session |
|
29 | 29 | * @param Database $database |
30 | 30 | */ |
31 | 31 | public function __construct(AbstractLogger $logger, SessionWrapper $session, Database $database) |
@@ -78,6 +78,7 @@ discard block |
||
78 | 78 | * @param string $trace |
79 | 79 | * @param string $level |
80 | 80 | * @param int $flashbagLevel |
81 | + * @param string $redirect |
|
81 | 82 | */ |
82 | 83 | public function process($event, $message, $file, $line, $trace, $level, $flashbagLevel, $redirect = null) |
83 | 84 | { |
@@ -5,14 +5,11 @@ |
||
5 | 5 | use Asylamba\Classes\Logger\AbstractLogger; |
6 | 6 | use Asylamba\Classes\Library\Session\SessionWrapper; |
7 | 7 | use Asylamba\Classes\Library\Flashbag; |
8 | - |
|
9 | 8 | use Asylamba\Classes\Library\Http\Request; |
10 | 9 | use Asylamba\Classes\Library\Http\Response; |
11 | - |
|
12 | 10 | use Asylamba\Classes\Event\ExceptionEvent; |
13 | 11 | use Asylamba\Classes\Event\ErrorEvent; |
14 | 12 | use Asylamba\Classes\Exception\FormException; |
15 | - |
|
16 | 13 | use Asylamba\Classes\Database\Database; |
17 | 14 | |
18 | 15 | class ExceptionListener { |
@@ -76,6 +76,9 @@ |
||
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | + /** |
|
80 | + * @param string $currentHour |
|
81 | + */ |
|
79 | 82 | protected function executeDaily($currentHour) |
80 | 83 | { |
81 | 84 | if (($currentDay = date('d')) === $this->lastExecutedDay || ($currentHour < $this->dailyScriptHour)) { |
@@ -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; |
@@ -376,6 +380,9 @@ discard block |
||
376 | 380 | return TRUE; |
377 | 381 | } |
378 | 382 | |
383 | + /** |
|
384 | + * @param boolean $isWinner |
|
385 | + */ |
|
379 | 386 | public function resultOfFight(Commander $commander, $isWinner, $enemyCommander) { |
380 | 387 | if ($isWinner == TRUE) { |
381 | 388 | $this->setEarnedExperience($commander, $enemyCommander); |
@@ -919,6 +926,12 @@ discard block |
||
919 | 926 | # HELPER |
920 | 927 | |
921 | 928 | # comeBack |
929 | + |
|
930 | + /** |
|
931 | + * @param Commander $commander |
|
932 | + * @param Place $commanderPlace |
|
933 | + * @param PlayerBonus $playerBonus |
|
934 | + */ |
|
922 | 935 | public function comeBack(Place $place, $commander, $commanderPlace, $playerBonus) { |
923 | 936 | $length = Game::getDistance($place->getXSystem(), $commanderPlace->getXSystem(), $place->getYSystem(), $commanderPlace->getYSystem()); |
924 | 937 | $duration = Game::getTimeToTravel($commanderPlace, $place, $playerBonus->bonus); |
@@ -928,6 +941,10 @@ discard block |
||
928 | 941 | $this->move($commander, $commander->rBase, $place->id, Commander::BACK, $length, $duration); |
929 | 942 | } |
930 | 943 | |
944 | + /** |
|
945 | + * @param Commander $commander |
|
946 | + * @param PlayerBonus $playerBonus |
|
947 | + */ |
|
931 | 948 | private function lootAnEmptyPlace(Place $place, $commander, $playerBonus) { |
932 | 949 | $bonus = $playerBonus->bonus->get(PlayerBonus::SHIP_CONTAINER); |
933 | 950 | |
@@ -943,6 +960,11 @@ discard block |
||
943 | 960 | LiveReport::$resources = $resourcesLooted; |
944 | 961 | } |
945 | 962 | |
963 | + /** |
|
964 | + * @param Commander $commander |
|
965 | + * @param PlayerBonus $playerBonus |
|
966 | + * @param OrbitalBase $placeBase |
|
967 | + */ |
|
946 | 968 | private function lootAPlayerPlace($commander, $playerBonus, $placeBase) { |
947 | 969 | $bonus = $playerBonus->bonus->get(PlayerBonus::SHIP_CONTAINER); |
948 | 970 | |
@@ -962,6 +984,11 @@ discard block |
||
962 | 984 | } |
963 | 985 | } |
964 | 986 | |
987 | + /** |
|
988 | + * @param Commander $commander |
|
989 | + * @param \Asylamba\Modules\Zeus\Model\Player $player |
|
990 | + * @param \Asylamba\Modules\Zeus\Model\Player $enemyPlayer |
|
991 | + */ |
|
965 | 992 | private function startFight(Place $place, $commander, $player, $enemyCommander = NULL, $enemyPlayer = NULL, $pvp = FALSE) { |
966 | 993 | if ($pvp == TRUE) { |
967 | 994 | $commander->setArmy(); |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Asylamba\Modules\Ares\Repository; |
4 | 4 | |
5 | 5 | use Asylamba\Classes\Entity\AbstractRepository; |
6 | - |
|
7 | 6 | use Asylamba\Modules\Ares\Model\Report; |
8 | 7 | |
9 | 8 | class LiveReportRepository extends AbstractRepository |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
95 | - * @param type $orbitalBaseId |
|
95 | + * @param integer $orbitalBaseId |
|
96 | 96 | * @return array |
97 | 97 | */ |
98 | 98 | public function getByBase($orbitalBaseId) |
@@ -115,6 +115,11 @@ discard block |
||
115 | 115 | ); |
116 | 116 | } |
117 | 117 | |
118 | + /** |
|
119 | + * @param Transaction $transaction |
|
120 | + * @param \Asylamba\Modules\Athena\Model\OrbitalBase $destOB |
|
121 | + * @param Commander|null $commander |
|
122 | + */ |
|
118 | 123 | public function deliver(CommercialShipping $commercialShipping, $transaction, $destOB, $commander) { |
119 | 124 | if ($transaction !== NULL AND $transaction->statement == Transaction::ST_COMPLETED) { |
120 | 125 |
@@ -368,6 +368,11 @@ discard block |
||
368 | 368 | $this->entityManager->flush($orbitalBase); |
369 | 369 | } |
370 | 370 | |
371 | + /** |
|
372 | + * @param integer $id |
|
373 | + * @param OrbitalBase $base |
|
374 | + * @param integer $newOwner |
|
375 | + */ |
|
371 | 376 | public function changeOwnerById($id, $base, $newOwner, $baseCommanders) { |
372 | 377 | if ($base->getId() == 0) { |
373 | 378 | throw new ErrorException('Cette base orbitale n\'existe pas !'); |
@@ -443,7 +448,7 @@ discard block |
||
443 | 448 | |
444 | 449 | /** |
445 | 450 | * @param OrbitalBase $orbitalBase |
446 | - * @return int |
|
451 | + * @return double |
|
447 | 452 | */ |
448 | 453 | public function updatePoints(OrbitalBase $orbitalBase) { |
449 | 454 | $initialPoints = $orbitalBase->getPoints(); |
@@ -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\Gaia\Manager\GalaxyColorManager; |
23 | 22 | use Asylamba\Modules\Athena\Model\Transaction; |
24 | 23 | use Asylamba\Modules\Ares\Model\Commander; |
@@ -39,20 +38,16 @@ discard block |
||
39 | 38 | use Asylamba\Modules\Hermes\Manager\NotificationManager; |
40 | 39 | use Asylamba\Modules\Athena\Helper\OrbitalBaseHelper; |
41 | 40 | use Asylamba\Modules\Demeter\Resource\ColorResource; |
42 | - |
|
43 | 41 | use Asylamba\Modules\Athena\Model\RecyclingMission; |
44 | 42 | use Asylamba\Modules\Athena\Model\RecyclingLog; |
45 | 43 | use Asylamba\Modules\Zeus\Model\PlayerBonus; |
46 | 44 | use Asylamba\Modules\Gaia\Model\Place; |
47 | -use Asylamba\Modules\Zeus\Model\Player; |
|
48 | 45 | use Asylamba\Modules\Athena\Model\CommercialShipping; |
49 | 46 | use Asylamba\Modules\Hermes\Model\Notification; |
50 | - |
|
51 | 47 | use Asylamba\Modules\Athena\Resource\OrbitalBaseResource; |
52 | 48 | use Asylamba\Modules\Promethee\Helper\TechnologyHelper; |
53 | 49 | use Asylamba\Modules\Athena\Resource\ShipResource; |
54 | 50 | use Asylamba\Classes\Library\Flashbag; |
55 | - |
|
56 | 51 | use Asylamba\Classes\Scheduler\RealTimeActionScheduler; |
57 | 52 | |
58 | 53 | class OrbitalBaseManager { |
@@ -88,6 +88,10 @@ discard block |
||
88 | 88 | //GETTERS |
89 | 89 | public function getId() { return $this->rPlace; } |
90 | 90 | public function getRPlace() { return $this->rPlace; } |
91 | + |
|
92 | + /** |
|
93 | + * @return integer |
|
94 | + */ |
|
91 | 95 | public function getRPlayer() { return $this->rPlayer; } |
92 | 96 | public function getName() { return $this->name; } |
93 | 97 | public function getLevelGenerator() { return $this->levelGenerator; } |
@@ -135,6 +139,9 @@ discard block |
||
135 | 139 | public function getRealRecyclingLevel() { return $this->realRecyclingLevel; } |
136 | 140 | public function getRealSpatioportLevel() { return $this->realSpatioportLevel; } |
137 | 141 | |
142 | + /** |
|
143 | + * @param integer $buildingNumber |
|
144 | + */ |
|
138 | 145 | public function getBuildingLevel($buildingNumber) { |
139 | 146 | switch ($buildingNumber) { |
140 | 147 | case 0 : return $this->levelGenerator; |
@@ -162,6 +169,10 @@ discard block |
||
162 | 169 | $this->rPlace = $var; |
163 | 170 | return $this; |
164 | 171 | } |
172 | + |
|
173 | + /** |
|
174 | + * @param integer $var |
|
175 | + */ |
|
165 | 176 | public function setRPlayer($var) { |
166 | 177 | $this->rPlayer = $var; |
167 | 178 | return $this; |
@@ -170,42 +181,82 @@ discard block |
||
170 | 181 | $this->name = $var; |
171 | 182 | return $this; |
172 | 183 | } |
184 | + |
|
185 | + /** |
|
186 | + * @param integer $var |
|
187 | + */ |
|
173 | 188 | public function setLevelGenerator($var) { |
174 | 189 | $this->levelGenerator = $var; |
175 | 190 | return $this; |
176 | 191 | } |
192 | + |
|
193 | + /** |
|
194 | + * @param integer $var |
|
195 | + */ |
|
177 | 196 | public function setLevelRefinery($var) { |
178 | 197 | $this->levelRefinery = $var; |
179 | 198 | return $this; |
180 | 199 | } |
200 | + |
|
201 | + /** |
|
202 | + * @param integer $var |
|
203 | + */ |
|
181 | 204 | public function setLevelDock1($var) { |
182 | 205 | $this->levelDock1 = $var; |
183 | 206 | return $this; |
184 | 207 | } |
208 | + |
|
209 | + /** |
|
210 | + * @param integer $var |
|
211 | + */ |
|
185 | 212 | public function setLevelDock2($var) { |
186 | 213 | $this->levelDock2 = $var; |
187 | 214 | return $this; |
188 | 215 | } |
216 | + |
|
217 | + /** |
|
218 | + * @param integer $var |
|
219 | + */ |
|
189 | 220 | public function setLevelDock3($var) { |
190 | 221 | $this->levelDock3 = $var; |
191 | 222 | return $this; |
192 | 223 | } |
224 | + |
|
225 | + /** |
|
226 | + * @param integer $var |
|
227 | + */ |
|
193 | 228 | public function setLevelTechnosphere($var) { |
194 | 229 | $this->levelTechnosphere = $var; |
195 | 230 | return $this; |
196 | 231 | } |
232 | + |
|
233 | + /** |
|
234 | + * @param integer $var |
|
235 | + */ |
|
197 | 236 | public function setLevelCommercialPlateforme($var) { |
198 | 237 | $this->levelCommercialPlateforme = $var; |
199 | 238 | return $this; |
200 | 239 | } |
240 | + |
|
241 | + /** |
|
242 | + * @param integer $var |
|
243 | + */ |
|
201 | 244 | public function setLevelStorage($var) { |
202 | 245 | $this->levelStorage = $var; |
203 | 246 | return $this; |
204 | 247 | } |
248 | + |
|
249 | + /** |
|
250 | + * @param integer $var |
|
251 | + */ |
|
205 | 252 | public function setLevelRecycling($var) { |
206 | 253 | $this->levelRecycling = $var; |
207 | 254 | return $this; |
208 | 255 | } |
256 | + |
|
257 | + /** |
|
258 | + * @param integer $var |
|
259 | + */ |
|
209 | 260 | public function setLevelSpatioport($var) { |
210 | 261 | $this->levelSpatioport = $var; |
211 | 262 | return $this; |
@@ -214,14 +265,26 @@ discard block |
||
214 | 265 | $this->points = $var; |
215 | 266 | return $this; |
216 | 267 | } |
268 | + |
|
269 | + /** |
|
270 | + * @param integer $var |
|
271 | + */ |
|
217 | 272 | public function setISchool($var) { |
218 | 273 | $this->iSchool = $var; |
219 | 274 | return $this; |
220 | 275 | } |
276 | + |
|
277 | + /** |
|
278 | + * @param integer $var |
|
279 | + */ |
|
221 | 280 | public function setIAntiSpy($var) { |
222 | 281 | $this->iAntiSpy = $var; |
223 | 282 | return $this; |
224 | 283 | } |
284 | + |
|
285 | + /** |
|
286 | + * @param integer $var |
|
287 | + */ |
|
225 | 288 | public function setAntiSpyAverage($var) { |
226 | 289 | $this->antiSpyAverage = $var; |
227 | 290 | return $this; |
@@ -230,6 +293,10 @@ discard block |
||
230 | 293 | $this->shipStorage[$k] = $v; |
231 | 294 | return $this; |
232 | 295 | } |
296 | + |
|
297 | + /** |
|
298 | + * @param integer $var |
|
299 | + */ |
|
233 | 300 | public function setResourcesStorage($var) { |
234 | 301 | $this->resourcesStorage = $var; |
235 | 302 | return $this; |
@@ -263,6 +330,10 @@ discard block |
||
263 | 330 | $this->tax = $var; |
264 | 331 | return $this; |
265 | 332 | } |
333 | + |
|
334 | + /** |
|
335 | + * @param double $var |
|
336 | + */ |
|
266 | 337 | public function setPlanetPopulation($var) { |
267 | 338 | $this->planetPopulation = $var; |
268 | 339 | return $this; |
@@ -276,18 +347,33 @@ discard block |
||
276 | 347 | return $this; |
277 | 348 | } |
278 | 349 | |
350 | + /** |
|
351 | + * @param double $var |
|
352 | + */ |
|
279 | 353 | public function setRemainingTimeGenerator($var) { |
280 | 354 | $this->remainingTimeGenerator = $var; |
281 | 355 | return $this; |
282 | 356 | } |
357 | + |
|
358 | + /** |
|
359 | + * @param double $var |
|
360 | + */ |
|
283 | 361 | public function setRemainingTimeDock1($var) { |
284 | 362 | $this->remainingTimeDock1 = $var; |
285 | 363 | return $this; |
286 | 364 | } |
365 | + |
|
366 | + /** |
|
367 | + * @param double $var |
|
368 | + */ |
|
287 | 369 | public function setRemainingTimeDock2($var) { |
288 | 370 | $this->remainingTimeDock2 = $var; |
289 | 371 | return $this; |
290 | 372 | } |
373 | + |
|
374 | + /** |
|
375 | + * @param double $var |
|
376 | + */ |
|
291 | 377 | public function setRemainingTimeDock3($var) { |
292 | 378 | $this->remainingTimeDock3 = $var; |
293 | 379 | return $this; |
@@ -297,47 +383,90 @@ discard block |
||
297 | 383 | return $this; |
298 | 384 | } |
299 | 385 | |
386 | + /** |
|
387 | + * @param integer $var |
|
388 | + */ |
|
300 | 389 | public function setRealGeneratorLevel($var) { |
301 | 390 | $this->realGeneratorLevel = $var; |
302 | 391 | return $this; |
303 | 392 | } |
393 | + |
|
394 | + /** |
|
395 | + * @param integer $var |
|
396 | + */ |
|
304 | 397 | public function setRealRefineryLevel($var) { |
305 | 398 | $this->realRefineryLevel = $var; |
306 | 399 | return $this; |
307 | 400 | } |
401 | + |
|
402 | + /** |
|
403 | + * @param integer $var |
|
404 | + */ |
|
308 | 405 | public function setRealDock1Level($var) { |
309 | 406 | $this->realDock1Level = $var; |
310 | 407 | return $this; |
311 | 408 | } |
409 | + |
|
410 | + /** |
|
411 | + * @param integer $var |
|
412 | + */ |
|
312 | 413 | public function setRealDock2Level($var) { |
313 | 414 | $this->realDock2Level = $var; |
314 | 415 | return $this; |
315 | 416 | } |
417 | + |
|
418 | + /** |
|
419 | + * @param integer $var |
|
420 | + */ |
|
316 | 421 | public function setRealDock3Level($var) { |
317 | 422 | $this->realDock3Level = $var; |
318 | 423 | return $this; |
319 | 424 | } |
425 | + |
|
426 | + /** |
|
427 | + * @param integer $var |
|
428 | + */ |
|
320 | 429 | public function setRealTechnosphereLevel($var) { |
321 | 430 | $this->realTechnosphereLevel = $var; |
322 | 431 | return $this; |
323 | 432 | } |
433 | + |
|
434 | + /** |
|
435 | + * @param integer $var |
|
436 | + */ |
|
324 | 437 | public function setRealCommercialPlateformeLevel($var) { |
325 | 438 | $this->realCommercialPlateformeLevel = $var; |
326 | 439 | return $this; |
327 | 440 | } |
441 | + |
|
442 | + /** |
|
443 | + * @param integer $var |
|
444 | + */ |
|
328 | 445 | public function setRealStorageLevel($var) { |
329 | 446 | $this->realStorageLevel = $var; |
330 | 447 | return $this; |
331 | 448 | } |
449 | + |
|
450 | + /** |
|
451 | + * @param integer $var |
|
452 | + */ |
|
332 | 453 | public function setRealRecyclingLevel($var) { |
333 | 454 | $this->realRecyclingLevel = $var; |
334 | 455 | return $this; |
335 | 456 | } |
457 | + |
|
458 | + /** |
|
459 | + * @param integer $var |
|
460 | + */ |
|
336 | 461 | public function setRealSpatioportLevel($var) { |
337 | 462 | $this->realSpatioportLevel = $var; |
338 | 463 | return $this; |
339 | 464 | } |
340 | 465 | |
466 | + /** |
|
467 | + * @param integer $buildingNumber |
|
468 | + * @param integer $level |
|
469 | + */ |
|
341 | 470 | public function setBuildingLevel($buildingNumber, $level) { |
342 | 471 | switch ($buildingNumber) { |
343 | 472 | case 0 : $this->levelGenerator = $level; break; |