second part of overhaul

prototypes/gravitation/gr_black_hole.lua

@@ -50,7 +50,7 @@ data:extend({
         energy_source = {
             type = "electric",
             render_no_power_icon = false,
-            buffer_capacity = "10YJ",
+            buffer_capacity = "1TJ",
             usage_priority = "primary-output",
             max_input_flow = "0W",
             --drain = "1GW"

prototypes/gravitation/gr_lab.lua

@@ -29,11 +29,11 @@ data:extend({
         type = 'lab',
         icon = sprite('item.png'),
         icon_size = 64,
-        flags = {"player-creation","placeable-neutral"},
+        flags = {"player-creation","placeable-neutral","not-rotatable"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-4,-4},{4,4}},
-        selection_box = {{-4,-4},{4,4}},
+        collision_box = {{-4,-3.5},{4,3.5}},
+        selection_box = {{-4,-3.5},{4,3.5}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
             mining_time = 1,
@@ -64,7 +64,8 @@ data:extend({
             scale = 0.6,
             line_length = 1,
             frame_count = 1,
-            animation_speed = 0.1
+            animation_speed = 0.1,
+            shift = {0,-0.2}
         },
         on_animation = {
             filename = sprite('animation.png'),
@@ -72,7 +73,8 @@ data:extend({
             scale = 0.6,
             line_length = 5,
             frame_count = 5,
-            animation_speed = 0.1
+            animation_speed = 0.1,
+            shift = {0,-0.2}
         },
         
         working_sound = { 

prototypes/gravitation/gr_materials.lua

@@ -16,7 +16,7 @@ data:extend({
         icon_size = 64,
         stack_size = 10,
         subgroup = 'gr_item_subgroup_a',
-        order = 'a-c',
+        order = 'a-c-c',
     },
     {
         name = 'gr_materials_stack_down_item',
@@ -25,7 +25,7 @@ data:extend({
         icon_size = 64,
         stack_size = 100,
         subgroup = 'gr_item_subgroup_a',
-        order = 'a-a',
+        order = 'a-c-b',
     },
     {
         name = 'gr_materials_stack_up_item',
@@ -34,7 +34,7 @@ data:extend({
         icon_size = 64,
         stack_size = 100,
         subgroup = 'gr_item_subgroup_a',
-        order = 'a-b',
+        order = 'a-c-a',
     },
     {
         name = 'gr_materials_cooked_crystal_item',
@@ -402,5 +402,50 @@ data:extend({
         order = "c-b",
         stack_size = 1
     },
+    {
+        name = 'gr_materials_circuit',
+        type = 'item',
+        icon = sprite('circuit.png'),
+        icon_size = 64,
+        stack_size = 500,
+        subgroup = 'gr_item_subgroup_a',
+        order = 'a-b',
+    },
+    {
+        name = 'gr_materials_gold_wire',
+        type = 'item',
+        icon = sprite('gold_wire.png'),
+        icon_size = 64,
+        stack_size = 200,
+        subgroup = 'gr_item_subgroup_a',
+        order = 'a-c',
+    },
+    {
+        name = 'gr_materials_pcb',
+        type = 'item',
+        icon = sprite('pcb.png'),
+        icon_size = 64,
+        stack_size = 200,
+        subgroup = 'gr_item_subgroup_a',
+        order = 'a-a',
+    },
+    {
+        name = 'gr_materials_magnet',
+        type = 'item',
+        icon = sprite('magnet.png'),
+        icon_size = 64,
+        stack_size = 200,
+        subgroup = 'gr_item_subgroup_a',
+        order = 'a-a',
+    },
+    {
+        name = 'gr_materials_plasma_cube',
+        type = 'item',
+        icon = sprite('plasma_cube.png'),
+        icon_size = 64,
+        stack_size = 200,
+        subgroup = 'gr_item_subgroup_a',
+        order = 'a-a',
+    },
 
 })

prototypes/gravitation/gr_train.lua

@@ -184,7 +184,7 @@ data:extend({
         },
         working_sound = { 
             sound = { filename ='__base__/sound/train-engine.ogg'},
-            apparent_volume = 0.5,
+            apparent_volume = 0.2,
         }, 
         vehicle_impact_sound = {
             filename = "__base__/sound/car-metal-impact-6.ogg",
@@ -351,8 +351,8 @@ data:extend({
         icon_size = 64,
         place_result = 'gr_magnet_train_pre_entity',
         stack_size = 20,
-        subgroup = 'gr_item_subgroup_b',
-        order = 'b-a',
+        subgroup = 'fu_item_subgroup_d',
+        order = 'e-a',
     },
     {
         name = 'gr_magnet_wagon_pre_item',
@@ -361,8 +361,8 @@ data:extend({
         icon_size = 64,
         place_result = 'gr_magnet_wagon_pre_entity',
         stack_size = 20,
-        subgroup = 'gr_item_subgroup_b',
-        order = 'b-b',
+        subgroup = 'fu_item_subgroup_d',
+        order = 'e-b',
     },
     {
         name = 'gr_magnet_tanker_pre_item',
@@ -371,8 +371,8 @@ data:extend({
         icon_size = 64,
         place_result = 'gr_magnet_tanker_pre_entity',
         stack_size = 20,
-        subgroup = 'gr_item_subgroup_b',
-        order = 'b-c',
+        subgroup = 'fu_item_subgroup_d',
+        order = 'e-c',
     },
     {
         name = 'gr_magnet_train_pre_entity',
@@ -399,7 +399,7 @@ data:extend({
             result = 'gr_magnet_train_pre_item',
         },
         --stats
-        max_speed = 2,
+        max_speed = 1.8,
         max_power = '40kW',
         braking_force = 1,
         friction_force = 0.00025,
@@ -409,7 +409,18 @@ data:extend({
         reversing_power_modifier = 0.5,
         weight = 10,
         --burner
-        energy_source = {type = "void"},
+        burner = {
+            fuel_categories = {
+                'nuclear',
+                'fi_basic_fuel',
+                'fi_advanced_fuel',
+                'fi_pure_fuel',
+            },
+            fuel_inventory_size = 3,
+            burnt_inventory_size = 3,
+            effectivity = 0.001,
+            emissions_per_minute = 10,
+        },
         --light
         front_light = {
             {
@@ -515,7 +526,7 @@ data:extend({
         },
         working_sound = { 
             sound = { filename ='__base__/sound/train-engine.ogg'},
-            apparent_volume = 0.5,
+            apparent_volume = 0.2,
         }, 
         vehicle_impact_sound = {
             filename = "__base__/sound/car-metal-impact-6.ogg",

prototypes/gravitation/gr_white_hole.lua

@@ -39,8 +39,7 @@ data:extend({
         crafting_speed = 1,
         energy_source = {
             type = "electric",
-            usage_priority = "secondary-input",
-            drain = "1TW"
+            usage_priority = "secondary-input"
         },
         energy_usage = "1TW",
         animation =  {