From a31c1c5a10fce4f404e022a54fc42ee3ad4c4c1f Mon Sep 17 00:00:00 2001 From: danielmartin0 Date: Sun, 15 Sep 2024 21:37:12 +0100 Subject: [PATCH] remove events system --- maps/pirates/api_on_tick.lua | 2 +- maps/pirates/commands.lua | 3 +- maps/pirates/custom_events.lua | 15 -------- maps/pirates/gui/gui.lua | 36 ++----------------- maps/pirates/main.lua | 1 - maps/pirates/ores.lua | 4 +-- maps/pirates/overworld.lua | 6 ++-- maps/pirates/progression.lua | 6 ++-- .../quest_structures/furnace1/furnace1.lua | 2 +- .../quest_structures/market1/market1.lua | 2 +- .../quest_structures/quest_structures.lua | 2 +- maps/pirates/surfaces/crowsnest.lua | 4 +-- maps/pirates/surfaces/dock.lua | 2 +- 13 files changed, 14 insertions(+), 71 deletions(-) delete mode 100644 maps/pirates/custom_events.lua diff --git a/maps/pirates/api_on_tick.lua b/maps/pirates/api_on_tick.lua index 648824ab..af02fb0e 100644 --- a/maps/pirates/api_on_tick.lua +++ b/maps/pirates/api_on_tick.lua @@ -27,7 +27,7 @@ local Crew = require 'maps.pirates.crew' local Math = require 'maps.pirates.math' local _inspect = require 'utils.inspect'.inspect local Kraken = require 'maps.pirates.surfaces.sea.kraken' -local CustomEvents = require 'maps.pirates.custom_events' + local Quest = require 'maps.pirates.quest' -- local ShopDock = require 'maps.pirates.shop.dock' diff --git a/maps/pirates/commands.lua b/maps/pirates/commands.lua index e32b3ae4..52fb293f 100644 --- a/maps/pirates/commands.lua +++ b/maps/pirates/commands.lua @@ -29,7 +29,7 @@ local simplex_noise = require 'utils.simplex_noise'.d2 local Token = require 'utils.token' local Task = require 'utils.task' local Highscore = require 'maps.pirates.highscore' -local CustomEvents = require 'maps.pirates.custom_events' + local Classes = require 'maps.pirates.roles.classes' local Gui = require 'maps.pirates.gui.gui' -- local Session = require 'utils.datastore.session_data' @@ -616,7 +616,6 @@ if _DEBUG then end memory.currentdestination_index = memory.mapbeingloadeddestination_index - script.raise_event(CustomEvents.enum['update_crew_progress_gui'], {}) Surfaces.create_surface(Common.current_destination()) Task.set_timeout_in_ticks(60, go_2, { id = data.id }) end diff --git a/maps/pirates/custom_events.lua b/maps/pirates/custom_events.lua deleted file mode 100644 index 7e09c4d3..00000000 --- a/maps/pirates/custom_events.lua +++ /dev/null @@ -1,15 +0,0 @@ --- This file is part of thesixthroc's Pirate Ship softmod, licensed under GPLv3 and stored at https://github.com/ComfyFactory/ComfyFactorio and https://github.com/danielmartin0/ComfyFactorio-Pirates. - - -local Event = require 'utils.event' - -local Public = {} - --- just beginning this, gotta finish reformulating the gui updates in terms of events: - -local enum = { - update_crew_progress_gui = Event.generate_event_name('update_crew_progress_gui'), -} -Public.enum = enum - -return Public diff --git a/maps/pirates/gui/gui.lua b/maps/pirates/gui/gui.lua index 60bf8950..5baf8e9b 100644 --- a/maps/pirates/gui/gui.lua +++ b/maps/pirates/gui/gui.lua @@ -24,7 +24,7 @@ local Progression = require 'maps.pirates.progression' local Surfaces = require 'maps.pirates.surfaces.surfaces' local Roles = require 'maps.pirates.roles.roles' local Event = require 'utils.event' -local CustomEvents = require 'maps.pirates.custom_events' + local IslandEnum = require 'maps.pirates.surfaces.islands.island_enum' local Kraken = require 'maps.pirates.surfaces.sea.kraken' local GuiWelcome = require 'maps.pirates.gui.welcome' @@ -33,19 +33,8 @@ local ComfyGui = require 'utils.gui' ComfyGui.set_disabled_tab('Scoreboard', true) ComfyGui.set_disabled_tab('Groups', true) - local Public = {} --- this seems to be never used -local enum = { - PROGRESS = 'progress', - RUNS = 'runs', - CREW = 'crew', - CLASSES = 'classes', - MINIMAP = 'minimap', - INFO = 'info', - COLOR = 'color', -} -Public.enum = enum + Public.progress = require 'maps.pirates.gui.progress' Public.runs = require 'maps.pirates.gui.runs' Public.crew = require 'maps.pirates.gui.crew' @@ -54,23 +43,6 @@ Public.minimap = require 'maps.pirates.gui.minimap' Public.info = require 'maps.pirates.gui.info' Public.color = require 'maps.pirates.gui.color' - -function Public.update_crew_gui(which_gui) - if not Public[which_gui] then return end - - local players = Common.crew_get_crew_members_and_spectators() - - for _, player in pairs(players) do - Public[which_gui].full_update(player) - end -end - -function Public.update_crew_progress_gui() - return Public.update_crew_gui('progress') -end - -Event.add(CustomEvents.enum['update_crew_progress_gui'], Public.update_crew_progress_gui) - local function create_gui(player) local flow1, flow2, flow3, flow4 @@ -1277,12 +1249,8 @@ local function on_gui_location_changed(event) end - - local event = require 'utils.event' event.add(defines.events.on_gui_click, on_gui_click) event.add(defines.events.on_gui_location_changed, on_gui_location_changed) - - return Public diff --git a/maps/pirates/main.lua b/maps/pirates/main.lua index 67785171..96def92c 100644 --- a/maps/pirates/main.lua +++ b/maps/pirates/main.lua @@ -24,7 +24,6 @@ The scenario is quite complex, but there are ways to get started, even if you do -- require 'modules.biters_yield_coins' require 'modules.biter_noms_you' require 'modules.no_deconstruction_of_neutral_entities' -require 'maps.pirates.custom_events' --probably do this before anything else require 'utils.server' local _inspect = require 'utils.inspect'.inspect -- local Modifers = require 'player_modifiers' diff --git a/maps/pirates/ores.lua b/maps/pirates/ores.lua index d65b1017..5c3dcbf0 100644 --- a/maps/pirates/ores.lua +++ b/maps/pirates/ores.lua @@ -9,7 +9,7 @@ local _inspect = require 'utils.inspect'.inspect local Common = require 'maps.pirates.common' local Utils = require 'maps.pirates.utils_local' local simplex_noise = require 'utils.simplex_noise'.d2 --- local CustomEvents = require 'maps.pirates.custom_events' +-- local Public = {} @@ -151,8 +151,6 @@ function Public.try_ore_spawn(surface, realp, source_name, density_bonus, from_t end end - -- script.raise_event(CustomEvents.enum['update_crew_progress_gui'], {}) - return ret end diff --git a/maps/pirates/overworld.lua b/maps/pirates/overworld.lua index 957cc7fc..3f31d66f 100644 --- a/maps/pirates/overworld.lua +++ b/maps/pirates/overworld.lua @@ -25,11 +25,11 @@ local Crew = require 'maps.pirates.crew' -- local Parrot = require 'maps.pirates.parrot' -- local Hold = require 'maps.pirates.surfaces.hold' -- local Cabin = require 'maps.pirates.surfaces.cabin' -local Shop = require 'maps.pirates.shop.shop' +-- local Shop = require 'maps.pirates.shop.shop' local Upgrades = require 'maps.pirates.shop.boat_upgrades' local Kraken = require 'maps.pirates.surfaces.sea.kraken' local Highscore = require 'maps.pirates.highscore' -local CustomEvents = require 'maps.pirates.custom_events' + local IslandEnum = require 'maps.pirates.surfaces.islands.island_enum' @@ -591,8 +591,6 @@ function Public.check_for_destination_collisions() memory.currentdestination_index = index memory.boat.state = Boats.enum_state.ATSEA_LOADING_MAP - script.raise_event(CustomEvents.enum['update_crew_progress_gui'], {}) - local destination = Common.current_destination() Surfaces.destination_on_collide(destination) diff --git a/maps/pirates/progression.lua b/maps/pirates/progression.lua index 6c531a9d..55bd2d68 100644 --- a/maps/pirates/progression.lua +++ b/maps/pirates/progression.lua @@ -10,7 +10,7 @@ local Common = require 'maps.pirates.common' local CoreData = require 'maps.pirates.coredata' local Utils = require 'maps.pirates.utils_local' local _inspect = require 'utils.inspect'.inspect -local CustomEvents = require 'maps.pirates.custom_events' + -- local Structures = require 'maps.pirates.structures.structures' local Boats = require 'maps.pirates.structures.boats.boats' @@ -25,7 +25,7 @@ local Roles = require 'maps.pirates.roles.roles' -- local Parrot = require 'maps.pirates.parrot' -- local Quest = require 'maps.pirates.quest' -local Shop = require 'maps.pirates.shop.shop' +-- local Shop = require 'maps.pirates.shop.shop' local Overworld = require 'maps.pirates.overworld' local Hold = require 'maps.pirates.surfaces.hold' local Cabin = require 'maps.pirates.surfaces.cabin' @@ -305,8 +305,6 @@ function Public.progress_to_destination(destination_index) memory.currentdestination_index = destination_index --already done when we collide with it typically local destination = Common.current_destination() - script.raise_event(CustomEvents.enum['update_crew_progress_gui'], {}) - destination.dynamic_data.timer = 0 destination.dynamic_data.timeratlandingtime = nil destination.dynamic_data.enemyboats = {} diff --git a/maps/pirates/structures/quest_structures/furnace1/furnace1.lua b/maps/pirates/structures/quest_structures/furnace1/furnace1.lua index 795c5f12..35576353 100644 --- a/maps/pirates/structures/quest_structures/furnace1/furnace1.lua +++ b/maps/pirates/structures/quest_structures/furnace1/furnace1.lua @@ -8,7 +8,7 @@ local Common = require 'maps.pirates.common' -- local CoreData = require 'maps.pirates.coredata' -- local Utils = require 'maps.pirates.utils_local' local _inspect = require 'utils.inspect'.inspect --- local CustomEvents = require 'maps.pirates.custom_events' +-- -- local SurfacesCommon = require 'maps.pirates.surfaces.common' local Raffle = require 'maps.pirates.raffle' local ShopCovered = require 'maps.pirates.shop.covered' diff --git a/maps/pirates/structures/quest_structures/market1/market1.lua b/maps/pirates/structures/quest_structures/market1/market1.lua index 94705336..130b2e23 100644 --- a/maps/pirates/structures/quest_structures/market1/market1.lua +++ b/maps/pirates/structures/quest_structures/market1/market1.lua @@ -8,7 +8,7 @@ local Common = require 'maps.pirates.common' -- local CoreData = require 'maps.pirates.coredata' -- local Utils = require 'maps.pirates.utils_local' local _inspect = require 'utils.inspect'.inspect --- local CustomEvents = require 'maps.pirates.custom_events' +-- -- local SurfacesCommon = require 'maps.pirates.surfaces.common' local Raffle = require 'maps.pirates.raffle' local ShopCovered = require 'maps.pirates.shop.covered' diff --git a/maps/pirates/structures/quest_structures/quest_structures.lua b/maps/pirates/structures/quest_structures/quest_structures.lua index 672bd6b8..07aee3b2 100644 --- a/maps/pirates/structures/quest_structures/quest_structures.lua +++ b/maps/pirates/structures/quest_structures/quest_structures.lua @@ -8,7 +8,7 @@ local Common = require 'maps.pirates.common' local CoreData = require 'maps.pirates.coredata' local Utils = require 'maps.pirates.utils_local' local _inspect = require 'utils.inspect'.inspect --- local CustomEvents = require 'maps.pirates.custom_events' +-- local IslandEnum = require 'maps.pirates.surfaces.islands.island_enum' -- local Raffle = require 'maps.pirates.raffle' -- local ShopCovered = require 'maps.pirates.shop.covered' diff --git a/maps/pirates/surfaces/crowsnest.lua b/maps/pirates/surfaces/crowsnest.lua index 6046094c..a7d1ae0a 100644 --- a/maps/pirates/surfaces/crowsnest.lua +++ b/maps/pirates/surfaces/crowsnest.lua @@ -7,7 +7,7 @@ local Common = require 'maps.pirates.common' local CoreData = require 'maps.pirates.coredata' local Utils = require 'maps.pirates.utils_local' -- local Math = require 'maps.pirates.math' -local CustomEvents = require 'maps.pirates.custom_events' + local _inspect = require 'utils.inspect'.inspect local Token = require 'utils.token' @@ -119,8 +119,6 @@ function Public.move_crowsnest(vectorx, vectory) -- crew_force.clear_chart(surface) crew_force.chart(surface, area) end - - script.raise_event(CustomEvents.enum['update_crew_progress_gui'], {}) end function Public.update_destination_renderings() diff --git a/maps/pirates/surfaces/dock.lua b/maps/pirates/surfaces/dock.lua index bd40e9ce..eada911f 100644 --- a/maps/pirates/surfaces/dock.lua +++ b/maps/pirates/surfaces/dock.lua @@ -12,7 +12,7 @@ local Cabin = require 'maps.pirates.surfaces.cabin' local CoreData = require 'maps.pirates.coredata' local Utils = require 'maps.pirates.utils_local' local _inspect = require 'utils.inspect'.inspect -local CustomEvents = require 'maps.pirates.custom_events' + local Public = {}