X Tutup
Skip to content

Some lua fixes #5413

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

Merged
sturnclaw merged 2 commits into from
Nov 6, 2022
Merged

Some lua fixes #5413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3861235
fix search & rescue - do not take ship without cabin capacity for mis…
azieba Nov 2, 2022
4e46a85
fix ignoring stock when buying on commidity market
azieba Nov 2, 2022
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
6 changes: 4 additions & 2 deletions data/modules/SearchRescue/SearchRescue.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,11 @@ local createTargetShipParameters = function (flavour)
end
if (shipdef.capacity-drive.capabilities.mass) / 10 < 1 then shipdefs[i] = nil end
end
elseif flavour.pickup_pass > 0 then
end

if flavour.pickup_pass > 0 then
for i,shipdef in pairs(shipdefs) do
if shipdef.capacity * 10 < flavour.pickup_pass then shipdefs[i] = nil end
if shipdef.slots["cabin"] < flavour.pickup_pass then shipdefs[i] = nil end
end
end

Expand Down
4 changes: 2 additions & 2 deletions data/pigui/libs/commodity-market.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ function CommodityMarketWidget:ChangeTradeAmount(delta)
if self.tradeModeBuy then
local playerfreecargo = Game.player.totalCargo - Game.player.usedCargo
if tradecost > playerCash then
wantamount = math.floor(playerCash / price)
wantamount = math.min(wantamount, math.floor(playerCash / price))
end
local tradecargo = self.selectedItem.capabilities.mass * wantamount
if playerfreecargo < tradecargo then
wantamount = math.floor(playerfreecargo / self.selectedItem.capabilities.mass)
wantamount = math.min(wantamount, math.floor(playerfreecargo / self.selectedItem.capabilities.mass))
end
self.tradeText = l.MARKET_BUYLINE
else --mode = sell
Expand Down
X Tutup