View GitHub Repository SuperNova

Schedule Inspection
Subscribe
Completed
Push — trunk ( 153731...fde30a )
by SuperNova.WS
04:15
created
Status
Category
Toggle Patches
includes/vars.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -1175,12 +1175,12 @@
 
 block discarded – undo
1175 1175 
     ],
1176 1176 
     // Defensive building list
1177 1177 
     'defense'            => [UNIT_DEF_TURRET_MISSILE   => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
1178 
-                             UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
1179 
-                             UNIT_DEF_TURRET_ION       => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
1178 
+                              UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
1179 
+                              UNIT_DEF_TURRET_ION       => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
1180 1180
1181 
-                             UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET,
1181 
+                              UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET,
1182 1182
1183 
-                             UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,
1183 
+                              UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,
1184 1184 
     ],
1185 1185
1186 1186 
     // Missiles list
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch 
@@ -582,9 +582,9 @@  discard block
 
 block discarded – undo
582 582 
           2 => 0.01,
583 583 
         ],
584 584 
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
585 
-          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
586 
-          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
587 
-          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
585 
+          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
586 
+          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
587 
+          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
588 588 
         ],
589 589 
       ],
590 590 
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => [
 
@@ -596,9 +596,9 @@  discard block
 
 block discarded – undo
596 596 
           2 => 0.025,
597 597 
         ],
598 598 
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
599 
-          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
600 
-          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
601 
-          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
599 
+          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
600 
+          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
601 
+          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
602 602 
         ],
603 603 
       ],
604 604 
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => [
 
@@ -643,14 +643,14 @@  discard block
 
 block discarded – undo
643 643 
     ],
644 644
645 645 
     'planet_generator' => [
646 
-      0  => [ // HomeWorld
646 
+      0  => [// HomeWorld
647 647 
         't_max_min'     => 40, // Tmax 40
648 648 
         't_max_max'     => 40,
649 649 
         't_delta_min'   => 40, // Tmin 0
650 650 
         't_delta_max'   => 40,
651 651 
         'size_min'      => $config->initial_fields,
652 652 
         'size_max'      => $config->initial_fields,
653 
-        'core_types'    => [PLANET_DENSITY_STANDARD,],
653 
+        'core_types'    => [PLANET_DENSITY_STANDARD, ],
654 654 
         'planet_images' => ['normaltemp'],
655 655 
       ],
656 656 
       1  => [
 
@@ -880,7 +880,7 @@  discard block
 
 block discarded – undo
880 880 
         ],
881 881 
         'planet_images' => ['eis'],
882 882 
       ],
883 
-      16 => [ // Random planet - stranger; -35 avg
883 
+      16 => [// Random planet - stranger; -35 avg
884 884 
         't_max_min'     => -90,
885 885 
         't_max_max'     => +40,
886 886 
         't_delta_min'   => 2,
 
@@ -900,7 +900,7 @@  discard block
 
 block discarded – undo
900 900 
           PLANET_DENSITY_METAL_PERIDOT,
901 901 
           PLANET_DENSITY_METAL_RAW,
902 902 
         ],
903 
-        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis',],
903 
+        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis', ],
904 904 
       ],
905 905 
     ],
906 906 
 
@@ -923,7 +923,7 @@  discard block
 
 block discarded – undo
923 923 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_HYDROGEN,
924 924 
         UNIT_PLANET_DENSITY_RARITY        => 30, // 1, // 40.00, // * 1/121 0,82645
925 925 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
926 
-        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,],
926 
+        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ],
927 927 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
928 928 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
929 929 
       ],
 
@@ -932,7 +932,7 @@  discard block
 
 block discarded – undo
932 932 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_METHANE,
933 933 
         UNIT_PLANET_DENSITY_RARITY        => 130, // 6, // 6.67, // * 6,0	4,95868
934 934 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
935 
-        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,],
935 
+        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ],
936 936 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
937 937 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
938 938 
       ],
 
@@ -941,7 +941,7 @@  discard block
 
 block discarded – undo
941 941 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_ICE_WATER,
942 942 
         UNIT_PLANET_DENSITY_RARITY        => 450, //20, // 2.00, // * 20,0	16,52893
943 943 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
944 
-        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,],
944 
+        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ],
945 945 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
946 946 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
947 947 
       ],
 
@@ -951,7 +951,7 @@  discard block
 
 block discarded – undo
951 951 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_RAW,
952 952 
         UNIT_PLANET_DENSITY_RARITY        => 20, // 1, // 40.00, // *1,0	0,82645
953 953 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
954 
-        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,],
954 
+        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ],
955 955 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
956 956 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
957 957 
       ],
 
@@ -960,7 +960,7 @@  discard block
 
 block discarded – undo
960 960 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_SILICATE,
961 961 
         UNIT_PLANET_DENSITY_RARITY        => 140, // 5.71, // * 7,0	5,78512
962 962 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
963 
-        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,],
963 
+        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ],
964 964 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
965 965 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
966 966 
       ],
 
@@ -969,7 +969,7 @@  discard block
 
 block discarded – undo
969 969 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_CRYSTAL_STONE,
970 970 
         UNIT_PLANET_DENSITY_RARITY        => 500, // 1.90, // * 21,0	17,35537
971 971 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
972 
-        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,],
972 
+        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ],
973 973 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
974 974 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
975 975 
       ],
 
@@ -979,7 +979,7 @@  discard block
 
 block discarded – undo
979 979 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_STANDARD,
980 980 
         UNIT_PLANET_DENSITY_RARITY        => 1000, // 1.0, // * 40,0	33,05785
981 981 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_NORMAL,
982 
-        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,],
982 
+        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ],
983 983 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
984 984 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
985 985 
       ],
 
@@ -989,7 +989,7 @@  discard block
 
 block discarded – undo
989 989 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_ORE,
990 990 
         UNIT_PLANET_DENSITY_RARITY        => 550, // 2.11, // * 19,0	15,70248
991 991 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_AVERAGE,
992 
-        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,],
992 
+        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ],
993 993 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
994 994 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
995 995 
       ],
 
@@ -998,7 +998,7 @@  discard block
 
 block discarded – undo
998 998 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_PERIDOT,
999 999 
         UNIT_PLANET_DENSITY_RARITY        => 120, // 8.00, // * 5,0	4,13223
1000 1000 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_GOOD,
1001 
-        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,],
1001 
+        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ],
1002 1002 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
1003 1003 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
1004 1004 
       ],
 
@@ -1007,7 +1007,7 @@  discard block
 
 block discarded – undo
1007 1007 
         UNIT_PLANET_DENSITY_INDEX         => PLANET_DENSITY_METAL_RAW,
1008 1008 
         UNIT_PLANET_DENSITY_RARITY        => 25, // 40.00, // * 1,0	0,82645
1009 1009 
         UNIT_PLANET_DENSITY_RICHNESS      => PLANET_DENSITY_RICHNESS_PERFECT,
1010 
-        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,],
1010 
+        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ],
1011 1011 
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
1012 1012 
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
1013 1013 
       ],
 
@@ -1184,7 +1184,7 @@  discard block
 
 block discarded – undo
1184 1184 
     ],
1185 1185
1186 1186 
     // Missiles list
1187 
-    'missile'            => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,],
1187 
+    'missile'            => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ],
1188 1188
1189 1189 
     // Combat units list
1190 1190 
     'combat'             => [
 
@@ -1233,7 +1233,7 @@  discard block
 
 block discarded – undo
1233 1233 
     // Resource list
1234 1234 
     'resources'          => [0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'],
1235 1235 
     // Resources all
1236 
-    '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,],
1236 
+    '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, ],
1237 1237 
     // Resources can be produced on planet
1238 1238 
     'resources_planet'   => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY],
1239 1239 
     // Resources can be looted from planet
 
@@ -1252,13 +1252,13 @@  discard block
 
 block discarded – undo
1252 1252 
     ],
1253 1253
1254 1254 
     // Resources that can be tradeable in market trader AND be a quest_rewards
1255 
-    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,],
1255 
+    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ],
1256 1256
1257 1257 
 //      // Ques list
1258 1258 
 //      'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH),
1259 1259
1260 
-    '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,],
1261 
-    '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,],
1260 
+    '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, ],
1261 
+    '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, ],
1262 1262
1263 1263 
     GROUP_GROUP_ID_TO_NAMES => [
1264 1264 
       UNIT_STRUCTURES   => 'structures',
 
@@ -1272,7 +1272,7 @@  discard block
 
 block discarded – undo
1272 1272 
       UNIT_PLANS        => 'plans',
1273 1273 
     ],
1274 1274
1275 
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',],
1275 
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
1276 1276
1277 1277 
   ],
1278 1278 
 ];
Please login to merge, or discard this patch.