1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-24 03:47:58 +02:00
This commit is contained in:
danielmartin0 2022-05-29 12:43:31 +01:00
parent fa1a5ff5a6
commit f73765515b
16 changed files with 44 additions and 53 deletions

View File

@ -1,10 +1,10 @@
local Public = {}
local Math = require 'maps.pirates.math'
local Raffle = require 'maps.pirates.raffle'
-- local Raffle = require 'maps.pirates.raffle'
-- local Memory = require 'maps.pirates.memory'
local Common = require 'maps.pirates.common'
local Utils = require 'maps.pirates.utils_local'
-- local Utils = require 'maps.pirates.utils_local'
local _inspect = require 'utils.inspect'.inspect
-- this file is an API to all the balance tuning knobs

View File

@ -167,7 +167,6 @@ end
function Public.parrot_speak(force, message)
force.print({"", {'pirates.notify_parrot'}, ' ', message}, CoreData.colors.parrot)
local memory = Memory.get_crew_memory()
Server.to_discord_embed_raw({"", {'pirates.notify_parrot'}, ' ', message}, true)
end

View File

@ -405,7 +405,6 @@ function Public.leave_crew(player, to_lobby, quiet)
if char and char.valid then
-- local p = char.position
-- local surface_name = char.surface.name
local message
if not quiet then
Common.notify_force(player.force, {'pirates.crew_leave', player.name})
-- else

View File

@ -1,12 +1,12 @@
-- local Math = require 'maps.pirates.math'
local Memory = require 'maps.pirates.memory'
-- local Memory = require 'maps.pirates.memory'
local _inspect = require 'utils.inspect'.inspect
-- local Token = require 'utils.token'
-- local CoreData = require 'maps.pirates.coredata'
-- local Task = require 'utils.task'
-- local Balance = require 'maps.pirates.balance'
local Common = require 'maps.pirates.common'
-- local Common = require 'maps.pirates.common'
-- local Utils = require 'maps.pirates.utils_local'
local Public = {}

View File

@ -134,7 +134,6 @@ function Public.assign_class(player_index, class, self_assigned)
local force = memory.force
if force and force.valid then
local message
if self_assigned then
Common.notify_force_light(force,{'pirates.class_take_spare', player.name, Public.display_form(memory.classes_table[player_index]), Public.explanation(memory.classes_table[player_index])})
else

View File

@ -3,11 +3,11 @@ local Memory = require 'maps.pirates.memory'
local Math = require 'maps.pirates.math'
local Balance = require 'maps.pirates.balance'
local Common = require 'maps.pirates.common'
local CoreData = require 'maps.pirates.coredata'
local Utils = require 'maps.pirates.utils_local'
-- 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 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'
local Classes = require 'maps.pirates.roles.classes'
@ -20,7 +20,6 @@ Public.Data = require 'maps.pirates.structures.quest_structures.furnace1.data'
function Public.create_step1_entities()
local memory = Memory.get_crew_memory()
local destination = Common.current_destination()
local surface = game.surfaces[destination.surface_name]

View File

@ -3,11 +3,11 @@ local Memory = require 'maps.pirates.memory'
local Math = require 'maps.pirates.math'
local Balance = require 'maps.pirates.balance'
local Common = require 'maps.pirates.common'
local CoreData = require 'maps.pirates.coredata'
local Utils = require 'maps.pirates.utils_local'
-- 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 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'
local Classes = require 'maps.pirates.roles.classes'
@ -18,7 +18,6 @@ Public.Data = require 'maps.pirates.structures.quest_structures.market1.data'
function Public.create_step1_entities()
local memory = Memory.get_crew_memory()
local destination = Common.current_destination()
local surface = game.surfaces[destination.surface_name]

View File

@ -1,17 +1,17 @@
local Memory = require 'maps.pirates.memory'
local Math = require 'maps.pirates.math'
local Balance = require 'maps.pirates.balance'
-- local Balance = require 'maps.pirates.balance'
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 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'
local Classes = require 'maps.pirates.roles.classes'
local Loot = require 'maps.pirates.loot'
-- local Raffle = require 'maps.pirates.raffle'
-- local ShopCovered = require 'maps.pirates.shop.covered'
-- local Classes = require 'maps.pirates.roles.classes'
-- local Loot = require 'maps.pirates.loot'
local Public = {}
@ -45,8 +45,6 @@ function Public.initialise_cached_quest_structure(position, quest_structure_type
local destination = Common.current_destination()
local surface = game.surfaces[destination.surface_name]
local special_to_return
if quest_structure_type == enum.MARKET1 then
local structurePath = Public[enum.MARKET1]
@ -190,8 +188,6 @@ function Public.initialise_cached_quest_structure(position, quest_structure_type
end
log('quest structure position: ' .. position.x .. ', ' .. position.y)
return special_to_return
end

View File

@ -2,7 +2,7 @@
local Memory = require 'maps.pirates.memory'
local Math = require 'maps.pirates.math'
local Balance = require 'maps.pirates.balance'
local Structures = require 'maps.pirates.structures.structures'
-- local Structures = require 'maps.pirates.structures.structures'
local Boats = require 'maps.pirates.structures.boats.boats'
local Common = require 'maps.pirates.common'
local CoreData = require 'maps.pirates.coredata'

View File

@ -15,7 +15,7 @@ local Cabin = require 'maps.pirates.surfaces.cabin'
local Islands = require 'maps.pirates.surfaces.islands.islands'
local Crowsnest = require 'maps.pirates.surfaces.crowsnest'
local Quest = require 'maps.pirates.quest'
local Parrot = require 'maps.pirates.parrot'
-- local Parrot = require 'maps.pirates.parrot'
local ShopMerchants = require 'maps.pirates.shop.merchants'
local SurfacesCommon = require 'maps.pirates.surfaces.common'
-- local Roles = require 'maps.pirates.roles.roles'