smrealms /
smr
We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | $db3 = new SmrMySqlDatabase(); |
| 8 | 8 | |
| 9 | 9 | // get current entry |
| 10 | - $db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id)); |
|
| 10 | + $db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id)); |
|
| 11 | 11 | if ($db->nextRecord()) { |
| 12 | 12 | $parent_topic_id = $db->getInt('parent_topic_id'); |
| 13 | 13 | $order_id = $db->getInt('order_id'); |
@@ -19,17 +19,17 @@ discard block |
||
| 19 | 19 | // ************************** |
| 20 | 20 | // ** PREVIOUS |
| 21 | 21 | // ************************** |
| 22 | - $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1)); |
|
| 22 | + $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id - 1)); |
|
| 23 | 23 | |
| 24 | 24 | // no result? |
| 25 | 25 | if (!$db2->getNumRows()) |
| 26 | - $db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id)); |
|
| 26 | + $db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id)); |
|
| 27 | 27 | |
| 28 | 28 | echo ('<th width="32">'); |
| 29 | 29 | if ($db2->nextRecord()) { |
| 30 | 30 | $previous_topic_id = $db2->getInt('topic_id'); |
| 31 | 31 | $previous_topic = stripslashes($db2->getField('topic')); |
| 32 | - echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>'); |
|
| 32 | + echo ('<a href="/manual.php?' . $previous_topic_id . '"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>'); |
|
| 33 | 33 | } else |
| 34 | 34 | echo ('<img src="/images/help/empty.jpg" width="32" height="32">'); |
| 35 | 35 | echo ('</th>'); |
@@ -37,12 +37,12 @@ discard block |
||
| 37 | 37 | // ************************** |
| 38 | 38 | // ** UP |
| 39 | 39 | // ************************** |
| 40 | - $db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id)); |
|
| 40 | + $db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id)); |
|
| 41 | 41 | echo ('<th width="32">'); |
| 42 | 42 | if ($db2->nextRecord()) { |
| 43 | 43 | $up_topic_id = $db2->getInt('topic_id'); |
| 44 | 44 | $up_topic = stripslashes($db2->getField('topic')); |
| 45 | - echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>'); |
|
| 45 | + echo ('<a href="/manual.php?' . $up_topic_id . '"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>'); |
|
| 46 | 46 | } else |
| 47 | 47 | echo ('<img src="/images/help/empty.jpg" width="32" height="32">'); |
| 48 | 48 | echo ('</th>'); |
@@ -50,35 +50,35 @@ discard block |
||
| 50 | 50 | // ************************** |
| 51 | 51 | // ** NEXT |
| 52 | 52 | // ************************** |
| 53 | - $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1'); |
|
| 53 | + $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($topic_id) . ' AND order_id = 1'); |
|
| 54 | 54 | |
| 55 | 55 | if (!$db2->getNumRows()) |
| 56 | - $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1)); |
|
| 56 | + $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id + 1)); |
|
| 57 | 57 | |
| 58 | 58 | $seenParentIDs = array(0); |
| 59 | 59 | $curr_parent_topic_id = $parent_topic_id; |
| 60 | 60 | while (!$db2->getNumRows() && !in_array($curr_parent_topic_id, $seenParentIDs)) { |
| 61 | 61 | $seenParentIDs[] = $curr_parent_topic_id; |
| 62 | - $db3->query('SELECT * FROM manual WHERE topic_id = '.$db3->escapeNumber($parent_topic_id)); |
|
| 62 | + $db3->query('SELECT * FROM manual WHERE topic_id = ' . $db3->escapeNumber($parent_topic_id)); |
|
| 63 | 63 | $db3->nextRecord(); |
| 64 | 64 | $curr_order_id = $db3->getInt('order_id'); |
| 65 | 65 | $curr_parent_topic_id = $db3->getInt('parent_topic_id'); |
| 66 | 66 | |
| 67 | - $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($curr_order_id + 1)); |
|
| 67 | + $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($curr_order_id + 1)); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | echo ('<th width="32">'); |
| 71 | 71 | if ($db2->nextRecord()) { |
| 72 | 72 | $next_topic_id = $db2->getInt('topic_id'); |
| 73 | 73 | $next_topic = stripslashes($db2->getField('topic')); |
| 74 | - echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>'); |
|
| 74 | + echo ('<a href="/manual.php?' . $next_topic_id . '"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>'); |
|
| 75 | 75 | } |
| 76 | 76 | else { |
| 77 | 77 | echo ('<img src="/images/help/empty.jpg" width="32" height="32">'); |
| 78 | 78 | } |
| 79 | 79 | echo ('</th>'); |
| 80 | 80 | |
| 81 | - echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic.'</th>'); |
|
| 81 | + echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic . '</th>'); |
|
| 82 | 82 | echo ('<th width="32"><a href="/manual_toc.php"><img src="/images/help/contents.jpg" width="32" height="32" border="0"></a></th>'); |
| 83 | 83 | |
| 84 | 84 | echo ('</tr>'); |
@@ -86,11 +86,11 @@ discard block |
||
| 86 | 86 | echo ('<tr>'); |
| 87 | 87 | echo ('<td colspan="5">'); |
| 88 | 88 | if (isset($previous_topic_id) && $previous_topic_id > 0) |
| 89 | - echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a> '); |
|
| 89 | + echo ('<b>Previous:</b> <a href="/manual.php?' . $previous_topic_id . '">' . get_numbering($previous_topic_id) . $previous_topic . '</a> '); |
|
| 90 | 90 | if (isset($up_topic_id) && $up_topic_id > 0) |
| 91 | - echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a> '); |
|
| 91 | + echo ('<b>Up:</b> <a href="/manual.php?' . $up_topic_id . '">' . get_numbering($up_topic_id) . $up_topic . '</a> '); |
|
| 92 | 92 | if (isset($next_topic_id) && $next_topic_id > 0) |
| 93 | - echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>'); |
|
| 93 | + echo ('<b>Next:</b> <a href="/manual.php?' . $next_topic_id . '">' . get_numbering($next_topic_id) . $next_topic . '</a>'); |
|
| 94 | 94 | echo ('</tr>'); |
| 95 | 95 | |
| 96 | 96 | echo ('</table>'); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | $db = new SmrMySqlDatabase(); |
| 104 | 104 | |
| 105 | 105 | // get current entry |
| 106 | - $db->query('SELECT * FROM manual WHERE topic_id = '.$topic_id); |
|
| 106 | + $db->query('SELECT * FROM manual WHERE topic_id = ' . $topic_id); |
|
| 107 | 107 | if ($db->nextRecord()) { |
| 108 | 108 | $parent_topic_id = $db->getInt('parent_topic_id'); |
| 109 | 109 | $order_id = $db->getInt('order_id'); |
@@ -111,8 +111,8 @@ discard block |
||
| 111 | 111 | $text = stripslashes($db->getField('text')); |
| 112 | 112 | |
| 113 | 113 | echo ('<div id="help_content">'); |
| 114 | - echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>'); |
|
| 115 | - echo ('<p>'.$text.'<p>'); |
|
| 114 | + echo ('<h1>' . get_numbering($topic_id) . $topic . '</h1>'); |
|
| 115 | + echo ('<p>' . $text . '<p>'); |
|
| 116 | 116 | echo ('</div>'); |
| 117 | 117 | } else |
| 118 | 118 | echo ('Invalid Topic!'); |
@@ -121,9 +121,9 @@ discard block |
||
| 121 | 121 | function echo_subsection($topic_id) { |
| 122 | 122 | // database object |
| 123 | 123 | $db = new SmrMySqlDatabase(); |
| 124 | - $return=''; |
|
| 124 | + $return = ''; |
|
| 125 | 125 | // check if there are subsections |
| 126 | - $db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id'); |
|
| 126 | + $db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id'); |
|
| 127 | 127 | if ($db->getNumRows()) { |
| 128 | 128 | echo ('<hr noshade width="75%" size="1" class="center"/>'); |
| 129 | 129 | echo ('<div id="help_menu">'); |
@@ -137,19 +137,19 @@ discard block |
||
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | function echo_menu($topic_id) { |
| 140 | - $return=''; |
|
| 140 | + $return = ''; |
|
| 141 | 141 | // database object |
| 142 | 142 | $db = new SmrMySqlDatabase(); |
| 143 | 143 | |
| 144 | - $db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id'); |
|
| 144 | + $db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id'); |
|
| 145 | 145 | if ($db->getNumRows()) { |
| 146 | 146 | echo ('<ul type="disc">'); |
| 147 | - while($db->nextRecord()) { |
|
| 147 | + while ($db->nextRecord()) { |
|
| 148 | 148 | $sub_topic_id = $db->getInt('topic_id'); |
| 149 | 149 | $order_id = $db->getInt('order_id'); |
| 150 | 150 | $sub_topic = stripslashes($db->getField('topic')); |
| 151 | 151 | |
| 152 | - echo ('<li><a href="/manual.php?'.$sub_topic_id.'">' . get_numbering($sub_topic_id) . $sub_topic.'</a></li>'); |
|
| 152 | + echo ('<li><a href="/manual.php?' . $sub_topic_id . '">' . get_numbering($sub_topic_id) . $sub_topic . '</a></li>'); |
|
| 153 | 153 | echo_menu($sub_topic_id); |
| 154 | 154 | } |
| 155 | 155 | echo ('</ul>'); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | function get_numbering($topic_id) { |
| 161 | 161 | $db = new SmrMySqlDatabase(); |
| 162 | 162 | |
| 163 | - $db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id)); |
|
| 163 | + $db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id)); |
|
| 164 | 164 | if ($db->nextRecord()) { |
| 165 | 165 | $up_topic_id = $db->getInt('parent_topic_id'); |
| 166 | 166 | $order_id = $db->getInt('order_id'); |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | $game_id = $var['delete_game_id']; |
| 22 | 22 | |
| 23 | 23 | if ($save) { |
| 24 | - $db->query('SELECT * FROM alliance WHERE game_id = '.$db->escapeNumber($game_id)); |
|
| 24 | + $db->query('SELECT * FROM alliance WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 25 | 25 | |
| 26 | 26 | while ($db->nextRecord()) { |
| 27 | 27 | $id = $db->getInt('alliance_id'); |
| 28 | 28 | //we need info for forces |
| 29 | 29 | //populate alliance list |
| 30 | 30 | $db2->query('SELECT * FROM player |
| 31 | - WHERE alliance_id = '.$db2->escapeNumber($id).' |
|
| 31 | + WHERE alliance_id = '.$db2->escapeNumber($id) . ' |
|
| 32 | 32 | AND game_id = '.$db2->escapeNumber($game_id)); |
| 33 | 33 | $list = array(0); |
| 34 | 34 | while ($db2->nextRecord()) { |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | $db2->query('SELECT sum(mines) as sum_m, sum(combat_drones) as cds, sum(scout_drones) as sds |
| 38 | 38 | FROM sector_has_forces |
| 39 | - WHERE owner_id IN ('.$db2->escapeArray($list).') AND game_id = '.$db2->escapeNumber($game_id)); |
|
| 39 | + WHERE owner_id IN ('.$db2->escapeArray($list) . ') AND game_id = ' . $db2->escapeNumber($game_id)); |
|
| 40 | 40 | if ($db2->nextRecord()) { |
| 41 | 41 | |
| 42 | 42 | $mines = $db2->getInt('sum_m'); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $deaths = $db->getInt('alliance_deaths'); |
| 57 | 57 | // insert into history db |
| 58 | 58 | $history_db_sql[] = 'INSERT INTO alliance (game_id, alliance_id, leader_id, kills, deaths, alliance_name, mines, cds, sds) ' . |
| 59 | - 'VALUES ('.$db->escapeNumber($game_id).', '.$db->escapeNumber($id).', '.$db->escapeNumber($leader).', '.$db->escapeNumber($kills).', '.$db->escapeNumber($deaths).', ' . $db->escapeString($name) . ', '.$db->escapeNumber($mines).', '.$db->escapeNumber($cds).', '.$db->escapeNumber($sds).')'; |
|
| 59 | + 'VALUES (' . $db->escapeNumber($game_id) . ', ' . $db->escapeNumber($id) . ', ' . $db->escapeNumber($leader) . ', ' . $db->escapeNumber($kills) . ', ' . $db->escapeNumber($deaths) . ', ' . $db->escapeString($name) . ', ' . $db->escapeNumber($mines) . ', ' . $db->escapeNumber($cds) . ', ' . $db->escapeNumber($sds) . ')'; |
|
| 60 | 60 | |
| 61 | 61 | } |
| 62 | 62 | |
@@ -65,56 +65,56 @@ discard block |
||
| 65 | 65 | // these table is nothing worth without the players |
| 66 | 66 | //$smr_db_sql[] = 'DELETE FROM account_has_logs WHERE game_id = '.$game_id; |
| 67 | 67 | |
| 68 | - $smr_db_sql[] = 'UPDATE active_session SET game_id = 0 WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 69 | - $smr_db_sql[] = 'DELETE FROM alliance WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 70 | - $smr_db_sql[] = 'DELETE FROM alliance_bank_transactions WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 71 | - $smr_db_sql[] = 'DELETE FROM alliance_has_roles WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 72 | - $smr_db_sql[] = 'DELETE FROM alliance_thread WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 73 | - $smr_db_sql[] = 'DELETE FROM alliance_thread_topic WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 68 | + $smr_db_sql[] = 'UPDATE active_session SET game_id = 0 WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 69 | + $smr_db_sql[] = 'DELETE FROM alliance WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 70 | + $smr_db_sql[] = 'DELETE FROM alliance_bank_transactions WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 71 | + $smr_db_sql[] = 'DELETE FROM alliance_has_roles WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 72 | + $smr_db_sql[] = 'DELETE FROM alliance_thread WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 73 | + $smr_db_sql[] = 'DELETE FROM alliance_thread_topic WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 74 | 74 | |
| 75 | 75 | if ($save) { |
| 76 | 76 | |
| 77 | - $db->query('SELECT * FROM alliance_vs_alliance WHERE game_id = '.$db->escapeNumber($game_id)); |
|
| 77 | + $db->query('SELECT * FROM alliance_vs_alliance WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 78 | 78 | while ($db->nextRecord()) { |
| 79 | 79 | |
| 80 | 80 | $alliance_1 = $db->getInt('alliance_id_1'); |
| 81 | 81 | $alliance_2 = $db->getInt('alliance_id_2'); |
| 82 | 82 | $kills = $db->getInt('kills'); |
| 83 | 83 | $history_db_sql[] = 'INSERT INTO alliance_vs_alliance (game_id, alliance_id_1, alliance_id_2, kills) ' . |
| 84 | - 'VALUES ('.$game_id.', '.$alliance_1.', '.$alliance_2.', '.$kills.')'; |
|
| 84 | + 'VALUES (' . $game_id . ', ' . $alliance_1 . ', ' . $alliance_2 . ', ' . $kills . ')'; |
|
| 85 | 85 | |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | |
| 91 | - $smr_db_sql[] = 'DELETE FROM alliance_vs_alliance WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 92 | - $smr_db_sql[] = 'DELETE FROM anon_bank WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 93 | - $smr_db_sql[] = 'DELETE FROM anon_bank_transactions WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 94 | - $smr_db_sql[] = 'DELETE FROM bar_tender WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 95 | - $smr_db_sql[] = 'DELETE FROM blackjack WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 96 | - $smr_db_sql[] = 'DELETE FROM galactic_post_applications WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 97 | - $smr_db_sql[] = 'DELETE FROM galactic_post_article WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 98 | - $smr_db_sql[] = 'DELETE FROM galactic_post_paper WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 99 | - $smr_db_sql[] = 'DELETE FROM galactic_post_paper_content WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 100 | - $smr_db_sql[] = 'DELETE FROM galactic_post_writer WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 101 | - $smr_db_sql[] = 'DELETE FROM game_galaxy WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 91 | + $smr_db_sql[] = 'DELETE FROM alliance_vs_alliance WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 92 | + $smr_db_sql[] = 'DELETE FROM anon_bank WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 93 | + $smr_db_sql[] = 'DELETE FROM anon_bank_transactions WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 94 | + $smr_db_sql[] = 'DELETE FROM bar_tender WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 95 | + $smr_db_sql[] = 'DELETE FROM blackjack WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 96 | + $smr_db_sql[] = 'DELETE FROM galactic_post_applications WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 97 | + $smr_db_sql[] = 'DELETE FROM galactic_post_article WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 98 | + $smr_db_sql[] = 'DELETE FROM galactic_post_paper WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 99 | + $smr_db_sql[] = 'DELETE FROM galactic_post_paper_content WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 100 | + $smr_db_sql[] = 'DELETE FROM galactic_post_writer WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 101 | + $smr_db_sql[] = 'DELETE FROM game_galaxy WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 102 | 102 | |
| 103 | 103 | if ($save) { |
| 104 | 104 | $game = SmrGame::getGame($game_id); |
| 105 | 105 | // insert into history db |
| 106 | 106 | $history_db_sql[] = 'INSERT INTO game (game_id, end_date, start_date, game_name, speed, type) VALUES ' . |
| 107 | - '('.$db->escapeNumber($game_id).', '.$game->getEndTime().', '.$game->getStartTime().', ' . $db->escapeString($game->getGameName()) . ', '.$game->getGameSpeed().', '.$db->escapeString($game->getGameType()).')'; |
|
| 107 | + '(' . $db->escapeNumber($game_id) . ', ' . $game->getEndTime() . ', ' . $game->getStartTime() . ', ' . $db->escapeString($game->getGameName()) . ', ' . $game->getGameSpeed() . ', ' . $db->escapeString($game->getGameType()) . ')'; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - $smr_db_sql[] = 'DELETE FROM location WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 111 | - $smr_db_sql[] = 'DELETE FROM mb_exceptions WHERE value LIKE '.$db->escapeString($game_id.'%'); |
|
| 112 | - $smr_db_sql[] = 'DELETE FROM message WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 113 | - $smr_db_sql[] = 'DELETE FROM message_notify WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 110 | + $smr_db_sql[] = 'DELETE FROM location WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 111 | + $smr_db_sql[] = 'DELETE FROM mb_exceptions WHERE value LIKE ' . $db->escapeString($game_id . '%'); |
|
| 112 | + $smr_db_sql[] = 'DELETE FROM message WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 113 | + $smr_db_sql[] = 'DELETE FROM message_notify WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 114 | 114 | |
| 115 | 115 | if ($save) { |
| 116 | 116 | |
| 117 | - $db->query('SELECT * FROM news WHERE game_id = '.$game_id.' AND type = \'regular\''); |
|
| 117 | + $db->query('SELECT * FROM news WHERE game_id = ' . $game_id . ' AND type = \'regular\''); |
|
| 118 | 118 | $id = 1; |
| 119 | 119 | |
| 120 | 120 | while ($db->nextRecord()) { |
@@ -124,17 +124,17 @@ discard block |
||
| 124 | 124 | $msg = $db->getField('news_message'); |
| 125 | 125 | |
| 126 | 126 | // insert into history db |
| 127 | - $history_db_sql[] = 'INSERT INTO news (game_id, news_id, time, message) VALUES ('.$game_id.', '.$id.', '.$time.', ' . $db->escapeString($msg) . ')'; |
|
| 127 | + $history_db_sql[] = 'INSERT INTO news (game_id, news_id, time, message) VALUES (' . $game_id . ', ' . $id . ', ' . $time . ', ' . $db->escapeString($msg) . ')'; |
|
| 128 | 128 | $id++; |
| 129 | 129 | |
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - $smr_db_sql[] = 'DELETE FROM news WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 133 | + $smr_db_sql[] = 'DELETE FROM news WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 134 | 134 | |
| 135 | 135 | if ($save) { |
| 136 | 136 | |
| 137 | - $db->query('SELECT * FROM planet WHERE game_id = '.$db->escapeNumber($game_id)); |
|
| 137 | + $db->query('SELECT * FROM planet WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 138 | 138 | |
| 139 | 139 | while ($db->nextRecord()) { |
| 140 | 140 | |
@@ -142,34 +142,34 @@ discard block |
||
| 142 | 142 | $sector = $db->getInt('sector_id'); |
| 143 | 143 | $owner = $db->getInt('owner_id'); |
| 144 | 144 | |
| 145 | - $db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 1'); |
|
| 145 | + $db2->query('SELECT * FROM planet_has_building WHERE game_id = ' . $game_id . ' AND sector_id = ' . $sector . ' AND construction_id = 1'); |
|
| 146 | 146 | if ($db2->nextRecord()) $gens = $db2->getInt('amount'); |
| 147 | 147 | else $gens = 0; |
| 148 | 148 | |
| 149 | - $db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 2'); |
|
| 149 | + $db2->query('SELECT * FROM planet_has_building WHERE game_id = ' . $game_id . ' AND sector_id = ' . $sector . ' AND construction_id = 2'); |
|
| 150 | 150 | if ($db2->nextRecord()) $hangs = $db2->getInt('amount'); |
| 151 | 151 | else $hangs = 0; |
| 152 | 152 | |
| 153 | - $db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 3'); |
|
| 153 | + $db2->query('SELECT * FROM planet_has_building WHERE game_id = ' . $game_id . ' AND sector_id = ' . $sector . ' AND construction_id = 3'); |
|
| 154 | 154 | if ($db2->nextRecord()) $turs = $db2->getInt('amount'); |
| 155 | 155 | else $turs = 0; |
| 156 | 156 | |
| 157 | 157 | // insert into history db |
| 158 | 158 | $history_db_sql[] = 'INSERT INTO planet (game_id, sector_id, owner_id, generators, hangers, turrets) VALUES ' . |
| 159 | - '('.$game_id.', '.$sector.', '.$owner.', '.$gens.', '.$hangs.', '.$turs.')'; |
|
| 159 | + '(' . $game_id . ', ' . $sector . ', ' . $owner . ', ' . $gens . ', ' . $hangs . ', ' . $turs . ')'; |
|
| 160 | 160 | |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - $smr_db_sql[] = 'DELETE FROM planet WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 166 | - $smr_db_sql[] = 'DELETE FROM planet_is_building WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 167 | - $smr_db_sql[] = 'DELETE FROM planet_has_cargo WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 168 | - $smr_db_sql[] = 'DELETE FROM planet_has_building WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 165 | + $smr_db_sql[] = 'DELETE FROM planet WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 166 | + $smr_db_sql[] = 'DELETE FROM planet_is_building WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 167 | + $smr_db_sql[] = 'DELETE FROM planet_has_cargo WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 168 | + $smr_db_sql[] = 'DELETE FROM planet_has_building WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 169 | 169 | |
| 170 | 170 | if ($save) { |
| 171 | 171 | |
| 172 | - $db->query('SELECT * FROM player WHERE game_id = '.$game_id); |
|
| 172 | + $db->query('SELECT * FROM player WHERE game_id = ' . $game_id); |
|
| 173 | 173 | |
| 174 | 174 | while ($db->nextRecord()) { |
| 175 | 175 | |
@@ -187,48 +187,48 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | $amount = 0; |
| 189 | 189 | $smrCredits = 0; |
| 190 | - $db2->query('SELECT sum(amount) as bounty_am, sum(smr_credits) as bounty_cred FROM bounty WHERE game_id = '.$game_id.' AND account_id = '.$acc_id.' AND claimer_id = 0'); |
|
| 190 | + $db2->query('SELECT sum(amount) as bounty_am, sum(smr_credits) as bounty_cred FROM bounty WHERE game_id = ' . $game_id . ' AND account_id = ' . $acc_id . ' AND claimer_id = 0'); |
|
| 191 | 191 | if ($db2->nextRecord()) { |
| 192 | 192 | if (is_int($db2->getField('bounty_am'))) $amount = $db2->getInt('bounty_am'); |
| 193 | 193 | if (is_int($db2->getField('bounty_cred'))) $smrCredits = $db2->getInt('bounty_cred'); |
| 194 | 194 | |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - $db2->query('SELECT * FROM ship_has_name WHERE game_id = '.$game_id.' AND account_id = '.$acc_id); |
|
| 197 | + $db2->query('SELECT * FROM ship_has_name WHERE game_id = ' . $game_id . ' AND account_id = ' . $acc_id); |
|
| 198 | 198 | if ($db2->nextRecord()) $ship_name = $db2->getField('ship_name'); |
| 199 | 199 | else $ship_name = 'None'; |
| 200 | 200 | |
| 201 | 201 | // insert into history db |
| 202 | 202 | $history_db_sql[] = 'INSERT INTO player (account_id, game_id, player_name, player_id, experience, ship, race, alignment, alliance_id, kills, deaths, bounty, bounty_cred, ship_name) ' . |
| 203 | - 'VALUES ('.$acc_id.', '.$game_id.', ' . $db->escapeString($name) . ', '.$id.', '.$exp.', '.$ship.', '.$race.', '.$align.', '.$alli.', '.$kills.', '.$deaths.', '.$amount.','.$smrCredits.', ' . $db->escapeString($ship_name) . ')'; |
|
| 203 | + 'VALUES (' . $acc_id . ', ' . $game_id . ', ' . $db->escapeString($name) . ', ' . $id . ', ' . $exp . ', ' . $ship . ', ' . $race . ', ' . $align . ', ' . $alli . ', ' . $kills . ', ' . $deaths . ', ' . $amount . ',' . $smrCredits . ', ' . $db->escapeString($ship_name) . ')'; |
|
| 204 | 204 | |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | } |
| 208 | 208 | |
| 209 | - $smr_db_sql[] = 'DELETE FROM player WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 210 | - $smr_db_sql[] = 'DELETE FROM bounty WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 211 | - $smr_db_sql[] = 'DELETE FROM player_has_ticker WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 212 | - $smr_db_sql[] = 'DELETE FROM player_has_ticket WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 213 | - $smr_db_sql[] = 'DELETE FROM player_has_alliance_role WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 214 | - $smr_db_sql[] = 'DELETE FROM player_has_drinks WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 215 | - $smr_db_sql[] = 'DELETE FROM player_has_relation WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 216 | - $smr_db_sql[] = 'DELETE FROM player_has_unread_messages WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 217 | - $smr_db_sql[] = 'DELETE FROM player_plotted_course WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 218 | - $smr_db_sql[] = 'DELETE FROM player_read_thread WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 219 | - $smr_db_sql[] = 'DELETE FROM player_visited_port WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 220 | - $smr_db_sql[] = 'DELETE FROM player_visited_sector WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 221 | - $smr_db_sql[] = 'DELETE FROM player_votes_pact WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 222 | - $smr_db_sql[] = 'DELETE FROM player_votes_relation WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 223 | - $smr_db_sql[] = 'DELETE FROM plot_cache WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 224 | - $smr_db_sql[] = 'DELETE FROM port WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 225 | - $smr_db_sql[] = 'DELETE FROM port_has_goods WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 226 | - $smr_db_sql[] = 'DELETE FROM race_has_relation WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 227 | - $smr_db_sql[] = 'DELETE FROM race_has_voting WHERE game_id = '.$db->escapeNumber($game_id); |
|
| 209 | + $smr_db_sql[] = 'DELETE FROM player WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 210 | + $smr_db_sql[] = 'DELETE FROM bounty WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 211 | + $smr_db_sql[] = 'DELETE FROM player_has_ticker WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 212 | + $smr_db_sql[] = 'DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 213 | + $smr_db_sql[] = 'DELETE FROM player_has_alliance_role WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 214 | + $smr_db_sql[] = 'DELETE FROM player_has_drinks WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 215 | + $smr_db_sql[] = 'DELETE FROM player_has_relation WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 216 | + $smr_db_sql[] = 'DELETE FROM player_has_unread_messages WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 217 | + $smr_db_sql[] = 'DELETE FROM player_plotted_course WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 218 | + $smr_db_sql[] = 'DELETE FROM player_read_thread WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 219 | + $smr_db_sql[] = 'DELETE FROM player_visited_port WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 220 | + $smr_db_sql[] = 'DELETE FROM player_visited_sector WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 221 | + $smr_db_sql[] = 'DELETE FROM player_votes_pact WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 222 | + $smr_db_sql[] = 'DELETE FROM player_votes_relation WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 223 | + $smr_db_sql[] = 'DELETE FROM plot_cache WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 224 | + $smr_db_sql[] = 'DELETE FROM port WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 225 | + $smr_db_sql[] = 'DELETE FROM port_has_goods WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 226 | + $smr_db_sql[] = 'DELETE FROM race_has_relation WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 227 | + $smr_db_sql[] = 'DELETE FROM race_has_voting WHERE game_id = ' . $db->escapeNumber($game_id); |
|
| 228 | 228 | |
| 229 | 229 | if ($save) { |
| 230 | 230 | |
| 231 | - $db->query('SELECT * FROM sector WHERE game_id = '.$game_id); |
|
| 231 | + $db->query('SELECT * FROM sector WHERE game_id = ' . $game_id); |
|
| 232 | 232 | |
| 233 | 233 | while ($db->nextRecord()) { |
| 234 | 234 | |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | $gal_id = $db->getInt('galaxy_id'); |
| 239 | 239 | |
| 240 | 240 | $db2->query('SELECT sum(mines) as sum_mines, sum(combat_drones) as cds, sum(scout_drones) as sds FROM sector_has_forces ' . |
| 241 | - 'WHERE sector_id = '.$sector.' AND game_id = '.$game_id.' GROUP BY sector_id'); |
|
| 241 | + 'WHERE sector_id = ' . $sector . ' AND game_id = ' . $game_id . ' GROUP BY sector_id'); |
|
| 242 | 242 | if ($db2->nextRecord()) { |
| 243 | 243 | |
| 244 | 244 | $mines = $db2->getInt('sum_mines'); |
@@ -258,32 +258,32 @@ discard block |
||
| 258 | 258 | |
| 259 | 259 | // insert into history db |
| 260 | 260 | $history_db_sql[] = 'INSERT INTO sector (game_id, sector_id, gal_id, mines, kills, combat, scouts) ' . |
| 261 | - 'VALUES ('.$game_id.','. $sector.','. $gal_id.','. $mines.','. $kills.','. $cds.','. $sds.')'; |
|
| 261 | + 'VALUES (' . $game_id . ',' . $sector . ',' . $gal_id . ',' . $mines . ',' . $kills . ',' . $cds . ',' . $sds . ')'; |
|
| 262 | 262 | |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | - $smr_db_sql[] = 'DELETE FROM sector WHERE game_id = '.$game_id; |
|
| 268 | - $smr_db_sql[] = 'DELETE FROM sector_has_forces WHERE game_id = '.$game_id; |
|
| 269 | - $smr_db_sql[] = 'DELETE FROM ship_has_cargo WHERE game_id = '.$game_id; |
|
| 270 | - $smr_db_sql[] = 'DELETE FROM ship_has_hardware WHERE game_id = '.$game_id; |
|
| 271 | - $smr_db_sql[] = 'DELETE FROM ship_has_name WHERE game_id = '.$game_id; |
|
| 272 | - $smr_db_sql[] = 'DELETE FROM ship_has_illusion WHERE game_id = '.$game_id; |
|
| 273 | - $smr_db_sql[] = 'DELETE FROM ship_has_weapon WHERE game_id = '.$game_id; |
|
| 274 | - $smr_db_sql[] = 'DELETE FROM ship_is_cloaked WHERE game_id = '.$game_id; |
|
| 275 | - $smr_db_sql[] = 'UPDATE game SET end_time='.TIME.' WHERE game_id = '.$game_id.' AND end_time > '.TIME; // Do not delete game placeholder, just make sure game is finished |
|
| 276 | - $smr_db_sql[] = 'UPDATE active_session SET game_id = 0 WHERE game_id = '.$game_id; |
|
| 267 | + $smr_db_sql[] = 'DELETE FROM sector WHERE game_id = ' . $game_id; |
|
| 268 | + $smr_db_sql[] = 'DELETE FROM sector_has_forces WHERE game_id = ' . $game_id; |
|
| 269 | + $smr_db_sql[] = 'DELETE FROM ship_has_cargo WHERE game_id = ' . $game_id; |
|
| 270 | + $smr_db_sql[] = 'DELETE FROM ship_has_hardware WHERE game_id = ' . $game_id; |
|
| 271 | + $smr_db_sql[] = 'DELETE FROM ship_has_name WHERE game_id = ' . $game_id; |
|
| 272 | + $smr_db_sql[] = 'DELETE FROM ship_has_illusion WHERE game_id = ' . $game_id; |
|
| 273 | + $smr_db_sql[] = 'DELETE FROM ship_has_weapon WHERE game_id = ' . $game_id; |
|
| 274 | + $smr_db_sql[] = 'DELETE FROM ship_is_cloaked WHERE game_id = ' . $game_id; |
|
| 275 | + $smr_db_sql[] = 'UPDATE game SET end_time=' . TIME . ' WHERE game_id = ' . $game_id . ' AND end_time > ' . TIME; // Do not delete game placeholder, just make sure game is finished |
|
| 276 | + $smr_db_sql[] = 'UPDATE active_session SET game_id = 0 WHERE game_id = ' . $game_id; |
|
| 277 | 277 | |
| 278 | 278 | // now do the sql stuff |
| 279 | - foreach($smr_db_sql as $sql) { |
|
| 279 | + foreach ($smr_db_sql as $sql) { |
|
| 280 | 280 | |
| 281 | 281 | $db->query($sql); |
| 282 | 282 | |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | $db = new SmrHistoryMySqlDatabase(); |
| 286 | - foreach($history_db_sql as $sql) { |
|
| 286 | + foreach ($history_db_sql as $sql) { |
|
| 287 | 287 | |
| 288 | 288 | $db->query($sql); |
| 289 | 289 | |
@@ -1,48 +1,48 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if(is_array($TraderTeamCombatResults['Traders'])) { |
|
| 4 | - foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) { |
|
| 5 | - $ShootingPlayer =& $TraderResults['Player']; |
|
| 6 | - $TotalDamage =& $TraderResults['TotalDamage']; |
|
| 7 | - if($TraderResults['DeadBeforeShot']) { |
|
| 3 | +if (is_array($TraderTeamCombatResults['Traders'])) { |
|
| 4 | + foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) { |
|
| 5 | + $ShootingPlayer = & $TraderResults['Player']; |
|
| 6 | + $TotalDamage = & $TraderResults['TotalDamage']; |
|
| 7 | + if ($TraderResults['DeadBeforeShot']) { |
|
| 8 | 8 | echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php |
| 9 | 9 | } else { |
| 10 | - if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) { |
|
| 11 | - foreach($TraderResults['Weapons'] as $WeaponResults) { |
|
| 12 | - $ShootingWeapon =& $WeaponResults['Weapon']; |
|
| 13 | - $ShotHit =& $WeaponResults['Hit']; |
|
| 14 | - $ActualDamage =& $WeaponResults['ActualDamage']; |
|
| 15 | - $WeaponDamage =& $WeaponResults['WeaponDamage']; |
|
| 16 | - $TargetPlayer =& $WeaponResults['TargetPlayer']; |
|
| 10 | + if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) { |
|
| 11 | + foreach ($TraderResults['Weapons'] as $WeaponResults) { |
|
| 12 | + $ShootingWeapon = & $WeaponResults['Weapon']; |
|
| 13 | + $ShotHit = & $WeaponResults['Hit']; |
|
| 14 | + $ActualDamage = & $WeaponResults['ActualDamage']; |
|
| 15 | + $WeaponDamage = & $WeaponResults['WeaponDamage']; |
|
| 16 | + $TargetPlayer = & $WeaponResults['TargetPlayer']; |
|
| 17 | 17 | |
| 18 | - echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if($ShotHit && $ActualDamage['TargetAlreadyDead']){ ?> the debris that was once<?php } ?> the forces<?php |
|
| 18 | + echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at<?php if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { ?> the debris that was once<?php } ?> the forces<?php |
|
| 19 | 19 | if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) { |
| 20 | - if(!$ShotHit) { |
|
| 20 | + if (!$ShotHit) { |
|
| 21 | 21 | ?> and misses<?php |
| 22 | - } else if($ActualDamage['TotalDamage'] == 0) { |
|
| 23 | - if($WeaponDamage['Shield'] > 0) { |
|
| 24 | - ?> which proves ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } |
|
| 25 | - } else if($WeaponDamage['Armour'] > 0) { |
|
| 26 | - ?> which is deflected by the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php |
|
| 22 | + } else if ($ActualDamage['TotalDamage'] == 0) { |
|
| 23 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 24 | + ?> which proves ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } |
|
| 25 | + } else if ($WeaponDamage['Armour'] > 0) { |
|
| 26 | + ?> which is deflected by the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php |
|
| 27 | 27 | } else { |
| 28 | 28 | ?> but it cannot do any damage<?php |
| 29 | 29 | } |
| 30 | 30 | } else { |
| 31 | 31 | ?> destroying <?php |
| 32 | 32 | $DamageTypes = 0; |
| 33 | - if($ActualDamage['NumMines'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 34 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 35 | - if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 33 | + if ($ActualDamage['NumMines'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 34 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 35 | + if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 36 | 36 | |
| 37 | - if($ActualDamage['NumMines'] > 0) { |
|
| 37 | + if ($ActualDamage['NumMines'] > 0) { |
|
| 38 | 38 | ?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php |
| 39 | 39 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 40 | 40 | } |
| 41 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 41 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 42 | 42 | ?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 43 | 43 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 44 | 44 | } |
| 45 | - if($ActualDamage['NumSDs'] > 0) { |
|
| 45 | + if ($ActualDamage['NumSDs'] > 0) { |
|
| 46 | 46 | ?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php |
| 47 | 47 | } |
| 48 | 48 | } |
@@ -53,71 +53,71 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | - if(isset($TraderResults['Drones'])) { |
|
| 57 | - $Drones =& $TraderResults['Drones']; |
|
| 58 | - $ActualDamage =& $Drones['ActualDamage']; |
|
| 59 | - $WeaponDamage =& $Drones['WeaponDamage']; |
|
| 60 | - $TargetPlayer =& $Drones['TargetPlayer']; |
|
| 56 | + if (isset($TraderResults['Drones'])) { |
|
| 57 | + $Drones = & $TraderResults['Drones']; |
|
| 58 | + $ActualDamage = & $Drones['ActualDamage']; |
|
| 59 | + $WeaponDamage = & $Drones['WeaponDamage']; |
|
| 60 | + $TargetPlayer = & $Drones['TargetPlayer']; |
|
| 61 | 61 | |
| 62 | 62 | echo $ShootingPlayer->getDisplayName(); |
| 63 | - if($WeaponDamage['Launched'] == 0) { |
|
| 63 | + if ($WeaponDamage['Launched'] == 0) { |
|
| 64 | 64 | ?> fails to launch their combat drones<?php |
| 65 | 65 | } else { |
| 66 | - ?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at<?php if($ActualDamage['TargetAlreadyDead']){ ?> the debris that was once <?php } ?> the forces<?php |
|
| 67 | - if(!$ActualDamage['TargetAlreadyDead']) { |
|
| 68 | - if($ActualDamage['TotalDamage'] == 0) { |
|
| 69 | - if($WeaponDamage['Shield'] > 0) { |
|
| 70 | - ?> which prove ineffective against the <?php if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } |
|
| 71 | - } else if($WeaponDamage['Armour'] > 0) { |
|
| 66 | + ?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at<?php if ($ActualDamage['TargetAlreadyDead']) { ?> the debris that was once <?php } ?> the forces<?php |
|
| 67 | + if (!$ActualDamage['TargetAlreadyDead']) { |
|
| 68 | + if ($ActualDamage['TotalDamage'] == 0) { |
|
| 69 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 70 | + ?> which prove ineffective against the <?php if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } |
|
| 71 | + } else if ($WeaponDamage['Armour'] > 0) { |
|
| 72 | 72 | ?> which is deflected by the <?php |
| 73 | - if($ActualDamage['HasMines']){ ?>mines<?php } else if($ActualDamage['HasCDs']){ ?>combat drones<?php } else{ ?>scout drones<?php } ?> shields<?php |
|
| 73 | + if ($ActualDamage['HasMines']) { ?>mines<?php } else if ($ActualDamage['HasCDs']) { ?>combat drones<?php } else { ?>scout drones<?php } ?> shields<?php |
|
| 74 | 74 | } else { |
| 75 | 75 | ?> but they cannot do any damage<?php |
| 76 | 76 | } |
| 77 | 77 | } else { |
| 78 | 78 | $DamageTypes = 0; |
| 79 | - if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes+1; } |
|
| 80 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 81 | - if($ActualDamage['NumSDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 79 | + if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { $DamageTypes = $DamageTypes + 1; } |
|
| 80 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 81 | + if ($ActualDamage['NumSDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 82 | 82 | |
| 83 | - if($WeaponDamage['Kamikaze'] == 0) { |
|
| 83 | + if ($WeaponDamage['Kamikaze'] == 0) { |
|
| 84 | 84 | ?> destroying <?php |
| 85 | 85 | } else { |
| 86 | 86 | ?> of which <span class="cds"><?php echo $WeaponDamage['Kamikaze'] ?></span> kamikaze against <span class="red"><?php echo $WeaponDamage['Kamikaze'] ?></span> mines<?php |
| 87 | - if($DamageTypes > 0) { |
|
| 87 | + if ($DamageTypes > 0) { |
|
| 88 | 88 | ?> whilst the others destroy <?php |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | - if($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { |
|
| 91 | + if ($ActualDamage['NumMines'] > $WeaponDamage['Kamikaze']) { |
|
| 92 | 92 | ?><span class="red"><?php echo number_format($ActualDamage['NumMines']) ?></span> mines<?php |
| 93 | 93 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 94 | 94 | } |
| 95 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 95 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 96 | 96 | ?><span class="red"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 97 | 97 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 98 | 98 | } |
| 99 | - if($ActualDamage['NumSDs'] > 0) { |
|
| 99 | + if ($ActualDamage['NumSDs'] > 0) { |
|
| 100 | 100 | ?><span class="red"><?php echo number_format($ActualDamage['NumSDs']) ?></span> scout drones<?php |
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | }?>. |
| 105 | 105 | <br /> |
| 106 | - <?php if($ActualDamage['KillingShot']) { |
|
| 106 | + <?php if ($ActualDamage['KillingShot']) { |
|
| 107 | 107 | ?>Forces are <span class="red">DESTROYED!</span><br /><?php |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | echo $ShootingPlayer->getDisplayName(); |
| 112 | - if($TotalDamage > 0) { |
|
| 112 | + if ($TotalDamage > 0) { |
|
| 113 | 113 | ?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php |
| 114 | 114 | } else { |
| 115 | 115 | ?> does no damage this round.<?php |
| 116 | - if(!$TraderResults['DeadBeforeShot']) { |
|
| 116 | + if (!$TraderResults['DeadBeforeShot']) { |
|
| 117 | 117 | ?> Maybe they should go back to the academy<?php |
| 118 | 118 | } |
| 119 | 119 | } ?>.<br /><br /><?php |
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?> |
| 123 | -This fleet <?php if($TotalDamage > 0){ ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else{ ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>. |
|
| 123 | +This fleet <?php if ($TotalDamage > 0) { ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else { ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>. |
|
@@ -1,36 +1,36 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if(is_array($TraderTeamCombatResults['Traders'])) { |
|
| 3 | - foreach($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) { |
|
| 4 | - $ShootingPlayer =& $TraderResults['Player']; |
|
| 5 | - $TotalDamage =& $TraderResults['TotalDamage']; |
|
| 2 | +if (is_array($TraderTeamCombatResults['Traders'])) { |
|
| 3 | + foreach ($TraderTeamCombatResults['Traders'] as $AccountID => $TraderResults) { |
|
| 4 | + $ShootingPlayer = & $TraderResults['Player']; |
|
| 5 | + $TotalDamage = & $TraderResults['TotalDamage']; |
|
| 6 | 6 | |
| 7 | - if($TraderResults['DeadBeforeShot']) { |
|
| 7 | + if ($TraderResults['DeadBeforeShot']) { |
|
| 8 | 8 | echo $ShootingPlayer->getDisplayName() ?> died before they were able to attack!<br /><?php |
| 9 | 9 | } else { |
| 10 | - if(isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) { |
|
| 11 | - foreach($TraderResults['Weapons'] as $WeaponResults) { |
|
| 12 | - $ShootingWeapon =& $WeaponResults['Weapon']; |
|
| 13 | - $ShotHit =& $WeaponResults['Hit']; |
|
| 14 | - $ActualDamage =& $WeaponResults['ActualDamage']; |
|
| 15 | - $WeaponDamage =& $WeaponResults['WeaponDamage']; |
|
| 16 | - $TargetPlayer =& $WeaponResults['TargetPlayer']; |
|
| 10 | + if (isset($TraderResults['Weapons']) && is_array($TraderResults['Weapons'])) { |
|
| 11 | + foreach ($TraderResults['Weapons'] as $WeaponResults) { |
|
| 12 | + $ShootingWeapon = & $WeaponResults['Weapon']; |
|
| 13 | + $ShotHit = & $WeaponResults['Hit']; |
|
| 14 | + $ActualDamage = & $WeaponResults['ActualDamage']; |
|
| 15 | + $WeaponDamage = & $WeaponResults['WeaponDamage']; |
|
| 16 | + $TargetPlayer = & $WeaponResults['TargetPlayer']; |
|
| 17 | 17 | |
| 18 | 18 | echo $ShootingPlayer->getDisplayName() ?> fires their <?php echo $ShootingWeapon->getName() ?> at <?php |
| 19 | - if($ShotHit && $ActualDamage['TargetAlreadyDead']) { |
|
| 19 | + if ($ShotHit && $ActualDamage['TargetAlreadyDead']) { |
|
| 20 | 20 | ?>the debris that was once <?php |
| 21 | 21 | } |
| 22 | 22 | echo $TargetPlayer->getDisplayName(); |
| 23 | 23 | if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) { |
| 24 | - if(!$ShotHit) { |
|
| 24 | + if (!$ShotHit) { |
|
| 25 | 25 | ?> and misses<?php |
| 26 | - } else if($ActualDamage['TotalDamage'] == 0) { |
|
| 27 | - if($WeaponDamage['Shield'] > 0) { |
|
| 28 | - if($ActualDamage['HasCDs']) { |
|
| 26 | + } else if ($ActualDamage['TotalDamage'] == 0) { |
|
| 27 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 28 | + if ($ActualDamage['HasCDs']) { |
|
| 29 | 29 | ?> which proves ineffective against their combat drones<?php |
| 30 | 30 | } else { |
| 31 | 31 | ?> which washes harmlessly over their hull<?php |
| 32 | 32 | } |
| 33 | - } else if($WeaponDamage['Armour'] > 0) { |
|
| 33 | + } else if ($WeaponDamage['Armour'] > 0) { |
|
| 34 | 34 | ?> which is deflected by their shields<?php |
| 35 | 35 | } else { |
| 36 | 36 | ?> but it cannot do any damage<?php |
@@ -38,94 +38,94 @@ discard block |
||
| 38 | 38 | } else { |
| 39 | 39 | ?> destroying <?php |
| 40 | 40 | $DamageTypes = 0; |
| 41 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 42 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 43 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 41 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 42 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 43 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 44 | 44 | |
| 45 | - if($ActualDamage['Shield'] > 0) { |
|
| 45 | + if ($ActualDamage['Shield'] > 0) { |
|
| 46 | 46 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php |
| 47 | 47 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 48 | 48 | } |
| 49 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 49 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 50 | 50 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 51 | 51 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 52 | 52 | } |
| 53 | - if($ActualDamage['Armour'] > 0) { |
|
| 53 | + if ($ActualDamage['Armour'] > 0) { |
|
| 54 | 54 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | } ?>. |
| 58 | 58 | <br /><?php |
| 59 | 59 | if ($ShotHit && $ActualDamage['KillingShot']) { |
| 60 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$WeaponResults['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 60 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$WeaponResults['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer)); |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | - if(isset($TraderResults['Drones'])) { |
|
| 65 | - $Drones =& $TraderResults['Drones']; |
|
| 66 | - $ActualDamage =& $Drones['ActualDamage']; |
|
| 67 | - $WeaponDamage =& $Drones['WeaponDamage']; |
|
| 68 | - $TargetPlayer =& $Drones['TargetPlayer']; |
|
| 64 | + if (isset($TraderResults['Drones'])) { |
|
| 65 | + $Drones = & $TraderResults['Drones']; |
|
| 66 | + $ActualDamage = & $Drones['ActualDamage']; |
|
| 67 | + $WeaponDamage = & $Drones['WeaponDamage']; |
|
| 68 | + $TargetPlayer = & $Drones['TargetPlayer']; |
|
| 69 | 69 | $DamageTypes = 0; |
| 70 | - if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 71 | - if($ActualDamage['NumCDs'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 72 | - if($ActualDamage['Armour'] > 0){ $DamageTypes = $DamageTypes+1; } |
|
| 70 | + if ($ActualDamage['Shield'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 71 | + if ($ActualDamage['NumCDs'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 72 | + if ($ActualDamage['Armour'] > 0) { $DamageTypes = $DamageTypes + 1; } |
|
| 73 | 73 | |
| 74 | 74 | echo $ShootingPlayer->getDisplayName(); |
| 75 | - if($WeaponDamage['Launched'] == 0) { |
|
| 75 | + if ($WeaponDamage['Launched'] == 0) { |
|
| 76 | 76 | ?> fails to launch their combat drones<?php |
| 77 | 77 | } else { |
| 78 | 78 | ?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php |
| 79 | - if($ActualDamage['TargetAlreadyDead']) { |
|
| 79 | + if ($ActualDamage['TargetAlreadyDead']) { |
|
| 80 | 80 | ?>the debris that was once <?php |
| 81 | 81 | } |
| 82 | 82 | echo $TargetPlayer->getDisplayName(); |
| 83 | - if(!$ActualDamage['TargetAlreadyDead']) { |
|
| 84 | - if($ActualDamage['TotalDamage'] == 0) { |
|
| 85 | - if($WeaponDamage['Shield'] > 0) { |
|
| 86 | - if($ActualDamage['HasCDs']) { |
|
| 83 | + if (!$ActualDamage['TargetAlreadyDead']) { |
|
| 84 | + if ($ActualDamage['TotalDamage'] == 0) { |
|
| 85 | + if ($WeaponDamage['Shield'] > 0) { |
|
| 86 | + if ($ActualDamage['HasCDs']) { |
|
| 87 | 87 | ?> which prove ineffective against their combat drones<?php |
| 88 | 88 | } else { |
| 89 | 89 | ?> which washes harmlessly over their hull<?php |
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | - if($ActualDamage['Armour'] > 0) { |
|
| 92 | + if ($ActualDamage['Armour'] > 0) { |
|
| 93 | 93 | ?> which is deflected by their shields<?php |
| 94 | 94 | } else { |
| 95 | 95 | ?> but they cannot do any damage<?php |
| 96 | 96 | } |
| 97 | 97 | } else { |
| 98 | 98 | ?> destroying <?php |
| 99 | - if($ActualDamage['Shield'] > 0) { |
|
| 99 | + if ($ActualDamage['Shield'] > 0) { |
|
| 100 | 100 | ?><span class="shields"><?php echo number_format($ActualDamage['Shield']) ?></span> shields<?php |
| 101 | 101 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 102 | 102 | } |
| 103 | - if($ActualDamage['NumCDs'] > 0) { |
|
| 103 | + if ($ActualDamage['NumCDs'] > 0) { |
|
| 104 | 104 | ?><span class="cds"><?php echo number_format($ActualDamage['NumCDs']) ?></span> combat drones<?php |
| 105 | 105 | $this->doDamageTypeReductionDisplay($DamageTypes); |
| 106 | 106 | } |
| 107 | - if($ActualDamage['Armour'] > 0) { |
|
| 107 | + if ($ActualDamage['Armour'] > 0) { |
|
| 108 | 108 | ?><span class="red"><?php echo number_format($ActualDamage['Armour']) ?></span> plates of armour<?php |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | } ?>. |
| 113 | 113 | <br /><?php |
| 114 | - if($ActualDamage['KillingShot']) { |
|
| 115 | - $this->includeTemplate('includes/TraderCombatKillMessage.inc',array('KillResults'=>$Drones['KillResults'],'TargetPlayer'=>$TargetPlayer,'ShootingPlayer'=>$ShootingPlayer)); |
|
| 114 | + if ($ActualDamage['KillingShot']) { |
|
| 115 | + $this->includeTemplate('includes/TraderCombatKillMessage.inc', array('KillResults'=>$Drones['KillResults'], 'TargetPlayer'=>$TargetPlayer, 'ShootingPlayer'=>$ShootingPlayer)); |
|
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | echo $ShootingPlayer->getDisplayName(); |
| 120 | - if($TotalDamage > 0) { |
|
| 120 | + if ($TotalDamage > 0) { |
|
| 121 | 121 | ?> hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php |
| 122 | 122 | } else { |
| 123 | 123 | ?> does no damage this round.<?php |
| 124 | - if(!$TraderResults['DeadBeforeShot']) { |
|
| 124 | + if (!$TraderResults['DeadBeforeShot']) { |
|
| 125 | 125 | ?> Maybe they should go back to the academy<?php |
| 126 | 126 | } |
| 127 | 127 | } ?>.<br /><br /><?php |
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | $TotalDamage = $TraderTeamCombatResults['TotalDamage']; ?> |
| 131 | -This fleet <?php if($TotalDamage > 0){ ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else{ ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.<br /> |
|
| 131 | +This fleet <?php if ($TotalDamage > 0) { ?>hits for a total of <span class="red"><?php echo $TotalDamage ?></span> damage in this round of combat<?php } else { ?>does no damage this round. You call that a fleet? They need a better recruiter<?php } ?>.<br /> |
|
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 95 | 95 | return $return; |
| 96 | 96 | } |
| 97 | - $damage =& $this->getModifiedDamage(); |
|
| 97 | + $damage = & $this->getModifiedDamage(); |
|
| 98 | 98 | if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships |
| 99 | 99 | $damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER); |
| 100 | 100 | $damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER); |
@@ -131,12 +131,12 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) { |
| 134 | - $return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker); |
|
| 135 | - $return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']); |
|
| 134 | + $return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker); |
|
| 135 | + $return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']); |
|
| 136 | 136 | $return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']); |
| 137 | 137 | |
| 138 | 138 | if ($return['ActualDamage']['KillingShot']) { |
| 139 | - $return['KillResults'] =& $targetPlayer->killPlayerByForces($forces); |
|
| 139 | + $return['KillResults'] = & $targetPlayer->killPlayerByForces($forces); |
|
| 140 | 140 | } |
| 141 | 141 | return $return; |
| 142 | 142 | } |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 81 | 81 | return $return; |
| 82 | 82 | } |
| 83 | - $damage =& $this->getModifiedDamage(); |
|
| 83 | + $damage = & $this->getModifiedDamage(); |
|
| 84 | 84 | $damage['Launched'] = ICeil($this->getNumberOfSDs() * $this->getModifiedForceAccuracyAgainstPlayer($forces, $targetPlayer) / 100); |
| 85 | 85 | $damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']); |
| 86 | 86 | $damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']); |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | public function setWeaponLocations(array $orderArray) { |
| 302 | 302 | $weapons = $this->weapons; |
| 303 | 303 | foreach ($orderArray as $newOrder => $oldOrder) { |
| 304 | - $this->weapons[$newOrder] =& $weapons[$oldOrder]; |
|
| 304 | + $this->weapons[$newOrder] = & $weapons[$oldOrder]; |
|
| 305 | 305 | } |
| 306 | 306 | $this->hasChangedWeapons = true; |
| 307 | 307 | } |
@@ -901,14 +901,14 @@ discard block |
||
| 901 | 901 | } |
| 902 | 902 | $results['DeadBeforeShot'] = false; |
| 903 | 903 | foreach ($this->weapons as $orderID => $weapon) { |
| 904 | - $results['Weapons'][$orderID] =& $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]); |
|
| 904 | + $results['Weapons'][$orderID] = & $weapon->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]); |
|
| 905 | 905 | if ($results['Weapons'][$orderID]['Hit']) { |
| 906 | 906 | $results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage']; |
| 907 | 907 | } |
| 908 | 908 | } |
| 909 | 909 | if ($this->hasCDs()) { |
| 910 | 910 | $thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs()); |
| 911 | - $results['Drones'] =& $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]); |
|
| 911 | + $results['Drones'] = & $thisCDs->shootPlayer($thisPlayer, $targetPlayers[array_rand($targetPlayers)]); |
|
| 912 | 912 | $results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage']; |
| 913 | 913 | } |
| 914 | 914 | $thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLAYER)); |
@@ -926,7 +926,7 @@ discard block |
||
| 926 | 926 | } |
| 927 | 927 | $results['DeadBeforeShot'] = false; |
| 928 | 928 | foreach ($this->weapons as $orderID => $weapon) { |
| 929 | - $results['Weapons'][$orderID] =& $weapon->shootForces($thisPlayer, $forces); |
|
| 929 | + $results['Weapons'][$orderID] = & $weapon->shootForces($thisPlayer, $forces); |
|
| 930 | 930 | if ($results['Weapons'][$orderID]['Hit']) { |
| 931 | 931 | $results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage']; |
| 932 | 932 | $thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC); |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | } |
| 941 | 941 | if ($this->hasCDs()) { |
| 942 | 942 | $thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs()); |
| 943 | - $results['Drones'] =& $thisCDs->shootForces($thisPlayer, $forces); |
|
| 943 | + $results['Drones'] = & $thisCDs->shootForces($thisPlayer, $forces); |
|
| 944 | 944 | $results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage']; |
| 945 | 945 | $thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC); |
| 946 | 946 | $thisPlayer->increaseHOF($results['Drones']['ActualDamage']['Mines'], array('Combat', 'Forces', 'Mines', 'Damage Done'), HOF_PUBLIC); |
@@ -965,14 +965,14 @@ discard block |
||
| 965 | 965 | } |
| 966 | 966 | $results['DeadBeforeShot'] = false; |
| 967 | 967 | foreach ($this->weapons as $orderID => $weapon) { |
| 968 | - $results['Weapons'][$orderID] =& $weapon->shootPort($thisPlayer, $port); |
|
| 968 | + $results['Weapons'][$orderID] = & $weapon->shootPort($thisPlayer, $port); |
|
| 969 | 969 | if ($results['Weapons'][$orderID]['Hit']) { |
| 970 | 970 | $results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage']; |
| 971 | 971 | } |
| 972 | 972 | } |
| 973 | 973 | if ($this->hasCDs()) { |
| 974 | 974 | $thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs()); |
| 975 | - $results['Drones'] =& $thisCDs->shootPort($thisPlayer, $port); |
|
| 975 | + $results['Drones'] = & $thisCDs->shootPort($thisPlayer, $port); |
|
| 976 | 976 | $results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage']; |
| 977 | 977 | } |
| 978 | 978 | $thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PORT)); |
@@ -1003,14 +1003,14 @@ discard block |
||
| 1003 | 1003 | } |
| 1004 | 1004 | $results['DeadBeforeShot'] = false; |
| 1005 | 1005 | foreach ($this->weapons as $orderID => $weapon) { |
| 1006 | - $results['Weapons'][$orderID] =& $weapon->shootPlanet($thisPlayer, $planet, $delayed); |
|
| 1006 | + $results['Weapons'][$orderID] = & $weapon->shootPlanet($thisPlayer, $planet, $delayed); |
|
| 1007 | 1007 | if ($results['Weapons'][$orderID]['Hit']) { |
| 1008 | 1008 | $results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage']; |
| 1009 | 1009 | } |
| 1010 | 1010 | } |
| 1011 | 1011 | if ($this->hasCDs()) { |
| 1012 | 1012 | $thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs()); |
| 1013 | - $results['Drones'] =& $thisCDs->shootPlanet($thisPlayer, $planet, $delayed); |
|
| 1013 | + $results['Drones'] = & $thisCDs->shootPlanet($thisPlayer, $planet, $delayed); |
|
| 1014 | 1014 | $results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage']; |
| 1015 | 1015 | } |
| 1016 | 1016 | $thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLANET)); |
@@ -363,26 +363,26 @@ |
||
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | public function isNPC() { |
| 366 | - if(!isset($this->npc)) { |
|
| 367 | - $this->db->query('SELECT login FROM npc_logins WHERE login = '.$this->db->escapeString($this->getLogin()).' LIMIT 1;'); |
|
| 366 | + if (!isset($this->npc)) { |
|
| 367 | + $this->db->query('SELECT login FROM npc_logins WHERE login = ' . $this->db->escapeString($this->getLogin()) . ' LIMIT 1;'); |
|
| 368 | 368 | $this->npc = $this->db->nextRecord(); |
| 369 | 369 | } |
| 370 | 370 | return $this->npc; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | protected function getHOFData() { |
| 374 | - if(!isset($this->HOF)) { |
|
| 374 | + if (!isset($this->HOF)) { |
|
| 375 | 375 | //Get Player HOF |
| 376 | 376 | $this->db->query('SELECT type,sum(amount) as amount FROM player_hof WHERE ' . $this->SQL . ' AND game_id IN (SELECT game_id FROM game WHERE ignore_stats = \'FALSE\') GROUP BY type'); |
| 377 | 377 | $this->HOF = array(); |
| 378 | - while($this->db->nextRecord()) { |
|
| 379 | - $hof =& $this->HOF; |
|
| 380 | - $typeList = explode(':',$this->db->getField('type')); |
|
| 381 | - foreach($typeList as $type) { |
|
| 382 | - if(!isset($hof[$type])) { |
|
| 378 | + while ($this->db->nextRecord()) { |
|
| 379 | + $hof = & $this->HOF; |
|
| 380 | + $typeList = explode(':', $this->db->getField('type')); |
|
| 381 | + foreach ($typeList as $type) { |
|
| 382 | + if (!isset($hof[$type])) { |
|
| 383 | 383 | $hof[$type] = array(); |
| 384 | 384 | } |
| 385 | - $hof =& $hof[$type]; |
|
| 385 | + $hof = & $hof[$type]; |
|
| 386 | 386 | } |
| 387 | 387 | $hof = $this->db->getFloat('amount'); |
| 388 | 388 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 133 | 133 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 134 | 134 | } |
| 135 | - $damage =& $this->getModifiedDamage(); |
|
| 135 | + $damage = & $this->getModifiedDamage(); |
|
| 136 | 136 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstForces($weaponPlayer, $forces) / 100); |
| 137 | 137 | $damage['Kamikaze'] = 0; |
| 138 | 138 | if ($weaponPlayer->isCombatDronesKamikazeOnMines()) { // If kamikaze then damage is same as MINE_ARMOUR |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 157 | 157 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 158 | 158 | } |
| 159 | - $damage =& $this->getModifiedDamage(); |
|
| 159 | + $damage = & $this->getModifiedDamage(); |
|
| 160 | 160 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPort($weaponPlayer, $port) / 100); |
| 161 | 161 | $damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage']); |
| 162 | 162 | $damage['Shield'] = ICeil($damage['Launched'] * $damage['Shield']); |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | // If we can't shoot forces then just return a damageless array and don't waste resources calculated any damage mods. |
| 171 | 171 | return array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 172 | 172 | } |
| 173 | - $damage =& $this->getModifiedDamage(); |
|
| 173 | + $damage = & $this->getModifiedDamage(); |
|
| 174 | 174 | $damage['Launched'] = ICeil($this->getNumberOfCDs() * $this->getModifiedAccuracyAgainstPlanet($weaponPlayer, $planet) / 100); |
| 175 | 175 | $planetMod = self::PLANET_DAMAGE_MOD; |
| 176 | 176 | $damage['MaxDamage'] = ICeil($damage['Launched'] * $damage['MaxDamage'] * $planetMod); |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 186 | 186 | return $return; |
| 187 | 187 | } |
| 188 | - $damage =& $this->getModifiedDamage(); |
|
| 188 | + $damage = & $this->getModifiedDamage(); |
|
| 189 | 189 | if ($targetPlayer->getShip()->hasDCS()) { |
| 190 | 190 | $damage['MaxDamage'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT; |
| 191 | 191 | $damage['Shield'] *= DCS_PLAYER_DAMAGE_DECIMAL_PERCENT; |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 204 | 204 | return $return; |
| 205 | 205 | } |
| 206 | - $damage =& $this->getModifiedDamage(); |
|
| 206 | + $damage = & $this->getModifiedDamage(); |
|
| 207 | 207 | |
| 208 | 208 | if ($targetPlayer->getShip()->hasDCS()) { |
| 209 | 209 | $damage['MaxDamage'] *= DCS_FORCE_DAMAGE_DECIMAL_PERCENT; |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 224 | 224 | return $return; |
| 225 | 225 | } |
| 226 | - $damage =& $this->getModifiedDamage(); |
|
| 226 | + $damage = & $this->getModifiedDamage(); |
|
| 227 | 227 | |
| 228 | 228 | if ($targetPlayer->getShip()->hasDCS()) { |
| 229 | 229 | $damage['MaxDamage'] *= DCS_PORT_DAMAGE_DECIMAL_PERCENT; |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | $return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover()); |
| 243 | 243 | return $return; |
| 244 | 244 | } |
| 245 | - $damage =& $this->getModifiedDamage(); |
|
| 245 | + $damage = & $this->getModifiedDamage(); |
|
| 246 | 246 | |
| 247 | 247 | if ($targetPlayer->getShip()->hasDCS()) { |
| 248 | 248 | $damage['MaxDamage'] *= DCS_PLANET_DAMAGE_DECIMAL_PERCENT; |
