1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2024-12-28 23:06:38 +02:00
This commit is contained in:
danielmartin0 2022-09-13 22:09:25 +01:00
parent bbc71d6a3e
commit b3fb6040a3
5 changed files with 10 additions and 14 deletions

View File

@ -1248,7 +1248,7 @@ local function event_on_research_finished(event)
if (not (memory.game_lost)) then --this condition should prevent discord messages being fired when the crew disbands and gets reset
-- using a localised string means we have to write this out (recall that "" signals concatenation)
memory.force.print({"", '>> ', {'pirates.research_notification', research.localised_name}}, CoreData.colors.notify_force_light)
Server.to_discord_embed_raw({'', '[' .. memory.name .. '] ', {'pirates.research_notification', game.technology_prototypes[research.name].localised_name}}, true)
end

View File

@ -379,7 +379,6 @@ function Public.quest_reward_multiplier()
end
function Public.island_richness_avg_multiplier()
local ret
local base = 0.73
local additional = 0.120 * Math.clamp(0, 7, (Common.overworldx()/40)^(65/100) * Math.sloped(Public.crew_scale(), 1/40)) --tuned tbh

View File

@ -71,12 +71,12 @@ function Public.full_update(player)
local destination = Common.current_destination()
local evolution_leagues
local evolution_kraken
local evolution_time
local evolution_silo
local evolution_nests
local evolution_sandwurms
local evolution_leagues = 0
local evolution_kraken = 0
local evolution_time = 0
local evolution_silo = 0
local evolution_nests = 0
local evolution_sandwurms = 0
local evolution_total
local types = {'leagues', 'kraken', 'time', 'silo', 'nests', 'sandwurms'}
@ -143,7 +143,7 @@ function Public.full_update(player)
button.number = evolution_total
button.tooltip = str
if evolution_total > 1.0 then
button.sprite = 'entity/behemoth-worm-turret'
elseif evolution_total >= 0.9 then

View File

@ -123,8 +123,6 @@ local function on_init()
game.create_force(Common.get_ancient_friendly_force_name(id))
game.create_force(Common.get_ancient_hostile_force_name(id))
local crew_force = game.create_force(Common.get_crew_force_name(id))
Crew.reset_crew_and_enemy_force(id)
end
@ -279,9 +277,9 @@ local function crew_tick()
memory.crew_disband_tick_message = nil
local message1 = {'pirates.crew_disband_tick_message', 30}
Common.notify_force(memory.force, message1)
Server.to_discord_embed_raw({'', '[' .. memory.name .. '] ', message1}, true)
end
end

View File

@ -129,7 +129,6 @@ Public.market_sales = {
function Public.create_dock_markets(surface, p)
local memory = Memory.get_crew_memory()
local destination = Common.current_destination()
if not (surface and p) then return end