Completed
Push — trunk ( d06df9...f48ee3 )
by SuperNova.WS
11:23
created
includes/vars.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -601,29 +601,29 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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,
Please login to merge, or discard this patch.
includes/general/general.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
   }
Please login to merge, or discard this patch.
includes/general/general_urlAndHttp.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
   );
87 87
 
88 88
   // Quick hack to support IPv6 at least on local host
89
-  if($ip['ip'] == '::1') {
89
+  if ($ip['ip'] == '::1') {
90 90
     $ip['ip'] = '127.0.0.1';
91 91
   }
92 92
 
Please login to merge, or discard this patch.
includes/includes/flt_functions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
       return $result = ATTACK_ACS_TOO_LATE;
365 365
     }
366 366
 
367
-    if(DbFleetStatic::acsIsAcsFull($acs['id'])) {
367
+    if (DbFleetStatic::acsIsAcsFull($acs['id'])) {
368 368
       return $result = ATTACK_ACS_MAX_FLEETS;
369 369
     }
370 370
   }
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 
549 549
 
550 550
   !is_array($resources) ? $resources = [] : false;
551
-  if(empty($options[P_FLEET_ATTACK_RES_LIST])) {
551
+  if (empty($options[P_FLEET_ATTACK_RES_LIST])) {
552 552
     $options[P_FLEET_ATTACK_RES_LIST] = $resources;
553 553
   }
554 554
   $can_attack = flt_can_attack($from, $to, $fleet, $mission, $options);
Please login to merge, or discard this patch.
includes/constants/constants_units.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -161,10 +161,10 @@  discard block
 block discarded – undo
161 161
 // === Artifacts
162 162
 define('UNIT_ARTIFACTS_STR', 'artifacts');
163 163
 define('UNIT_ARTIFACTS', 1000);
164
-define('ART_LHC', 1001);      // Additional moon chance
165
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
166
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
167
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
164
+define('ART_LHC', 1001); // Additional moon chance
165
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
166
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
167
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
168 168
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
169 169
 define('ART_NANO_BUILDER', 1006); // Speed up building
170 170
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -238,25 +238,25 @@  discard block
 block discarded – undo
238 238
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
239 239
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
240 240
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
241
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
242
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
243
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206);  // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
241
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
242
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
243
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206); // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
244 244
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_AMOUNT', 2207); // Медаль Лучшему Кавалеру за максимум потраченной ММ Женщине от Мужчины во время ивента 8 марта 2017 года
245 245
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_COUNT', 2208); // Медаль Лучшему Кавалеру за максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
246 246
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_AMOUNT', 2209); // Медаль Королевы Весны за максимум полученной ММ от Мужчины во время ивента 8 марта 2017 года
247 247
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_COUNT', 2210); // Медаль Королевы Весны за максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
248 248
 
249 249
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
250
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
251
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
250
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
251
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
252 252
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
253 253
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
254 254
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
255 255
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
256 256
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
257 257
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
258
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
259
-define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
258
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
259
+define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
260 260
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SIMPLE', 2311); // День Рождения СН - 2017
261 261
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_BRONZE', 2312); // День Рождения СН - 2017
262 262
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SILVER', 2313); // День Рождения СН - 2017
@@ -360,19 +360,19 @@  discard block
 block discarded – undo
360 360
 const GROUP_UNIT_OBJECTS_IN_SPACE = 790002;
361 361
 
362 362
 
363
-define('GROUP_PART',         800000); // Зарезервировано для запчастей: 800.001 - 899.999
364
- define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
365
- define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
366
- define('GROUP_PART_SHIELD',  803000); // Щиты - 1000 штук
367
- define('GROUP_PART_WEAPON',  810000); // Оружие - 10000 штук
363
+define('GROUP_PART', 800000); // Зарезервировано для запчастей: 800.001 - 899.999
364
+ define('GROUP_PART_HULL', 801000); // Корпуса - 1000 штук
365
+ define('GROUP_PART_ARMOR', 802000); // Броня - 1000 штук
366
+ define('GROUP_PART_SHIELD', 803000); // Щиты - 1000 штук
367
+ define('GROUP_PART_WEAPON', 810000); // Оружие - 10000 штук
368 368
 
369 369
 
370 370
 define('UNIT_GROUP', 'groups'); // 900.000 // Зарезервировано для груп юнитов: 900.001 - 999.999
371
-define('GROUP_UNIT_USER', 1000000);// Зарезервировано для пользовательских юнитов: 1.000.001 - 1.999.999
372
-define('GROUP_ID_RESERVED', 2000000);// Зарезервировано для прочих нужд: 2.000.000 - 1.999.999.999
371
+define('GROUP_UNIT_USER', 1000000); // Зарезервировано для пользовательских юнитов: 1.000.001 - 1.999.999
372
+define('GROUP_ID_RESERVED', 2000000); // Зарезервировано для прочих нужд: 2.000.000 - 1.999.999.999
373 373
 const UNIT_CAN_NOT_BE_BUILD = 2000001; // Юнит не может быть построен - для спецюнитов
374
-define('GROUP_PARAMS', 1000000000);// Зарезервировано для параметров: 1.000.000.001 - 1.999.999.999
375
-define('GROUP_DEVELOPERS', 2000000000);// Пространство для разработчиков: 2.000.000.001 - 2.147.483.647
374
+define('GROUP_PARAMS', 1000000000); // Зарезервировано для параметров: 1.000.000.001 - 1.999.999.999
375
+define('GROUP_DEVELOPERS', 2000000000); // Пространство для разработчиков: 2.000.000.001 - 2.147.483.647
376 376
 
377 377
 define('UNIT_PLAYER_COLONIES_CURRENT', 'COLONIES_CURRENT');
378 378
 define('UNIT_PLAYER_COLONIES_MAX', 'COLONIES_MAX');
Please login to merge, or discard this patch.
admin/admin_analyze_matter.php 1 patch
Spacing   +8 added lines, -9 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 
16 16
 $constants = get_defined_constants(true);
17 17
 $rpgConstants = array();
18
-foreach($constants['user'] as $constantName => $constantValue) {
19
-  if(substr($constantName, 0, 4) == 'RPG_') {
18
+foreach ($constants['user'] as $constantName => $constantValue) {
19
+  if (substr($constantName, 0, 4) == 'RPG_') {
20 20
     $rpgConstants[$constantValue] = $constantName;
21 21
   }
22 22
 }
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
   GROUP BY log_dark_matter_reason, IF(sign((log_dark_matter_amount)) > 0, 1, -1) ORDER BY sum(log_dark_matter_amount) DESC;"
35 35
 );
36 36
 
37
-while($row = SN::$db->db_fetch($result)) {
37
+while ($row = SN::$db->db_fetch($result)) {
38 38
   $row['CONSTANT'] = $rpgConstants[$row['REASON']];
39 39
 
40 40
   $row['DM_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['DM_AMOUNT']);
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
57 57
   GROUP BY reason, if(sign((amount)) > 0, 1, -1) ORDER BY sum(amount) DESC;"
58 58
 );
59 59
 
60
-while($row = SN::$db->db_fetch($result)) {
61
-  if(empty($spent[$row['BALANCE']])) {
60
+while ($row = SN::$db->db_fetch($result)) {
61
+  if (empty($spent[$row['BALANCE']])) {
62 62
     $spent[$row['BALANCE']] = array();
63 63
   }
64 64
 
@@ -68,16 +68,15 @@  discard block
 block discarded – undo
68 68
   $spent[$row['BALANCE']] = array_merge_recursive_numeric($spent[$row['BALANCE']], $row);
69 69
 }
70 70
 
71
-foreach($spent as &$row) {
71
+foreach ($spent as &$row) {
72 72
   @$row['TOTAL_COUNT'] = $row['MM_COUNT'] + $row['DM_COUNT'];
73 73
   @$row['TOTAL_AMOUNT'] = $row['MM_AMOUNT'] + $row['DM_AMOUNT'];
74 74
   @$row['TOTAL_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['TOTAL_AMOUNT']);
75 75
   @$row['TOTAL_COUNT_TEXT'] = HelperString::numberFloorAndFormat($row['TOTAL_COUNT']);
76 76
 }
77 77
 
78
-usort($spent, function ($a, $b) {
79
-  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 :
80
-    ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
78
+usort($spent, function($a, $b) {
79
+  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 : ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
81 80
 });
82 81
 
83 82
 
Please login to merge, or discard this patch.
admin/admin_user_activity.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
         $length          = 0;
74 74
       } else {
75 75
         $spendOnThisHour = $leftOfThisHour;
76
-        $length          -= $leftOfThisHour;
76
+        $length -= $leftOfThisHour;
77 77
       }
78 78
       $perHour[$hourStart] += $spendOnThisHour;
79 79
 
Please login to merge, or discard this patch.
classes/RequestInfo.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -120,15 +120,15 @@
 block discarded – undo
120 120
     sn_db_transaction_commit();
121 121
 
122 122
     $this->user_agent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
123
-    $this->browser_id = db_get_set_unique_id_value('security_browser', 'browser_id', ['browser_user_agent' => $this->user_agent,]);
123
+    $this->browser_id = db_get_set_unique_id_value('security_browser', 'browser_id', ['browser_user_agent' => $this->user_agent, ]);
124 124
 
125 125
     $this->page_address    = substr($_SERVER['PHP_SELF'], strlen(SN_ROOT_RELATIVE));
126
-    $this->page_address_id = db_get_set_unique_id_value('security_url', 'url_id', ['url_string' => $this->page_address,]);
126
+    $this->page_address_id = db_get_set_unique_id_value('security_url', 'url_id', ['url_string' => $this->page_address, ]);
127 127
 
128 128
     // Not a simulator - because it can have loooooong string
129 129
     if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') !== 0 && !$skip_log_query) {
130 130
       $this->queryString = !empty($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
131
-      $this->queryStringId = db_get_set_unique_id_value('security_query_strings', 'id', ['query_string' => $this->queryString,]);
131
+      $this->queryStringId = db_get_set_unique_id_value('security_query_strings', 'id', ['query_string' => $this->queryString, ]);
132 132
     }
133 133
 
134 134
     $ip                      = sec_player_ip();
Please login to merge, or discard this patch.
resources.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
   ]);
53 53
 };
54 54
 
55
-$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
55
+$ValidList['percent'] = array(0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100);
56 56
 $template = SnTemplate::gettemplate('resources', true);
57 57
 
58 58
 /** @noinspection PhpUnhandledExceptionInspection */
59 59
 $planet = SN::$gc->repoV2->getPlanet($planetrow['id']);
60
-if(!empty($transmutation_result = $planet->sn_sys_planet_core_transmute($user))) {
60
+if (!empty($transmutation_result = $planet->sn_sys_planet_core_transmute($user))) {
61 61
   $template->assign_block_vars('result', $transmutation_result);
62 62
   $planet->dbLoadRecord($planetrow['id']);
63 63
 }
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
   'ENERGY_TYPE'    => $capsObj->productionCurrentMatrix[RES_ENERGY][0],
130 130
 ));
131 131
 
132
-foreach($sn_group_factories as $unit_id)
132
+foreach ($sn_group_factories as $unit_id)
133 133
 {
134
-  if(mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
134
+  if (mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
135 135
   {
136 136
     $level_plain = mrc_get_level($user, $planetrow, $unit_id, false, true);
137 137
     $template->assign_block_vars('production', array(
Please login to merge, or discard this patch.