diff --git a/README.md b/README.md index 78e9caf..e1c3002 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,4 @@ Unsorted [daydev](https://mods.factorio.com/mod/EquipmentPlusPortableEngine) -- Portable engine - -[Zithorian's Extra Storage Tanks](https://mods.factorio.com/mod/zithorian-extra-storage-tanks) - -- Gold storage tank \ No newline at end of file +- Portable engine \ No newline at end of file diff --git a/lignumis/data-updates.lua b/lignumis/data-updates.lua deleted file mode 100644 index e3e118d..0000000 --- a/lignumis/data-updates.lua +++ /dev/null @@ -1 +0,0 @@ -require("prototypes/content/updates") \ No newline at end of file diff --git a/lignumis/data.lua b/lignumis/data.lua index 6620624..e29792f 100644 --- a/lignumis/data.lua +++ b/lignumis/data.lua @@ -1,4 +1,3 @@ -require("__cf-lib__/util") - require("prototypes/content/data") require("prototypes/integrations/data") +require("prototypes/technology") \ No newline at end of file diff --git a/lignumis/info.json b/lignumis/info.json index fbbe646..a103429 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -9,7 +9,6 @@ "dependencies": [ "base", "space-age >= 2.0.0", - "cf-lib >= 0.0.1", "wood-military >= 2.0.0", "Wood-Walls >= 1.2.0", "wood-logistics >= 2.1.1", diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index adc2fbd..00de6ce 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -81,8 +81,5 @@ basic-construction-robotics-copper=Basic construction robotics (copper) wood-floor=Wood floor natural-gold-soil=Gold-infused soil -[fuel-category-name] -wood=Wood fuel - [lignumis] start-new-game=Lignumis is meant to be played in a fresh game as it extends the early game before Nauvis. \ No newline at end of file diff --git a/lignumis/prototypes/content/burner-long-handed-inserter.lua b/lignumis/prototypes/content/burner-long-handed-inserter.lua index 4c3621b..c777c18 100644 --- a/lignumis/prototypes/content/burner-long-handed-inserter.lua +++ b/lignumis/prototypes/content/burner-long-handed-inserter.lua @@ -18,8 +18,8 @@ long_handed_inserter.energy_source = { fuel_categories = { "chemical" }, effectivity = 1, fuel_inventory_size = 1, - initial_fuel = "coal", - initial_fuel_percent = 0.25, + initial_fuel = "wood", + initial_fuel_percent = 0.5, light_flicker = { color = { 0, 0, 0 } }, smoke = { { diff --git a/lignumis/prototypes/content/data.lua b/lignumis/prototypes/content/data.lua index d34dcc6..a8e2a31 100644 --- a/lignumis/prototypes/content/data.lua +++ b/lignumis/prototypes/content/data.lua @@ -1,4 +1,3 @@ -require("technology") require("lignumis/planet") require("lignumis/autoplace-controls") require("wooden-gearwheel") @@ -17,7 +16,6 @@ require("steam-science") require("wood-liquefaction") require("wooden-rocket-silo") require("basic-gun-turret") -require("fuel-category") require("basic-construction-robots") require("noise") diff --git a/lignumis/prototypes/content/fuel-category-updates.lua b/lignumis/prototypes/content/fuel-category-updates.lua deleted file mode 100644 index 34b3a5c..0000000 --- a/lignumis/prototypes/content/fuel-category-updates.lua +++ /dev/null @@ -1,27 +0,0 @@ -local blacklist = { - --"burner-assembling-machine", - --"stone-furnace", - --"desiccation-furnace", - --"lumber-mill" -} - -function update_fuel_categories(t) - for _, entity in pairs(t) do - if entity.energy_source - and entity.energy_source.type == "burner" - and not table.contains(blacklist, entity.name) - and entity.energy_source.fuel_categories - and table.contains(entity.energy_source.fuel_categories, "chemical") - then - table.insert(entity.energy_source.fuel_categories, "wood") - end - end -end - -data.raw.item["wood"].fuel_category = "wood" -data.raw.item["lumber"].fuel_category = "wood" -data.raw.item["tree-seed"].fuel_category = "wood" -data.raw.item["wooden-wall"].fuel_category = "wood" - --- Add more if incompatibilities arise -update_fuel_categories(data.raw["boiler"]) \ No newline at end of file diff --git a/lignumis/prototypes/content/fuel-category.lua b/lignumis/prototypes/content/fuel-category.lua deleted file mode 100644 index 99191c9..0000000 --- a/lignumis/prototypes/content/fuel-category.lua +++ /dev/null @@ -1,6 +0,0 @@ -data:extend({ - { - type = "fuel-category", - name = "wood" - } -}) \ No newline at end of file diff --git a/lignumis/prototypes/content/gold/stromatolite.lua b/lignumis/prototypes/content/gold/stromatolite.lua index 753f5f3..3d50035 100644 --- a/lignumis/prototypes/content/gold/stromatolite.lua +++ b/lignumis/prototypes/content/gold/stromatolite.lua @@ -184,9 +184,7 @@ local seed = { drop_sound = space_age_item_sounds.agriculture_inventory_move, stack_size = 10, default_import_location = "lignumis", - weight = 10 * kg, - fuel_category = "wood", - fuel_value = "100kJ" + weight = 10 * kg } local bacteria = { diff --git a/lignumis/prototypes/content/updates.lua b/lignumis/prototypes/content/updates.lua deleted file mode 100644 index c6d2a3f..0000000 --- a/lignumis/prototypes/content/updates.lua +++ /dev/null @@ -1 +0,0 @@ -require("fuel-category-updates") \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index 74036aa..a7c43db 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -29,8 +29,6 @@ burner_inserter.hand_base_picture.filename = "__lignumis__/graphics/entity/burne burner_inserter.hand_closed_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-closed.png" burner_inserter.hand_open_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-open.png" burner_inserter.platform_picture.sheet.filename = "__lignumis__/graphics/entity/burner-inserter-platform.png" -burner_inserter.energy_source.initial_fuel = "coal" -burner_inserter.energy_source.initial_fuel_percent = 0.15 data.raw.item["burner-inserter"].icon = "__lignumis__/graphics/icons/burner-inserter.png" @@ -46,6 +44,10 @@ local wood_processing = data.raw.recipe["wood-processing"] wood_processing.ingredients[1].amount = 1 wood_processing.icon = data.raw.item["tree-seed"].icon +local tree_seed = data.raw.item["tree-seed"] +tree_seed.fuel_category = nil +tree_seed.fuel_value = nil + for _, tree in pairs(data.raw.tree) do tree.minable.result = nil tree.minable.count = nil diff --git a/lignumis/prototypes/content/technology.lua b/lignumis/prototypes/technology.lua similarity index 100% rename from lignumis/prototypes/content/technology.lua rename to lignumis/prototypes/technology.lua