From 71aa65cfd2aa8b9d6848e14ea4b49e57cd65af41 Mon Sep 17 00:00:00 2001 From: danielmartin0 Date: Tue, 29 Oct 2024 14:22:52 +0000 Subject: [PATCH] luacheck --- maps/pirates/buried_treasure.lua | 16 ++++++++-------- maps/pirates/gui/classes.lua | 4 ++-- maps/pirates/gui/gui.lua | 3 ++- maps/pirates/gui/treasure.lua | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/maps/pirates/buried_treasure.lua b/maps/pirates/buried_treasure.lua index ca904fa9..148d753e 100644 --- a/maps/pirates/buried_treasure.lua +++ b/maps/pirates/buried_treasure.lua @@ -1,14 +1,14 @@ -- 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 Common = require('maps.pirates.common') -local Memory = require('maps.pirates.memory') +-- local Memory = require('maps.pirates.memory') local Math = require('maps.pirates.math') local _inspect = require('utils.inspect') local Token = require('utils.token') local Public = {} -function Public.pick_up_treasure_tick(tick_interval) +function Public.pick_up_treasure_tick() if Common.activecrewcount() == 0 then return end @@ -29,7 +29,6 @@ function Public.pick_up_treasure_tick(tick_interval) local maps = dynamic_data.treasure_maps or {} local buried_treasure = dynamic_data.buried_treasure or {} - local ghosts = dynamic_data.ghosts or {} for i = 1, #maps do local map = maps[i] @@ -80,7 +79,7 @@ function Public.pick_up_treasure_tick(tick_interval) end end -function Public.buried_treasure_tick(tick_interval) +function Public.buried_treasure_tick() if Common.activecrewcount() == 0 then return end @@ -166,15 +165,16 @@ function Public.buried_treasure_tick(tick_interval) if destination.dynamic_data.treasure_remaining == 0 then -- destroy all local buried_treasure = destination.dynamic_data.buried_treasure - for _, t2 in pairs(buried_treasure) do - t2 = nil + for k, _ in pairs(buried_treasure) do + buried_treasure[k] = nil end + local maps = destination.dynamic_data.treasure_maps - for _, m in pairs(maps) do + for k, m in pairs(maps) do if m.state == 'on_ground' then m.mapobject_rendering.destroy() end - m = nil + maps[k] = nil end elseif t.count <= 0 then treasure.treasure = nil diff --git a/maps/pirates/gui/classes.lua b/maps/pirates/gui/classes.lua index 6ca3cf79..1fa0215a 100644 --- a/maps/pirates/gui/classes.lua +++ b/maps/pirates/gui/classes.lua @@ -109,13 +109,13 @@ function Public.toggle_window(player) flow = GuiCommon.new_window(player, window_name) flow.caption = { 'pirates.gui_classes' } - + -- Set the window position local gui_memory = Memory.get_global_memory().player_gui_memories[player.index] if gui_memory and gui_memory[window_name] and gui_memory[window_name].position then flow.location = gui_memory[window_name].position else - flow.location = GuiCommon.default_window_positions[window_name] or {x = 300, y = 76} + flow.location = GuiCommon.default_window_positions[window_name] or { x = 300, y = 76 } end flow.style.maximal_width = 500 diff --git a/maps/pirates/gui/gui.lua b/maps/pirates/gui/gui.lua index 771162a9..aff218a4 100644 --- a/maps/pirates/gui/gui.lua +++ b/maps/pirates/gui/gui.lua @@ -1039,7 +1039,8 @@ function Public.update_gui(player) flow1 = pirates_flow.treasure_piratebutton_frame local maps = BuriedTreasure.get_picked_up_treasure_maps() flow1.visible = #maps > 0 - local flow2 = flow1.treasure_piratebutton + + flow2 = flow1.treasure_piratebutton flow2.tooltip = { 'pirates.gui_treasure_tooltip', #maps } flow2.number = #maps diff --git a/maps/pirates/gui/treasure.lua b/maps/pirates/gui/treasure.lua index eb642b32..6687d051 100644 --- a/maps/pirates/gui/treasure.lua +++ b/maps/pirates/gui/treasure.lua @@ -6,7 +6,7 @@ local _inspect = require('utils.inspect').inspect local GuiCommon = require('maps.pirates.gui.common') local BuriedTreasure = require('maps.pirates.buried_treasure') local Common = require('maps.pirates.common') -local Memory = require('maps.pirates.memory') +-- local Memory = require('maps.pirates.memory') local Surfaces = require('maps.pirates.surfaces.surfaces') local Public = {}