0.1.1

changelog.txt

@@ -1,5 +1,13 @@
 ---------------------------------------------------------------------------------------------------
-Version: 0.1.0
+Version: 0.1.1
 Date: 2024-01-30
+  Changes:
+    - Pipes will update adjacent pipes when placed
+    - Pipes will update adjacent pipes when placed by bots
+    - Pipes will update adjacent pipes when removed
+    - Pipes will update adjacent pipes when removed by bots
+---------------------------------------------------------------------------------------------------
+Version: 0.1.0
+Date: 2024-01-29
   Info:
     - Initial release

control.lua

@@ -6,129 +6,308 @@ local function getType(entity)
 	if not name then return; end
   -- if npt
   if name:find("-npt") then
-    return name:sub(1, #name - 8)
+    return name:sub(1, -9)
   -- else
   else
     return name
   end
 end
 
-local function findBlocked(entity, surface)
+local function findBlocked(entity, surface, skip)
 	local blocked = 0
   for i, offset in pairs({{0,-1}, {1,0}, {0,1}, {-1,0}}) do
-    -- find pipe (?)
-    local pipe = surface.find_entities_filtered({type = 'pipe', position = {entity.position.x + offset[1], entity.position.y + offset[2]}})[1]
-    if not pipe then pipe = surface.find_entities_filtered({ghost_type = 'pipe', position = {entity.position.x + offset[1], entity.position.y + offset[2]}})[1] end
-    -- check pipe material
-    local type = getType(pipe)
-    if type and type ~= getType(entity) then
-      blocked = blocked + 2^(i - 1)
+    if not skip or entity.position.x + offset[1] ~= skip.x and entity.position.y + offset[2] ~= skip.y then
+      -- find pipe (?)
+      local pipe = surface.find_entities_filtered({type = 'pipe', position = {entity.position.x + offset[1], entity.position.y + offset[2]}})[1]
+      if not pipe then pipe = surface.find_entities_filtered({ghost_type = 'pipe', position = {entity.position.x + offset[1], entity.position.y + offset[2]}})[1] end
+      -- check pipe material
+      local type = getType(pipe)
+      if type and type ~= getType(entity) then
+        blocked = blocked + 2^(i - 1)
+      end
     end
   end
   return blocked
 end
 
+-- check the amount of blocked types for a pipe prototype
+local function getPipeBlocked(entity)
+  -- if not pipe
+  if not entity then return; end
+  -- get name from ghost or normal
+  local name = entity.type == "entity-ghost" and entity.ghost_name or entity.type == "pipe" and entity.name
+	if not name then return; end
+  -- if npt
+  if name:find("-npt") then
+    return name:sub(-3, -2)
+  -- else
+  else
+    return name
+  end
+end
+
+local function cancelConstruction(event)
+  local player = game.get_player(event.player_index)
+  -- tell the player no
+  player.create_local_flying_text{
+    text = "Cannot place pipe",
+    create_at_cursor = true
+  }
+  player.play_sound{
+    path = "utility/cannot_build",
+    position = event.created_entity.position
+  }
+  -- if pipe, place in inventory
+  if event.created_entity.type == "pipe" then
+    -- put item back into player's inventory
+    player.insert({name = event.created_entity.name})
+  end
+  -- delete old entity
+  event.created_entity.destroy()
+  game.print("destroyed pipe")
+end
+
+local function updateAdjacent(position, surface, skip)
+  for o, offset in pairs({{0,-1}, {1,0}, {0,1}, {-1,0}}) do
+    local adjacent_pipe = surface.find_entities_filtered({type = "pipe", position = {position.x + offset[1], position.y + offset[2]}})[1]
+    if not adjacent_pipe then
+      adjacent_pipe = surface.find_entities_filtered({ghost_type = "pipe", position = {position.x + offset[1], position.y + offset[2]}})[1]
+    end
+    if adjacent_pipe then
+      -- skip if marked for deconstruction
+      if adjacent_pipe.to_be_deconstructed() then goto continue; end
+      -- find blocked
+      local adj_blocked
+      if skip then
+        adj_blocked = findBlocked(adjacent_pipe, surface, position)
+      else
+        adj_blocked = findBlocked(adjacent_pipe, surface, nil)
+      end
+      -- update the pipe if something is different
+      if adj_blocked ~= getPipeBlocked(adjacent_pipe) then
+        -- create some local variables
+        local fluidbox = adjacent_pipe.fluidbox
+        local adj_type = adjacent_pipe.type
+        local adj_position = adjacent_pipe.position
+        local force = adjacent_pipe.force
+        local last_user = adjacent_pipe.last_user
+        local name
+        local type = getType(adjacent_pipe)
+        adjacent_pipe.destroy()
+        if adj_blocked ~= 0 then
+          name = string.format("%s-npt[%02d]", type, 15 - adj_blocked)
+        else
+          name = type
+        end
+        if adj_type == "ghost_type" then
+          surface.create_entity({
+            inner_name = name,
+            name = "entity-ghost",
+            position = adj_position,
+            force = force,
+            player = last_user,
+            -- fast_replace = true,
+            -- spill = false,
+            create_build_effect_smoke = false
+          }).fluidbox = fluidbox
+        else
+          surface.create_entity({
+            name = name,
+            position = adj_position,
+            force = force,
+            player = last_user,
+            -- fast_replace = true,
+            -- spill = false,
+            create_build_effect_smoke = false
+          }).fluidbox = fluidbox
+        end
+      end
+      ::continue::
+    end
+  end
+end
+
 -- on-built-entity                 done
--- on-robot-built-entity           n
+-- on-robot-built-entity           done
 -- on-pre-ghost-updated            n
 -- on-pre-ghost-deconstructed      n
--- on-cancelled-deconstruction     n
+-- on-cancelled-deconstruction     done
 -- on-marked-for-deconstruction    n
 -- on-player-deconstructed-area    n
 -- on-robot-mined-entity           n
 -- quick replacement               n
 
--- update entities on place pipe
--- check robot interactions
--- deconstruction
--- update entities on remove pipe
--- look into fast replacing while running
--- fix bots placing in illegal places
--- filter items on ghost placement
-
+-- prevent pipes completely surrounded       n
+-- update entities on place pipe             done
+-- update entities on remove pipe            done
+-- check robot interactions                  who knows
+-- deconstruction                            done
+-- look into fast replacing while running    n
+-- fix bots placing in illegal places        done ish
+-- filter items on ghost placement           done i think
+-- fix upgrade groups                        n
+-- fix ghosts placing actual pipes           n
 
 script.on_event({defines.events.on_built_entity, defines.events.on_robot_built_entity}, function (event)
   local entity = event.created_entity
-
+  
   -- check if pipe, otherwise return
   if entity.type ~= "pipe" and entity.type ~= "entity-ghost" then return; end
 	local pipeType = getType(entity)
 
   -- check if valid, otherwise return
 	if not pipeType then return; end
+
+  -- create local variables
   local surface = entity.surface
+  local type = entity.type
+	local force = entity.force
+  local position = entity.position
+  -- update adjacent pipes
+  updateAdjacent(position, surface, false)
 
   -- find adjacent pipes
-  local blocked = findBlocked(entity, surface)
+  local blocked = findBlocked(entity, surface, nil)
+
+  -- if everything is blocked, cancel construction
+  -- if blocked == 15 then
+  --   cancelConstruction(event)
+  --   -- return so nothing else happens
+  --   return
+  -- end
+  -- check adjacent pipes and cancel if any are fully blocked
+  -- for o, offset in pairs({{0,-1}, {1,0}, {0,1}, {-1,0}}) do
+  --   log(3.1)
+  --   local adjacent_pipe = surface.find_entities_filtered({type = "pipe", position = {x + offset[1], y + offset[2]}})
+  --   if not adjacent_pipe then
+  --     adjacent_pipe = surface.find_entities_filtered({ghost_type = "pipe", position = {x + offset[1], y + offset[2]}})
+  --   end
+  --   if adjacent_pipe ~= nil then
+  --     log(3.2)
+  --     -- find blocked
+  --     local adj_blocked = findBlocked(adjacent_pipe, surface)
+  --     -- if fully blocked, cancel construction
+  --     if adj_blocked == 15 then
+  --       log(3.3)
+  --       cancelConstruction(event)
+  --       -- return so nothing else happens
+  --       return
+  --     end
+  --   end
+  -- end
 
   -- if nothing is blocked, return
   if blocked == 0 then return; end
 
-  -- create local variables
-  local type = entity.type
-	local force = entity.force
-  local x, y = entity.position.x, entity.position.y
-
-  -- if everything is blocked, prevent placement
-  if blocked == 15 then
-    local player = game.get_player(event.player_index)
-    -- tell the player no
-    player.create_local_flying_text({
-      text = "Cannot place pipe",
-      create_at_cursor = true
-    })    
-    player.play_sound({
-      path = "utility/cannot_build",
-      position = {x, y}
-    })
-    -- if pipe, place in inventory
-    if entity.type == "pipe" then
-      -- put item back into player's inventory
-      player.insert({name = entity.name})
-    end
-    -- delete old entity
-    entity.destroy()
-    -- return so nothing else happens
-    return
-  end
-
   -- destroy the old entity
   if not entity.destroy() then return; end -- return if something breaks
-
+  
   -- replace old entity
   -- log("creating new pipe entity: " .. entity.type)
   local pipe
   if type == "pipe" then
     pipe = surface.create_entity({
       name = string.format("%s-npt[%02d]", pipeType, 15 - blocked),
-      position = {x, y},
+      position = position,
       force = force
     })
   else
     pipe = surface.create_entity({
       name = "entity-ghost",
       inner_name = string.format("%s-npt[%02d]", pipeType, 15 - blocked),
-      position = {x, y},
+      position = position,
       force = force
   })
   end
   if pipe and event.player_index then pipe.last_user = event.player_index; end
+end)
 
-  for o, offset in pairs({{0,-1}, {1,0}, {0,1}, {-1,0}}) do
-    local adjacent_pipe = surface.find_entities_filtered({type = "pipe", position = {x + offset[1], y + offset[2]}})
-  end
-  -- for i = 1, 4 do
-  --   local adjacent_pipe = surface.find_entities_filtered({type = "pipe", position = {x + (i - 2) % 2, y + (i - 3) % 2}})
+script.on_event({defines.events.on_cancelled_deconstruction}, function (event)
+  local entity = event.entity
+
+  -- check if pipe, otherwise return
+  if entity.type ~= "pipe" and entity.type ~= "entity-ghost" then return; end
+	local pipeType = getType(entity)
+
+  -- check if valid, otherwise return
+	if not pipeType then return; end
+
+  -- create local variables
+  local surface = entity.surface
+  local type = entity.type
+	local force = entity.force
+  local position = entity.position
+  -- update adjacent pipes
+  updateAdjacent(position, surface, false)
+
+  -- find adjacent pipes
+  local blocked = findBlocked(entity, surface, nil)
+
+  -- if everything is blocked, cancel construction
+  -- if blocked == 15 then
+  --   cancelConstruction(event)
+  --   -- return so nothing else happens
+  --   return
+  -- end
+  -- check adjacent pipes and cancel if any are fully blocked
+  -- for o, offset in pairs({{0,-1}, {1,0}, {0,1}, {-1,0}}) do
+  --   log(3.1)
+  --   local adjacent_pipe = surface.find_entities_filtered({type = "pipe", position = {x + offset[1], y + offset[2]}})
   --   if not adjacent_pipe then
-  --     adjacent_pipe = surface.find_entities_filtered({type = "pipe-to-ground", position = {x + (i - 2) % 2, y + (i - 3) % 2}})
+  --     adjacent_pipe = surface.find_entities_filtered({ghost_type = "pipe", position = {x + offset[1], y + offset[2]}})
+  --   end
+  --   if adjacent_pipe ~= nil then
+  --     log(3.2)
+  --     -- find blocked
+  --     local adj_blocked = findBlocked(adjacent_pipe, surface)
+  --     -- if fully blocked, cancel construction
+  --     if adj_blocked == 15 then
+  --       log(3.3)
+  --       cancelConstruction(event)
+  --       -- return so nothing else happens
+  --       return
+  --     end
   --   end
-
   -- end
-end)
 
+  -- if nothing is blocked, return
+  if blocked == 0 then return; end
 
+  -- destroy the old entity
+  if not entity.destroy() then return; end -- return if something breaks
+
+  -- replace old entity
+  -- log("creating new pipe entity: " .. entity.type)
+  local pipe
+  if type == "pipe" then
+    pipe = surface.create_entity({
+      name = string.format("%s-npt[%02d]", pipeType, 15 - blocked),
+      position = position,
+      force = force
+    })
+  else
+    pipe = surface.create_entity({
+      name = "entity-ghost",
+      inner_name = string.format("%s-npt[%02d]", pipeType, 15 - blocked),
+      position = position,
+      force = force
+  })
+  end
+  if pipe and event.player_index then pipe.last_user = event.player_index; end
+end)
 
--- script.on_event({defines.events.on_player_mined_entity, defines.events.on_robot_mined_entity}, on_mined_entity)
+script.on_event({defines.events.on_player_mined_entity, defines.events.on_robot_mined_entity}, function (event)
+  local entity = event.entity
+  -- check if pipe, otherwise return
+  if entity.type ~= "pipe" and entity.type ~= "entity-ghost" then return; end
+  log("destroy pipe")
+	local pipeType = getType(entity)
+  -- check if valid, otherwise return
+	if not pipeType then return; end
+  log("updating adjacent")
+  -- update adjacent pipes
+  updateAdjacent(entity.position, entity.surface, true)
+end)
 -- script.on_event({defines.events.on_player_setup_blueprint}, on_player_setup_blueprint)
 --script.on_event({defines.events.on_pre_ghost_deconstructed}, on_pre_ghost_deconstructed)
 -- script.on_event({defines.events.on_pre_player_mined_item}, on_pre_player_mined_item)

info.json

@@ -1,6 +1,6 @@
 {
   "name": "no-pipe-touching",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "title": "No Pipe Touching",
   "description": "Allows you to place pipes of different materials next to each other without them connecting. Designed as a less fancy alternative to advanced fluid handling, without the recipe complexity of flow control.",
   "author": "protocol_1903",