From 4d2341d7066605dc8e7cc926c859a51fb902286a Mon Sep 17 00:00:00 2001 From: none Date: Sun, 28 Jan 2024 10:59:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=B0=D1=80=D1=83=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=89=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update_db.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/update_db.py b/update_db.py index eba8ddd..6912317 100644 --- a/update_db.py +++ b/update_db.py @@ -39,9 +39,8 @@ BOTANY = "https://github.com/SerbiaStrong-220/space-station-14/raw/master/Resour BOTANY_LOCALISATION_URL = "https://github.com/SerbiaStrong-220/space-station-14/raw/master/Resources/Locale/ru-RU/reagents/meta/botany.ftl" # все съедобное и питьевое -FOOD = "https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/Resources/Prototypes/Recipes/Reactions/chemicals.yml" -FOOD_R = "https://github.com/SerbiaStrong-220/space-station-14/raw/master/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml" -FOOD_R_EX = "https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml" +FOOD = "https://github.com/SerbiaStrong-220/space-station-14/raw/master/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml" +FOOD_R = "https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml" INGREDIENTS_URL = "https://github.com/SerbiaStrong-220/space-station-14/raw/master/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml" DRINKS_URL = "https://github.com/SerbiaStrong-220/space-station-14/raw/master/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml" @@ -164,19 +163,17 @@ def load_recipes(url,name): load_reagents(BOTANY, 'botany') load_reagents(TOXINS, 'toxins') - load_reagents(MEDICINE_R, 'medicine') -load_recipes(MEDICINE, 'medicine') - # Не загружается? load_reagents(CHEMICALS_R, 'chemicals') -load_recipes(CHEMICALS, 'chemicals') - #load_reagents(FOOD_R, 'food') -load_reagents(FOOD_R_EX, 'food') -load_recipes(FOOD, 'chemicals') +load_reagents(FOOD_R, 'food') +load_recipes(MEDICINE, 'medicine') +load_recipes(CHEMICALS, 'chemicals') +load_recipes(CHEMICALS, 'chemicals') + # TODO: Включать ли токсины без крафта? (некоторые имеют крафт) reagents = [Reagent(init_data=content[item]) for item in content if "reactants" in content[item]]