diff --git a/lignumis-cf/settings.lua b/lignumis-cf/settings.lua index d54b7f5..c5c2e0e 100644 --- a/lignumis-cf/settings.lua +++ b/lignumis-cf/settings.lua @@ -28,7 +28,4 @@ forceDefault("wood-walls-fuelvalue") forceDefault("wood-walls-wall-cost") forceDefault("wood-walls-wall-output") forceDefault("wood-walls-hp") -forceDefault("wood-walls-disable-wall") - --- Astroponics -forceDefault("astroponics-garden-speed") \ No newline at end of file +forceDefault("wood-walls-disable-wall") \ No newline at end of file diff --git a/lignumis/info.json b/lignumis/info.json index 3e0c869..f504af4 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -37,7 +37,6 @@ "(?) gleba-reborn", "(?) Krastorio2-spaced-out", "(?) metal-and-stars", - "(?) planet-muluna", "(?) secretas", "(?) Wood_Gasification_updated", "! apm_power_ldinc", diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index b0940aa..e0c568a 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -194,18 +194,17 @@ lignumis-belt-progression=[color=orange][font=heading-2]Overhaul[/font][/color] lignumis-inserter-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=burner-inserter] Enable telescopic inserter recipes lignumis-ammo-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=wood-darts-magazine] Enable telescopic ammo recipes lignumis-technology-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=wood-science-pack] Enable progressive technologies +lignumis-basic-circuit-board=[color=gray][font=heading-2]Deprecated (please enable)[/font] Enable basic circuit board[/color] lignumis-circuit-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=basic-circuit-board] Enable telescopic circuit recipes lignumis-assembler-progression=[color=orange][font=heading-2]Overhaul[/font][/color] [item=burner-assembling-machine] Enable telescopic assembler recipes -lignumis-fulgora-wood=[color=orange][font=heading-2]Overhaul[/font][/color] [planet=fulgora] Add wood to Fulgora -lignumis-lab=[color=orange][font=heading-2]Overhaul[/font][/color] [item=lab] Lab requires wooden belts -lignumis-more-wood=[color=green][font=heading-2]Easy[/font][/color] Increase wood from all sources lignumis-lumber-mill-more-recipes=[color=green][font=heading-2]Easy[/font][/color] Enable more recipes for the lumber mill +lignumis-fulgora-wood=[color=orange][font=heading-2]Overhaul[/font][/color] [planet=fulgora] Add wood to Fulgora lignumis-early-robots=[color=green][font=heading-2]Easy[/font][/color] Even earlier personal robots +lignumis-lab=[color=orange][font=heading-2]Overhaul[/font][/color] [item=lab] Lab requires wooden belts lignumis-double-rocket=[color=green][font=heading-2]Easy[/font][/color] Double provisional rocket cargo capacity +lignumis-sciences-spoil=[color=red][font=heading-2]Hard[/font][/color] Lignumis science packs spoil lignumis-infinite-astroponics-productivity-research=[color=green][font=heading-2]Easy[/font][/color] Infinite productivity research for Astroponics lignumis-electric-lumber-mill=[color=green][font=heading-2]Easy[/font][/color] Electric lumber mill -lignumis-sciences-spoil=[color=red][font=heading-2]Hard[/font][/color] Lignumis science packs spoil -lignumis-basic-circuit-board=[color=gray][font=heading-2]Deprecated (please enable)[/font] Enable basic circuit board[/color] [mod-setting-description] lignumis-belt-progression=Yellow belts will require wood belts to craft. diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua index e63117d..0ed7173 100644 --- a/lignumis/prototypes/compatibility/data.lua +++ b/lignumis/prototypes/compatibility/data.lua @@ -8,5 +8,4 @@ require("lane-splitters") require("wood-industry") require("crushing-industry") require("canal-excavator") -require("diversitree") -require("muluna") \ No newline at end of file +require("diversitree") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/muluna.lua b/lignumis/prototypes/compatibility/muluna.lua deleted file mode 100644 index 1fdc7ce..0000000 --- a/lignumis/prototypes/compatibility/muluna.lua +++ /dev/null @@ -1,5 +0,0 @@ -local Recipe = require("__cf-lib__/data/Recipe") - -if not mods["planet-muluna"] then return end - -Recipe:new("muluna-tree-crushing"):replaceResult("wood", 5) \ No newline at end of file diff --git a/lignumis/prototypes/integrations/astroponics.lua b/lignumis/prototypes/integrations/astroponics.lua index df6f485..bee736e 100644 --- a/lignumis/prototypes/integrations/astroponics.lua +++ b/lignumis/prototypes/integrations/astroponics.lua @@ -1,7 +1,5 @@ if not mods["astroponics"] then return end --- Astroponics productivity research - local infinite = settings.startup["lignumis-infinite-astroponics-productivity-research"].value local base_levels = { diff --git a/lignumis/prototypes/integrations/more-wood.lua b/lignumis/prototypes/integrations/more-wood.lua deleted file mode 100644 index 102903a..0000000 --- a/lignumis/prototypes/integrations/more-wood.lua +++ /dev/null @@ -1,43 +0,0 @@ -local Recipe = require("__cf-lib__/data/Recipe") - -if not settings.startup["lignumis-more-wood"].value then return end - -if mods["astroponics"] then - Recipe:new("tree-astroponics"):replaceResult("wood", 10) -end - -if mods["planet-muluna"] then - Recipe:new("muluna-tree-crushing"):replaceResult("wood", 10) -end - -if mods["cerys-lunaponics"] then - Recipe:new("cerys-crude-lunaponics"):replaceResult("wood", 8) -end - -if mods["fulgora-coralmium-agriculture"] then - Recipe:new("synthetic-wood"):replaceResult("wood", 6) -end - -if mods["gleba-water-cane"] or mods["wayward-seas"] then - Recipe:new("water-cane-separation"):replaceResult("wood", 2) -end - -if mods["aquilo-seabloom-algaculture"] then - Recipe:new("seaweed-blanching"):replaceResult("wood", 10) -end - -if mods["vulcanus-sulfuric-bacteria"] then - Recipe:new("sulfuric-bacteria-cultivation"):replaceResult("sulfuric-bacteria", 8) -end - -if mods["moshine-solaponics"] then - Recipe:new("tree-solaponics"):replaceResult("wood", 16) -end - -if mods["planetaris-arig"] then - Recipe:new("planetaris-cactus-wood"):replaceResult("wood", 8) -end - -if mods["pelagos"] then - data.raw.plant["coconut-palm"].minable.results[2].amount = 10 -end \ No newline at end of file diff --git a/lignumis/prototypes/integrations/updates.lua b/lignumis/prototypes/integrations/updates.lua index a21b359..b8f72cc 100644 --- a/lignumis/prototypes/integrations/updates.lua +++ b/lignumis/prototypes/integrations/updates.lua @@ -1,3 +1,2 @@ -require("more-wood") require("vanilla-updates") require("astroponics-updates") \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index ee52fac..d8da7a1 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -98,7 +98,6 @@ local wood_processing = data.raw.recipe["wood-processing"] wood_processing.ingredients[1].amount = 1 wood_processing.icon = data.raw.item["tree-seed"].icon PlanetsLib.relax_surface_conditions(wood_processing, {property = "pressure", min = 900}) -local wood_multiplier = settings.startup["lignumis-more-wood"].value and 2 or 1 for _, tree in pairs(data.raw.tree) do local function isWoodResult(result) @@ -111,7 +110,7 @@ for _, tree in pairs(data.raw.tree) do if not isRegularTree then goto continue end tree.minable.result = nil tree.minable.count = nil - local woodResult = { type = "item", name = "wood", amount = nil, amount_min = 4 * wood_multiplier, amount_max = 6 * wood_multiplier } + local woodResult = { type = "item", name = "wood", amount = nil, amount_min = 2, amount_max = 8 } if minable.results and #woodResults > 0 then table.assign(woodResults[1], woodResult) woodResults[1].amount = nil @@ -123,7 +122,7 @@ end local tree_plant = data.raw.plant["tree-plant"] tree_plant.growth_ticks = 5 * minute -tree_plant.minable.results = { { type = "item", name = "wood", amount = 5 * wood_multiplier } } +tree_plant.minable.results = { { type = "item", name = "wood", amount = 5 } } tree_plant.minable.count = nil PlanetsLib.relax_surface_conditions(tree_plant, {property = "pressure", min = 900}) table.insert(tree_plant.autoplace.tile_restriction, "natural-gold-soil") diff --git a/lignumis/settings.lua b/lignumis/settings.lua index 87f9608..985783f 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -7,112 +7,105 @@ data:extend({ name = "lignumis-restrict-sciences", setting_type = "startup", default_value = true, - order = "a[general]-a" + order = "a" }, { type = "bool-setting", name = "lignumis-circuit-progression", setting_type = "startup", default_value = true, - order = "b[overhaul]-a" + order = "b" }, { type = "bool-setting", name = "lignumis-belt-progression", setting_type = "startup", default_value = false, - order = "b[overhaul]-b" + order = "c" }, { type = "bool-setting", name = "lignumis-inserter-progression", setting_type = "startup", default_value = false, - order = "b[overhaul]-c" + order = "d" }, { type = "bool-setting", name = "lignumis-ammo-progression", setting_type = "startup", default_value = false, - order = "b[overhaul]-d" + order = "e" }, { type = "bool-setting", name = "lignumis-assembler-progression", setting_type = "startup", default_value = false, - order = "b[overhaul]-e" + order = "f" }, { type = "bool-setting", name = "lignumis-technology-progression", setting_type = "startup", default_value = false, - order = "b[overhaul]-f" + order = "g" }, { type = "bool-setting", name = "lignumis-lab", setting_type = "startup", default_value = false, - order = "b[overhaul]-g" + order = "h" }, { type = "bool-setting", name = "lignumis-fulgora-wood", setting_type = "startup", default_value = false, - order = "b[overhaul]-h" - }, - { - type = "bool-setting", - name = "lignumis-more-wood", - setting_type = "startup", - default_value = false, - order = "c[easy]-a" + order = "i" }, { type = "bool-setting", name = "lignumis-lumber-mill-more-recipes", setting_type = "startup", default_value = false, - order = "c[easy]-b" + order = "j" }, { type = "bool-setting", name = "lignumis-early-robots", setting_type = "startup", default_value = false, - order = "c[easy]-c" + order = "k" }, { type = "bool-setting", name = "lignumis-double-rocket", setting_type = "startup", default_value = false, - order = "c[easy]-d" + order = "l" }, { type = "bool-setting", name = "lignumis-electric-lumber-mill", setting_type = "startup", default_value = false, - order = "c[easy]-e" + order = "m" }, { type = "bool-setting", name = "lignumis-sciences-spoil", setting_type = "startup", default_value = false, - order = "d[hard]-a" + order = "n" }, { type = "bool-setting", name = "lignumis-basic-circuit-board", setting_type = "startup", default_value = true, - order = "z[deprecated]-a" + order = "z" }, { type = "string-setting", @@ -131,7 +124,7 @@ if mods["astroponics"] then name = "lignumis-infinite-astroponics-productivity-research", setting_type = "startup", default_value = false, - order = "c[easy]-z[mods]-a" + order = "n" } }) end diff --git a/lignumis/settings/astroponics.lua b/lignumis/settings/astroponics.lua deleted file mode 100644 index d14426e..0000000 --- a/lignumis/settings/astroponics.lua +++ /dev/null @@ -1,8 +0,0 @@ -if not mods["astroponics"] then - return -end - -local Settings = require("__cf-lib__/settings/Settings") -local force = Settings.force - -force("astroponics-more-wood", false) \ No newline at end of file diff --git a/lignumis/settings/updates.lua b/lignumis/settings/updates.lua index 2cd9a36..37ac7b9 100644 --- a/lignumis/settings/updates.lua +++ b/lignumis/settings/updates.lua @@ -1,3 +1,2 @@ require("wood-logistics") -require("wood-military") -require("astroponics") \ No newline at end of file +require("wood-military") \ No newline at end of file