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.

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

Reworks and Reintroduced Micro Reactor & Radiation Scrubber CBM's #2663

Merged
merged 11 commits into from
Apr 30, 2023
Merged

Reworks and Reintroduced Micro Reactor & Radiation Scrubber CBM's #2663

merged 11 commits into from
Apr 30, 2023

Conversation

MrLostman
Copy link
Contributor

@MrLostman MrLostman commented Apr 18, 2023

Summary

SUMMARY:[Content] "Reworks micro reactor & radiation CBM's and adds the reactors back to the drop table"

Purpose of change

To fill a gap in high tech power generation CBM's

Describe the solution

Edit : a * represents a revision edit

Micro Reactor

  • dropped from husks & shocker brutes. low drop from cyborgs & sci body sites
  • 5 chest encumbrance
  • 1 plutonium cell gives 2500 charges @ 10kw
  • holds 4 cells
  • 10 irradiation stacks a day *only while fueled
  • *produces a constant 500 J 50 J of power while fueled for no cost

Advanced Micro Reactor

  • dropped from bank vaults
  • 5 chest encumbrance
  • 1 plutonium cell gives 3000 charges @ 12kw
  • holds 4 cells
  • 5 irradiation stacks a day *only while fueled
  • *produces a constant 1 kJ 100J of power while fueled for no cost

Radiation Scrubber CBM
- lowers radiation produced by the Micro Reactor by half and completely stops radiation of the Advanced Micro Reactor

  • *reworked to be toggled removing up to 10 rads so one stack every 10 mins
  • *10 J to have running and a cost of 10 kJ only when it removes rads

*Reactor Safety Override

  • comes with the normal and advanced reactors
  • produces an extra 40kJ of power a turn
  • 0.5 radiation stacks a turn

Testing

  1. checked functionality by spawning in the cbm's and testing
  2. checked spawns
  3. checked natural instillation & upgrade
  4. passed time with all combinations to test irradiation

@github-actions github-actions bot added JSON related to game datas in JSON format. src changes related to source code. labels Apr 18, 2023
src/consumption.cpp Outdated Show resolved Hide resolved
src/consumption.cpp Outdated Show resolved Hide resolved
src/suffer.cpp Outdated Show resolved Hide resolved
src/suffer.cpp Outdated Show resolved Hide resolved
src/suffer.cpp Outdated Show resolved Hide resolved
src/suffer.cpp Outdated Show resolved Hide resolved
src/suffer.cpp Outdated Show resolved Hide resolved
@chaosvolt
Copy link
Member

chaosvolt commented Apr 18, 2023

Should the radiation be constant, even when not supplied with fuel or otherwise in use? Seems more fitting for it to apply bursts of radiation when used, to properly make it an "oh shit" powergen option with consequences when the situation is dire enough to rely on.

EDIT: After discussion about it on the BN discord, it's probably fine aside from maybe being good to have it only apply when it actually has fuel in it.

@MrLostman
Copy link
Contributor Author

Just put this on hold for a little bit, going to rework the rework radiation scrubber too and add another setting to the reactor

@scarf005
Copy link
Member

would love the reactor to perpetually generate small amount of energy on default like IRL.

@MrLostman MrLostman changed the title Reworks and Reintroduced Micro Reactor CBM's Reworks and Reintroduced Micro Reactor & Radiation Scrubber CBM's Apr 20, 2023
src/bionics.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the tests changes related to tests label Apr 20, 2023
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

also, using descriptive commit names makes it clear what the commit does and helps both author and reviewer identify changes quickly.

tests/bionics_test.cpp Outdated Show resolved Hide resolved
@scarf005 scarf005 requested a review from chaosvolt April 29, 2023 13:38
Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

  1. Compiled and load-tested.
  2. Installed a ton of power storage CBMs before adding micro-reactor.
  3. Waited a while, observed that no radiation or power generation occured without fuel.
  4. Loaded a single plutonium cell in, waited a while to confirm power generation and radiation occured.
  5. Turned it on, observed that power generation is 10 kj per turn.
  6. Debugged in the upgrade CBM and installed it, confirmed it converts the normal reactor to advanced, and that you still only have one copy of the override CBM on you.

I'm not yet 100% sure about the amount of passive powergen it gives, since you can get the same amount of power you'd get out of burning that cell just by waiting a lil over an hour, and even faster for the advanced version. I'd be tempted to suggest 50 and 100 watts for the passive powergen instead, that leaves it still a constant source of free energy but makes the choice to burn it a much more tantalizing prospect in comparison.

from 500J & 1kJ to 50J & 100J
Copy link
Member

@scarf005 scarf005 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. could you try JSONizing persistent powergen for reactors sometimes later? or would it be unneccesary because there's few permagen CBMs?

@scarf005 scarf005 enabled auto-merge (squash) April 30, 2023 02:54
@scarf005 scarf005 merged commit b9c4282 into cataclysmbnteam:upload Apr 30, 2023
@MrLostman MrLostman deleted the micro-reactor-rework branch April 30, 2023 03:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. src changes related to source code. tests changes related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants