Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jpanther committed Sep 8, 2021
2 parents 4f75d26 + 717b74f commit 7e48cca
Show file tree
Hide file tree
Showing 68 changed files with 126 additions and 18 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,14 @@ Special thanks to the translators below (in no particular order).
* Chinese Traditional (29%) - [k98a](https://crowdin.com/profile/k98a).
* Czech (71%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij).
* French (98%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi) and [daikyraraga](https://crowdin.com/profile/daikyraraga).
* German (98%) - [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), [Leridon](https://crowdin.com/profile/Leridon), [Meisterfuchs](https://crowdin.com/profile/Meisterfuchs) and [adoa](https://crowdin.com/profile/adoa).
* 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), [Leridon](https://crowdin.com/profile/Leridon), [Meisterfuchs](https://crowdin.com/profile/Meisterfuchs) and [adoa](https://crowdin.com/profile/adoa).
* Hungarian (100%) - [mmnetworkteam](https://crowdin.com/profile/mmnetworkteam).
* Italian (60%) - [diego.crosera](https://crowdin.com/profile/diego.crosera).
* Italian (100%) - [diego.crosera](https://crowdin.com/profile/diego.crosera) and [andrea.gomarasca](https://crowdin.com/profile/andrea.gomarasca).
* Korean (100%) - [GimoXagros](https://crowdin.com/profile/GimoXagros).
* Polish (95%) - [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).
* 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 (98%) - [celaquila](https://crowdin.com/profile/celaquila) and [Unknow0059](https://crowdin.com/profile/Unknow0059).
* 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 (86%) - [notallme](https://crowdin.com/profile/notallme).
* Spanish (100%) - [notallme](https://crowdin.com/profile/notallme) and [AgnotSeeker](https://crowdin.com/profile/agnotseeker).

### Mod Compatibility

Expand Down
18 changes: 18 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
---------------------------------------------------------------------------------------------------
Version: 0.12.3
Date: 08. 09. 2021
Added:
- Higher resolution technology and signal icons
- New Painted concrete and refined concrete icons
- Glowing lamps are now fast replacable with normal Lamps
Changed:
- Balancing - Wooden barricade no longer requires research to unlock
- Balancing - Fixed fuel value of Wooden barricade being too overpowered
Bugfixes:
- Fixed lamp signal colours not working for science packs
- Increased search radius for lamps to stop glowing lamp flicker when it comes in range
- Add missing icon_mipmaps parameter to technology icons
Locales:
- Updated Italian translation (thanks to diego.crosera and andrea.gomarasca)
- Updated Polish translation (thanks to no_desired_username)
- Updated Spanish translation (thanks to AgnotSeeker)
---------------------------------------------------------------------------------------------------
Version: 0.12.2
Date: 14. 12. 2020
Bugfixes:
Expand Down
Binary file modified graphics/icons/base-deepwater-green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/base-deepwater.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/base-water-green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/base-water.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-caution-refined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-caution.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-danger-refined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-danger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-defect-refined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-defect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-emergency-refined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-emergency.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-hazard-refined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-hazard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-operations-refined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-operations.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-radiation-refined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-radiation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-safety-refined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/icons/paint-safety.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/signal/arrow-down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/signal/arrow-horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/signal/arrow-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/signal/arrow-reset.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/signal/arrow-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/signal/arrow-universal.png
Binary file modified graphics/signal/arrow-up.png
Binary file modified graphics/signal/arrow-vertical.png
Binary file modified graphics/signal/misc-alarm.png
Binary file modified graphics/signal/misc-battery.png
Binary file modified graphics/signal/misc-clock.png
Binary file modified graphics/signal/misc-finish.png
Binary file modified graphics/signal/misc-gears.png
Binary file modified graphics/signal/misc-gun.png
Binary file modified graphics/signal/misc-light.png
Binary file modified graphics/signal/misc-mine.png
Binary file modified graphics/signal/misc-nuclear.png
Binary file modified graphics/signal/misc-oil.png
Binary file modified graphics/signal/misc-power.png
Binary file modified graphics/signal/misc-rocket.png
Binary file modified graphics/signal/misc-siren.png
Binary file modified graphics/signal/misc-star.png
Binary file modified graphics/signal/misc-tank.png
Binary file modified graphics/signal/misc-temperature.png
Binary file modified graphics/signal/misc-train.png
Binary file modified graphics/signal/misc-wall.png
Binary file modified graphics/signal/misc-warning-shield.png
Binary file modified graphics/signal/misc-warning-triangle.png
Binary file modified graphics/technology/basic-wall.png
100755 → 100644
Binary file modified graphics/technology/concrete-paint.png
100755 → 100644
Binary file modified graphics/technology/landscaping.png
100755 → 100644
Binary file modified graphics/technology/lawnmower.png
Binary file modified graphics/technology/wood-floor.png
100755 → 100644
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Dectorio",
"version": "0.12.2",
"version": "0.12.3",
"title": "Dectorio",
"author": "PantherX",
"contact": "",
Expand Down
19 changes: 19 additions & 0 deletions locale/es-ES/dectorio.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Dectorio=Dectorio

[mod-description]
Dectorio=Añade elementos para embellecer tu fabrica. Actualmente incluye señales de colores, paredes de malla, piedra, madera y concreto, señales, pisos de madera, grava y diferentes estilos de concreto.

[mod-setting-name]
dectorio-signals=Habilitar señales
Expand All @@ -13,25 +14,34 @@ dectorio-gravel=Habilitar las losas de Grava
dectorio-concrete=Habilitar las losas de Concreto
dectorio-painted-concrete=Habilitar las losas de Concreto Pintado
dectorio-decoratives=Habilitar decoraciones
dectorio-lawnmower=Habilitar el cortacésped
dectorio-item-group=Separar pestaña de elaboración
dectorio-vanilla-hazard-concrete-style=Usar el estilo por defecto de Factorio para el concreto de peligro
dectorio-landscaping-blueprintable=Incluir items de paisajismo al crear planos
dectorio-remove-decoratives-near-entity=Eliminar decorativas cerca de entidades recién colocadas
dectorio-painted-concrete-speed-modifier=Modificador de velocidad de concreto pintado
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

[mod-setting-description]
dectorio-signals=Habilita señales adicionales para usar en lamparas o redes de circuitos
dectorio-walls=Habilita tipos de paredes y puertas adicionales
dectorio-landscaping=Habilita la capacidad de crear pisos de arena, tierra, pastos y desiertos
dectorio-waterfill=Habilita la capacidad de crear agua para crear o expandir lagos
dectorio-wood=Permite la capacidad de elaborar tipos de suelo de madera
dectorio-gravel=Habilita la capacidad de colocar materiales brutos en el suelo como grava
dectorio-concrete=Permite la capacidad de elaborar tipos de suelo de hormigón, incluyendo hormigón de rejilla
dectorio-painted-concrete=Habilita estilos de concreto pintados que sustituyen al concreto de riesgo base
dectorio-decoratives=Habilita la capacidad de diseñar items decorativos para la fábrica
dectorio-lawnmower=Permite que la herramienta de cortacésped elimine los elementos decorativos de su fábrica
dectorio-item-group=Mueve todos los elementos decorativos a una pestaña dedicada en el menú de elaboración
dectorio-vanilla-hazard-concrete-style=Cuando se habilita, el Concreto de riesgo pintado se verá como el Concreto de riesgo por defecto de Factorio cuando se coloca (requiere que se habilite el Concreto Pintado)
dectorio-landscaping-blueprintable=Cuando está activada, los planos incluirán características de paisaje como mosaicos
Expand All @@ -40,6 +50,7 @@ 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 Expand Up @@ -137,6 +148,7 @@ dect-lawnmower=Mientras se sostiene, __CONTROL__select-for-blueprint__ arrastre

[recipe-name]
dect-concrete-wall-from-stone-wall=Muro de Concreto a base de Muro de Piedra
dect-concrete-gate-from-stone-gate=Portón de concreto a base de Portón de piedra

[entity-name]
dect-wood-wall=Barricada de madera
Expand Down Expand Up @@ -191,8 +203,13 @@ dect-coal-gravel=Grava de carbón
[technology-name]
dect-landscaping=Paisajismo
dect-concrete-paint=Concreto pintado
stone-wall=Muro básico
dect-advanced-wall=Muro avanzado
dect-wood-floor=Tablón de madera
dect-earthworks=Terraplenes
dect-lawnmower=Cortadora de césped
gate=Portón básico
dect-advanced-gate=Portón avanzado

[technology-description]
dect-landscaping=Permite colocar superficies terrestres naturales.
Expand All @@ -202,6 +219,8 @@ dect-advanced-wall=Más resistente que las paredes básicas, protegen tu fábric
dect-wood-floor=Azulejos de madera básicos que cubren el terreno y permiten mayor velocidad de movimiento.
dect-earthworks=Permite colocar y remover agua en el terreno.
dect-lawnmower=Elimina las decoraciones de un área determinada, dejando una superficie completamente despejada.
gate=Secciones básicas del muro que se abren cuando es necesario. Puede ser controlado por la red de circuitos.
dect-advanced-gate=Más fuertes que los portónes básicos, éstas secciones avanzadas del muro se abren cuando es necesario. Puede ser controlado por la red de circuitos.

[virtual-signal-name]
signal-red=Señal roja
Expand Down
37 changes: 37 additions & 0 deletions locale/it/dectorio.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,23 @@ dectorio-waterfill-tiles-deep=Solo sezioni d'acqua profonda
[mod-setting-description]
dectorio-signals=Abilita i segnali aggiuntivi per l'utilizzo nelle lampade o nella rete circuitale
dectorio-walls=Abilita ulteriori tipi di muri e cancelli
dectorio-landscaping=Abilita la capacità di assemblare sezioni del terreno fatte di sabbia, terriccio, erba o deserto
dectorio-waterfill=Abilita la capacità di assemblare acqua per creare o espandere specchi d'acqua
dectorio-wood=Abilita la possibilità di assemblare pavimentazioni in legno
dectorio-gravel=Abilita la possibilità per i minerali grezzi di essere posizionati a terra come ghiaia
dectorio-concrete=Abilita la possibilità di assemblare pavimentazioni in cemento, tra cui la griglia di cemento
dectorio-painted-concrete=Abilita il cemento con diversi stili di strisce verniciate che sostituiscono il cemento con strisce di pericolo del gioco base
dectorio-decoratives=Abilita la possibilità di assemblare oggetti decorativi per la tua fabbrica
dectorio-lawnmower=Abilita lo strumento tosaerba per rimuovere gli oggetti decorativi dal terreno della tua fabbrica
dectorio-item-group=Sposta tutti gli oggetti decorativi in una scheda di assemblaggio dedicata nell'inventario
dectorio-vanilla-hazard-concrete-style=Quando abilitato, il cemento dipinto Zona Pericolosa sarà uguale al cemento Zona Pericolosa base di Factorio (richiede che Cemento Dipinto sia attivo)
dectorio-landscaping-blueprintable=Quando attivato, i progetti includeranno caratteristiche di paesaggio come tessere
dectorio-painted-concrete-speed-modifier=Modifica la velocità base di camminamento e dei veicoli per il cemento colorato di questo valore (1= nessun cambio (base), 0.75 = 75% della velocità base, 0.5 = 50% della velocità base)
dectorio-decorative-removal-probability=La probabilità che le decorazioni, come i cespugli e le graminacee, siano rimosse quando vengono posizionate piastrelle di pavimentazione (1 = 100% vengono rimosse (base), 0.5 = 50%, 0 = nessuna viene rimossa)
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 Expand Up @@ -127,8 +144,11 @@ dect-paint-refined-danger=Premere __CONTROL__rotate__ per ruotare le sezioni dip
dect-paint-refined-defect=Premere __CONTROL__rotate__ per ruotare le sezioni dipinte.
dect-paint-refined-operations=Premere __CONTROL__rotate__ per ruotare le sezioni dipinte.
dect-small-lamp-glow=Quando a questa lampada viene passato un segnale, brillerà luminosamente in un raggio di grandi dimensioni.
dect-lawnmower=Tenere premuto, __CONTROL__select-for-blueprint__ e trascinare su un'area per rimuovere eventuali decorazioni. __CONTROL__select-for-cancel-deconstruct_ e trascinare per rimuovere i residui.
[recipe-name]
dect-concrete-wall-from-stone-wall=Muro di cemento da muro di pietra
dect-concrete-gate-from-stone-gate=Cancello di cemento da Cancello di pietra
[entity-name]
dect-wood-wall=Palizzata di legno
Expand Down Expand Up @@ -181,9 +201,26 @@ dect-copper-ore-gravel=Ghiaia di rame
dect-coal-gravel=Ghiaia di carbone
[technology-name]
dect-landscaping=Paesaggistica
dect-concrete-paint=Cemento dipinto
stone-wall=Muro semplice
dect-advanced-wall=Muro avanzato
dect-wood-floor=Pavimentazioni in Legno
dect-earthworks=Movimentazione terra
dect-lawnmower=Tosaerba
gate=Cancello di base
dect-advanced-gate=Cancello avanzato
[technology-description]
dect-landscaping=Consente di posizionare superfici di terreno naturali.
dect-concrete-paint=Superfici di cemento dipinte come ulteriori decorazioni.
stone-wall=Muri di base che proteggono la tua fabbrica dagli assalitori.
dect-advanced-wall=Piú forti dei muri di base, proteggono la tua fabbrica dagli assalitori.
dect-wood-floor=Pavimentazione in legno di base che copre il terreno e consente di muoversi più velocemente.
dect-earthworks=Consente di posizionare e rimuovere le tessere d'acqua.
dect-lawnmower=Rimuove gli oggetti decorativi da una determinata area, lasciando la superficie completamente pulita.
gate=Sezioni di muri di base che si aprono quando necessario. Possono essere controllati tramite rete di circuiti.
dect-advanced-gate=Più forti dei cancelli di base, queste sezioni di mura avanzate si aprono quando serve. Possono essere controllate tramite rete di circuiti.

[virtual-signal-name]
signal-red=Segnale rosso
Expand Down
7 changes: 7 additions & 0 deletions locale/pl/dectorio.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
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
Expand All @@ -17,6 +18,7 @@ dectorio-lawnmower=Włącz kosiarkę
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-remove-decoratives-near-entity=Usuń elementy dekoracyjne w pobliżu nowo umieszczonych obiektów
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
Expand Down Expand Up @@ -201,8 +203,13 @@ dect-coal-gravel=Żwir z węgla
[technology-name]
dect-landscaping=Krajobraz
dect-concrete-paint=Malowany beton
stone-wall=Podstawowy mur
dect-advanced-wall=Zaawansowany mur
dect-wood-floor=Drewniane podłoże
dect-earthworks=Prace ziemne
dect-lawnmower=Kosiarka
gate=Podstawowa brama
dect-advanced-gate=Zaawansowana brama

[technology-description]
dect-landscaping=Umożliwia umieszczenie naturalnych podłoży.
Expand Down
7 changes: 7 additions & 0 deletions migrations/0.12.3.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
for index, force in pairs(game.forces) do
force.reset_recipes()
force.reset_technologies()

local rec = force.recipes
rec["dect-wood-wall"].enabled = true
end
13 changes: 12 additions & 1 deletion prototypes/entity/lamp.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
-- entity/lamp

-- Make base lamp fast replacable
local base_lamp = data.raw["lamp"]["small-lamp"]
base_lamp.fast_replaceable_group = "lamp"

-- Add glowing coloured lamp
local lamp = util.table.deepcopy(data.raw["lamp"]["small-lamp"])
local lamp = util.table.deepcopy(base_lamp)
lamp.name = "dect-small-lamp-glow"
lamp.icon = "__Dectorio__/graphics/icons/small-lamp-glow.png"
lamp.icon_size = 64
Expand All @@ -12,4 +16,11 @@ lamp.glow_color_intensity = 0.8
lamp.glow_render_mode = "multiplicative"
lamp.light_when_colored.size = 0
lamp.light_when_colored.intensity = 0
lamp.fast_replaceable_group = "lamp"
data:extend({lamp})

-- Increase light search radius
local limit = lamp.glow_size
if data.raw["utility-constants"]["default"]["light_renderer_search_distance_limit"] and data.raw["utility-constants"]["default"]["light_renderer_search_distance_limit"] < limit then
data.raw["utility-constants"]["default"]["light_renderer_search_distance_limit"] = limit
end
2 changes: 1 addition & 1 deletion prototypes/item/walls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if DECT.ENABLED["walls"] then
icon_size = 32,
icon_mipmaps = 1,
fuel_category = "chemical",
fuel_value = "12MJ",
fuel_value = "6MJ",
subgroup = "defensive-structure",
order = "a[a-wood-wall]",
stack_size = DECT.CONFIG.SETTINGS["walls_stack_size"],
Expand Down
2 changes: 1 addition & 1 deletion prototypes/recipe/walls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if DECT.ENABLED["walls"] then
{
type = "recipe",
name = "dect-wood-wall",
enabled = false,
enabled = true,
ingredients = {{"wood", 3}},
result = "dect-wood-wall"
},
Expand Down
8 changes: 6 additions & 2 deletions prototypes/signal/final-fixes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ if DECT.ENABLED["signals"] then
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})
else
if signal.name:find("%-science%-pack") and data.raw["tool"][signal.name] 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
end

Expand Down
2 changes: 1 addition & 1 deletion prototypes/signal/signals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ if DECT.ENABLED["signals"] then
},
{
icon = "__Dectorio__/graphics/signal/" .. iconset.name .. "-" .. icon .. ".png",
icon_size = 32,
icon_size = 64,
icon_mipmaps = 1
}
},
Expand Down
6 changes: 4 additions & 2 deletions prototypes/technology/flooring.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ if DECT.ENABLED["wood-floor"] then
type = "technology",
name = "dect-wood-floor",
icon = "__Dectorio__/graphics/technology/wood-floor.png",
icon_size = 128,
icon_size = 256,
icon_mipmaps = 1,
unit = {
count = 10,
ingredients = {
Expand Down Expand Up @@ -54,7 +55,8 @@ if DECT.ENABLED["painted-concrete"] then
type = "technology",
name = "dect-concrete-paint",
icon = "__Dectorio__/graphics/technology/concrete-paint.png",
icon_size = 128,
icon_size = 256,
icon_mipmaps = 1,
prerequisites = {"concrete"},
unit = {
count = 150,
Expand Down
9 changes: 6 additions & 3 deletions prototypes/technology/landscaping.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ if DECT.ENABLED["landscaping"] then
type = "technology",
name = "dect-landscaping",
icon = "__Dectorio__/graphics/technology/landscaping.png",
icon_size = 128,
icon_size = 256,
icon_mipmaps = 1,
unit = {
count = 15,
ingredients = {
Expand Down Expand Up @@ -62,7 +63,8 @@ if DECT.ENABLED["lawnmower"] then
type = "technology",
name = "dect-lawnmower",
icon = "__Dectorio__/graphics/technology/lawnmower.png",
icon_size = 128,
icon_size = 256,
icon_mipmaps = 1,
prerequisites = lawnmower_prereq,
unit = {
count = 30,
Expand Down Expand Up @@ -99,7 +101,8 @@ if DECT.ENABLED["waterfill"] then
type = "technology",
name = "dect-earthworks",
icon = "__Dectorio__/graphics/technology/landscaping.png",
icon_size = 128,
icon_size = 256,
icon_mipmaps = 1,
prerequisites = {"landfill", "explosives"},
unit = {
count = 200,
Expand Down
4 changes: 2 additions & 2 deletions prototypes/technology/walls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ if DECT.ENABLED["walls"] then
-- Change stone wall tech to basic walls
local base_stone_wall = data.raw["technology"]["stone-wall"]
base_stone_wall.icon = "__Dectorio__/graphics/technology/basic-wall.png"
base_stone_wall.icon_size = 128
table.insert(base_stone_wall.effects, {type = "unlock-recipe", recipe = "dect-wood-wall"})
base_stone_wall.icon_size = 256
base_stone_wall.icon_mipmaps = 1

data:extend(
{
Expand Down

0 comments on commit 7e48cca

Please sign in to comment.