We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -9,10 +9,11 @@ discard block |
||
9 | 9 | $realAttackers = array(); |
10 | 10 | $attackers = array(); |
11 | 11 | $i=1; |
12 | -if(isset($_POST['attackers'])) |
|
12 | +if(isset($_POST['attackers'])) { |
|
13 | 13 | foreach($_POST['attackers'] as $attackerName) { |
14 | 14 | if($attackerName=='none') |
15 | 15 | continue; |
16 | +} |
|
16 | 17 | if(isset($usedNames[$attackerName])) { |
17 | 18 | $duplicates = true; |
18 | 19 | continue; |
@@ -24,17 +25,19 @@ discard block |
||
24 | 25 | ++$i; |
25 | 26 | } |
26 | 27 | |
27 | -for(;$i<=10;++$i) |
|
28 | +for(;$i<=10;++$i) { |
|
28 | 29 | $attackers[$i] = null; |
30 | +} |
|
29 | 31 | $template->assign('Attackers',$attackers); |
30 | 32 | |
31 | 33 | $i=1; |
32 | 34 | $realDefenders = array(); |
33 | 35 | $defenders = array(); |
34 | -if(isset($_POST['defenders'])) |
|
36 | +if(isset($_POST['defenders'])) { |
|
35 | 37 | foreach($_POST['defenders'] as $defenderName) { |
36 | 38 | if($defenderName=='none') |
37 | 39 | continue; |
40 | +} |
|
38 | 41 | if(isset($usedNames[$defenderName])) { |
39 | 42 | $duplicates = true; |
40 | 43 | continue; |
@@ -46,8 +49,9 @@ discard block |
||
46 | 49 | ++$i; |
47 | 50 | } |
48 | 51 | |
49 | -for(;$i<=10;++$i) |
|
52 | +for(;$i<=10;++$i) { |
|
50 | 53 | $defenders[$i] = null; |
54 | +} |
|
51 | 55 | $template->assign('Defenders',$defenders); |
52 | 56 | |
53 | 57 | $template->assign('Duplicates',$duplicates); |
@@ -62,12 +66,14 @@ discard block |
||
62 | 66 | while(count($realAttackers)>0 && count($realDefenders)>0) { |
63 | 67 | runAnAttack($realAttackers,$realDefenders); |
64 | 68 | foreach($realAttackers as $key => &$teamPlayer) { |
65 | - if($teamPlayer->isDead()) |
|
66 | - unset($realAttackers[$key]); |
|
69 | + if($teamPlayer->isDead()) { |
|
70 | + unset($realAttackers[$key]); |
|
71 | + } |
|
67 | 72 | } unset($teamPlayer); |
68 | 73 | foreach($realDefenders as $key => &$teamPlayer) { |
69 | - if($teamPlayer->isDead()) |
|
70 | - unset($realDefenders[$key]); |
|
74 | + if($teamPlayer->isDead()) { |
|
75 | + unset($realDefenders[$key]); |
|
76 | + } |
|
71 | 77 | } unset($teamPlayer); |
72 | 78 | } |
73 | 79 | } |
@@ -1,91 +1,91 @@ |
||
1 | 1 | <?php declare(strict_types=1); |
2 | -$template->assign('PageTopic','Combat Simulator'); |
|
2 | +$template->assign('PageTopic', 'Combat Simulator'); |
|
3 | 3 | |
4 | -$template->assign('EditDummysLink',SmrSession::getNewHREF(create_container('skeleton.php','edit_dummys.php'))); |
|
4 | +$template->assign('EditDummysLink', SmrSession::getNewHREF(create_container('skeleton.php', 'edit_dummys.php'))); |
|
5 | 5 | $template->assign('DummyNames', DummyPlayer::getDummyPlayerNames()); |
6 | 6 | |
7 | 7 | $duplicates = false; |
8 | 8 | $usedNames = array(); |
9 | 9 | $realAttackers = array(); |
10 | 10 | $attackers = array(); |
11 | -$i=1; |
|
12 | -if(isset($_POST['attackers'])) |
|
13 | - foreach($_POST['attackers'] as $attackerName) { |
|
14 | - if($attackerName=='none') |
|
11 | +$i = 1; |
|
12 | +if (isset($_POST['attackers'])) |
|
13 | + foreach ($_POST['attackers'] as $attackerName) { |
|
14 | + if ($attackerName == 'none') |
|
15 | 15 | continue; |
16 | - if(isset($usedNames[$attackerName])) { |
|
16 | + if (isset($usedNames[$attackerName])) { |
|
17 | 17 | $duplicates = true; |
18 | 18 | continue; |
19 | 19 | } |
20 | 20 | $usedNames[$attackerName] = true; |
21 | - $attackers[$i] =& DummyPlayer::getCachedDummyPlayer($attackerName); |
|
21 | + $attackers[$i] = & DummyPlayer::getCachedDummyPlayer($attackerName); |
|
22 | 22 | $attackers[$i]->setAllianceID(1); |
23 | - $realAttackers[$i] =& $attackers[$i]; |
|
23 | + $realAttackers[$i] = & $attackers[$i]; |
|
24 | 24 | ++$i; |
25 | 25 | } |
26 | 26 | |
27 | -for(;$i<=10;++$i) |
|
27 | +for (;$i <= 10; ++$i) |
|
28 | 28 | $attackers[$i] = null; |
29 | -$template->assign('Attackers',$attackers); |
|
29 | +$template->assign('Attackers', $attackers); |
|
30 | 30 | |
31 | -$i=1; |
|
31 | +$i = 1; |
|
32 | 32 | $realDefenders = array(); |
33 | 33 | $defenders = array(); |
34 | -if(isset($_POST['defenders'])) |
|
35 | - foreach($_POST['defenders'] as $defenderName) { |
|
36 | - if($defenderName=='none') |
|
34 | +if (isset($_POST['defenders'])) |
|
35 | + foreach ($_POST['defenders'] as $defenderName) { |
|
36 | + if ($defenderName == 'none') |
|
37 | 37 | continue; |
38 | - if(isset($usedNames[$defenderName])) { |
|
38 | + if (isset($usedNames[$defenderName])) { |
|
39 | 39 | $duplicates = true; |
40 | 40 | continue; |
41 | 41 | } |
42 | 42 | $usedNames[$attackerName] = true; |
43 | - $defenders[$i] =& DummyPlayer::getCachedDummyPlayer($defenderName); |
|
43 | + $defenders[$i] = & DummyPlayer::getCachedDummyPlayer($defenderName); |
|
44 | 44 | $defenders[$i]->setAllianceID(2); |
45 | - $realDefenders[$i] =& $defenders[$i]; |
|
45 | + $realDefenders[$i] = & $defenders[$i]; |
|
46 | 46 | ++$i; |
47 | 47 | } |
48 | 48 | |
49 | -for(;$i<=10;++$i) |
|
49 | +for (;$i <= 10; ++$i) |
|
50 | 50 | $defenders[$i] = null; |
51 | -$template->assign('Defenders',$defenders); |
|
51 | +$template->assign('Defenders', $defenders); |
|
52 | 52 | |
53 | -$template->assign('Duplicates',$duplicates); |
|
53 | +$template->assign('Duplicates', $duplicates); |
|
54 | 54 | |
55 | -$template->assign('CombatSimHREF',SmrSession::getNewHREF(create_container('skeleton.php','combat_simulator.php'))); |
|
55 | +$template->assign('CombatSimHREF', SmrSession::getNewHREF(create_container('skeleton.php', 'combat_simulator.php'))); |
|
56 | 56 | |
57 | 57 | if (!empty($realAttackers) && !empty($realDefenders)) { |
58 | - if(isset($_REQUEST['run'])) { |
|
59 | - runAnAttack($realAttackers,$realDefenders); |
|
58 | + if (isset($_REQUEST['run'])) { |
|
59 | + runAnAttack($realAttackers, $realDefenders); |
|
60 | 60 | } |
61 | - if(isset($_REQUEST['death_run'])) { |
|
62 | - while(count($realAttackers)>0 && count($realDefenders)>0) { |
|
63 | - runAnAttack($realAttackers,$realDefenders); |
|
64 | - foreach($realAttackers as $key => &$teamPlayer) { |
|
65 | - if($teamPlayer->isDead()) |
|
61 | + if (isset($_REQUEST['death_run'])) { |
|
62 | + while (count($realAttackers) > 0 && count($realDefenders) > 0) { |
|
63 | + runAnAttack($realAttackers, $realDefenders); |
|
64 | + foreach ($realAttackers as $key => &$teamPlayer) { |
|
65 | + if ($teamPlayer->isDead()) |
|
66 | 66 | unset($realAttackers[$key]); |
67 | 67 | } unset($teamPlayer); |
68 | - foreach($realDefenders as $key => &$teamPlayer) { |
|
69 | - if($teamPlayer->isDead()) |
|
68 | + foreach ($realDefenders as $key => &$teamPlayer) { |
|
69 | + if ($teamPlayer->isDead()) |
|
70 | 70 | unset($realDefenders[$key]); |
71 | 71 | } unset($teamPlayer); |
72 | 72 | } |
73 | 73 | } |
74 | 74 | } |
75 | 75 | |
76 | -function runAnAttack($realAttackers,$realDefenders) { |
|
76 | +function runAnAttack($realAttackers, $realDefenders) { |
|
77 | 77 | global $template; |
78 | 78 | $results = array('Attackers' => array('Traders' => array(), 'TotalDamage' => 0), |
79 | 79 | 'Defenders' => array('Traders' => array(), 'TotalDamage' => 0)); |
80 | 80 | foreach ($realAttackers as $accountID => $teamPlayer) { |
81 | - $playerResults =& $teamPlayer->shootPlayers($realDefenders); |
|
82 | - $results['Attackers']['Traders'][] =& $playerResults; |
|
81 | + $playerResults = & $teamPlayer->shootPlayers($realDefenders); |
|
82 | + $results['Attackers']['Traders'][] = & $playerResults; |
|
83 | 83 | $results['Attackers']['TotalDamage'] += $playerResults['TotalDamage']; |
84 | 84 | } |
85 | 85 | foreach ($realDefenders as $accountID => $teamPlayer) { |
86 | - $playerResults =& $teamPlayer->shootPlayers($realAttackers); |
|
87 | - $results['Defenders']['Traders'][] =& $playerResults; |
|
86 | + $playerResults = & $teamPlayer->shootPlayers($realAttackers); |
|
87 | + $results['Defenders']['Traders'][] = & $playerResults; |
|
88 | 88 | $results['Defenders']['TotalDamage'] += $playerResults['TotalDamage']; |
89 | 89 | } |
90 | - $template->assign('TraderCombatResults',$results); |
|
90 | + $template->assign('TraderCombatResults', $results); |
|
91 | 91 | } |
@@ -5,8 +5,9 @@ discard block |
||
5 | 5 | require_once(ENGINE . 'Default/help.inc'); |
6 | 6 | |
7 | 7 | $topic_id = $_SERVER['QUERY_STRING']; |
8 | - if (empty($topic_id) || !is_numeric($topic_id)) |
|
9 | - $topic_id = 1; |
|
8 | + if (empty($topic_id) || !is_numeric($topic_id)) { |
|
9 | + $topic_id = 1; |
|
10 | + } |
|
10 | 11 | ?> |
11 | 12 | <!DOCTYPE html> |
12 | 13 | |
@@ -48,8 +49,7 @@ discard block |
||
48 | 49 | |
49 | 50 | </body> |
50 | 51 | </html><?php |
51 | -} |
|
52 | -catch (Throwable $e) { |
|
52 | +} catch (Throwable $e) { |
|
53 | 53 | handleException($e); |
54 | 54 | } |
55 | 55 | ?> |
@@ -68,8 +68,7 @@ |
||
68 | 68 | |
69 | 69 | </body> |
70 | 70 | </html><?php |
71 | -} |
|
72 | -catch (Throwable $e) { |
|
71 | +} catch (Throwable $e) { |
|
73 | 72 | handleException($e); |
74 | 73 | } |
75 | 74 | ?> |
@@ -41,8 +41,8 @@ |
||
41 | 41 | |
42 | 42 | function teamAttack(&$results, $fightingPlayers, $attack, $defend) { |
43 | 43 | foreach ($fightingPlayers[$attack] as $accountID => $teamPlayer) { |
44 | - $playerResults =& $teamPlayer->shootPlayers($fightingPlayers[$defend]); |
|
45 | - $results[$attack]['Traders'][$teamPlayer->getAccountID()] =& $playerResults; |
|
44 | + $playerResults = & $teamPlayer->shootPlayers($fightingPlayers[$defend]); |
|
45 | + $results[$attack]['Traders'][$teamPlayer->getAccountID()] = & $playerResults; |
|
46 | 46 | $results[$attack]['TotalDamage'] += $playerResults['TotalDamage']; |
47 | 47 | |
48 | 48 | // Award assists (if there are multiple attackers) |
@@ -72,18 +72,18 @@ |
||
72 | 72 | |
73 | 73 | // If mines are bumped, the forces shoot first. Otherwise player shoots first. |
74 | 74 | if ($bump) { |
75 | - $results['Forces'] =& $forces->shootPlayers($attackers, $bump); |
|
75 | + $results['Forces'] = & $forces->shootPlayers($attackers, $bump); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | $results['Attackers'] = array('TotalDamage' => 0); |
79 | 79 | foreach ($attackers as $attacker) { |
80 | - $playerResults =& $attacker->shootForces($forces); |
|
81 | - $results['Attackers']['Traders'][$attacker->getAccountID()] =& $playerResults; |
|
80 | + $playerResults = & $attacker->shootForces($forces); |
|
81 | + $results['Attackers']['Traders'][$attacker->getAccountID()] = & $playerResults; |
|
82 | 82 | $results['Attackers']['TotalDamage'] += $playerResults['TotalDamage']; |
83 | 83 | } |
84 | 84 | |
85 | 85 | if (!$bump) { |
86 | - $results['Forces'] =& $forces->shootPlayers($attackers, $bump); |
|
86 | + $results['Forces'] = & $forces->shootPlayers($attackers, $bump); |
|
87 | 87 | $forces->updateExpire(); |
88 | 88 | } |
89 | 89 |
@@ -1,5 +1,8 @@ |
||
1 | 1 | <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> |
2 | -<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) echo ": $GameName"; ?></title> |
|
2 | +<title><?php echo PAGE_TITLE; ?><?php if (isset($GameName)) { |
|
3 | + echo ": $GameName"; |
|
4 | +} |
|
5 | +?></title> |
|
3 | 6 | <meta http-equiv="pragma" content="no-cache" /><?php |
4 | 7 | if (!is_object($ThisAccount) || $ThisAccount->isDefaultCSSEnabled()) { ?> |
5 | 8 | <link rel="stylesheet" type="text/css" href="<?php echo $CSSLink; ?>" /> |
@@ -10,7 +10,10 @@ |
||
10 | 10 | <td style="width: 80%" class="center"> |
11 | 11 | Local Map of the Known <span class="big bold"><?php echo $GalaxyName ?></span> Galaxy |
12 | 12 | <br /><br /> |
13 | - <?php if (isset($Error)) echo $Error; ?> |
|
13 | + <?php if (isset($Error)) { |
|
14 | + echo $Error; |
|
15 | +} |
|
16 | +?> |
|
14 | 17 | </td> |
15 | 18 | <td style="width: 10%"></td> |
16 | 19 | </tr> |
@@ -20,13 +20,13 @@ |
||
20 | 20 | const USER_SCORE_NAME = 'User Score'; |
21 | 21 | $hofTypes = array(DONATION_NAME=>true, USER_SCORE_NAME=>true); |
22 | 22 | while ($db->nextRecord()) { |
23 | - $hof =& $hofTypes; |
|
23 | + $hof = & $hofTypes; |
|
24 | 24 | $typeList = explode(':', $db->getField('type')); |
25 | 25 | foreach ($typeList as $type) { |
26 | 26 | if (!isset($hof[$type])) { |
27 | 27 | $hof[$type] = array(); |
28 | 28 | } |
29 | - $hof =& $hof[$type]; |
|
29 | + $hof = & $hof[$type]; |
|
30 | 30 | } |
31 | 31 | $hof = true; |
32 | 32 | } |
@@ -20,13 +20,13 @@ |
||
20 | 20 | const USER_SCORE_NAME = 'User Score'; |
21 | 21 | $hofTypes = array(DONATION_NAME=>true, USER_SCORE_NAME=>true); |
22 | 22 | while ($db->nextRecord()) { |
23 | - $hof =& $hofTypes; |
|
23 | + $hof = & $hofTypes; |
|
24 | 24 | $typeList = explode(':', $db->getField('type')); |
25 | 25 | foreach ($typeList as $type) { |
26 | 26 | if (!isset($hof[$type])) { |
27 | 27 | $hof[$type] = array(); |
28 | 28 | } |
29 | - $hof =& $hof[$type]; |
|
29 | + $hof = & $hof[$type]; |
|
30 | 30 | } |
31 | 31 | $hof = true; |
32 | 32 | } |