We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -79,12 +79,12 @@ discard block |
||
| 79 | 79 | 'exp_gain' => 540, |
| 80 | 80 | ], |
| 81 | 81 | ]; |
| 82 | - public function name() { return "Terran Planet"; } |
|
| 83 | - public function imageLink() { return "images/planet1.png"; } |
|
| 84 | - public function description() { return "A lush world, with forests, seas, sweeping meadows, and indigenous lifeforms."; } |
|
| 82 | + public function name() { return "Terran Planet"; } |
|
| 83 | + public function imageLink() { return "images/planet1.png"; } |
|
| 84 | + public function description() { return "A lush world, with forests, seas, sweeping meadows, and indigenous lifeforms."; } |
|
| 85 | 85 | public function maxAttackers() { return 10; } |
| 86 | - public function maxLanded() { return self::MAX_LANDED_UNLIMITED; } |
|
| 87 | - public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; } |
|
| 86 | + public function maxLanded() { return self::MAX_LANDED_UNLIMITED; } |
|
| 87 | + public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; } |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | class AridPlanet extends SmrPlanetType { |
@@ -108,12 +108,12 @@ discard block |
||
| 108 | 108 | 'exp_gain' => 180, |
| 109 | 109 | ], |
| 110 | 110 | ]; |
| 111 | - public function name() { return "Arid Planet"; } |
|
| 112 | - public function imageLink() { return "images/planet2.png"; } |
|
| 113 | - public function description() { return "A world mostly devoid of surface water, but capable of supporting life."; } |
|
| 111 | + public function name() { return "Arid Planet"; } |
|
| 112 | + public function imageLink() { return "images/planet2.png"; } |
|
| 113 | + public function description() { return "A world mostly devoid of surface water, but capable of supporting life."; } |
|
| 114 | 114 | public function maxAttackers() { return 5; } |
| 115 | - public function maxLanded() { return 5; } |
|
| 116 | - public function menuOptions() { return ['CONSTRUCTION', 'DEFENSE', 'STOCKPILE', 'OWNERSHIP']; } |
|
| 115 | + public function maxLanded() { return 5; } |
|
| 116 | + public function menuOptions() { return ['CONSTRUCTION', 'DEFENSE', 'STOCKPILE', 'OWNERSHIP']; } |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | class DwarfPlanet extends SmrPlanetType { |
@@ -137,12 +137,12 @@ discard block |
||
| 137 | 137 | 'exp_gain' => 540, |
| 138 | 138 | ], |
| 139 | 139 | ]; |
| 140 | - public function name() { return "Dwarf Planet"; } |
|
| 141 | - public function imageLink() { return "images/planet3.png"; } |
|
| 142 | - public function description() { return "A smaller than usual planet, with no native life present."; } |
|
| 140 | + public function name() { return "Dwarf Planet"; } |
|
| 141 | + public function imageLink() { return "images/planet3.png"; } |
|
| 142 | + public function description() { return "A smaller than usual planet, with no native life present."; } |
|
| 143 | 143 | public function maxAttackers() { return 5; } |
| 144 | - public function maxLanded() { return self::MAX_LANDED_UNLIMITED; } |
|
| 145 | - public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; } |
|
| 144 | + public function maxLanded() { return self::MAX_LANDED_UNLIMITED; } |
|
| 145 | + public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; } |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | class ProtoPlanet extends SmrPlanetType { |
@@ -178,12 +178,12 @@ discard block |
||
| 178 | 178 | 'exp_gain' => 540, |
| 179 | 179 | ], |
| 180 | 180 | ]; |
| 181 | - public function name() { return "Protoplanet"; } |
|
| 182 | - public function imageLink() { return "images/planet5.png"; } |
|
| 183 | - public function description() { return "A developing planet, not yet able to support the infrastructure of advanced technologies."; } |
|
| 181 | + public function name() { return "Protoplanet"; } |
|
| 182 | + public function imageLink() { return "images/planet5.png"; } |
|
| 183 | + public function description() { return "A developing planet, not yet able to support the infrastructure of advanced technologies."; } |
|
| 184 | 184 | public function maxAttackers() { return 5; } |
| 185 | - public function maxLanded() { return 5; } |
|
| 186 | - public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; } |
|
| 185 | + public function maxLanded() { return 5; } |
|
| 186 | + public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; } |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | class DefenseWorld extends SmrPlanetType { |
@@ -213,10 +213,10 @@ discard block |
||
| 213 | 213 | 'exp_gain' => 9, |
| 214 | 214 | ], |
| 215 | 215 | ]; |
| 216 | - public function name() { return "Defense World"; } |
|
| 217 | - public function imageLink() { return "images/planet4.png"; } |
|
| 218 | - public function description() { return "A fully armed and operational battle station loaded with excessive firepower."; } |
|
| 216 | + public function name() { return "Defense World"; } |
|
| 217 | + public function imageLink() { return "images/planet4.png"; } |
|
| 218 | + public function description() { return "A fully armed and operational battle station loaded with excessive firepower."; } |
|
| 219 | 219 | public function maxAttackers() { return 10; } |
| 220 | - public function maxLanded() { return self::MAX_LANDED_UNLIMITED; } |
|
| 221 | - public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; } |
|
| 220 | + public function maxLanded() { return self::MAX_LANDED_UNLIMITED; } |
|
| 221 | + public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; } |
|
| 222 | 222 | } |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $template->assign('OurRank', $ourRank); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | -$expRanks = function (int $minRank, int $maxRank) use ($player, $db) : array { |
|
| 28 | +$expRanks = function(int $minRank, int $maxRank) use ($player, $db) : array { |
|
| 29 | 29 | $offset = $minRank - 1; |
| 30 | 30 | $limit = $maxRank - $offset; |
| 31 | 31 | $db->query('SELECT alliance_id, COALESCE(SUM(experience), 0) amount |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | foreach (\Globals::getGoods() as $goodId => $value) { |
| 91 | 91 | if ($goods[$goodId] === true) { |
| 92 | 92 | if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_SELLS && |
| 93 | - $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 93 | + $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 94 | 94 | $rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId); |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | foreach (\Globals::getGoods() as $goodId => $value) { |
| 119 | 119 | if ($goods[$goodId] === true) { |
| 120 | 120 | if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_SELLS && |
| 121 | - $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 121 | + $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 122 | 122 | $owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId); |
| 123 | 123 | $fakeReturn = new OneWayRoute($targetSectorId, $currentSectorId, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOODS_NOTHING); |
| 124 | 124 | $mpr = new MultiplePortRoute($owr, $fakeReturn); |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | } |
| 36 | 36 | $helper = self::getTwitterObj($_SESSION['TwitterToken']); |
| 37 | 37 | $accessToken = $helper->oauth('oauth/access_token', |
| 38 | - ['oauth_verifier' => \Request::get('oauth_verifier')]); |
|
| 38 | + ['oauth_verifier' => \Request::get('oauth_verifier')]); |
|
| 39 | 39 | $auth = self::getTwitterObj($accessToken); |
| 40 | 40 | $userInfo = $auth->get('account/verify_credentials', ['include_email' => 'true']); |
| 41 | 41 | if ($auth->getLastHttpCode() == 200) { |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | // Delete all tickets and re-insert the winning ticket |
| 33 | 33 | $db->query('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($gameID)); |
| 34 | 34 | $db->query('INSERT INTO player_has_ticket (game_id, account_id, time, prize) ' |
| 35 | - .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
| 35 | + .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
| 36 | 36 | |
| 37 | 37 | $db->unlock(); |
| 38 | 38 | |
@@ -924,14 +924,14 @@ |
||
| 924 | 924 | |
| 925 | 925 | public function isFederal() { |
| 926 | 926 | return $this->getShipTypeID() == SHIP_TYPE_FEDERAL_DISCOVERY || |
| 927 | - $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT || |
|
| 928 | - $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
| 927 | + $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT || |
|
| 928 | + $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
| 929 | 929 | } |
| 930 | 930 | |
| 931 | 931 | public function isUnderground() { |
| 932 | 932 | return $this->getShipTypeID() == SHIP_TYPE_THIEF || |
| 933 | - $this->getShipTypeID() == SHIP_TYPE_ASSASSIN || |
|
| 934 | - $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER; |
|
| 933 | + $this->getShipTypeID() == SHIP_TYPE_ASSASSIN || |
|
| 934 | + $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER; |
|
| 935 | 935 | } |
| 936 | 936 | |
| 937 | 937 | public function shootPlayers(array $targetPlayers) { |
@@ -40,9 +40,9 @@ discard block |
||
| 40 | 40 | } else { |
| 41 | 41 | ?> destroying <?php |
| 42 | 42 | $DamageTypes = 0; |
| 43 | - if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 44 | - if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 45 | - if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 43 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 44 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 45 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 46 | 46 | |
| 47 | 47 | if ($ActualDamage['Shield'] > 0) { |
| 48 | 48 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | } ?>. |
| 60 | 60 | <br /><?php |
| 61 | 61 | if ($ShotHit && $ActualDamage['KillingShot']) { |
| 62 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 62 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer)); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -69,9 +69,9 @@ discard block |
||
| 69 | 69 | $WeaponDamage = $Drones['WeaponDamage']; |
| 70 | 70 | $TargetPlayer = $Drones['TargetPlayer']; |
| 71 | 71 | $DamageTypes = 0; |
| 72 | - if ($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 73 | - if ($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 74 | - if ($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 72 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 73 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 74 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 75 | 75 | |
| 76 | 76 | echo $ShootingPlayer->getDisplayName(); |
| 77 | 77 | if ($WeaponDamage['Launched'] == 0) { |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | } ?>. |
| 115 | 115 | <br /><?php |
| 116 | 116 | if ($ActualDamage['KillingShot']) { |
| 117 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc.php',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 117 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc.php', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer)); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -130,4 +130,4 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?> |
| 133 | -This fleet <?php if ($TotalDamage > 0){ ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else{ ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.<br /> |
|
| 133 | +This fleet <?php if ($TotalDamage > 0) { ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else { ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.<br /> |
|
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | $menuItems[] = array('Link'=>Globals::getPlanetListHREF($alliance_id), 'Text'=>'Defense'); |
| 42 | 42 | $menuItems[] = array('Link'=>Globals::getPlanetListFinancialHREF($alliance_id), 'Text'=>'Financial'); |
| 43 | 43 | // make the selected index bold |
| 44 | - $boldItem =& $menuItems[$selected_index]['Text']; |
|
| 44 | + $boldItem = & $menuItems[$selected_index]['Text']; |
|
| 45 | 45 | $boldItem = '<span class="bold">' . $boldItem . '</span>'; |
| 46 | 46 | $template->assign('MenuItems', $menuItems); |
| 47 | 47 | } |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | 'Text' => 'Game News', |
| 142 | 142 | ]; |
| 143 | 143 | // make the selected index bold |
| 144 | - $boldItem =& $menuItems[$selected_index]['Text']; |
|
| 144 | + $boldItem = & $menuItems[$selected_index]['Text']; |
|
| 145 | 145 | $boldItem = '<b>' . $boldItem . '</b>'; |
| 146 | 146 | $template->assign('MenuItems', $menuItems); |
| 147 | 147 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | if ($db->nextRecord()) { |
| 71 | 71 | $return = unserialize($db->getField('info')); |
| 72 | 72 | $return->regenerate($player); |
| 73 | - self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return; |
|
| 73 | + self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = & $return; |
|
| 74 | 74 | } else { |
| 75 | 75 | self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player); |
| 76 | 76 | } |