games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-22 03:38:48 +02:00
Code Issues Releases Activity

fluid void fix

Browse Source
This commit is contained in:
MewMew 2020-04-28 13:05:02 +02:00
parent 2379198e49
commit 01ca4465f2
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maps/railway_troopers_v2/main.lua
View File

@ -1,5 +1,6 @@
require "modules.biters_yield_ore" require "modules.biters_yield_ore"
require "modules.difficulty_vote" require "modules.difficulty_vote"
require "modules.satellite_score"
local difficulties_votes = { local difficulties_votes = {
[1] = 32, [1] = 32,
@ -182,7 +183,7 @@ local function on_chunk_generated(event)
local seed = game.surfaces["railway_troopers"].map_gen_settings.seed local seed = game.surfaces["railway_troopers"].map_gen_settings.seed
for _, e in pairs(surface.find_entities_filtered({force = "enemy", area = event.area})) do for _, e in pairs(surface.find_entities_filtered({force = "enemy", area = event.area})) do
local noise = Get_noise("n3", e.position, seed) local noise = Get_noise("n3", e.position, seed)
if noise > 0 then e.destroy() end if noise > 0.05 then e.destroy() end
end end
end end

49
modules/immersive_cargo_wagons/functions.lua
View File

@ -35,33 +35,30 @@ local function connect_power_pole(entity, wagon_area_left_top_y)
end end
end end
local function equal_fluid(source_tank, target_tank)
local source_fluid = source_tank.fluidbox[1]
if not source_fluid then return end
local target_fluid = target_tank.fluidbox[1]
local source_fluid_amount = source_fluid.amount
local amount
if target_fluid then
amount = source_fluid_amount - ((target_fluid.amount + source_fluid_amount) * 0.5)
else
amount = source_fluid.amount * 0.5
end
if amount <= 0 then return end
local inserted_amount = target_tank.insert_fluid({name = source_fluid.name, amount = amount, temperature = source_fluid.temperature})
if inserted_amount > 0 then source_tank.remove_fluid({name = source_fluid.name, amount = inserted_amount}) end
end
local function divide_fluid(wagon, storage_tank) local function divide_fluid(wagon, storage_tank)
local wagon_fluidbox = wagon.entity.fluidbox local fluid_wagon = wagon.entity
local fluid_wagon = wagon.entity equal_fluid(fluid_wagon, storage_tank)
local wagon_fluid = wagon_fluidbox[1] equal_fluid(storage_tank, fluid_wagon)
local tank_fluidbox = storage_tank.fluidbox
local tank_fluid = tank_fluidbox[1]
if not wagon_fluid and not tank_fluid then return end
if wagon_fluid and tank_fluid then
if wagon_fluid.name ~= tank_fluid.name then return end
end
if not wagon_fluid then
wagon_fluidbox[1] = {name = tank_fluid.name, amount = tank_fluid.amount * 0.5, temperature = tank_fluid.temperature}
storage_tank.remove_fluid({name = tank_fluid.name, amount = tank_fluid.amount * 0.5})
return
end
if not tank_fluid then
tank_fluidbox[1] = {name = wagon_fluid.name, amount = wagon_fluid.amount * 0.5, temperature = wagon_fluid.temperature}
fluid_wagon.remove_fluid({name = wagon_fluid.name, amount = wagon_fluid.amount * 0.5})
return
end
local a = (wagon_fluid.amount + tank_fluid.amount) * 0.5
local n = wagon_fluid.name
local t = wagon_fluid.temperature
wagon_fluidbox[1] = {name = n, amount = a, temperature = t}
tank_fluidbox[1] = {name = n, amount = a, temperature = t}
end end
local function input_filtered(wagon_inventory, chest, chest_inventory, free_slots) local function input_filtered(wagon_inventory, chest, chest_inventory, free_slots)