From 7b9f638832ab6c31e32b726e1f7dec1079aac486 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Thu, 9 Jun 2022 18:43:02 -0400 Subject: [PATCH] get ratio'd --- code/controllers/configuration/entries/game_options.dm | 2 +- config/game_options.txt | 6 +++--- hyperstation/code/controllers/subsystem/economy.dm | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index dfa6f0041..f9fa2cdec 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -390,7 +390,7 @@ min_val = 0 /datum/config_entry/number/economy_base_pay_ratio - config_entry_value = 3 + config_entry_value = 6 min_val = 1 /datum/config_entry/number/economy_price_multiplier diff --git a/config/game_options.txt b/config/game_options.txt index 1d4977749..8bf910cd8 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -595,8 +595,8 @@ BOX_RANDOM_ENGINE Box P.A.C.M.A.N,0 # The base amount of credits, before any math whatsoever gets involved, that paychecks give ECONOMY_BASE_PAYMENT 60 -# The base pay for paychecks get divided by this amount. Useful for slowing down the rate of payment. -ECONOMY_BASE_PAY_RATIO 3 +# How many paychecks the crew gets when first joining the station. Adds 1 if this is the start of the round, because of how subsystems work +ECONOMY_BASE_PAY_RATIO 6 # The default multiplier for a paycheck if nothing is assigned to a specific job. # You're allowed to set specific jobs a specific type of pay multiplier with ECONOMY_JOB_RATE @@ -627,4 +627,4 @@ ECONOMY_PRICE_EXPENSIVE_AF 90 # A multiplier to the prices of items inside vendors. Avoid setting this higher than the Assistant's paycheck multiplier if possible # This scales every item found in vendors. If you want to change an individual item, you have to change it through code -ECONOMY_PRICE_MULTIPLIER 1.25 +ECONOMY_PRICE_MULTIPLIER 1.35 diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm index 9627e9ef1..7a71bc1fb 100644 --- a/hyperstation/code/controllers/subsystem/economy.dm +++ b/hyperstation/code/controllers/subsystem/economy.dm @@ -12,6 +12,7 @@ SUBSYSTEM_DEF(economy) /// Updates the prices from the config. Assorted into this individual proc instead of Initialize() so testers can change the config mid-round /// without having to initialize the economy SS again /datum/controller/subsystem/economy/proc/UpdatePrices() + roundstart_paychecks prices_by_type = list() prices_by_type += CONFIG_GET(number/economy_price_default) //ECONOMY_PRICE_DEFAULT.. 1 prices_by_type += CONFIG_GET(number/economy_price_low) //ECONOMY_PRICE_LOW.. 2 @@ -22,7 +23,9 @@ SUBSYSTEM_DEF(economy) prices_by_type += 0 //ECONOMY_PRICE_FORCED_FREE.. 7 /datum/controller/subsystem/economy/Initialize() - UpdatePrices() + roundstart_paychecks = CONFIG_GET(number/economy_base_pay_ratio) + if(!prices_by_type) + UpdatePrices() return ..() /datum/controller/subsystem/economy/fire()