We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | $shareFrom[$fromAccountId] = [ |
39 | 39 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
40 | 40 | 'Player Name' => $otherPlayer == null ? |
41 | - '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
42 | - $otherPlayer->getDisplayName(), |
|
41 | + '<b>Account</b>: ' . SmrAccount::getAccount($fromAccountId)->getHofDisplayName() : |
|
42 | + $otherPlayer->getDisplayName(), |
|
43 | 43 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
44 | 44 | 'Game ID' => $gameId, |
45 | 45 | ]; |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | $shareTo[$toAccountId] = [ |
60 | 60 | 'Player ID' => $otherPlayer == null ? '-' : $otherPlayer->getPlayerID(), |
61 | 61 | 'Player Name' => $otherPlayer == null ? |
62 | - '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
63 | - $otherPlayer->getDisplayName(), |
|
62 | + '<b>Account</b>: ' . SmrAccount::getAccount($toAccountId)->getHofDisplayName() : |
|
63 | + $otherPlayer->getDisplayName(), |
|
64 | 64 | 'All Games' => $gameId == 0 ? '<span class="green">YES</span>' : '<span class="red">NO</span>', |
65 | 65 | 'Game ID' => $gameId, |
66 | 66 | ]; |
@@ -81,7 +81,7 @@ |
||
81 | 81 | foreach ($alliance_vs_ids as $id) { |
82 | 82 | $row_alliance = SmrAlliance::getAlliance($id, $player->getGameID()); |
83 | 83 | $showRed = (!$curr_alliance->isNone() && $curr_alliance->hasDisbanded()) || |
84 | - (!$row_alliance->isNone() && $row_alliance->hasDisbanded()); |
|
84 | + (!$row_alliance->isNone() && $row_alliance->hasDisbanded()); |
|
85 | 85 | $showBold = $curr_id == $player->getAllianceID() || $id == $player->getAllianceID(); |
86 | 86 | $style = ''; |
87 | 87 | if ($curr_id == $id && !$row_alliance->isNone()) { |
@@ -65,9 +65,9 @@ |
||
65 | 65 | //get base for ports that dont happen to trade that good |
66 | 66 | $GOODS = Globals::getGoods(); |
67 | 67 | $fine = $totalFine = $port->getLevel() * |
68 | - (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
69 | - ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
70 | - ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
68 | + (($ship->getCargo(GOODS_SLAVES) * $GOODS[GOODS_SLAVES]['BasePrice']) + |
|
69 | + ($ship->getCargo(GOODS_WEAPONS) * $GOODS[GOODS_WEAPONS]['BasePrice']) + |
|
70 | + ($ship->getCargo(GOODS_NARCOTICS) * $GOODS[GOODS_NARCOTICS]['BasePrice'])); |
|
71 | 71 | $player->increaseHOF($ship->getCargo(GOODS_SLAVES) + $ship->getCargo(GOODS_WEAPONS) + $ship->getCargo(GOODS_NARCOTICS), ['Trade', 'Search', 'Caught', 'Goods Confiscated'], HOF_PUBLIC); |
72 | 72 | $player->increaseHOF($totalFine, ['Trade', 'Search', 'Caught', 'Amount Fined'], HOF_PUBLIC); |
73 | 73 | $template->assign('TotalFine', $totalFine); |