We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -11,7 +11,7 @@ |
||
11 | 11 | |
12 | 12 | $db->switchDatabases($var['HistoryDatabase']); |
13 | 13 | $db->query('SELECT start_date, type, end_date, game_name, speed, game_id ' . |
14 | - 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
14 | + 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
15 | 15 | $db->requireRecord(); |
16 | 16 | $template->assign('GameName', $game_name); |
17 | 17 | $template->assign('Start', date(DATE_DATE_SHORT, $db->getInt('start_date'))); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | // Send vote announcement to members of the player's council (war votes) |
40 | 40 | // or both races' councils (peace votes). |
41 | 41 | $councilMembers = Council::getRaceCouncil($player->getGameID(), |
42 | - $player->getRaceID()); |
|
42 | + $player->getRaceID()); |
|
43 | 43 | if ($type == 'PEACE') { |
44 | 44 | $otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id); |
45 | 45 | $councilMembers = array_merge($councilMembers, $otherCouncil); |
@@ -49,16 +49,16 @@ discard block |
||
49 | 49 | $color = ($type == 'PEACE' ? 'dgreen' : 'red'); |
50 | 50 | $type_fancy = "<span class=\"$color\">$type</span>"; |
51 | 51 | $message = $player->getLevelName() . " " . $player->getBBLink() |
52 | - . " has initiated a vote for $type_fancy with the " |
|
53 | - . Globals::getRaceName($race_id) |
|
54 | - . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
55 | - . " to cast your vote."; |
|
52 | + . " has initiated a vote for $type_fancy with the " |
|
53 | + . Globals::getRaceName($race_id) |
|
54 | + . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
55 | + . " to cast your vote."; |
|
56 | 56 | |
57 | 57 | foreach ($councilMembers as $accountID) { |
58 | 58 | // don't send to the player who started the vote |
59 | 59 | if ($player->getAccountID() != $accountID) { |
60 | 60 | SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(), |
61 | - $accountID, $message, $time); |
|
61 | + $accountID, $message, $time); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 |
@@ -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 | ); |
@@ -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); |
@@ -74,7 +74,7 @@ |
||
74 | 74 | </center><?php |
75 | 75 | |
76 | 76 | } elseif (in_array($type, ['search', 'alliance_ips', 'wild_log', 'wild_in', |
77 | - 'compare', 'compare_log', 'wild_ip', 'wild_host'])) { ?> |
|
77 | + 'compare', 'compare_log', 'wild_ip', 'wild_host'])) { ?> |
|
78 | 78 | |
79 | 79 | <center> |
80 | 80 | <?php echo $Summary; ?><br /><br /> |
@@ -337,8 +337,8 @@ |
||
337 | 337 | foreach (Globals::getAvailableTemplates() as $Template) { |
338 | 338 | foreach (Globals::getAvailableColourSchemes($Template) as $ColourScheme) { |
339 | 339 | $selected = ($ThisAccount->getTemplate() == $Template && |
340 | - $ThisAccount->getColourScheme() == $ColourScheme && |
|
341 | - $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : ''; |
|
340 | + $ThisAccount->getColourScheme() == $ColourScheme && |
|
341 | + $ThisAccount->isDefaultCSSEnabled()) ? 'selected' : ''; |
|
342 | 342 | $name = $Template . ' - ' . $ColourScheme; |
343 | 343 | ?><option value="<?php echo $name; ?>" <?php echo $selected; ?>><?php echo $name; ?></option><?php |
344 | 344 | } |