From 9955fe7626ccdb71daeea3e749f68b2481e8e51e Mon Sep 17 00:00:00 2001 From: Brevven Date: Fri, 5 Aug 2022 23:57:28 -0700 Subject: [PATCH] data util once --- carbon-recipe-final-k2.lua | 2 +- carbon-recipe-final-rrr.lua | 2 +- carbon-recipe-final-se.lua | 2 +- carbon-recipe-final-stacking.lua | 2 +- carbon-recipe-k2.lua | 2 +- carbon-recipe-modules.lua | 2 +- carbon-recipe-se.lua | 2 +- carbon-recipe-updates.lua | 2 +- carbon-recipe.lua | 2 +- changelog.txt | 5 +++++ compatibility/248k.lua | 2 +- data-util.lua | 21 +++++++++++++++++++++ diamond.lua | 2 +- graphite.lua | 2 +- info.json | 2 +- 15 files changed, 39 insertions(+), 13 deletions(-) diff --git a/carbon-recipe-final-k2.lua b/carbon-recipe-final-k2.lua index c7452b0..973edf8 100644 --- a/carbon-recipe-final-k2.lua +++ b/carbon-recipe-final-k2.lua @@ -1,4 +1,4 @@ -local bzutil = require("__bzcarbon__.data-util"); +local bzutil = require("data-util"); local util = require("util") if mods.Krastorio2 then if bzutil.me.use_fullerenes() then diff --git a/carbon-recipe-final-rrr.lua b/carbon-recipe-final-rrr.lua index a5c7274..163597e 100644 --- a/carbon-recipe-final-rrr.lua +++ b/carbon-recipe-final-rrr.lua @@ -1,4 +1,4 @@ -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); if util.me.use_flake_graphite() and mods["Rich-Rocks-Requiem"] then if data.raw.recipe["rrr-stone-processing"] then diff --git a/carbon-recipe-final-se.lua b/carbon-recipe-final-se.lua index e0830de..777acbb 100644 --- a/carbon-recipe-final-se.lua +++ b/carbon-recipe-final-se.lua @@ -1,5 +1,5 @@ local futil = require("util") -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); if mods["space-exploration"] then -- core mining balancing diff --git a/carbon-recipe-final-stacking.lua b/carbon-recipe-final-stacking.lua index d92d05c..f635003 100644 --- a/carbon-recipe-final-stacking.lua +++ b/carbon-recipe-final-stacking.lua @@ -1,6 +1,6 @@ -- Deadlock stacking recipes -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); if deadlock then deadlock.add_stack("flake-graphite", "__bzcarbon__/graphics/icons/stacked/flake-graphite-stacked.png", "deadlock-stacking-1", 64) diff --git a/carbon-recipe-k2.lua b/carbon-recipe-k2.lua index 1011564..9111fcd 100644 --- a/carbon-recipe-k2.lua +++ b/carbon-recipe-k2.lua @@ -1,4 +1,4 @@ -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); if mods.Krastorio2 then diff --git a/carbon-recipe-modules.lua b/carbon-recipe-modules.lua index f3668f8..efa7668 100644 --- a/carbon-recipe-modules.lua +++ b/carbon-recipe-modules.lua @@ -1,5 +1,5 @@ -- Enable prod modules for all recipes -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); recipes = { "graphite", diff --git a/carbon-recipe-se.lua b/carbon-recipe-se.lua index 9bcfab8..8a5a952 100644 --- a/carbon-recipe-se.lua +++ b/carbon-recipe-se.lua @@ -1,4 +1,4 @@ -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); if mods["space-exploration"] then if util.me.use_rough_diamond() then diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua index 9afad54..e2cdbc4 100644 --- a/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -1,4 +1,4 @@ -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); -- TECHS util.add_prerequisite("steel-processing", "graphite-processing") diff --git a/carbon-recipe.lua b/carbon-recipe.lua index a1922d5..1738f74 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -1,4 +1,4 @@ -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); local graphite_category = "advanced-crafting" if mods["space-exploration"] then diff --git a/changelog.txt b/changelog.txt index 1be64bf..5b7beb1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.11 +Date: 2022-08-07 + Changes: + - Very minor lua optimization +--------------------------------------------------------------------------------------------------- Version: 0.3.10 Date: 2022-08-06 Fixes: diff --git a/compatibility/248k.lua b/compatibility/248k.lua index a7ec7cb..260214b 100644 --- a/compatibility/248k.lua +++ b/compatibility/248k.lua @@ -1,4 +1,4 @@ -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); util.remove_ingredient("fu_carbon_fiber_recipe", "fi_crushed_coal_item") util.add_ingredient("fu_carbon_fiber_recipe", "graphite", 3) diff --git a/data-util.lua b/data-util.lua index 80fbfde..5adf092 100644 --- a/data-util.lua +++ b/data-util.lua @@ -23,6 +23,27 @@ else util.titanium_processing = "titanium-processing" end +allbypass = {} +log("BZZ" .. me.name) +-- if get_setting("bz-recipe-bypass") then +-- for recipe in string.gmatch(me.get_setting("bz-recipe-bypass"), '[^",%s]+') do +-- allbypass[recipe] = true +-- end +-- end + +function get_setting(name) + if settings.startup[name] == nil then + return nil + end + return settings.startup[name].value +end + +function bypass(recipe_name) + if me.bypass[recipe_name] then return true end + if allbypass[recipe_name] then return true end + if get_setting("bz-tabula-rasa") then return true end +end + function util.fe_plus(sub) if mods["FactorioExtended-Plus-"..sub] then return true diff --git a/diamond.lua b/diamond.lua index 115d2bf..5c432f3 100644 --- a/diamond.lua +++ b/diamond.lua @@ -1,7 +1,7 @@ local resource_autoplace = require('resource-autoplace'); local noise = require('noise'); -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); if util.me.use_rough_diamond() then data:extend({ diff --git a/graphite.lua b/graphite.lua index a101533..01e3adb 100644 --- a/graphite.lua +++ b/graphite.lua @@ -1,7 +1,7 @@ local resource_autoplace = require('resource-autoplace'); local noise = require('noise'); -local util = require("__bzcarbon__.data-util"); +local util = require("data-util"); if util.me.use_flake_graphite() then data:extend({ diff --git a/info.json b/info.json index d0e5620..13aa447 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon", - "version": "0.3.10", + "version": "0.3.11", "factorio_version": "1.1", "title": "Graphite & Diamonds", "author": "Brevven",