supernova-ws / SuperNova

includes/general/math.php

Braces +20 added lines, -19 removed lines

@@ -4,16 +4,14 @@ 
   return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
 }
 
-function sn_floor($value)
-{
+function sn_floor($value) {
   return $value >= 0 ? floor($value) : ceil($value);
 }
 
 // Эта функция выдает нормально распределенное случайное число с матожиднием $mu и стандартным отклонением $sigma
 // $strict - количество $sigma, по которым идет округление функции. Т.е. $strict = 3 означает, что диапазон значений обрезается по +-3 * $sigma
 // Используется http://ru.wikipedia.org/wiki/Преобразование_Бокса_—_Мюллера
-function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false)
-{
+function sn_rand_gauss($mu = 0, $sigma = 1, $strict = false) {
   // http://ru.wikipedia.org/wiki/Среднеквадратическое_отклонение
   // При $mu = 0 (график симметричный, цифры только для половины графика)
   // От 0 до $sigma ~ 34.1%
@@ -43,7 +41,7 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
   if($cut_extreme) {
     $range_start--;
     $range_end++;
@@ -56,8 +54,7 @@ 
   return $result;
 }
 
-function median()
-{
+function median() {
   $args = func_get_args();
 
   switch(func_num_args())
@@ -86,8 +83,7 @@ 
       if($n % 2 == 0)
       {
         $median = ($args[$h] + $args[$h-1]) / 2;
-      }
-      else
+      } else
       {
         $median = $args[$h];
       }
@@ -97,12 +93,10 @@ 
 
   return $median;
 }
-function average($arr)
-{
+function average($arr) {
   return is_array($arr) && count($arr) ? array_sum($arr) / count($arr) : 0;
 }
-function linear_calc(&$linear, $from = 0, $debug = false)
-{
+function linear_calc(&$linear, $from = 0, $debug = false) {
   for($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
@@ -111,7 +105,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if($debug) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -121,7 +117,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if($debug) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -138,11 +136,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($debug) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($debug) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
+    if($debug) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);

includes/db/db_queries.php

Braces +14 added lines, -28 removed lines

@@ -7,8 +7,7 @@ 
 require_once('db_queries_fleet.php');
 
 
-function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type)
-{
+function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return doquery(
     "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
     " FROM {{planets}} AS p
@@ -17,8 +16,7 @@ 
     " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
-function db_planet_list_search($searchtext)
-{
+function db_planet_list_search($searchtext) {
   return doquery(
     "SELECT
       p.galaxy, p.system, p.planet, p.planet_type, p.name as planet_name,
@@ -38,8 +36,7 @@ 
 
 
 
-function db_user_list_search($searchtext)
-{
+function db_user_list_search($searchtext) {
   return doquery(
     "SELECT
       pn.player_name, u.id as uid, u.username, u.ally_id, u.id_planet, u.total_points, u.total_rank,
@@ -57,8 +54,7 @@ 
   );
 }
 
-function db_buddy_list_by_user($user_id)
-{
+function db_buddy_list_by_user($user_id) {
 //  return ($user_id = intval($user_id)) ? doquery(
   return ($user_id = idval($user_id)) ? doquery(
     "SELECT
@@ -84,8 +80,7 @@ 
 
 
 
-function db_message_list_outbox_by_user_id($user_id)
-{
+function db_message_list_outbox_by_user_id($user_id) {
   // return ($user_id = intval($user_id))
   return ($user_id = idval($user_id))
     ? doquery("SELECT {{messages}}.message_id, {{messages}}.message_owner, {{users}}.id AS message_sender, {{messages}}.message_time,
@@ -101,8 +96,7 @@ 
 
 
 
-function db_unit_records_sum($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_sum($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -113,8 +107,7 @@ 
     , true);
 }
 
-function db_unit_records_plain($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_plain($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -198,25 +191,21 @@ 
 }
 
 
-function db_stat_list_update_user_stats()
-{
+function db_stat_list_update_user_stats() {
   return doquery("UPDATE {{users}} AS u JOIN {{statpoints}} AS sp ON sp.id_owner = u.id AND sp.stat_code = 1 AND sp.stat_type = 1 SET u.total_rank = sp.total_rank, u.total_points = sp.total_points WHERE user_as_ally IS NULL;");
 }
 
-function db_stat_list_update_ally_stats()
-{
+function db_stat_list_update_ally_stats() {
   return doquery("UPDATE {{alliance}} AS a JOIN {{statpoints}} AS sp ON sp.id_ally = a.id AND sp.stat_code = 1 AND sp.stat_type = 2 SET a.total_rank = sp.total_rank, a.total_points = sp.total_points;");
 }
 
-function db_stat_list_delete_ally_player()
-{
+function db_stat_list_delete_ally_player() {
   return doquery('DELETE s FROM {{statpoints}} AS s JOIN {{users}} AS u ON u.id = s.id_owner WHERE s.id_ally IS NULL AND u.user_as_ally IS NOT NULL');
 }
 
 
 
-function db_chat_player_list_online($chat_refresh_rate, $ally_add)
-{
+function db_chat_player_list_online($chat_refresh_rate, $ally_add) {
   $sql_date = SN_TIME_NOW - $chat_refresh_rate * 2;
 
   return doquery(
@@ -230,13 +219,11 @@ 
     ORDER BY authlevel DESC, `username`");
 }
 
-function db_referrals_list_by_id($user_id)
-{
+function db_referrals_list_by_id($user_id) {
   return doquery("SELECT r.*, u.username, u.register_time FROM {{referrals}} AS r LEFT JOIN {{users}} AS u ON u.id = r.id WHERE id_partner = {$user_id}");
 }
 
-function db_message_list_admin_by_type($int_type_selected, $StartRec)
-{
+function db_message_list_admin_by_type($int_type_selected, $StartRec) {
   return doquery("SELECT
   message_id as `ID`,
   message_from as `FROM`,
@@ -255,8 +242,7 @@ 
 }
 
 
-function db_message_insert_all($message_type, $from, $subject, $text)
-{
+function db_message_insert_all($message_type, $from, $subject, $text) {
   return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
     "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
 }

includes/general_pname.php

Braces +2 added lines, -4 removed lines

@@ -2,12 +2,10 @@
 
 // Эти функции будут переписаны по добавлению инфы в БД
 
-function pname_factory_production_field_name($factory_unit_id)
-{
+function pname_factory_production_field_name($factory_unit_id) {
   return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
 }
 
-function pname_resource_name($resource_id)
-{
+function pname_resource_name($resource_id) {
   return get_unit_param($resource_id, P_NAME);
 }
\ No newline at end of file

includes/functions/int_fleet_events.php

Braces +6 added lines, -12 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 
-function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false)
-{
+function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) {
   global $config, $user, $fleet_number, $lang;
 
   $fleet_events = array();
@@ -23,12 +22,10 @@ 
     if($fleet['fleet_end_planet'] > $config->game_maxPlanet)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_exploration'];
-    }
-    elseif($fleet['fleet_mission'] == MT_COLONIZE)
+    } elseif($fleet['fleet_mission'] == MT_COLONIZE)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_colonization'];
-    }
-    else
+    } else
     {
       $planet_end = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_end_galaxy'], $fleet['fleet_end_system'], $fleet['fleet_end_planet'], $planet_end_type, false, 'name');
       $fleet['fleet_end_name'] = $planet_end['name'];
@@ -80,8 +77,7 @@ 
   return $fleet_events;
 }
 
-function flt_register_fleet_event($fleet, $ov_label, $planet_end_type)
-{
+function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) {
   global $user, $planetrow, $fleet_number;
 
   switch($fleet['ov_label'] = $ov_label)
@@ -121,8 +117,7 @@ 
   if($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
-  }
-  else
+  } else
   {
     $user_data = db_user_by_id($fleet['fleet_owner']);
   }
@@ -130,8 +125,7 @@ 
   return tpl_parse_fleet_db($fleet, ++$fleet_number, $user_data);
 }
 
-function int_planet_pretemplate($planetrow, &$template)
-{
+function int_planet_pretemplate($planetrow, &$template) {
   global $lang, $user;
 
   $governor_id = $planetrow['PLANET_GOVERNOR_ID'];

includes/functions/ali_alliances.php

Braces +3 added lines, -6 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function ali_rank_list_save($ranks)
-{
+function ali_rank_list_save($ranks) {
   global $user;
 
   if(!empty($ranks))
@@ -17,8 +16,7 @@ 
   return $ranklist;
 }
 
-function ali_relations($ally_from, $ally_to = 0)
-{
+function ali_relations($ally_from, $ally_to = 0) {
   $ally_to = intval($ally_to);
   $ally_to = $ally_to ? " AND alliance_diplomacy_contr_ally_id = {$ally_to}" : '';
 
@@ -45,8 +43,7 @@ 
   return $temp_array;
 }
 
-function ali_relation($ally_from, $ally_to)
-{
+function ali_relation($ally_from, $ally_to) {
   $relation = ali_relations($ally_from, $ally_to);
   return empty($relation) ? ALLY_DIPLOMACY_NEUTRAL : $relation[$ally_to]['alliance_diplomacy_relation'];
 }

includes/functions/uni_functions.php

Braces +14 added lines, -23 removed lines

@@ -242,24 +242,24 @@ 
  * 1 - copyright 2008 By Chlorel for XNova
  *
  */
-function SetSelectedPlanet(&$user)
-{
+function SetSelectedPlanet(&$user) {
   $planet_row['id'] = $user['current_planet'];
 
   // Пытаемся переключить на новую планету
   if(($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet'])
   {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($selected_planet, $user['id'], false, 'id');
-  }
-  else
+  } else
   {
     $planet_row = DBStaticPlanet::db_planet_by_id($planet_row['id']);
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if(!isset($planet_row['id'])) {
+    // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
+  }
     // Если текущей планеты не существует - выставляем Столицу
     if(!isset($planet_row['id']))
     {
@@ -284,25 +284,21 @@ 
 }
 
 // ----------------------------------------------------------------------------------------------------------------
-function uni_render_coordinates($from, $prefix = '')
-{
+function uni_render_coordinates($from, $prefix = '') {
   return "[{$from[$prefix . 'galaxy']}:{$from[$prefix . 'system']}:{$from[$prefix . 'planet']}]";
 }
 
-function uni_render_planet($from)
-{
+function uni_render_planet($from) {
   return "{$from['name']} [{$from['galaxy']}:{$from['system']}:{$from['planet']}]";
 }
 
-function uni_render_planet_full($from, $prefix = '', $html_safe = true, $include_id = false)
-{
+function uni_render_planet_full($from, $prefix = '', $html_safe = true, $include_id = false) {
   global $lang;
 
   if(!$from['id'])
   {
     $result = $lang['sys_planet_expedition'];
-  }
-  else
+  } else
   {
     $from_planet_id = $include_id ? (
       'ID {' . ($from['id'] ? $from['id'] : ($from[$prefix . 'planet_id'] ? $from[$prefix . 'planet_id'] : 0)) . '} '
@@ -318,30 +314,25 @@ 
   return $result;
 }
 
-function uni_render_coordinates_url($from, $prefix = '', $page = 'galaxy.php')
-{
+function uni_render_coordinates_url($from, $prefix = '', $page = 'galaxy.php') {
   return $page . (strpos($page, '?') === false ? '?' : '&') . "galaxy={$from[$prefix . 'galaxy']}&system={$from[$prefix . 'system']}&planet={$from[$prefix . 'planet']}";
 }
 
-function uni_render_coordinates_href($from, $prefix = '', $mode = 0, $fleet_type = '')
-{
+function uni_render_coordinates_href($from, $prefix = '', $mode = 0, $fleet_type = '') {
   return '<a href="' . uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}") . '"' . ($fleet_type ? " {$fleet_type}" : '') . '>' . uni_render_coordinates($from, $prefix) . '</a>';
 }
 
-function uni_get_time_to_jump($moon_row)
-{
+function uni_get_time_to_jump($moon_row) {
   $jump_gate_level = mrc_get_level($user, $moon_row, STRUC_MOON_GATE);
   return $jump_gate_level ? max(0, $moon_row['last_jump_time'] + abs(60 * 60 / $jump_gate_level) - SN_TIME_NOW) : 0;
 }
 
-function uni_calculate_moon_chance($FleetDebris)
-{
+function uni_calculate_moon_chance($FleetDebris) {
   $MoonChance = $FleetDebris / 1000000;
   return ($MoonChance < 1) ? 0 : ($MoonChance>30 ? 30 : $MoonChance);
 }
 
-function uni_coordinates_valid($coordinates, $prefix = '')
-{
+function uni_coordinates_valid($coordinates, $prefix = '') {
   global $config;
 
   // array_walk($coordinates, 'intval');

includes/functions/flt_mission_missile.php

Braces +2 added lines, -4 removed lines

@@ -4,8 +4,7 @@ 
 // Open Source
 // V1
 //
-function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0')
-{
+function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0') {
   // Here we select which part of defense should take damage: structure or shield
   // $damageTo = P_SHIELD;
   // $damageTo = P_STRUCTURE;
@@ -34,8 +33,7 @@ 
     $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
     $structures[$targetedStructure][0] -= $structsDestroyed;
     $MIPDamage -= $structsDestroyed*$damageDone;
-  }
-  else
+  } else
   {
     // REALLY random attack
     $can_be_damaged = sn_get_groups('defense_active');

includes/functions/rpg_points.php

Braces +6 added lines, -12 removed lines

@@ -161,8 +161,7 @@ 
   return $rows_affected;
 }
 
-function rpg_level_up(&$user, $type, $xp_to_add = 0)
-{
+function rpg_level_up(&$user, $type, $xp_to_add = 0) {
   $q = 1.03;
 
   switch($type)
@@ -223,27 +222,22 @@ 
   }
 }
 
-function rpg_xp_for_level($level, $b1, $q)
-{
+function rpg_xp_for_level($level, $b1, $q) {
   return floor($b1 * (pow($q, $level) - 1)/($q - 1));
 }
 
-function rpg_get_miner_xp($level)
-{
+function rpg_get_miner_xp($level) {
   return rpg_xp_for_level($level, 50, 1.03);
 }
 
-function RPG_get_raider_xp($level)
-{
+function RPG_get_raider_xp($level) {
   return rpg_xp_for_level($level, 10, 1.03);
 }
 
-function rpg_get_tech_xp($level)
-{
+function rpg_get_tech_xp($level) {
   return rpg_xp_for_level($level, 50, 1.03);
 }
 
-function rpg_get_explore_xp($level)
-{
+function rpg_get_explore_xp($level) {
   return rpg_xp_for_level($level, 10, 1.05);
 }

includes/functions/eco_queue.php

Braces +1 added lines, -2 removed lines

@@ -458,8 +458,7 @@
 
     if(is_numeric($planet['id'])) {
       DBStaticPlanet::db_planet_set_by_id($planet['id'], "`que_processed` = UNIX_TIMESTAMP(NOW())");
-    }
-    elseif(is_numeric($user['id'])) {
+    } elseif(is_numeric($user['id'])) {
       db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
     }