diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 0075155..0e4f777 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -110,4 +110,4 @@ if (settings.startup["sct-difficulty-cost"].value ~= "noadjustment") then end end -end +end \ No newline at end of file diff --git a/data-updates.lua b/data-updates.lua index a3147c4..0ec496f 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -10,4 +10,4 @@ require("tweaks.Bio_Industries.1_update") require("tweaks.bobsmods.1_update") require("tweaks.omnimatter.1_update") ---require("tweaks.xander.1_update") +--require("tweaks.xander.1_update") \ No newline at end of file diff --git a/data.lua b/data.lua index 6e62a9d..558d756 100644 --- a/data.lua +++ b/data.lua @@ -1,5 +1,6 @@ --INITIALIZE if not SCTTweaks then SCTTweaks = {} end +SCTTweaks.item_icons = {} require("sctmlib") diff --git a/info.json b/info.json index b1b1798..c0bf10f 100644 --- a/info.json +++ b/info.json @@ -1,7 +1,7 @@ { "name": "ScienceCostTweakerM", "version": "1.2.4", - "factorio_version":"1.1", + "factorio_version":"2.0", "title": "ScienceCostTweaker Mod M", "author": "mexmer, kingarthur, kiwihawk", "dependencies": [ diff --git a/locale/en/sciencecosttweaker.cfg b/locale/en/sciencecosttweaker.cfg index e899062..0d7e27e 100644 --- a/locale/en/sciencecosttweaker.cfg +++ b/locale/en/sciencecosttweaker.cfg @@ -38,7 +38,7 @@ sct-htech-random=Rapidly generates an enormous amount of random numbers mechanic sct-bio-science-pack=They grow, they evolve, they are consumed. ;bobmods -advanced-logistic-science-pack=Technology for controling logistic item flow and optimal transfer and delivery. +bob-advanced-logistic-science-pack=Technology for controling logistic item flow and optimal transfer and delivery. sct-advanced-logistic-science-pack=Technology for controling logistic item flow and optimal transfer and delivery. ;aai @@ -130,12 +130,12 @@ sct-bio-sample-scaffold=Protective scaffolding sct-bio-sample-filling=Seedling nest ;bobmods -advanced-logistic-science-pack=Science pack: Commercial AI implementation +bob-advanced-logistic-science-pack=Science pack: Commercial AI implementation sct-logistic-cargo-unit=Flying cargo kit sct-logistic-unimover=Universal transport engine sct-logistic-automated-storage=Automated storage sct-logistic-memory-unit=Combined memory cells -sct-advanced-logistic-science-pack=__ITEM__advanced-logistic-science-pack__ +sct-advanced-logistic-science-pack=__ITEM__bob-advanced-logistic-science-pack__ ;omni sct-omni-pack-minerals=Omnious minerals sct-omni-pack-tools=Omni tools @@ -240,7 +240,7 @@ utility-science-pack=__ITEM__utility-science-pack__ ;angelmods sct-bio-science-pack=__ITEM__sct-bio-science-pack__ ;bobmods -advanced-logistic-science-pack=__ITEM__advanced-logistic-science-pack__ +bob-advanced-logistic-science-pack=__ITEM__bob-advanced-logistic-science-pack__ science-pack-gold=Complex Science Expertise alien-science-pack=Outworld Biology Testing sct-lab-alien=__ITEM__lab-alien__ @@ -248,7 +248,7 @@ sct-lab-modules=__ITEM__lab-module__ sct-lab-lab2=__ITEM__lab-2__ sct-science-pack-gold=Complex Science Expertise sct-alien-science-pack=Outworld Biology Testing -sct-advanced-logistic-science-pack=__ITEM__advanced-logistic-science-pack__ +sct-advanced-logistic-science-pack=__ITEM__bob-advanced-logistic-science-pack__ ;omni ;sct-research-omni=Omnious Experiments omnipack-technology=Omnious Experiments @@ -278,7 +278,7 @@ utility-science-pack=Used by Lab for adapting high technology to the local envir sct-bio-science-pack=They grow, they evolve, they are consumed. ;bobmods -advanced-logistic-science-pack=Technology for controling logistic item flow and optimal transfer and delivery. +bob-advanced-logistic-science-pack=Technology for controling logistic item flow and optimal transfer and delivery. alien-science-pack=Outworld Biology Testing science-pack-gold=Complex Science Expertise sct-lab-alien=__ITEM__lab-alien__ diff --git a/locale/ja/sciencecosttweaker.cfg b/locale/ja/sciencecosttweaker.cfg index 872379a..0045aec 100644 --- a/locale/ja/sciencecosttweaker.cfg +++ b/locale/ja/sciencecosttweaker.cfg @@ -38,7 +38,7 @@ sct-htech-random=量子フィールドや仮想粒子の歪みの局所的な偏 sct-bio-science-pack=成長し、進化し、消費されます。 ;bobmods -advanced-logistic-science-pack=物流フローを制御し最適な転送と配送を行うためのテクノロジー。 +bob-advanced-logistic-science-pack=物流フローを制御し最適な転送と配送を行うためのテクノロジー。 sct-advanced-logistic-science-pack=物流フローを制御し最適な転送と配送を行うためのテクノロジー。 ;aai @@ -130,7 +130,7 @@ sct-bio-sample-scaffold=保護足場 sct-bio-sample-filling=苗床 ;bobmods -advanced-logistic-science-pack=商用AI実装 +bob-advanced-logistic-science-pack=商用AI実装 sct-logistic-cargo-unit=飛行貨物キット sct-logistic-unimover=万能輸送エンジン sct-logistic-automated-storage=自動ストレージ @@ -242,7 +242,7 @@ utility-science-pack=__ITEM__utility-science-pack__ sct-bio-science-pack=農業計画 ;bobmods -advanced-logistic-science-pack=商用AI実装 +bob-advanced-logistic-science-pack=商用AI実装 science-pack-gold=複雑なサイエンスの専門知識 alien-science-pack=エイリアン試験 sct-lab-alien=__ITEM__lab-alien__ @@ -281,7 +281,7 @@ utility-science-pack=高度なテクノロジーを局所環境に適応させ sct-bio-science-pack=成長し、進化し、消費されます。 ;bobmods -advanced-logistic-science-pack=物流フローを制御し最適な転送と配送を行うためのテクノロジー。 +bob-advanced-logistic-science-pack=物流フローを制御し最適な転送と配送を行うためのテクノロジー。 alien-science-pack=エイリアン試験 science-pack-gold=複雑なサイエンスの専門知識 sct-lab-alien=__ITEM__lab-alien__ diff --git a/prototypes/0_itemgroups.lua b/prototypes/0_itemgroups.lua index c88870f..3ef3aa2 100644 --- a/prototypes/0_itemgroups.lua +++ b/prototypes/0_itemgroups.lua @@ -8,7 +8,7 @@ data:extend({ type = "item-group", name = "sct-science", order = "c-sct", - inventory_order = "c-sct", + -- inventory_order = "c-sct", icon = "__ScienceCostTweakerM__/graphics/icons/sct-science-64.png", icon_size = 64, diff --git a/prototypes/0_recipe.lua b/prototypes/0_recipe.lua index a6326fa..dec75af 100644 --- a/prototypes/0_recipe.lua +++ b/prototypes/0_recipe.lua @@ -32,3 +32,17 @@ local sciencepackh = table.deepcopy(data.raw.recipe["sct-utility-science-pack"]) sctm.hide_recipe("sct-utility-science-pack") sciencepackh.name = "utility-science-pack" data.raw.recipe["utility-science-pack"] = sciencepackh + +for k,v in pairs(SCTTweaks.item_icons) do + if data.raw.recipe[v.name] then + recipe = data.raw.recipe[v.name] + if not recipe.icon and not recipe.icons then + if v.icon then + recipe.icon = v.icon + recipe.icon_size = v.icon_size + elseif v.icons then + recipe.icons = v.icons + end + end + end +end \ No newline at end of file diff --git a/prototypes/0_technology.lua b/prototypes/0_technology.lua index 26acca5..73b6316 100644 --- a/prototypes/0_technology.lua +++ b/prototypes/0_technology.lua @@ -5,7 +5,7 @@ require("technologies.sciencepacks") require("technologies.labs") sctm.tech_dependency_add("automation", "sct-automation-science-pack") -sctm.tech_dependency_add("optics", "sct-automation-science-pack") +sctm.tech_dependency_add("lamp", "sct-automation-science-pack") sctm.tech_dependency_add("gun-turret", "sct-automation-science-pack") sctm.tech_dependency_add("stone-wall", "sct-automation-science-pack") sctm.tech_dependency_add("military", "sct-automation-science-pack") diff --git a/prototypes/2_technology.lua b/prototypes/2_technology.lua index ab28333..8d8747a 100644 --- a/prototypes/2_technology.lua +++ b/prototypes/2_technology.lua @@ -19,22 +19,22 @@ scttechmap = ["sct-bio-science-pack"] = "sct-bio-science-pack", -- bobs ["steam-science-pack"] = "sct-research-steam", -- technology placeholder, doesn't exists - ["advanced-logistic-science-pack"] = "advanced-logistic-science-pack", - ["science-pack-gold"] = "sct-science-pack-gold", - ["effectivity-processor"] = "modules", - ["module-case"] = "modules", - ["module-circuit-board"] = "modules", - ["pollution-clean-processor"] = "modules", - ["pollution-create-processor"] = "modules", - ["productivity-processor"] = "modules", - ["speed-processor"] = "modules", - ["alien-science-pack"] = "sct-alien-science-pack", - ["alien-science-pack-blue"] = "alien-reseach", - ["alien-science-pack-green"] = "alien-reseach", - ["alien-science-pack-orange"] = "alien-reseach", - ["alien-science-pack-purple"] = "alien-reseach", - ["alien-science-pack-red"] = "alien-reseach", - ["alien-science-pack-yellow"] = "alien-reseach", + ["bob-advanced-logistic-science-pack"] = "bob-advanced-logistic-science-pack", + ["bob-science-pack-gold"] = "sct-science-pack-gold", + ["bob-efficiency-processor"] = "modules", + ["bob-module-case"] = "modules", + ["bob-module-circuit-board"] = "modules", + ["bob-pollution-clean-processor"] = "modules", + ["bob-pollution-create-processor"] = "modules", + ["bob-productivity-processor"] = "modules", + ["bob-speed-processor"] = "modules", + ["bob-alien-science-pack"] = "sct-alien-science-pack", + ["bob-alien-science-pack-blue"] = "alien-reseach", + ["bob-alien-science-pack-green"] = "alien-reseach", + ["bob-alien-science-pack-orange"] = "alien-reseach", + ["bob-alien-science-pack-purple"] = "alien-reseach", + ["bob-alien-science-pack-red"] = "alien-reseach", + ["bob-alien-science-pack-yellow"] = "alien-reseach", -- aai ["sct-science-pack-0"] = "sct-research-t0", -- technology placeholder, doesn't exists } @@ -152,7 +152,7 @@ sctm.tech_replace("production-science-pack", "sct-production-science-pack") sctm.tech_replace("utility-science-pack", "sct-utility-science-pack") sctm.tech_replace("space-science-pack", "sct-space-science-pack") --bob mods -sctm.tech_replace("advanced-logistic-science-pack", "sct-advanced-logistic-science-pack") +sctm.tech_replace("bob-advanced-logistic-science-pack", "sct-advanced-logistic-science-pack") if settings.startup["sct-connect-science"] and settings.startup["sct-connect-science"].value == true then sctm.log("science connect started") @@ -179,10 +179,10 @@ local knownpackmatchlist = { { partial = false, name = "military-science-pack" }, { partial = false, name = "utility-science-pack" }, { partial = false, name = "space-science-pack" }, - { partial = false, name = "advanced-logistic-science-pack" }, -- bobs - { partial = false, name = "science-pack-gold" }, -- bobs - { partial = false, name = "alien-science-pack" }, -- bobs --- { partial = true, name = "alien-science-pack-" }, -- bobs - leaving them under alien research + { partial = false, name = "bob-advanced-logistic-science-pack" }, -- bobs + { partial = false, name = "bob-science-pack-gold" }, -- bobs + { partial = false, name = "bob-alien-science-pack" }, -- bobs +-- { partial = true, name = "bob-alien-science-pack-" }, -- bobs - leaving them under alien research { partial = false, name = "sct-bio-science-pack" }, -- angels -- { partial = false, name = "omni-pack" }, -- omnimatter - leaving under omnipack-technology -- { partial = false, name = "science-pack-t0" }, -- aai - should not have unlock at all diff --git a/prototypes/entities/intermediates.lua b/prototypes/entities/intermediates.lua index 3a6deb7..b8f2ab4 100644 --- a/prototypes/entities/intermediates.lua +++ b/prototypes/entities/intermediates.lua @@ -1,4 +1,4 @@ -data:extend({ +intermediates = { -- Junk Byproducts -- ============================= @@ -506,4 +506,6 @@ data:extend({ order = "b[labparts]-d[lab4]-c[manipulators]", stack_size = 10, }, -}) +} +SCTTweaks.item_icons = intermediates +data.extend(intermediates) diff --git a/prototypes/entities/labs.lua b/prototypes/entities/labs.lua index dc4d986..068afe6 100644 --- a/prototypes/entities/labs.lua +++ b/prototypes/entities/labs.lua @@ -83,13 +83,8 @@ data:extend({ "automation-science-pack", "logistic-science-pack" }, - module_specification = - { - module_slots = 0, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9}, - }, + + module_slots = 0, fast_replaceable_group = "lab", next_upgrade = "sct-lab-t3", }, @@ -178,13 +173,7 @@ data:extend({ "production-science-pack", -- "utility-science-pack", }, - module_specification = - { - module_slots = 0, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - }, + module_slots = 0, fast_replaceable_group = "lab", next_upgrade = "sct-lab-t4" }, @@ -275,13 +264,7 @@ data:extend({ "utility-science-pack", "space-science-pack" }, - module_specification = - { - module_slots = 0, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - }, + module_slots = 0, fast_replaceable_group = "lab", }, @@ -338,23 +321,17 @@ data.raw["lab"]["lab"].inputs = { "automation-science-pack" } -data.raw["lab"]["lab"].module_specification = - { - module_slots = 0, - max_entity_info_module_icons_per_row = 3, - max_entity_info_module_icon_rows = 1, - module_info_icon_shift = {0, 0.9} - } +data.raw["lab"]["lab"].module_slots = 0 data.raw["lab"]["lab"].fast_replaceable_group = "lab" data.raw["lab"]["lab"].next_upgrade = "sct-lab-t2" if settings.startup["sct-lab-modules"].value == "tier3" then - data.raw["lab"]["sct-lab-t3"].module_specification.module_slots = 1 - data.raw["lab"]["sct-lab-t4"].module_specification.module_slots = 2 + data.raw["lab"]["sct-lab-t3"].module_slots = 1 + data.raw["lab"]["sct-lab-t4"].module_slots = 2 end if settings.startup["sct-lab-modules"].value == "tier4" then - data.raw["lab"]["sct-lab-t4"].module_specification.module_slots = 2 + data.raw["lab"]["sct-lab-t4"].module_slots = 2 end if settings.startup["sct-lab-scaling"].value == true then diff --git a/prototypes/recipes/labs-intermediates.lua b/prototypes/recipes/labs-intermediates.lua index 9ee6da5..6681fa3 100644 --- a/prototypes/recipes/labs-intermediates.lua +++ b/prototypes/recipes/labs-intermediates.lua @@ -5,246 +5,237 @@ data:extend({ { type = "recipe", name = "sct-lab1-construction", - expensive = - { - energy_required = 5, - enabled = false, - ingredients = - { - {"iron-stick", 10}, - {"iron-plate", 3}, - }, - result = "sct-lab1-construction", - }, - normal = - { - energy_required = 2, - enabled = false, - ingredients = - { - {"iron-stick", 4}, - {"iron-plate", 1}, - }, - result = "sct-lab1-construction", - }, + -- expensive = + -- { + -- energy_required = 5, + -- enabled = false, + -- ingredients = + -- { + -- {"iron-stick", 10}, + -- {"iron-plate", 3}, + -- }, + -- result = "sct-lab1-construction", + -- }, + energy_required = 2, + enabled = false, + ingredients = + { + {type = "item", name = "iron-stick", amount = 4}, + {type = "item", name = "iron-plate", amount = 1}, + }, + results = { + {type = "item", name = "sct-lab1-construction", amount = 1}, + } }, { type = "recipe", name = "sct-lab1-mechanization", - expensive = - { - energy_required = 10, - enabled = false, - ingredients = - { - {"transport-belt", 30}, - {"electronic-circuit", 20}, - }, - result = "sct-lab1-mechanization", - }, - normal = - { - energy_required = 4, - enabled = false, - ingredients = - { - {"transport-belt", 10}, - {"electronic-circuit", 10}, - }, - result = "sct-lab1-mechanization", - }, + -- expensive = + -- { + -- energy_required = 10, + -- enabled = false, + -- ingredients = + -- { + -- {"transport-belt", 30}, + -- {"electronic-circuit", 20}, + -- }, + -- result = "sct-lab1-mechanization", + -- }, + energy_required = 4, + enabled = false, + ingredients = + { + {type = "item", name = "transport-belt", amount = 10}, + {type = "item", name = "electronic-circuit", amount = 10}, + }, + results = { + {type = "item", name = "sct-lab1-mechanization", amount = 1}, + } }, -- lab2 intermediates { type = "recipe", name = "sct-lab2-construction", - expensive = - { - energy_required = 10, - enabled = false, - ingredients = - { - {"iron-gear-wheel", 10}, - {"steel-plate", 5}, - }, - result = "sct-lab2-construction", - }, - normal = - { - energy_required = 4, - enabled = false, - ingredients = - { - {"iron-gear-wheel", 4}, - {"steel-plate", 2}, - }, - result = "sct-lab2-construction", - }, + -- expensive = + -- { + -- energy_required = 10, + -- enabled = false, + -- ingredients = + -- { + -- {"iron-gear-wheel", 10}, + -- {"steel-plate", 5}, + -- }, + -- result = "sct-lab2-construction", + -- }, + energy_required = 4, + enabled = false, + ingredients = + { + {type = "item", name = "iron-gear-wheel", amount = 4}, + {type = "item", name = "steel-plate", amount = 2}, + }, + results = { + {type = "item", name = "sct-lab2-construction", amount = 1}, + } }, { type = "recipe", name = "sct-lab2-automatization", - expensive = - { - energy_required = 20, - enabled = false, - ingredients = - { - {"fast-inserter", 5}, - {"splitter", 2}, - }, - result = "sct-lab2-automatization", - }, - normal = - { - energy_required = 8, - enabled = false, - ingredients = - { - {"fast-inserter", 2}, - {"splitter", 1}, - }, - result = "sct-lab2-automatization", - }, + -- expensive = + -- { + -- energy_required = 20, + -- enabled = false, + -- ingredients = + -- { + -- {"fast-inserter", 5}, + -- {"splitter", 2}, + -- }, + -- result = "sct-lab2-automatization", + -- }, + energy_required = 8, + enabled = false, + ingredients = + { + {type = "item", name = "fast-inserter", amount = 2}, + {type = "item", name = "splitter", amount = 1}, + }, + results = { + {type = "item", name = "sct-lab2-automatization", amount = 1}, + } }, -- lab3 intermediates { type = "recipe", name = "sct-lab3-construction", - expensive = - { - energy_required = 15, - enabled = false, - ingredients = - { - {"solar-panel", 10}, - {"steel-plate", 15}, - }, - result = "sct-lab3-construction", - }, - normal = - { - energy_required = 6, - enabled = false, - ingredients = - { - {"solar-panel", 5}, - {"steel-plate", 5}, - }, - result = "sct-lab3-construction", - }, + -- expensive = + -- { + -- energy_required = 15, + -- enabled = false, + -- ingredients = + -- { + -- {"solar-panel", 10}, + -- {"steel-plate", 15}, + -- }, + -- result = "sct-lab3-construction", + -- }, + energy_required = 6, + enabled = false, + ingredients = + { + {type = "item", name = "solar-panel", amount = 5}, + {type = "item", name = "steel-plate", amount = 5}, + }, + results = { + {type = "item", name = "sct-lab3-construction", amount = 1}, + } }, { type = "recipe", name = "sct-lab3-optics", - expensive = - { - energy_required = 30, - enabled = false, - ingredients = - { - {"sct-t3-sulfur-lightsource", 10}, - {"sct-t3-femto-lasers", 2} - }, - result = "sct-lab3-optics", - }, - normal = - { - energy_required = 12, - enabled = false, - ingredients = - { - {"sct-t3-sulfur-lightsource", 3}, - {"sct-t3-femto-lasers", 1} - }, - result = "sct-lab3-optics", - }, + -- expensive = + -- { + -- energy_required = 30, + -- enabled = false, + -- ingredients = + -- { + -- {"sct-t3-sulfur-lightsource", 10}, + -- {"sct-t3-femto-lasers", 2} + -- }, + -- result = "sct-lab3-optics", + -- }, + energy_required = 12, + enabled = false, + ingredients = + { + {type = "item", name = "sct-t3-sulfur-lightsource", amount = 3}, + {type = "item", name = "sct-t3-femto-lasers", amount = 1} + }, + results = { + {type = "item", name = "sct-lab3-optics", amount = 1}, + } }, { type = "recipe", name = "sct-t3-sulfur-lightsource", - expensive = - { - energy_required = 5, - enabled = false, - ingredients = { - { "sulfur", 5 }, - { "plastic-bar", 5 }, - }, - result = "sct-t3-sulfur-lightsource", - }, - normal = - { - energy_required = 5, - enabled = false, - ingredients = { - { "sulfur", 2 }, - { "plastic-bar", 2 }, - }, - result = "sct-t3-sulfur-lightsource", - }, + -- expensive = + -- { + -- energy_required = 5, + -- enabled = false, + -- ingredients = { + -- { "sulfur", 5 }, + -- { "plastic-bar", 5 }, + -- }, + -- result = "sct-t3-sulfur-lightsource", + -- }, + energy_required = 5, + enabled = false, + ingredients = { + { type = "item", name = "sulfur", amount = 2 }, + { type = "item", name = "plastic-bar", amount = 2 }, + }, + results = { + {type = "item", name = "sct-t3-sulfur-lightsource", amount = 1}, + } }, -- lab4 intermediates { type = "recipe", name = "sct-lab4-construction", - expensive = - { - energy_required = 15, - enabled = false, - ingredients = - { - {"centrifuge", 2}, - {"low-density-structure", 20}, - }, - result = "sct-lab4-construction", - }, - normal = - { - energy_required = 6, - enabled = false, - ingredients = - { - {"centrifuge", 1}, - {"low-density-structure", 10}, - }, - result = "sct-lab4-construction", - }, + -- expensive = + -- { + -- energy_required = 15, + -- enabled = false, + -- ingredients = + -- { + -- {"centrifuge", 2}, + -- {"low-density-structure", 20}, + -- }, + -- result = "sct-lab4-construction", + -- }, + energy_required = 6, + enabled = false, + ingredients = + { + {type = "item", name = "centrifuge", amount = 1}, + {type = "item", name = "low-density-structure", amount = 10}, + }, + results = { + {type = "item", name = "sct-lab4-construction", amount = 1}, + } }, { type = "recipe", name = "sct-lab4-manipulators", - expensive = - { - energy_required = 30, - enabled = false, - ingredients = - { - {"sct-htech-injector", 1}, - {"stack-filter-inserter", 5}, - {"processing-unit", 15}, - }, - result = "sct-lab4-manipulators", - }, - normal = - { - energy_required = 12, - enabled = false, - ingredients = - { - {"sct-htech-injector", 1}, - {"stack-filter-inserter", 2}, - {"processing-unit", 5}, - }, - result = "sct-lab4-manipulators", - }, + -- expensive = + -- { + -- energy_required = 30, + -- enabled = false, + -- ingredients = + -- { + -- {"sct-htech-injector", 1}, + -- {"bulk-inserter", 5}, + -- {"processing-unit", 15}, + -- }, + -- result = "sct-lab4-manipulators", + -- }, + energy_required = 12, + enabled = false, + ingredients = + { + {type = "item", name = "sct-htech-injector", amount = 1}, + {type = "item", name = "bulk-inserter", amount = 2}, + {type = "item", name = "processing-unit", amount = 5}, + }, + results = { + {type = "item", name = "sct-lab4-manipulators", amount = 1}, + } }, }) \ No newline at end of file diff --git a/prototypes/recipes/labs.lua b/prototypes/recipes/labs.lua index aec08cf..e600dc5 100644 --- a/prototypes/recipes/labs.lua +++ b/prototypes/recipes/labs.lua @@ -6,33 +6,31 @@ data:extend({ name = "sct-lab-t1", subgroup = "sct-labs", order = "a[labs]-a[sct-lab-t1]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/sct-lab-t1/icon-64.png", --default icon again + -- expensive = + -- { + -- enabled = false, + -- energy_required = 12, + -- ingredients = + -- { + -- {"sct-lab1-construction", 3}, + -- {"sct-lab1-mechanization", 2}, + -- }, + -- results = + -- { + -- { type="item", amount=1, name="lab",}, + -- }, + -- }, + enabled = false, + energy_required = 5, + ingredients = { - enabled = false, - energy_required = 12, - ingredients = - { - {"sct-lab1-construction", 3}, - {"sct-lab1-mechanization", 2}, - }, - results = - { - { type="item", amount=1, name="lab",}, - }, + {type = "item", name = "sct-lab1-construction", amount = 2}, + {type = "item", name = "sct-lab1-mechanization", amount = 1}, }, - normal = + results = { - enabled = false, - energy_required = 5, - ingredients = - { - {"sct-lab1-construction", 2}, - {"sct-lab1-mechanization", 1}, - }, - results = - { - { type="item", amount=1, name="lab",}, - }, + { type="item", amount=1, name="lab",}, }, }, @@ -41,35 +39,33 @@ data:extend({ name = "sct-lab-t2", subgroup = "sct-labs", order = "a[labs]-b[sct-lab-t2]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/sct-lab-t2/icon-64.png", + -- expensive = + -- { + -- enabled = false, + -- energy_required = 12, + -- ingredients = + -- { + -- {"lab", 1}, + -- {"sct-lab2-construction", 3}, + -- {"sct-lab2-automatization", 2}, + -- }, + -- results = + -- { + -- { type="item", amount=1, name="sct-lab-t2",}, + -- }, + -- }, + enabled = false, + energy_required = 5, + ingredients = { - enabled = false, - energy_required = 12, - ingredients = - { - {"lab", 1}, - {"sct-lab2-construction", 3}, - {"sct-lab2-automatization", 2}, - }, - results = - { - { type="item", amount=1, name="sct-lab-t2",}, - }, + {type = "item", name = "lab", amount = 1}, + {type = "item", name = "sct-lab2-construction", amount = 2}, + {type = "item", name = "sct-lab2-automatization", amount = 1}, }, - normal = + results = { - enabled = false, - energy_required = 5, - ingredients = - { - {"lab", 1}, - {"sct-lab2-construction", 2}, - {"sct-lab2-automatization", 1}, - }, - results = - { - { type="item", amount=1, name="sct-lab-t2",}, - }, + { type="item", amount=1, name="sct-lab-t2",}, }, }, @@ -78,35 +74,33 @@ data:extend({ name = "sct-lab-t3", subgroup = "sct-labs", order = "b[labs]-c[sct-lab-t3]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/sct-lab-t3/icon-64.png", + -- expensive = + -- { + -- enabled = false, + -- energy_required = 12, + -- ingredients = + -- { + -- {"sct-lab-t2", 1}, + -- {"sct-lab3-construction", 3}, + -- {"sct-lab3-optics", 2}, + -- }, + -- results = + -- { + -- { type="item", amount=1, name="sct-lab-t3",}, + -- }, + -- }, + enabled = false, + energy_required = 5, + ingredients = { - enabled = false, - energy_required = 12, - ingredients = - { - {"sct-lab-t2", 1}, - {"sct-lab3-construction", 3}, - {"sct-lab3-optics", 2}, - }, - results = - { - { type="item", amount=1, name="sct-lab-t3",}, - }, + {type = "item", name = "sct-lab-t2", amount = 1}, + {type = "item", name = "sct-lab3-construction", amount = 2}, + {type = "item", name = "sct-lab3-optics", amount = 1}, }, - normal = + results = { - enabled = false, - energy_required = 5, - ingredients = - { - {"sct-lab-t2", 1}, - {"sct-lab3-construction", 2}, - {"sct-lab3-optics", 1}, - }, - results = - { - { type="item", amount=1, name="sct-lab-t3",}, - }, + { type="item", amount=1, name="sct-lab-t3",}, }, }, @@ -115,35 +109,33 @@ data:extend({ name = "sct-lab-t4", subgroup = "sct-labs", order = "b[labs]-d[lab4]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/sct-lab-t4/icon-64.png", + -- expensive = + -- { + -- enabled = false, + -- energy_required = 12, + -- ingredients = + -- { + -- {"sct-lab-t3", 1}, + -- {"sct-lab4-construction", 3}, + -- {"sct-lab4-manipulators", 2}, + -- }, + -- results = + -- { + -- { type="item", amount=1, name="sct-lab-t4",}, + -- }, + -- }, + enabled = false, + energy_required = 5, + ingredients = { - enabled = false, - energy_required = 12, - ingredients = - { - {"sct-lab-t3", 1}, - {"sct-lab4-construction", 3}, - {"sct-lab4-manipulators", 2}, - }, - results = - { - { type="item", amount=1, name="sct-lab-t4",}, - }, + {type = "item", name = "sct-lab-t3", amount = 1}, + {type = "item", name = "sct-lab4-construction", amount = 2}, + {type = "item", name = "sct-lab4-manipulators", amount = 1}, }, - normal = + results = { - enabled = false, - energy_required = 5, - ingredients = - { - {"sct-lab-t3", 1}, - {"sct-lab4-construction", 2}, - {"sct-lab4-manipulators", 1}, - }, - results = - { - { type="item", amount=1, name="sct-lab-t4",}, - }, + { type="item", amount=1, name="sct-lab-t4",}, }, }, }) diff --git a/prototypes/recipes/sciencepacks-intermediates.lua b/prototypes/recipes/sciencepacks-intermediates.lua index 7f7a1b0..65f619d 100644 --- a/prototypes/recipes/sciencepacks-intermediates.lua +++ b/prototypes/recipes/sciencepacks-intermediates.lua @@ -12,7 +12,7 @@ data:extend({ subgroup = "sct-byproducts", order = "c[bp]-a[copperwaste]", --[[ - expensive = + expensive = -- already commented { enabled = false, energy_required = 1, @@ -25,39 +25,36 @@ data:extend({ { type="item", name="copper-ore", amount=2 }, }, allow_decomposition = false, - hidden_from_stats = true, + hide_from_stats = true, }, ]]-- - expensive = - { - enabled = false, - energy_required = 1, - ingredients = - { - {"sct-waste-copperonly", 2}, - }, - results = - { - { type="item", name="copper-ore", amount=2 }, - }, - allow_decomposition = false, - hidden_from_stats = true, - }, - normal = - { - enabled = false, - energy_required = 0.5, - ingredients = - { - {"sct-waste-copperonly", 2}, - }, - results = - { - { type="item", name="copper-ore", amount=2 }, - }, - allow_decomposition = false, - hidden_from_stats = true, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 1, + -- ingredients = + -- { + -- {type = "item", name = "sct-waste-copperonly", amount = 2}, + -- }, + -- results = + -- { + -- { type="item", name="copper-ore", amount=2 }, + -- }, + -- allow_decomposition = false, + -- hide_from_stats = true, + -- }, + enabled = false, + energy_required = 0.5, + ingredients = + { + {type="item", name = "sct-waste-copperonly", amount = 2}, + }, + results = + { + { type="item", name="copper-ore", amount=2 }, + }, + allow_decomposition = false, + hide_from_stats = true, }, { @@ -83,41 +80,38 @@ data:extend({ { type="item", name="iron-ore", amount=1 }, }, allow_decomposition = false, - hidden_from_stats = true, + hide_from_stats = true, }, ]]-- - expensive = - { - enabled = false, - energy_required = 1, - ingredients = - { - {"sct-waste-ironcopper", 2}, - }, - results = - { - { type="item", name="copper-ore", amount=1 }, - { type="item", name="iron-ore", amount=1 }, - }, - allow_decomposition = false, - hidden_from_stats = true, - }, - normal = - { - enabled = false, - energy_required = 0.5, - ingredients = - { - {"sct-waste-ironcopper", 2}, - }, - results = - { - { type="item", name="copper-ore", amount=1 }, - { type="item", name="iron-ore", amount=1 }, - }, - allow_decomposition = false, - hidden_from_stats = true, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 1, + -- ingredients = + -- { + -- {type = "item", name = "sct-waste-ironcopper", amount = 2}, + -- }, + -- results = + -- { + -- { type="item", name="copper-ore", amount=1 }, + -- { type="item", name="iron-ore", amount=1 }, + -- }, + -- allow_decomposition = false, + -- hide_from_stats = true, + -- }, + enabled = false, + energy_required = 0.5, + ingredients = + { + {type = "item", name = "sct-waste-ironcopper", amount = 2}, + }, + results = + { + { type="item", name="copper-ore", amount=1 }, + { type="item", name="iron-ore", amount=1 }, + }, + allow_decomposition = false, + hide_from_stats = true, }, -- Recipes for new science packs intermediary products. @@ -135,31 +129,28 @@ data:extend({ name = "sct-t1-ironcore", subgroup = "sct-sciencepack-1", order = "d[t1]-b[ironcore]", - expensive = - { - enabled = false, - energy_required = 2.5, - ingredients = - { - {"iron-plate", 4}, - }, - results = - { - {type="item", name="sct-t1-ironcore", amount=1}, - }, - }, - normal = - { - enabled = false, - energy_required = 1.25, - ingredients = - { - {"iron-plate", 2}, - }, - results = - { - {type="item", name="sct-t1-ironcore", amount=1}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 2.5, + -- ingredients = + -- { + -- {"iron-plate", 4}, + -- }, + -- results = + -- { + -- {type="item", name="sct-t1-ironcore", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 1.25, + ingredients = + { + {type = "item", name = "iron-plate", amount = 2}, + }, + results = + { + {type="item", name="sct-t1-ironcore", amount=1}, }, }, @@ -168,31 +159,28 @@ data:extend({ name = "sct-t1-magnet-coils", subgroup = "sct-sciencepack-1", order = "d[t1]-c[magnet-coils]", - expensive = - { - enabled = false, - energy_required = 10, - ingredients = - { - {"copper-plate", 8}, - }, - results = - { - {type="item", name="sct-t1-magnet-coils", amount=8}, - }, - }, - normal = - { - enabled = false, - energy_required = 5, - ingredients = - { - {"copper-plate", 4}, - }, - results = - { - {type="item", name="sct-t1-magnet-coils", amount=8}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 10, + -- ingredients = + -- { + -- {"copper-plate", 8}, + -- }, + -- results = + -- { + -- {type="item", name="sct-t1-magnet-coils", amount=8}, + -- }, + -- }, + enabled = false, + energy_required = 5, + ingredients = + { + {type = "item", name = "copper-plate", amount = 4}, + }, + results = + { + {type="item", name="sct-t1-magnet-coils", amount=8}, }, }, @@ -227,35 +215,32 @@ data:extend({ }, }, ]]-- - expensive = - { - enabled = false, - energy_required = 3, - ingredients = - { - {"sct-t2-microcircuits", 10}, - {"electronic-circuit", 1}, - {"iron-plate", 1}, - }, - results = - { - {type="item", name="sct-t2-instruments", amount=1}, - }, - }, - normal = - { - enabled = false, - energy_required = 1.5, - ingredients = - { - {"sct-t2-microcircuits", 10}, - {"electronic-circuit", 1}, - {"iron-plate", 1}, - }, - results = - { - {type="item", name="sct-t2-instruments", amount=1}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 3, + -- ingredients = + -- { + -- {"sct-t2-microcircuits", 10}, + -- {"electronic-circuit", 1}, + -- {"iron-plate", 1}, + -- }, + -- results = + -- { + -- {type="item", name="sct-t2-instruments", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 1.5, + ingredients = + { + {type = "item", name = "sct-t2-microcircuits", amount = 10}, + {type = "item", name = "electronic-circuit", amount = 1}, + {type = "item", name = "iron-plate", amount = 1}, + }, + results = + { + {type="item", name="sct-t2-instruments", amount=1}, }, }, @@ -264,33 +249,30 @@ data:extend({ name = "sct-t2-microcircuits", subgroup = "sct-sciencepack-2", order = "e[t2]-c[microcircuits]", - expensive = - { - enabled = false, - energy_required = 3, - ingredients = - { - {"copper-plate", 2}, - {"sct-t2-micro-wafer", 2}, - }, - results = - { - {type="item", name="sct-t2-microcircuits", amount=10}, - }, - }, - normal = - { - enabled = false, - energy_required = 1.5, - ingredients = - { - {"copper-plate", 1}, - {"sct-t2-micro-wafer", 1}, - }, - results = - { - {type="item", name="sct-t2-microcircuits", amount=10}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 3, + -- ingredients = + -- { + -- {"copper-plate", 2}, + -- {"sct-t2-micro-wafer", 2}, + -- }, + -- results = + -- { + -- {type="item", name="sct-t2-microcircuits", amount=10}, + -- }, + -- }, + enabled = false, + energy_required = 1.5, + ingredients = + { + {type = "item", name = "copper-plate", amount = 1}, + {type = "item", name = "sct-t2-micro-wafer", amount = 1}, + }, + results = + { + {type="item", name="sct-t2-microcircuits", amount=10}, }, }, @@ -299,33 +281,30 @@ data:extend({ name = "sct-t2-micro-wafer", subgroup = "sct-sciencepack-2", order = "e[t2]-d[micro-wafer]", - expensive = - { - enabled = false, - energy_required = 6, - ingredients = - { - {"iron-plate", 4}, - {"sct-t2-wafer-stamp", 6} - }, - results = - { - {type="item", name="sct-t2-micro-wafer", amount=2}, - }, - }, - normal = - { - enabled = false, - energy_required = 3, - ingredients = - { - {"iron-plate", 2}, - {"sct-t2-wafer-stamp", 4} - }, - results = - { - {type="item", name="sct-t2-micro-wafer", amount=2}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 6, + -- ingredients = + -- { + -- {"iron-plate", 4}, + -- {"sct-t2-wafer-stamp", 6} + -- }, + -- results = + -- { + -- {type="item", name="sct-t2-micro-wafer", amount=2}, + -- }, + -- }, + enabled = false, + energy_required = 3, + ingredients = + { + {type = "item", name = "iron-plate", amount = 2}, + {type = "item", name = "sct-t2-wafer-stamp", amount = 4} + }, + results = + { + {type="item", name="sct-t2-micro-wafer", amount=2}, }, }, @@ -334,31 +313,28 @@ data:extend({ name = "sct-t2-wafer-stamp", subgroup = "sct-sciencepack-2", order = "e[t2]-e[wafer-stamp]", - expensive = - { - enabled = false, - energy_required = 6, - ingredients = - { - {"iron-plate", 6}, - }, - results = - { - {type="item", name="sct-t2-wafer-stamp", amount=4}, - }, - }, - normal = - { - enabled = false, - energy_required = 3, - ingredients = - { - {"iron-plate", 4}, - }, - results = - { - {type="item", name="sct-t2-wafer-stamp", amount=4}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 6, + -- ingredients = + -- { + -- {"iron-plate", 6}, + -- }, + -- results = + -- { + -- {type="item", name="sct-t2-wafer-stamp", amount=4}, + -- }, + -- }, + enabled = false, + energy_required = 3, + ingredients = + { + {type = "item", name = "iron-plate", amount = 4}, + }, + results = + { + {type="item", name="sct-t2-wafer-stamp", amount=4}, }, }, @@ -367,33 +343,30 @@ data:extend({ name = "sct-t2-reaction-nodes", subgroup = "sct-sciencepack-2", order = "e[t2]-f[reaction-nodes]", - expensive = - { - enabled = false, - energy_required = 3, - ingredients = - { - {"sct-t1-magnet-coils", 4}, - {"iron-plate", 2}, - }, - results = - { - {type="item", name="sct-t2-reaction-nodes", amount=1}, - }, - }, - normal = - { - enabled = false, - energy_required = 1.5, - ingredients = - { - {"sct-t1-magnet-coils", 2}, - {"iron-plate", 1}, - }, - results = - { - {type="item", name="sct-t2-reaction-nodes", amount=1}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 3, + -- ingredients = + -- { + -- {"sct-t1-magnet-coils", 4}, + -- {"iron-plate", 2}, + -- }, + -- results = + -- { + -- {type="item", name="sct-t2-reaction-nodes", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 1.5, + ingredients = + { + {type = "item", name = "sct-t1-magnet-coils", amount = 2}, + {type = "item", name = "iron-plate", amount = 1}, + }, + results = + { + {type="item", name="sct-t2-reaction-nodes", amount=1}, }, }, @@ -423,37 +396,34 @@ data:extend({ }, }, ]]-- - expensive = - { - enabled = false, - energy_required = 6, - ingredients = - { - {type="item", name="sct-t3-laser-emitter", amount=1}, - {type="item", name="sct-t3-laser-foci", amount=1}, - {type="item", name="sct-t3-flash-fuel", amount=1}, - {type="fluid", name="water", amount=10} - }, - results = - { - {type="item", name="sct-t3-femto-lasers", amount=1}, - }, - }, - normal = - { - enabled = false, - energy_required = 3, - ingredients = - { - {type="item", name="sct-t3-laser-emitter", amount=1}, - {type="item", name="sct-t3-laser-foci", amount=1}, - {type="item", name="sct-t3-flash-fuel", amount=1}, - {type="fluid", name="water", amount=10} - }, - results = - { - {type="item", name="sct-t3-femto-lasers", amount=1}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 6, + -- ingredients = + -- { + -- {type="item", name="sct-t3-laser-emitter", amount=1}, + -- {type="item", name="sct-t3-laser-foci", amount=1}, + -- {type="item", name="sct-t3-flash-fuel", amount=1}, + -- {type="fluid", name="water", amount=10} + -- }, + -- results = + -- { + -- {type="item", name="sct-t3-femto-lasers", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 3, + ingredients = + { + {type="item", name="sct-t3-laser-emitter", amount=1}, + {type="item", name="sct-t3-laser-foci", amount=1}, + {type="item", name="sct-t3-flash-fuel", amount=1}, + {type="fluid", name="water", amount=10} + }, + results = + { + {type="item", name="sct-t3-femto-lasers", amount=1}, }, }, @@ -464,33 +434,30 @@ data:extend({ always_show_made_in = true, subgroup = "sct-sciencepack-3", order = "f[t3]-c[flashfuel]", - expensive = - { - enabled = false, - energy_required = 6, - ingredients = - { - {type="fluid", name="petroleum-gas", amount=40}, - {type="item", name="steel-plate", amount=2} - }, - results = - { - {type="item", name="sct-t3-flash-fuel", amount=1}, - }, - }, - normal = - { - enabled = false, - energy_required = 3, - ingredients = - { - {type="fluid", name="petroleum-gas", amount=20}, - {type="item", name="steel-plate", amount=1} - }, - results = - { - {type="item", name="sct-t3-flash-fuel", amount=1}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 6, + -- ingredients = + -- { + -- {type="fluid", name="petroleum-gas", amount=40}, + -- {type="item", name="steel-plate", amount=2} + -- }, + -- results = + -- { + -- {type="item", name="sct-t3-flash-fuel", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 3, + ingredients = + { + {type="fluid", name="petroleum-gas", amount=20}, + {type="item", name="steel-plate", amount=1} + }, + results = + { + {type="item", name="sct-t3-flash-fuel", amount=1}, }, }, @@ -499,189 +466,177 @@ data:extend({ name = "sct-t3-laser-foci", subgroup = "sct-sciencepack-3", order = "f[t3]-d[laserfoci]", + -- expensive = + -- { + -- enabled = false, + -- energy_required = 6, + -- ingredients = + -- { + -- {type="item", name="copper-plate", amount=8}, + -- {type="item", name="iron-plate", amount=12} + -- }, + -- results = + -- { + -- {type="item", name="sct-t3-laser-foci", amount=1}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- }, + -- main_product = "sct-t3-laser-foci", + -- }, + enabled = false, + energy_required = 3, + ingredients = + { + {type="item", name="copper-plate", amount=4}, + {type="item", name="iron-plate", amount=6} + }, + results = + { + {type="item", name="sct-t3-laser-foci", amount=1}, + {type="item", name="sct-waste-copperonly", amount=1} + }, + main_product = "sct-t3-laser-foci", + }, + + { + type = "recipe", + name = "sct-t3-laser-emitter", + subgroup = "sct-sciencepack-3", + order = "f[t3]-e[laseremitter]", + -- expensive = + -- { + -- enabled = false, + -- energy_required = 6, + -- ingredients = + -- { + -- {type="item", name="electronic-circuit", amount=12}, + -- {type="item", name="copper-plate", amount=4}, + -- {type="item", name="iron-plate", amount=4} + -- }, + -- results = + -- { + -- {type="item", name="sct-t3-laser-emitter", amount=1}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- }, + -- main_product = "sct-t3-laser-emitter", + -- }, + enabled = false, + energy_required = 3, + ingredients = + { + {type="item", name="electronic-circuit", amount=6}, + {type="item", name="copper-plate", amount=2}, + {type="item", name="iron-plate", amount=2} + }, + results = + { + {type="item", name="sct-t3-laser-emitter", amount=1}, + {type="item", name="sct-waste-copperonly", amount=1} + }, + main_product = "sct-t3-laser-emitter", + }, + + { + type = "recipe", + name = "sct-t3-atomic-sensors", + category = "crafting-with-fluid", + subgroup = "sct-sciencepack-3", + order = "f[t3]-f[atomicsensors]", + -- expensive = + -- { + -- enabled = false, + -- energy_required = 8, + -- ingredients = + -- { + -- {type="item", name="advanced-circuit", amount=2}, + -- {type="item", name="iron-plate", amount=12}, + -- {type="item", name="sct-t1-magnet-coils", amount=44}, + -- {type="fluid", name="water", amount=40} + -- }, + -- results = + -- { + -- {type="item", name="sct-t3-atomic-sensors", amount=1}, + -- {type="item", name="sct-waste-copperonly", amount=2} + -- }, + -- main_product = "sct-t3-atomic-sensors", + -- }, + enabled = false, + energy_required = 3, + ingredients = + { + {type="item", name="advanced-circuit", amount=1}, + {type="item", name="iron-plate", amount=12}, + {type="item", name="sct-t1-magnet-coils", amount=22}, + {type="fluid", name="water", amount=20} + }, + results = + { + {type="item", name="sct-t3-atomic-sensors", amount=1}, + {type="item", name="sct-waste-copperonly", amount=2} + }, + main_product = "sct-t3-atomic-sensors", + }, + + -- Military Intermediary products. + -- ============================= + { + type = "recipe", + name = "sct-mil-plating", + category = "advanced-crafting", + subgroup = "sct-sciencepack-mil", + order = "g[mil]-b[plating]", + --[[ expensive = { enabled = false, - energy_required = 6, + energy_required = 22.5, ingredients = { - {type="item", name="copper-plate", amount=8}, - {type="item", name="iron-plate", amount=12} + {type="item", name="steel-plate", amount=2}, + {type="item", name="iron-plate", amount=15}, + {type="item", name="sct-mil-subplating", amount=20}, + {type="item", name="copper-plate", amount=5} }, results = { - {type="item", name="sct-t3-laser-foci", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} + {type="item", name="sct-mil-plating", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=1} }, - main_product = "sct-t3-laser-foci", - }, - normal = - { - enabled = false, - energy_required = 3, - ingredients = - { - {type="item", name="copper-plate", amount=4}, - {type="item", name="iron-plate", amount=6} - }, - results = - { - {type="item", name="sct-t3-laser-foci", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-t3-laser-foci", - }, - }, - - { - type = "recipe", - name = "sct-t3-laser-emitter", - subgroup = "sct-sciencepack-3", - order = "f[t3]-e[laseremitter]", - expensive = - { - enabled = false, - energy_required = 6, - ingredients = - { - {type="item", name="electronic-circuit", amount=12}, - {type="item", name="copper-plate", amount=4}, - {type="item", name="iron-plate", amount=4} - }, - results = - { - {type="item", name="sct-t3-laser-emitter", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-t3-laser-emitter", - }, - normal = - { - enabled = false, - energy_required = 3, - ingredients = - { - {type="item", name="electronic-circuit", amount=6}, - {type="item", name="copper-plate", amount=2}, - {type="item", name="iron-plate", amount=2} - }, - results = - { - {type="item", name="sct-t3-laser-emitter", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-t3-laser-emitter", - }, - }, - - { - type = "recipe", - name = "sct-t3-atomic-sensors", - category = "crafting-with-fluid", - subgroup = "sct-sciencepack-3", - order = "f[t3]-f[atomicsensors]", - expensive = - { - enabled = false, - energy_required = 8, - ingredients = - { - {type="item", name="advanced-circuit", amount=2}, - {type="item", name="iron-plate", amount=12}, - {type="item", name="sct-t1-magnet-coils", amount=44}, - {type="fluid", name="water", amount=40} - }, - results = - { - {type="item", name="sct-t3-atomic-sensors", amount=1}, - {type="item", name="sct-waste-copperonly", amount=2} - }, - main_product = "sct-t3-atomic-sensors", - }, - normal = - { - enabled = false, - energy_required = 3, - ingredients = - { - {type="item", name="advanced-circuit", amount=1}, - {type="item", name="iron-plate", amount=12}, - {type="item", name="sct-t1-magnet-coils", amount=22}, - {type="fluid", name="water", amount=20} - }, - results = - { - {type="item", name="sct-t3-atomic-sensors", amount=1}, - {type="item", name="sct-waste-copperonly", amount=2} - }, - main_product = "sct-t3-atomic-sensors", - }, - }, - - -- Military Intermediary products. - -- ============================= - { - type = "recipe", - name = "sct-mil-plating", - category = "advanced-crafting", - subgroup = "sct-sciencepack-mil", - order = "g[mil]-b[plating]", - --[[ - expensive = - { - enabled = false, - energy_required = 22.5, - ingredients = - { - {type="item", name="steel-plate", amount=2}, - {type="item", name="iron-plate", amount=15}, - {type="item", name="sct-mil-subplating", amount=20}, - {type="item", name="copper-plate", amount=5} - }, - results = - { - {type="item", name="sct-mil-plating", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=1} - }, - main_product = "sct-mil-plating", + main_product = "sct-mil-plating", }, ]]-- - expensive = - { - enabled = false, - energy_required = 15, - ingredients = - { - {type="item", name="steel-plate", amount=1}, - {type="item", name="iron-plate", amount=6}, - {type="item", name="sct-mil-subplating", amount=7}, - {type="item", name="copper-plate", amount=2} - }, - results = - { - {type="item", name="sct-mil-plating", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=1} - }, - main_product = "sct-mil-plating", - }, - normal = - { - enabled = false, - energy_required = 9, - ingredients = - { - {type="item", name="steel-plate", amount=1}, - {type="item", name="iron-plate", amount=6}, - {type="item", name="sct-mil-subplating", amount=7}, - {type="item", name="copper-plate", amount=2} - }, - results = - { - {type="item", name="sct-mil-plating", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=1} - }, - main_product = "sct-mil-plating", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 15, + -- ingredients = + -- { + -- {type="item", name="steel-plate", amount=1}, + -- {type="item", name="iron-plate", amount=6}, + -- {type="item", name="sct-mil-subplating", amount=7}, + -- {type="item", name="copper-plate", amount=2} + -- }, + -- results = + -- { + -- {type="item", name="sct-mil-plating", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=1} + -- }, + -- main_product = "sct-mil-plating", + -- }, + enabled = false, + energy_required = 9, + ingredients = + { + {type="item", name="steel-plate", amount=1}, + {type="item", name="iron-plate", amount=6}, + {type="item", name="sct-mil-subplating", amount=7}, + {type="item", name="copper-plate", amount=2} + }, + results = + { + {type="item", name="sct-mil-plating", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=1} + }, + main_product = "sct-mil-plating", }, { @@ -689,38 +644,35 @@ data:extend({ name = "sct-mil-subplating", subgroup = "sct-sciencepack-mil", order = "g[mil]-c[subplating]", - expensive = - { - enabled = false, - energy_required = 2, - ingredients = - { - {type="item", name="iron-plate", amount=6}, - {type="item", name="copper-plate", amount=2} - }, - results = - { - {type="item", name="sct-mil-subplating", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=1} - }, - main_product = "sct-mil-subplating", - }, - normal = - { - enabled = false, - energy_required = 1, - ingredients = - { - {type="item", name="iron-plate", amount=3}, - {type="item", name="copper-plate", amount=1} - }, - results = - { - {type="item", name="sct-mil-subplating", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=1} - }, - main_product = "sct-mil-subplating", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 2, + -- ingredients = + -- { + -- {type="item", name="iron-plate", amount=6}, + -- {type="item", name="copper-plate", amount=2} + -- }, + -- results = + -- { + -- {type="item", name="sct-mil-subplating", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=1} + -- }, + -- main_product = "sct-mil-subplating", + -- }, + enabled = false, + energy_required = 1, + ingredients = + { + {type="item", name="iron-plate", amount=3}, + {type="item", name="copper-plate", amount=1} + }, + results = + { + {type="item", name="sct-mil-subplating", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=1} + }, + main_product = "sct-mil-subplating", }, { @@ -748,40 +700,37 @@ data:extend({ main_product = "sct-mil-circuit3", }, ]]-- - expensive = - { - enabled = false, - energy_required = 5, - ingredients = - { - {type="item", name="sct-mil-circuit2", amount=1}, - {type="item", name="advanced-circuit", amount=2}, - }, - results = - { - {type="item", name="sct-mil-circuit3", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-mil-circuit3", - }, - normal = - { - enabled = false, - energy_required = 3, - ingredients = - { - {type="item", name="sct-mil-circuit2", amount=1}, - {type="item", name="advanced-circuit", amount=2}, - }, - results = - { - {type="item", name="sct-mil-circuit3", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-mil-circuit3", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 5, + -- ingredients = + -- { + -- {type="item", name="sct-mil-circuit2", amount=1}, + -- {type="item", name="advanced-circuit", amount=2}, + -- }, + -- results = + -- { + -- {type="item", name="sct-mil-circuit3", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=2}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- }, + -- main_product = "sct-mil-circuit3", + -- }, + enabled = false, + energy_required = 3, + ingredients = + { + {type="item", name="sct-mil-circuit2", amount=1}, + {type="item", name="advanced-circuit", amount=2}, + }, + results = + { + {type="item", name="sct-mil-circuit3", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=2}, + {type="item", name="sct-waste-copperonly", amount=1} + }, + main_product = "sct-mil-circuit3", }, { @@ -789,40 +738,37 @@ data:extend({ name = "sct-mil-circuit2", subgroup = "sct-sciencepack-mil", order = "g[mil]-e[circuit2]", - expensive = - { - enabled = false, - energy_required = 3, - ingredients = - { - {type="item", name="sct-mil-circuit1", amount=2}, - {type="item", name="electronic-circuit", amount=4}, - }, - results = - { - {type="item", name="sct-mil-circuit2", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-mil-circuit2", - }, - normal = - { - enabled = false, - energy_required = 2, - ingredients = - { - {type="item", name="sct-mil-circuit1", amount=1}, - {type="item", name="electronic-circuit", amount=2}, - }, - results = - { - {type="item", name="sct-mil-circuit2", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-mil-circuit2", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 3, + -- ingredients = + -- { + -- {type="item", name="sct-mil-circuit1", amount=2}, + -- {type="item", name="electronic-circuit", amount=4}, + -- }, + -- results = + -- { + -- {type="item", name="sct-mil-circuit2", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=2}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- }, + -- main_product = "sct-mil-circuit2", + -- }, + enabled = false, + energy_required = 2, + ingredients = + { + {type="item", name="sct-mil-circuit1", amount=1}, + {type="item", name="electronic-circuit", amount=2}, + }, + results = + { + {type="item", name="sct-mil-circuit2", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=2}, + {type="item", name="sct-waste-copperonly", amount=1} + }, + main_product = "sct-mil-circuit2", }, { @@ -830,38 +776,35 @@ data:extend({ name = "sct-mil-circuit1", subgroup = "sct-sciencepack-mil", order = "g[mil]-f[circuit1]", - expensive = - { - enabled = false, - energy_required = 2, - ingredients = - { - {type="item", name="electronic-circuit", amount=4}, - {type="item", name="coal", amount=10} - }, - results = - { - {type="item", name="sct-mil-circuit1", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=1} - }, - main_product = "sct-mil-circuit1", - }, - normal = - { - enabled = false, - energy_required = 1, - ingredients = - { - {type="item", name="electronic-circuit", amount=2}, - {type="item", name="coal", amount=5} - }, - results = - { - {type="item", name="sct-mil-circuit1", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=1} - }, - main_product = "sct-mil-circuit1", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 2, + -- ingredients = + -- { + -- {type="item", name="electronic-circuit", amount=4}, + -- {type="item", name="coal", amount=10} + -- }, + -- results = + -- { + -- {type="item", name="sct-mil-circuit1", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=1} + -- }, + -- main_product = "sct-mil-circuit1", + -- }, + enabled = false, + energy_required = 1, + ingredients = + { + {type="item", name="electronic-circuit", amount=2}, + {type="item", name="coal", amount=5} + }, + results = + { + {type="item", name="sct-mil-circuit1", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=1} + }, + main_product = "sct-mil-circuit1", }, -- Production Intermediary products. @@ -872,40 +815,37 @@ data:extend({ category = "advanced-crafting", subgroup = "sct-sciencepack-prod", order = "h[prod]-b[bioprocessor]", - expensive = - { - enabled = false, - energy_required = 30, - ingredients = - { - {type="item", name="sct-prod-baked-biopaste", amount=1}, - {type="item", name="red-wire", amount=10}, - {type="item", name="processing-unit", amount=1} - }, - results = - { - {type="item", name="sct-prod-bioprocessor", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=4}, - }, - main_product = "sct-prod-bioprocessor", - }, - normal = - { - enabled = false, - energy_required = 15, - ingredients = - { - {type="item", name="sct-prod-baked-biopaste", amount=1}, - {type="item", name="red-wire", amount=6}, - {type="item", name="processing-unit", amount=1} - }, - results = - { - {type="item", name="sct-prod-bioprocessor", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=4}, - }, - main_product = "sct-prod-bioprocessor", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 30, + -- ingredients = + -- { + -- {type="item", name="sct-prod-baked-biopaste", amount=1}, + -- {type="item", name="copper-cable", amount=10}, + -- {type="item", name="processing-unit", amount=1} + -- }, + -- results = + -- { + -- {type="item", name="sct-prod-bioprocessor", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=4}, + -- }, + -- main_product = "sct-prod-bioprocessor", + -- }, + enabled = false, + energy_required = 15, + ingredients = + { + {type="item", name="sct-prod-baked-biopaste", amount=1}, + {type="item", name="copper-cable", amount=6}, + {type="item", name="processing-unit", amount=1} + }, + results = + { + {type="item", name="sct-prod-bioprocessor", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=4}, + }, + main_product = "sct-prod-bioprocessor", }, { @@ -930,31 +870,28 @@ data:extend({ }, }, ]]-- - expensive = - { - energy_required = 8, - enabled = false, - ingredients = - { - {"sct-prod-biosilicate", 1} - }, - results = - { - { type="item", name="sct-prod-baked-biopaste", amount=1}, - }, - }, - normal = - { - energy_required = 5, - enabled = false, - ingredients = - { - {"sct-prod-biosilicate", 1} - }, - results = - { - { type="item", name="sct-prod-baked-biopaste", amount=1}, - }, + -- expensive = + -- { + -- energy_required = 8, + -- enabled = false, + -- ingredients = + -- { + -- {"sct-prod-biosilicate", 1} + -- }, + -- results = + -- { + -- { type="item", name="sct-prod-baked-biopaste", amount=1}, + -- }, + -- }, + energy_required = 5, + enabled = false, + ingredients = + { + {type = "item", name = "sct-prod-biosilicate", amount = 1} + }, + results = + { + { type="item", name="sct-prod-baked-biopaste", amount=1}, }, }, @@ -965,39 +902,36 @@ data:extend({ subgroup = "sct-sciencepack-prod", order = "h[prod]-d[biosilicate]", always_show_made_in = true, - expensive = - { - enabled = false, - energy_required = 12.5, - ingredients = - { - {type="item", name="stone", amount=40}, - {type="item", name="steel-plate", amount=12}, - {type="item", name="plastic-bar", amount=6}, - {type="item", name="electronic-circuit", amount=3}, - {type="fluid", name="petroleum-gas", amount=40} - }, - results = - { - {type="item", name="sct-prod-biosilicate", amount=1}, - }, - }, - normal = - { - enabled = false, - energy_required = 5, - ingredients = - { - {type="item", name="stone", amount=20}, - {type="item", name="steel-plate", amount=8}, - {type="item", name="plastic-bar", amount=4}, - {type="item", name="electronic-circuit", amount=2}, - {type="fluid", name="petroleum-gas", amount=20} - }, - results = - { - {type="item", name="sct-prod-biosilicate", amount=1}, - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 12.5, + -- ingredients = + -- { + -- {type="item", name="stone", amount=40}, + -- {type="item", name="steel-plate", amount=12}, + -- {type="item", name="plastic-bar", amount=6}, + -- {type="item", name="electronic-circuit", amount=3}, + -- {type="fluid", name="petroleum-gas", amount=40} + -- }, + -- results = + -- { + -- {type="item", name="sct-prod-biosilicate", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 5, + ingredients = + { + {type="item", name="stone", amount=20}, + {type="item", name="steel-plate", amount=8}, + {type="item", name="plastic-bar", amount=4}, + {type="item", name="electronic-circuit", amount=2}, + {type="fluid", name="petroleum-gas", amount=20} + }, + results = + { + {type="item", name="sct-prod-biosilicate", amount=1}, }, }, @@ -1007,46 +941,43 @@ data:extend({ category = "crafting-with-fluid", subgroup = "sct-sciencepack-prod", order = "h[prod]-e[overclocker]", - expensive = - { - enabled = false, - energy_required = 30, - ingredients = - { - {type="item", name="iron-gear-wheel", amount=30}, - {type="item", name="copper-cable", amount=30}, - {type="item", name="steel-plate", amount=15}, - {type="item", name="sct-prod-chipcase", amount=1}, - {type="fluid", name="water", amount=250} - }, - results = - { - {type="item", name="sct-prod-overclocker", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-prod-overclocker", - }, - normal = - { - enabled = false, - energy_required = 15, - ingredients = - { - {type="item", name="iron-gear-wheel", amount=17}, - {type="item", name="copper-cable", amount=16}, - {type="item", name="steel-plate", amount=9}, - {type="item", name="sct-prod-chipcase", amount=1}, - {type="fluid", name="water", amount=120} - }, - results = - { - {type="item", name="sct-prod-overclocker", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2}, - {type="item", name="sct-waste-copperonly", amount=1}, - }, - main_product = "sct-prod-overclocker", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 30, + -- ingredients = + -- { + -- {type="item", name="iron-gear-wheel", amount=30}, + -- {type="item", name="copper-cable", amount=30}, + -- {type="item", name="steel-plate", amount=15}, + -- {type="item", name="sct-prod-chipcase", amount=1}, + -- {type="fluid", name="water", amount=250} + -- }, + -- results = + -- { + -- {type="item", name="sct-prod-overclocker", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=2}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- }, + -- main_product = "sct-prod-overclocker", + -- }, + enabled = false, + energy_required = 15, + ingredients = + { + {type="item", name="iron-gear-wheel", amount=17}, + {type="item", name="copper-cable", amount=16}, + {type="item", name="steel-plate", amount=9}, + {type="item", name="sct-prod-chipcase", amount=1}, + {type="fluid", name="water", amount=120} + }, + results = + { + {type="item", name="sct-prod-overclocker", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=2}, + {type="item", name="sct-waste-copperonly", amount=1}, + }, + main_product = "sct-prod-overclocker", }, { @@ -1055,42 +986,39 @@ data:extend({ category = "crafting-with-fluid", subgroup = "sct-sciencepack-prod", order = "h[prod]-f[chipcase]", - expensive = - { - enabled = false, - energy_required = 10, - ingredients = - { - {type="item", name="plastic-bar", amount=10}, - {type="item", name="green-wire", amount=8}, - {type="item", name="advanced-circuit", amount=1}, - {type="fluid", name="heavy-oil", amount=250} - }, - results = - { - {type="item", name="sct-prod-chipcase", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-prod-chipcase", - }, - normal = - { - enabled = false, - energy_required = 5, - ingredients = - { - {type="item", name="plastic-bar", amount=5}, - {type="item", name="green-wire", amount=5}, - {type="item", name="advanced-circuit", amount=1}, - {type="fluid", name="heavy-oil", amount=120} - }, - results = - { - {type="item", name="sct-prod-chipcase", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-prod-chipcase", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 10, + -- ingredients = + -- { + -- {type="item", name="plastic-bar", amount=10}, + -- {type="item", name="copper-cable", amount=8}, + -- {type="item", name="advanced-circuit", amount=1}, + -- {type="fluid", name="heavy-oil", amount=250} + -- }, + -- results = + -- { + -- {type="item", name="sct-prod-chipcase", amount=1}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- }, + -- main_product = "sct-prod-chipcase", + -- }, + enabled = false, + energy_required = 5, + ingredients = + { + {type="item", name="plastic-bar", amount=5}, + {type="item", name="copper-cable", amount=5}, + {type="item", name="advanced-circuit", amount=1}, + {type="fluid", name="heavy-oil", amount=120} + }, + results = + { + {type="item", name="sct-prod-chipcase", amount=1}, + {type="item", name="sct-waste-copperonly", amount=1} + }, + main_product = "sct-prod-chipcase", }, -- High-Tech Intermediary products. @@ -1102,40 +1030,37 @@ data:extend({ category = "advanced-crafting", subgroup = "sct-sciencepack-hightech", order = "i[ht]-b[capbank]", - expensive = - { - enabled = false, - energy_required = 28, - ingredients = - { - {type="item", name="battery", amount=1}, - {type="item", name="iron-plate", amount=15}, - {type="item", name="copper-cable", amount=20} - }, - results = - { - {type="item", name="sct-htech-capbank", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2} - }, - main_product = "sct-htech-capbank", - }, - normal = - { - enabled = false, - energy_required = 14, - ingredients = - { - {type="item", name="battery", amount=1}, - {type="item", name="iron-plate", amount=10}, - {type="item", name="copper-cable", amount=15} - }, - results = - { - {type="item", name="sct-htech-capbank", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2} - }, - main_product = "sct-htech-capbank", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 28, + -- ingredients = + -- { + -- {type="item", name="battery", amount=1}, + -- {type="item", name="iron-plate", amount=15}, + -- {type="item", name="copper-cable", amount=20} + -- }, + -- results = + -- { + -- {type="item", name="sct-htech-capbank", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=2} + -- }, + -- main_product = "sct-htech-capbank", + -- }, + enabled = false, + energy_required = 14, + ingredients = + { + {type="item", name="battery", amount=1}, + {type="item", name="iron-plate", amount=10}, + {type="item", name="copper-cable", amount=15} + }, + results = + { + {type="item", name="sct-htech-capbank", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=2} + }, + main_product = "sct-htech-capbank", }, { @@ -1144,42 +1069,39 @@ data:extend({ category = "advanced-crafting", subgroup = "sct-sciencepack-hightech", order = "i[ht]-c[injector]", - expensive = - { - enabled = false, - energy_required = 14, - ingredients = - { - {type="item", name="processing-unit", amount=4}, - {type="item", name="plastic-bar", amount=15}, - {type="item", name="iron-plate", amount=20}, - {type="item", name="copper-cable", amount=30} - }, - results = - { - {type="item", name="sct-htech-injector", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=3} - }, - main_product = "sct-htech-injector", - }, - normal = - { - enabled = false, - energy_required = 7, - ingredients = - { - {type="item", name="processing-unit", amount=3}, - {type="item", name="plastic-bar", amount=10}, - {type="item", name="iron-plate", amount=15}, - {type="item", name="copper-cable", amount=30} - }, - results = - { - {type="item", name="sct-htech-injector", amount=1}, - {type="item", name="sct-waste-ironcopper", amount=2} - }, - main_product = "sct-htech-injector", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 14, + -- ingredients = + -- { + -- {type="item", name="processing-unit", amount=4}, + -- {type="item", name="plastic-bar", amount=15}, + -- {type="item", name="iron-plate", amount=20}, + -- {type="item", name="copper-cable", amount=30} + -- }, + -- results = + -- { + -- {type="item", name="sct-htech-injector", amount=1}, + -- {type="item", name="sct-waste-ironcopper", amount=3} + -- }, + -- main_product = "sct-htech-injector", + -- }, + enabled = false, + energy_required = 7, + ingredients = + { + {type="item", name="processing-unit", amount=3}, + {type="item", name="plastic-bar", amount=10}, + {type="item", name="iron-plate", amount=15}, + {type="item", name="copper-cable", amount=30} + }, + results = + { + {type="item", name="sct-htech-injector", amount=1}, + {type="item", name="sct-waste-ironcopper", amount=2} + }, + main_product = "sct-htech-injector", }, { @@ -1188,33 +1110,30 @@ data:extend({ category = "advanced-crafting", subgroup = "sct-sciencepack-hightech", order = "i[ht]-d[random]", - expensive = - { - enabled = false, - energy_required = 14, - ingredients = - { - {type="item", name="sct-htech-thermalstore-heated", amount=1}, - {type="item", name="iron-gear-wheel", amount=10} - }, - results = - { - {type="item", name="sct-htech-random", amount=1} - }, - }, - normal = - { - enabled = false, - energy_required = 7, - ingredients = - { - {type="item", name="sct-htech-thermalstore-heated", amount=1}, - {type="item", name="iron-gear-wheel", amount=5} - }, - results = - { - {type="item", name="sct-htech-random", amount=1} - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 14, + -- ingredients = + -- { + -- {type="item", name="sct-htech-thermalstore-heated", amount=1}, + -- {type="item", name="iron-gear-wheel", amount=10} + -- }, + -- results = + -- { + -- {type="item", name="sct-htech-random", amount=1} + -- }, + -- }, + enabled = false, + energy_required = 7, + ingredients = + { + {type="item", name="sct-htech-thermalstore-heated", amount=1}, + {type="item", name="iron-gear-wheel", amount=5} + }, + results = + { + {type="item", name="sct-htech-random", amount=1} }, }, @@ -1240,34 +1159,31 @@ data:extend({ always_show_made_in = true, }, ]]-- - expensive = - { - energy_required = 16, - enabled = false, - ingredients = - { - {"sct-htech-thermalstore", 1} - }, - results = - { - {type="item", name="sct-htech-thermalstore-heated", amount=1}, - }, - always_show_made_in = true, - }, - normal = - { - energy_required = 10.5, - enabled = false, - ingredients = - { - {"sct-htech-thermalstore", 1} - }, - results = - { - {type="item", name="sct-htech-thermalstore-heated", amount=1}, - }, - always_show_made_in = true, + -- expensive = + -- { + -- energy_required = 16, + -- enabled = false, + -- ingredients = + -- { + -- {"sct-htech-thermalstore", 1} + -- }, + -- results = + -- { + -- {type="item", name="sct-htech-thermalstore-heated", amount=1}, + -- }, + -- always_show_made_in = true, + -- }, + energy_required = 10.5, + enabled = false, + ingredients = + { + {type = "item", name = "sct-htech-thermalstore", amount = 1} + }, + results = + { + {type="item", name="sct-htech-thermalstore-heated", amount=1}, }, + always_show_made_in = true, }, { @@ -1276,35 +1192,32 @@ data:extend({ category = "advanced-crafting", subgroup = "sct-sciencepack-hightech", order = "i[ht]-f[thermalstore]", - expensive = - { - enabled = false, - energy_required = 14, - ingredients = - { - {type="item", name="copper-plate", amount=80} - }, - results = - { - {type="item", name="sct-htech-thermalstore", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-htech-thermalstore", - }, - normal = - { - enabled = false, - energy_required = 7, - ingredients = - { - {type="item", name="copper-plate", amount=40} - }, - results = - { - {type="item", name="sct-htech-thermalstore", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - }, - main_product = "sct-htech-thermalstore", - }, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 14, + -- ingredients = + -- { + -- {type="item", name="copper-plate", amount=80} + -- }, + -- results = + -- { + -- {type="item", name="sct-htech-thermalstore", amount=1}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- }, + -- main_product = "sct-htech-thermalstore", + -- }, + enabled = false, + energy_required = 7, + ingredients = + { + {type="item", name="copper-plate", amount=40} + }, + results = + { + {type="item", name="sct-htech-thermalstore", amount=1}, + {type="item", name="sct-waste-copperonly", amount=1} + }, + main_product = "sct-htech-thermalstore", }, }) diff --git a/prototypes/recipes/sciencepacks.lua b/prototypes/recipes/sciencepacks.lua index 1c450c8..b046a90 100644 --- a/prototypes/recipes/sciencepacks.lua +++ b/prototypes/recipes/sciencepacks.lua @@ -10,6 +10,7 @@ data:extend( name = "sct-automation-science-pack", subgroup = "sct-sciencepack-1", order = "d[t1]-a[automation-science-pack]", + icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-1-64.png", -- default icon, else doesn't work --[[ expensive = { enabled = false, @@ -24,18 +25,16 @@ data:extend( energy_required = 12 }, ]]-- - normal = { - enabled = false, - always_show_made_in = true, - ingredients = { - {"sct-t1-ironcore", 1}, - {"sct-t1-magnet-coils", 2} - }, - results = { - {type = "item", amount = 1, name = "automation-science-pack"} - }, - energy_required = 5 - } + enabled = false, + always_show_made_in = true, + ingredients = { + {type = "item", name = "sct-t1-ironcore", amount = 1}, + {type = "item", name = "sct-t1-magnet-coils", amount = 2} + }, + results = { + {type = "item", amount = 1, name = "automation-science-pack"} + }, + energy_required = 5 } } ) @@ -48,6 +47,7 @@ data:extend( name = "sct-logistic-science-pack", subgroup = "sct-sciencepack-2", order = "e[t2]-a[logistic-science-pack]", + icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-2-64.png", --[[ expensive = { enabled = false, @@ -63,19 +63,16 @@ data:extend( enabled = false }, ]]-- - normal = { - enabled = false, - always_show_made_in = true, - ingredients = { - {"sct-t2-instruments", 1}, - {"sct-t2-reaction-nodes", 1} - }, - results = { - {type = "item", amount = 1, name = "logistic-science-pack"} - }, - energy_required = 6, - enabled = false - } + enabled = false, + always_show_made_in = true, + ingredients = { + {type = "item", name = "sct-t2-instruments", amount = 1}, + {type = "item", name = "sct-t2-reaction-nodes", amount = 1} + }, + results = { + {type = "item", amount = 1, name = "logistic-science-pack"} + }, + energy_required = 6, } } ) @@ -103,19 +100,18 @@ data:extend( name = "sct-chemical-science-pack", subgroup = "sct-sciencepack-3", order = "f[t3]-a[chemical-science-pack]", - normal = { - enabled = false, - always_show_made_in = true, - ingredients = { - {"sct-t3-femto-lasers", 1}, - {"sct-t3-atomic-sensors", 1} - }, - results = { - {type = "item", amount = 1, name = "chemical-science-pack"} - }, - energy_required = 10, - enabled = false - } + icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-3-64.png", + + enabled = false, + always_show_made_in = true, + ingredients = { + {type = "item", name = "sct-t3-femto-lasers", amount = 1}, + {type = "item", name = "sct-t3-atomic-sensors", amount = 1} + }, + results = { + {type = "item", amount = 1, name = "chemical-science-pack"} + }, + energy_required = 10, } } ) @@ -138,6 +134,7 @@ data:extend( { type = "recipe", name = "sct-military-science-pack", + icon = "__ScienceCostTweakerM__/graphics/icons/military-science-pack-64.png", --[[ expensive = { enabled = false, @@ -153,19 +150,17 @@ data:extend( enabled = false }, ]]-- - normal = { - enabled = false, - always_show_made_in = true, - ingredients = { - {"sct-mil-circuit3", 1}, - {"sct-mil-plating", 1} - }, - results = { - {type = "item", amount = 2, name = "military-science-pack"} - }, - energy_required = 10, - enabled = false + enabled = false, + always_show_made_in = true, + ingredients = { + {type = "item", name = "sct-mil-circuit3", amount = 1}, + {type = "item", name = "sct-mil-plating", amount = 1} }, + results = { + {type = "item", amount = 2, name = "military-science-pack"} + }, + energy_required = 10, + subgroup = "sct-sciencepack-mil", order = "g[mil]-a[military-science-pack]" } @@ -190,6 +185,7 @@ data:extend( { type = "recipe", name = "sct-production-science-pack", + icon = "__ScienceCostTweakerM__/graphics/icons/production-science-pack-64.png", --[[ expensive = { always_show_made_in = true, @@ -204,18 +200,17 @@ data:extend( enabled = false }, ]]-- - normal = { - always_show_made_in = true, - ingredients = { - {"sct-prod-bioprocessor", 1}, - {"sct-prod-overclocker", 1} - }, - results = { - {type = "item", amount = 2, name = "production-science-pack"} - }, - energy_required = 14, - enabled = false + always_show_made_in = true, + ingredients = { + {type = "item", name = "sct-prod-bioprocessor", amount = 1}, + {type = "item", name = "sct-prod-overclocker", amount = 1} + }, + results = { + {type = "item", amount = 2, name = "production-science-pack"} }, + energy_required = 14, + enabled = false, + subgroup = "sct-sciencepack-prod", order = "h[prod]-a[production-science-pack]" } @@ -240,6 +235,7 @@ data:extend( { type = "recipe", name = "sct-utility-science-pack", + icon = "__ScienceCostTweakerM__/graphics/icons/high-tech-science-pack-64.png", --[[ expensive = { always_show_made_in = true, @@ -255,19 +251,18 @@ data:extend( enabled = false }, ]]-- - normal = { - always_show_made_in = true, - enabled = false, - ingredients = { - {"sct-htech-capbank", 1}, - {"sct-htech-injector", 1}, - {"sct-htech-random", 1} - }, - results = { - {type = "item", amount = 2, name = "utility-science-pack"} - }, - energy_required = 14, + always_show_made_in = true, + enabled = false, + ingredients = { + {type = "item", name = "sct-htech-capbank", amount = 1}, + {type = "item", name = "sct-htech-injector", amount = 1}, + {type = "item", name = "sct-htech-random", amount = 1} + }, + results = { + {type = "item", amount = 2, name = "utility-science-pack"} }, + energy_required = 14, + subgroup = "sct-sciencepack-hightech", order = "i[ht]-a[ht-science-pack]" } @@ -284,11 +279,11 @@ local sctpacks = { -- "sct-space-science-pack", } -for _, stp in pairs(sctpacks) do - data.raw.recipe[stp].expensive = table.deepcopy(data.raw.recipe[stp].normal) -end +-- for _, stp in pairs(sctpacks) do +-- data.raw.recipe[stp].expensive = table.deepcopy(data.raw.recipe[stp].normal) +-- end if settings.startup["sct-military"].value == "tier3" then - data.raw.recipe["sct-military-science-pack"].normal.energy_required = 14 - data.raw.recipe["sct-military-science-pack"].expensive.energy_required = 14 + data.raw.recipe["sct-military-science-pack"].energy_required = 14 + --data.raw.recipe["sct-military-science-pack"].expensive.energy_required = 14 end diff --git a/prototypes/technologies/labs.lua b/prototypes/technologies/labs.lua index 02ffb51..4e40b34 100644 --- a/prototypes/technologies/labs.lua +++ b/prototypes/technologies/labs.lua @@ -5,14 +5,15 @@ data:extend({ { type = "technology", name = "sct-lab-t1", - icon_size = 128, icons = { { icon = "__ScienceCostTweakerM__/graphics/sct-lab-t1/icon-128.png", + icon_size = 128, }, { icon = "__ScienceCostTweakerM__/graphics/overlays/1-128.png", + icon_size = 128, }, }, effects = @@ -50,14 +51,16 @@ data:extend({ { type = "technology", name = "sct-lab-t2", - icon_size = 128, + icons = { { icon = "__ScienceCostTweakerM__/graphics/sct-lab-t2/icon-128.png", + icon_size = 128, }, { icon = "__ScienceCostTweakerM__/graphics/overlays/2-128.png", + icon_size = 128, }, }, effects = @@ -99,14 +102,16 @@ data:extend({ { type = "technology", name = "sct-lab-t3", - icon_size = 128, + icons = { { icon = "__ScienceCostTweakerM__/graphics/sct-lab-t3/icon-128.png", + icon_size = 128, }, { icon = "__ScienceCostTweakerM__/graphics/overlays/3-128.png", + icon_size = 128, }, }, effects = @@ -173,14 +178,16 @@ data:extend({ { type = "technology", name = "sct-lab-t4", - icon_size = 128, + icons = { { icon = "__ScienceCostTweakerM__/graphics/sct-lab-t4/icon-128.png", + icon_size = 128, }, { icon = "__ScienceCostTweakerM__/graphics/overlays/4-128.png", + icon_size = 128, }, }, effects = @@ -205,9 +212,9 @@ data:extend({ prerequisites = { -- "chemical-science-pack", - "advanced-electronics-2", + "processing-unit", "uranium-processing", - "stack-inserter", + "bulk-inserter", "low-density-structure" }, unit = diff --git a/prototypes/technologies/sciencepacks.lua b/prototypes/technologies/sciencepacks.lua index 2f50891..9b4f735 100644 --- a/prototypes/technologies/sciencepacks.lua +++ b/prototypes/technologies/sciencepacks.lua @@ -7,6 +7,7 @@ data:extend({ name = "sct-automation-science-pack", icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-1-128.png", icon_size = 128, + essential = true, effects = { { @@ -45,6 +46,7 @@ data:extend({ name = "sct-logistic-science-pack", icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-2-128.png", icon_size = 128, + essential = true, effects = { --[[ @@ -97,6 +99,7 @@ data:extend({ name = "sct-chemical-science-pack", icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-3-128.png", icon_size = 128, + essential = true, effects = { --[[ @@ -113,7 +116,7 @@ data:extend({ prerequisites = { "sct-lab-t3", - "advanced-electronics" + "advanced-circuit" }, unit = { @@ -134,6 +137,7 @@ data:extend({ name = "sct-military-science-pack", icon = "__ScienceCostTweakerM__/graphics/icons/military-science-pack-128.png", icon_size = 128, + essential = true, effects = { --[[ @@ -194,7 +198,8 @@ data:extend({ type = "technology", name = "sct-production-science-pack", icon = "__ScienceCostTweakerM__/graphics/icons/production-science-pack-128.png", - icon_size = 128, + icon_size = 128, + essential = true, effects = { --[[ @@ -234,7 +239,7 @@ data:extend({ -- "chemical-science-pack", "circuit-network", "advanced-material-processing-2", - "advanced-electronics-2", + "processing-unit", "advanced-oil-processing" -- "sct-lab-t4", }, @@ -259,6 +264,7 @@ data:extend({ name = "sct-utility-science-pack", icon = "__ScienceCostTweakerM__/graphics/icons/high-tech-science-pack-128.png", icon_size = 128, + essential = true, effects = { --[[ @@ -313,6 +319,7 @@ data:extend({ name = "sct-space-science-pack", icon = "__ScienceCostTweakerM__/graphics/icons/space-science-pack-128.png", icon_size = 128, + essential = true, effects = { --[[ @@ -349,7 +356,7 @@ data:extend({ -- military tech dependencies, based on settings if settings.startup["sct-military"].value == "tier2" then - sctm.tech_dependency_add("sct-military-science-pack", "advanced-electronics") + sctm.tech_dependency_add("sct-military-science-pack", "advanced-circuit") else -- tier 3.5 -- after blue, but does not require t4 lab sctm.tech_dependency_add("sct-military-science-pack", "chemical-science-pack") diff --git a/sctmlib.lua b/sctmlib.lua index 5a5584b..0704365 100644 --- a/sctmlib.lua +++ b/sctmlib.lua @@ -90,18 +90,18 @@ function sctm.tech_dependency_remove(techname, depname) if data.raw.technology[techname] then local tech = data.raw.technology[techname] local hasdiff = false - if tech.normal then - if tech.normal.prerequisites then - removed = removeprereq(tech.normal.prerequisites, depname) - hasdiff = true - end - end - if tech.expensive then - if tech.expensive.prerequisites then - removed = removeprereq(tech.expensive.prerequisites, depname) or removed - hasdiff = true - end - end + -- if tech.normal then + -- if tech.normal.prerequisites then + -- removed = removeprereq(tech.normal.prerequisites, depname) + -- hasdiff = true + -- end + -- end + -- if tech.expensive then + -- if tech.expensive.prerequisites then + -- removed = removeprereq(tech.expensive.prerequisites, depname) or removed + -- hasdiff = true + -- end + -- end if not hasdiff and tech.prerequisites then removed = removeprereq(tech.prerequisites, depname) or removed end @@ -137,20 +137,20 @@ function sctm.tech_dependency_add(techname, depname, hidden) data.raw.technology[depname] and (data.raw.technology[depname].enabled or true) and (not (data.raw.technology[depname].hidden or false) or addhidden) then local tech = data.raw.technology[techname] local hasdiff = false - if tech.normal then - if not tech.normal.prerequisites then - tech.normal.prerequisites = {} - end - added = addprereq(tech.normal.prerequisites, depname) - hasdiff = true - end - if tech.expensive then - if not tech.expensive.prerequisites then - tech.expensive.prerequisites = {} - end - added = addprereq(tech.expensive.prerequisites, depname) or added - hasdiff = true - end + -- if tech.normal then + -- if not tech.normal.prerequisites then + -- tech.normal.prerequisites = {} + -- end + -- added = addprereq(tech.normal.prerequisites, depname) + -- hasdiff = true + -- end + -- if tech.expensive then + -- if not tech.expensive.prerequisites then + -- tech.expensive.prerequisites = {} + -- end + -- added = addprereq(tech.expensive.prerequisites, depname) or added + -- hasdiff = true + -- end if not hasdiff then if not tech.prerequisites then tech.prerequisites = {} @@ -173,16 +173,16 @@ function sctm.tech_dependency_get(techname) sctm.debug("retrieving dps for " .. techname) if data.raw.technology[techname] then local tech = data.raw.technology[techname] - if tech.normal and tech.normal.prerequisites then - for _i, prereq in pairs(tech.normal.prerequisites) do - table.insert(deps, prereq) - end - end - if tech.expensive and tech.expensive.prerequisites then - for _i, prereq in pairs(tech.expensive.prerequisites) do - table.insert(deps, prereq) - end - end + -- if tech.normal and tech.normal.prerequisites then + -- for _i, prereq in pairs(tech.normal.prerequisites) do + -- table.insert(deps, prereq) + -- end + -- end + -- if tech.expensive and tech.expensive.prerequisites then + -- for _i, prereq in pairs(tech.expensive.prerequisites) do + -- table.insert(deps, prereq) + -- end + -- end if tech.prerequisites then for _i, prereq in pairs(tech.prerequisites) do table.insert(deps, prereq) @@ -212,18 +212,18 @@ function sctm.tech_pack_remove(techname, packname) if data.raw.technology[techname] then local tech = data.raw.technology[techname] local hasdiff = false - if tech.normal then - if tech.normal.unit and tech.normal.unit.ingredients then - removed = rempack(tech.normal.unit.ingredients, packname) - end - hasdiff = true - end - if tech.expensive then - if tech.expensive.unit and tech.expensive.unit.ingredients then - removed = rempack(tech.expensive.unit.ingredients, packname) or removed - end - hasdiff = true - end + -- if tech.normal then + -- if tech.normal.unit and tech.normal.unit.ingredients then + -- removed = rempack(tech.normal.unit.ingredients, packname) + -- end + -- hasdiff = true + -- end + -- if tech.expensive then + -- if tech.expensive.unit and tech.expensive.unit.ingredients then + -- removed = rempack(tech.expensive.unit.ingredients, packname) or removed + -- end + -- hasdiff = true + -- end if not hasdiff then if tech.unit and tech.unit.ingredients then removed = rempack(tech.unit.ingredients, packname) @@ -251,7 +251,7 @@ local function addpack(ingredientstable, newpack) ingredientstable[ingredientsize + 1] = newpack added = true end - return addedd + return added end function sctm.tech_pack_add(techname, packnormal, packexpensive) @@ -265,24 +265,24 @@ function sctm.tech_pack_add(techname, packnormal, packexpensive) if data.raw.technology[techname] and data.raw.tool[normal[1]] then local tech = data.raw.technology[techname] local hasdiff = false - if tech.normal then - if tech.normal.unit then - if not tech.normal.unit.ingredients then - tech.normal.ingredients = {} - end - added = addpack(tech.normal.unit.ingredients, normal) - end - hasdiff = true - end - if tech.expensive then - if tech.expensive.unit then - if not tech.expensive.unit.ingredients then - tech.expensive.unit.ingredients = {} - end - added = addpack(tech.expensive.unit.ingredients, expensive) or added - end - hasdiff = true - end + -- if tech.normal then + -- if tech.normal.unit then + -- if not tech.normal.unit.ingredients then + -- tech.normal.ingredients = {} + -- end + -- added = addpack(tech.normal.unit.ingredients, normal) + -- end + -- hasdiff = true + -- end + -- if tech.expensive then + -- if tech.expensive.unit then + -- if not tech.expensive.unit.ingredients then + -- tech.expensive.unit.ingredients = {} + -- end + -- added = addpack(tech.expensive.unit.ingredients, expensive) or added + -- end + -- hasdiff = true + -- end if not hasdiff or not added then if tech.unit then if not tech.unit.ingredients then @@ -324,18 +324,18 @@ function sctm.tech_pack_replace(techname, oldpackname, newpackname) if data.raw.technology[techname] and data.raw.tool[newpackname] then local tech = data.raw.technology[techname] local hasdiff = false - if tech.normal then - if tech.normal.unit and tech.normal.unit.ingredients then - replaced = replacepack(tech.normal.unit.ingredients, oldpackname, newpackname) - end - hasdiff = true - end - if tech.expensive then - if tech.expensive.unit and tech.expensive.unit.ingredients then - replaced = replacepack(tech.expensive.unit.ingredients, oldpackname, newpackname) or replaced - end - hasdiff = true - end + -- if tech.normal then + -- if tech.normal.unit and tech.normal.unit.ingredients then + -- replaced = replacepack(tech.normal.unit.ingredients, oldpackname, newpackname) + -- end + -- hasdiff = true + -- end + -- if tech.expensive then + -- if tech.expensive.unit and tech.expensive.unit.ingredients then + -- replaced = replacepack(tech.expensive.unit.ingredients, oldpackname, newpackname) or replaced + -- end + -- hasdiff = true + -- end if not hasdiff or not replaced then if tech.unit and tech.unit.ingredients then replaced = replacepack(tech.unit.ingredients, oldpackname, newpackname) @@ -372,20 +372,20 @@ function sctm.tech_unlock_add(techname, recipename) if data.raw.recipe[recipename] and data.raw.technology[techname] then local tech = data.raw.technology[techname] local hasdiff = false - if tech.normal then - if not tech.normal.effects then - tech.normal.effects = {} - end - addunlock(tech.normal.effects, recipename) - hasdiff = true - end - if tech.expensive then - if not tech.expensive.effects then - tech.expensive.effects = {} - end - addunlock(tech.expensive.effects, recipename) - hasdiff = true - end + -- if tech.normal then + -- if not tech.normal.effects then + -- tech.normal.effects = {} + -- end + -- addunlock(tech.normal.effects, recipename) + -- hasdiff = true + -- end + -- if tech.expensive then + -- if not tech.expensive.effects then + -- tech.expensive.effects = {} + -- end + -- addunlock(tech.expensive.effects, recipename) + -- hasdiff = true + -- end if not hasdiff then if not tech.effects then tech.effects = {} @@ -419,18 +419,18 @@ function sctm.tech_unlock_remove(techname, recipename) if data.raw.technology[techname] then local tech = data.raw.technology[techname] local hasdiff = false - if tech.normal then - if tech.normal.effects then - removed = removeunlock(tech.normal.effects, recipename) - end - hasdiff = true - end - if tech.expensive then - if tech.expensive.effects then - removed = removeunlock(tech.expensive.effects, recipename) or removed - end - hasdiff = true - end + -- if tech.normal then + -- if tech.normal.effects then + -- removed = removeunlock(tech.normal.effects, recipename) + -- end + -- hasdiff = true + -- end + -- if tech.expensive then + -- if tech.expensive.effects then + -- removed = removeunlock(tech.expensive.effects, recipename) or removed + -- end + -- hasdiff = true + -- end if not hasdiff then if tech.effects then removed = removeunlock(tech.effects, recipename) @@ -473,18 +473,18 @@ function sctm.tech_remove_known_packs(techname, packlist) if data.raw.technology[techname] then local hasdif = false local tech = data.raw.technology[techname] - if tech.expensive then - hasdif = true - if tech.expensive.effects and table_size(tech.expensive.effects) then - removed = removeknownpacks(tech.expensive.effects, packlist, techname) - end - end - if tech.normal then - hasdif = true - if tech.normal.effects and table_size(tech.normal.effects) then - removed = removeknownpacks(tech.normal.effects, packlist, techname) and removed - end - end + -- if tech.expensive then + -- hasdif = true + -- if tech.expensive.effects and table_size(tech.expensive.effects) then + -- removed = removeknownpacks(tech.expensive.effects, packlist, techname) + -- end + -- end + -- if tech.normal then + -- hasdif = true + -- if tech.normal.effects and table_size(tech.normal.effects) then + -- removed = removeknownpacks(tech.normal.effects, packlist, techname) and removed + -- end + -- end if not hasdif and tech.effects and table_size(tech.effects) then removed = removeknownpacks(tech.effects, packlist, techname) end @@ -556,21 +556,25 @@ function sctm.recipe_ingredient_remove(recipename, ingredientname) if data.raw.recipe[recipename] then local recipe = data.raw.recipe[recipename] local hasdiff = false - if recipe.normal then - if recipe.normal.ingredients then - removed = removeingredient(recipe.normal.ingredients, ingredientname) - end - hasdiff = true - end - if recipe.expensive then - if recipe.expensive.ingredients then - removed = removeingredient(recipe.expensive.ingredients, ingredientname) or removed - end - hasdiff = true - end + -- if recipe.normal then + -- if recipe.normal.ingredients then + -- removed = removeingredient(recipe.normal.ingredients, ingredientname) + -- end + -- hasdiff = true + -- end + -- if recipe.expensive then + -- if recipe.expensive.ingredients then + -- removed = removeingredient(recipe.expensive.ingredients, ingredientname) or removed + -- end + -- hasdiff = true + -- end if not hasdiff then if recipe.ingredients then removed = removeingredient(recipe.ingredients, ingredientname) + if not removed then + log("Warning: removeingredient: ingredient " .. ingredientname .. " not found in recipe " .. recipename) + log(debug.traceback()) + end end end end @@ -609,20 +613,20 @@ function sctm.recipe_ingredient_add(recipename, ingredientnormal, ingredientexpe if data.raw.recipe[recipename] and (data.raw.item[normal.name] or data.raw.fluid[normal.name]) and (data.raw.item[expensive.name] or data.raw.fluid[expensive.name]) then local recipe = data.raw.recipe[recipename] local hasdiff = false - if recipe.normal then - if not recipe.normal.ingredients then - recipe.normal.ingredients = {} - end - added = addingredient(recipe.normal.ingredients, normal) - hasdiff = true - end - if recipe.expensive then - if not recipe.expensive.ingredients then - recipe.expensive.ingredients = {} - end - added = addingredient(recipe.expensive.ingredients, expensive) or added - hasdiff = true - end + -- if recipe.normal then + -- if not recipe.normal.ingredients then + -- recipe.normal.ingredients = {} + -- end + -- added = addingredient(recipe.normal.ingredients, normal) + -- hasdiff = true + -- end + -- if recipe.expensive then + -- if not recipe.expensive.ingredients then + -- recipe.expensive.ingredients = {} + -- end + -- added = addingredient(recipe.expensive.ingredients, expensive) or added + -- hasdiff = true + -- end if not hasdiff then if not recipe.ingredients then recipe.ingredients = {} @@ -687,19 +691,19 @@ function sctm.recipe_ingredient_replace(recipename, oldingredientnormal, newingr end if data.raw.recipe[recipename] and (data.raw.item[normal.name] or data.raw.fluid[normal.name]) and (data.raw.item[expensive.name] or data.raw.fluid[expensive.name]) then local recipe = data.raw.recipe[recipename] - local hasdiff = false - if recipe.normal then - if recipe.normal.ingredients then - replaced = replaceingredient(recipe.normal.ingredients, oldnormal, normal) - end - hasdiff = true - end - if recipe.expensive then - if recipe.expensive.ingredients then - replaced = replaceingredient(recipe.expensive.ingredients, oldexpensive, expensive) or replaced - end - hasdiff = true - end + local hasdiff = false -- TODO: remove this var and if + -- if recipe.normal then + -- if recipe.normal.ingredients then + -- replaced = replaceingredient(recipe.normal.ingredients, oldnormal, normal) + -- end + -- hasdiff = true + -- end + -- if recipe.expensive then + -- if recipe.expensive.ingredients then + -- replaced = replaceingredient(recipe.expensive.ingredients, oldexpensive, expensive) or replaced + -- end + -- hasdiff = true + -- end if not hasdiff then if recipe.ingredients then replaced = replaceingredient(recipe.ingredients, oldnormal, normal) @@ -764,18 +768,18 @@ function sctm.recipe_result_replace(recipename, oldresultnormal, newresultnormal if data.raw.recipe[recipename] and (data.raw.item[normal.name] or data.raw.fluid[normal.name]) and (data.raw.item[expensive.name] or data.raw.fluid[expensive.name]) then local recipe = data.raw.recipe[recipename] local hasdiff = false - if recipe.normal then - if recipe.normal.results then - replaced = replaceresult(recipe.normal.results, oldnormal, normal) - end - hasdiff = true - end - if recipe.expensive then - if recipe.expensive.results then - replaced = replaceresult(recipe.expensive.results, oldexpensive, expensive) or replaced - end - hasdiff = true - end + -- if recipe.normal then + -- if recipe.normal.results then + -- replaced = replaceresult(recipe.normal.results, oldnormal, normal) + -- end + -- hasdiff = true + -- end + -- if recipe.expensive then + -- if recipe.expensive.results then + -- replaced = replaceresult(recipe.expensive.results, oldexpensive, expensive) or replaced + -- end + -- hasdiff = true + -- end if not hasdiff then if recipe.results then replaced = replaceresult(recipe.results, oldnormal, normal) @@ -859,16 +863,17 @@ end function sctm.hide_recipe(recipe_name) r = data.raw.recipe[recipe_name] if r then - if not r.normal and not r.expensive then - r.hidden = true - else - if r.normal then - r.normal.hidden = true - end - if r.expensive then - r.expensive.hidden = true - end - end + -- if not r.normal and not r.expensive then + -- r.hidden = true + -- else + -- if r.normal then + -- r.normal.hidden = true + -- end + -- if r.expensive then + -- r.expensive.hidden = true + -- end + -- end + r.hidden = true end end diff --git a/tweaks/aai/1_update.lua b/tweaks/aai/1_update.lua index 4026232..d88671c 100644 --- a/tweaks/aai/1_update.lua +++ b/tweaks/aai/1_update.lua @@ -6,7 +6,7 @@ if mods["aai-industry"] then "electricity", "basic-fluid-handling", "electric-mining", - "fuel-processing", + "fuel-processing", } if mods["omnimatter_water"] then aaitech0[#aaitech0+1] = "omniwaste" diff --git a/tweaks/aai/science_aai.lua b/tweaks/aai/science_aai.lua index f19d304..776f5aa 100644 --- a/tweaks/aai/science_aai.lua +++ b/tweaks/aai/science_aai.lua @@ -40,31 +40,28 @@ if mods["aai-industry"] then name = "sct-t0-crate", subgroup = "sct-science-pack-0", order = "d[t0]-b[crate]", - expensive = + -- expensive = + -- { + -- enabled = true, + -- energy_required = 2, + -- ingredients = + -- { + -- {type="item", name="stone", amount=4}, + -- }, + -- results = + -- { + -- {type="item", name="sct-t0-crate", amount=1}, + -- }, + -- }, + enabled = true, + energy_required = 1, + ingredients = { - enabled = true, - energy_required = 2, - ingredients = - { - {type="item", name="stone", amount=4}, - }, - results = - { - {type="item", name="sct-t0-crate", amount=1}, - }, + {type="item", name="stone", amount=2}, }, - normal = + results = { - enabled = true, - energy_required = 1, - ingredients = - { - {type="item", name="stone", amount=2}, - }, - results = - { - {type="item", name="sct-t0-crate", amount=1}, - }, + {type="item", name="sct-t0-crate", amount=1}, }, }, @@ -73,33 +70,30 @@ if mods["aai-industry"] then name = "sct-t0-solvent", subgroup = "sct-science-pack-0", order = "d[t0]-c[solvent]", - expensive = + -- expensive = + -- { + -- enabled = true, + -- energy_required = 2.5, + -- ingredients = + -- { + -- {type="item", name="iron-ore", amount=3}, + -- {type="item", name="wood", amount=4}, + -- }, + -- results = + -- { + -- {type="item", name="sct-t0-solvent", amount=1}, + -- }, + -- }, + enabled = true, + energy_required = 1, + ingredients = { - enabled = true, - energy_required = 2.5, - ingredients = - { - {type="item", name="iron-ore", amount=3}, - {type="item", name="wood", amount=4}, - }, - results = - { - {type="item", name="sct-t0-solvent", amount=1}, - }, + {type="item", name="iron-ore", amount=2}, + {type="item", name="wood", amount=2}, }, - normal = + results = { - enabled = true, - energy_required = 1, - ingredients = - { - {type="item", name="iron-ore", amount=2}, - {type="item", name="wood", amount=2}, - }, - results = - { - {type="item", name="sct-t0-solvent", amount=1}, - }, + {type="item", name="sct-t0-solvent", amount=1}, }, }, }) @@ -130,35 +124,32 @@ if mods["aai-industry"] then name = "sct-science-pack-0", subgroup = "sct-science-pack-0", order = "d[t0]-a[pack]", - expensive = + -- expensive = + -- { + -- enabled = true, + -- always_show_made_in = true, + -- energy_required = 3, + -- ingredients = + -- { + -- {type="item", name="sct-t0-crate", amount=2}, + -- {type="item", name="sct-t0-solvent", amount=2}, + -- }, + -- results = + -- { + -- {type="item", name="sct-science-pack-0", amount=4}, + -- }, + -- }, + enabled = true, + always_show_made_in = true, + energy_required = 3, + ingredients = { - enabled = true, - always_show_made_in = true, - energy_required = 3, - ingredients = - { - {type="item", name="sct-t0-crate", amount=2}, - {type="item", name="sct-t0-solvent", amount=2}, - }, - results = - { - {type="item", name="sct-science-pack-0", amount=4}, - }, + {type="item", name="sct-t0-crate", amount=2}, + {type="item", name="sct-t0-solvent", amount=2}, }, - normal = + results = { - enabled = true, - always_show_made_in = true, - energy_required = 3, - ingredients = - { - {type="item", name="sct-t0-crate", amount=2}, - {type="item", name="sct-t0-solvent", amount=2}, - }, - results = - { - {type="item", name="sct-science-pack-0", amount=4}, - }, + {type="item", name="sct-science-pack-0", amount=4}, }, }, }) diff --git a/tweaks/angelsmods/0_initial.lua b/tweaks/angelsmods/0_initial.lua index 8522d6f..42eb5c4 100644 --- a/tweaks/angelsmods/0_initial.lua +++ b/tweaks/angelsmods/0_initial.lua @@ -4,15 +4,15 @@ if mods["angelsbioprocessing"] then sctm.lab_input_add("sct-lab-t3", "sct-bio-science-pack") sctm.lab_input_add("sct-lab-t4", "sct-bio-science-pack") - angelsmods.triggers.paper = true + angelsmods.trigger.paper = true angelsmods.trigger.water_red_waste = true end -if mods["angelsindustries"] and angelsmods.industries.components then +if mods["angelsindustries"] and angelsmods.industries.components then -- TODO : test with angelsindustries sctm.tech_dependency_add("angels-components-mechanical-1", "sct-automation-science-pack") sctm.tech_dependency_add("angels-components-weapons-basic", "sct-automation-science-pack") sctm.tech_dependency_add("angels-solder-smelting-basic", "sct-automation-science-pack") - sctm.tech_dependency_add("water-treatment", "sct-automation-science-pack") + sctm.tech_dependency_add("angels-water-treatment", "sct-automation-science-pack") -- Remove mixed waste processing as it will already have been unlocked with Military Science sctm.tech_unlock_remove("sct-production-science-pack", "sct-waste-processing-mixed") sctm.tech_unlock_remove("sct-utility-science-pack", "sct-waste-processing-mixed") diff --git a/tweaks/angelsmods/1_update.lua b/tweaks/angelsmods/1_update.lua index b7ab69d..cc162fb 100644 --- a/tweaks/angelsmods/1_update.lua +++ b/tweaks/angelsmods/1_update.lua @@ -1,10 +1,7 @@ if mods["angelsbioprocessing"] then - sctm.tech_dependency_add("bio-temperate-farming", "sct-bio-science-pack") - sctm.tech_dependency_add("bio-swamp-farming", "sct-bio-science-pack") - sctm.tech_dependency_add("bio-desert-farming", "sct-bio-science-pack") - sctm.lab_input_add("lab-2", "sct-bio-science-pack") - if mods["bobmodules"] and settings.startup["bobmods-modules-enable-modules-lab"] and settings.startup["bobmods-modules-enable-modules-lab"].value then - sctm.lab_input_add("lab-module", "sct-bio-science-pack") - end + sctm.tech_dependency_add("angels-bio-temperate-farming", "sct-bio-science-pack") + sctm.tech_dependency_add("angels-bio-swamp-farming", "sct-bio-science-pack") + sctm.tech_dependency_add("angels-bio-desert-farming", "sct-bio-science-pack") + sctm.lab_input_add("bob-lab-2", "sct-bio-science-pack") sctm.tech_dependency_add("sct-lab-t3", "angels-oil-processing") end diff --git a/tweaks/angelsmods/2_final.lua b/tweaks/angelsmods/2_final.lua index f327397..79f0862 100644 --- a/tweaks/angelsmods/2_final.lua +++ b/tweaks/angelsmods/2_final.lua @@ -1,25 +1,25 @@ -- remove angels bio token from lab if mods["angelsbioprocessing"] then - if data.raw.tool["token-bio"] or data.raw.recipe["token-bio"] then + if data.raw.tool["angels-token-bio"] or data.raw.recipe["angels-token-bio"] then for _i, lab in pairs(data.raw["lab"]) do - sctm.lab_input_remove(_i, "token-bio") + sctm.lab_input_remove(_i, "angels-token-bio") end - if data.raw.tool["token-bio"] then - data.raw.tool["token-bio"].order = "d_a[bio]-e[token-bio]" - data.raw.tool["token-bio"].subgroup = "sct-bio-science-pack" + if data.raw.tool["angels-token-bio"] then + data.raw.tool["angels-token-bio"].order = "d_a[bio]-e[token-bio]" + data.raw.tool["angels-token-bio"].subgroup = "sct-bio-science-pack" end - if data.raw.recipe["token-bio"] then - data.raw.recipe["token-bio"].order = "d_a[bio]-e[token-bio]" - data.raw.recipe["token-bio"].subgroup = "sct-bio-science-pack" + if data.raw.recipe["angels-token-bio"] then + data.raw.recipe["angels-token-bio"].order = "d_a[bio]-e[token-bio]" + data.raw.recipe["angels-token-bio"].subgroup = "sct-bio-science-pack" end -- replace token-bio with bio science pack for i, tech in pairs(data.raw.technology) do - sctm.tech_pack_replace(tech.name, "token-bio", "sct-bio-science-pack") + sctm.tech_pack_replace(tech.name, "angels-token-bio", "sct-bio-science-pack") end end end if mods["angelsindustries"] and angelsmods.industries.components then - sctm.recipe_ingredient_replace("sct-htech-capbank", "steel-gear-wheel", {name = "grate-steel", amount = 5}) - sctm.recipe_ingredient_replace("sct-htech-random", "titanium-gear-wheel", "angels-spring") + sctm.recipe_ingredient_replace("sct-htech-capbank", "bob-steel-gear-wheel", {name = "grate-steel", amount = 5}) + sctm.recipe_ingredient_replace("sct-htech-random", "bob-titanium-gear-wheel", "angels-spring") end diff --git a/tweaks/angelsmods/science_angels.lua b/tweaks/angelsmods/science_angels.lua index d3c5554..1fb3c49 100644 --- a/tweaks/angelsmods/science_angels.lua +++ b/tweaks/angelsmods/science_angels.lua @@ -63,35 +63,35 @@ if mods["angelsbioprocessing"] then name = "sct-bio-science-pack", subgroup = "sct-bio-science-pack", order = "d_a[bio]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-bio-science-pack-64.png", + icon_size = 64, + -- expensive = + -- { + -- enabled = false, + -- always_show_made_in = true, + -- energy_required = 5, + -- ingredients = + -- { + -- {"sct-bio-ground-sample", 1}, + -- {"angels-token-bio", 1}, + -- }, + -- results = + -- { + -- {type="item", name="sct-bio-science-pack", amount=1}, + -- }, + -- }, + + enabled = false, + always_show_made_in = true, + energy_required = 5, + ingredients = { - enabled = false, - always_show_made_in = true, - energy_required = 5, - ingredients = - { - {"sct-bio-ground-sample", 1}, - {"token-bio", 1}, - }, - results = - { - {type="item", name="sct-bio-science-pack", amount=1}, - }, + {type = "item", name = "sct-bio-ground-sample", amount = 1}, + {type = "item", name = "angels-token-bio", amount = 1}, }, - normal = + results = { - enabled = false, - always_show_made_in = true, - energy_required = 5, - ingredients = - { - {"sct-bio-ground-sample", 1}, - {"token-bio", 1}, - }, - results = - { - {type="item", name="sct-bio-science-pack", amount=1}, - }, + {type="item", name="sct-bio-science-pack", amount=1}, }, }, @@ -100,33 +100,32 @@ if mods["angelsbioprocessing"] then name = "sct-bio-ground-sample", subgroup = "sct-bio-science-pack", order = "d_a[bio]-b[groundsample]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-bio-ground-sample.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 10, + -- ingredients = + -- { + -- {"sct-bio-sample-scaffold", 2}, + -- {"sct-bio-sample-filling", 1}, + -- }, + -- results = + -- { + -- {type="item", name="sct-bio-ground-sample", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 5, + ingredients = { - enabled = false, - energy_required = 10, - ingredients = - { - {"sct-bio-sample-scaffold", 2}, - {"sct-bio-sample-filling", 1}, - }, - results = - { - {type="item", name="sct-bio-ground-sample", amount=1}, - }, + {type = "item", name = "sct-bio-sample-scaffold", amount = 1}, + {type = "item", name = "sct-bio-sample-filling", amount = 1}, }, - normal = + results = { - enabled = false, - energy_required = 5, - ingredients = - { - {"sct-bio-sample-scaffold", 1}, - {"sct-bio-sample-filling", 1}, - }, - results = - { - {type="item", name="sct-bio-ground-sample", amount=1}, - }, + {type="item", name="sct-bio-ground-sample", amount=1}, }, }, @@ -135,33 +134,32 @@ if mods["angelsbioprocessing"] then name = "sct-bio-sample-scaffold", subgroup = "sct-bio-science-pack", order = "d_a[bio]-c[scaffold]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-bio-sample-scaffold.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"wood", 2}, + -- {"angels-solid-paper", 4}, + -- }, + -- results = + -- { + -- {type="item", name="sct-bio-sample-scaffold", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"wood", 2}, - {"solid-paper", 4}, - }, - results = - { - {type="item", name="sct-bio-sample-scaffold", amount=1}, - }, + {type = "item", name = "wood", amount = 1}, + {type = "item", name = "angels-solid-paper", amount = 2}, }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"wood", 1}, - {"solid-paper", 2}, - }, - results = - { - {type="item", name="sct-bio-sample-scaffold", amount=1}, - }, + {type="item", name="sct-bio-sample-scaffold", amount=1}, }, }, @@ -170,36 +168,35 @@ if mods["angelsbioprocessing"] then name = "sct-bio-sample-filling", subgroup = "sct-bio-science-pack", order = "d_a[bio]-d[filling]", - category = "liquifying", - expensive = + category = "angels-liquifying", + icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-bio-sample-filling.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"angels-solid-soil", 2}, + -- {"angels-solid-compost", 4}, + -- {type="fluid", name="water", amount=200}, + -- }, + -- results = + -- { + -- {type="item", name="sct-bio-sample-filling", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"solid-soil", 2}, - {"solid-compost", 4}, - {type="fluid", name="water", amount=200}, - }, - results = - { - {type="item", name="sct-bio-sample-filling", amount=1}, - }, + {type = "item", name = "angels-solid-soil", amount = 1}, + {type = "item", name = "angels-solid-compost", amount = 2}, + {type="fluid", name="water", amount=100}, }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"solid-soil", 1}, - {"solid-compost", 2}, - {type="fluid", name="water", amount=100}, - }, - results = - { - {type="item", name="sct-bio-sample-filling", amount=1}, - }, + {type="item", name="sct-bio-sample-filling", amount=1}, }, }, }) @@ -232,16 +229,16 @@ if mods["angelsbioprocessing"] then }, prerequisites = { - "gardens", - "bio-paper-1", + "angels-gardens", + "angels-bio-paper-1", }, unit = { count = 60, ingredients = { - { type = "item", name = "automation-science-pack", amount = 1 }, - { type = "item", name = "logistic-science-pack", amount = 1 }, + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, }, time = 20, }, diff --git a/tweaks/bobsmods/0_initial.lua b/tweaks/bobsmods/0_initial.lua index 80b960a..950de0f 100644 --- a/tweaks/bobsmods/0_initial.lua +++ b/tweaks/bobsmods/0_initial.lua @@ -2,7 +2,6 @@ require("science_bobmods_logistic") require("science_bobmods_tech") require("science_bobmods_alien") require("science_bobmods_burner") -require("science_bobmods_modules") if mods["bobtech"] then -- bobtech renames logistic science to transport science. @@ -10,16 +9,16 @@ if mods["bobtech"] then data.raw.tool["logistic-science-pack"].localised_name = nil data.raw.technology["logistic-science-pack"].localised_name = nil - if data.raw.tool["advanced-logistic-science-pack"] then - data.raw.tool["advanced-logistic-science-pack"].localised_name = nil + if data.raw.tool["bob-advanced-logistic-science-pack"] then + data.raw.tool["bob-advanced-logistic-science-pack"].localised_name = nil end end if mods["bobplates"] then -- Production Science Pack: -- ============================= - if data.raw.item["silicon"] then - sctm.recipe_ingredient_replace("sct-prod-biosilicate", "stone", {type="item", name="silicon", amount = 2}) - sctm.tech_dependency_add("advanced-material-processing-2", "silicon-processing") + if data.raw.item["bob-silicon-plate"] then + sctm.recipe_ingredient_replace("sct-prod-biosilicate", "stone", {type="item", name="bob-silicon-plate", amount = 2}) + sctm.tech_dependency_add("advanced-material-processing-2", "bob-silicon-processing") end end diff --git a/tweaks/bobsmods/1_update.lua b/tweaks/bobsmods/1_update.lua index 1d54a49..75b2d37 100644 --- a/tweaks/bobsmods/1_update.lua +++ b/tweaks/bobsmods/1_update.lua @@ -6,18 +6,18 @@ if mods["bobelectronics"] or mods["boblogistics"] or mods["bobplates"] then end if mods["boblibrary"] then - if data.raw["recipe-category"]["electronics"] then - sctm.set_category("sct-t2-instruments", "electronics") - sctm.set_category("sct-t2-wafer-stamp", "electronics") - sctm.set_category("sct-mil-circuit1", "electronics") - sctm.set_category("sct-mil-circuit2", "electronics") - sctm.set_category("sct-mil-circuit3", "electronics") - sctm.set_category("sct-prod-bioprocessor", "electronics") + if data.raw["recipe-category"]["bob-electronics"] then + sctm.set_category("sct-t2-instruments", "bob-electronics") + sctm.set_category("sct-t2-wafer-stamp", "bob-electronics") + sctm.set_category("sct-mil-circuit1", "bob-electronics") + sctm.set_category("sct-mil-circuit2", "bob-electronics") + sctm.set_category("sct-mil-circuit3", "bob-electronics") + sctm.set_category("sct-prod-bioprocessor", "bob-electronics") end - if data.raw["recipe-category"]["electronics-with-fluid"] then - sctm.set_category("sct-prod-overclocker", "electronics-with-fluid") - sctm.set_category("sct-prod-chipcase", "electronics-with-fluid") + if data.raw["recipe-category"]["bob-electronics-with-fluid"] then + sctm.set_category("sct-prod-overclocker", "bob-electronics-with-fluid") + sctm.set_category("sct-prod-chipcase", "bob-electronics-with-fluid") end end @@ -28,302 +28,331 @@ if mods["bobplates"] then sctm.tech_dependency_remove("steel-processing", "sct-automation-science-pack") - sctm.tech_dependency_add("air-compressor-1", "sct-automation-science-pack") - sctm.tech_dependency_add("alloy-processing", "sct-automation-science-pack") - sctm.tech_dependency_add("chemical-processing-1", "sct-automation-science-pack") - sctm.tech_dependency_add("electrolysis-1", "sct-automation-science-pack") - sctm.tech_dependency_add("water-bore-1", "sct-automation-science-pack") + sctm.tech_dependency_add("bob-air-compressor-1", "sct-automation-science-pack") + sctm.tech_dependency_add("bob-alloy-processing", "sct-automation-science-pack") + sctm.tech_dependency_add("bob-chemical-processing-1", "sct-automation-science-pack") + sctm.tech_dependency_add("bob-electrolysis-1", "sct-automation-science-pack") + sctm.tech_dependency_add("bob-water-bore-1", "sct-automation-science-pack") -- Green Science Pack: -- ============================= - if data.raw.item["tin-plate"] then - sctm.recipe_ingredient_replace("sct-t2-instruments", "iron-plate", "tin-plate") + if data.raw.item["bob-tin-plate"] then + sctm.recipe_ingredient_replace("sct-t2-instruments", "iron-plate", "bob-tin-plate") end - if data.raw.item["lead-plate"] then - sctm.recipe_ingredient_replace("sct-t2-micro-wafer", "iron-plate", "lead-plate") + if data.raw.item["bob-lead-plate"] then + sctm.recipe_ingredient_replace("sct-t2-micro-wafer", "iron-plate", "bob-lead-plate") end - if data.raw.item["tinned-copper-cable"] then - sctm.recipe_ingredient_replace("sct-t2-reaction-nodes", "sct-t1-magnet-coils", "tinned-copper-cable") + if data.raw.item["bob-tinned-copper-cable"] then + sctm.recipe_ingredient_replace("sct-t2-reaction-nodes", "sct-t1-magnet-coils", "bob-tinned-copper-cable") end -- Blue Science Pack: -- ============================= - if data.raw.fluid["nitrogen"] then - sctm.recipe_ingredient_replace("sct-t3-femto-lasers", "water", "nitrogen") - sctm.tech_dependency_add("sct-lab-t3", "nitrogen-processing") + if data.raw.fluid["bob-nitrogen"] then + sctm.recipe_ingredient_replace("sct-t3-femto-lasers", "water", "bob-nitrogen") + sctm.tech_dependency_add("sct-lab-t3", "bob-nitrogen-processing") end - if data.raw.item["glass"] and data.raw.item["silver-plate"] then - data.raw.recipe["sct-t3-laser-foci"].normal.ingredients = + if data.raw.item["bob-glass"] and data.raw.item["bob-silver-plate"] then + data.raw.recipe["sct-t3-laser-foci"].ingredients = { {type="item", name="copper-plate", amount=5}, - {type="item", name="glass", amount=8}, - {type="item", name="silver-plate", amount=2} - } - data.raw.recipe["sct-t3-laser-foci"].expensive.ingredients = - { - {type="item", name="copper-plate", amount=10}, - {type="item", name="glass", amount=15}, - {type="item", name="silver-plate", amount=5} + {type="item", name="bob-glass", amount=8}, + {type="item", name="bob-silver-plate", amount=2} } + -- data.raw.recipe["sct-t3-laser-foci"].expensive.ingredients = + -- { + -- {type="item", name="copper-plate", amount=10}, + -- {type="item", name="bob-glass", amount=15}, + -- {type="item", name="bob-silver-plate", amount=5} + -- } if mods["angelssmelting"] then sctm.tech_dependency_add("sct-lab-t3", "angels-silver-smelting-1") elseif mods["angelsrefining"] then - sctm.tech_dependency_add("sct-lab-t3", "lead-processing") + sctm.tech_dependency_add("sct-lab-t3", "bob-lead-processing") end end - if data.raw.item["glass"] then - sctm.recipe_ingredient_replace("sct-t3-sulfur-lightsource", "plastic-bar", "glass") + if data.raw.item["bob-glass"] then + sctm.recipe_ingredient_replace("sct-t3-sulfur-lightsource", "plastic-bar", "bob-glass") sctm.tech_dependency_remove("sct-lab-t3", "plastics") end - if data.raw.item["glass"] and data.raw.item["aluminium-plate"] then - data.raw.recipe["sct-t3-laser-emitter"].normal.ingredients = + if data.raw.item["bob-glass"] and data.raw.item["bob-aluminium-plate"] then + data.raw.recipe["sct-t3-laser-emitter"].ingredients = { {type="item", name="electronic-circuit", amount=6}, {type="item", name="copper-plate", amount=8}, - {type="item", name="glass", amount=4}, - {type="item", name="aluminium-plate", amount=5} + {type="item", name="bob-glass", amount=4}, + {type="item", name="bob-aluminium-plate", amount=5} } - data.raw.recipe["sct-t3-laser-emitter"].normal.results = - { - {type="item", name="sct-t3-laser-emitter", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - } - data.raw.recipe["sct-t3-laser-emitter"].expensive.ingredients = - { - {type="item", name="electronic-circuit", amount=10}, - {type="item", name="copper-plate", amount=15}, - {type="item", name="glass", amount=6}, - {type="item", name="aluminium-plate", amount=10} - } - data.raw.recipe["sct-t3-laser-emitter"].expensive.results = + data.raw.recipe["sct-t3-laser-emitter"].results = { {type="item", name="sct-t3-laser-emitter", amount=1}, {type="item", name="sct-waste-copperonly", amount=1} } + -- data.raw.recipe["sct-t3-laser-emitter"].expensive.ingredients = + -- { + -- {type="item", name="electronic-circuit", amount=10}, + -- {type="item", name="copper-plate", amount=15}, + -- {type="item", name="bob-glass", amount=6}, + -- {type="item", name="bob-aluminium-plate", amount=10} + -- } + -- data.raw.recipe["sct-t3-laser-emitter"].expensive.results = + -- { + -- {type="item", name="sct-t3-laser-emitter", amount=1}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- } if mods["angelssmelting"] then sctm.tech_dependency_add("sct-lab-t3", "angels-aluminium-smelting-1") sctm.tech_dependency_add("sct-lab-t3", "angels-glass-smelting-1") else - sctm.tech_dependency_add("sct-lab-t3", "aluminium-processing") + sctm.tech_dependency_add("sct-lab-t3", "bob-aluminium-processing") end end - if data.raw.item["silver-plate"] and data.raw.item["aluminium-plate"] and data.raw.fluid["nitrogen"] then - data.raw.recipe["sct-t3-atomic-sensors"].normal.ingredients = + if data.raw.item["bob-silver-plate"] and data.raw.item["bob-aluminium-plate"] and data.raw.fluid["bob-nitrogen"] then + data.raw.recipe["sct-t3-atomic-sensors"].ingredients = { {type="item", name="advanced-circuit", amount=1}, - {type="item", name="aluminium-plate", amount=5}, - {type="item", name="silver-plate", amount=2}, + {type="item", name="bob-aluminium-plate", amount=5}, + {type="item", name="bob-silver-plate", amount=2}, {type="item", name="copper-plate", amount=12}, - {type="fluid", name="nitrogen", amount=15} - } - data.raw.recipe["sct-t3-atomic-sensors"].normal.results = - { - {type="item", name="sct-t3-atomic-sensors", amount=1}, - {type="item", name="sct-waste-copperonly", amount=1} - } - data.raw.recipe["sct-t3-atomic-sensors"].expensive.ingredients = - { - {type="item", name="advanced-circuit", amount=1}, - {type="item", name="aluminium-plate", amount=10}, - {type="item", name="silver-plate", amount=5}, - {type="item", name="copper-plate", amount=20}, - {type="fluid", name="nitrogen", amount=30} + {type="fluid", name="bob-nitrogen", amount=15} } - data.raw.recipe["sct-t3-atomic-sensors"].expensive.results = + data.raw.recipe["sct-t3-atomic-sensors"].results = { {type="item", name="sct-t3-atomic-sensors", amount=1}, {type="item", name="sct-waste-copperonly", amount=1} } - sctm.tech_dependency_remove("chemical-science-pack", "alloy-processing-1") + -- data.raw.recipe["sct-t3-atomic-sensors"].expensive.ingredients = + -- { + -- {type="item", name="advanced-circuit", amount=1}, + -- {type="item", name="bob-aluminium-plate", amount=10}, + -- {type="item", name="bob-silver-plate", amount=5}, + -- {type="item", name="copper-plate", amount=20}, + -- {type="fluid", name="bob-nitrogen", amount=30} + -- } + -- data.raw.recipe["sct-t3-atomic-sensors"].expensive.results = + -- { + -- {type="item", name="sct-t3-atomic-sensors", amount=1}, + -- {type="item", name="sct-waste-copperonly", amount=1} + -- } + sctm.tech_dependency_remove("chemical-science-pack", "bob-alloy-processing") end -- Military Science Pack: -- ============================= - if data.raw.item["invar-alloy"] then - sctm.recipe_ingredient_replace("sct-mil-subplating", "iron-plate", { type="item", name="invar-alloy", amount = 0}) - sctm.recipe_ingredient_replace("sct-mil-plating", "iron-plate", { type="item", name="invar-alloy", amount = 0}) + if data.raw.item["bob-invar-alloy"] then + sctm.recipe_ingredient_replace("sct-mil-subplating", "iron-plate", { type="item", name="bob-invar-alloy", amount = 0}) + sctm.recipe_ingredient_replace("sct-mil-plating", "iron-plate", { type="item", name="bob-invar-alloy", amount = 0}) if mods["angelssmelting"] then sctm.tech_dependency_add("sct-military-science-pack", "angels-invar-smelting-1") else - sctm.tech_dependency_add("sct-military-science-pack", "invar-processing") + sctm.tech_dependency_add("sct-military-science-pack", "bob-invar-processing") end end - if data.raw.item["brass-alloy"] then - sctm.recipe_ingredient_replace("sct-mil-subplating", "copper-plate", { type="item", name="brass-alloy", amount = 0}) - sctm.recipe_ingredient_replace("sct-mil-plating", "copper-plate", { type="item", name="brass-alloy", amount = 0}) + if data.raw.item["bob-brass-alloy"] then + sctm.recipe_ingredient_replace("sct-mil-subplating", "copper-plate", { type="item", name="bob-brass-alloy", amount = 0}) + sctm.recipe_ingredient_replace("sct-mil-plating", "copper-plate", { type="item", name="bob-brass-alloy", amount = 0}) if mods["angelssmelting"] then sctm.tech_dependency_add("sct-military-science-pack", "angels-brass-smelting-1") else - sctm.tech_dependency_add("sct-military-science-pack", "zinc-processing") + sctm.tech_dependency_add("sct-military-science-pack", "bob-zinc-processing") end end - if data.raw.item["carbon"] then - sctm.recipe_ingredient_add("sct-mil-circuit3" , { type="item", name="carbon", amount=4 }, { type="item", name="carbon", amount=10 }) - sctm.recipe_ingredient_add("sct-mil-circuit2", { type="item", name="carbon", amount=3 }, { type="item", name="carbon", amount=8 }) --- table.insert(data.raw.recipe["sct-mil-circuit1"].normal.ingredients, { type="item", name="carbon", amount=2 }) --- table.insert(data.raw.recipe["sct-mil-circuit1"].expensive.ingredients, { type="item", name="carbon", amount=5 }) - sctm.recipe_ingredient_replace("sct-mil-circuit1", "coal", { type="item", name="carbon", amount=0 }) + if data.raw.item["bob-carbon"] then + sctm.recipe_ingredient_add("sct-mil-circuit3" , { type="item", name="bob-carbon", amount=4 }, { type="item", name="bob-carbon", amount=10 }) + sctm.recipe_ingredient_add("sct-mil-circuit2", { type="item", name="bob-carbon", amount=3 }, { type="item", name="bob-carbon", amount=8 }) +-- table.insert(data.raw.recipe["sct-mil-circuit1"].normal.ingredients, { type="item", name="bob-carbon", amount=2 }) +-- table.insert(data.raw.recipe["sct-mil-circuit1"].expensive.ingredients, { type="item", name="bob-carbon", amount=5 }) + sctm.recipe_ingredient_replace("sct-mil-circuit1", "coal", { type="item", name="bob-carbon", amount=0 }) end -- Production Science Pack: -- ============================= - if data.raw.item["tin-plate"] and data.raw.item["lead-plate"] and data.raw.item["gold-plate"] and data.raw.fluid["sulfur-dioxide"] then - data.raw.recipe["sct-prod-overclocker"].normal.ingredients = + if data.raw.item["bob-tin-plate"] and data.raw.item["bob-lead-plate"] and data.raw.item["bob-gold-plate"] and data.raw.fluid["bob-sulfur-dioxide"] then + data.raw.recipe["sct-prod-overclocker"].ingredients = { - {type="item", name="tin-plate", amount=10}, - {type="item", name="lead-plate", amount=10}, - {type="item", name="gold-plate", amount=10}, + {type="item", name="bob-tin-plate", amount=10}, + {type="item", name="bob-lead-plate", amount=10}, + {type="item", name="bob-gold-plate", amount=10}, {type="item", name="sct-prod-chipcase", amount=1}, - {type="fluid", name="sulfur-dioxide", amount=120}, + {type="fluid", name="bob-sulfur-dioxide", amount=120}, } - data.raw.recipe["sct-prod-overclocker"].normal.results = + data.raw.recipe["sct-prod-overclocker"].results = { {type="item", name="sct-prod-overclocker", amount=1}, {type="item", name="sulfur", amount=4} } - data.raw.recipe["sct-prod-overclocker"].expensive.ingredients = + -- data.raw.recipe["sct-prod-overclocker"].expensive.ingredients = + -- { + -- {type="item", name="bob-tin-plate", amount=20}, + -- {type="item", name="bob-lead-plate", amount=20}, + -- {type="item", name="bob-gold-plate", amount=20}, + -- {type="item", name="sct-prod-chipcase", amount=1}, + -- {type="fluid", name="bob-sulfur-dioxide", amount=200}, + -- } + -- data.raw.recipe["sct-prod-overclocker"].expensive.results = + -- { + -- {type="item", name="sct-prod-overclocker", amount=1}, + -- {type="item", name="sulfur", amount=4} + -- } + sctm.tech_dependency_add("sct-production-science-pack", "bob-gold-processing") + end + if data.raw.item["bob-insulated-cable"] then + data.raw.recipe["sct-prod-bioprocessor"].ingredients = { - {type="item", name="tin-plate", amount=20}, - {type="item", name="lead-plate", amount=20}, - {type="item", name="gold-plate", amount=20}, - {type="item", name="sct-prod-chipcase", amount=1}, - {type="fluid", name="sulfur-dioxide", amount=200}, + {type="item", name="sct-prod-baked-biopaste", amount=1}, + {type="item", name="bob-insulated-cable", amount=6}, + {type="item", name="processing-unit", amount=1} } - data.raw.recipe["sct-prod-overclocker"].expensive.results = + -- data.raw.recipe["sct-prod-bioprocessor"].expensive.ingredients = + -- { + -- {type="item", name="sct-prod-baked-biopaste", amount=1}, + -- {type="item", name="bob-insulated-cable", amount=10}, + -- {type="item", name="processing-unit", amount=1} + -- } + + data.raw.recipe["sct-prod-chipcase"].ingredients = { - {type="item", name="sct-prod-overclocker", amount=1}, - {type="item", name="sulfur", amount=4} + {type="item", name="plastic-bar", amount=5}, + {type="item", name="bob-insulated-cable", amount=5}, + {type="item", name="advanced-circuit", amount=1}, + {type="fluid", name="heavy-oil", amount=120} } - sctm.tech_dependency_add("sct-production-science-pack", "gold-processing") + -- data.raw.recipe["sct-prod-chipcase"].expensive.ingredients = + -- { + -- {type="item", name="plastic-bar", amount=10}, + -- {type="item", name="bob-insulated-cable", amount=8}, + -- {type="item", name="advanced-circuit", amount=1}, + -- {type="fluid", name="heavy-oil", amount=250} + -- } end -- High-Tech Science Pack: -- ============================= - if data.raw.item["lithium-ion-battery"] and data.raw.item["silicon-nitride"] and data.raw.item["steel-gear-wheel"] then - sctm.recipe_ingredient_replace("sct-htech-capbank", "iron-plate", "steel-gear-wheel") - sctm.recipe_ingredient_replace("sct-htech-capbank", "battery", "lithium-ion-battery") - sctm.recipe_ingredient_add("sct-htech-capbank", { type="item", name="silicon-nitride", amount=10},{ type="item", name="silicon-nitride", amount=25}) + if data.raw.item["bob-lithium-ion-battery"] and data.raw.item["bob-silicon-nitride"] and data.raw.item["bob-steel-gear-wheel"] then + sctm.recipe_ingredient_replace("sct-htech-capbank", "iron-plate", "bob-steel-gear-wheel") + sctm.recipe_ingredient_replace("sct-htech-capbank", "battery", "bob-lithium-ion-battery") + sctm.recipe_ingredient_add("sct-htech-capbank", { type="item", name="bob-silicon-nitride", amount=10},{ type="item", name="bob-silicon-nitride", amount=25}) sctm.tech_dependency_remove("sct-utility-science-pack", "battery") - sctm.tech_dependency_add("sct-utility-science-pack", "battery-2") - sctm.tech_dependency_add("sct-utility-science-pack", "ceramics") + sctm.tech_dependency_add("sct-utility-science-pack", "bob-battery-2") + sctm.tech_dependency_add("sct-utility-science-pack", "bob-ceramics") end - if data.raw.item["titanium-plate"] and data.raw.item["powdered-tungsten"] and data.raw.item["ruby-5"] then - data.raw.recipe["sct-htech-injector"].normal.ingredients = + if data.raw.item["bob-titanium-plate"] and data.raw.item["bob-powdered-tungsten"] and data.raw.item["bob-ruby-5"] then + data.raw.recipe["sct-htech-injector"].ingredients = { {type="item", name="copper-cable", amount=20}, {type="item", name="processing-unit", amount=5}, - {type="item", name="titanium-plate", amount=20}, - {type="item", name="powdered-tungsten", amount=20}, - {type="item", name="ruby-5", amount=1} - } - data.raw.recipe["sct-htech-injector"].expensive.ingredients = - { - {type="item", name="copper-cable", amount=30}, - {type="item", name="processing-unit", amount=10}, - {type="item", name="titanium-plate", amount=40}, - {type="item", name="powdered-tungsten", amount=40}, - {type="item", name="ruby-5", amount=1} + {type="item", name="bob-titanium-plate", amount=20}, + {type="item", name="bob-powdered-tungsten", amount=20}, + {type="item", name="bob-ruby-5", amount=1} } - sctm.tech_dependency_add("sct-lab-t4", "gem-processing-3") - sctm.tech_dependency_add("sct-lab-t4", "titanium-processing") - sctm.tech_dependency_add("sct-lab-t4", "tungsten-processing") + -- data.raw.recipe["sct-htech-injector"].expensive.ingredients = + -- { + -- {type="item", name="copper-cable", amount=30}, + -- {type="item", name="processing-unit", amount=10}, + -- {type="item", name="bob-titanium-plate", amount=40}, + -- {type="item", name="bob-powdered-tungsten", amount=40}, + -- {type="item", name="bob-ruby-5", amount=1} + -- } + sctm.tech_dependency_add("sct-lab-t4", "bob-gem-processing-3") + sctm.tech_dependency_add("sct-lab-t4", "bob-titanium-processing") + sctm.tech_dependency_add("sct-lab-t4", "bob-tungsten-processing") if mods["angelsrefining"] then sctm.tech_pack_add("sct-lab-t4", {"production-science-pack", 1}) sctm.tech_pack_add("sct-utility-science-pack", {"production-science-pack", 1}) sctm.tech_unlock_remove("sct-utility-science-pack", "sct-waste-processing-mixed") - if data.raw.item["advanced-processing-unit"] then - sctm.recipe_ingredient_replace("sct-lab4-manipulators", "processing-unit", "advanced-processing-unit") - sctm.tech_dependency_add("sct-lab-t4", "advanced-electronics-3") + if data.raw.item["bob-advanced-processing-unit"] then + sctm.recipe_ingredient_replace("sct-lab4-manipulators", "processing-unit", "bob-advanced-processing-unit") + sctm.tech_dependency_add("sct-lab-t4", "bob-advanced-processing-unit") end end end - if data.raw.item["tinned-copper-cable"] then - sctm.recipe_ingredient_replace("sct-htech-injector", "copper-cable", "tinned-copper-cable") + if data.raw.item["bob-tinned-copper-cable"] then + sctm.recipe_ingredient_replace("sct-htech-injector", "copper-cable", "bob-tinned-copper-cable") end - if data.raw.item["tungsten-plate"] and data.raw.item["cobalt-steel-alloy"] then - data.raw.recipe["sct-htech-thermalstore"].normal.ingredients = + if data.raw.item["bob-tungsten-plate"] and data.raw.item["bob-cobalt-steel-alloy"] then + data.raw.recipe["sct-htech-thermalstore"].ingredients = { - {type="item", name="tungsten-plate", amount=20}, - {type="item", name="cobalt-steel-alloy", amount=20} - } - data.raw.recipe["sct-htech-thermalstore"].expensive.ingredients = - { - {type="item", name="tungsten-plate", amount=40}, - {type="item", name="cobalt-steel-alloy", amount=40} + {type="item", name="bob-tungsten-plate", amount=20}, + {type="item", name="bob-cobalt-steel-alloy", amount=20} } + -- data.raw.recipe["sct-htech-thermalstore"].expensive.ingredients = + -- { + -- {type="item", name="bob-tungsten-plate", amount=40}, + -- {type="item", name="bob-cobalt-steel-alloy", amount=40} + -- } if mods["angelssmelting"] then sctm.tech_dependency_add("sct-utility-science-pack", "angels-cobalt-steel-smelting-1") end end - if data.raw.item["titanium-gear-wheel"] and data.raw.item["tungsten-gear-wheel"] then - sctm.recipe_ingredient_replace("sct-htech-random", "iron-gear-wheel", "tungsten-gear-wheel") - sctm.recipe_ingredient_add("sct-htech-random", { type="item", name="titanium-gear-wheel", amount=5}, { type="item", name="titanium-gear-wheel", amount=10}) - sctm.recipe_ingredient_add("sct-htech-random", { type="item", name="titanium-bearing", amount=10}, { type="item", name="titanium-bearing", amount=15}) + if data.raw.item["bob-titanium-gear-wheel"] and data.raw.item["bob-tungsten-gear-wheel"] then + sctm.recipe_ingredient_replace("sct-htech-random", "iron-gear-wheel", "bob-tungsten-gear-wheel") + sctm.recipe_ingredient_add("sct-htech-random", { type="item", name="bob-titanium-gear-wheel", amount=5}, { type="item", name="bob-titanium-gear-wheel", amount=10}) + sctm.recipe_ingredient_add("sct-htech-random", { type="item", name="bob-titanium-bearing", amount=10}, { type="item", name="bob-titanium-bearing", amount=15}) end -- lab intermediates - if data.raw.item["steel-gear-wheel"] then - sctm.recipe_ingredient_replace("sct-lab2-construction", "iron-gear-wheel", "steel-gear-wheel") + if data.raw.item["bob-steel-gear-wheel"] then + sctm.recipe_ingredient_replace("sct-lab2-construction", "iron-gear-wheel", "bob-steel-gear-wheel") end - if data.raw.item["brass-alloy"] then - sctm.recipe_ingredient_replace("sct-lab3-construction", "steel-plate", "brass-alloy") + if data.raw.item["bob-brass-alloy"] then + sctm.recipe_ingredient_replace("sct-lab3-construction", "steel-plate", "bob-brass-alloy") if mods["angelssmelting"] then sctm.tech_dependency_add("sct-lab-t3", "angels-brass-smelting-1") else - sctm.tech_dependency_add("sct-lab-t3", "zinc-processing") + sctm.tech_dependency_add("sct-lab-t3", "bob-zinc-processing") end end - if data.raw.item["tungsten-plate"] then - sctm.recipe_ingredient_replace("sct-lab4-construction", "steel-plate", "tungsten-plate") + if data.raw.item["bob-tungsten-plate"] then + sctm.recipe_ingredient_replace("sct-lab4-construction", "steel-plate", "bob-tungsten-plate") end end if mods["bobelectronics"] then - sctm.tech_dependency_add("sct-lab-t2", "electronics") + sctm.tech_dependency_add("sct-lab-t2", "bob-electronics") if settings.startup["sct-military"].value == "tier2" then sctm.recipe_ingredient_replace("sct-mil-circuit3", "advanced-circuit", "electronic-circuit") - sctm.tech_dependency_remove("sct-military-science-pack", "advanced-electronics") - end - if data.raw.item["basic-circuit-board"] then - sctm.recipe_ingredient_replace("sct-t2-instruments", "electronic-circuit", "basic-circuit-board") - sctm.recipe_ingredient_replace("sct-lab1-mechanization", "electronic-circuit", "basic-circuit-board") - sctm.recipe_ingredient_replace("sct-mil-circuit1", "electronic-circuit", "basic-circuit-board") - sctm.recipe_ingredient_replace("sct-lab2-automatization", "electronic-circuit", "basic-circuit-board") - end - if data.raw.item["insulated-cable"] then - sctm.recipe_ingredient_replace("sct-htech-capbank", "copper-cable", "insulated-cable") - sctm.recipe_ingredient_replace("sct-htech-injector", "copper-cable", "insulated-cable") - end - - if data.raw["recipe-category"]["electronics"] then - data.raw.recipe["sct-t1-ironcore"].category = "electronics" - data.raw.recipe["sct-t1-magnet-coils"].category = "electronics" - data.raw.recipe["sct-t2-microcircuits"].category = "electronics" - data.raw.recipe["sct-t2-micro-wafer"].category = "electronics" - data.raw.recipe["sct-t2-reaction-nodes"].category = "electronics" - data.raw.recipe["sct-mil-circuit3"].category = "electronics" - data.raw.recipe["sct-mil-circuit2"].category = "electronics" - data.raw.recipe["sct-mil-circuit1"].category = "electronics" + sctm.tech_dependency_remove("sct-military-science-pack", "advanced-circuit") + end + if data.raw.item["bob-basic-circuit-board"] then + sctm.recipe_ingredient_replace("sct-t2-instruments", "electronic-circuit", "bob-basic-circuit-board") + sctm.recipe_ingredient_replace("sct-lab1-mechanization", "electronic-circuit", "bob-basic-circuit-board") + sctm.recipe_ingredient_replace("sct-mil-circuit1", "electronic-circuit", "bob-basic-circuit-board") + sctm.recipe_ingredient_replace("sct-lab2-automatization", "electronic-circuit", "bob-basic-circuit-board") + end + if data.raw.item["bob-insulated-cable"] then + sctm.recipe_ingredient_replace("sct-htech-capbank", "copper-cable", "bob-insulated-cable") + sctm.recipe_ingredient_replace("sct-htech-injector", "copper-cable", "bob-insulated-cable") + end + + if data.raw["recipe-category"]["bob-electronics"] then + data.raw.recipe["sct-t1-ironcore"].category = "bob-electronics" + data.raw.recipe["sct-t1-magnet-coils"].category = "bob-electronics" + data.raw.recipe["sct-t2-microcircuits"].category = "bob-electronics" + data.raw.recipe["sct-t2-micro-wafer"].category = "bob-electronics" + data.raw.recipe["sct-t2-reaction-nodes"].category = "bob-electronics" + data.raw.recipe["sct-mil-circuit3"].category = "bob-electronics" + data.raw.recipe["sct-mil-circuit2"].category = "bob-electronics" + data.raw.recipe["sct-mil-circuit1"].category = "bob-electronics" if data.raw.recipe["sct-logistic-memory-unit"] then - data.raw.recipe["sct-logistic-memory-unit"].category = "electronics" + data.raw.recipe["sct-logistic-memory-unit"].category = "bob-electronics" end end end @@ -333,22 +362,22 @@ if mods["bobpower"] then sctm.tech_dependency_add("steam-power", "sct-automation-science-pack") end - if data.raw.item["solar-panel-large"] then - sctm.recipe_ingredient_replace("sct-lab3-construction", "solar-panel", "solar-panel-large") + if data.raw.item["bob-solar-panel-large"] then + sctm.recipe_ingredient_replace("sct-lab3-construction", "solar-panel", "bob-solar-panel-large") end end -- add bob logistic pack if found - for now, might replace with qol later if mods["bobtech"] then - sctm.tech_dependency_add("sct-lab-alien", "advanced-research") + sctm.tech_dependency_add("sct-lab-alien", "bob-advanced-research") -- hide bob lab mk2 - if data.raw.lab["lab-2"] then - --table.insert(data.raw.item["lab-2"].flags, "hidden") - sctm.tech_unlock_remove("advanced-research", "lab-2") + if data.raw.lab["bob-lab-2"] then + --table.insert(data.raw.item["bob-lab-2"].flags, "hidden") + sctm.tech_unlock_remove("bob-advanced-research", "bob-lab-2") -- if someone enables it, move it to sct labs group, and make it hightest tier lab - data.raw.item["lab-2"].subgroup = "sct-labs" - data.raw.item["lab-2"].order = "b[labs]-e[lab5]" - data.raw.item["lab-2"].icons = + data.raw.item["bob-lab-2"].subgroup = "sct-labs" + data.raw.item["bob-lab-2"].order = "b[labs]-e[lab5]" + data.raw.item["bob-lab-2"].icons = { { icon = "__ScienceCostTweakerM__/graphics/bobmods/lab2-64.png", @@ -359,7 +388,7 @@ if mods["bobtech"] then icon_size = 64, }, } - data.raw.lab["lab-2"].icons = + data.raw.lab["bob-lab-2"].icons = { { icon_size = 64, @@ -370,22 +399,22 @@ if mods["bobtech"] then icon = "__ScienceCostTweakerM__/graphics/overlays/beta-64.png", }, } - data.raw.recipe["lab-2"].subgroup = "sct-labs" - data.raw.recipe["lab-2"].order = "b[labs]-e[lab5]" - sctm.recipe_ingredient_replace("lab-2", "lab", "sct-lab-t4") + data.raw.recipe["bob-lab-2"].subgroup = "sct-labs" + data.raw.recipe["bob-lab-2"].order = "b[labs]-e[lab5]" + sctm.recipe_ingredient_replace("bob-lab-2", "lab", "sct-lab-t4") sctm.lab_input_remove("sct-lab-t4", "space-science-pack") if settings.startup["sct-lab-scaling"].value == true then - data.raw.lab["lab-2"].researching_speed = 2 + data.raw.lab["bob-lab-2"].researching_speed = 2 else - data.raw.lab["lab-2"].researching_speed = 1 + data.raw.lab["bob-lab-2"].researching_speed = 1 end - data.raw.lab["sct-lab-t4"].next_upgrade = "lab-2" + data.raw.lab["sct-lab-t4"].next_upgrade = "bob-lab-2" data.raw.lab["lab"].next_upgrade = "sct-lab-t2" end - if data.raw.item["lab-alien"] then - data.raw.item["lab-alien"].subgroup = "sct-labs" - data.raw.item["lab-alien"].order = "b[labs]-f[lab6]" - data.raw.item["lab-alien"].icons = + if data.raw.item["bob-lab-alien"] then + data.raw.item["bob-lab-alien"].subgroup = "sct-labs" + data.raw.item["bob-lab-alien"].order = "b[labs]-f[lab6]" + data.raw.item["bob-lab-alien"].icons = { { icon_size = 64, @@ -396,7 +425,7 @@ if mods["bobtech"] then icon = "__ScienceCostTweakerM__/graphics/overlays/alien-64.png", }, } - data.raw.lab["lab-alien"].icons = + data.raw.lab["bob-lab-alien"].icons = { { icon_size = 64, @@ -407,127 +436,92 @@ if mods["bobtech"] then icon = "__ScienceCostTweakerM__/graphics/overlays/alien-64.png", }, } - data.raw.recipe["lab-alien"].subgroup = "sct-labs" - data.raw.recipe["lab-alien"].order = "b[labs]-f[lab6]" - sctm.recipe_ingredient_replace("lab-alien", "lab", "sct-lab-t3") - sctm.tech_unlock_remove("alien-research", "lab-alien") - sctm.tech_dependency_add("alien-research", "sct-alien-science-pack") - sctm.tech_dependency_remove("alien-research", "advanced-research") - sctm.tech_pack_replace("alien-research", "automation-science-pack", "science-pack-gold") - sctm.tech_pack_replace("alien-research", "logistic-science-pack", "alien-science-pack") - sctm.tech_pack_remove("alien-research", "military-science-pack") - sctm.tech_pack_remove("alien-research", "chemical-science-pack") - end - if data.raw.tool["advanced-logistic-science-pack"] and data.raw.recipe["advanced-logistic-science-pack"] then + data.raw.recipe["bob-lab-alien"].subgroup = "sct-labs" + data.raw.recipe["bob-lab-alien"].order = "b[labs]-f[lab6]" + sctm.recipe_ingredient_replace("bob-lab-alien", "lab", "sct-lab-t3") + sctm.tech_unlock_remove("bob-alien-research", "bob-lab-alien") + sctm.tech_dependency_add("bob-alien-research", "sct-alien-science-pack") + sctm.tech_dependency_remove("bob-alien-research", "bob-advanced-research") + sctm.tech_pack_replace("bob-alien-research", "automation-science-pack", "bob-science-pack-gold") + sctm.tech_pack_replace("bob-alien-research", "logistic-science-pack", "bob-alien-science-pack") + sctm.tech_pack_remove("bob-alien-research", "military-science-pack") + sctm.tech_pack_remove("bob-alien-research", "chemical-science-pack") + end + if data.raw.tool["bob-advanced-logistic-science-pack"] and data.raw.recipe["bob-advanced-logistic-science-pack"] then -- remove logistic pack from tier 1 lab - sctm.lab_input_remove("lab", "advanced-logistic-science-pack") - sctm.lab_input_add("sct-lab-t3", "advanced-logistic-science-pack") - sctm.lab_input_add("sct-lab-t4", "advanced-logistic-science-pack") - - data.raw.tool["advanced-logistic-science-pack"].subgroup = "sct-advanced-logistic-science-pack" - data.raw.tool["advanced-logistic-science-pack"].order = "h_a[logistic]" - data.raw.tool["advanced-logistic-science-pack"].icon_size = 64 - data.raw.tool["advanced-logistic-science-pack"].icon = "__ScienceCostTweakerM__/graphics/bobmods/logistic-science-pack-64.png" + sctm.lab_input_remove("lab", "bob-advanced-logistic-science-pack") + sctm.lab_input_add("sct-lab-t3", "bob-advanced-logistic-science-pack") + sctm.lab_input_add("sct-lab-t4", "bob-advanced-logistic-science-pack") + + data.raw.tool["bob-advanced-logistic-science-pack"].subgroup = "sct-advanced-logistic-science-pack" + data.raw.tool["bob-advanced-logistic-science-pack"].order = "h_a[logistic]" + data.raw.tool["bob-advanced-logistic-science-pack"].icon_size = 64 + data.raw.tool["bob-advanced-logistic-science-pack"].icon = "__ScienceCostTweakerM__/graphics/bobmods/logistic-science-pack-64.png" local logisticrecipe = table.deepcopy(data.raw.recipe["sct-advanced-logistic-science-pack"]) sctm.hide_recipe("sct-advanced-logistic-science-pack") - logisticrecipe.name = "advanced-logistic-science-pack" - data.raw.recipe["advanced-logistic-science-pack"] = logisticrecipe - end - if data.raw.tool["science-pack-gold"] then - data.raw.tool["science-pack-gold"].subgroup = "sct-alien-science-pack" - data.raw.tool["science-pack-gold"].order = "0-gold-science-pack" - data.raw.tool["science-pack-gold"].icon_size = 64 - data.raw.tool["science-pack-gold"].icon = "__ScienceCostTweakerM__/graphics/bobmods/gold-science-pack-64.png" - data.raw.recipe["science-pack-gold"].subgroup = "sct-alien-science-pack" - data.raw.recipe["science-pack-gold"].order = "0-gold-science-pack" - end - if data.raw.tool["alien-science-pack"] then - data.raw.tool["alien-science-pack"].subgroup = "sct-alien-science-pack" - data.raw.tool["alien-science-pack"].icon_size = 64 - data.raw.tool["alien-science-pack"].icon = "__ScienceCostTweakerM__/graphics/bobmods/alien-science-pack-64.png" - data.raw.tool["alien-science-pack-blue"].subgroup = "sct-alien-science-pack" - data.raw.tool["alien-science-pack-orange"].subgroup = "sct-alien-science-pack" - data.raw.tool["alien-science-pack-purple"].subgroup = "sct-alien-science-pack" - data.raw.tool["alien-science-pack-yellow"].subgroup = "sct-alien-science-pack" - data.raw.tool["alien-science-pack-green"].subgroup = "sct-alien-science-pack" - data.raw.tool["alien-science-pack-red"].subgroup = "sct-alien-science-pack" - end - - if data.raw.item["brass-chest"] then - sctm.recipe_ingredient_replace("sct-logistic-automated-storage", "steel-chest", "brass-chest") - sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "zinc-processing") + logisticrecipe.name = "bob-advanced-logistic-science-pack" + data.raw.recipe["bob-advanced-logistic-science-pack"] = logisticrecipe + end + if data.raw.tool["bob-science-pack-gold"] then + data.raw.tool["bob-science-pack-gold"].subgroup = "sct-alien-science-pack" + data.raw.tool["bob-science-pack-gold"].order = "0-gold-science-pack" + data.raw.tool["bob-science-pack-gold"].icon_size = 64 + data.raw.tool["bob-science-pack-gold"].icon = "__ScienceCostTweakerM__/graphics/bobmods/gold-science-pack-64.png" + data.raw.recipe["bob-science-pack-gold"].subgroup = "sct-alien-science-pack" + data.raw.recipe["bob-science-pack-gold"].order = "0-gold-science-pack" + end + if data.raw.tool["bob-alien-science-pack"] then + data.raw.tool["bob-alien-science-pack"].subgroup = "sct-alien-science-pack" + data.raw.tool["bob-alien-science-pack"].icon_size = 64 + data.raw.tool["bob-alien-science-pack"].icon = "__ScienceCostTweakerM__/graphics/bobmods/alien-science-pack-64.png" + data.raw.tool["bob-alien-science-pack-blue"].subgroup = "sct-alien-science-pack" + data.raw.tool["bob-alien-science-pack-orange"].subgroup = "sct-alien-science-pack" + data.raw.tool["bob-alien-science-pack-purple"].subgroup = "sct-alien-science-pack" + data.raw.tool["bob-alien-science-pack-yellow"].subgroup = "sct-alien-science-pack" + data.raw.tool["bob-alien-science-pack-green"].subgroup = "sct-alien-science-pack" + data.raw.tool["bob-alien-science-pack-red"].subgroup = "sct-alien-science-pack" + end + + if data.raw.item["bob-brass-chest"] then + sctm.recipe_ingredient_replace("sct-logistic-automated-storage", "steel-chest", "bob-brass-chest") + sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "bob-zinc-processing") end if mods["bobelectronics"] and mods["bobplates"] then - sctm.tech_unlock_add("gold-processing", "gilded-copper-cable") - sctm.tech_unlock_remove("advanced-electronics-3", "gilded-copper-cable") - end -end - -if mods["bobmodules"] then - if data.raw.item["lab-module"] then - data.raw.item["lab-module"].subgroup = "sct-labs" - data.raw.item["lab-module"].order = "b[labs]-g[lab7]" - data.raw.item["lab-module"].icons = - { - { - icon_size = 64, - icon = "__ScienceCostTweakerM__/graphics/bobmods/module-lab-64.png", - }, - { - icon_size = 64, - icon = "__ScienceCostTweakerM__/graphics/overlays/module-64.png", - }, - } - data.raw.lab["lab-module"].icons = - { - { - icon_size = 64, - icon = "__ScienceCostTweakerM__/graphics/bobmods/module-lab-64.png", - }, - { - icon_size = 64, - icon = "__ScienceCostTweakerM__/graphics/overlays/module-64.png", - }, - } - data.raw.recipe["lab-module"].subgroup = "sct-labs" - data.raw.recipe["lab-module"].order = "b[labs]-g[lab7]" - sctm.recipe_ingredient_replace("lab-module", "lab", "sct-lab-t2") --- sctm.tech_dependency_add("effect-transmission", "chemical-science-pack") --- sctm.tech_dependency_add("effect-transmission-2", "production-science-pack") --- sctm.tech_dependency_add("effect-transmission-3", "utility-science-pack") + sctm.tech_unlock_add("bob-gold-processing", "bob-gilded-copper-cable") + sctm.tech_unlock_remove("bob-advanced-processing-unit", "bob-gilded-copper-cable") end end if mods["bobplates"] and mods["bobelectronics"] and mods["bobtech"] then - sctm.recipe_ingredient_add("sct-logistic-memory-unit2", {type="item", name="silicon-wafer", amount=2}, {type="item", name="silicon-wafer", amount=4}) + sctm.recipe_ingredient_add("sct-logistic-memory-unit2", {type="item", name="bob-silicon-wafer", amount=2}, {type="item", name="bob-silicon-wafer", amount=4}) end if mods["boblogistics"] then if settings.startup["bobmods-logistics-inserteroverhaul"] and settings.startup["bobmods-logistics-inserteroverhaul"].value then sctm.tech_dependency_remove("sct-lab-t2", "fast-inserter") - if data.raw.recipe["yellow-filter-inserter"] then - sctm.recipe_ingredient_replace("sct-lab2-automatization", "fast-inserter", "yellow-filter-inserter") - sctm.tech_dependency_add("sct-lab-t2", "electronics") + if data.raw.recipe["inserter"] then + sctm.recipe_ingredient_replace("sct-lab2-automatization", "fast-inserter", "inserter") + sctm.tech_dependency_add("sct-lab-t2", "bob-electronics") else sctm.recipe_ingredient_replace("sct-lab2-automatization", "fast-inserter", "inserter") end --- sctm.tech_pack_add("stack-inserter-2", {"production-science-pack",1}) +-- sctm.tech_pack_add("bob-bulk-inserter-2", {"production-science-pack",1}) -- sctm.log(serpent.block(data.raw.recipe["sct-lab4-manipulators"])) --- sctm.recipe_ingredient_replace("sct-lab4-manipulators", "stack-filter-inserter", "red-stack-filter-inserter") - sctm.tech_dependency_add("sct-lab-t4", "stack-inserter-2") +-- sctm.recipe_ingredient_replace("sct-lab4-manipulators", "bulk-inserter", "bob-red-bulk-inserter") + sctm.tech_dependency_add("sct-lab-t4", "bob-bulk-inserter-2") end if settings.startup["bobmods-logistics-beltoverhaul"] and settings.startup["bobmods-logistics-beltoverhaul"].value then if not (mods["bobtech"] and settings.startup["bobmods-burnerphase"].value) then sctm.tech_dependency_remove("logistics", "sct-automation-science-pack") sctm.tech_dependency_add("logistics-0", "sct-automation-science-pack") end - sctm.recipe_ingredient_replace("sct-lab1-mechanization", "transport-belt", "basic-transport-belt") + sctm.recipe_ingredient_replace("sct-lab1-mechanization", "transport-belt", "bob-basic-transport-belt") end end if mods["bobtech"] and settings.startup["bobmods-burnerphase"].value then - if (data.raw.recipe["steam-science-pack"]) then + if (data.raw.recipe["steam-science-pack"]) then -- removed data.raw.recipe["steam-science-pack"].subgroup = "sct-science-pack-0" end if (data.raw.tool["steam-science-pack"]) then @@ -559,11 +553,11 @@ if mods["bobtech"] and settings.startup["bobmods-burnerphase"].value then data.raw.technology["sct-lab-t1"].unit.time = 20 sctm.tech_pack_add("sct-lab-t1", {"steam-science-pack", 10}) end - if (data.raw.recipe["burner-lab"]) then - data.raw.recipe["burner-lab"].subgroup = "sct-labs" + if (data.raw.recipe["bob-burner-lab"]) then + data.raw.recipe["bob-burner-lab"].subgroup = "sct-labs" end - if (data.raw.item["burner-lab"]) then - data.raw.item["burner-lab"].subgroup = "sct-labs" + if (data.raw.item["bob-burner-lab"]) then + data.raw.item["bob-burner-lab"].subgroup = "sct-labs" end if (data.raw.technology["steam-automation"]) then @@ -580,19 +574,19 @@ elseif mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value end if mods["bobrevamp"] then - if data.raw.item["silver-zinc-battery"] then + if data.raw.item["bob-silver-zinc-battery"] then sctm.tech_dependency_remove("sct-space-science-pack", "electric-energy-accumulators") - sctm.tech_dependency_add("sct-space-science-pack", "battery-3") + sctm.tech_dependency_add("sct-space-science-pack", "bob-battery-3") end - if data.raw.item["rtg"] then + if data.raw.item["bob-rtg"] then sctm.tech_dependency_remove("sct-space-science-pack", "solar-energy") - sctm.tech_dependency_add("sct-space-science-pack", "rtg") + sctm.tech_dependency_add("sct-space-science-pack", "bob-rtg") end end if mods["bobmining"] then - if data.raw.technology["water-miner-1"] then - sctm.tech_dependency_add("water-miner-1", "sct-automation-science-pack") + if data.raw.technology["bob-water-miner-1"] then + sctm.tech_dependency_add("bob-water-miner-1", "sct-automation-science-pack") end end @@ -601,5 +595,5 @@ if mods["bobgreenhouse"] then end if mods["bobwarfare"] then - sctm.tech_dependency_add("sct-space-science-pack", "radars-5") + sctm.tech_dependency_add("sct-space-science-pack", "bob-radars-5") end diff --git a/tweaks/bobsmods/2_final.lua b/tweaks/bobsmods/2_final.lua index c177083..ea37379 100644 --- a/tweaks/bobsmods/2_final.lua +++ b/tweaks/bobsmods/2_final.lua @@ -1,45 +1,45 @@ if mods["bobtech"] then - sctm.tech_pack_add("sct-space-science-pack", {"advanced-logistic-science-pack", 5}) + sctm.tech_pack_add("sct-space-science-pack", {"bob-advanced-logistic-science-pack", 5}) if mods["angelspetrochem"] then - sctm.recipe_ingredient_remove("chemical-science-pack", "solid-sodium-hydroxide") + sctm.recipe_ingredient_remove("chemical-science-pack", "angels-solid-sodium-hydroxide") sctm.recipe_ingredient_remove("production-science-pack", "angels-chemical-plant") else - sctm.recipe_ingredient_remove("chemical-science-pack", "sodium-hydroxide") + sctm.recipe_ingredient_remove("chemical-science-pack", "bob-sodium-hydroxide") end sctm.recipe_ingredient_remove("production-science-pack", "chemical-plant") sctm.recipe_ingredient_remove("production-science-pack", "assembling-machine-2") - sctm.recipe_ingredient_remove("utility-science-pack", "silver-zinc-battery") + sctm.recipe_ingredient_remove("utility-science-pack", "bob-silver-zinc-battery") sctm.recipe_ingredient_remove("utility-science-pack", "processing-unit") - sctm.recipe_ingredient_remove("utility-science-pack", "titanium-bearing") + sctm.recipe_ingredient_remove("utility-science-pack", "bob-titanium-bearing") + sctm.recipe_ingredient_remove("utility-science-pack", "electric-engine-unit") + if data.raw.item["bob-solar-panel-small"] then + sctm.recipe_ingredient_remove("utility-science-pack", "bob-solar-panel-small") + else + sctm.recipe_ingredient_remove("utility-science-pack", "solar-panel") + end end if mods["bobplates"] then - sctm.recipe_ingredient_remove("chemical-science-pack", "bronze-alloy") - sctm.recipe_ingredient_remove("utility-science-pack", "lithium-ion-battery") - sctm.recipe_ingredient_remove("utility-science-pack", "silicon-nitride") - sctm.tech_dependency_remove("chemical-science-pack", "alloy-processing-1") + sctm.recipe_ingredient_remove("chemical-science-pack", "bob-bronze-alloy") + sctm.recipe_ingredient_remove("utility-science-pack", "bob-lithium-ion-battery") + sctm.recipe_ingredient_remove("utility-science-pack", "bob-silicon-nitride") + sctm.tech_dependency_remove("chemical-science-pack", "bob-alloy-processing") end if mods["bobmodules"] then if sctm.tech_dependency_remove("modular-armor", "modules") then - sctm.tech_dependency_add("modular-armor","advanced-electronics") + sctm.tech_dependency_add("modular-armor","advanced-circuit") end - - if settings.startup["bobmods-modules-enable-modules-lab"] and settings.startup["bobmods-modules-enable-modules-lab"].value then - if sctm.tech_dependency_remove("modules", "advanced-electronics") then - sctm.tech_dependency_add("modules", "sct-lab-modules") - end - sctm.tech_unlock_remove("modules", "lab-module") - sctm.tech_unlock_remove("modules", "module-processor-board") - sctm.tech_unlock_remove("modules", "effectivity-processor") - sctm.tech_unlock_remove("modules", "speed-processor") - sctm.tech_unlock_remove("modules", "productivity-processor") - if mods["angelsbioprocessing"] then - sctm.tech_dependency_add("sct-lab-modules", "bio-processing-crystal-splinter-1") - end - end end if mods["boblogistics"] and settings.startup["bobmods-logistics-inserteroverhaul"].value then - sctm.tech_dependency_add("turbo-inserter", "express-inserters") + sctm.tech_dependency_add("bob-turbo-inserter", "bob-express-inserters") +end + +if data.raw["technology"]["bob-advanced-logistic-science-pack"] then + for k,v in pairs(data.raw.lab["lab"].inputs) do + if v == "bob-advanced-logistic-science-pack" then + table.remove(data.raw.lab["lab"].inputs, k) + end + end end diff --git a/tweaks/bobsmods/science_bobmods_alien.lua b/tweaks/bobsmods/science_bobmods_alien.lua index b95d071..c827c5f 100644 --- a/tweaks/bobsmods/science_bobmods_alien.lua +++ b/tweaks/bobsmods/science_bobmods_alien.lua @@ -28,7 +28,7 @@ data:extend({ { { type = "unlock-recipe", - recipe = "lab-alien", + recipe = "bob-lab-alien", }, }, prerequisites = @@ -63,7 +63,7 @@ data:extend({ { { type = "unlock-recipe", - recipe = "science-pack-gold", + recipe = "bob-science-pack-gold", }, }, prerequisites = @@ -95,32 +95,32 @@ data:extend({ { { type = "unlock-recipe", - recipe = "alien-science-pack", + recipe = "bob-alien-science-pack", }, --[[ { type = "unlock-recipe", - recipe = "alien-science-pack-blue", + recipe = "bob-alien-science-pack-blue", }, { type = "unlock-recipe", - recipe = "alien-science-pack-orange", + recipe = "bob-alien-science-pack-orange", }, { type = "unlock-recipe", - recipe = "alien-science-pack-purple", + recipe = "bob-alien-science-pack-purple", }, { type = "unlock-recipe", - recipe = "alien-science-pack-yellow", + recipe = "bob-alien-science-pack-yellow", }, { type = "unlock-recipe", - recipe = "alien-science-pack-green", + recipe = "bob-alien-science-pack-green", }, { type = "unlock-recipe", - recipe = "alien-science-pack-red", + recipe = "bob-alien-science-pack-red", }, ]]-- }, @@ -134,13 +134,13 @@ data:extend({ count = 120, ingredients = { - {"science-pack-gold", 1}, + {"bob-science-pack-gold", 1}, }, time = 4, }, order = "sct-pack-e[alien]", }, }) -sctm.tech_unlock_remove("alien-research", "science-pack-gold") -sctm.tech_unlock_remove("alien-research", "alien-science-pack") +sctm.tech_unlock_remove("bob-alien-research", "bob-science-pack-gold") +sctm.tech_unlock_remove("bob-alien-research", "bob-alien-science-pack") end diff --git a/tweaks/bobsmods/science_bobmods_logistic.lua b/tweaks/bobsmods/science_bobmods_logistic.lua index 6c69c90..f8020c1 100644 --- a/tweaks/bobsmods/science_bobmods_logistic.lua +++ b/tweaks/bobsmods/science_bobmods_logistic.lua @@ -16,12 +16,13 @@ if mods["bobtech"] then name = "sct-advanced-logistic-science-pack", icon = "__ScienceCostTweakerM__/graphics/bobmods/logistic-science-pack-128.png", icon_size = 128, + essential = true, effects = { --[[ { type = "unlock-recipe", - recipe = "advanced-logistic-science-pack", + recipe = "bob-advanced-logistic-science-pack", }, ]]-- { @@ -62,9 +63,9 @@ if mods["bobtech"] then if not mods["bobelectronics"] then sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "circuit-network") elseif mods["bobplates"] then - sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "advanced-electronics-2") + sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "processing-unit") else - sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "advanced-electronics-2") + sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "processing-unit") sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "circuit-network") end @@ -118,6 +119,8 @@ if mods["bobtech"] then name = "sct-advanced-logistic-science-pack", subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]", + icon = "__ScienceCostTweakerM__/graphics/bobmods/logistic-science-pack.png", + icon_size = 32, --[[ expensive = { @@ -130,39 +133,36 @@ if mods["bobtech"] then }, results = { - { type="item", name="advanced-logistic-science-pack", amount=2 }, + { type="item", name="bob-advanced-logistic-science-pack", amount=2 }, }, }, ]]-- - expensive = + -- expensive = + -- { + -- enabled = false, + -- always_show_made_in = true, + -- energy_required = 14, + -- ingredients = + -- { + -- { type="item", name="sct-logistic-cargo-unit", amount=1 }, + -- { type="item", name="sct-logistic-memory-unit", amount=1 }, + -- }, + -- results = + -- { + -- { type="item", name="bob-advanced-logistic-science-pack", amount=2 }, + -- }, + -- }, + enabled = false, + always_show_made_in = true, + energy_required = 14, + ingredients = { - enabled = false, - always_show_made_in = true, - energy_required = 14, - ingredients = - { - { type="item", name="sct-logistic-cargo-unit", amount=1 }, - { type="item", name="sct-logistic-memory-unit", amount=1 }, - }, - results = - { - { type="item", name="advanced-logistic-science-pack", amount=2 }, - }, + { type="item", name="sct-logistic-cargo-unit", amount=1 }, + { type="item", name="sct-logistic-memory-unit", amount=1 }, }, - normal = + results = { - enabled = false, - always_show_made_in = true, - energy_required = 14, - ingredients = - { - { type="item", name="sct-logistic-cargo-unit", amount=1 }, - { type="item", name="sct-logistic-memory-unit", amount=1 }, - }, - results = - { - { type="item", name="advanced-logistic-science-pack", amount=2 }, - }, + { type="item", name="bob-advanced-logistic-science-pack", amount=2 }, }, } }) @@ -174,6 +174,8 @@ if mods["bobtech"] then name = "sct-logistic-cargo-unit", subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]-b[cargo]", + icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-cargo-unit.png", + icon_size = 32, --[[ expensive = { @@ -190,33 +192,30 @@ if mods["bobtech"] then }, }, ]]-- - expensive = + -- expensive = + -- { + -- enabled = false, + -- energy_required = 3, + -- ingredients = + -- { + -- {"sct-logistic-unimover", 1}, + -- {"sct-logistic-automated-storage", 1}, + -- }, + -- results = + -- { + -- {type="item", name="sct-logistic-cargo-unit", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 3, + ingredients = { - enabled = false, - energy_required = 3, - ingredients = - { - {"sct-logistic-unimover", 1}, - {"sct-logistic-automated-storage", 1}, - }, - results = - { - {type="item", name="sct-logistic-cargo-unit", amount=1}, - }, + {type = "item", name = "sct-logistic-unimover", amount = 1}, + {type = "item", name = "sct-logistic-automated-storage", amount = 1}, }, - normal = + results = { - enabled = false, - energy_required = 3, - ingredients = - { - {"sct-logistic-unimover", 1}, - {"sct-logistic-automated-storage", 1}, - }, - results = - { - {type="item", name="sct-logistic-cargo-unit", amount=1}, - }, + {type="item", name="sct-logistic-cargo-unit", amount=1}, }, }, }) @@ -228,37 +227,36 @@ if mods["bobtech"] then name = "sct-logistic-automated-storage", subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]-d[storage]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-automated-storage.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"bob-titanium-gear-wheel", 6}, + -- {"bob-cobalt-steel-bearing-ball", 6}, + -- {"processing-unit", 2}, + -- {"bob-brass-alloy", 4}, + -- }, + -- results = + -- { + -- {type="item", name="sct-logistic-automated-storage", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"titanium-gear-wheel", 6}, - {"cobalt-steel-bearing-ball", 6}, - {"processing-unit", 2}, - {"brass-alloy", 4}, - }, - results = - { - {type="item", name="sct-logistic-automated-storage", amount=1}, - }, + {type = "item", name = "bob-titanium-gear-wheel", amount = 3}, + {type = "item", name = "bob-cobalt-steel-bearing-ball", amount = 3}, + {type = "item", name = "processing-unit", amount = 1}, + {type = "item", name = "bob-brass-alloy", amount = 2}, }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"titanium-gear-wheel", 3}, - {"cobalt-steel-bearing-ball", 3}, - {"processing-unit", 1}, - {"brass-alloy", 2}, - }, - results = - { - {type="item", name="sct-logistic-automated-storage", amount=1}, - }, + {type="item", name="sct-logistic-automated-storage", amount=1}, }, }, }) @@ -270,44 +268,43 @@ if mods["bobtech"] then subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]-c[unimover]", category = "crafting-with-fluid", - expensive = + icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-unimover.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"advanced-circuit", 8}, + -- {"bob-titanium-bearing-ball", 12}, + -- {"bob-cobalt-steel-gear-wheel", 12}, + -- {"bob-aluminium-plate",15}, + -- {type="fluid", name="lubricant",amount=50} + -- }, + -- results = + -- { + -- {type="item", name="sct-logistic-unimover", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"advanced-circuit", 8}, - {"titanium-bearing-ball", 12}, - {"cobalt-steel-gear-wheel", 12}, - {"aluminium-plate",15}, - {type="fluid", name="lubricant",amount=50} - }, - results = - { - {type="item", name="sct-logistic-unimover", amount=1}, - }, + {type = "item", name = "advanced-circuit", amount = 4}, + {type = "item", name = "bob-titanium-bearing-ball", amount = 6}, + {type = "item", name = "bob-cobalt-steel-gear-wheel", amount = 6}, + {type = "item", name = "bob-aluminium-plate", amount = 8}, + {type="fluid", name="lubricant",amount=20} }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"advanced-circuit", 4}, - {"titanium-bearing-ball", 6}, - {"cobalt-steel-gear-wheel", 6}, - {"aluminium-plate",8}, - {type="fluid", name="lubricant",amount=20} - }, - results = - { - {type="item", name="sct-logistic-unimover", amount=1}, - }, + {type="item", name="sct-logistic-unimover", amount=1}, }, }, }) - sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "cobalt-processing") - sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "titanium-processing") + sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "bob-cobalt-processing") + sctm.tech_dependency_add("sct-advanced-logistic-science-pack", "bob-titanium-processing") else data:extend({ { @@ -315,33 +312,32 @@ if mods["bobtech"] then name = "sct-logistic-automated-storage", subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]-d[storage]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-automated-storage.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"fast-inserter", 1}, + -- {"steel-chest", 3}, + -- }, + -- results = + -- { + -- {type="item", name="sct-logistic-automated-storage", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"filter-inserter", 1}, - {"steel-chest", 3}, - }, - results = - { - {type="item", name="sct-logistic-automated-storage", amount=1}, - }, + {type = "item", name = "fast-inserter", amount = 1}, + {type = "item", name = "steel-chest", amount = 2}, }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"filter-inserter", 1}, - {"steel-chest", 2}, - }, - results = - { - {type="item", name="sct-logistic-automated-storage", amount=1}, - }, + {type="item", name="sct-logistic-automated-storage", amount=1}, }, }, }) @@ -352,33 +348,32 @@ if mods["bobtech"] then name = "sct-logistic-unimover", subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]-c[unimover]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-unimover.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"flying-robot-frame", 1}, + -- {"express-transport-belt", 2}, + -- }, + -- results = + -- { + -- {type="item", name="sct-logistic-unimover", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"flying-robot-frame", 1}, - {"express-transport-belt", 2}, - }, - results = - { - {type="item", name="sct-logistic-unimover", amount=1}, - }, + {type = "item", name = "flying-robot-frame", amount = 1}, + {type = "item", name = "express-transport-belt", amount = 2}, }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"flying-robot-frame", 1}, - {"express-transport-belt", 2}, - }, - results = - { - {type="item", name="sct-logistic-unimover", amount=1}, - }, + {type="item", name="sct-logistic-unimover", amount=1}, }, }, }) @@ -393,33 +388,32 @@ if mods["bobtech"] then name = "sct-logistic-memory-unit", subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]-e[memory-unit]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-memory-unit.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"arithmetic-combinator", 2}, + -- {"constant-combinator", 3}, + -- }, + -- results = + -- { + -- {type="item", name="sct-logistic-memory-unit", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"arithmetic-combinator", 2}, - {"constant-combinator", 3}, - }, - results = - { - {type="item", name="sct-logistic-memory-unit", amount=1}, - }, + {type = "item", name = "arithmetic-combinator", amount = 1}, + {type = "item", name = "constant-combinator", amount = 2}, }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"arithmetic-combinator", 1}, - {"constant-combinator", 2}, - }, - results = - { - {type="item", name="sct-logistic-memory-unit", amount=1}, - }, + {type="item", name="sct-logistic-memory-unit", amount=1}, }, }, }) @@ -430,35 +424,34 @@ if mods["bobtech"] then name = "sct-logistic-memory-unit", subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]-e[memory-unit]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-memory-unit.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"bob-gilded-copper-cable", 6}, + -- {"bob-integrated-electronics", 4}, + -- {"bob-solder", 4} + -- }, + -- results = + -- { + -- {type="item", name="sct-logistic-memory-unit", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"gilded-copper-cable", 6}, - {"intergrated-electronics", 4}, - {"solder", 4} - }, - results = - { - {type="item", name="sct-logistic-memory-unit", amount=1}, - }, + {type = "item", name = "bob-gilded-copper-cable", amount = 3}, + {type = "item", name = "bob-integrated-electronics", amount = 2}, + {type = "item", name = "bob-solder", amount = 2} }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"gilded-copper-cable", 3}, - {"intergrated-electronics", 2}, - {"solder", 2} - }, - results = - { - {type="item", name="sct-logistic-memory-unit", amount=1}, - }, + {type="item", name="sct-logistic-memory-unit", amount=1}, }, }, }) @@ -469,33 +462,32 @@ if mods["bobtech"] then name = "sct-logistic-memory-unit", subgroup = "sct-advanced-logistic-science-pack", order = "h_a[logistic]-e[memory-unit]", - expensive = + icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-memory-unit.png", + icon_size = 32, + -- expensive = + -- { + -- enabled = false, + -- energy_required = 4, + -- ingredients = + -- { + -- {"bob-integrated-electronics", 4}, + -- {"constant-combinator", 3}, + -- }, + -- results = + -- { + -- {type="item", name="sct-logistic-memory-unit", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 2, + ingredients = { - enabled = false, - energy_required = 4, - ingredients = - { - {"intergrated-electronics", 4}, - {"constant-combinator", 3}, - }, - results = - { - {type="item", name="sct-logistic-memory-unit", amount=1}, - }, + {type = "item", name = "bob-integrated-electronics", amount = 4}, + {type = "item", name = "constant-combinator", amount = 2}, }, - normal = + results = { - enabled = false, - energy_required = 2, - ingredients = - { - {"intergrated-electronics", 4}, - {"constant-combinator", 2}, - }, - results = - { - {type="item", name="sct-logistic-memory-unit", amount=1}, - }, + {type="item", name="sct-logistic-memory-unit", amount=1}, }, }, }) diff --git a/tweaks/bobsmods/science_bobmods_tech.lua b/tweaks/bobsmods/science_bobmods_tech.lua index 9df4ba4..1b62197 100644 --- a/tweaks/bobsmods/science_bobmods_tech.lua +++ b/tweaks/bobsmods/science_bobmods_tech.lua @@ -5,28 +5,29 @@ if mods["bobtech"] then { type = "technology", name = "sct-lab-lab2", - icon_size = 128, icons = { { icon = "__ScienceCostTweakerM__/graphics/bobmods/lab2-128.png", + icon_size = 128, }, { icon = "__ScienceCostTweakerM__/graphics/overlays/beta-128.png", + icon_size = 128, }, }, effects = { { type = "unlock-recipe", - recipe = "lab-2", + recipe = "bob-lab-2", }, }, prerequisites = { "utility-science-pack", "production-science-pack", - "advanced-logistic-science-pack", + "bob-advanced-logistic-science-pack", }, unit = { @@ -38,7 +39,7 @@ if mods["bobtech"] then {"chemical-science-pack", 1}, {"production-science-pack", 1}, {"utility-science-pack", 1}, - {"advanced-logistic-science-pack",1} + {"bob-advanced-logistic-science-pack",1} }, time = 40, }, diff --git a/tweaks/omnimatter/1_update.lua b/tweaks/omnimatter/1_update.lua index f5e84bd..8d75197 100644 --- a/tweaks/omnimatter/1_update.lua +++ b/tweaks/omnimatter/1_update.lua @@ -11,8 +11,8 @@ if mods["omnimatter_science"] and mods["omnimatter_crystal"] then sctm.lab_input_add("sct-lab-t3", "omni-pack") sctm.lab_input_add("sct-lab-t4", "omni-pack") -- add omnipack to bob labs - sctm.lab_input_add("lab-2", "omni-pack") - sctm.lab_input_add("lab-alien", "omni-pack") + sctm.lab_input_add("bob-lab-2", "omni-pack") + sctm.lab_input_add("bob-lab-alien", "omni-pack") -- add t3 lab dep on omnipack research (because it reuqires it) sctm.tech_dependency_add("sct-lab-t3", "omnipack-technology") -- omnipack icons diff --git a/tweaks/omnimatter/science_omnimatter_science.lua b/tweaks/omnimatter/science_omnimatter_science.lua index 4c51e83..01a91b8 100644 --- a/tweaks/omnimatter/science_omnimatter_science.lua +++ b/tweaks/omnimatter/science_omnimatter_science.lua @@ -90,33 +90,30 @@ if mods["omnimatter_science"] and mods["omnimatter_crystal"] then }, }, ]]-- - expensive = + -- expensive = + -- { + -- enabled = false, + -- energy_required = 10, + -- ingredients = + -- { + -- { type="item", name="sct-omni-pack-tools", amount=1 }, + -- { type="item", name="sct-omni-pack-minerals", amount=1 }, + -- }, + -- results = + -- { + -- { type="item", name="omni-pack", amount=2 }, + -- }, + -- }, + enabled = false, + energy_required = 10, + ingredients = { - enabled = false, - energy_required = 10, - ingredients = - { - { type="item", name="sct-omni-pack-tools", amount=1 }, - { type="item", name="sct-omni-pack-minerals", amount=1 }, - }, - results = - { - { type="item", name="omni-pack", amount=2 }, - }, + { type="item", name="sct-omni-pack-tools", amount=1 }, + { type="item", name="sct-omni-pack-minerals", amount=1 }, }, - normal = + results = { - enabled = false, - energy_required = 10, - ingredients = - { - { type="item", name="sct-omni-pack-tools", amount=1 }, - { type="item", name="sct-omni-pack-minerals", amount=1 }, - }, - results = - { - { type="item", name="omni-pack", amount=2 }, - }, + { type="item", name="omni-pack", amount=2 }, }, } }) @@ -129,33 +126,30 @@ if mods["omnimatter_science"] and mods["omnimatter_crystal"] then subgroup = "sct-omni-science-pack", order = "e_a[omni]-b[minerals]", category = "crafting-with-fluid", - expensive = + -- expensive = + -- { + -- enabled = false, + -- energy_required = 5, + -- ingredients = + -- { + -- {type="fluid", name="omniston", amount=80}, + -- {"iron-ore-crystal", 4}, + -- }, + -- results = + -- { + -- {type="item", name="sct-omni-pack-minerals", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 3, + ingredients = { - enabled = false, - energy_required = 5, - ingredients = - { - {type="fluid", name="omniston", amount=80}, - {"iron-ore-crystal", 4}, - }, - results = - { - {type="item", name="sct-omni-pack-minerals", amount=1}, - }, + {type="fluid", name="omniston", amount=20}, + {type = "item", name = "iron-ore-crystal", amount = 2}, }, - normal = + results = { - enabled = false, - energy_required = 3, - ingredients = - { - {type="fluid", name="omniston", amount=20}, - {"iron-ore-crystal", 2,}, - }, - results = - { - {type="item", name="sct-omni-pack-minerals", amount=1}, - }, + {type="item", name="sct-omni-pack-minerals", amount=1}, }, }, { @@ -163,33 +157,30 @@ if mods["omnimatter_science"] and mods["omnimatter_crystal"] then name = "sct-omni-pack-tools", subgroup = "sct-omni-science-pack", order = "e_a[omni]-c[tools]", - expensive = + -- expensive = + -- { + -- enabled = false, + -- energy_required = 5, + -- ingredients = + -- { + -- {"fast-transport-belt", 4}, + -- {"fast-inserter", 4}, + -- }, + -- results = + -- { + -- {type="item", name="sct-omni-pack-tools", amount=1}, + -- }, + -- }, + enabled = false, + energy_required = 3, + ingredients = { - enabled = false, - energy_required = 5, - ingredients = - { - {"fast-transport-belt", 4}, - {"fast-inserter", 4}, - }, - results = - { - {type="item", name="sct-omni-pack-tools", amount=1}, - }, + {type = "item", name = "fast-transport-belt", amount = 2}, + {type = "item", name = "fast-inserter", amount = 2}, }, - normal = + results = { - enabled = false, - energy_required = 3, - ingredients = - { - {"fast-transport-belt", 2}, - {"fast-inserter", 2,}, - }, - results = - { - {type="item", name="sct-omni-pack-tools", amount=1}, - }, + {type="item", name="sct-omni-pack-tools", amount=1}, }, }, }) diff --git a/tweaks/productivity-limitations.lua b/tweaks/productivity-limitations.lua index 01eff84..ad4f6b1 100644 --- a/tweaks/productivity-limitations.lua +++ b/tweaks/productivity-limitations.lua @@ -6,9 +6,9 @@ local science_packs_and_intermediates = "military-science-pack", "production-science-pack", "utility-science-pack", - "advanced-logistic-science-pack", - "alien-science-pack", - "science-pack-gold", + "bob-advanced-logistic-science-pack", + "bob-alien-science-pack", + "bob-science-pack-gold", "omni-pack", } @@ -29,5 +29,5 @@ if mods["angelsrefining"] and angelsmods and angelsmods.functions and angelsmods -- if bobsmod with productivity limit function exists, add it to list elseif mods["boblibrary"] and bobmods and bobmods.lib and bobmods.lib.module and bobmods.lib.module.add_productivity_limitations then -- sctm.log("bobprodlimit") - bobmods.lib.module.add_productivity_limitations(finallist) + bobmods.lib.module.add_productivity_limitations(finallist) -- TODO: remove this/ replace this ? end