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

Add scalable fuel tanks #376

Merged
merged 17 commits into from
Nov 28, 2023
Merged

Add scalable fuel tanks #376

merged 17 commits into from
Nov 28, 2023

Conversation

thecraftianman
Copy link
Member

@thecraftianman thecraftianman commented Oct 7, 2023 •
edited
Loading

  • Box fuel tanks are now fully scalable along the same limits as ammo crates
  • Added scalable cylindrical fuel tanks
  • Should be fully backwards compatible with all existing fuel tanks (as far as I can tell)
    • Old box containers will be converted into scalable boxes with matching proportions
    • Old fuel drums will be converted into scalable fuel drums with proportions that match those of the base model
  • Added new globals to control scalable tank behavior (ACF.FuelArmor, ACF.FuelMinSize, ACF.FuelMaxSize)
  • Existing box container flavor text in the menu is now randomly selected on each fuel info text update
  • The fuel menu settings will now change parameter options based on the tank type (Box, Drum, or Miscellaneous)

(Possibly) important things to note before merging!

  • Tank mass and fuel capacity results are slightly different from before for scaling tanks. I tried to keep them as similar to the original containers as I could, so they shouldn't make any sort of drastic difference, but I thought I'd just mention this in case it's an issue.
  • Tank visuals are not super consistent at the moment. Box tanks use the 4x4x4 tank model, and drum tanks use the HL2 oil drum model. I'm not really sure what (if anything) should be changed about these to make them any better.
  • That 0.4774 magic number for capacity is still in use. I don't really know what to do with it, so any suggestions here would be appreciated. [HELP][MAGIC NUMBERS] What the hell are these numbers? #179 could probably be closed once this is dealt with. Magic number has been removed; the issue can (probably?) be closed once this is merged.

thecraftianman and others added 10 commits October 6, 2023 22:07
@thecraftianman
Initial test version
54658e8 
LOTS of debug stuff to clean up still in this version
@thecraftianman
Merge remote-tracking branch 'upstream/master' into scalable-fuel
6153497
@thecraftianman
Remove obsolete fuel tank types
1dd9033
@thecraftianman
Reorganize new fuel tank types
f86a4a2
@thecraftianman
Remove debug code
e76fb44 
I think this is all of it but maybe there's still something in a different file that I missed
@thecraftianman
Slight fuel armor value tweaks
fc66144
@thecraftianman
Removed capacity magic number
ee1d7e5
@thecraftianman
Redo backwards compatibility
4ea7d0e 
Should be better now? Maybe?
@thecraftianman
Extremely important update
6ec8a17 
I knew I missed something lol
@TwistedTail
Improved fuel tank verification
5235a25 
- Now fuel tanks will properly make use of its verification function, along with allowing people to implement scalable and non scalable fuel tank classes into ACF.
- Added Size to the list of dupe information arguments on fuel tanks.
@Stooberton
Copy link
Collaborator

Stooberton commented Oct 15, 2023 •
edited
Loading

I'm getting this error when trying to spawn cuboid and cylindrical fuel tanks

image

And this one when spawning the miscellaneous fuel tank

image

@TwistedTail
Copy link
Member

I'm getting this error when trying to spawn cuboid and cylindrical fuel tanks

image

And this one when spawning the miscellaneous fuel tank

image

It might be related to the latest commit I pushed to this PR, I'm changing the affected code a little bit so it works in a similar way to guns and ammo crates when it comes to registration, verification, backwards compatibility and entity creating/updating.

@thecraftianman
Improved tank modularity
76b5064 
Should have replaced pretty much all the hardcoded stuff (and fixed the stuff that was just breaking)
@thecraftianman
Copy link
Member Author

I'm getting this error when trying to spawn cuboid and cylindrical fuel tanks

image

And this one when spawning the miscellaneous fuel tank

image

Should be resolved with this latest commit.

@thecraftianman thecraftianman merged commit 420db96 into ACF-Team:dev Nov 28, 2023
2 checks passed
CheezusChrust added a commit to CheezusChrust/ACF-3 that referenced this pull request Dec 1, 2023
@CheezusChrust
Revert "Merge pull request ACF-Team#376 from thecraftianman/scalable-…
3e7f945 
…fuel"

This reverts commit 420db96, reversing
changes made to d391020.
@thecraftianman thecraftianman deleted the scalable-fuel branch December 1, 2023 22:15
CheezusChrust added a commit to CheezusChrust/ACF-3 that referenced this pull request Jan 20, 2024
@CheezusChrust
Revert "Merge pull request ACF-Team#376 from thecraftianman/scalable-…
06f9061 
…fuel"

This reverts commit 420db96, reversing
changes made to d391020.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thecraftianman @Stooberton @TwistedTail