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

Jump to bottom

Refuel - Added ability to refuel fuel sources #8981

Merged
merged 30 commits into from
Feb 17, 2023
Merged

Refuel - Added ability to refuel fuel sources #8981

merged 30 commits into from
Feb 17, 2023

Conversation

Quantx
Copy link
Contributor

@Quantx Quantx commented Jul 25, 2022 •
edited
Loading

When merged this pull request will:

  • Added ability to refuel fuel truck's tanks and jerry cans
  • Added a separate flow rate option for filling fuel sources to account for the vastly larger volumes
  • Fuel counter now behaves the same for both limited and unlimited fuel sources
  • Improved fuel transfer process to ensure that no fuel is lost during the transfer
  • Added action to jerry cans to check how much fuel is left
  • Prevented fuel source objects from being dragged, carried or loaded into vehicles while they are being refueled or are refueling something

This PR is intended to supplant #7039 by @BaerMitUmlaut

BaerMitUmlaut and others added 15 commits June 8, 2019 00:32
@BaerMitUmlaut
Simplify main fuel loop
c2984f7
@BaerMitUmlaut
Remove unecessary action macro
16221b5
@BaerMitUmlaut
Add container refueling
8e549b6
@Quantx
Merge branch 'master' into refuel-containers
0bbc067 
Conflicts:
	addons/refuel/CfgVehicles.hpp
	addons/refuel/functions/fnc_onMouseButtonDown.sqf
	addons/refuel/functions/fnc_refuel.sqf
	addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
@Quantx
Fuel counter behaviour is now consistent for both limited and unlimit…
c7360c6 
…ed fuel sources
@Quantx
Update maxFuel and refuelContainer whenever fueling begins
9c82960
@Quantx
Update maxFuel and refuelContainer whenever fueling begins
d6587a3
@Quantx
Merge branch 'refuel-containers' of github.com:Quantx/ACE3 into refue…
89c8bb1 
…l-containers
@Quantx
Prevent loading of fuel sources into cargo when they have a nozzle co…
13fd11e 
…nnected to them
@Quantx
Added action to check how much fuel is left in a jerry can
433da54
@Quantx
Prevent jerry cans from being picked up if they have a nozzle connect…
36c50c4 
…ed to them
@Quantx
Added function to check if a nozzle can be connected to an object
9e3afac
@Quantx
Prevent fuel sources which have their nozzle deployed from being loaded
61926dc
@Quantx
Compute both tank volumes inside of refuel instead of durring turn on
e9a501f
@Quantx
Didn't mean to delete these
b606bab
@Quantx
Copy link
Contributor Author

Quantx commented Jul 25, 2022 •
edited
Loading

I noticed that fuel trucks with big fuel containers can take ages to fill compared to vehicles with smaller tanks. The HEMTT fuel truck for example has fuel tank capacity of about 600 liters, while it can store up to 10,000 liters. Should we implement some sort of flow rate multiplier for refilling fuel trucks' containers vs their tanks?

@severgun
Copy link
Contributor

severgun commented Jul 27, 2022 •
edited
Loading

From gameplay standpoint multiplier definitely should be implemented.
From IRL it should consider source pump performance, hose diameter and target fitting size. Aircrafts refuel at 1500-2200 L/min

@LupusTheCanine
Copy link
Contributor

From gameplay standpoint multiplier definitely should be implemented. From IRL it should consider source pump performance, hose diameter and target fitting size. Aircrafts refuel at 1500-2200 L/min

It would be nice if each vehicle had max intake rate and sources had max flow rate. It would then pick lower of the two values.

@Quantx
Copy link
Contributor Author

Quantx commented Nov 23, 2022

I completely agree with both of the above comments. For now I've implemented a separate flow rate multiplier option for filling cargo fuel sources. It's 10x the standard refueling rate by default which should make filling huge tanks less of a pain. Adding dedicated input/output flow rates for each tank is a great idea and I'll probably implement something like this in t he future.

BaerMitUmlaut
BaerMitUmlaut requested changes Nov 23, 2022
View reviewed changes
addons/refuel/CfgVehicles.hpp Outdated Show resolved Hide resolved
@Quantx Quantx requested a review from BaerMitUmlaut November 24, 2022 03:35
@Drofseh
Copy link
Contributor

Drofseh commented Nov 26, 2022

@Quantx would you be able to make your variable names a little more verbose? Stuff like _bb, _ll, and _rr makes it a little hard to understand.

@Quantx
Copy link
Contributor Author

Quantx commented Nov 27, 2022

@Dystopian Fixed the isNull( cases and added newlines to every file.

@Quantx Quantx requested review from BrettMayson and removed request for BaerMitUmlaut November 27, 2022 08:44
@Quantx Quantx requested review from BaerMitUmlaut and removed request for BrettMayson November 30, 2022 02:20
@LinkIsGrim LinkIsGrim mentioned this pull request Dec 4, 2022
Closed
@Quantx
Merge branch 'master' into refuel-containers
1783470 
Conflicts:
	addons/refuel/CfgVehicles.hpp
@Mirviriam
Copy link

I read thru the changes & it looks like both requests were fulfilled - is there something else holding feature back or just that we need to bump?

@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Jan 23, 2023
@PabstMirror PabstMirror self-requested a review January 23, 2023 03:20
@Quantx
Copy link
Contributor Author

Quantx commented Jan 24, 2023

I have nothing left to add to this feature at this point and I've made all the requested changes. So unless there are any other suggestions or changes anyone wants to make, this should be good to merge.

PabstMirror
PabstMirror approved these changes Jan 24, 2023
View reviewed changes
Copy link
Contributor

@PabstMirror PabstMirror left a comment

Choose a reason for hiding this comment

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

everything else looks good

@Quantx @PabstMirror
Only setFuel once per jerry can creation
5dfdcf7 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@PabstMirror PabstMirror added this to the 3.16.0 milestone Jan 28, 2023
@PabstMirror PabstMirror mentioned this pull request Jan 28, 2023
Merged
3 tasks
BaerMitUmlaut
BaerMitUmlaut previously requested changes Jan 30, 2023
View reviewed changes
addons/refuel/functions/fnc_getFuel.sqf Outdated Show resolved Hide resolved
@Quantx Quantx requested a review from BaerMitUmlaut February 1, 2023 04:02
@PabstMirror PabstMirror merged commit edf4a70 into acemod:master Feb 17, 2023
@BrettMayson BrettMayson mentioned this pull request May 16, 2023
Closed
@jonpas jonpas added kind/feature Release Notes: **ADDED:** and removed kind/enhancement Release Notes: **IMPROVED:** labels Jun 28, 2023
@killerswin2 killerswin2 mentioned this pull request Nov 25, 2023
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dystopian Dystopian Dystopian requested changes

@PabstMirror PabstMirror PabstMirror approved these changes

@BrettMayson BrettMayson BrettMayson approved these changes

@BaerMitUmlaut BaerMitUmlaut Awaiting requested review from BaerMitUmlaut

Assignees
No one assigned
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Milestone
3.16.0
Development

Successfully merging this pull request may close these issues.
10 participants
@Quantx @severgun @LupusTheCanine @Drofseh @Dystopian @Mirviriam @BrettMayson @PabstMirror @BaerMitUmlaut @jonpas