diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index d1169ef..0000000 --- a/.editorconfig +++ /dev/null @@ -1,3 +0,0 @@ -[*] -indent_style = space -indent_size = 4 \ No newline at end of file diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index 9416c90..0ec7456 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -178,7 +178,6 @@ wood=Wood fuel quality-catalyst=Quality catalyst [mod-setting-name] -lignumis-restrict-sciences=Restrict Lignumis science recipes to Lignumis lignumis-belt-progression=Enable progressive belt recipes lignumis-inserter-progression=Enable progressive inserter recipes lignumis-ammo-progression=Enable progressive ammo recipes diff --git a/lignumis/prototypes/content/steam-science.lua b/lignumis/prototypes/content/steam-science.lua index 171bab7..cb37493 100644 --- a/lignumis/prototypes/content/steam-science.lua +++ b/lignumis/prototypes/content/steam-science.lua @@ -41,8 +41,7 @@ data:extend({ primary = { r = 0.65, g = 0.27, b = 0.18, a = 1.000 }, secondary = { r = 0.65, g = 0.27, b = 0.18, a = 1.000 }, }, - allow_productivity = true, - surface_conditions = settings.startup["lignumis-restrict-sciences"].value and { { property = "pollutant-type", min = 3, max = 3 } } or nil + allow_productivity = true }, { type = "recipe", @@ -60,8 +59,7 @@ data:extend({ primary = { r = 0.65, g = 0.27, b = 0.18, a = 1.000 }, secondary = { r = 0.65, g = 0.27, b = 0.18, a = 1.000 }, }, - allow_productivity = true, - surface_conditions = settings.startup["lignumis-restrict-sciences"].value and { { property = "pollutant-type", min = 3, max = 3 } } or nil + allow_productivity = true }, { type = "technology", diff --git a/lignumis/prototypes/content/wood-science.lua b/lignumis/prototypes/content/wood-science.lua index 3d90530..b80cbe5 100644 --- a/lignumis/prototypes/content/wood-science.lua +++ b/lignumis/prototypes/content/wood-science.lua @@ -40,8 +40,7 @@ data:extend({ primary = { r = 0.65, g = 0.27, b = 0.18, a = 1.000 }, secondary = { r = 0.65, g = 0.27, b = 0.18, a = 1.000 }, }, - allow_productivity = true, - surface_conditions = settings.startup["lignumis-restrict-sciences"].value and { { property = "pollutant-type", min = 3, max = 3 } } or nil + allow_productivity = true }, { type = "technology", diff --git a/lignumis/settings.lua b/lignumis/settings.lua index 8296fdd..ddde9f0 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -1,108 +1,101 @@ data:extend({ - { - type = "bool-setting", - name = "lignumis-restrict-sciences", - setting_type = "startup", - default_value = false, - order = "a" - }, { type = "bool-setting", name = "lignumis-belt-progression", setting_type = "startup", default_value = true, - order = "b" + order = "a" }, { type = "bool-setting", name = "lignumis-inserter-progression", setting_type = "startup", default_value = true, - order = "c" + order = "b" }, { type = "bool-setting", name = "lignumis-ammo-progression", setting_type = "startup", default_value = true, - order = "d" + order = "c" }, { type = "bool-setting", name = "lignumis-technology-progression", setting_type = "startup", default_value = true, - order = "e" + order = "d" }, { type = "bool-setting", name = "lignumis-basic-circuit-board", setting_type = "startup", default_value = true, - order = "f" + order = "e" }, { type = "bool-setting", name = "lignumis-circuit-progression", setting_type = "startup", default_value = false, - order = "g" + order = "f" }, { type = "bool-setting", name = "lignumis-assembler-progression", setting_type = "startup", default_value = false, - order = "h" + order = "g" }, { type = "bool-setting", name = "lignumis-lumber-mill-more-recipes", setting_type = "startup", default_value = false, - order = "i" + order = "h" }, { type = "bool-setting", name = "lignumis-fulgora-wood", setting_type = "startup", default_value = false, - order = "j" + order = "i" }, { type = "bool-setting", name = "lignumis-early-robots", setting_type = "startup", default_value = false, - order = "k" + order = "j" }, { type = "bool-setting", name = "lignumis-vanilla-lab", setting_type = "startup", default_value = false, - order = "l" + order = "k" }, { type = "bool-setting", name = "lignumis-double-rocket", setting_type = "startup", default_value = false, - order = "m" + order = "l" }, { type = "bool-setting", name = "lignumis-sciences-spoil", setting_type = "startup", default_value = false, - order = "n" + order = "m" }, { type = "bool-setting", name = "lignumis-infinite-astroponics-productivity-research", setting_type = "startup", default_value = false, - order = "o" + order = "n" }, { type = "string-setting",