Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

small fixes #424

Merged
merged 2 commits into from
Oct 23, 2023
Merged

small fixes #424

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdfd99d
small fixes
hanakocz Oct 23, 2023
1f9f416
fix typo
hanakocz Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions maps/journey/functions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ function Public.create_the_world(journey)
local m = (100 + modifier.value) * 0.01
local name = modifier.name
local extremes = {Constants.modifiers[name].min, Constants.modifiers[name].max}
journey.world_modifiers[name] = math.round(math.min(extremes[2], math.max(extremes[1], journey.world_modifiers[name] * m)), 5)
journey.world_modifiers[name] = math.round(math.min(extremes[2], math.max(extremes[1], journey.world_modifiers[name] * m)) * 100000, 5) / 100000
end
surface.map_gen_settings = mgs
set_map_modifiers(journey)
Expand Down Expand Up @@ -1344,10 +1344,12 @@ function Public.world(journey)
local inventory = silo.get_inventory(defines.inventory.rocket_silo_rocket) or {}
local slot = inventory[1]
if slot and slot.valid and slot.valid_for_read then
local needs = (journey.mothership_cargo_space[slot.name] or 0) - (journey.mothership_cargo[slot.name] or 0)
if needs > 0 and slot.count >= math.min(game.item_prototypes[slot.name].stack_size, needs) then
local name = slot.name
local count = slot.count
local needs = (journey.mothership_cargo_space[name] or 0) - (journey.mothership_cargo[name] or 0)
if needs > 0 and count >= math.min(game.item_prototypes[name].stack_size, needs) then
if silo.launch_rocket() then
table.insert(journey.mothership_messages, {'journey.message_rocket_launched', slot.count, slot.name, silo.position.x, silo.position.y})
table.insert(journey.mothership_messages, {'journey.message_rocket_launched', count, name, silo.position.x, silo.position.y})
end
end
end
Expand Down