Frozen (#64)

* the vacuum pump saga continues * Circuit connections for Diamond + Regolite mines (#62) --------- Co-authored-by: Jake Staberg Morgan <[email protected]>
pyanodon · May 28, 2024 · 63f1da8 · 63f1da8
1 parent 1aafa32
commit 63f1da8
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 5 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,12 @@
+Version: 2.0.14
+Date: When it's done
+  Changes:
+    - Added circuit connectivity to Diamond and Regolite mines (credit: JStMorgan)
+---------------------------------------------------------------------------------------------------
+Version: 2.0.13
+Date: 2024-4-30
+  Changes:
+    - Fixed that vacuum pump passthrough fluidbox couldn't pass fluid to pipes but for really real this time.
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.12
 Date: 2024-4-25

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
   "name": "pyfusionenergy",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "factorio_version": "1.1",
   "title": "Pyanodons Fusion Energy",
   "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",

diff --git a/prototypes/buildings/diamond-mine.lua b/prototypes/buildings/diamond-mine.lua
@@ -61,6 +61,9 @@ ENTITY {
         width = 12,
         height = 12
     },
+    circuit_wire_connection_points = circuit_connector_definitions["diamond-mine"].points,
+    circuit_connector_sprites = circuit_connector_definitions["diamond-mine"].sprites,
+    circuit_wire_max_distance = default_circuit_wire_max_distance,
     animations = {
         layers = {
             {

diff --git a/prototypes/buildings/regolite-mine.lua b/prototypes/buildings/regolite-mine.lua
@@ -61,6 +61,9 @@ ENTITY {
         width = 12,
         height = 12
     },
+    circuit_wire_connection_points = circuit_connector_definitions["regolite-mine"].points,
+    circuit_connector_sprites = circuit_connector_definitions["regolite-mine"].sprites,
+    circuit_wire_max_distance = default_circuit_wire_max_distance,
     animations = {
         layers = {
             {

diff --git a/prototypes/buildings/vacuum-pump-mk01.lua b/prototypes/buildings/vacuum-pump-mk01.lua
@@ -91,7 +91,7 @@ ENTITY {
             pipe_covers = py.pipe_covers(false, true, false, false),
             base_area = 10,
             base_level = -1,
-	    height = 2,
+	        height = 2,
             pipe_connections = {{type = "input-output", position = {-2.0, -0}},{type = "input-output", position = {2.0, -0}}}
         },
         {

diff --git a/prototypes/buildings/vacuum-pump-mk02.lua b/prototypes/buildings/vacuum-pump-mk02.lua
@@ -93,7 +93,7 @@ ENTITY {
             pipe_covers = py.pipe_covers(false, true, false, false),
             base_area = 10,
             base_level = -1,
-	    height = 2,
+	        height = 2,
             pipe_connections = {{type = "input-output", position = {-2.0, -0}},{type = "input-output", position = {2.0, -0}}}
         },
         {

diff --git a/prototypes/buildings/vacuum-pump-mk03.lua b/prototypes/buildings/vacuum-pump-mk03.lua
@@ -94,7 +94,7 @@ ENTITY {
             pipe_covers = py.pipe_covers(false, true, false, false),
             base_area = 10,
             base_level = -1,
-	    height = 2,
+	        height = 2,
             pipe_connections = {{type = "input-output", position = {-2.0, -0}},{type = "input-output", position = {2.0, -0}}}
         },
         {

diff --git a/prototypes/buildings/vacuum-pump-mk04.lua b/prototypes/buildings/vacuum-pump-mk04.lua
@@ -92,7 +92,7 @@ ENTITY {
             pipe_covers = py.pipe_covers(false, true, false, false),
             base_area = 10,
             base_level = -1,
-	    height = 2,
+	        height = 2,
             pipe_connections = {{type = "input-output", position = {-2.0, -0}},{type = "input-output", position = {2.0, -0}}}
         },
         {

diff --git a/prototypes/circuit-connector-definitions.lua b/prototypes/circuit-connector-definitions.lua
@@ -1,6 +1,17 @@
 -- Holds circuit connection definitions for PyFE entities.
 -- variation counts from 0 (Python-like).
 
+circuit_connector_definitions["diamond-mine"] = circuit_connector_definitions.create
+(
+  universal_connector_template,
+  {--Directions are up, right, down, left.
+    { variation = 2, main_offset = util.by_pixel(60, 65), shadow_offset = util.by_pixel(57, 77), show_shadow = false },
+    { variation = 2, main_offset = util.by_pixel(60, 65), shadow_offset = util.by_pixel(57, 77), show_shadow = false },
+    { variation = 2, main_offset = util.by_pixel(60, 65), shadow_offset = util.by_pixel(57, 77), show_shadow = false },
+    { variation = 2, main_offset = util.by_pixel(60, 65), shadow_offset = util.by_pixel(57, 77), show_shadow = false }
+  }
+)
+
 circuit_connector_definitions["molybdenum-mine"] = circuit_connector_definitions.create
 (
   universal_connector_template,
@@ -11,3 +22,14 @@ circuit_connector_definitions["molybdenum-mine"] = circuit_connector_definitions
     { variation = 26, main_offset = util.by_pixel(72, -35), shadow_offset = util.by_pixel(69, -23), show_shadow = false }
   }
 )
+
+circuit_connector_definitions["regolite-mine"] = circuit_connector_definitions.create
+(
+  universal_connector_template,
+  {--Directions are up, right, down, left.
+    { variation = 2, main_offset = util.by_pixel(-85, 82), shadow_offset = util.by_pixel(84, 60), show_shadow = false },
+    { variation = 2, main_offset = util.by_pixel(-85, 82), shadow_offset = util.by_pixel(84, 60), show_shadow = false },
+    { variation = 2, main_offset = util.by_pixel(-85, 82), shadow_offset = util.by_pixel(84, 60), show_shadow = false },
+    { variation = 2, main_offset = util.by_pixel(-85, 82), shadow_offset = util.by_pixel(84, 60), show_shadow = false }
+  }
+)