We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | $missingLocs = array_diff(array_keys(SmrLocation::getAllLocations()), |
| 23 | - array_keys($existingLocs)); |
|
| 23 | + array_keys($existingLocs)); |
|
| 24 | 24 | $missingLocNames = []; |
| 25 | 25 | foreach ($missingLocs as $locID) { |
| 26 | 26 | $missingLocNames[] = SmrLocation::getLocation($locID)->getName(); |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | $template->assign('SelectedPortRaceID', $selectedPortRaceID); |
| 26 | 26 | |
| 27 | 27 | $sectorLocationIDs = array_pad(array_keys($editSector->getLocations()), |
| 28 | - UNI_GEN_LOCATION_SLOTS, 0); |
|
| 28 | + UNI_GEN_LOCATION_SLOTS, 0); |
|
| 29 | 29 | $template->assign('SectorLocationIDs', $sectorLocationIDs); |
| 30 | 30 | |
| 31 | 31 | if ($editSector->hasWarp()) { |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | // * C o l o r L e g e n d |
| 29 | 29 | // ********************************* |
| 30 | 30 | $avail_colors = array('#FFFFFF', '#00FF00', '#FF3377', '#0099FF', |
| 31 | - '#FF0000', '#0000FF'); |
|
| 31 | + '#FF0000', '#0000FF'); |
|
| 32 | 32 | |
| 33 | 33 | // now assign each account id a color |
| 34 | 34 | $colors = []; |
@@ -46,5 +46,5 @@ |
||
| 46 | 46 | $template->assign('ProcessingHREF', $processingHREF); |
| 47 | 47 | |
| 48 | 48 | $template->assign('PermissionCategories', |
| 49 | - AdminPermissions::getPermissionsByCategory()); |
|
| 49 | + AdminPermissions::getPermissionsByCategory()); |
|
| 50 | 50 | } |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | |
| 47 | 47 | // Don't lose more exp than you have |
| 48 | 48 | $lost_xp = min($player->getExperience(), |
| 49 | - IRound(SmrPort::getBaseExperience($amount, $good_distance))); |
|
| 49 | + IRound(SmrPort::getBaseExperience($amount, $good_distance))); |
|
| 50 | 50 | $player->decreaseExperience($lost_xp); |
| 51 | 51 | $player->increaseHOF($lost_xp, array('Trade', 'Experience', 'Jettisoned'), HOF_PUBLIC); |
| 52 | 52 | |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | //heres the AIs cards |
| 97 | 97 | $i = 1; |
| 98 | 98 | if ($dealerHand->hasBlackjack() || |
| 99 | - ($playerHand->getValue() > 21 && $dealerHand->getValue() <= 21)) { |
|
| 99 | + ($playerHand->getValue() > 21 && $dealerHand->getValue() <= 21)) { |
|
| 100 | 100 | $message .= ('<h1 class="red center">Bank Wins</h1>'); |
| 101 | 101 | } |
| 102 | 102 | $message .= ('<div class="center">Bank\'s Cards are</div><br /><table class="center"><tr>'); |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | $shareFrom[$fromAccountId] = array( |
| 20 | 20 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
| 21 | 21 | 'Player Name' => $otherPlayer == null ? |
| 22 | - '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
| 23 | - $otherPlayer->getDisplayName(), |
|
| 22 | + '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
| 23 | + $otherPlayer->getDisplayName(), |
|
| 24 | 24 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
| 25 | 25 | 'Game ID' => $gameId, |
| 26 | 26 | ); |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | $shareTo[$toAccountId] = array( |
| 41 | 41 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
| 42 | 42 | 'Player Name' => $otherPlayer == null ? |
| 43 | - '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
| 44 | - $otherPlayer->getDisplayName(), |
|
| 43 | + '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
| 44 | + $otherPlayer->getDisplayName(), |
|
| 45 | 45 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
| 46 | 46 | 'Game ID' => $gameId, |
| 47 | 47 | ); |
@@ -19,8 +19,7 @@ discard block |
||
| 19 | 19 | $shareFrom[$fromAccountId] = array( |
| 20 | 20 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
| 21 | 21 | 'Player Name' => $otherPlayer == null ? |
| 22 | - '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
| 23 | - $otherPlayer->getDisplayName(), |
|
| 22 | + '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : $otherPlayer->getDisplayName(), |
|
| 24 | 23 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
| 25 | 24 | 'Game ID' => $gameId, |
| 26 | 25 | ); |
@@ -40,8 +39,7 @@ discard block |
||
| 40 | 39 | $shareTo[$toAccountId] = array( |
| 41 | 40 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
| 42 | 41 | 'Player Name' => $otherPlayer == null ? |
| 43 | - '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
| 44 | - $otherPlayer->getDisplayName(), |
|
| 42 | + '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : $otherPlayer->getDisplayName(), |
|
| 45 | 43 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
| 46 | 44 | 'Game ID' => $gameId, |
| 47 | 45 | ); |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | foreach ($alliance_vs_ids as $id) { |
| 53 | 53 | $row_alliance = SmrAlliance::getAlliance($id, $player->getGameID()); |
| 54 | 54 | $showRed = (!$curr_alliance->isNone() && $curr_alliance->hasDisbanded()) || |
| 55 | - (!$row_alliance->isNone() && $row_alliance->hasDisbanded()); |
|
| 55 | + (!$row_alliance->isNone() && $row_alliance->hasDisbanded()); |
|
| 56 | 56 | $showBold = $curr_id == $player->getAllianceID() || $id == $player->getAllianceID(); |
| 57 | 57 | $style = ''; |
| 58 | 58 | if ($curr_id == $id && !$row_alliance->isNone()) { |
@@ -50,9 +50,9 @@ |
||
| 50 | 50 | //get base for ports that dont happen to trade that good |
| 51 | 51 | $GOODS = Globals::getGoods(); |
| 52 | 52 | $fine = $totalFine = $port->getLevel() * |
| 53 | - (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
| 54 | - ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
| 55 | - ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
| 53 | + (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
| 54 | + ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
| 55 | + ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
| 56 | 56 | $player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), array('Trade', 'Search', 'Caught', 'Goods Confiscated'), HOF_PUBLIC); |
| 57 | 57 | $player->increaseHOF($totalFine, array('Trade', 'Search', 'Caught', 'Amount Fined'), HOF_PUBLIC); |
| 58 | 58 | $template->assign('TotalFine', $totalFine); |