Jsonize Cbm power generation #33302
Merged
Jsonize Cbm power generation #33302
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
added 21 commits
August 12, 2019 15:11
This reverts commit c435f83.
Does that include mana-powered bionics? OwO |
|
No not mana, not without some more code. |
BevapDin
reviewed
Aug 17, 2019
BevapDin
reviewed
Aug 17, 2019
BevapDin
reviewed
Aug 17, 2019
BevapDin
reviewed
Aug 17, 2019
src/bionics.cpp
Outdated
| @@ -2096,13 +2150,23 @@ int bionic::get_quality( const quality_id &quality ) const | |||
| return item( i.fake_item ).get_quality( quality ); | |||
| } | |||
|
|
|||
| bool bionic::is_muscle_powered() const | |||
| { | |||
| for( const itype_id fuel : this->info().fuel_opts ) { | |||
There was a problem hiding this comment.
Suggested change
| for( const itype_id fuel : this->info().fuel_opts ) { | |
| for( const itype_id &fuel : info().fuel_opts ) { |
But better would be using std::find, or maybe change fuel_opts into a set and query it directly.
There was a problem hiding this comment.
I used std::find, I'm not too sure how to handle making fuel_opts a set
BevapDin
reviewed
Aug 17, 2019
ZhilkinSerg
added
<Documentation>
added 22 commits
August 19, 2019 23:42
|
Why was the reversion to '2040 no mo' included? That seems like it would be out of this PR's scope. |
|
The commits say it reverts it - it is not actually reverted |
|
Ah, my mistake. |
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
Jsonize Cbm power generation
Merged
6 tasks
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.
Summary
SUMMARY: Infrastructure "Jsonize Cbm power generation"Purpose of change
Jsonize Cbm power generation, you can now specify what fuel a CBM can use, the efficiency of the conversion to bionic power and how many charges of fuel the CBM can hold.
Adresses part of #31495
Describe the solution
If player has bionic that can store fuel, it's added to the player fuel storage upon consumption.
Type and amount of fuel and CBM involved in storage are tracked using creature::value
When the bionic is activated we check if there is enought fuel for it to start and if there is enough room for more power to not waste fuel.
Every interval of time specified in
"time"the bionic is active it addsfuel_energy * efficiencyto the power storage.The special case of muscle fuel is handled along side the code for joint torsion ratchet
Describe alternatives you've considered
Additional context
I did not remove the hardcoded bionic and did not move them to the unhardcoded system because it would break NPC usage of them.
Messing with the handling of CBMs by NPCs seems to be worth it's own PR.
This system allows for the creation of fuel storage CBM that could be alternative ways to store power.
(Which in turn could also allow mages to carry power without messing with their mana too much ...)