refactor: Energy Rework #5259
Draft
refactor: Energy Rework #5259
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Procrastinated long enough. This commit is mainly proof of concept, it makes batteries type: BATTERY instead of type magazine and has them store energy as units::energy instead of charges. `ammo_consume` is a hack for me to play with, which confirms that power is being drawn correctly when it is called. The bionic scanner is sort of necessary at the moment for testing purposes. Next step is to convert energy using functions over from charge usage.
github-actions
bot
added
src
chaosvolt
reviewed
Aug 27, 2024
| @@ -576,7 +576,6 @@ | |||
| "target": "bionic_scanner_on", | |||
| "msg": "You start scanning for bionics.", | |||
| "active": true, | |||
| "need_charges": 1, | |||
There was a problem hiding this comment.
Removing this will if I recall let you turn it on even when it has zero power? Unless 1 is a default in the code already.
There was a problem hiding this comment.
Necessary while I'm testing, since batteries don't have charges in the rework. There's not a whole lot of point in reviewing my work at this stage, it's very preliminary.
There was a problem hiding this comment.
Ah, aight. Hope it goes well then. :D
Add and convert most of the power handling code. Need to update `has_energy()` and `use_energy()` pending an understanding of `visitable.cpp` code.
Finishes all the power draw code, so items that consume power via power draw will now consume power properly. Next up is the ability to load batteries, unload batteries, and use magazines alongside batteries.
|
Autofix has formatted code style violation in this PR. I edit commits locally (e.g: git, github desktop) and want to keep autofix
I do not want the automated commit
If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT. |
Allow you to reload batteries into an item, add migration of batteries to new system. Lay down early framework for gun power draw system. Energy Rework Part 3 Allow you to reload batteries into an item, add migration of batteries to new system. Lay down early framework for gun power draw system.
KheirFerrum
force-pushed
the
The-BIG-FUCKING-energy-rework
branch
from
45e1a1b
to
b70c8f2
Compare
`iuse_actor.cpp` use functions now return charges to be used and energy to be used as appropriate. Updates partially some of the jsons that use batteries as ammo
KheirFerrum
force-pushed
the
The-BIG-FUCKING-energy-rework
branch
from
13a13e6
to
7ecabae
Compare
11 tasks
Partially updates the iuse.cpp action. Fixes up the things the merge fucks in the code.
…eirFerrum/Cataclysm-BN into The-BIG-FUCKING-energy-rework
Continue work on iuse.cpp Note, check up on pet food, it used to consume charges from via code instead of the return function. Must confirm if that will still work.
Starting with some macros, it's working alright. Updated the firework iuse actions to use the new transforms, removed the `taser2` iuse. Remind myself to update the hand crank to actually recharge batteries after I'm done here.
KheirFerrum
force-pushed
the
The-BIG-FUCKING-energy-rework
branch
from
098444c
to
bafda51
Compare
No need to bother calculating energy/units remaining if the value to compare against is 0, should save on processing time.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
Required
mainso it won't cause conflict when updatingmainbranch later.Optional
doc/folder.lang/bn_extract_json_strings.shscript if it does not support them yet.Purpose of change
Basically, make batteries use discrete charges in the form of
units::energyinstead of charges, which will allow us to makepower_drawbehaviour less cursed and in general make code that handles power more reliable.Describe the solution
This PR isn't functional at the moment, I'm partway through a lot of infrastructure reworking but I can at least confirm that most of the sections I've changed thus far work the way I expect them to.
Right now it's mainly visual, with batteries being able to store charges as
units::energy, display them when loaded, etc. Theammo_consume()function written for it is placeholder and will be converted toenergy_consume()in the near future.Describe alternatives you've considered
power_drawcodeTesting
Additional context