games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-02-03 13:12:11 +02:00
Code Issues Releases Activity

pirates local 1

Browse Source
This commit is contained in:
danielmartin0 2024-09-27 17:13:36 +01:00 committed by Gerkiz
parent 19b18ed477
commit 9bbfe2ffb3
2 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
maps/pirates/api_on_tick.lua
View File

@ -16,7 +16,7 @@ local Roles = require 'maps.pirates.roles.roles'
local Progression = require 'maps.pirates.progression'
local Crowsnest = require 'maps.pirates.surfaces.crowsnest'
local Hold = require 'maps.pirates.surfaces.hold'
-- local Cabin = require 'maps.pirates.surfaces.cabin'
local Cabin = require 'maps.pirates.surfaces.cabin'
local Balance = require 'maps.pirates.balance'
local Common = require 'maps.pirates.common'
local CoreData = require 'maps.pirates.coredata'
@ -1414,14 +1414,42 @@ function Public.quest_progress_tick(tickinterval)
if dynamic_data.quest_type == Quest.enum.RESOURCEFLOW and (not dynamic_data.quest_complete) then
local force = memory.force
if not (force and force.valid and dynamic_data.quest_params) then return end
dynamic_data.quest_progress = force.get_item_production_statistics(surface).get_flow_count { name = dynamic_data.quest_params.item, category = 'input', precision_index = defines.flow_precision_index.five_seconds, count = false }
Quest.try_resolve_quest()
end
if dynamic_data.quest_type == Quest.enum.RESOURCECOUNT and (not dynamic_data.quest_complete) then
local total_flow_count = force.get_item_production_statistics(surface).get_flow_count { name = dynamic_data.quest_params.item, category = 'input', precision_index = defines.flow_precision_index.five_seconds, count = false }
for i = 1, memory.hold_surface_count do
local hold_surface = Hold.get_hold_surface(i)
if hold_surface and hold_surface.valid then
total_flow_count = total_flow_count + force.get_item_production_statistics(hold_surface).get_flow_count { name = dynamic_data.quest_params.item, category = 'input', precision_index = defines.flow_precision_index.five_seconds, count = false }
end
end
local cabin_surface = Cabin.get_cabin_surface()
if cabin_surface and cabin_surface.valid then
total_flow_count = total_flow_count + force.get_item_production_statistics(cabin_surface).get_flow_count { name = dynamic_data.quest_params.item, category = 'input', precision_index = defines.flow_precision_index.five_seconds, count = false }
end
dynamic_data.quest_progress = total_flow_count
Quest.try_resolve_quest()
elseif dynamic_data.quest_type == Quest.enum.RESOURCECOUNT and (not dynamic_data.quest_complete) then
local force = memory.force
if not (force and force.valid and dynamic_data.quest_params) then return end
dynamic_data.quest_progress = force.get_item_production_statistics(surface).get_flow_count { name = dynamic_data.quest_params.item, category = 'input', precision_index = defines.flow_precision_index.one_thousand_hours, count = true } - dynamic_data.quest_params.initial_count
local total_count = force.get_item_production_statistics(surface).get_flow_count { name = dynamic_data.quest_params.item, category = 'input', precision_index = defines.flow_precision_index.one_thousand_hours, count = true }
for i = 1, memory.hold_surface_count do
local hold_surface = Hold.get_hold_surface(i)
if hold_surface and hold_surface.valid then
total_count = total_count + force.get_item_production_statistics(hold_surface).get_flow_count { name = dynamic_data.quest_params.item, category = 'input', precision_index = defines.flow_precision_index.one_thousand_hours, count = true }
end
end
local cabin_surface = Cabin.get_cabin_surface()
if cabin_surface and cabin_surface.valid then
total_count = total_count + force.get_item_production_statistics(cabin_surface).get_flow_count { name = dynamic_data.quest_params.item, category = 'input', precision_index = defines.flow_precision_index.one_thousand_hours, count = true }
end
dynamic_data.quest_progress = total_count - dynamic_data.quest_params.initial_count
Quest.try_resolve_quest()
end
end

18
maps/pirates/quest.lua
View File

@ -11,6 +11,8 @@ local Raffle = require 'maps.pirates.raffle'
-- local CoreData = require 'maps.pirates.coredata'
local IslandEnum = require 'maps.pirates.surfaces.islands.island_enum'
local _inspect = require 'utils.inspect'.inspect
local Hold = require 'maps.pirates.surfaces.hold'
local Cabin = require 'maps.pirates.surfaces.cabin'
local Public = {}
@ -187,7 +189,21 @@ function Public.initialise_resourcecount_quest()
local force = memory.force
if force and force.valid then
destination.dynamic_data.quest_params.initial_count = force.get_item_production_statistics(surface).get_flow_count { name = generated_production_quest.item, category = 'input', precision_index = defines.flow_precision_index.one_thousand_hours, count = true }
local initial_total_count = force.get_item_production_statistics(surface).get_flow_count { name = generated_production_quest.item, category = 'input', precision_index = defines.flow_precision_index.one_thousand_hours, count = true }
for i = 1, memory.hold_surface_count do
local hold_surface = Hold.get_hold_surface(i)
if hold_surface and hold_surface.valid then
initial_total_count = initial_total_count + force.get_item_production_statistics(hold_surface).get_flow_count { name = generated_production_quest.item, category = 'input', precision_index = defines.flow_precision_index.one_thousand_hours, count = true }
end
end
local cabin_surface = Cabin.get_cabin_surface()
if cabin_surface and cabin_surface.valid then
initial_total_count = initial_total_count + force.get_item_production_statistics(cabin_surface).get_flow_count { name = generated_production_quest.item, category = 'input', precision_index = defines.flow_precision_index.one_thousand_hours, count = true }
end
destination.dynamic_data.quest_params.initial_count = initial_total_count
end
local progressneeded_before_rounding = generated_production_quest.base_rate * Balance.resource_quest_multiplier()