Commit: b2df8c1a26e1680bc152a66692e1ac369b559e7f - LD_AutoCircuit (hg)

Another simple mod for the game "Factorio". Automatically strings circuit wire on long distance poles.

Commit MetaInfo

• Revisión: b2df8c1a26e1680bc152a66692e1ac369b559e7f (tree)
• Tiempo: 2018-11-04 14:52:04
• Autor: Eric Hopper <hopper@omni...>
• Commiter: Eric Hopper

Log Message

Fix a whole host of different small stupid errors.

Cambiar Resumen

• modified: control.lua
• modified: settings.lua

Diferencia incremental

diff -r 6d13949fa9ee -r b2df8c1a26e1 control.lua
--- a/control.lua	Sat Nov 03 22:16:41 2018 -0700
+++ b/control.lua	Sat Nov 03 22:52:04 2018 -0700
@@ -17,38 +17,43 @@
 end)
 
 local function is_long_distance_pole(entity)
-   if entity.type != "electric-pole" then
-      return false
-   elseif entity.supply_area_distance > 2 then
-      return false
-   elseif entity.maximum_wire_distance < 30 then
+   if entity.type ~= "electric-pole" then
       return false
    else
-      return true
+      local poleproto = entity.prototype
+      if poleproto.supply_area_distance > 2 then
+         return false
+      elseif poleproto.max_wire_distance < 30 then
+         return false
+      else
+         return true
+      end
    end
 end
 
 local function has_red_wire(pole)
-   local redwires = pole.neighbors["red"]
+   local redwires = pole.neighbours["red"]
    return (redwires ~= nil) and (#redwires > 0)
+end
 
 local function has_green_wire(pole)
-   local greenwires = pole.neighbors["green"]
-   return (redwires ~= nil) and (#redwires > 0)
+   local greenwires = pole.neighbours["green"]
+   return (greenwires ~= nil) and (#greenwires > 0)
+end
 
 script.on_event(defines.events.on_built_entity, function(event)
-   if not conf_enable then
+   if not conf_enable[event.player_index] then
       return
    end
    local entity = event.created_entity
    if (not entity) or (not is_long_distance_pole(entity)) then
       return
    end
-   local copperbuddies = entity.neighbors["copper"]
+   local copperbuddies = entity.neighbours["copper"]
    if not copperbuddies then
       return
    end
-   local otherpole
+   local otherpole = nil
    local newconnects = {}
    for _, otherpole in pairs(copperbuddies) do
       if is_long_distance_pole(otherpole) then
@@ -64,4 +69,6 @@
    end
    local newconnect
    for _, newconnect in pairs(newconnects) do
-      entity.connect_neighbor(newconnect)
+      entity.connect_neighbour(newconnect)
+   end
+end)

diff -r 6d13949fa9ee -r b2df8c1a26e1 settings.lua
--- a/settings.lua	Sat Nov 03 22:16:41 2018 -0700
+++ b/settings.lua	Sat Nov 03 22:52:04 2018 -0700
@@ -1,7 +1,7 @@
 _G.data:extend({
 	{
 		type = "bool-setting",
-		name = "ld_autocircuit-endabled",
+		name = "ld_autocircuit-enabled",
 		setting_type = "runtime-per-user",
 		default_value = true,
 	},