mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2026-11-21 15:33:12 +09:00
s
This commit is contained in:
1 parent
eeeda196ae
commit
ce6f54dd17
1 file changed
+13
-11
@@ -288,7 +288,7 @@ end
|
|||||||
--- @param s_index number surface index
|
--- @param s_index number surface index
|
||||||
--- @return number
|
--- @return number
|
||||||
local function get_production_multiplier(s_index)
|
local function get_production_multiplier(s_index)
|
||||||
local surface = assert(config.global_surface and game.surface[1] or game.surfaces[s_index])
|
local surface = assert(config.global_surface and game.surface[1] or game.surfaces[s_index]) --[[@as LuaSurface]]
|
||||||
local multiplier = surface.solar_power_multiplier
|
local multiplier = surface.solar_power_multiplier
|
||||||
if surface.always_day then
|
if surface.always_day then
|
||||||
return multiplier
|
return multiplier
|
||||||
@@ -304,14 +304,14 @@ local function get_production_multiplier(s_index)
|
|||||||
|
|
||||||
local daytime = (game.tick % surface.ticks_per_day) / surface.ticks_per_day
|
local daytime = (game.tick % surface.ticks_per_day) / surface.ticks_per_day
|
||||||
surface.daytime = daytime
|
surface.daytime = daytime
|
||||||
if daytime <= surface.daytime_parameters.dusk then
|
if daytime <= surface.dusk then
|
||||||
return multiplier
|
return multiplier
|
||||||
elseif daytime <= surface.daytime_parameters.evening then
|
elseif daytime <= surface.evening then
|
||||||
return multiplier * (1 - (daytime - surface.daytime_parameters.dusk) / (surface.daytime_parameters.evening - surface.daytime_parameters.dusk))
|
return multiplier * (1 - (daytime - surface.dusk) / (surface.evening - surface.dusk))
|
||||||
elseif daytime <= surface.daytime_parameters.morning then
|
elseif daytime <= surface.morning then
|
||||||
return 0
|
return 0
|
||||||
elseif daytime <= surface.daytime_parameters.dawn then
|
elseif daytime <= surface.dawn then
|
||||||
return multiplier * (daytime - surface.daytime_parameters.morning) / (surface.daytime_parameters.dawn - surface.daytime_parameters.morning)
|
return multiplier * (daytime - surface.morning) / (surface.dawn - surface.morning)
|
||||||
end
|
end
|
||||||
return multiplier
|
return multiplier
|
||||||
end
|
end
|
||||||
@@ -320,15 +320,15 @@ end
|
|||||||
--- @param s_index number surface index
|
--- @param s_index number surface index
|
||||||
--- @return number
|
--- @return number
|
||||||
local function get_sustained_multiplier(s_index)
|
local function get_sustained_multiplier(s_index)
|
||||||
local surface = assert(config.global_surface and game.surface[1] or game.surfaces[s_index])
|
local surface = assert(config.global_surface and game.surface[1] or game.surfaces[s_index]) --[[@as LuaSurface]]
|
||||||
local multiplier = surface.solar_power_multiplier
|
local multiplier = surface.solar_power_multiplier
|
||||||
if surface.always_day then
|
if surface.always_day then
|
||||||
return multiplier
|
return multiplier
|
||||||
end
|
end
|
||||||
|
|
||||||
local day_duration = 1 - surface.daytime_parameters.dawn + surface.daytime_parameters.dusk
|
local day_duration = 1 - surface.dawn + surface.dusk
|
||||||
local sunset_duration = surface.daytime_parameters.evening - surface.daytime_parameters.dusk
|
local sunset_duration = surface.evening - surface.dusk
|
||||||
local sunrise_duration = surface.daytime_parameters.dawn - surface.daytime_parameters.morning
|
local sunrise_duration = surface.dawn - surface.morning
|
||||||
return multiplier * (day_duration + 0.5 * (sunset_duration + sunrise_duration))
|
return multiplier * (day_duration + 0.5 * (sunset_duration + sunrise_duration))
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -383,6 +383,7 @@ function Vlayer.insert_item(s_index, name, count, quality_level)
|
|||||||
local vd = assert(config.global_surface and vlayer_data[1] or vlayer_data[s_index])
|
local vd = assert(config.global_surface and vlayer_data[1] or vlayer_data[s_index])
|
||||||
local storage = vd.storage
|
local storage = vd.storage
|
||||||
if not storage.items[name] then storage.items[name] = {} end
|
if not storage.items[name] then storage.items[name] = {} end
|
||||||
|
if not storage.items[name][quality_level] then storage.items[name][quality_level] = 0 end
|
||||||
storage.items[name][quality_level] = storage.items[name][quality_level] + count
|
storage.items[name][quality_level] = storage.items[name][quality_level] + count
|
||||||
|
|
||||||
if config.unlimited_surface_area or item.required_area == 0 then
|
if config.unlimited_surface_area or item.required_area == 0 then
|
||||||
@@ -399,6 +400,7 @@ function Vlayer.insert_item(s_index, name, count, quality_level)
|
|||||||
|
|
||||||
local unallocated = count - allocated
|
local unallocated = count - allocated
|
||||||
if not storage.unallocated[name] then storage.unallocated[name] = {} end
|
if not storage.unallocated[name] then storage.unallocated[name] = {} end
|
||||||
|
if not storage.unallocated[name][quality_level] then storage.unallocated[name][quality_level] = 0 end
|
||||||
storage.unallocated[name][quality_level] = storage.unallocated[name][quality_level] + unallocated
|
storage.unallocated[name][quality_level] = storage.unallocated[name][quality_level] + unallocated
|
||||||
count_unallocated_production(s_index, name, unallocated, quality_level)
|
count_unallocated_production(s_index, name, unallocated, quality_level)
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in new issue
Block a user