From 8612127fe15dd2893ee74977f43282b29883c480 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 1 Jun 2023 07:35:47 +0700 Subject: [PATCH 1/2] add actual shallow waterfill Previously, only normal and deep water were supported (normal water was mistakenly called "shallow") --- config.lua | 19 ++++++++++++++----- graphics/icons/base-water-mud.png | Bin 0 -> 5058 bytes graphics/icons/base-water-shallow.png | Bin 0 -> 5347 bytes locale/en/dectorio.cfg | 13 ++++++------- prototypes/third-party/config.lua | 13 ++++++++++--- settings.lua | 25 +++++++++++++++++++------ 6 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 graphics/icons/base-water-mud.png create mode 100644 graphics/icons/base-water-shallow.png diff --git a/config.lua b/config.lua index 192ab76..4996526 100644 --- a/config.lua +++ b/config.lua @@ -99,7 +99,10 @@ DECT.ENABLED = { ["painted-concrete"] = settings.startup["dectorio-painted-concrete"].value, ["decoratives"] = settings.startup["dectorio-decoratives"].value, ["lawnmower"] = settings.startup["dectorio-lawnmower"].value, - ["item-group"] = settings.startup["dectorio-item-group"].value + ["item-group"] = settings.startup["dectorio-item-group"].value, + ["waterfill-shallow"] = settings.startup["dectorio-waterfill-shallow"].value, + ["waterfill-normal"] = settings.startup["dectorio-waterfill-normal"].value, + ["waterfill-deep"] = settings.startup["dectorio-waterfill-deep"].value, } -- The subgroups for all items in the mod @@ -114,7 +117,6 @@ DECT.CONFIG.SETTINGS = { ["flooring_stack_size"] = settings.startup["dectorio-flooring-stack-size"].value, ["landscaping_stack_size"] = settings.startup["dectorio-landscaping-stack-size"].value, ["walls_stack_size"] = settings.startup["dectorio-walls-stack-size"].value, - ["waterfill_tiles"] = settings.startup["dectorio-waterfill-tiles"].value } DECT.CONFIG.PAINT_VARIANTS = { @@ -133,8 +135,8 @@ DECT.CONFIG.GRAVEL_VARIANTS = { {name = "coal", color = {r = 0.33, g = 0.33, b = 0.33}} } DECT.CONFIG.WATERFILL_TILES = { - ["all"] = {"water", "deepwater", "water-green", "deepwater-green"}, - ["shallow"] = {"water", "water-green"}, + ["shallow"] = {"water-shallow", "water-mud"}, + ["normal"] = {"water", "water-green"}, ["deep"] = {"deepwater", "deepwater-green"} } @@ -160,7 +162,14 @@ DECT.CONFIG.BASE_TILES = { "red-desert-2", "red-desert-3" } -DECT.CONFIG.BASE_WATER_TILES = DECT.CONFIG.WATERFILL_TILES[DECT.CONFIG.SETTINGS["waterfill_tiles"]] +DECT.CONFIG.BASE_WATER_TILES = {} +for water_kind, water_tiles in pairs(DECT.CONFIG.WATERFILL_TILES) do + if DECT.ENABLED["waterfill-" .. water_kind] then + for _, water_tile in pairs(water_tiles) do + table.insert(DECT.CONFIG.BASE_WATER_TILES, water_tile) + end + end +end DECT.CONFIG.BASE_TREES = { "tree-01", "tree-02", diff --git a/graphics/icons/base-water-mud.png b/graphics/icons/base-water-mud.png new file mode 100644 index 0000000000000000000000000000000000000000..65c1d53d2ce31203658224305728523f802f18db GIT binary patch literal 5058 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 BmAn7| literal 0 HcmV?d00001 diff --git a/locale/en/dectorio.cfg b/locale/en/dectorio.cfg index 6dae279..3e70f22 100644 --- a/locale/en/dectorio.cfg +++ b/locale/en/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Decoration removal probability dectorio-flooring-stack-size=Flooring items stack size dectorio-landscaping-stack-size=Landscaping items stack size dectorio-walls-stack-size=Wall items stack size -dectorio-waterfill-tiles=Waterfill tiles - -[string-mod-setting] -dectorio-waterfill-tiles-all=All water tiles -dectorio-waterfill-tiles-shallow=Only shallow water tiles -dectorio-waterfill-tiles-deep=Only deep water tiles +dectorio-waterfill-shallow=Enable Shallow Waterfill +dectorio-waterfill-normal=Enable Normal Waterfill +dectorio-waterfill-deep=Enable Deep Waterfill [mod-setting-description] dectorio-signals=Enables additional signals for use in lamps or the circuit network @@ -50,7 +47,9 @@ dectorio-decorative-removal-probability=The probability that decorations, such a dectorio-flooring-stack-size=The number of flooring items that can be stacked in one inventory slot (default = 100) dectorio-landscaping-stack-size=The number of landscaping items that can be stacked in one inventory slot (default = 100) dectorio-walls-stack-size=The number of walls that can be stacked in one inventory slot (default = 100) -dectorio-waterfill-tiles=If waterfill is enabled, this specifies which water tiles are available for placement +dectorio-waterfill-shallow=If waterfill is enabled, this enables the ability to craft shallow water +dectorio-waterfill-normal=If waterfill is enabled, this enables the ability to craft normal water +dectorio-waterfill-deep=If waterfill is enabled, this enables the ability to craft deep water [dect-notify] dectorio=Dectorio diff --git a/prototypes/third-party/config.lua b/prototypes/third-party/config.lua index 40fb4ee..d15f47d 100644 --- a/prototypes/third-party/config.lua +++ b/prototypes/third-party/config.lua @@ -23,12 +23,19 @@ end if mods["alien-biomes"] then -- Only supports blue water tiles DECT.CONFIG.WATERFILL_TILES = { - ["all"] = {"water", "deepwater"}, - ["shallow"] = {"water"}, + ["shallow"] = {"water-shallow"}, + ["normal"] = {"water"}, ["deep"] = {"deepwater"} } DECT.CONFIG.BASE_TILES = {} - DECT.CONFIG.BASE_WATER_TILES = DECT.CONFIG.WATERFILL_TILES[DECT.CONFIG.SETTINGS["waterfill_tiles"]] + DECT.CONFIG.BASE_WATER_TILES = {} + for water_kind, water_tiles in pairs(DECT.CONFIG.WATERFILL_TILES) do + if DECT.ENABLED["waterfill-" .. water_kind] then + for _, water_tile in pairs(water_tiles) do + table.insert(DECT.CONFIG.BASE_WATER_TILES, water_tile) + end + end + end DECT.CONFIG.BASE_ROCKS = {} DECT.CONFIG.BASE_TREES = {} end diff --git a/settings.lua b/settings.lua index 9b46631..22533a4 100644 --- a/settings.lua +++ b/settings.lua @@ -146,12 +146,25 @@ data:extend( order = "d-d" }, { - type = "string-setting", - name = "dectorio-waterfill-tiles", + type = "bool-setting", + name = "dectorio-waterfill-shallow", setting_type = "startup", - default_value = "all", - allowed_values = {"all", "shallow", "deep"}, - order = "d-e" - } + default_value = true, + order = "e-a" + }, + { + type = "bool-setting", + name = "dectorio-waterfill-normal", + setting_type = "startup", + default_value = true, + order = "e-b" + }, + { + type = "bool-setting", + name = "dectorio-waterfill-deep", + setting_type = "startup", + default_value = true, + order = "e-c" + }, } ) From 37a348e3685c87ea4a600e3cead274dd7f315f96 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 1 Jun 2023 07:37:15 +0700 Subject: [PATCH 2/2] localize shallow water to more languages I only know Russian, English and Japanese, so I did this with the help of DeepL. I did my best to make sure it's correct, but I may have made some mistakes. For most languages, I didn't write a description for the new setting as I have no confidence in getting that right. --- locale/de/dectorio.cfg | 10 +++------- locale/es-ES/dectorio.cfg | 10 +++------- locale/fr/dectorio.cfg | 10 +++------- locale/hu/dectorio.cfg | 10 +++------- locale/it/dectorio.cfg | 10 +++------- locale/ko/dectorio.cfg | 10 +++------- locale/pl/dectorio.cfg | 10 +++------- locale/pt-BR/dectorio.cfg | 10 +++------- locale/ru/dectorio.cfg | 13 ++++++------- locale/uk/dectorio.cfg | 13 ++++++------- 10 files changed, 36 insertions(+), 70 deletions(-) diff --git a/locale/de/dectorio.cfg b/locale/de/dectorio.cfg index d4555e1..00c9913 100644 --- a/locale/de/dectorio.cfg +++ b/locale/de/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Wahrscheinlichkeit, Dekoration zu entfer dectorio-flooring-stack-size=Stapelgröße von Bodentypen dectorio-landscaping-stack-size=Stapelgröße von Landschaftsobjekten dectorio-walls-stack-size=Stapelgröße von Mauern -dectorio-waterfill-tiles=Verfügbare Wassergräben - -[string-mod-setting] -dectorio-waterfill-tiles-all=Alle Wasergräben -dectorio-waterfill-tiles-shallow=Nur flache Wassergräben -dectorio-waterfill-tiles-deep=Nur tiefe Wassergräben +dectorio-waterfill-shallow=Flache Wassergräben aktivieren +dectorio-waterfill-normal=Normale Wassergräben aktivieren +dectorio-waterfill-deep=Tiefe Wassergräben aktivieren [mod-setting-description] dectorio-signals=Erlaubt zusätzliche Signale für Lampen und Schaltungsnetze @@ -50,7 +47,6 @@ dectorio-decorative-removal-probability=Wahrscheinlichkeit, dass Dekorationen wi dectorio-flooring-stack-size=Anzahl an Bodenkacheln, die in einem Inventarslot gestapelt werden können (Standard = 100) dectorio-landscaping-stack-size=Anzahl an Landschaftsobjekten, die in einem Inventarslot gestapelt werden können (Standard = 100) dectorio-walls-stack-size=Anzahl an Mauern, die in einem Inventarslot gestapelt werden können (Standard = 100) -dectorio-waterfill-tiles=Wenn Wassergräben aktiviert sind, gibt dies an, welche Arten an Wasser verfügbar sind [dect-notify] dectorio=Dectorio diff --git a/locale/es-ES/dectorio.cfg b/locale/es-ES/dectorio.cfg index 264f247..886e2d5 100644 --- a/locale/es-ES/dectorio.cfg +++ b/locale/es-ES/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Probabilidad de eliminar decoración dectorio-flooring-stack-size=Los items de pavimentación son apilables dectorio-landscaping-stack-size=Los items de paisajismo son apilables dectorio-walls-stack-size=Los artículos de paredes son apilables -dectorio-waterfill-tiles=Baldosas de agua - -[string-mod-setting] -dectorio-waterfill-tiles-all=Todas las baldosas de agua -dectorio-waterfill-tiles-shallow=Sólo baldosas de agua poco profundas -dectorio-waterfill-tiles-deep=Sólo baldosas de agua profunda +dectorio-waterfill-shallow=Habilitar relleno con agua poco profunda +dectorio-waterfill-normal=Habilitar relleno con agua normal +dectorio-waterfill-deep=Habilitar relleno con agua profunda [mod-setting-description] dectorio-signals=Habilita señales adicionales para usar en lamparas o redes de circuitos @@ -50,7 +47,6 @@ dectorio-decorative-removal-probability=La probabilidad de que se eliminen las d dectorio-flooring-stack-size=El número de elementos de pavimentación que se pueden apilar en una ranura de inventario (valor predeterminado = 100) dectorio-landscaping-stack-size=El número de elementos de paisajismo que se pueden apilar en una ranura de inventario (valor predeterminado = 100) dectorio-walls-stack-size=El número de paredes que se pueden apilar en una ranura de inventario (valor predeterminado = 100) -dectorio-waterfill-tiles=Si el relleno de agua está habilitado, especifica qué baldosas de agua están disponibles para su colocación [dect-notify] dectorio=Dectorio diff --git a/locale/fr/dectorio.cfg b/locale/fr/dectorio.cfg index bf98b7e..4cc639b 100644 --- a/locale/fr/dectorio.cfg +++ b/locale/fr/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Probabilité de suppression des décorat dectorio-flooring-stack-size=Taille de la pile des sols dectorio-landscaping-stack-size=Taille de la pile des éléments de paysage dectorio-walls-stack-size=Taille de la pile des murs -dectorio-waterfill-tiles=Cases d'eau - -[string-mod-setting] -dectorio-waterfill-tiles-all=Toutes les cases d'eau -dectorio-waterfill-tiles-shallow=Uniquement les cases d'eau peu profonde -dectorio-waterfill-tiles-deep=Uniquement les cases d'eau profonde +dectorio-waterfill-shallow=Activer le terrassement avec d'eau peu profonde +dectorio-waterfill-normal=Activer le terrassement avec d'eau normale +dectorio-waterfill-deep=Activer le terrassement avec d'eau profonde [mod-setting-description] dectorio-signals=Ajoute de nouveaux signaux à utiliser dans les lampes ou dans le réseau logique @@ -50,7 +47,6 @@ dectorio-decorative-removal-probability=La probabilité que les décorations, co dectorio-flooring-stack-size=Le nombre de sols qui peut être empilé en un seul emplacement logistique (par défaut = 100) dectorio-landscaping-stack-size=Le nombre d'éléments d'aménagement du paysage qui peut être empilé en un seul emplacement logistique (par défaut = 100) dectorio-walls-stack-size=Le nombre de murs qui peut être empilé en un seul emplacement logistique (par défaut = 100) -dectorio-waterfill-tiles=Si le terrassement est activé, cela indique quelles cases d'eau peuvent être placées [dect-notify] dectorio=Dectorio diff --git a/locale/hu/dectorio.cfg b/locale/hu/dectorio.cfg index 639e698..b7d083e 100644 --- a/locale/hu/dectorio.cfg +++ b/locale/hu/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Dekoráció eltávolíthatósági valós dectorio-flooring-stack-size=Padlózati elemek hordható mérete dectorio-landscaping-stack-size=Területformálási eszközök hordható mérete dectorio-walls-stack-size=Fal elemek hordható mérete -dectorio-waterfill-tiles=Vízkitöltő burkolatok - -[string-mod-setting] -dectorio-waterfill-tiles-all=Minden vizes burkolat -dectorio-waterfill-tiles-shallow=Csak sekély vizes burkolatok -dectorio-waterfill-tiles-deep=Csak mély vizes burkolatok +dectorio-waterfill-shallow=Sekély vízszűrést engedélyezése +dectorio-waterfill-normal=Normál vízszűrést engedélyezése +dectorio-waterfill-deep=Mély vízszűrést engedélyezése [mod-setting-description] dectorio-signals=Több jel feloldása, melyek lámpáknál vagy az elektromos hálózatban használhatóak @@ -50,7 +47,6 @@ dectorio-decorative-removal-probability=Annak a valószínűsége hogy padlózat dectorio-flooring-stack-size=A szám, mely az egy Inventory slotba tehető padlózatokat adja meg (alapértelmezés = 100) dectorio-landscaping-stack-size=A szám, mely az egy Inventory slotba tehető területformálási elemeket adja meg (alapértelmezés = 100) dectorio-walls-stack-size=A szám, mely az egy Inventory slotba tehető fal elemeket adja meg (alapértelmezés = 100) -dectorio-waterfill-tiles=Ha a vízkitöltés engedélyezett, eldönti melyik vízburkolat legyen elérhető lehelyezésre [dect-notify] dectorio=Dectorio diff --git a/locale/it/dectorio.cfg b/locale/it/dectorio.cfg index 1841ebd..ec36fa3 100644 --- a/locale/it/dectorio.cfg +++ b/locale/it/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Probabilità di rimozione delle decorazi dectorio-flooring-stack-size=Dimensione dello stack degli oggetti di pavimentazione dectorio-landscaping-stack-size=Dimensione dello stack degli oggetti di modifica paesaggistica dectorio-walls-stack-size=Dimensione dello stack degli oggetti tipo muro -dectorio-waterfill-tiles=Sezioni d'acqua - -[string-mod-setting] -dectorio-waterfill-tiles-all=Tutte le sezioni d'acqua -dectorio-waterfill-tiles-shallow=Solo sezioni d'acqua poco profonda -dectorio-waterfill-tiles-deep=Solo sezioni d'acqua profonda +dectorio-waterfill-shallow=Abilita la creazione di acqua poco profonde +dectorio-waterfill-normal=Abilita la creazione di acqua normale +dectorio-waterfill-deep=Abilita la creazione di acqua profonde [mod-setting-description] dectorio-signals=Abilita i segnali aggiuntivi per l'utilizzo nelle lampade o nella rete circuitale @@ -50,7 +47,6 @@ dectorio-decorative-removal-probability=La probabilità che le decorazioni, come dectorio-flooring-stack-size=Il numero di elementi di pavimentazione che possono essere impilati in uno slot di inventario (default = 100) dectorio-landscaping-stack-size=Il numero di elementi paesaggistici che possono essere impilati in uno slot di magazzino (default = 100) dectorio-walls-stack-size=Il numero di muri che possono essere impilati in uno slot dell' inventario (default = 100) -dectorio-waterfill-tiles=Se il riempimento d'acqua é abilitato, questo specifica quali caselle d'acqua sono disponibili per il posizionamento [dect-notify] dectorio=Dectorio diff --git a/locale/ko/dectorio.cfg b/locale/ko/dectorio.cfg index 8e823e7..8f7f6db 100644 --- a/locale/ko/dectorio.cfg +++ b/locale/ko/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=장식 제거 확율 dectorio-flooring-stack-size=바닥재 아이템 소지 갯수 dectorio-landscaping-stack-size=조경 아이템 소지 갯수 dectorio-walls-stack-size=벽 아이템 소지 갯수 -dectorio-waterfill-tiles=수몰 타일 - -[string-mod-setting] -dectorio-waterfill-tiles-all=모든 물 타일 -dectorio-waterfill-tiles-shallow=얕은 물 타일만 -dectorio-waterfill-tiles-deep=깊은 물 타일만 +dectorio-waterfill-shallow=얕은 수몰 활성화 +dectorio-waterfill-normal=일반 수몰 활성화 +dectorio-waterfill-deep=깊은 수몰 타일 [mod-setting-description] dectorio-signals=추가 된 신호를 조명 또는 회로 네트워크에서 사용 할 수 있습니다. @@ -50,7 +47,6 @@ dectorio-decorative-removal-probability=바닥재를 배치시 장식물이 제 dectorio-flooring-stack-size=인벤토리 슬롯의 바닥 아이템 소지 갯수 (기본값 = 100) dectorio-landscaping-stack-size=인벤토리 슬롯의 조경 아이템 소지 갯수 (기본값 = 100) dectorio-walls-stack-size=인벤토리 슬롯의 벽 아이템 소지 갯수 (기본값 = 100) -dectorio-waterfill-tiles=수몰 옵션이 활성화된 경우, 배치할 수 있는 물 타일을 지정합니다. [dect-notify] dectorio=덱토리오(Dectorio) diff --git a/locale/pl/dectorio.cfg b/locale/pl/dectorio.cfg index 52e80c4..1e9d42f 100644 --- a/locale/pl/dectorio.cfg +++ b/locale/pl/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Prawdopodobieństwo usunięcia dekoracji dectorio-flooring-stack-size=Rozmiar stosu elementów podłogowych dectorio-landscaping-stack-size=Rozmiar stosu elementów terenowych dectorio-walls-stack-size=Rozmiar stosu elementów ogrodzeniowych -dectorio-waterfill-tiles=Wypełnienia wodą - -[string-mod-setting] -dectorio-waterfill-tiles-all=Wszystkie rodzaje wody -dectorio-waterfill-tiles-shallow=Tylko płytka woda -dectorio-waterfill-tiles-deep=Tylko głęboka woda +dectorio-waterfill-shallow=Włącz wypełnianie płytka wodą +dectorio-waterfill-normal=Włącz wypełnianie zwykłą wodą +dectorio-waterfill-deep=Włącz wypełnianie głęboka wodą [mod-setting-description] dectorio-signals=Włącz dodatkowe sygnały do użycia w lampach lub sieci obwodowej @@ -50,7 +47,6 @@ dectorio-decorative-removal-probability=Prawdopodobieństwo że dekoracja podło dectorio-flooring-stack-size=Liczba elementów podłogowych które mogą być umieszczone w pozycji inwentarza (domyślnie = 100) dectorio-landscaping-stack-size=Liczba elementów terenów które mogą być umieszczone w pozycji inwentarza (domyślnie = 100) dectorio-walls-stack-size=Liczba elementów ogrodzeń które mogą być umieszczone w pozycji inwentarza (domyślnie = 100) -dectorio-waterfill-tiles=Jeśli funkcja napełniania jest włączona, określa, który typ wody jest dostępny do umieszczenia [dect-notify] dectorio=Dectorio diff --git a/locale/pt-BR/dectorio.cfg b/locale/pt-BR/dectorio.cfg index c9fd508..1129c75 100644 --- a/locale/pt-BR/dectorio.cfg +++ b/locale/pt-BR/dectorio.cfg @@ -23,12 +23,9 @@ dectorio-decorative-removal-probability=Probabilidade de remover Decorações da dectorio-flooring-stack-size=Tamanho de pilha de Pisos dectorio-landscaping-stack-size=Tamanho de pilha de Terreno dectorio-walls-stack-size=Tamanho de pilha de Muros -dectorio-waterfill-tiles=Pisos de Preenchimento de Água - -[string-mod-setting] -dectorio-waterfill-tiles-all=Todos pisos de água -dectorio-waterfill-tiles-shallow=Apenas pisos de água rasos -dectorio-waterfill-tiles-deep=Apenas pisos de água profundos +dectorio-waterfill-shallow=Habilitar Preenchimento com Água rasa +dectorio-waterfill-normal=Habilitar Preenchimento com Água normal +dectorio-waterfill-deep=Habilitar Preenchimento com Água profunda [mod-setting-description] dectorio-signals=Permite sinais adicionais para uso em lâmpadas ou na rede de circuito @@ -49,7 +46,6 @@ dectorio-decorative-removal-probability=A probabilidade que decorativos da natur dectorio-flooring-stack-size=Número de pisos que podem ser empilhados num slot de inventário (padrão = 100) dectorio-landscaping-stack-size=Número de pisos de terreno que podem ser empilhados num slot de inventário (padrão = 100) dectorio-walls-stack-size=Número de paredes que podem ser empilhadas numa slot de inventário (padrão = 100) -dectorio-waterfill-tiles=Se preenchimento de água estiver ativado, isso especifica quais pisos de água são colocáveis [dect-notify] dectorio=Dectorio diff --git a/locale/ru/dectorio.cfg b/locale/ru/dectorio.cfg index ef0635f..e4cb30b 100644 --- a/locale/ru/dectorio.cfg +++ b/locale/ru/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Шанс удаления декорат dectorio-flooring-stack-size=Размер пачки для напольных покрытий dectorio-landscaping-stack-size=Размер пачки для ландшафтного дизайна dectorio-walls-stack-size=Размер пачки для элементов стен -dectorio-waterfill-tiles=Варианты заполнения водой - -[string-mod-setting] -dectorio-waterfill-tiles-all=Любая глубина воды -dectorio-waterfill-tiles-shallow=Только клетки с мелкой водой -dectorio-waterfill-tiles-deep=Только клетки с глубокой водой +dectorio-waterfill-shallow=Включить заливку мелкой водой +dectorio-waterfill-normal=Включить заливку обычной водой +dectorio-waterfill-deep=Включить заливку глубокой водой [mod-setting-description] dectorio-signals=Включает дополнительные сигналы для использования в лампах или в логической сети @@ -50,7 +47,9 @@ dectorio-decorative-removal-probability=Вероятность того, что dectorio-flooring-stack-size=Количество предметов напольных покрытий, которое поместится в один слот инвентаря (по умолчанию = 100) dectorio-landscaping-stack-size=Количество элементов ландшафтного дизайна, которое поместится в один слот инвентаря (по умолчанию = 100) dectorio-walls-stack-size=Количество стен, которое поместится в один слот инвентаря (по умолчанию = 100) -dectorio-waterfill-tiles=Если включено заполнение клеток водой, здесь можно выбрать, как именно вода будет их заполнять +dectorio-waterfill-shallow=Если заливка включена, эта настройка позволяет создавать мелкую воду +dectorio-waterfill-normal=Если заливка включена, эта настройка позволяет создавать обычную воду +dectorio-waterfill-deep=Если заливка включена, эта настройка позволяет создавать глубокую воду [dect-notify] dectorio=Dectorio diff --git a/locale/uk/dectorio.cfg b/locale/uk/dectorio.cfg index be4c8d8..ea3bb53 100644 --- a/locale/uk/dectorio.cfg +++ b/locale/uk/dectorio.cfg @@ -24,12 +24,9 @@ dectorio-decorative-removal-probability=Імовірність зняття де dectorio-flooring-stack-size=Розмір стопки предметів для підлоги dectorio-landscaping-stack-size=Розмір стопки елементів ландшафтного дизайну dectorio-walls-stack-size=Розмір настінні предмети стопки -dectorio-waterfill-tiles=Водоналивна плитка - -[string-mod-setting] -dectorio-waterfill-tiles-all=Вся водна плитка -dectorio-waterfill-tiles-shallow=Тільки плитка для мілководдя -dectorio-waterfill-tiles-deep=Тільки глибоководні плитки +dectorio-waterfill-shallow=Увімкнути заливку мілкою водою +dectorio-waterfill-normal=Увімкнути заливку звичайною водою +dectorio-waterfill-deep=Увімкнути заливку глибокою водою [mod-setting-description] dectorio-signals=Включає додаткові сигнали для використання в лампах або в електричній мережі @@ -50,7 +47,9 @@ dectorio-decorative-removal-probability=Імовірність того, що п dectorio-flooring-stack-size=Кількість предметів підлоги, які можна покласти в один слот інвентарю (за замовчуванням = 100) dectorio-landscaping-stack-size=Кількість елементів ландшафтного дизайну, які можна помістити в один слот інвентарю (за замовчуванням = 100) dectorio-walls-stack-size=Кількість стін, які можна помістити в один слот інвентарю (за замовчуванням = 100) -dectorio-waterfill-tiles=Якщо залив увімкнено, це визначає, які плитки води доступні для розміщення +dectorio-waterfill-shallow=Якщо залив увімкнено, це дозволяє створювати мілку воду +dectorio-waterfill-normal=Якщо залив увімкнено, це дозволяє створювати звичайну воду +dectorio-waterfill-deep=Якщо залив увімкнено, це дозволяє створювати глибоку воду [dect-notify] dectorio=Dectorio