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.

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

Flying empty fix #3516

Merged
merged 1 commit into from
Dec 23, 2015
Merged

Conversation

robothauler
Copy link
Contributor

This fixes the behaviour that the player couldn't take a cargorun pickup mission if he hasn't enough free cargo space at the moment. laarmen advised me to use the equipment API but until the volume/mass thing is improved this PR seems to be the only practical solution IMHO.

@impaktor impaktor self-assigned this Nov 6, 2015
@@ -343,7 +343,8 @@ local onChat = function (form, ref, option)
form:SetMessage(howmuch)

elseif option == 3 then
if Game.player.freeCapacity < ad.amount then
if (not ad.pickup and Game.player.freeCapacity < ad.amount) or
(ad.pickup and Game.player.totalCargo < ad.amount) then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No Game.player:GetEquipFree("cargo")?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know how to deal with #3450. Besides that I have messed up something with this PR.

@impaktor impaktor removed their assignment Nov 7, 2015
@fluffyfreak
Copy link
Contributor

So this just needs a one line change to Game.player:GetEquipFree("cargo") and then it's good for testing/merging yes?

@fluffyfreak
Copy link
Contributor

Bump!

@robothauler
Copy link
Contributor Author

I would merge this as is. I think changing this will not work at the moment. I'm not sure.

fluffyfreak added a commit that referenced this pull request Dec 23, 2015
@fluffyfreak fluffyfreak merged commit fc2cb47 into pioneerspacesim:master Dec 23, 2015
@robothauler robothauler deleted the flying_empty_fix branch June 26, 2016 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants