Домножение рецепта и мелкие доработки

reworked/calc.py

@@ -1,10 +1,12 @@
-def expand_recipe(recipe, recipes):
+global expanded ; expanded = {}
+def expand_recipe(recipe, recipes, main = False):
 	global expanded
 
 	ok = False
 	part = 1 # Одна часть
 	while not ok:
 		ok = True
+		min_vol = 0 # Объём мин. рецепта (вход)
 		# Перебираем элементы
 		for el in recipe:
 			# Если составное
@@ -16,24 +18,35 @@ def expand_recipe(recipe, recipes):
 					expanded = {}
 					break
 				else:
-					expand_recipe(recipes[el].comps, recipes)
+					min_vol += expand_recipe(recipes[el].comps, recipes)
 			else:
 				if el in expanded:
 					expanded[el] += recipe[el]*part
 				else:
 					expanded[el] = recipe[el]*part
 
+				min_vol += recipe[el]*part
+
+	if main:
+		return expanded, min_vol, part
+	else:
+		return min_vol
+
 def calc(element, amount, recipes):
-	# TODO: Пока только выводит расширенную версию рецепта
+	# Получаем характеристику элемента
 	recipe, out = recipes[element].comps, recipes[element].out
+	# Расчитываем минимальный рецепт
+	expanded, vol, part = expand_recipe(recipe, recipes, True)
 
-	global expanded
-	expanded = {}
-	expand_recipe(recipe, recipes)
+	# Домнажаем на сколько нужно
+	need = amount//vol
+	for i in expanded:
+		expanded[i] = expanded[i]*need
+	out = part*out*need
 
-	return expanded
+	return expanded, out
 
 
 from parse import *
 #print( load_recipes() )
-print( calc('Dylovene', 100, load_recipes()) )
+print( calc('Leporazine', 100, load_recipes()) )