Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add *actual* shallow waterfill #235

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add *actual* shallow waterfill #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8612127
add actual shallow waterfill
chayleaf Jun 1, 2023
37a348e
localize shallow water to more languages
chayleaf Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 = {
Expand All @@ -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"}
}

Expand All @@ -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",
Expand Down
Binary file added graphics/icons/base-water-mud.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/icons/base-water-shallow.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 3 additions & 7 deletions locale/de/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
13 changes: 6 additions & 7 deletions locale/en/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions locale/es-ES/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions locale/fr/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions locale/hu/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions locale/it/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions locale/ko/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=추가 된 신호를 조명 또는 회로 네트워크에서 사용 할 수 있습니다.
Expand All @@ -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)
Expand Down
10 changes: 3 additions & 7 deletions locale/pl/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions locale/pt-BR/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
13 changes: 6 additions & 7 deletions locale/ru/dectorio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=Включает дополнительные сигналы для использования в лампах или в логической сети
Expand All @@ -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
Expand Down
Loading