diff options
Diffstat (limited to 'src/openvic-simulation/economy/FactoryProducer.hpp')
| -rw-r--r-- | src/openvic-simulation/economy/FactoryProducer.hpp | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/openvic-simulation/economy/FactoryProducer.hpp b/src/openvic-simulation/economy/FactoryProducer.hpp index 623ec48..ee658a5 100644 --- a/src/openvic-simulation/economy/FactoryProducer.hpp +++ b/src/openvic-simulation/economy/FactoryProducer.hpp @@ -2,7 +2,7 @@ #include <cstdint> -#include "openvic-simulation/economy/Good.hpp" +#include "openvic-simulation/economy/GoodDefinition.hpp" #include "openvic-simulation/economy/ProductionType.hpp" #include "openvic-simulation/types/fixed_point/FixedPoint.hpp" #include "openvic-simulation/utility/Getters.hpp" @@ -21,7 +21,7 @@ namespace OpenVic { fixed_point_t PROPERTY(unsold_quantity_yesterday); fixed_point_t PROPERTY(size_multiplier); ordered_map<Pop*, Pop::pop_size_t> PROPERTY(employees); - Good::good_map_t PROPERTY(stockpile); + GoodDefinition::good_definition_map_t PROPERTY(stockpile); fixed_point_t PROPERTY(budget); fixed_point_t PROPERTY(balance_yesterday); fixed_point_t PROPERTY(received_investments_yesterday); @@ -34,16 +34,26 @@ namespace OpenVic { public: FactoryProducer( - ProductionType const& new_production_type, const fixed_point_t new_size_multiplier, - const fixed_point_t new_revenue_yesterday, const fixed_point_t new_output_quantity_yesterday, - const fixed_point_t new_unsold_quantity_yesterday, ordered_map<Pop*, Pop::pop_size_t>&& new_employees, - Good::good_map_t&& new_stockpile, fixed_point_t new_budget, const fixed_point_t new_balance_yesterday, - const fixed_point_t new_received_investments_yesterday, const fixed_point_t new_market_spendings_yesterday, - const fixed_point_t new_paychecks_yesterday, const uint32_t new_unprofitable_days, - const uint32_t new_subsidised_days, const uint32_t new_days_without_input, const uint8_t new_hiring_priority, - const uint8_t new_profit_history_current, daily_profit_history_t&& new_daily_profit_history + ProductionType const& new_production_type, + fixed_point_t new_size_multiplier, + fixed_point_t new_revenue_yesterday, + fixed_point_t new_output_quantity_yesterday, + fixed_point_t new_unsold_quantity_yesterday, + ordered_map<Pop*, Pop::pop_size_t>&& new_employees, + GoodDefinition::good_definition_map_t&& new_stockpile, + fixed_point_t new_budget, + fixed_point_t new_balance_yesterday, + fixed_point_t new_received_investments_yesterday, + fixed_point_t new_market_spendings_yesterday, + fixed_point_t new_paychecks_yesterday, + uint32_t new_unprofitable_days, + uint32_t new_subsidised_days, + uint32_t new_days_without_input, + uint8_t new_hiring_priority, + uint8_t new_profit_history_current, + daily_profit_history_t&& new_daily_profit_history ); - FactoryProducer(ProductionType const& new_production_type, const fixed_point_t new_size_multiplier); + FactoryProducer(ProductionType const& new_production_type, fixed_point_t new_size_multiplier); fixed_point_t get_profitability_yesterday() const; fixed_point_t get_average_profitability_last_seven_days() const; |