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

PTL Income Adjustment #3933

Merged
merged 2 commits into from Mar 26, 2021
Merged

PTL Income Adjustment #3933

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9918218
laser go brrr
Azrun Mar 7, 2021
a650014
Apply suggestions from code review
ZeWaka Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions code/modules/power/pt_laser.dm
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@
var/output_multi = 1e6
var/emagged = FALSE
var/lifetime_earnings = 0
var/undistributed_earnings = 0
var/excess = null //for tgui readout
var/is_charging = FALSE //for tgui readout

Expand Down Expand Up @@ -144,7 +145,7 @@
dont_update = 1 //so the firing animation runs
charge -= adj_output
if(selling)
power_sold()
power_sold(adj_output)
else if(charge < adj_output && (adj_output >= PTLMINOUTPUT)) //firing but not enough charge to sustain
stop_firing()
else //firing and have enough power to carry on
Expand Down Expand Up @@ -177,18 +178,22 @@

var/output_mw = adjusted_output / 1e6

#define BUX_PER_SEC_CAP 5000 //at inf power, generate 5000$/tick, also max amt to drain/tick
#define LOW_CAP (20) //provide a nice scalar for deminishing returns instead of a slow steady climb
#define BUX_PER_WORK_CAP (5000-LOW_CAP) //at inf power, generate 5000$/tick, also max amt to drain/tick
#define ACCEL_FACTOR 69 //our acceleration factor towards cap
#define STEAL_FACTOR 4 //Adjusts the curve of the stealing EQ (2nd deriv/concavity)

//For equation + explaination, https://www.desmos.com/calculator/62w5igbqwo
//For equation + explaination, https://www.desmos.com/calculator/sgpk5aj6hy
ZeWaka marked this conversation as resolved.
Show resolved Hide resolved
//Adjusted to give a decent amt. of cash/tick @ 50GW (said to be average hellburn)
var/generated_moolah = (2*output_mw*BUX_PER_SEC_CAP)/(2*output_mw + BUX_PER_SEC_CAP*ACCEL_FACTOR) //used if output_mw > 0
var/generated_moolah = (2*output_mw*BUX_PER_WORK_CAP)/(2*output_mw + BUX_PER_WORK_CAP*ACCEL_FACTOR) //used if output_mw > 0
ZeWaka marked this conversation as resolved.
Show resolved Hide resolved
generated_moolah += (4*output_mw*LOW_CAP)/(4*output_mw + LOW_CAP)

if (output_mw < 0) //steals money since you emagged it
generated_moolah = (-2*output_mw*BUX_PER_SEC_CAP)/(2*STEAL_FACTOR*output_mw - BUX_PER_SEC_CAP*STEAL_FACTOR*ACCEL_FACTOR)
generated_moolah = (-2*output_mw*BUX_PER_WORK_CAP)/(2*STEAL_FACTOR*output_mw - BUX_PER_WORK_CAP*STEAL_FACTOR*ACCEL_FACTOR)

lifetime_earnings += generated_moolah
generated_moolah += undistributed_earnings
undistributed_earnings = 0

var/list/accounts = list()
for(var/datum/data/record/t in data_core.bank)
Expand All @@ -204,10 +209,13 @@

for(var/datum/data/record/t in accounts)
t.fields["current_money"] += round(generated_moolah/accounts.len)
undistributed_earnings += generated_moolah-(round(generated_moolah/accounts.len) * (accounts.len))
ZeWaka marked this conversation as resolved.
Show resolved Hide resolved
else
undistributed_earnings += generated_moolah

#undef STEAL_FACTOR
#undef ACCEL_FACTOR
#undef BUX_PER_SEC_CAP
#undef BUX_PER_WORK_CAP

/obj/machinery/power/pt_laser/proc/get_barrel_turf()
var/x_off = 0
Expand Down