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

⛽ Fuel Support Rework #2251

Merged
merged 8 commits into from
Feb 15, 2022
Merged

⛽ Fuel Support Rework #2251

merged 8 commits into from
Feb 15, 2022

Conversation

killerswin2
Copy link

@killerswin2 killerswin2 commented Feb 13, 2022 •
edited by CalebSerafin
Loading

What type of PR is this.

  1. Bug
  2. Change
  3. Enhancement

What have you changed and why?

  • Made fuel only buyable with the commander.
  • Fixed fuel station capitalization.
  • Changed starting fuel amount for ace in stations
  • Added Land_vn_usaf_fueltank_75_01 to cam.
  • No more garaging fuel, now only selling.
  • Also changed fuel station marker colour and alpha.

Please specify which Issue this PR Resolves.

replaces #2216
closes #2213

Please verify the following and ensure all checks are completed.

  1. Have you loaded the mission in LAN host?
  2. Have you loaded the mission on a dedicated server?

Is further testing or are further changes required?

  1. No
  2. Yes (Please provide further detail below.)

How can the changes be tested?

Steps:

Notes:

@Bob-Murphy Bob-Murphy added this to the 2.5.X milestone Feb 13, 2022
Bob-Murphy
Bob-Murphy requested changes Feb 14, 2022
View reviewed changes
Copy link

@Bob-Murphy Bob-Murphy left a comment

Choose a reason for hiding this comment

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

Please add Land_vn_usaf_fueltank_75_01 in the mapInfo of Cam Lao Nam as that was part of the old PR.

A3A/addons/core/functions/init/fn_initZones.sqf Show resolved Hide resolved
@Bob-Murphy Bob-Murphy added the Change requested A change has been requested, and this can't be merged until it's done. label Feb 14, 2022
CalebSerafin
CalebSerafin requested changes Feb 14, 2022
View reviewed changes
Copy link
Member

@CalebSerafin CalebSerafin left a comment

Choose a reason for hiding this comment

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

Mostly good. Some minor improvements.

A3A/addons/core/functions/UtilityItems/fn_buyItem.sqf Outdated Show resolved Hide resolved
A3A/addons/core/functions/Base/fn_sellVehicle.sqf Outdated Show resolved Hide resolved
@killerswin2 killerswin2 changed the title Fuel Fixes ⛽ Fuel Support Rework Feb 14, 2022
killerswin2 and others added 2 commits February 14, 2022 17:15
@killerswin2 @HakonRydland
yessssssssssssssssssssssssss, Fixed array not being array
10bd6ea 
Co-authored-by: HakonRydland <HakonRydland@users.noreply.github.com>
@killerswin2
_insufficientFunds variable name
2ec5ef3
CalebSerafin
CalebSerafin approved these changes Feb 14, 2022
View reviewed changes
Copy link
Member

@CalebSerafin CalebSerafin left a comment

Choose a reason for hiding this comment

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

Looks good to me.

A3A/addons/core/functions/UtilityItems/fn_buyItem.sqf Show resolved Hide resolved
@CalebSerafin CalebSerafin added Review pending and removed Change requested A change has been requested, and this can't be merged until it's done. labels Feb 15, 2022
@Bob-Murphy
Copy link

Does this issue close #2213 ?
If so, please link it properly. It was mentioned in the old PR.

@killerswin2
Copy link
Author

Done

@CalebSerafin CalebSerafin merged commit 8e485c2 into official-antistasi-community:unstable Feb 15, 2022
@Bob-Murphy Bob-Murphy added the Added to changelog Added to changelog label Dec 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalebSerafin CalebSerafin CalebSerafin approved these changes

@Bob-Murphy Bob-Murphy Bob-Murphy approved these changes

Assignees
No one assigned
Labels
Added to changelog Added to changelog Ready for merge
Projects
None yet
Milestone
3.0
Development

Successfully merging this pull request may close these issues.

[Feature Request]: Purchasable fuel tanks should not be confused with fuel sources.
3 participants
@killerswin2 @Bob-Murphy @CalebSerafin