|
|
@@ -18,14 +18,13 @@ with open('regions.json') as file:
|
|
|
REGIONS = json.load(file)
|
|
|
|
|
|
RESOURCES = None
|
|
|
-with open('resources.json') as file:
|
|
|
+with open('factories.json') as file:
|
|
|
RESOURCES = json.load(file)
|
|
|
|
|
|
|
|
|
WP = WorkProduction()
|
|
|
-WP.user_level = 95
|
|
|
-WP.work_exp = 80000 + 200 * 350
|
|
|
-WP.nation_bonus = True
|
|
|
+WP.user_level = 73
|
|
|
+WP.work_exp = 80000 + 200 * 176
|
|
|
WP.profit_share = 75
|
|
|
|
|
|
|
|
|
@@ -36,7 +35,7 @@ def calculate_wage(resource_name, factory):
|
|
|
resource = Item(resource_name)
|
|
|
WP.resource = resource
|
|
|
WP.factory_level = factory['level']
|
|
|
- WP.department_bonus = DEPARTMENTS[resource_name]
|
|
|
+ WP.department_bonus = DEPARTMENTS[REGIONS[str(factory['region_id'])]['state']][resource_name]
|
|
|
WP.resource_max = REGIONS[str(factory['region_id'])]['resources'][resource_name]
|
|
|
WP.wage_percentage = factory['wage']
|
|
|
WP.tax_rate = REGIONS[str(factory['region_id'])]['tax'][resource_name]
|
|
|
@@ -67,7 +66,7 @@ def print_all():
|
|
|
"""Print wages per resource"""
|
|
|
factory_dict = all_factories()
|
|
|
|
|
|
- print("total Wage %")
|
|
|
+ print("Total Wage %")
|
|
|
print("———————————————————————————— ————— ———")
|
|
|
sorted_factories = sorted(factory_dict.values(), key=lambda k: k['wage'], reverse=True)
|
|
|
top_wage = sorted_factories[0]['wage']
|
