Update for .16

Former-commit-id: 7ee1ded
Former-commit-id: 4b30602fdb980d5f49a0d8134b355a438c2fc49d

data.lua

@@ -1,10 +1,15 @@
 require("prototypes.item-groups")
+require("prototypes.recipe-categories")
 
+--Technology
 require("prototypes.technologies.storage-tanks")
 require("prototypes.technologies.asphalt")
 require("prototypes.technologies.burner")
 require("prototypes.technologies.warehouses")
 
+--Pipes
+require("prototypes.pipes.niobium-pipes")
+
 --Tiles
 require ("prototypes.tiles.py-asphalt")
 require ("prototypes.tiles.py-limestone")
@@ -29,10 +34,15 @@ require("prototypes.buildings.fluid-tanks.tanks-7000")
 require("prototypes.buildings.fluid-tanks.tanks-6500")
 require("prototypes.buildings.fluid-tanks.tanks-8000")
 
+require("prototypes.buildings.valves.check-valve")
+require("prototypes.buildings.valves.overflow-valve")
+require("prototypes.buildings.valves.underflow-valve")
+
+--Other
 require("prototypes.buildings.accumulator-mk01")
 require("prototypes.buildings.radar")
+
+--Voiding
 require("prototypes.buildings.burner")
 require("prototypes.buildings.sinkhole")
 require("prototypes.buildings.gas-vent")
-
-require("prototypes.pipes.niobium-pipes")

graphics/entity/py-tank-7000/hr-north.png.REMOVED.git-id

@@ -0,0 +1 @@
+207af28723b30f817711e2e3894cddaa4bc47470

graphics/entity/py-tank-7000/hr-west.png.REMOVED.git-id

@@ -0,0 +1 @@
+6e760f4c1b90a6174b9ccd9b6f5b7888fe28c903

info.json

@@ -1,7 +1,7 @@
 {
   "name": "pyindustry",
-  "version": "1.0.1",
-  "factorio_version": "0.15",
+  "version": "1.0.2",
+  "factorio_version": "0.16",
   "title": "Pyanodons Industry",
   "author": "Pyanodon, Nexela",
   "contact": "",

locale/en/en.cfg

@@ -19,6 +19,10 @@ py-tank-6500=Tank 6500L
 py-tank-7000=Tank 7000L
 py-tank-8000=Tank 8000L
 
+py-check-valve=Check Valve
+py-overflow-valve=Overflow Valve
+py-underflow-valve=Underflow Valve
+
 niobium-pipe=Niobum pipe
 niobium-pipe-to-ground=Niobum underground pipe
 
@@ -59,6 +63,10 @@ py-tank-4000=Medium capacity tank.
 py-tank-5000=Medium capacity tank.
 py-tank-6500=Good capacity tank.
 
+py-check-valve=Allows flow only in direction of arrow.
+py-overflow-valve=Allows flow when input is over 80% full.
+py-underflow-valve=Allows flow when output is under 80% full.
+
 poorman-wood-fence=At least you have something.
 wood-fence=Made of pure wood.
 concrete-wall=Hard and breakable.

prototypes/buildings/accumulator-mk01.lua

@@ -1,92 +1,86 @@
 local Recipe = require("stdlib/data/recipe")
--------------------------------------------------------------------------------
---[[Recipes]]--
-local recipe = Recipe {
+local Item = require("stdlib/data/item")
+local Entity = require("stdlib/data/entity")
+
+Recipe {
     type = "recipe",
     name = "accumulator-mk01",
     energy_required = 5,
     enabled = false,
-    ingredients =
-    {
+    ingredients = {
         {"battery", 20},
         {"iron-plate", 40},
         {"copper-plate", 40},
-        {"steel-plate", 50}, -- {"nexelit-plate", 50},
+        {"steel-plate", 50} -- {"nexelit-plate", 50},
         -- {"niobium-plate", 10},
     },
-    result= "accumulator-mk01",
-    icon = "__pyindustry__/graphics/icons/accumulator-mk01.png",
-}:extend()
+    result = "accumulator-mk01"
+}:replace_ingredient("steel-plate", "nexelit-plate"):add_ingredient({"niobium-plate", 10}):add_unlock(
+    {"coal-processing-3", "electric-energy-accumulators-1"}
+)
 
--------------------------------------------------------------------------------
---[[Items]]--
-local item = {
+Item {
     type = "item",
     name = "accumulator-mk01",
     icon = "__pyindustry__/graphics/icons/accumulator-mk01.png",
+    icon_size = 32,
     flags = {"goes-to-quickbar"},
     subgroup = "py-industry",
     order = "a",
     place_result = "accumulator-mk01",
-    stack_size = 50,
+    stack_size = 50
 }
--------------------------------------------------------------------------------
---[[Entites]]--
-local entity = {
+
+Entity {
     type = "accumulator",
     name = "accumulator-mk01",
     icon = "__pyindustry__/graphics/icons/accumulator-mk01.png",
+    icon_size = 32,
     flags = {"placeable-neutral", "player-creation"},
     minable = {hardness = 0.2, mining_time = 0.5, result = "accumulator-mk01"},
     max_health = 150,
     corpse = "medium-remnants",
     collision_box = {{-1.9, -1.9}, {1.9, 1.9}},
     selection_box = {{-2, -2}, {2, 2}},
-    energy_source =
-    {
+    energy_source = {
         type = "electric",
         buffer_capacity = "20MJ",
         usage_priority = "terciary",
         input_flow_limit = "1400kW",
         output_flow_limit = "1400kW"
     },
-    picture =
-    {
+    picture = {
         filename = "__pyindustry__/graphics/entity/accumulator-mk01/accumulator-idle.png",
         priority = "extra-high",
         width = 157,
         height = 244,
-        shift = {0.43, -1.781},
+        shift = {0.43, -1.781}
     },
-    charge_animation =
-    {
+    charge_animation = {
         filename = "__pyindustry__/graphics/entity/accumulator-mk01/accumulator-charging.png",
         width = 157,
         height = 244,
         line_length = 10,
         frame_count = 40,
         shift = {0.43, -1.781},
-        animation_speed = 0.2,
+        animation_speed = 0.2
     },
     charge_cooldown = 30,
     charge_light = {intensity = 0.3, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}},
-    discharge_animation =
-    {
+    discharge_animation = {
         filename = "__pyindustry__/graphics/entity/accumulator-mk01/accumulator-discharging.png",
         width = 157,
         height = 244,
         line_length = 10,
         frame_count = 40,
         shift = {0.43, -1.781},
-        animation_speed = 0.2,
+        animation_speed = 0.2
     },
     discharge_cooldown = 60,
     discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}},
-    vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
-    working_sound =
-    {
-        sound =
-        {
+    vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65},
+    working_sound = {
+        sound = {
             filename = "__pyindustry__/sounds/accumulator.ogg",
             volume = 0.6
         },
@@ -96,33 +90,17 @@ local entity = {
         },
         max_sounds_per_type = 5
     },
-    circuit_wire_connection_point =
-    {
-        shadow =
-        {
+    circuit_wire_connection_point = {
+        shadow = {
             red = {0.984375, 1.10938},
             green = {0.890625, 1.10938}
         },
-        wire =
-        {
+        wire = {
             red = {0.6875, 0.59375},
             green = {0.6875, 0.71875}
         }
     },
     circuit_wire_max_distance = 9,
-    default_output_signal = {type = "virtual", name = "signal-A"}
+    default_output_signal = {type = "virtual", name = "signal-A"},
+    circuit_connector_sprites = _G.circuit_connector_definitions["accumulator"].sprites
 }
-
-if _G.get_circuit_connector_sprites then
-    entity.circuit_connector_sprites = _G.get_circuit_connector_sprites({0.46875, 0.5}, {0.46875, 0.8125}, 26)
-else
-    entity.circuit_connector_sprites = _G.circuit_connector_definitions["accumulator"].sprites
-end
-
-
--------------------------------------------------------------------------------
-data:extend{item, entity}
-
-recipe:replace_ingredient("steel-plate", "nexelit-plate"):add_ingredient({"niobium-plate", 10})
-recipe:add_unlock({"coal-processing-3", "electric-energy-accumulators-1"})
-

prototypes/buildings/burner.lua

@@ -1,6 +1,8 @@
+local Item = require("stdlib/data/item")
 local Recipe = require("stdlib/data/recipe")
+local Entity = require("stdlib/data/entity")
 
-local recipe = Recipe {
+Recipe {
     type = "recipe",
     name = "py-burner",
     energy_required = 10,
@@ -14,22 +16,23 @@ local recipe = Recipe {
     result = "py-burner"
 }:add_unlock("py-burner")
 
-local item = {
+Item {
     type = "item",
     name = "py-burner",
     icon = "__pyindustry__/graphics/icons/burner.png",
+    icon_size = 32,
     flags = {"goes-to-quickbar"},
     subgroup = "py-industry",
     order = "a",
     place_result = "py-burner",
     stack_size = 50
 }
 
-local entity =
-    {
+Entity {
     type = "furnace",
     name = "py-burner",
     icon = "__pyindustry__/graphics/icons/burner.png",
+    icon_size = 32,
     flags = {"placeable-neutral", "placeable-player", "player-creation"},
     minable = {mining_time = 1, result = "py-burner"},
     max_health = 200,
@@ -58,7 +61,7 @@ local entity =
     },
     collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
     selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-    crafting_categories = {"smelting"},
+    crafting_categories = {"py-incineration"},
     result_inventory_size = 1,
     energy_usage = "180kW",
     crafting_speed = 1,
@@ -124,4 +127,3 @@ local entity =
     },
     fast_replaceable_group = "py-burner"
 }
-data:extend {recipe, item, entity}

prototypes/buildings/containers/connectors.lua

@@ -13,7 +13,7 @@ function connectors.sprites(con_shift, shadow_shift)
             scale = 0.5
         },
         led_red = {
-            filename = "__base__/graphics/entity/circuit-connector/circuit-connector-led-red.png",
+            filename = "__base__/graphics/entity/circuit-connector/circuit-connector-led-red-glow.png",
             priority = "low",
             width = 20,
             height = 16,
@@ -22,7 +22,7 @@ function connectors.sprites(con_shift, shadow_shift)
             shift = red_green_shift
         },
         led_green = {
-            filename = "__base__/graphics/entity/circuit-connector/circuit-connector-led-green.png",
+            filename = "__base__/graphics/entity/circuit-connector/circuit-connector-led-green-glow.png",
             priority = "low",
             width = 20,
             height = 16,
@@ -31,7 +31,7 @@ function connectors.sprites(con_shift, shadow_shift)
             shift = red_green_shift
         },
         led_blue = {
-            filename = "__base__/graphics/entity/circuit-connector/circuit-connector-led-blue.png",
+            filename = "__base__/graphics/entity/circuit-connector/circuit-connector-led-blue-glow.png",
             priority = "low",
             width = 20,
             height = 16,