diff --git a/README.md b/README.md index 5e6b881..d268878 100644 --- a/README.md +++ b/README.md @@ -107,9 +107,9 @@ Special thanks to the translators below (in no particular order). * Chinese Traditional (37%) - [k98a](https://crowdin.com/profile/k98a). * Czech (70%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij). * French (96%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi) and [daikyraraga](https://crowdin.com/profile/daikyraraga). -* German (99%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn) and [lpzockerx](https://crowdin.com/profile/lpzockerx). +* German (100%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn), [lpzockerx](https://crowdin.com/profile/lpzockerx) and [Leridon](https://crowdin.com/profile/Leridon). * Korean (99%) - [GimoXagros](https://crowdin.com/profile/GimoXagros). -* Polish (55%) - [Tomirad](https://github.com/Tomirad) and [Requelfade](https://crowdin.com/profile/Requelfade). +* Polish (100%) - [Tomirad](https://github.com/Tomirad), [Requelfade](https://crowdin.com/profile/Requelfade), [no_desired_username](https://crowdin.com/profile/no_desired_username) and [tomplus](https://crowdin.com/profile/tomplus). * Portuguese, Brazilian (99%) - [celaquila](https://crowdin.com/profile/celaquila). * Russian (100%) - [nastyslave](https://crowdin.com/profile/nastyslave), [diraria](https://crowdin.com/profile/diraria), [scheugen86](https://crowdin.com/profile/scheugen86), [antonus777](https://crowdin.com/profile/antonus777), [schmarotzerltd](https://crowdin.com/profile/schmarotzerltd) and [1avek1](https://crowdin.com/profile/1avek1). * Spanish (99%) - [notallme](https://crowdin.com/profile/notallme). diff --git a/changelog.txt b/changelog.txt index 2c2951b..d5d3edc 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,18 @@ --------------------------------------------------------------------------------------------------- +Version: 0.9.15 +Date: 10. 09. 2019 + Added: + - Signal color support for Angel's Refining and Angel's Smelting modded items + - Support for built in mod incompatibility listing + Bugfixes: + - Fixed an oversight when determining the minable result of trees and rocks that caused an incompatibility with Industrial Revolution mod + Changed: + - Sign icon selection GUI is now draggable + - Balancing - Crafting rock and tree recipes now require all items that are returned when mining to avoid potential to get these items for free by placing and mining entities repeatedly + Locales: + - Updated German translation (thanks to Leridon) + - Updated Polish translation (thanks to no_desired_username and tomplus) +--------------------------------------------------------------------------------------------------- Version: 0.9.14 Date: 03. 06. 2019 Changed: diff --git a/config.lua b/config.lua index 9d0ee9a..df7fb38 100644 --- a/config.lua +++ b/config.lua @@ -140,7 +140,7 @@ DECT.CONFIG.BASE_WATER_TILES = {"water", "deepwater", "water-green", "deepwater- DECT.CONFIG.BASE_TREES = {"tree-01", "tree-02", "tree-03", "tree-04", "tree-05", "tree-06", "tree-07", "tree-08", "tree-09", "dead-dry-hairy-tree", "dead-grey-trunk", "dead-tree-desert", "dry-hairy-tree", "dry-tree", "tree-02-red", "tree-08-red", "tree-09-red", "tree-06-brown", "tree-08-brown", "tree-09-brown"} DECT.CONFIG.BASE_ROCKS = {"rock-huge", "rock-big", "sand-rock-big"} DECT.CONFIG.SIGN_CATEGORIES = {"item", "fluid", "tool", "ammo", "armor", "capsule", "gun", "module"} -DECT.CONFIG.SIGN_BLACKLIST = {"barrel", "loader", "simple%-entity", "player%-port", "computer", "coin", "small%-plane", "railgun", "vehicle%-machine%-gun", "tank%-machine%-gun", "signpost", "dect%-signal%-", "infinity%-chest", "infinity%-pipe", "heat%-interface", "pollution", "escape%-pod%-power", "dummy%-steel%-axe", "atlas", "dect%-sign", "dect%-base"} +DECT.CONFIG.SIGN_BLACKLIST = {"barrel", "loader", "simple%-entity", "player%-port", "computer", "coin", "small%-plane", "railgun", "vehicle%-machine%-gun", "tank%-machine%-gun", "signpost", "dect%-signal%-", "infinity%-chest", "infinity%-pipe", "heat%-interface", "pollution", "escape%-pod%-power", "dummy%-steel%-axe", "atlas", "crash%-site", "dect%-sign", "dect%-base"} DECT.CONFIG.SIGN_WHITELIST = {"empty-barrel"} DECT.INCOMPATIBLE = {} diff --git a/control.lua b/control.lua index 5a11535..f935c65 100644 --- a/control.lua +++ b/control.lua @@ -240,7 +240,7 @@ local function create_sign_gui(player) if global.sign_gui[player.index] ~= nil then destroy_sign_gui(player) end - global.sign_gui[player.index] = player.gui.left.add({type="frame", name="dect-gui-sign", caption={"dect-gui.sign-title"}, direction="vertical", style="dect-icon-frame"}) + global.sign_gui[player.index] = player.gui.screen.add({type="frame", name="dect-gui-sign", caption={"dect-gui.sign-title"}, direction="vertical", style="dect-icon-frame", draggable=true}) local gui_scroll = global.sign_gui[player.index].add({type="scroll-pane", name="dect-gui-scroll", vertical_scroll_policy="auto-and-reserve-space", horizontal_scroll_policy="never"}) local gui_table = gui_scroll.add({type="table", name="dect-icons-table", column_count=8, style="dect-icon-table"}) for _, icon in pairs(global.icons) do diff --git a/info.json b/info.json index 28a5d84..f45638b 100644 --- a/info.json +++ b/info.json @@ -1,11 +1,17 @@ { "name": "Dectorio", - "version": "0.9.14", + "version": "0.9.15", "title": "Dectorio", "author": "PantherX", "contact": "", "homepage": "https://github.com/jpanther/Dectorio", "factorio_version": "0.17", - "dependencies": ["base >= 0.17.12", "? alien-biomes >= 0.4.1", "(?) Expanded_Color_Lamps < 0.1", "(?) Thaumaturgic-Machinations < 0.1", "(?) dectorio-stone-wall < 0.17.1"], + "dependencies": [ + "base >= 0.17.59", + "? alien-biomes >= 0.4.1", + "(?) dectorio-stone-wall < 0.17.1", + "!Expanded_Color_Lamps", + "!Thaumaturgic-Machinations" + ], "license": "GNU GPLv3" } diff --git a/locale/de/dectorio.cfg b/locale/de/dectorio.cfg index 54d2c35..922031e 100644 --- a/locale/de/dectorio.cfg +++ b/locale/de/dectorio.cfg @@ -156,6 +156,7 @@ dect-sign-wood=Holzschild dect-sign-steel=Stahlschild dect-small-lamp-glow=Glühende Lampe dect-traffic-bollard=Verkehrspoller +stone-wall=Steinwand [tile-name] dect-concrete-grid=Betonraster diff --git a/locale/pl/dectorio.cfg b/locale/pl/dectorio.cfg index 71ec25e..2bff364 100644 --- a/locale/pl/dectorio.cfg +++ b/locale/pl/dectorio.cfg @@ -2,16 +2,26 @@ Dectorio=Dectorio [mod-description] +Dectorio=Dodaje elementy dekoracyjne upiększające fabrykę. Zawiera: +- dodatkowe sygnały (w tym nowe kolory), +- drewniane, druciane, kamienne i betonowe ściany, +- znaki informacyjne, +- drewniane podłogi, drogi żwirowe oraz malowany beton i żelbeton. [mod-setting-name] -dectorio-signals=Włącz Sygnały +dectorio-signals=Włącz sygnały dectorio-walls=Włącz mury i bramy -dectorio-landscaping=Włącz prace ziemne -dectorio-flooring=Włącz drewniane podłoża +dectorio-landscaping=Włącz elementy terenu +dectorio-waterfill=Włącz wypełnianie wodą +dectorio-flooring=Włącz podłoża drewniane +dectorio-gravel=Włącz podłoża żwirowe dectorio-painted-concrete=Włącz malowany beton -dectorio-signs=Włącz znaki -dectorio-vanilla-hazard-concrete-style=Użyj domyślnego stylu Ostrzeżeń Factorio +dectorio-signs=Włącz znaki informacyjne +dectorio-decoratives=Włącz dekoracje +dectorio-item-group=Oddzielna karta w menu wytwarzania +dectorio-vanilla-hazard-concrete-style=Użyj domyślnego stylu Factorio dla ostrzeżeń na betonie dectorio-landscaping-blueprintable=Elementy terenu są projektowalne +dectorio-painted-concrete-speed-modifier=Modyfikator prędkości dla malowanego betonu 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 @@ -20,16 +30,24 @@ dectorio-walls-stack-size=Rozmiar stosu elementów ogrodzeniowych [mod-setting-description] dectorio-signals=Włącz dodatkowe sygnały do użycia w lampach lub sieci obwodowej dectorio-walls=Włącza dodatkowe typy bram i murów +dectorio-landscaping=Włącza możliwości tworzenia piachu, ziemi, traw i pustyń +dectorio-waterfill=Włącza możliwości tworzenia wody +dectorio-flooring=Włącza możliwości tworzenia drewnianych podłóg +dectorio-gravel=Włącza możliwości tworzenia ścieżek ze żwiru dectorio-painted-concrete=Włącz możliwość tworzenia malowania ostrzeżeń na betonie dectorio-signs=Włącza możliwość stawiania znaków informacyjnych -dectorio-vanilla-hazard-concrete-style=Kiedy włączony, Malowane Ostrzeżenia na betonie będą takie jak domyślne ostrzeżenia Factorio (wymagany jest włączony dodatek Malowany Beton) +dectorio-decoratives=Włącza możliwości tworzenia obiektów dekoracyjnych +dectorio-item-group=Przenosi wszystkie elementy dekoracyjne na dedykowaną kartę w menu wytwarzania +dectorio-vanilla-hazard-concrete-style=Kiedy włączony, malowane ostrzeżenia na betonie będą takie jak domyślne ostrzeżenia Factorio (wymagany jest włączony dodatek "Malowany beton") dectorio-landscaping-blueprintable=Kiedy włączony, plany terenów będą dołączane jako kafelki +dectorio-painted-concrete-speed-modifier=Modyfikuje domyślną szybkość chodzenia i szybkość pojazdu dla malowanego betonu przez tę wartość (1 = bez zmiany szybkości (domyślnie), 0,75 = 75% prędkości domyślnej, 0.5 = 50% prędkości domyślnej) dectorio-decorative-removal-probability=Prawdopodobieństwo że dekoracja podłogowa zarośnie trawą lub krzakami, usuwając ją (1 = 100% usuwania (domyślnie), 0.5 = 50%, 0 = nie będą usuwane) -dectorio-flooring-stack-size=Liczba elementów podłogowych które mogą być umieszczone w pozycji inwentarza (default = 500) -dectorio-landscaping-stack-size=Liczba elementów terenów które mogą być umieszczone w pozycji inwentarza (default = 500) -dectorio-walls-stack-size=Liczba elementów ogrodzeń które mogą być umieszczone w pozycji inwentarza (default = 200) +dectorio-flooring-stack-size=Liczba elementów podłogowych które mogą być umieszczone w pozycji inwentarza (domyślnie = 500) +dectorio-landscaping-stack-size=Liczba elementów terenów które mogą być umieszczone w pozycji inwentarza (domyślnie = 500) +dectorio-walls-stack-size=Liczba elementów ogrodzeń które mogą być umieszczone w pozycji inwentarza (domyślnie = 200) [dect-cmd] +destroy-orphaned-signs=Powoduje usunięcie wszystkich osieroconych znaków z bieżącej powierzchni gracza. [dect-gui] sign-title=Wybierz ikonę @@ -38,8 +56,19 @@ sign-cancel=Anuluj [dect-notify] dectorio=Dectorio version=[__1__] Wersja __2__ została zainstalowana. -incompatible=[__1__] Ostrzeżenie: Niekompatybilny mod został wykryty! +new-version=[__1__] Zaktualizowano z wersji __2__ do wersji __3__. Szczegółowe informacje można znaleźć w dzienniku zmian (Mods > Dectorio > Changelog). +incompatible=[__1__] Ostrzeżenie: Niekompatybilna modyfikacja została wykryta! +reason-signals=[__1__] Przyczyna: '__2__' nadpisuje dane sygnału. +reason-tech=[__1__] Przyczyna: '__2__' jest duplikatem technologii, która jest już w Dectorio. +reason-item=[__1__] Przyczyna: '__2__' tworzy duplikat elementu, który już znajduje się w Dectorio. +reason-disable=[__1__] Przyczyna: '__2__' wyłącza funkcje, które są dodawane przez Dectorio. +recommended-action=[__1__] Usuń '__2__', albo wyłącz komponent __3__ w ustawieniach uruchamiania Dectorio. +recommended-setting=[__1__] Można rozwiązać ten konflikt, zmieniając ustawienie '__2__' w ustawieniach modyfikacji __3__. mod-portal=[__1__] Więcej informacji można znaleźć w portalu z modyfikacjami Factorio. +supported-mod-added=[__1__] Dodano obsługę modyfikacji __2__. +supported-mod-removed=[__1__] Usunięto obsługę modyfikacji __2__. +cmd-removed-orphaned-sign=[__1__] Osierocony znak został pomyślnie usunięty z __2__. +cmd-no-orphaned-signs=[__1__] Brak osieroconych znaków do usunięcia. [dect-signal] arrow-down=Dół @@ -49,30 +78,55 @@ arrow-right=Prawo arrow-vertical=Pionowy arrow-horizontal=Poziomy arrow-universal=Uniwersalny +arrow-reset=Reset misc-clock=Zegar -misc-battery=Batera +misc-alarm=Alarm +misc-battery=Akumulator misc-power=Moc misc-nuclear=Atomowy misc-rocket=Rakietowy misc-temperature=Temperatura -misc-finish=Zapisz +misc-finish=Zakończenie misc-gears=Przekładnia -misc-star=Gwiazdy +misc-star=Gwiazda +misc-light=Lampa +misc-gun=Broń +misc-mine=Kopalnia +misc-oil=Kiwon +misc-tank=Czołg +misc-train=Pociąg +misc-wall=Ściana +misc-siren=Syrena alarmowa +misc-warning-shield=Tarcza ostrzegawcza +misc-warning-triangle=Trójkąt ostrzegawczy [item-group-name] dectorio=Dectorio [item-name] +dect-concrete-grid=Siatka betonowa hazard-concrete=Beton z pasami ostrzegawczymi dect-paint-emergency=Beton z przekazem awaryjnym dect-paint-radiation=Beton z przekazem o promieniowaniu -dect-paint-safety=Beton z zabezpieczeniem -dect-paint-caution=Betn z przekazem ostrzegawczym -dect-paint-danger=Beton z przekazem o niebezpieczeństwie -dect-paint-defect=Uszkodzony beton -dect-paint-operations=Beton operacyjny +dect-paint-safety=Betonowa strefa bezpieczeństwa +dect-paint-caution=Beton - strefa szczególnej ostrożności +dect-paint-danger=Beton - strefa zagrożenia +dect-paint-defect=Beton - strefa z uszkodzeniami +dect-paint-operations=Beton - strefa operacyjna +refined-hazard-concrete=Żelazobeton - strefa ryzyka +dect-paint-refined-emergency=Żelazobeton - strefa występowania wypadków +dect-paint-refined-radiation=Żelazobeton - strefa zagrożenia promieniowaniem +dect-paint-refined-safety=Żelazobeton - strefa bezpieczeństwa +dect-paint-refined-caution=Żelazobeton - strefa szczególnej ostrożności +dect-paint-refined-danger=Żelazobeton - strefa zagrożenia +dect-paint-refined-defect=Żelazobeton - strefa z uszkodzeniami +dect-paint-refined-operations=Żelazobeton - strefa operacyjna dect-wood-floor=Drewniane podłoże -dect-small-lamp-glow=Lapy oświetlające +dect-small-lamp-glow=Lampa oświetlająca +dect-stone-gravel=Żwir z kamienia +dect-iron-ore-gravel=Żwir z żelaza +dect-copper-ore-gravel=Żwir z miedzi +dect-coal-gravel=Żwir z węgla dect-lawnmower=Kosiarka [item-description] @@ -93,9 +147,10 @@ dect-paint-refined-danger=Wciśnij __CONTROL__rotate__ aby obrócić element. dect-paint-refined-defect=Wciśnij __CONTROL__rotate__ aby obrócić element. dect-paint-refined-operations=Wciśnij __CONTROL__rotate__ aby obrócić element. dect-small-lamp-glow=Gdy lampa otrzyma sygnał, zacznie świecić światłem o dużym zasięgu. +dect-lawnmower=Przeciągnij przytrzymując __CONTROL__select-for-blueprint__, aby usunąć dekoracje. Przeciągnij przytrzymując __CONTROL__select-for-cancel-deconstruct__, aby usunąć zwłoki. [recipe-name] -dect-concrete-wall-from-stone-wall=Betonowy mur z Kamiennego muru +dect-concrete-wall-from-stone-wall=Betonowy mur z kamiennego muru [entity-name] dect-wood-wall=Drewniana barykada @@ -103,32 +158,55 @@ dect-chain-wall=Ogrodzenie z metalowych drutów dect-concrete-wall=Betonowy mur dect-sign-wood=Drewniany znak dect-sign-steel=Stalowy znak -dect-small-lamp-glow=Lapy oświetlające +dect-small-lamp-glow=Lampa oświetlająca +dect-traffic-bollard=Słupek drogowy +stone-wall=Kamienny mur [tile-name] +dect-concrete-grid=Siatka betonowa hazard-concrete-left=Beton z pasami ostrzegawczymi hazard-concrete-right=Beton z pasami ostrzegawczymi dect-paint-emergency-left=Beton z przekazem awaryjnym dect-paint-emergency-right=Beton z przekazem awaryjnym dect-paint-radiation-left=Beton z przekazem o promieniowaniu dect-paint-radiation-right=Beton z przekazem o promieniowaniu -dect-paint-safety-left=Beton z zabezpieczeniem -dect-paint-safety-right=Beton z zabezpieczeniem -dect-paint-caution-left=Betn z przekazem ostrzegawczym -dect-paint-caution-right=Betn z przekazem ostrzegawczym -dect-paint-danger-left=Beton z przekazem o niebezpieczeństwie -dect-paint-danger-right=Beton z przekazem o niebezpieczeństwie -dect-paint-defect-left=Uszkodzony beton -dect-paint-defect-right=Uszkodzony beton -dect-paint-operations-left=Beton operacyjny -dect-paint-operations-right=Beton operacyjny +dect-paint-safety-left=Betonowa strefa bezpieczeństwa +dect-paint-safety-right=Betonowa strefa bezpieczeństwa +dect-paint-caution-left=Beton - strefa szczególnej ostrożności +dect-paint-caution-right=Beton - strefa szczególnej ostrożności +dect-paint-danger-left=Beton - strefa zagrożenia +dect-paint-danger-right=Beton - strefa zagrożenia +dect-paint-defect-left=Beton - strefa z uszkodzeniami +dect-paint-defect-right=Beton - strefa z uszkodzeniami +dect-paint-operations-left=Beton - strefa operacyjna +dect-paint-operations-right=Beton - strefa operacyjna +refined-hazard-concrete-left=Żelazobeton - strefa ryzyka +refined-hazard-concrete-right=Żelazobeton - strefa ryzyka +dect-paint-refined-emergency-left=Żelazobeton - strefa występowania wypadków +dect-paint-refined-emergency-right=Żelazobeton - strefa występowania wypadków +dect-paint-refined-radiation-left=Żelazobeton - strefa zagrożenia promieniowaniem +dect-paint-refined-radiation-right=Żelazobeton - strefa zagrożenia promieniowaniem +dect-paint-refined-safety-left=Żelazobeton - strefa bezpieczeństwa +dect-paint-refined-safety-right=Żelazobeton - strefa bezpieczeństwa +dect-paint-refined-caution-left=Żelazobeton - strefa szczególnej ostrożności +dect-paint-refined-caution-right=Żelazobeton - strefa szczególnej ostrożności +dect-paint-refined-danger-left=Żelazobeton - strefa zagrożenia +dect-paint-refined-danger-right=Żelazobeton - strefa zagrożenia +dect-paint-refined-defect-left=Żelazobeton - strefa z uszkodzeniami +dect-paint-refined-defect-right=Żelazobeton - strefa z uszkodzeniami +dect-paint-refined-operations-left=Żelazobeton - strefa operacyjna +dect-paint-refined-operations-right=Żelazobeton - strefa operacyjna dect-wood-floor=Drewniane podłoże +dect-stone-gravel=Żwir z kamienia +dect-iron-ore-gravel=Żwir z żelaza +dect-copper-ore-gravel=Żwir z miedzi +dect-coal-gravel=Żwir z węgla [technology-name] dect-landscaping=Krajobraz dect-concrete-paint=Malowany beton stone-walls=Podstawowe ogrodzenia -dect-advanced-walls=Trwalsze ogrodzenia +dect-advanced-walls=Zaawansowane ogrodzenia dect-wood-floor=Drewniane podłoże landfill=Prace ziemne dect-lawnmower=Kosiarka @@ -136,11 +214,12 @@ dect-signs=Znaki [technology-description] dect-landscaping=Umożliwia umieszczenie naturalnych podłoży. -dect-concrete-paint=Malowanie betonowych powierzchni aby z dodatkowymi informacjami. +dect-concrete-paint=Malowanie powierzchni betonowych. stone-walls=Podstawowe mury chroniące fabrykę przed napastnikami. -dect-advanced-walls=Silniejsze mury od podstawowych chroniące fabrykę przed agresorami. +dect-advanced-walls=Silniejsze mury chroniące fabrykę przed agresorami. dect-wood-floor=Podstawowe drewniane deski służą do okrywania ziemnego podłoża. Deski podłogowe przyśpieszają tempo poruszania się. landfill=Pozwala na dodanie lub usunięcie terenów z wodą. +dect-lawnmower=Usuwa dekoracje z danego obszaru, pozostawiając całkowicie wyczyszczoną powierzchnię. dect-signs=Znaki informacyjne które można ustawiać z informacją w formie przedmiotu. [virtual-signal-name] @@ -149,11 +228,18 @@ signal-orange=Pomarańczowy kolor sygnału signal-tangerine=Mandarynkowy kolor sygnału signal-yellow=Żółty kolor sygnału signal-green=Zielony kolor sygnału -signal-cyan=Błętkitny kolor sygnału +signal-cyan=Błękitny kolor sygnału signal-aqua=Morski kolor sygnału signal-blue=Niebieski kolor sygnału -signal-purple=Fioletowy kolor sygnału +signal-purple=Purpurowy kolor sygnału signal-pink=Różowy kolor sygnału +signal-maroon=Kasztanowy kolor sygnału +signal-brown=Brązowy kolor sygnału +signal-olive=Oliwkowy kolor sygnału +signal-emerald=Szmaragdowy kolor sygnału +signal-teal=Szaroniebieski kolor sygnału +signal-navy=Granatowy kolor sygnału +signal-violet=Fioletowy kolor sygnału signal-black=Czarny kolor sygnału signal-grey=Szary kolor sygnału signal-white=Biały kolor sygnału diff --git a/prototypes/recipe/landscaping.lua b/prototypes/recipe/landscaping.lua index b32263e..28bb69b 100644 --- a/prototypes/recipe/landscaping.lua +++ b/prototypes/recipe/landscaping.lua @@ -75,6 +75,26 @@ if DECT.ENABLED["landscaping"] then local base_trees = DECT.CONFIG.BASE_TREES local base_rocks = DECT.CONFIG.BASE_ROCKS + -- calculate the cost of the entity based upon what it gives when mined + local function entity_ingredients(name, type) + local entity = data.raw[type][name] + local ingredients = {} + if entity.minable then + if entity.minable.results then + for _, result in pairs(entity.minable.results) do + if result.amount_max then + table.insert(ingredients, {result.name, result.amount_max * 1.1}) + else + table.insert(ingredients, {result.name, result.amount * 1.5}) + end + end + elseif entity.minable.result then + table.insert(ingredients, {entity.minable.result, entity.minable.count * 1.5}) + end + end + return ingredients + end + -- Create new landscaping recipes for base trees for _, tree in pairs(base_trees) do data:extend({ @@ -84,9 +104,7 @@ if DECT.ENABLED["landscaping"] then energy_required = 2, enabled = false, category = "crafting", - ingredients = { - { data.raw["tree"][tree].minable.result, data.raw["tree"][tree].minable.count * 1.5 } - }, + ingredients = entity_ingredients(tree, "tree"), result = "dect-base-"..tree, result_count = 1 } @@ -95,11 +113,6 @@ if DECT.ENABLED["landscaping"] then -- Create new landscaping recipes for base rock decoratives for _, rock in pairs(base_rocks) do - local base_rock_loot = data.raw["simple-entity"][rock].loot - local rock_ingredients = {} - for i, ingredient in pairs(base_rock_loot) do - table.insert(rock_ingredients, {base_rock_loot[i].item, base_rock_loot[i].count_max}) - end data:extend({ { type = "recipe", @@ -107,7 +120,7 @@ if DECT.ENABLED["landscaping"] then energy_required = 2, enabled = false, category = "crafting", - ingredients = rock_ingredients, + ingredients = entity_ingredients(rock, "simple-entity"), result = "dect-base-"..rock, result_count = 1 } diff --git a/prototypes/signal/final-fixes.lua b/prototypes/signal/final-fixes.lua index 329a8a0..c339371 100755 --- a/prototypes/signal/final-fixes.lua +++ b/prototypes/signal/final-fixes.lua @@ -10,11 +10,21 @@ if DECT.ENABLED["signals"] then end end + -- Quick sanity check to filter out any items that might have been removed by other mods + local mapped_colors = {} + for _, signal in pairs(colors) do + if signal.type == "virtual" then + table.insert(mapped_colors, {type=signal.type, name=signal.name, color=signal.color}) + elseif data.raw[signal.type][signal.name] then + table.insert(mapped_colors, {type=signal.type, name=signal.name, color=signal.color}) + end + end + local lamp = data.raw.lamp["small-lamp"] - lamp.signal_to_color_mapping = colors + lamp.signal_to_color_mapping = mapped_colors local lamp_glow = data.raw.lamp["dect-small-lamp-glow"] - lamp_glow.signal_to_color_mapping = colors + lamp_glow.signal_to_color_mapping = mapped_colors -- Reorder some of the base game signals to improve the signal layout data:extend({ diff --git a/prototypes/signal/signals.lua b/prototypes/signal/signals.lua index 8475c28..3d8836a 100755 --- a/prototypes/signal/signals.lua +++ b/prototypes/signal/signals.lua @@ -49,11 +49,13 @@ if DECT.ENABLED["signals"] then end -- Update the lamps - local lamp = data.raw.lamp["small-lamp"] - lamp.signal_to_color_mapping = colors - - local lamp_glow = data.raw.lamp["dect-small-lamp-glow"] - lamp_glow.signal_to_color_mapping = colors + -- !! Moved to final-fixes !! + -- + -- local lamp = data.raw.lamp["small-lamp"] + -- lamp.signal_to_color_mapping = colors + -- + -- local lamp_glow = data.raw.lamp["dect-small-lamp-glow"] + -- lamp_glow.signal_to_color_mapping = colors -- Icon signals diff --git a/prototypes/third-party/alien-biomes.lua b/prototypes/third-party/alien-biomes.lua index 8ce5706..591dbaf 100644 --- a/prototypes/third-party/alien-biomes.lua +++ b/prototypes/third-party/alien-biomes.lua @@ -107,6 +107,26 @@ if DECT.ENABLED["landscaping"] and mods["alien-biomes"] then end end + -- calculate the cost of the entity based upon what it gives when mined + local function entity_ingredients(name, type) + local entity = data.raw[type][name] + local ingredients = {} + if entity.minable then + if entity.minable.results then + for _, result in pairs(entity.minable.results) do + if result.amount_max then + table.insert(ingredients, {result.name, result.amount_max * 1.1}) + else + table.insert(ingredients, {result.name, result.amount * 1.5}) + end + end + elseif entity.minable.result then + table.insert(ingredients, {entity.minable.result, entity.minable.count * 1.5}) + end + end + return ingredients + end + -- Create new tree items for _, tree in pairs(trees) do if data.raw["tree"][tree] then @@ -128,9 +148,7 @@ if DECT.ENABLED["landscaping"] and mods["alien-biomes"] then energy_required = 2, enabled = false, category = "crafting", - ingredients = { - { data.raw["tree"][tree].minable.result, data.raw["tree"][tree].minable.count * 1.5 } - }, + ingredients = entity_ingredients(tree, "tree"), result = "dect-alien-biomes-"..tree, result_count = 1 } @@ -161,9 +179,7 @@ if DECT.ENABLED["landscaping"] and mods["alien-biomes"] then energy_required = 2, enabled = false, category = "crafting", - ingredients = { - {"stone", 30} - }, + ingredients = entity_ingredients(rock.name, "simple-entity"), result = "dect-alien-biomes-"..rock.name, result_count = 1 } diff --git a/prototypes/third-party/config.lua b/prototypes/third-party/config.lua index a2f9ab8..dda9755 100644 --- a/prototypes/third-party/config.lua +++ b/prototypes/third-party/config.lua @@ -49,3 +49,282 @@ if mods["KS_Power"] then -- Add signal support for Diesel fuel fluid table.insert(DECT.CONFIG.SIGNALS, {type="fluid", name="diesel-fuel", color={r=0.70,g=0.70,b=0.00,a=0.68}}) end + +-- ANGEL'S REFINING +-- --------------------------------- +if mods["angelsrefining"] then + -- Add signal support for Angel's ores + local angelsrefining_items = { + -- Saphirite + {type="item", name="angels-ore1", color={r=0.21,g=0.37,b=0.53,a=0.86}}, + {type="item", name="angels-ore1-crushed", color={r=0.21,g=0.37,b=0.53,a=0.86}}, + {type="item", name="angels-ore1-chunk", color={r=0.21,g=0.37,b=0.53,a=0.86}}, + {type="item", name="angels-ore1-crystal", color={r=0.21,g=0.37,b=0.53,a=0.86}}, + {type="item", name="angels-ore1-pure", color={r=0.21,g=0.37,b=0.53,a=0.86}}, + -- Jivolite + {type="item", name="angels-ore2", color={r=0.71,g=0.66,b=0.22,a=0.86}}, + {type="item", name="angels-ore2-crushed", color={r=0.71,g=0.66,b=0.22,a=0.86}}, + {type="item", name="angels-ore2-chunk", color={r=0.71,g=0.66,b=0.22,a=0.86}}, + {type="item", name="angels-ore2-crystal", color={r=0.71,g=0.66,b=0.22,a=0.86}}, + {type="item", name="angels-ore2-pure", color={r=0.71,g=0.66,b=0.22,a=0.86}}, + -- Stiratite + {type="item", name="angels-ore3", color={r=0.41,g=0.58,b=0.70,a=0.86}}, + {type="item", name="angels-ore3-crushed", color={r=0.41,g=0.58,b=0.70,a=0.86}}, + {type="item", name="angels-ore3-chunk", color={r=0.41,g=0.58,b=0.70,a=0.86}}, + {type="item", name="angels-ore3-crystal", color={r=0.41,g=0.58,b=0.70,a=0.86}}, + {type="item", name="angels-ore3-pure", color={r=0.41,g=0.58,b=0.70,a=0.86}}, + -- Crotinnium + {type="item", name="angels-ore4", color={r=0.75,g=0.75,b=0.75,a=0.86}}, + {type="item", name="angels-ore4-crushed", color={r=0.75,g=0.75,b=0.75,a=0.86}}, + {type="item", name="angels-ore4-chunk", color={r=0.75,g=0.75,b=0.75,a=0.86}}, + {type="item", name="angels-ore4-crystal", color={r=0.75,g=0.75,b=0.75,a=0.86}}, + {type="item", name="angels-ore4-pure", color={r=0.75,g=0.75,b=0.75,a=0.86}}, + -- Rubyte + {type="item", name="angels-ore5", color={r=0.68,g=0.18,b=0.16,a=0.86}}, + {type="item", name="angels-ore5-crushed", color={r=0.68,g=0.18,b=0.16,a=0.86}}, + {type="item", name="angels-ore5-chunk", color={r=0.68,g=0.18,b=0.16,a=0.86}}, + {type="item", name="angels-ore5-crystal", color={r=0.68,g=0.18,b=0.16,a=0.86}}, + {type="item", name="angels-ore5-pure", color={r=0.68,g=0.18,b=0.16,a=0.86}}, + -- Bobmonium + {type="item", name="angels-ore6", color={r=0.53,g=0.37,b=0.17,a=0.86}}, + {type="item", name="angels-ore6-crushed", color={r=0.53,g=0.37,b=0.17,a=0.86}}, + {type="item", name="angels-ore6-chunk", color={r=0.53,g=0.37,b=0.17,a=0.86}}, + {type="item", name="angels-ore6-crystal", color={r=0.53,g=0.37,b=0.17,a=0.86}}, + {type="item", name="angels-ore6-pure", color={r=0.53,g=0.37,b=0.17,a=0.86}}, + -- Ferrous + {type="item", name="angels-ore8-crushed", color={r=0.51,g=0.74,b=0.21,a=0.86}}, + {type="item", name="angels-ore8-powder", color={r=0.51,g=0.74,b=0.21,a=0.86}}, + {type="item", name="angels-ore8-dust", color={r=0.51,g=0.74,b=0.21,a=0.86}}, + {type="item", name="angels-ore8-crystal", color={r=0.51,g=0.74,b=0.21,a=0.86}}, + -- Cupric + {type="item", name="angels-ore9-crushed", color={r=0.93,g=0.43,b=0.01,a=0.86}}, + {type="item", name="angels-ore9-powder", color={r=0.93,g=0.43,b=0.01,a=0.86}}, + {type="item", name="angels-ore9-dust", color={r=0.93,g=0.43,b=0.01,a=0.86}}, + {type="item", name="angels-ore9-crystal", color={r=0.93,g=0.43,b=0.01,a=0.86}}, + -- Stone & Slag + {type="item", name="stone-crushed", color={r=0.61,g=0.61,b=0.61,a=0.86}}, + {type="item", name="slag", color={r=0.39,g=0.33,b=0.34,a=0.86}}, + -- Catalyst + {type="item", name="catalysator-brown", color={r=0.43,g=0.27,b=0.00,a=0.92}}, + {type="item", name="catalysator-green", color={r=0.39,g=0.52,b=0.04,a=0.92}}, + {type="item", name="catalysator-orange", color={r=0.92,g=0.42,b=0.08,a=0.92}}, + -- Geodes + {type="item", name="crystal-dust", color={r=0.32,g=0.65,b=0.38,a=0.86}}, + {type="item", name="geode-blue", color={r=0.17,g=0.55,b=0.86,a=0.86}}, + {type="item", name="geode-cyan", color={r=0.14,g=0.86,b=0.72,a=0.86}}, + {type="item", name="geode-lightgreen", color={r=0.63,g=0.83,b=0.17,a=0.86}}, + {type="item", name="geode-purple", color={r=0.87,g=0.14,b=0.80,a=0.86}}, + {type="item", name="geode-red", color={r=0.67,g=0.22,b=0.16,a=0.86}}, + {type="item", name="geode-yellow", color={r=0.81,g=0.57,b=0.10,a=0.86}}, + } + for _, item in pairs(angelsrefining_items) do + table.insert(DECT.CONFIG.SIGNALS, item) + end +end + +-- ANGEL'S SMELTING +-- --------------------------------- +if mods["angelssmelting"] then + -- Add signal support for Angel's ingots, coils, plates, etc. + local angelssmelting_items = { + -- Steel + {type="item", name="ingot-steel", color={r=0.83,g=0.86,b=0.89,a=0.92}}, + {type="item", name="powder-steel", color={r=0.83,g=0.86,b=0.89,a=0.92}}, + {type="item", name="angels-plate-steel", color={r=0.83,g=0.86,b=0.89,a=0.92}}, + {type="item", name="angels-roll-steel", color={r=0.83,g=0.86,b=0.89,a=0.92}}, + {type="item", name="angels-rod-steel", color={r=0.83,g=0.86,b=0.89,a=0.92}}, + {type="item", name="angels-rod-rack-steel", color={r=0.83,g=0.86,b=0.89,a=0.92}}, + {type="fluid", name="liquid-molten-steel", color={r=0.83,g=0.86,b=0.89,a=0.68}}, + -- Solder + {type="item", name="angels-solder", color={r=0.33,g=0.39,b=0.39,a=0.92}}, + {type="item", name="angels-roll-solder", color={r=0.33,g=0.39,b=0.39,a=0.92}}, + {type="fluid", name="liquid-molten-solder", color={r=0.33,g=0.39,b=0.39,a=0.68}}, + -- Aluminium + {type="item", name="bauxite-ore", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="processed-aluminium", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="pellet-aluminium", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="solid-sodium-aluminate", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="solid-aluminium-hydroxide", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="solid-aluminium-oxide", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="ingot-aluminium", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="powder-aluminium", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="angels-plate-aluminium", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="item", name="angels-roll-aluminium", color={r=0.65,g=0.61,b=0.32,a=0.92}}, + {type="fluid", name="liquid-molten-aluminium", color={r=0.65,g=0.61,b=0.32,a=0.68}}, + -- Nickel + {type="item", name="nickel-ore", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="item", name="processed-nickel", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="item", name="pellet-nickel", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="item", name="cathode-nickel", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="item", name="solid-nickel-carbonyl", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="item", name="ingot-nickel", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="item", name="powder-nickel", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="item", name="angels-plate-nickel", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="item", name="angels-roll-nickel", color={r=0.22,g=0.47,b=0.44,a=0.92}}, + {type="fluid", name="liquid-molten-nickel", color={r=0.22,g=0.47,b=0.44,a=0.68}}, + -- Chrome + {type="item", name="chrome-ore", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="processed-chrome", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="pellet-chrome", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="solid-chromate", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="solid-dichromate", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="solid-chrome-oxide", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="ingot-chrome", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="angels-plate-chrome", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="powder-chrome", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="item", name="angels-roll-chrome", color={r=0.61,g=0.57,b=0.76,a=0.92}}, + {type="fluid", name="liquid-molten-chrome", color={r=0.61,g=0.57,b=0.76,a=0.68}}, + -- Cobalt + {type="item", name="cobalt-ore", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="item", name="processed-cobalt", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="item", name="pellet-cobalt", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="item", name="solid-cobalt-hydroxide", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="item", name="solid-cobalt-oxide", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="item", name="ingot-cobalt", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="item", name="powder-cobalt", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="item", name="angels-plate-cobalt", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="item", name="angels-roll-cobalt", color={r=0.20,g=0.28,b=0.38,a=0.92}}, + {type="fluid", name="liquid-molten-cobalt", color={r=0.20,g=0.28,b=0.38,a=0.68}}, + -- Manganese + {type="item", name="manganese-ore", color={r=0.79,g=0.32,b=0.33,a=0.92}}, + {type="item", name="processed-manganese", color={r=0.79,g=0.32,b=0.33,a=0.92}}, + {type="item", name="pellet-manganese", color={r=0.79,g=0.32,b=0.33,a=0.92}}, + {type="item", name="solid-manganese-oxide", color={r=0.79,g=0.32,b=0.33,a=0.92}}, + {type="item", name="cathode-manganese", color={r=0.79,g=0.32,b=0.33,a=0.92}}, + {type="item", name="ingot-manganese", color={r=0.79,g=0.32,b=0.33,a=0.92}}, + {type="item", name="angels-plate-manganese", color={r=0.79,g=0.32,b=0.33,a=0.92}}, + {type="item", name="angels-roll-manganese", color={r=0.79,g=0.32,b=0.33,a=0.92}}, + {type="fluid", name="liquid-molten-manganese", color={r=0.79,g=0.32,b=0.33,a=0.68}}, + -- Lead + {type="item", name="lead-ore", color={r=0.28,g=0.28,b=0.32,a=0.92}}, + {type="item", name="processed-lead", color={r=0.28,g=0.28,b=0.32,a=0.92}}, + {type="item", name="pellet-lead", color={r=0.28,g=0.28,b=0.32,a=0.92}}, + {type="item", name="solid-lead-oxide", color={r=0.28,g=0.28,b=0.32,a=0.92}}, + {type="item", name="anode-lead", color={r=0.28,g=0.28,b=0.32,a=0.92}}, + {type="item", name="ingot-lead", color={r=0.28,g=0.28,b=0.32,a=0.92}}, + {type="item", name="angels-plate-lead", color={r=0.28,g=0.28,b=0.32,a=0.92}}, + {type="fluid", name="liquid-molten-lead", color={r=0.28,g=0.28,b=0.32,a=0.68}}, + {type="fluid", name="liquid-hexafluorosilicic-acid", color={r=0.79,g=0.90,b=0.24,a=0.68}}, + -- Iron + {type="item", name="processed-iron", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="item", name="pellet-iron", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="item", name="solid-iron-hydroxide", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="item", name="ingot-iron", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="item", name="powder-iron", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="item", name="angels-plate-iron", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="item", name="angels-roll-iron", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="item", name="angels-rod-iron", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="item", name="angels-rod-stack-iron", color={r=0.64,g=0.69,b=0.74,a=0.92}}, + {type="fluid", name="liquid-molten-iron", color={r=0.64,g=0.69,b=0.74,a=0.68}}, + -- Gold + {type="item", name="gold-ore", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="processed-gold", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="pellet-gold", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="cathode-gold", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="solid-sodium-gold-cyanide", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="ingot-gold", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="angels-plate-gold", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="angels-roll-gold", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="angels-wire-coil-gold", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="item", name="angels-wire-gold", color={r=0.88,g=0.71,b=0.10,a=0.92}}, + {type="fluid", name="liquid-molten-gold", color={r=0.88,g=0.71,b=0.10,a=0.68}}, + {type="fluid", name="liquid-chlorauric-acid", color={r=0.58,g=0.61,b=0.09,a=0.68}}, + -- Glass + {type="item", name="solid-glass-mixture", color={r=0.44,g=0.40,b=0.40,a=0.92}}, + {type="item", name="angels-plate-glass", color={r=0.44,g=0.40,b=0.40,a=0.92}}, + {type="item", name="angels-coil-glass-fiber", color={r=0.44,g=0.40,b=0.40,a=0.92}}, + {type="fluid", name="liquid-molten-glass", color={r=0.44,g=0.40,b=0.40,a=0.92}}, + -- Copper + {type="item", name="processed-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="item", name="pellet-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="item", name="anode-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="item", name="ingot-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="item", name="powder-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="item", name="angels-plate-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="item", name="angels-roll-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="item", name="angels-wire-coil-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="item", name="angels-wire-copper", color={r=0.57,g=0.37,b=0.32,a=0.92}}, + {type="fluid", name="liquid-molten-copper", color={r=0.57,g=0.37,b=0.32,a=0.68}}, + -- Silicon + {type="item", name="quartz", color={r=0.83,g=0.83,b=0.83,a=0.92}}, + {type="item", name="processed-silica", color={r=0.83,g=0.83,b=0.83,a=0.92}}, + {type="item", name="pellet-silica", color={r=0.83,g=0.83,b=0.83,a=0.92}}, + {type="item", name="ingot-silicon", color={r=0.83,g=0.83,b=0.83,a=0.92}}, + {type="item", name="angels-mono-silicon-seed", color={r=0.83,g=0.83,b=0.83,a=0.92}}, + {type="item", name="angels-mono-silicon", color={r=0.83,g=0.83,b=0.83,a=0.92}}, + {type="item", name="angels-quartz-crucible", color={r=0.83,g=0.83,b=0.83,a=0.68}}, + {type="fluid", name="liquid-molten-silicon", color={r=0.83,g=0.83,b=0.83,a=0.68}}, + {type="fluid", name="liquid-trichlorosilane", color={r=0.83,g=0.83,b=0.83,a=0.68}}, + {type="fluid", name="gas-silane", color={r=0.83,g=0.83,b=0.83,a=0.92}}, + -- Silver + {type="item", name="silver-ore", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="processed-silver", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="pellet-silver", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="solid-silver-nitrate", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="solid-sodium-silver-cyanide", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="cathode-silver", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="ingot-silver", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="angels-plate-silver", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="angels-roll-silver", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="angels-wire-coil-silver", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="item", name="angels-wire-silver", color={r=0.57,g=0.65,b=0.70,a=0.92}}, + {type="fluid", name="liquid-molten-silver", color={r=0.57,g=0.65,b=0.70,a=0.68}}, + -- Stone + {type="item", name="solid-lime", color={r=0.90,g=0.78,b=0.67,a=0.92}}, + {type="item", name="solid-cement", color={r=0.45,g=0.43,b=0.42,a=0.92}}, + {type="fluid", name="liquid-concrete", color={r=0.45,g=0.43,b=0.42,a=0.68}}, + {type="item", name="clay-brick-raw", color={r=0.58,g=0.30,b=0.10,a=0.92}}, + {type="item", name="clay-brick", color={r=0.39,g=0.28,b=0.18,a=0.92}}, + {type="item", name="concrete-brick", color={r=0.39,g=0.38,b=0.37,a=0.92}}, + {type="item", name="reinforced-concrete-brick", color={r=0.39,g=0.38,b=0.37,a=0.92}}, + -- Tin + {type="item", name="tin-ore", color={r=0.34,g=0.51,b=0.38,a=0.92}}, + {type="item", name="processed-tin", color={r=0.34,g=0.51,b=0.38,a=0.92}}, + {type="item", name="pellet-tin", color={r=0.34,g=0.51,b=0.38,a=0.92}}, + {type="item", name="ingot-tin", color={r=0.34,g=0.51,b=0.38,a=0.92}}, + {type="item", name="angels-plate-tin", color={r=0.34,g=0.51,b=0.38,a=0.92}}, + {type="item", name="angels-wire-coil-tin", color={r=0.34,g=0.51,b=0.38,a=0.92}}, + {type="item", name="angels-wire-tin", color={r=0.34,g=0.51,b=0.38,a=0.92}}, + {type="fluid", name="liquid-molten-tin", color={r=0.34,g=0.51,b=0.38,a=0.92}}, + -- Titanium + {type="item", name="rutile-ore", color={r=0.49,g=0.38,b=0.48,a=0.92}}, + {type="item", name="processed-titanium", color={r=0.49,g=0.38,b=0.48,a=0.92}}, + {type="item", name="pellet-titanium", color={r=0.49,g=0.38,b=0.48,a=0.92}}, + {type="item", name="sponge-titanium", color={r=0.49,g=0.38,b=0.48,a=0.92}}, + {type="item", name="ingot-titanium", color={r=0.49,g=0.38,b=0.48,a=0.92}}, + {type="item", name="angels-plate-titanium", color={r=0.49,g=0.38,b=0.48,a=0.92}}, + {type="item", name="angels-roll-titanium", color={r=0.49,g=0.38,b=0.48,a=0.92}}, + {type="fluid", name="liquid-molten-titanium", color={r=0.49,g=0.38,b=0.48,a=0.68}}, + {type="fluid", name="liquid-titanium-tetrachloride", color={r=0.49,g=0.38,b=0.48,a=0.68}}, + -- Tungsten + {type="item", name="tungsten-ore", color={r=0.53,g=0.37,b=0.23,a=0.92}}, + {type="item", name="processed-tungsten", color={r=0.53,g=0.37,b=0.23,a=0.92}}, + {type="item", name="pellet-tungsten", color={r=0.53,g=0.37,b=0.23,a=0.92}}, + {type="item", name="solid-ammonium-paratungstate", color={r=0.53,g=0.37,b=0.23,a=0.92}}, + {type="item", name="solid-tungsten-oxide", color={r=0.53,g=0.37,b=0.23,a=0.92}}, + {type="item", name="powder-tungsten", color={r=0.53,g=0.37,b=0.23,a=0.92}}, + {type="item", name="casting-powder-tungsten", color={r=0.53,g=0.37,b=0.23,a=0.92}}, + {type="item", name="angels-plate-tungsten", color={r=0.53,g=0.37,b=0.23,a=0.92}}, + {type="fluid", name="liquid-tungstic-acid", color={r=0.53,g=0.37,b=0.23,a=0.68}}, + {type="fluid", name="gas-tungsten-hexafluoride", color={r=0.53,g=0.37,b=0.23,a=0.68}}, + -- Zinc + {type="item", name="zinc-ore", color={r=0.37,g=0.69,b=0.67,a=0.92}}, + {type="item", name="processed-zinc", color={r=0.37,g=0.69,b=0.67,a=0.92}}, + {type="item", name="pellet-zinc", color={r=0.37,g=0.69,b=0.67,a=0.92}}, + {type="item", name="solid-zinc-oxide", color={r=0.37,g=0.69,b=0.67,a=0.92}}, + {type="item", name="cathode-zinc", color={r=0.37,g=0.69,b=0.67,a=0.92}}, + {type="item", name="ingot-zinc", color={r=0.37,g=0.69,b=0.67,a=0.92}}, + {type="item", name="angels-plate-zinc", color={r=0.37,g=0.69,b=0.67,a=0.92}}, + {type="item", name="angels-roll-zinc", color={r=0.37,g=0.69,b=0.67,a=0.92}}, + {type="fluid", name="liquid-molten-zinc", color={r=0.37,g=0.69,b=0.67,a=0.68}}, + -- Coolant + {type="fluid", name="liquid-coolant", color={r=0.37,g=0.47,b=0.63,a=0.68}}, + {type="fluid", name="liquid-coolant-used", color={r=0.24,g=0.27,b=0.34,a=0.68}}, + -- Molds + {type="item", name="mold-expendable", color={r=0.59,g=0.48,b=0.40,a=0.92}}, + {type="item", name="mold-non-expendable", color={r=0.30,g=0.30,b=0.30,a=0.92}}, + } + for _, item in pairs(angelssmelting_items) do + table.insert(DECT.CONFIG.SIGNALS, item) + end +end