We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -53,9 +53,9 @@ |
||
| 53 | 53 | //get base for ports that dont happen to trade that good |
| 54 | 54 | $GOODS = Globals::getGoods(); |
| 55 | 55 | $fine = $totalFine = $port->getLevel() * |
| 56 | - (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
| 57 | - ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
| 58 | - ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
| 56 | + (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
| 57 | + ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
| 58 | + ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
| 59 | 59 | $player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), ['Trade', 'Search', 'Caught', 'Goods Confiscated'], HOF_PUBLIC); |
| 60 | 60 | $player->increaseHOF($totalFine, ['Trade', 'Search', 'Caught', 'Amount Fined'], HOF_PUBLIC); |
| 61 | 61 | $template->assign('TotalFine', $totalFine); |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | $shareFrom[$fromAccountId] = [ |
| 27 | 27 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
| 28 | 28 | 'Player Name' => $otherPlayer == null ? |
| 29 | - '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
| 30 | - $otherPlayer->getDisplayName(), |
|
| 29 | + '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
| 30 | + $otherPlayer->getDisplayName(), |
|
| 31 | 31 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
| 32 | 32 | 'Game ID' => $gameId, |
| 33 | 33 | ]; |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | $shareTo[$toAccountId] = [ |
| 48 | 48 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
| 49 | 49 | 'Player Name' => $otherPlayer == null ? |
| 50 | - '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
| 51 | - $otherPlayer->getDisplayName(), |
|
| 50 | + '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
| 51 | + $otherPlayer->getDisplayName(), |
|
| 52 | 52 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
| 53 | 53 | 'Game ID' => $gameId, |
| 54 | 54 | ]; |
@@ -555,7 +555,7 @@ |
||
| 555 | 555 | */ |
| 556 | 556 | public function setWarp(SmrSector $warp): void { |
| 557 | 557 | if ($this->getWarp() == $warp->getSectorID() && |
| 558 | - $warp->getWarp() == $this->getSectorID()) { |
|
| 558 | + $warp->getWarp() == $this->getSectorID()) { |
|
| 559 | 559 | // Warps are already set correctly! |
| 560 | 560 | return; |
| 561 | 561 | } |
@@ -735,14 +735,14 @@ |
||
| 735 | 735 | |
| 736 | 736 | public function isFederal(): bool { |
| 737 | 737 | return $this->getTypeID() === SHIP_TYPE_FEDERAL_DISCOVERY || |
| 738 | - $this->getTypeID() === SHIP_TYPE_FEDERAL_WARRANT || |
|
| 739 | - $this->getTypeID() === SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
| 738 | + $this->getTypeID() === SHIP_TYPE_FEDERAL_WARRANT || |
|
| 739 | + $this->getTypeID() === SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | public function isUnderground(): bool { |
| 743 | 743 | return $this->getTypeID() === SHIP_TYPE_THIEF || |
| 744 | - $this->getTypeID() === SHIP_TYPE_ASSASSIN || |
|
| 745 | - $this->getTypeID() === SHIP_TYPE_DEATH_CRUISER; |
|
| 744 | + $this->getTypeID() === SHIP_TYPE_ASSASSIN || |
|
| 745 | + $this->getTypeID() === SHIP_TYPE_DEATH_CRUISER; |
|
| 746 | 746 | } |
| 747 | 747 | |
| 748 | 748 | public function shootPlayers(array $targetPlayers): array { |
@@ -870,9 +870,9 @@ |
||
| 870 | 870 | */ |
| 871 | 871 | public function canFight(): bool { |
| 872 | 872 | return !($this->hasNewbieTurns() || |
| 873 | - $this->isDead() || |
|
| 874 | - $this->isLandedOnPlanet() || |
|
| 875 | - $this->hasFederalProtection()); |
|
| 873 | + $this->isDead() || |
|
| 874 | + $this->isLandedOnPlanet() || |
|
| 875 | + $this->hasFederalProtection()); |
|
| 876 | 876 | } |
| 877 | 877 | |
| 878 | 878 | public function setDead(bool $bool): void { |
@@ -67,9 +67,9 @@ |
||
| 67 | 67 | $session = Session::getInstance(); |
| 68 | 68 | $account = $session->getAccount(); |
| 69 | 69 | if (($vis == HOF_PRIVATE && $account->getAccountID() != $accountID) || |
| 70 | - ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 71 | - !SmrGame::getGame($gameID)->hasEnded() && |
|
| 72 | - !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer()))) { |
|
| 70 | + ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 71 | + !SmrGame::getGame($gameID)->hasEnded() && |
|
| 72 | + !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer()))) { |
|
| 73 | 73 | return '-'; |
| 74 | 74 | } else { |
| 75 | 75 | return $amount; |