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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Caps Softcap for Rad Collector Attempt 2 - Making 115k Credits per collector is NOT intended. #17495

Merged
merged 2 commits into from Jan 17, 2023
Merged

Caps Softcap for Rad Collector Attempt 2 - Making 115k Credits per collector is NOT intended. #17495

merged 2 commits into from Jan 17, 2023

Conversation

JamieD1
Copy link
Contributor

@JamieD1 JamieD1 commented Jan 15, 2023 •
edited by ToasterBiome

Adds a softcap to rad collectors where you get diminishing returns. This will "softly" cap it 1200-2000 credits a minute for INSANE power. See here:

https://www.desmos.com/calculator/txnkzdj0sw

Green: What's current
Red: what it will be instead

馃啈 SapphicOverload, JamieD12
bugfix: Softcaps rad collectors maximum credits per minute.
/:cl:

@Yogbot-13 Yogbot-13 added the Fix This fixes an issue. Please link issues in fix PRs label Jan 15, 2023
@SapphicOverload
Copy link
Contributor

i think giving it a soft cap similar to the power harvester would be better

Moltijoe
Moltijoe requested changes Jan 15, 2023
View reviewed changes
Copy link
Contributor

@Moltijoe Moltijoe left a comment

Choose a reason for hiding this comment

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

Boring and uninspired. Make it a soft cap so its possible to go above, but requires extensive work.

SomeguyManperson
SomeguyManperson reviewed Jan 15, 2023
View reviewed changes
code/modules/power/singularity/collector.dm
stored_power -= min(payout*200, stored_power)
payout = payout * balancevalue
D.adjust_money(payout)
stored_power -= min(payout*20000, stored_power)
Copy link
Contributor

Choose a reason for hiding this comment

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

Wuat does this change do

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Wuat does this change do

Puts it back to how it was before I touched it

MajManatee
MajManatee requested changes Jan 15, 2023
View reviewed changes
Copy link
Contributor

@MajManatee MajManatee left a comment

Choose a reason for hiding this comment

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

Not a bug fix, its a tweak

@JamieD1
Copy link
Contributor Author

JamieD1 commented Jan 15, 2023

Not a bug fix, its a tweak

No its a bug fix, the idea was to make it 1k per minute max per thing, this just hardwires it because im fed up of 151k per minute.

@Hopekz
Copy link
Contributor

Hopekz commented Jan 16, 2023

No its a bug fix, the idea was to make it 1k per minute max per thing, this just hardwires it because im fed up of 151k per minute.

You just described what a tweak is after you said "no its a bug fix".
Bug fixes aren't just changes that you like or think will fit.

@JamieD1
Copy link
Contributor Author

JamieD1 commented Jan 16, 2023

No its a bug fix, the idea was to make it 1k per minute max per thing, this just hardwires it because im fed up of 151k per minute.

You just described what a tweak is after you said "no its a bug fix". Bug fixes aren't just changes that you like or think will fit.

Its a bug with my original fucking math. How is that hard to understand. The original change was a tweak this is fixing that tweak.

@SapphicOverload
Copy link
Contributor

SapphicOverload commented Jan 16, 2023 •
edited

my suggestion:
image
image
creditpayout = log((payout + RAD_COLLECTOR_PAYOUT_SCALE) / RAD_COLLECTOR_PAYOUT_SCALE) * (RAD_COLLECTOR_PAYOUT_SCALE / log(2))

don't know how to suggest changes on github the normal way so this will have to do

@ReddicusDragon
Copy link
Contributor

oh god math

@ToasterBiome ToasterBiome changed the title Caps Credits for Rad Collector Attempt 2 - Making 115k Credits per collector is NOT intended. Caps Softcap for Rad Collector Attempt 2 - Making 115k Credits per collector is NOT intended. Jan 17, 2023
@ToasterBiome
Copy link
Contributor

Jamie told me to do this

@JamieD1 JamieD1 merged commit 52f19bf into master Jan 17, 2023
@JamieD1 JamieD1 deleted the fuck-sake branch January 17, 2023 17:24
Yogbot-13 added a commit that referenced this pull request Jan 17, 2023
@Yogbot-13
Automatic changelog generation #17495 [ci skip]
085375e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MajManatee MajManatee Awaiting requested review from MajManatee

@SomeguyManperson SomeguyManperson Awaiting requested review from SomeguyManperson

@Moltijoe Moltijoe Awaiting requested review from Moltijoe

Assignees
No one assigned
Labels
Fix This fixes an issue. Please link issues in fix PRs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@JamieD1 @SapphicOverload @Hopekz @ReddicusDragon @ToasterBiome @SomeguyManperson @MajManatee @Moltijoe @Yogbot-13