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

Fix dirty fuel #44045 #44689

Merged
merged 1 commit into from
Oct 8, 2020
Merged

Conversation

irwiss
Copy link
Contributor

@irwiss irwiss commented Oct 7, 2020

Summary

SUMMARY: None

Purpose of change

Fix #44045 (most likely)

Describe the solution

Buying fuel from the terminal swaps the gas pump for null terrain, then puts
fuel on tile, then swaps terrain back to gas pump. When fuel is put on null terrain
there's no LIQUIDCONT flag on the tile so it receives DIRTY flag.

Then a few vehicle functions disagree on handling flag differences which is why
there's the debug popup in the linked issue - but that needs another PR to fix.

For now this patch removes terrain swapping and puts LIQUIDCONT on non-broken
gas pumps which prevents DIRTY flag.

Describe alternatives you've considered

Testing

Spawn gas station special with terminals to buy more fuel.
Spill all fuel out of the pumps
Buy more fuel - the fuel should have no dirty flag, should refuel and stack in tanks with other fuel of same type

Additional context

@Fris0uman
Copy link
Contributor

Fris0uman commented Oct 7, 2020

Does That mean I can drop water on the gas pump and have it behave like it contains water? Can I fill the gas pump with milk?

@irwiss
Copy link
Contributor Author

irwiss commented Oct 7, 2020

No, dropping is blocked both via D and AIM, not sure if there's other ways to drop

@Fris0uman
Copy link
Contributor

Throwing? There's no weird prompt when examining the pump?

@irwiss
Copy link
Contributor Author

irwiss commented Oct 7, 2020

No weird prompt - just regular gas pump messages/dialog

Throwing produces weird results... Tried throwing bottles of whiskey at it -
the liquid gets dropped, but bottles don't actually shatter, so you get
spilled whiskey and intact bottle with whiskey dropped, but looks like it's
a separate bug that happens even if i compile without patch

@irwiss
Copy link
Contributor Author

irwiss commented Oct 7, 2020

Seems it's already open #43252 but regardless it doesn't seem to insert liquid into the pump

@esotericist esotericist added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Oct 7, 2020
@Rivet-the-Zombie Rivet-the-Zombie merged commit 68fd989 into CleverRaven:master Oct 8, 2020
@irwiss irwiss deleted the fix-dirty-fuel branch October 8, 2020 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using a 3L jar of Gasoline to refill a 60L Gasoline tank is impossible
4 participants