1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-03-25 21:29:06 +02:00

fix: errors that arose during string refactoring

This commit is contained in:
danielmartin0 2022-05-30 08:44:52 +01:00
parent e3e58e3596
commit 03f7da2b95
10 changed files with 18 additions and 16 deletions

View File

@ -16,7 +16,7 @@ softmod_info_tips_1=Features of the game that are hard to work out alone
softmod_info_tips_2=• The captain can steer the boat from the crow's nest by placing 100 rail signals in one of the blue boxes.\n• Resources granted to the ship appear in the captain's cabin.\n• Charging a silo drains power from everything else on its network.\n• The quantity of ore available on an island is independent of the order in which you break rocks.\n• Passive pollution ramps up over time on each island.\n• The strength of attacks is proportional to the number of remaining nests. (The time-based rate of evolution is proportional to nests too, but destroying a nest will immediately jump evolution by most of the amount it 'would have' made had it survived.)\n• Lab productivity increases with each league.\n• Logged-out players keep their items with them for a while — except 'important' items that are returned to the crew immediately.\n• item-on-ground entities on the deck are moved to the cabin when the boat moves, for performance reasons.\n• Commands: /ccolor gives you a fun color. /classinfo {classname} gives the description of the named class. To manage your class, use /take {classname} or /giveup. Captains also have /tax, /undock, /officer, /plank.
softmod_info_updates_1=Recent changes
softmod_info_updates_2=v1.2.4-v1.2.6\n• String-related hotfixes.\n\nv1.2.3\n• Rework of 'quest buildings' that appear on islands.\n• Fixed stutter when loading certain maps, such as swamp.\n• Various new player-friendly visual renderings.\n• Mod prepared for translation into other languages.\n• Expanded Gourmet's sense of taste.\n\nv1.2.2\n• Fixed crashes introduced in 1.2.1.\n• Kraken kill reward buffed.\n\nv1.2\n• Mod portal release.\n• Some rebalancing of Nightmare difficulty.
softmod_info_updates_2=v1.2.4-v1.2.7\n• String-related hotfixes.\n\nv1.2.3\n• Rework of 'quest buildings' that appear on islands.\n• Fixed stutter when loading certain maps, such as swamp.\n• Various new player-friendly visual renderings.\n• Mod prepared for translation into other languages.\n• Expanded Gourmet's sense of taste.\n\nv1.2\n• Mod portal release.\n• Some rebalancing of Nightmare difficulty.
softmod_info_credits_1=Credits
softmod_info_credits_2=Pirate Ship designed and coded by thesixthroc. Comfy codebase and help from Gerkiz, Hanakocz and Mew @ Comfy Industries (https://getcomfy.eu). Some island structure blueprints contributed by Mattisso.\n\nthesixthroc is looking for translators and coders to help with this mod. Come chat with us: https://getcomfy.eu/discord\n\n"Those white gloves. I'll never forget them 'till the day I die." - Dr. John
@ -243,7 +243,7 @@ roles_confirm_captain_error_2=Command error: You're not temporary, so you don't
roles_renounce_captain=__1__ renounces their title of captain.
roles_renounce_captain_error_1=Command error: But you're the only crew member...
roles_pass_captainhood=__1__ has passed their title of captain to __2__.
roles_lose_captainhood_by_afk=__1__ was removed as captain due to being afk.
roles_lose_captainhood_by_afk=__1__ was afk.
roles_ask_player_about_captainhood_variant_1=__1__, would you like to be captain? If yes say /ok
roles_ask_player_about_captainhood_variant_2=__1__, captain? If yes say /ok
roles_ask_player_about_captainhood_variant_3=__1__, is it your turn to be captain? If yes say /ok

View File

@ -128,7 +128,7 @@ function Public.wave_size_rng() -- random variance in attack sizes
local wave_size_multiplier = 1
local memory = Memory.get_crew_memory()
local rng1 = Math.random(100)
if rng1 <= 65 then
if rng1 <= 68 then
wave_size_multiplier = 0
elseif memory.overworldx > 0 then
local rng2 = Math.random(1000)

View File

@ -276,8 +276,8 @@ local function damage_to_players_changes(event)
local damage_multiplier = 1
if event.damage_type.name == 'poison' then --make all poison damage stronger
damage_multiplier = damage_multiplier * 1.5
if event.damage_type.name == 'poison' then --make all poison damage stronger against players
damage_multiplier = damage_multiplier * 1.85
else
if class and class == Classes.enum.SCOUT then
damage_multiplier = damage_multiplier * 1.25

View File

@ -5,7 +5,7 @@ local _inspect = require 'utils.inspect'.inspect
local Public = {}
Public.scenario_id_name = 'pirates'
Public.version_string = '1.2.6' --will now try to stick to major.minor.patch versioning, to match factorio mod portal
Public.version_string = '1.2.7' --will now try to stick to major.minor.patch versioning, to match factorio mod portal
Public.blueprint_library_allowed = true
Public.blueprint_importing_allowed = true

View File

@ -476,7 +476,7 @@ function Public.full_update(player)
for i, c in ipairs(memory.spare_classes) do
if i>1 then
str[#str+1] = {'', 'pirates.separator_1', Classes.display_form(c)} -- we need to do nesting here, because you can't contanenate more than 20 localised strings. Watch out!
str[#str+1] = {'', {'pirates.separator_1'}, Classes.display_form(c)} -- we need to do nesting here, because you can't contanenate more than 20 localised strings. Watch out!
--@TODO: In fact we should nest iteratively, as this still caps out around 19 classes.
else
str[#str+1] = {'', Classes.display_form(c)}
@ -564,17 +564,17 @@ function Public.click(event)
if string.sub(eventname, 1, 13) and string.sub(eventname, 1, 13) == 'assign_class_' then
local other_id = tonumber(flow.members.body.members_listbox.get_item(flow.members.body.members_listbox.selected_index)[2])
Classes.assign_class(other_id, tonumber(string.sub(eventname, 14, -1)))
Classes.assign_class(other_id, string.sub(eventname, 14, -1))
return
end
if string.sub(eventname, 1, 17) and string.sub(eventname, 1, 17) == 'selfassign_class_' then
Classes.assign_class(player.index, tonumber(string.sub(eventname, 18, -1)), true)
Classes.assign_class(player.index, string.sub(eventname, 18, -1), true)
return
end
if string.sub(eventname, 1, 18) and string.sub(eventname, 1, 18) == 'difficulty_option_' then
Crew.difficulty_vote(player.index, tonumber(string.sub(eventname, 19, -1)))
Crew.difficulty_vote(player.index, string.sub(eventname, 19, -1))
return
end

View File

@ -240,8 +240,8 @@ end
function Public.covered_wooden_chest_loot_1()
return {
{name = 'iron-plate', count = 180},
{name = 'copper-plate', count = 180}
{name = 'iron-plate', count = 500},
{name = 'copper-plate', count = 200}
}
end
@ -285,7 +285,7 @@ end
function Public.roboport_bots_loot()
return {
{name = 'logistic-robot', count = 5},
{name = 'logistic-robot', count = 8},
}
-- construction robots
end

View File

@ -208,7 +208,7 @@ function Public.update_character_properties(tickinterval)
local speed_boost = Balance.base_extra_character_speed
if memory.speed_boost_characters and memory.speed_boost_characters[player_index] then
speed_boost = speed_boost + 0.75
speed_boost = speed_boost + 0.85
else
if memory.classes_table and memory.classes_table[player_index] then
local class = memory.classes_table[player_index]

View File

@ -52,7 +52,7 @@ Public.market_permanent_offers = {
Public.market_sales = {
{price = {{'coin', 3000}}, offer = {type = 'give-item', item = 'coal', count = 900}},
{price = {{'coin', 3000}}, offer = {type = 'give-item', item = 'piercing-rounds-magazine', count = 75}},
{price = {{'coin', 3000}}, offer = {type = 'give-item', item = 'uranium-rounds-magazine', count = 30}},
{price = {{'coin', 3000}}, offer = {type = 'give-item', item = 'uranium-rounds-magazine', count = 20}},
{price = {{'coin', 3000}}, offer = {type = 'give-item', item = 'piercing-shotgun-shell', count = 50}},
{price = {{'coin', 3000}}, offer = {type = 'give-item', item = 'raw-fish', count = 300}},
{price = {{'coin', 3000}}, offer = {type = 'give-item', item = 'laser-turret', count = 1}},

View File

@ -129,6 +129,7 @@ function Public.create_step2_entities()
local inv = e.get_inventory(defines.inventory.chest)
local loot = Loot.covered_wooden_chest_loot()
if k==1 then loot[1] = {name = 'coin', count = 2000} end
--@TODO: log this in coin stats
for j = 1, #loot do
local l = loot[j]
inv.insert(l)

View File

@ -145,7 +145,8 @@ local free_labyrinth_cell_raffle = {
maze_belts_3 = 0.28,
maze_belts_4 = 0.28,
maze_mines = 0.1,
maze_treasure = 0.74,
maze_treasure = 0.92,
-- maze_treasure = 0.74,
}
local function free_labyrinth_cell_type(args)