games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-08 00:39:30 +02:00
Code Issues Releases Activity

v1.1.0.4

Browse Source
This commit is contained in:
danielmartin0 2022-03-13 10:55:04 +00:00
parent 9125ab5351
commit a1d26c0d58
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locale/en/pirates.cfg
View File

@ -45,4 +45,4 @@ resources_needed_tooltip_3=The captain can undock by clicking this button, but o
resources_needed_tooltip_1_rocketvariant=At the next destination, these resources will be needed in order to undock early.\n\nThe silo represents a rocket launch.
resources_needed_tooltip_2_rocketvariant=The captain can undock early by clicking this button, but only if enough resources have been stored in the captain's cabin.\n\nThe silo represents a rocket launch.
resources_needed_tooltip_3_rocketvariant=The captain can undock by clicking this button, but only if enough resources are stored in the captain's cabin.\n\nThe silo represents a rocket launch.
fuel_tooltip=__1__ stored fuel. If the ship runs out of fuel, you lose.\n\nClick to open the Captain's Store, which only the captain and their officers are authorised to use.
fuel_tooltip=__1__ stored fuel. To store more, send it to the captain's cabin. If the ship runs out of fuel, the crew loses.\n\nClick to open the Captain's Store, which only the captain and their officers are authorised to use.

4
maps/pirates/coredata.lua
View File

@ -5,8 +5,8 @@ local inspect = require 'utils.inspect'.inspect
local Public = {}
Public.scenario_id_name = 'pirates'
Public.version_string = '1.1.0.3'
Public.version_float = 1.103
Public.version_string = '1.1.0.4'
Public.version_float = 1.104
Public.blueprint_library_allowed = true
Public.blueprint_importing_allowed = true

21
maps/pirates/gui/gui.lua
View File

@ -133,12 +133,21 @@ local function create_gui(player)
-- flow2.style.right_padding = -100
flow3 = flow2.add({
name = 'fuel_label_1',
name = 'fuel_label_0',
type = 'label',
caption = ''
})
flow3.style.font = 'default-large-semibold'
flow3.style.font_color = GuiCommon.bold_font_color
flow3.caption = 'Fuel:'
flow3 = flow2.add({
name = 'fuel_label_1',
type = 'label',
caption = ''
})
flow3.style.font = 'default-large'
flow3.style.font_color = GuiCommon.default_font_color
-- flow3.style.font_color = GuiCommon.bold_font_color
-- flow4.style.top_margin = -36
-- flow4.style.left_margin = -100
@ -527,7 +536,7 @@ function Public.update_gui(player)
-- button.number = 3
-- end
pirates_flow.fuel_piratebutton_flow_1.fuel_piratebutton_flow_2.fuel_label_1.caption = 'Fuel: ' .. Utils.bignumber_abbrevform(memory.stored_fuel or 0) .. '[item=coal]'
pirates_flow.fuel_piratebutton_flow_1.fuel_piratebutton_flow_2.fuel_label_1.caption = Utils.bignumber_abbrevform(memory.stored_fuel or 0) .. '[item=coal]'
pirates_flow.fuel_piratebutton_flow_1.fuel_piratebutton_flow_2.fuel_label_2.caption = Utils.negative_rate_abbrevform(memory.fuel_depletion_rate_memoized or 0)
local color_scale = Math.max(Math.min((- (memory.fuel_depletion_rate_memoized or 0))/50, 1),0)
pirates_flow.fuel_piratebutton_flow_1.fuel_piratebutton_flow_2.fuel_label_2.style.font_color = {
@ -556,6 +565,10 @@ function Public.update_gui(player)
in_hold_bool = string.sub(player.surface.name, 9, 12) == 'Hold'
in_cabin_bool = string.sub(player.surface.name, 9, 13) == 'Cabin'
onmap_bool = destination.surface_name and (player.surface.name == destination.surface_name or (
memory.boat and memory.boat.surface_name == destination.surface_name and (in_crowsnest_bool or in_hold_bool or in_cabin_bool)
))
if destination and destination.dynamic_data then
eta_bool = destination.dynamic_data.time_remaining and destination.dynamic_data.time_remaining > 0 and onmap_bool
retreating_bool = memory.boat and memory.boat.state and memory.boat.state == Boats.enum_state.RETREATING and onmap_bool
@ -574,10 +587,6 @@ function Public.update_gui(player)
end
if memory.boat then
onmap_bool = destination.surface_name and (player.surface.name == destination.surface_name or (
memory.boat.surface_name == destination.surface_name and (in_crowsnest_bool or in_hold_bool or in_cabin_bool)
))
atsea_loading_bool = memory.boat.state == Boats.enum_state.ATSEA_LOADING_MAP and memory.loadingticks
character_on_deck_bool = player.character and player.character.position and player.surface.name and player.surface.name == memory.boat.surface_name

2
maps/pirates/main.lua
View File

@ -56,6 +56,8 @@ local Upgrades = require 'maps.pirates.boat_upgrades'
local Token = require 'utils.token'
local Task = require 'utils.task'
require 'utils.profiler'
local Public = {}
-- parrot sprites from https://elthen.itch.io/2d-pixel-art-parrot-sprites, licensed appropriately