Misc fixes

Author: tburrows13

data-final-fixes.lua

@@ -1,7 +1,6 @@
 require "__FreightForwarding__.prototypes.fuel-categories"
 
-do return end -- TODO 2.0 collision
-
+--[[ TODO 2.0 collision
 local collision_mask_util = require "__core__.lualib.collision-mask-util"
 
 data.raw["resource"]["ff-seamount"].collision_mask = { "resource-layer", non_deep_water_mask, "ground-tile" }
@@ -70,6 +69,7 @@ for _, tile in pairs(data.raw.tile) do
   end
 end
 collision_mask_util.add_layer(data.raw.pipe["ff-underwater-pipe"].collision_mask, underwater_pipe_layer)
+]]
 
 -- Science
 for _, tech in pairs(data.raw.technology) do

prototypes/offshore-tank.lua

@@ -93,9 +93,9 @@ data:extend{
       pipe_connections =
       {
         { flow_direction = "input-output", direction = defines.direction.north, position = {0, -2} },
-        { flow_direction = "input-output", direction = defines.direction.east, position = {0, 2} },
-        { flow_direction = "input-output", direction = defines.direction.south, position = {-2, 0} },
-        { flow_direction = "input-output", direction = defines.direction.west, position = {2, 0} },
+        { flow_direction = "input-output", direction = defines.direction.south, position = {0, 2} },
+        { flow_direction = "input-output", direction = defines.direction.west, position = {-2, 0} },
+        { flow_direction = "input-output", direction = defines.direction.east, position = {2, 0} },
       },
       production_type = "input-output",
     },

prototypes/recipe.lua

@@ -27,8 +27,8 @@ x_util.replace_ingredient("lex-flying-gunship", "steel-plate", "titanium-plate")
 x_util.replace_ingredient("lex-flying-cargo", "steel-plate", "titanium-plate")
 x_util.replace_ingredient("lex-flying-heavyship", "steel-plate", "titanium-plate")
 
---x_util.add_ingredient("rocket-control-unit", "ff-charged-battery-pack", 1)
+--x_util.add_ingredient("rocket-control-unit", "ff-charged-battery-pack", 1)  -- TODO 2.0 RCU?
 --x_util.add_prerequisite("rocket-control-unit", "ff-battery-pack")
 
 x_util.replace_ingredient("satellite", "accumulator", "ff-charged-battery-pack")
-x_util.add_prerequisite("space-science-pack", "ff-battery-pack")
+x_util.add_prerequisite("rocket-silo", "ff-battery-pack")

prototypes/sonar-buoy.lua

@@ -103,9 +103,9 @@ data:extend({
         filter = "crude-oil",
         pipe_connections = {
           { flow_direction = "input", direction = defines.direction.north, position = {0, -1} },
-          { flow_direction = "input", direction = defines.direction.east, position = {0, 1} },
-          { flow_direction = "input", direction = defines.direction.south, position = {-1, 0} },
-          { flow_direction = "input", direction = defines.direction.west, position = {1, 0} },
+          { flow_direction = "input", direction = defines.direction.south, position = {0, 1} },
+          { flow_direction = "input", direction = defines.direction.west, position = {-1, 0} },
+          { flow_direction = "input", direction = defines.direction.east, position = {1, 0} },
         }
       }
     },

scripts/chunk-util.lua

@@ -40,7 +40,7 @@ end
 function ChunkUtil.is_chunk_land(chunk_position, surface)
   -- 1024 tiles in a chunk
   local area = ChunkUtil.chunk_position_to_area(chunk_position)
-  local ground_tiles = surface.count_tiles_filtered { area = area, collision_mask = {layers={ground_tile=true}}}
+  local ground_tiles = surface.count_tiles_filtered { area = area, collision_mask = {ground_tile=true}}
   return ground_tiles > 64
 end
 

scripts/life-ring.lua

@@ -49,7 +49,7 @@ end
 
 local function on_tick()
   for _, player in pairs(game.players) do
-    local tile = player.surface.get_tile(player.position.x, player.position.y)
+    local tile = player.surface.get_tile(player.physical_position.x, player.physical_position.y)
     if not tile or not tile.valid then goto continue end
     local tile_name = tile.name
     if (tile_name == "water" or tile_name == "deepwater")
@@ -114,7 +114,7 @@ local function on_tick()
       for _, splash_position in pairs(splash_positions) do
         player.surface.create_entity{
           name = "ff-life-ring-splash",
-          position = add_offset(add_offset(player.position, splash_position), offset),
+          position = add_offset(add_offset(player.physical_position, splash_position), offset),
         }
       end
     else

scripts/seismic-scanning.lua

@@ -76,7 +76,7 @@ local function on_scanner_built(event)
 
   scanner.backer_name = ""
   local surface = scanner.surface
-  local water_tile_count = surface.count_tiles_filtered { position = scanner.position, radius = min_tiles_from_water, collision_mask = {layers={water_tile = true}}, limit = 1 }
+  local water_tile_count = surface.count_tiles_filtered { position = scanner.position, radius = min_tiles_from_water, collision_mask = {water_tile = true}, limit = 1 }
   if water_tile_count > 0 then
     scanner.active = false
     if event.player_index then