@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $this->sql_index_field = "{$table_name}_name"; |
41 | 41 | $this->sql_value_field = "{$table_name}_value"; |
42 | 42 | |
43 | - if(!$this->_DB_LOADED) { |
|
43 | + if (!$this->_DB_LOADED) { |
|
44 | 44 | $this->db_loadAll(); |
45 | 45 | } |
46 | 46 | } |
@@ -60,10 +60,10 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public function db_loadItem($index) { |
62 | 62 | $result = null; |
63 | - if($index) { |
|
63 | + if ($index) { |
|
64 | 64 | $index_safe = db_escape($index); |
65 | 65 | $queryResult = doquery("SELECT `{$this->sql_value_field}` FROM `{{{$this->table_name}}}` WHERE `{$this->sql_index_field}` = '{$index_safe}' FOR UPDATE", true); |
66 | - if(is_array($queryResult) && !empty($queryResult)) { |
|
66 | + if (is_array($queryResult) && !empty($queryResult)) { |
|
67 | 67 | $this->$index = $result = $queryResult[$this->sql_value_field]; |
68 | 68 | } |
69 | 69 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $this->loadDefaults(); |
76 | 76 | |
77 | 77 | $query = doquery("SELECT * FROM {{{$this->table_name}}} FOR UPDATE;"); |
78 | - while($row = db_fetch($query)) { |
|
78 | + while ($row = db_fetch($query)) { |
|
79 | 79 | $this[$row[$this->sql_index_field]] = $row[$this->sql_value_field]; |
80 | 80 | } |
81 | 81 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | } |
84 | 84 | |
85 | 85 | public function loadDefaults() { |
86 | - foreach($this->defaults as $defName => $defValue) { |
|
86 | + foreach ($this->defaults as $defName => $defValue) { |
|
87 | 87 | $this->$defName = $defValue; |
88 | 88 | } |
89 | 89 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } |
94 | 94 | |
95 | 95 | public function db_saveItem($item_list, $value = NULL) { |
96 | - if(empty($item_list)) { |
|
96 | + if (empty($item_list)) { |
|
97 | 97 | return; |
98 | 98 | } |
99 | 99 | |
@@ -101,8 +101,8 @@ discard block |
||
101 | 101 | |
102 | 102 | // Сначала записываем данные в базу - что бы поймать все блокировки |
103 | 103 | $qry = array(); |
104 | - foreach($item_list as $item_name => $item_value) { |
|
105 | - if($item_name) { |
|
104 | + foreach ($item_list as $item_name => $item_value) { |
|
105 | + if ($item_name) { |
|
106 | 106 | $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value); |
107 | 107 | $item_name = db_escape($item_name); |
108 | 108 | $qry[] = "('{$item_name}', '{$item_value}')"; |
@@ -111,8 +111,8 @@ discard block |
||
111 | 111 | doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";"); |
112 | 112 | |
113 | 113 | // И только после взятия блокировок - меняем значения в кэше |
114 | - foreach($item_list as $item_name => $item_value) { |
|
115 | - if($item_name && $item_value !== null) { |
|
114 | + foreach ($item_list as $item_name => $item_value) { |
|
115 | + if ($item_name && $item_value !== null) { |
|
116 | 116 | $this->__set($item_name, $item_value); |
117 | 117 | } |
118 | 118 | } |
@@ -140,14 +140,14 @@ discard block |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | public function __get($name) { |
143 | - if($this->force) { |
|
143 | + if ($this->force) { |
|
144 | 144 | $this->force = false; |
145 | 145 | $value = $this->db_loadItem($name); |
146 | 146 | } else { |
147 | 147 | $value = parent::__get($name); |
148 | 148 | } |
149 | 149 | |
150 | - if(isset($this->notEmptyFields[$name]) && empty($value) && isset($this->defaults[$name])) { |
|
150 | + if (isset($this->notEmptyFields[$name]) && empty($value) && isset($this->defaults[$name])) { |
|
151 | 151 | $value = $this->defaults[$name]; |
152 | 152 | } |
153 | 153 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | public function __set($name, $value) { |
158 | - if($this->force) { |
|
158 | + if ($this->force) { |
|
159 | 159 | $this->force = false; |
160 | 160 | $this->db_saveItem($name, $value); |
161 | 161 | } |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | |
225 | 225 | set_error_handler([$this, 'handlerQueryWarning']); |
226 | 226 | $sqlquery = $this->db_sql_query($sql); |
227 | - if(!$sqlquery) { |
|
227 | + if (!$sqlquery) { |
|
228 | 228 | $debug->error(db_error() . "<br />$sql<br />", 'SQL Error'); |
229 | 229 | } |
230 | 230 | restore_error_handler(); |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | $q1 = $this->db_sql_query("SHOW INDEX FROM {$prefixedTableName_safe};"); |
397 | 397 | while ($r1 = db_fetch($q1)) { |
398 | 398 | $indexName = $r1['Key_name']; |
399 | - if(empty($result[$indexName])) { |
|
399 | + if (empty($result[$indexName])) { |
|
400 | 400 | $result[$indexName] = new DbIndexDescription(); |
401 | 401 | } |
402 | 402 | $result[$indexName]->addField($r1); |
@@ -65,7 +65,7 @@ |
||
65 | 65 | |
66 | 66 | protected function sort() { |
67 | 67 | if (!$this->sorted) { |
68 | - asort($this->fields, function (DbIndexField $a, DbIndexField $b) { |
|
68 | + asort($this->fields, function(DbIndexField $a, DbIndexField $b) { |
|
69 | 69 | return $a->Seq_in_index - $b->Seq_in_index; |
70 | 70 | }); |
71 | 71 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $this->Collation = isset($indexField['Collation']) ? $indexField['Collation'] : null; |
28 | 28 | $this->Cardinality = isset($indexField['Cardinality']) ? $indexField['Cardinality'] : null; |
29 | 29 | $this->Sub_part = isset($indexField['Sub_part']) ? $indexField['Sub_part'] : null; |
30 | - $this->Null = isset($indexField['Null']) ? $indexField['Null'] : null; |
|
30 | + $this->null = isset($indexField['Null']) ? $indexField['Null'] : null; |
|
31 | 31 | $this->Expression = isset($indexField['Expression']) ? $indexField['Expression'] : null; |
32 | 32 | |
33 | 33 | return $this; |
@@ -153,7 +153,7 @@ |
||
153 | 153 | |
154 | 154 | |
155 | 155 | // If this field is not null and default value is not set - then this field is mandatory |
156 | - if ($fieldDescription->Null === 'NO' && $fieldDescription->Default === null && !$nonMandatory) { |
|
156 | + if ($fieldDescription->null === 'NO' && $fieldDescription->Default === null && !$nonMandatory) { |
|
157 | 157 | $this->mandatory = true; |
158 | 158 | } |
159 | 159 |
@@ -6,14 +6,14 @@ |
||
6 | 6 | |
7 | 7 | global $sn_page_name, $sn_mvc, $template, $template_result; |
8 | 8 | |
9 | -if(isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) { |
|
9 | +if (isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) { |
|
10 | 10 | require_once('common.' . substr(strrchr(__FILE__, '.'), 1)); |
11 | - if($sn_page_name) { |
|
11 | + if ($sn_page_name) { |
|
12 | 12 | // Loading page-specific language files |
13 | 13 | |
14 | 14 | !empty($sn_mvc['model'][$sn_page_name]) and execute_hooks($sn_mvc['model'][$sn_page_name], $template, 'model', $sn_page_name); |
15 | 15 | !empty($sn_mvc['view'][$sn_page_name]) and execute_hooks($sn_mvc['view'][$sn_page_name], $template, 'view', $sn_page_name); |
16 | - if(!empty($template_result) && is_object($template)) { |
|
16 | + if (!empty($template_result) && is_object($template)) { |
|
17 | 17 | $template->assign_recursive($template_result); |
18 | 18 | } |
19 | 19 |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | * @copyright 2008-2015 Gorlum for Project "SuperNova.WS" |
6 | 6 | */ |
7 | 7 | |
8 | -if(!defined('INSIDE')) { |
|
8 | +if (!defined('INSIDE')) { |
|
9 | 9 | die(); |
10 | 10 | } |
11 | 11 | |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | function db_change_units_perform($query, $tablename, $object_id) { |
15 | 15 | $query = implode(',', $query); |
16 | - if($query && $object_id) { |
|
16 | + if ($query && $object_id) { |
|
17 | 17 | return SN::db_upd_record_by_id($tablename == 'users' ? LOC_USER : LOC_PLANET, $object_id, $query); |
18 | 18 | } |
19 | 19 | } |
@@ -29,15 +29,15 @@ discard block |
||
29 | 29 | |
30 | 30 | $group = sn_get_groups('resources_loot'); |
31 | 31 | |
32 | - foreach($unit_list as $unit_id => $unit_amount) { |
|
33 | - if(!in_array($unit_id, $group)) { |
|
32 | + foreach ($unit_list as $unit_id => $unit_amount) { |
|
33 | + if (!in_array($unit_id, $group)) { |
|
34 | 34 | // TODO - remove later |
35 | 35 | print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_units() вызван для не-ресурсов!</h1>'); |
36 | 36 | pdump(debug_backtrace()); |
37 | 37 | die('db_change_units() вызван для не-ресурсов!'); |
38 | 38 | } |
39 | 39 | |
40 | - if(!$unit_amount) { |
|
40 | + if (!$unit_amount) { |
|
41 | 41 | continue; |
42 | 42 | } |
43 | 43 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $unit_location = sys_get_unit_location($user, $planet, $unit_id); |
47 | 47 | |
48 | 48 | // Changing value in object |
49 | - switch($unit_location) { |
|
49 | + switch ($unit_location) { |
|
50 | 50 | case LOC_USER: |
51 | 51 | $user[$unit_db_name] += $unit_amount; |
52 | 52 | break; |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * @deprecated |
110 | 110 | */ |
111 | 111 | function doquery($query, $table = '', $fetch = false, $skip_query_check = false) { |
112 | - if(is_bool($table) || !is_string($table)) { |
|
112 | + if (is_bool($table) || !is_string($table)) { |
|
113 | 113 | $fetch = $table; |
114 | 114 | } |
115 | 115 | return SN::$db->doquery($query, $fetch, $skip_query_check); |
@@ -1190,12 +1190,12 @@ |
||
1190 | 1190 | ], |
1191 | 1191 | // Defensive building list |
1192 | 1192 | UNIT_DEFENCE_STR => [UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL, |
1193 | - UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS, |
|
1194 | - UNIT_DEF_TURRET_ION => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA, |
|
1193 | + UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS, |
|
1194 | + UNIT_DEF_TURRET_ION => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA, |
|
1195 | 1195 | |
1196 | - UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET, |
|
1196 | + UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET, |
|
1197 | 1197 | |
1198 | - UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, |
|
1198 | + UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, |
|
1199 | 1199 | ], |
1200 | 1200 | |
1201 | 1201 | // Missiles list |
@@ -601,29 +601,29 @@ discard block |
||
601 | 601 | P_MISSION_EXPEDITION_OUTCOME => FLT_EXPEDITION_OUTCOME_FOUND_FLEET, |
602 | 602 | P_MISSION_EXPEDITION_OUTCOME_TYPE => FLT_EXPEDITION_OUTCOME_TYPE_GOOD, |
603 | 603 | P_CHANCE => 200, |
604 | - 'percent' => [0 => 0.1, 1 => 0.02, 2 => 0.01,], |
|
604 | + 'percent' => [0 => 0.1, 1 => 0.02, 2 => 0.01, ], |
|
605 | 605 | P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [ |
606 | - [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,], |
|
607 | - [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,], |
|
608 | - [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,], |
|
606 | + [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ], |
|
607 | + [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ], |
|
608 | + [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ], |
|
609 | 609 | ], |
610 | 610 | ], |
611 | 611 | FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => [ |
612 | 612 | P_MISSION_EXPEDITION_OUTCOME => FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES, |
613 | 613 | P_MISSION_EXPEDITION_OUTCOME_TYPE => FLT_EXPEDITION_OUTCOME_TYPE_GOOD, |
614 | 614 | P_CHANCE => 300, |
615 | - 'percent' => [0 => 0.1, 1 => 0.050, 2 => 0.025,], |
|
615 | + 'percent' => [0 => 0.1, 1 => 0.050, 2 => 0.025, ], |
|
616 | 616 | P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [ |
617 | - [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,], |
|
618 | - [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,], |
|
619 | - [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,], |
|
617 | + [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ], |
|
618 | + [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ], |
|
619 | + [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ], |
|
620 | 620 | ], |
621 | 621 | ], |
622 | 622 | FLT_EXPEDITION_OUTCOME_FOUND_DM => [ |
623 | 623 | P_MISSION_EXPEDITION_OUTCOME => FLT_EXPEDITION_OUTCOME_FOUND_DM, |
624 | 624 | P_MISSION_EXPEDITION_OUTCOME_TYPE => FLT_EXPEDITION_OUTCOME_TYPE_GOOD, |
625 | 625 | P_CHANCE => 100, |
626 | - 'percent' => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010,], |
|
626 | + 'percent' => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010, ], |
|
627 | 627 | P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [ |
628 | 628 | [P_CHANCE => 90, P_MULTIPLIER => 0.0010, /*P_MESSAGE_ID => 2,*/], |
629 | 629 | [P_CHANCE => 9, P_MULTIPLIER => 0.0040, /*P_MESSAGE_ID => 1,*/], |
@@ -658,14 +658,14 @@ discard block |
||
658 | 658 | ], |
659 | 659 | |
660 | 660 | 'planet_generator' => [ |
661 | - 0 => [ // HomeWorld |
|
661 | + 0 => [// HomeWorld |
|
662 | 662 | 't_max_min' => 40, // Tmax 40 |
663 | 663 | 't_max_max' => 40, |
664 | 664 | 't_delta_min' => 40, // Tmin 0 |
665 | 665 | 't_delta_max' => 40, |
666 | 666 | 'size_min' => $config->initial_fields, |
667 | 667 | 'size_max' => $config->initial_fields, |
668 | - 'core_types' => [PLANET_DENSITY_STANDARD,], |
|
668 | + 'core_types' => [PLANET_DENSITY_STANDARD, ], |
|
669 | 669 | 'planet_images' => ['normaltemp'], |
670 | 670 | ], |
671 | 671 | 1 => [ |
@@ -895,7 +895,7 @@ discard block |
||
895 | 895 | ], |
896 | 896 | 'planet_images' => ['eis'], |
897 | 897 | ], |
898 | - 16 => [ // Random planet - stranger; -35 avg |
|
898 | + 16 => [// Random planet - stranger; -35 avg |
|
899 | 899 | 't_max_min' => -90, |
900 | 900 | 't_max_max' => +40, |
901 | 901 | 't_delta_min' => 2, |
@@ -915,7 +915,7 @@ discard block |
||
915 | 915 | PLANET_DENSITY_METAL_PERIDOT, |
916 | 916 | PLANET_DENSITY_METAL_RAW, |
917 | 917 | ], |
918 | - 'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis',], |
|
918 | + 'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis', ], |
|
919 | 919 | ], |
920 | 920 | ], |
921 | 921 | |
@@ -938,7 +938,7 @@ discard block |
||
938 | 938 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_HYDROGEN, |
939 | 939 | UNIT_PLANET_DENSITY_RARITY => 30, // 1, // 40.00, // * 1/121 0,82645 |
940 | 940 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT, |
941 | - UNIT_RESOURCES => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,], |
|
941 | + UNIT_RESOURCES => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ], |
|
942 | 942 | UNIT_PLANET_DENSITY_MAX_SECTORS => 150, |
943 | 943 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11, |
944 | 944 | ], |
@@ -947,7 +947,7 @@ discard block |
||
947 | 947 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_METHANE, |
948 | 948 | UNIT_PLANET_DENSITY_RARITY => 130, // 6, // 6.67, // * 6,0 4,95868 |
949 | 949 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD, |
950 | - UNIT_RESOURCES => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,], |
|
950 | + UNIT_RESOURCES => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ], |
|
951 | 951 | UNIT_PLANET_DENSITY_MAX_SECTORS => 200, |
952 | 952 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6, |
953 | 953 | ], |
@@ -956,7 +956,7 @@ discard block |
||
956 | 956 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_WATER, |
957 | 957 | UNIT_PLANET_DENSITY_RARITY => 450, //20, // 2.00, // * 20,0 16,52893 |
958 | 958 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE, |
959 | - UNIT_RESOURCES => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,], |
|
959 | + UNIT_RESOURCES => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ], |
|
960 | 960 | UNIT_PLANET_DENSITY_MAX_SECTORS => 999, |
961 | 961 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0, |
962 | 962 | ], |
@@ -966,7 +966,7 @@ discard block |
||
966 | 966 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_RAW, |
967 | 967 | UNIT_PLANET_DENSITY_RARITY => 20, // 1, // 40.00, // *1,0 0,82645 |
968 | 968 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT, |
969 | - UNIT_RESOURCES => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,], |
|
969 | + UNIT_RESOURCES => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ], |
|
970 | 970 | UNIT_PLANET_DENSITY_MAX_SECTORS => 150, |
971 | 971 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11, |
972 | 972 | ], |
@@ -975,7 +975,7 @@ discard block |
||
975 | 975 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_SILICATE, |
976 | 976 | UNIT_PLANET_DENSITY_RARITY => 140, // 5.71, // * 7,0 5,78512 |
977 | 977 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD, |
978 | - UNIT_RESOURCES => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,], |
|
978 | + UNIT_RESOURCES => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ], |
|
979 | 979 | UNIT_PLANET_DENSITY_MAX_SECTORS => 200, |
980 | 980 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6, |
981 | 981 | ], |
@@ -984,7 +984,7 @@ discard block |
||
984 | 984 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_STONE, |
985 | 985 | UNIT_PLANET_DENSITY_RARITY => 500, // 1.90, // * 21,0 17,35537 |
986 | 986 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE, |
987 | - UNIT_RESOURCES => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,], |
|
987 | + UNIT_RESOURCES => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ], |
|
988 | 988 | UNIT_PLANET_DENSITY_MAX_SECTORS => 999, |
989 | 989 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0, |
990 | 990 | ], |
@@ -994,7 +994,7 @@ discard block |
||
994 | 994 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_STANDARD, |
995 | 995 | UNIT_PLANET_DENSITY_RARITY => 1000, // 1.0, // * 40,0 33,05785 |
996 | 996 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_NORMAL, |
997 | - UNIT_RESOURCES => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,], |
|
997 | + UNIT_RESOURCES => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ], |
|
998 | 998 | UNIT_PLANET_DENSITY_MAX_SECTORS => 999, |
999 | 999 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0, |
1000 | 1000 | ], |
@@ -1004,7 +1004,7 @@ discard block |
||
1004 | 1004 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_ORE, |
1005 | 1005 | UNIT_PLANET_DENSITY_RARITY => 550, // 2.11, // * 19,0 15,70248 |
1006 | 1006 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE, |
1007 | - UNIT_RESOURCES => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,], |
|
1007 | + UNIT_RESOURCES => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ], |
|
1008 | 1008 | UNIT_PLANET_DENSITY_MAX_SECTORS => 999, |
1009 | 1009 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0, |
1010 | 1010 | ], |
@@ -1013,7 +1013,7 @@ discard block |
||
1013 | 1013 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_PERIDOT, |
1014 | 1014 | UNIT_PLANET_DENSITY_RARITY => 120, // 8.00, // * 5,0 4,13223 |
1015 | 1015 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD, |
1016 | - UNIT_RESOURCES => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,], |
|
1016 | + UNIT_RESOURCES => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ], |
|
1017 | 1017 | UNIT_PLANET_DENSITY_MAX_SECTORS => 200, |
1018 | 1018 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6, |
1019 | 1019 | ], |
@@ -1022,7 +1022,7 @@ discard block |
||
1022 | 1022 | UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_RAW, |
1023 | 1023 | UNIT_PLANET_DENSITY_RARITY => 25, // 40.00, // * 1,0 0,82645 |
1024 | 1024 | UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT, |
1025 | - UNIT_RESOURCES => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,], |
|
1025 | + UNIT_RESOURCES => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ], |
|
1026 | 1026 | UNIT_PLANET_DENSITY_MAX_SECTORS => 150, |
1027 | 1027 | UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11, |
1028 | 1028 | ], |
@@ -1199,7 +1199,7 @@ discard block |
||
1199 | 1199 | ], |
1200 | 1200 | |
1201 | 1201 | // Missiles list |
1202 | - UNIT_DEF_MISSILES_STR => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,], |
|
1202 | + UNIT_DEF_MISSILES_STR => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ], |
|
1203 | 1203 | |
1204 | 1204 | // Combat units list |
1205 | 1205 | 'combat' => [ |
@@ -1248,7 +1248,7 @@ discard block |
||
1248 | 1248 | // Resource list |
1249 | 1249 | UNIT_RESOURCES_STR => [0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'], |
1250 | 1250 | // Resources all |
1251 | - 'resources_all' => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER,], |
|
1251 | + 'resources_all' => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER, ], |
|
1252 | 1252 | // Resources can be produced on planet |
1253 | 1253 | 'resources_planet' => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY], |
1254 | 1254 | // Resources can be looted from planet |
@@ -1267,13 +1267,13 @@ discard block |
||
1267 | 1267 | ], |
1268 | 1268 | |
1269 | 1269 | // Resources that can be tradeable in market trader AND be a quest_rewards |
1270 | - 'quest_rewards' => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,], |
|
1270 | + 'quest_rewards' => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ], |
|
1271 | 1271 | |
1272 | 1272 | // // Ques list |
1273 | 1273 | // 'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH), |
1274 | 1274 | |
1275 | - 'STAT_COMMON' => [STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE,], |
|
1276 | - 'STAT_PLAYER' => [STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID,], |
|
1275 | + 'STAT_COMMON' => [STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE, ], |
|
1276 | + 'STAT_PLAYER' => [STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID, ], |
|
1277 | 1277 | |
1278 | 1278 | GROUP_GROUP_ID_TO_NAMES => [ |
1279 | 1279 | UNIT_STRUCTURES => 'structures', |
@@ -1287,7 +1287,7 @@ discard block |
||
1287 | 1287 | UNIT_PLANS => 'plans', |
1288 | 1288 | ], |
1289 | 1289 | |
1290 | - GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',], |
|
1290 | + GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ], |
|
1291 | 1291 | |
1292 | 1292 | GROUP_UNIT_COMBAT_SORT_ORDER => [ |
1293 | 1293 | SHIP_SPY, |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | } |
122 | 122 | } |
123 | 123 | |
124 | - if($prepend) { |
|
124 | + if ($prepend) { |
|
125 | 125 | array_unshift($functions[$function_name], $function_data); |
126 | 126 | } else { |
127 | 127 | $functions[$function_name][] = $function_data; |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | $time_left = min(floor($time_left / PERIOD_DAY), $term_original); |
333 | 333 | $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0; |
334 | 334 | |
335 | - array_walk_recursive($result, function (&$value) use ($cost_left) { |
|
335 | + array_walk_recursive($result, function(&$value) use ($cost_left) { |
|
336 | 336 | $value -= $cost_left; |
337 | 337 | }); |
338 | 338 | } |