From e5c7c6581690f96ab3636060ea744022097e71a8 Mon Sep 17 00:00:00 2001 From: wadehusky Date: Tue, 30 Apr 2024 15:29:00 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8?= =?UTF-8?q?=20load=5Frecipe()=20=D0=B2=20parse.py=20=D0=94=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD?= =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20get=5Fall()=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20reag=5F=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reworked/parse.py | 14 ++++++++++++++ reworked/reag__.py | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/reworked/parse.py b/reworked/parse.py index 30b84d9..f940c28 100644 --- a/reworked/parse.py +++ b/reworked/parse.py @@ -1,5 +1,6 @@ from requests import get from yaml import load, SafeLoader +from reag__ import reag__ def parse_yml(url = 'https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/Resources/Prototypes/Recipes/Reactions/medicine.yml'): yml = load(get(url).content.decode('utf-8'), Loader=SafeLoader) @@ -15,3 +16,16 @@ def parse_ftl(url = 'https://raw.githubusercontent.com/SerbiaStrong-220/space-st locale = splitted[2] locales[name] = locale return locales + +def load_recipe(yml = parse_yml()): + recipes = {} + for element in yml: + category = "medicine" + product = element["id"] + comps = {} + for elem in element["reactants"]: + comps[elem] = element["reactants"][elem]["amount"] + for id, value in element["products"].items(): + out = value + recipes[product] = reag__(category=category, comps=comps, out=out) + return recipes \ No newline at end of file diff --git a/reworked/reag__.py b/reworked/reag__.py index ea74601..9e74950 100644 --- a/reworked/reag__.py +++ b/reworked/reag__.py @@ -1,8 +1,10 @@ class reag__: - def __init__(category = '-', comps, out): + def __init__(self, category: str = '-', comps = {}, out: int = 0): # medicine self.category = category # {'инапровалин': 1, 'углерод': 1} self.comps = comps # 2 self.out = out + def get_all(self): + return [self.category, self.comps, self.out] From bdc90b42d0bcb691c6409792d0bb731ba41788f6 Mon Sep 17 00:00:00 2001 From: wadehusky Date: Tue, 30 Apr 2024 15:34:26 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8?= =?UTF-8?q?=20load=5Frecipe()=20=D0=B2=20parse.py=20=D0=94=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD?= =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20get=5Fall()=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20reag=5F=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reworked/parse.py | 2 +- reworked/reag__.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/reworked/parse.py b/reworked/parse.py index f940c28..6b78da6 100644 --- a/reworked/parse.py +++ b/reworked/parse.py @@ -28,4 +28,4 @@ def load_recipe(yml = parse_yml()): for id, value in element["products"].items(): out = value recipes[product] = reag__(category=category, comps=comps, out=out) - return recipes \ No newline at end of file + return recipes diff --git a/reworked/reag__.py b/reworked/reag__.py index 9e74950..19e8419 100644 --- a/reworked/reag__.py +++ b/reworked/reag__.py @@ -8,3 +8,4 @@ class reag__: self.out = out def get_all(self): return [self.category, self.comps, self.out] + From 0afa5994082416a34be013d3e7e4be7010b5d6b3 Mon Sep 17 00:00:00 2001 From: justuser31 Date: Tue, 30 Apr 2024 16:09:46 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D1=8B?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=82=D0=B0=D0=B1=D1=8B,=20=D0=BC=D0=B5?= =?UTF-8?q?=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reworked/parse.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/reworked/parse.py b/reworked/parse.py index 6b78da6..e50f348 100644 --- a/reworked/parse.py +++ b/reworked/parse.py @@ -17,15 +17,15 @@ def parse_ftl(url = 'https://raw.githubusercontent.com/SerbiaStrong-220/space-st locales[name] = locale return locales -def load_recipe(yml = parse_yml()): - recipes = {} - for element in yml: - category = "medicine" - product = element["id"] - comps = {} - for elem in element["reactants"]: - comps[elem] = element["reactants"][elem]["amount"] - for id, value in element["products"].items(): - out = value - recipes[product] = reag__(category=category, comps=comps, out=out) - return recipes +def load_recipes(url = 'https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/Resources/Prototypes/Recipes/Reactions/medicine.yml', category = '-'): + yml = parse_yml(url) + recipes = {} + for element in yml: + product = element["id"] + comps = {} + for elem in element["reactants"]: + comps[elem] = element["reactants"][elem]["amount"] + for id, value in element["products"].items(): + out = value + recipes[product] = reag__(category=category, comps=comps, out=out) + return recipes