diff --git a/ScienceCostTweakerM_0.16.49/configs/costs/rawmodels.lua b/ScienceCostTweakerM_0.16.49/configs/costs/rawmodels.lua index 41e0504..43fb4a5 100644 --- a/ScienceCostTweakerM_0.16.49/configs/costs/rawmodels.lua +++ b/ScienceCostTweakerM_0.16.49/configs/costs/rawmodels.lua @@ -11,12 +11,12 @@ function SCT_newTier(timeMult, stepCountMult, redMult, greenMult, blueMult, mili cost = {} } - costAdjuster.cost["science-pack-1"] = redMult -- Multiplier to Red Science Packs - costAdjuster.cost["science-pack-2"] = greenMult -- Multiplier to Green Science Packs - costAdjuster.cost["science-pack-3"] = blueMult -- Multiplier to Blue Science Packs + costAdjuster.cost["automation-science-pack"] = redMult -- Multiplier to Red Science Packs + costAdjuster.cost["logistic-science-pack"] = greenMult -- Multiplier to Green Science Packs + costAdjuster.cost["chemical-science-pack"] = blueMult -- Multiplier to Blue Science Packs costAdjuster.cost["military-science-pack"] = militaryMult -- Multiplier to Military Science Packs costAdjuster.cost["production-science-pack"] = productionMult -- Multiplier to Production Science Packs - costAdjuster.cost["high-tech-science-pack"] = hightechMult -- Multiplier to High Tech Science Packs + costAdjuster.cost["utility-science-pack"] = hightechMult -- Multiplier to High Tech Science Packs return costAdjuster; end diff --git a/ScienceCostTweakerM_0.16.49/configs/costs/uberwaffe.lua b/ScienceCostTweakerM_0.16.49/configs/costs/uberwaffe.lua index 3296f0d..6b0fdca 100644 --- a/ScienceCostTweakerM_0.16.49/configs/costs/uberwaffe.lua +++ b/ScienceCostTweakerM_0.16.49/configs/costs/uberwaffe.lua @@ -24,6 +24,6 @@ sct_cost.uberwaffe.costs.darkmatter = SCT_newDarkMatter(1.0, 2500.0, 1.0, 1.0, 1 -- Personal Tweaking (UberTweaks Mod) of Bob's Module research replaces Module Case and Module Circuit with Science Pack 3 and Alien Science Packs. -- So add them into the table of ingredient cost multipliers. -sct_cost.uberwaffe.costs.bobmodules.cost["science-pack-3"] = 1.0 -sct_cost.uberwaffe.costs.bobmodules.cost["high-tech-science-pack"] = 1.0 -sct_cost.uberwaffe.costs.bobmodules.cost["space-science-pack"] = 1.0 \ No newline at end of file +sct_cost.uberwaffe.costs.bobmodules.cost["chemical-science-pack"] = 1.0 +sct_cost.uberwaffe.costs.bobmodules.cost["utility-science-pack"] = 1.0 +sct_cost.uberwaffe.costs.bobmodules.cost["space-science-pack"] = 1.0 diff --git a/ScienceCostTweakerM_0.16.49/data-final-fixes.lua b/ScienceCostTweakerM_0.16.49/data-final-fixes.lua index fffdfcb..4254341 100644 --- a/ScienceCostTweakerM_0.16.49/data-final-fixes.lua +++ b/ScienceCostTweakerM_0.16.49/data-final-fixes.lua @@ -28,7 +28,7 @@ if (settings.startup["sct-difficulty-cost"].value ~= "noadjustment") then tier = 1 multiplier = sciencecosttweaker.costs.tier1; for Index, Value in pairs( tech.unit.ingredients ) do - if (tier < 2 and tech.unit.ingredients[Index][1] == "science-pack-2") then + if (tier < 2 and tech.unit.ingredients[Index][1] == "logistic-science-pack") then tier = 2 multiplier = sciencecosttweaker.costs.tier2; end @@ -40,11 +40,11 @@ if (settings.startup["sct-difficulty-cost"].value ~= "noadjustment") then tier = 4 multiplier = sciencecosttweaker.costs.production; end - if (tier < 5 and tech.unit.ingredients[Index][1] == "science-pack-3") then + if (tier < 5 and tech.unit.ingredients[Index][1] == "chemical-science-pack") then tier = 5 multiplier = sciencecosttweaker.costs.tier3; end - if (tier < 6 and tech.unit.ingredients[Index][1] == "high-tech-science-pack") then + if (tier < 6 and tech.unit.ingredients[Index][1] == "utility-science-pack") then tier = 6 multiplier = sciencecosttweaker.costs.hightech; end diff --git a/ScienceCostTweakerM_0.16.49/info.json b/ScienceCostTweakerM_0.16.49/info.json index 8405e64..6933431 100644 --- a/ScienceCostTweakerM_0.16.49/info.json +++ b/ScienceCostTweakerM_0.16.49/info.json @@ -1,7 +1,7 @@ { "name": "ScienceCostTweakerM", "version": "0.16.49", - "factorio_version":"0.16", + "factorio_version":"0.17", "title": "ScienceCostTweaker Mod (mexmer)", "author": "mexmer", "dependencies": ["base >= 0.16.0" ], diff --git a/ScienceCostTweakerM_0.16.49/locale/en/sciencecosttweaker.cfg b/ScienceCostTweakerM_0.16.49/locale/en/sciencecosttweaker.cfg index 13894f7..67c0d0e 100644 --- a/ScienceCostTweakerM_0.16.49/locale/en/sciencecosttweaker.cfg +++ b/ScienceCostTweakerM_0.16.49/locale/en/sciencecosttweaker.cfg @@ -37,9 +37,9 @@ sct-science-pack-logistic=Technology for controling logistic item flow and optim sct-science-pack-0=Will it burn? [item-description] sct-science-pack-0=Used by Burner Lab for adapting technology to the local environment, everything will burn, but you might learn something from it -science-pack-1=Used by Lab for adapting technology to the local environment, this electromagnet is destroyed during use but allows for intricate electromagnetic experiments. -science-pack-2=Used by Lab for adapting technology to the local environment, this fragile equipment is destroyed during use but provide keen insight into the local environment's effects upon materials and chemical reactions. -science-pack-3=Used by Lab for adapting technology to the local environment, these can manipulate and monitor interactions on an atomic level, but burn themselves out in the process. +automation-science-pack=Used by Lab for adapting technology to the local environment, this electromagnet is destroyed during use but allows for intricate electromagnetic experiments. +logistic-science-pack=Used by Lab for adapting technology to the local environment, this fragile equipment is destroyed during use but provide keen insight into the local environment's effects upon materials and chemical reactions. +chemical-science-pack=Used by Lab for adapting technology to the local environment, these can manipulate and monitor interactions on an atomic level, but burn themselves out in the process. military-science-pack=Used by Lab for adapting weapons technology to the local environment, these single use items perform weapons tests and analyze the results. production-science-pack=Used by Lab for adapting production technology to the local environment, these living processors can directly manipulate and monitor quantum level interactions, but are destroyed during the hostile research experiments. high-tech-pack=Used by Lab for adapting high technology to the local environment, these single use items can forge virtual particles to manipulate and analyze matter and quantum fields. @@ -111,12 +111,12 @@ sct-bm4-part5a=Regulator sct-bm4-part5b=Layered Insulation sct-bm4-part5c=Containment Array sct-bm4-part5d=Control Core -science-pack-1=Sacrificial electromagnet -science-pack-2=Single-use ATMOS set -science-pack-3=Uni-lived atomic manipulator +automation-science-pack=Sacrificial electromagnet +logistic-science-pack=Single-use ATMOS set +chemical-science-pack=Uni-lived atomic manipulator military-science-pack=Ablative weapons testing kit production-science-pack=Burns-out QL Bio-processor -high-tech-science-pack=Onerun Virtual Particle Forge +utility-science-pack=Onerun Virtual Particle Forge sct-lab1-construction=Lab construction core sct-lab1-mechanization=Lab mechanization sct-lab2-construction=Advanced lab construction core @@ -135,7 +135,6 @@ 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 -logistic-science-pack=Commercial AI implementation ;pymods sct-prod-pycontainer=Fusion compound container sct-t1-pybotle=Electrolyte container @@ -185,9 +184,9 @@ sct-bm4-part2=VP Component Assembly sct-bm4-part3=VP Core Components sct-bm4-part4=VP Energy Components sct-bm4-part5=VP Control and Containment -science-pack-1=__ITEM__science-pack-1__ -science-pack-2=__ITEM__science-pack-2__ -science-pack-3=__ITEM__science-pack-3__ +automation-science-pack=__ITEM__automation-science-pack__ +logistic-science-pack=__ITEM__logistic-science-pack__ +chemical-science-pack=__ITEM__chemical-science-pack__ science-pack-4=__ITEM__science-pack-4__ alien-science-pack=__ITEM__alien-science-pack__ basic-circuit-board-base=__ITEM__basic-circuit-board-base__ diff --git a/ScienceCostTweakerM_0.16.49/locale/ja/sciencecosttweaker.cfg b/ScienceCostTweakerM_0.16.49/locale/ja/sciencecosttweaker.cfg index 2d5e744..929fa52 100644 --- a/ScienceCostTweakerM_0.16.49/locale/ja/sciencecosttweaker.cfg +++ b/ScienceCostTweakerM_0.16.49/locale/ja/sciencecosttweaker.cfg @@ -37,9 +37,9 @@ sct-science-pack-logistic=物流フローと最適な転送と配送を制御す sct-science-pack-0=燃焼しますか? [item-description] sct-science-pack-0=テクノロジーを局所環境に適応させるために燃焼研究所で使用され、全て燃え尽きるでしょうがそこから何かを学ぶかもしれません。 -science-pack-1=テクノロジーを局所環境に適応させるために研究所で使用され、この電磁石は使用中に破壊されますが複雑な電磁気実験を可能にします。 -science-pack-2=テクノロジーを局所環境に適応させるために研究所で使用され、この脆弱な機器は使用中に破壊されますが材料や化学反応に対する環境の影響についての鋭い洞察を提供します。 -science-pack-3=テクノロジーを局所環境に適応させるために研究所で使用され、これらは原子レベルでの相互作用を操作し監視することができますがプロセスで自ら消滅します。 +automation-science-pack=テクノロジーを局所環境に適応させるために研究所で使用され、この電磁石は使用中に破壊されますが複雑な電磁気実験を可能にします。 +logistic-science-pack=テクノロジーを局所環境に適応させるために研究所で使用され、この脆弱な機器は使用中に破壊されますが材料や化学反応に対する環境の影響についての鋭い洞察を提供します。 +chemical-science-pack=テクノロジーを局所環境に適応させるために研究所で使用され、これらは原子レベルでの相互作用を操作し監視することができますがプロセスで自ら消滅します。 military-science-pack=武器テクノロジーを局所環境に適応させるために研究所で使用され、これらの使い捨てアイテムは武器の検査を行い結果を分析します。 production-science-pack=生産テクノロジーを局所環境に適応させるために研究所で使用され、これらの生体プロセッサは量子レベルの相互作用を直接操作し監視することができますが、敵対的な研究の実験では破壊されます。 high-tech-pack=高度なテクノロジーを局所環境に適応させるために研究所で使用され、これらの使い捨てアイテムは仮想粒子を操作して物質と量子フィールドを操作し分析することができます。 @@ -111,12 +111,12 @@ sct-bm4-part5a=調節器 sct-bm4-part5b=層状絶縁体 sct-bm4-part5c=抑制アレイ sct-bm4-part5d=コントロールコア -science-pack-1=犠牲電磁石 -science-pack-2=使い捨てATMOSセット -science-pack-3=使い捨て原子マニピュレーター +automation-science-pack=犠牲電磁石 +logistic-science-pack=使い捨てATMOSセット +chemical-science-pack=使い捨て原子マニピュレーター military-science-pack=破壊的武器試験キット production-science-pack=焼けたQL生体プロセッサ -high-tech-science-pack=使い捨て仮想粒子炉 +utility-science-pack=使い捨て仮想粒子炉 sct-lab1-construction=研究所建設コア sct-lab1-mechanization=研究所機械化 sct-lab2-construction=発展研究所建設コア @@ -185,9 +185,9 @@ sct-bm4-part2=VPコンポーネント組立 sct-bm4-part3=VPコアコンポーネント sct-bm4-part4=VPエネルギーコンポーネント sct-bm4-part5=VPコントロールと抑制 -science-pack-1=__ITEM__science-pack-1__ -science-pack-2=__ITEM__science-pack-2__ -science-pack-3=__ITEM__science-pack-3__ +automation-science-pack=__ITEM__automation-science-pack__ +logistic-science-pack=__ITEM__logistic-science-pack__ +chemical-science-pack=__ITEM__chemical-science-pack__ science-pack-4=__ITEM__science-pack-4__ alien-science-pack=__ITEM__alien-science-pack__ basic-circuit-board-base=__ITEM__basic-circuit-board-base__ diff --git a/ScienceCostTweakerM_0.16.49/migrations/ScienceCostTweaker_0.16.13.lua b/ScienceCostTweakerM_0.16.49/migrations/ScienceCostTweaker_0.16.13.lua index cc491e2..332f5ea 100644 --- a/ScienceCostTweakerM_0.16.49/migrations/ScienceCostTweaker_0.16.13.lua +++ b/ScienceCostTweakerM_0.16.49/migrations/ScienceCostTweaker_0.16.13.lua @@ -9,7 +9,7 @@ for index, force in pairs(game.forces) do force.recipes["sct-lab-t2"].enabled = true end - force.recipes["science-pack-2"].enabled = true + force.recipes["logistic-science-pack"].enabled = true force.recipes["sct-t2-instruments"].enabled = true force.recipes["sct-t2-microcircuits"].enabled = true force.recipes["sct-t2-micro-wafer"].enabled = true diff --git a/ScienceCostTweakerM_0.16.49/prototypes/2_technology.lua b/ScienceCostTweakerM_0.16.49/prototypes/2_technology.lua index 6fac77c..12427e2 100644 --- a/ScienceCostTweakerM_0.16.49/prototypes/2_technology.lua +++ b/ScienceCostTweakerM_0.16.49/prototypes/2_technology.lua @@ -3,19 +3,19 @@ scttechmap = { -- vanilla - ["science-pack-1"] = "sct-research-t1", - ["science-pack-2"] = "sct-research-t2", - ["science-pack-3"] = "sct-research-t3", + ["automation-science-pack"] = "sct-research-t1", + ["logistic-science-pack"] = "sct-research-t2", + ["chemical-science-pack"] = "sct-research-t3", ["military-science-pack"] = "sct-research-mil", ["production-science-pack"] = "sct-research-prod", - ["high-tech-science-pack"] = "sct-research-ht", + ["utility-science-pack"] = "sct-research-ht", ["space-science-pack"] = "sct-research-space", -- omni ["omni-pack"] = "sct-research-omni", -- angels ["sct-science-pack-bio"] = "sct-research-bio", -- bobs - ["logistic-science-pack"] = "sct-research-logistic", +-- ["logistic-science-pack"] = "sct-research-logistic", ["science-pack-gold"] = "sct-research-gold", ["effectivity-processor"] = "modules", ["module-case"] = "modules", @@ -128,7 +128,7 @@ end if settings.startup["sct-connect-science"] and settings.startup["sct-connect-science"].value == true then sctm.log("science connect started") - local first_scient = "science-pack-1" + local first_scient = "automation-science-pack" if data.raw.tool["science-pack-0"] then first_science = "science-pack-0" end @@ -138,12 +138,12 @@ end -- remove known science pack unlocks from other technologies local knownpackmatchlist = { - { partial = false, name = "science-pack-1" }, - { partial = false, name = "science-pack-2" }, - { partial = false, name = "science-pack-3" }, + { partial = false, name = "automation-science-pack" }, + { partial = false, name = "logistic-science-pack" }, + { partial = false, name = "chemical-science-pack" }, { partial = false, name = "production-science-pack" }, { partial = false, name = "military-science-pack" }, - { partial = false, name = "high-tech-science-pack" }, + { partial = false, name = "utility-science-pack" }, -- { partial = false, name = "space-science-pack" }, -- not done yet { partial = false, name = "logistic-science-pack" }, -- bobs { partial = false, name = "science-pack-gold" }, -- bobs diff --git a/ScienceCostTweakerM_0.16.49/prototypes/entities/intermediates.lua b/ScienceCostTweakerM_0.16.49/prototypes/entities/intermediates.lua index e84a6f6..0b8f8a9 100644 --- a/ScienceCostTweakerM_0.16.49/prototypes/entities/intermediates.lua +++ b/ScienceCostTweakerM_0.16.49/prototypes/entities/intermediates.lua @@ -7,7 +7,6 @@ data:extend({ name = "sct-waste-copperonly", icon = "__ScienceCostTweakerM__/graphics/icons/sct-waste-copperonly.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-byproducts", order = "c[bp]-a[copperwaste]", stack_size = 200 @@ -17,7 +16,6 @@ data:extend({ name = "sct-waste-ironcopper", icon = "__ScienceCostTweakerM__/graphics/icons/sct-waste-ironcopper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-byproducts", order = "c[bp]-b[mixedewaste]", stack_size = 200 @@ -30,7 +28,6 @@ data:extend({ name = "sct-t1-ironcore", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t1-iron-core.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-1", order = "d[t1]-b[ironcore]", stack_size = 200 @@ -41,7 +38,6 @@ data:extend({ name = "sct-t1-magnet-coils", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t1-magnet-coils.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-1", order = "d[t1]-c[magnet-coils]", stack_size = 200 @@ -54,7 +50,6 @@ data:extend({ name = "sct-t2-instruments", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t2-instruments.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "e[t2]-b[instruments]", stack_size = 200 @@ -65,7 +60,6 @@ data:extend({ name = "sct-t2-microcircuits", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t2-microcircuits.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "e[t2]-c[microcircuits]", stack_size = 200 @@ -76,7 +70,6 @@ data:extend({ name = "sct-t2-micro-wafer", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t2-micro-wafer.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "e[t2]-d[micro-wafer]", stack_size = 200 @@ -87,7 +80,6 @@ data:extend({ name = "sct-t2-wafer-stamp", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t2-wafer-stamp.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "e[t2]-e[wafer-stamp]", stack_size = 200 @@ -98,7 +90,6 @@ data:extend({ name = "sct-t2-reaction-nodes", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t2-reaction-nodes.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "e[t2]-f[reaction-nodes]", stack_size = 200 @@ -112,7 +103,6 @@ data:extend({ name = "sct-t3-femto-lasers", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t3-femto-lasers.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "f[t3]-b[femtolasers]", stack_size = 200 @@ -123,7 +113,6 @@ data:extend({ name = "sct-t3-flash-fuel", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t3-flash-fuel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "f[t3]-c[flashfuel]", stack_size = 200 @@ -134,7 +123,6 @@ data:extend({ name = "sct-t3-laser-foci", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t3-laser-foci.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "f[t3]-d[laserfoci]", stack_size = 200 @@ -145,7 +133,6 @@ data:extend({ name = "sct-t3-laser-emitter", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t3-laser-emitter.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "f[t3]-e[laseremitter]", stack_size = 200 @@ -156,7 +143,6 @@ data:extend({ name = "sct-t3-atomic-sensors", icon = "__ScienceCostTweakerM__/graphics/icons/sct-t3-atomic-sensors.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "f[t3]-f[atomicsensors]", stack_size = 200 @@ -169,7 +155,6 @@ data:extend({ name = "sct-mil-plating", icon = "__ScienceCostTweakerM__/graphics/icons/sct-mil-plating.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "g[mil]-b[plating]", stack_size = 200 @@ -180,7 +165,6 @@ data:extend({ name = "sct-mil-subplating", icon = "__ScienceCostTweakerM__/graphics/icons/sct-mil-subplating.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "g[mil]-c[subplating]", stack_size = 200 @@ -191,7 +175,6 @@ data:extend({ name = "sct-mil-circuit3", icon = "__ScienceCostTweakerM__/graphics/icons/sct-mil-circuit3.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "g[mil]-d[circuit3]", stack_size = 200 @@ -202,7 +185,6 @@ data:extend({ name = "sct-mil-circuit2", icon = "__ScienceCostTweakerM__/graphics/icons/sct-mil-circuit2.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "g[mil]-e[circuit2]", stack_size = 200 @@ -213,7 +195,6 @@ data:extend({ name = "sct-mil-circuit1", icon = "__ScienceCostTweakerM__/graphics/icons/sct-mil-circuit1.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "g[mil]-f[circuit1]", stack_size = 200 @@ -226,7 +207,6 @@ data:extend({ name = "sct-prod-bioprocessor", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-prod-bioprocessor.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "h[prod]-b[bioprocessor]", stack_size = 200 @@ -237,7 +217,6 @@ data:extend({ name = "sct-prod-baked-biopaste", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-prod-baked-biopaste.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "h[prod]-c[biopaste]", stack_size = 200 @@ -248,7 +227,6 @@ data:extend({ name = "sct-prod-biosilicate", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-prod-biosilicate.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "h[prod]-d[biosilicate]", stack_size = 200 @@ -259,7 +237,6 @@ data:extend({ name = "sct-prod-overclocker", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-prod-overclocker.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "h[prod]-e[overclocker]", stack_size = 200 @@ -270,7 +247,6 @@ data:extend({ name = "sct-prod-chipcase", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-prod-chipcase.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "h[prod]-f[chipcase]", stack_size = 200 @@ -285,7 +261,6 @@ data:extend({ name = "sct-htech-capbank", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-htech-capbank.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "i[ht]-b[capbank]", stack_size = 200 @@ -297,7 +272,6 @@ data:extend({ name = "sct-htech-injector", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-htech-injector.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "i[ht]-c[injector]", stack_size = 200 @@ -309,7 +283,6 @@ data:extend({ name = "sct-htech-random", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-htech-random.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "i[ht]-d[random]", stack_size = 200 @@ -321,7 +294,6 @@ data:extend({ name = "sct-htech-thermalstore-heated", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-htech-thermalstore-heated.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "i[ht]-e[thermalstore-heated]", stack_size = 200 @@ -333,7 +305,6 @@ data:extend({ name = "sct-htech-thermalstore", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-htech-thermalstore.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "i[ht]-f[thermalstore]", stack_size = 200 @@ -346,7 +317,6 @@ data:extend({ name = "sct-bm4-plating", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-bm4-part2a.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-plating]", stack_size = 200 @@ -358,7 +328,6 @@ data:extend({ name = "sct-bm4-part3b", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-bm4-part1c.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part3b]", stack_size = 200 @@ -370,7 +339,6 @@ data:extend({ name = "sct-bm4-part3c", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-bm4-part2a.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part3c]", stack_size = 200 @@ -382,7 +350,6 @@ data:extend({ name = "sct-bm4-part3d", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-bm4-part2b.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part3d]", stack_size = 200 @@ -394,7 +361,6 @@ data:extend({ name = "sct-bm4-part4a", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-bm4-part2a.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part4a]", stack_size = 200 @@ -406,7 +372,6 @@ data:extend({ name = "sct-bm4-part4b", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-bm4-part2a.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part4b]", stack_size = 200 @@ -418,7 +383,6 @@ data:extend({ name = "sct-bm4-part4c", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-bm4-part2a.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part4c]", stack_size = 200 @@ -430,7 +394,6 @@ data:extend({ name = "sct-bm4-part4d", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-bm4-part2a.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part4d]", stack_size = 200 @@ -445,7 +408,6 @@ data:extend({ name = "sct-lab1-construction", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-lab1-construction.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-labparts", order = "b[labparts]-a[lab1]-b[construction]", stack_size = 10, @@ -456,7 +418,6 @@ data:extend({ name = "sct-lab1-mechanization", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-lab1-mechanization.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-labparts", order = "b[labparts]-a[lab1]-c[mechanization]", stack_size = 10, @@ -468,7 +429,6 @@ data:extend({ name = "sct-lab2-construction", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-lab2-construction.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-labparts", order = "b[labparts]-b[lab2]-b[construction]", stack_size = 10, @@ -479,7 +439,6 @@ data:extend({ name = "sct-lab2-automatization", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-lab2-automatization.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-labparts", order = "b[labparts]-b[lab2]-c[automatization]", stack_size = 10, @@ -491,7 +450,6 @@ data:extend({ name = "sct-lab3-construction", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-lab3-construction.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-labparts", order = "b[labparts]-c[lab3]-c[construction]", stack_size = 10, @@ -502,7 +460,6 @@ data:extend({ name = "sct-lab3-optics", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-lab3-optics.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-labparts", order = "b[labparts]-c[lab3]-c[optics]", stack_size = 10, @@ -514,7 +471,6 @@ data:extend({ name = "sct-lab4-construction", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-lab4-construction.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-labparts", order = "b[labparts]-d[lab4]-b[construction]", stack_size = 10, @@ -525,7 +481,6 @@ data:extend({ name = "sct-lab4-manipulators", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/icons/sct-lab4-manipulators.png", - flags = {"goes-to-main-inventory"}, subgroup = "sct-labparts", order = "b[labparts]-d[lab4]-c[manipulators]", stack_size = 10, diff --git a/ScienceCostTweakerM_0.16.49/prototypes/entities/labs.lua b/ScienceCostTweakerM_0.16.49/prototypes/entities/labs.lua index 0fe4294..3cc06e1 100644 --- a/ScienceCostTweakerM_0.16.49/prototypes/entities/labs.lua +++ b/ScienceCostTweakerM_0.16.49/prototypes/entities/labs.lua @@ -6,7 +6,6 @@ data:extend({ name = "sct-lab-t1", icon_size = 32, icon = "__ScienceCostTweakerM__/graphics/sct-lab-1/icon.png", - flags = {"goes-to-quickbar"}, subgroup = "sct-labs", order = "a[labs]-a[sct-lab-t1]", place_result = "sct-lab-t1", @@ -63,7 +62,7 @@ data:extend({ energy_usage = "60kW", inputs = { - "science-pack-1" + "automation-science-pack" }, module_specification = { @@ -91,7 +90,6 @@ data:extend({ icon = "__ScienceCostTweakerM__/graphics/overlays/2.png", }, }, - flags = {"goes-to-quickbar"}, subgroup = "sct-labs", order = "a[labs]-b[sct-lab-t2]", place_result = "sct-lab-t2", @@ -154,8 +152,8 @@ data:extend({ energy_usage = "150kW", inputs = { - "science-pack-1", - "science-pack-2" + "automation-science-pack", + "logistic-science-pack" }, module_specification = { @@ -180,7 +178,6 @@ data:extend({ icon = "__ScienceCostTweakerM__/graphics/overlays/3.png", }, }, - flags = {"goes-to-quickbar"}, subgroup = "sct-labs", order = "a[labs]-c[sct-lab-t3]", place_result = "sct-lab-t3", @@ -243,9 +240,9 @@ data:extend({ energy_usage = "500kW", inputs = { - "science-pack-1", - "science-pack-2", - "science-pack-3", + "automation-science-pack", + "logistic-science-pack", + "chemical-science-pack", "military-science-pack", "production-science-pack" }, @@ -273,7 +270,6 @@ data:extend({ icon = "__ScienceCostTweakerM__/graphics/overlays/4.png", }, }, - flags = {"goes-to-quickbar"}, subgroup = "sct-labs", order = "a[labs]-d[sct-lab-t4]", place_result = "sct-lab-t4", @@ -336,12 +332,12 @@ data:extend({ energy_usage = "2MW", inputs = { - "science-pack-1", - "science-pack-2", - "science-pack-3", + "automation-science-pack", + "logistic-science-pack", + "chemical-science-pack", "military-science-pack", "production-science-pack", - "high-tech-science-pack", + "utility-science-pack", "space-science-pack" }, module_specification = @@ -403,7 +399,7 @@ data.raw["lab"]["lab"].off_animation = data.raw["lab"]["lab"].energy_usage = "60kW" data.raw["lab"]["lab"].inputs = { - "science-pack-1" + "automation-science-pack" } data.raw["lab"]["lab"].module_specification = { diff --git a/ScienceCostTweakerM_0.16.49/prototypes/entities/sciencepacks.lua b/ScienceCostTweakerM_0.16.49/prototypes/entities/sciencepacks.lua index 5e79db5..e51d242 100644 --- a/ScienceCostTweakerM_0.16.49/prototypes/entities/sciencepacks.lua +++ b/ScienceCostTweakerM_0.16.49/prototypes/entities/sciencepacks.lua @@ -1,13 +1,13 @@ -- since this overriding existing item, we only alter grouping here, recipe changes are in recipe -data.raw["tool"]["science-pack-1"].subgroup = "sct-sciencepack-1" -data.raw["tool"]["science-pack-1"].order = "d[t1]-a[science-pack-1]" +data.raw["tool"]["automation-science-pack"].subgroup = "sct-sciencepack-1" +data.raw["tool"]["automation-science-pack"].order = "d[t1]-a[automation-science-pack]" -data.raw["tool"]["science-pack-2"].subgroup = "sct-sciencepack-2" -data.raw["tool"]["science-pack-2"].order = "e[t2]-a[science-pack-2]" +data.raw["tool"]["logistic-science-pack"].subgroup = "sct-sciencepack-2" +data.raw["tool"]["logistic-science-pack"].order = "e[t2]-a[logistic-science-pack]" -data.raw["tool"]["science-pack-3"].subgroup = "sct-sciencepack-3" -data.raw["tool"]["science-pack-3"].order = "f[t3]-a[science-pack-3]" +data.raw["tool"]["chemical-science-pack"].subgroup = "sct-sciencepack-3" +data.raw["tool"]["chemical-science-pack"].order = "f[t3]-a[chemical-science-pack]" data.raw["tool"]["military-science-pack"].subgroup = "sct-sciencepack-mil" data.raw["tool"]["military-science-pack"].order = "g[mil]-a[military-science-pack]" @@ -15,44 +15,44 @@ data.raw["tool"]["military-science-pack"].order = "g[mil]-a[military-science-pac data.raw["tool"]["production-science-pack"].subgroup = "sct-sciencepack-prod" data.raw["tool"]["production-science-pack"].order = "h[prod]-a[production-science-pack]" -data.raw["tool"]["high-tech-science-pack"].subgroup = "sct-sciencepack-hightech" -data.raw["tool"]["high-tech-science-pack"].order = "i[ht]-a[high-tech-science-pack]" +data.raw["tool"]["utility-science-pack"].subgroup = "sct-sciencepack-hightech" +data.raw["tool"]["utility-science-pack"].order = "i[ht]-a[utility-science-pack]" data.raw["tool"]["space-science-pack"].subgroup = "sct-sciencepack-space" data.raw["tool"]["space-science-pack"].order = "z[space]-a[space-science-pack]" -- icons if settings.startup["sct-hd-icons"] and settings.startup["sct-hd-icons"].value == true then - data.raw["tool"]["science-pack-1"].icon_size = 64 - data.raw["tool"]["science-pack-1"].icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-1-64.png" - data.raw["tool"]["science-pack-3"].icon_size = 64 - data.raw["tool"]["science-pack-3"].icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-3-64.png" - data.raw["tool"]["science-pack-2"].icon_size = 64 - data.raw["tool"]["science-pack-2"].icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-2-64.png" + data.raw["tool"]["automation-science-pack"].icon_size = 64 + data.raw["tool"]["automation-science-pack"].icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-1-64.png" + data.raw["tool"]["chemical-science-pack"].icon_size = 64 + data.raw["tool"]["chemical-science-pack"].icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-3-64.png" + data.raw["tool"]["logistic-science-pack"].icon_size = 64 + data.raw["tool"]["logistic-science-pack"].icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-2-64.png" data.raw["tool"]["military-science-pack"].icon_size = 64 data.raw["tool"]["military-science-pack"].icon = "__ScienceCostTweakerM__/graphics/icons/military-science-pack-64.png" data.raw["tool"]["production-science-pack"].icon_size = 64 data.raw["tool"]["production-science-pack"].icon = "__ScienceCostTweakerM__/graphics/icons/production-science-pack-64.png" - data.raw["tool"]["high-tech-science-pack"].icon_size = 64 - data.raw["tool"]["high-tech-science-pack"].icon = "__ScienceCostTweakerM__/graphics/icons/high-tech-science-pack-64.png" + data.raw["tool"]["utility-science-pack"].icon_size = 64 + data.raw["tool"]["utility-science-pack"].icon = "__ScienceCostTweakerM__/graphics/icons/high-tech-science-pack-64.png" data.raw["tool"]["space-science-pack"].icon_size = 64 data.raw["tool"]["space-science-pack"].icon = "__ScienceCostTweakerM__/graphics/icons/space-science-pack-64.png" else - data.raw["tool"]["science-pack-1"].icons = + data.raw["tool"]["automation-science-pack"].icons = { { icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-1.png", icon_size = 32, }, } - data.raw["tool"]["science-pack-2"].icons = + data.raw["tool"]["logistic-science-pack"].icons = { { icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-2.png", icon_size = 32, }, } - data.raw["tool"]["science-pack-3"].icons = + data.raw["tool"]["chemical-science-pack"].icons = { { icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-3.png", @@ -73,7 +73,7 @@ else icon_size = 32, }, } - data.raw["tool"]["high-tech-science-pack"].icons = + data.raw["tool"]["utility-science-pack"].icons = { { icon = "__ScienceCostTweakerM__/graphics/icons/high-tech-science-pack.png", @@ -87,4 +87,4 @@ else icon_size = 32, }, } -end \ No newline at end of file +end diff --git a/ScienceCostTweakerM_0.16.49/prototypes/recipes/sciencepacks.lua b/ScienceCostTweakerM_0.16.49/prototypes/recipes/sciencepacks.lua index 09cd812..df091b0 100644 --- a/ScienceCostTweakerM_0.16.49/prototypes/recipes/sciencepacks.lua +++ b/ScienceCostTweakerM_0.16.49/prototypes/recipes/sciencepacks.lua @@ -9,7 +9,7 @@ data:extend( type = "recipe", name = "sct-science-pack-t1", subgroup = "sct-sciencepack-1", - order = "d[t1]-a[science-pack-1]", + order = "d[t1]-a[automation-science-pack]", --[[ expensive = { enabled = false, @@ -19,7 +19,7 @@ data:extend( {"sct-t1-magnet-coils", 5} }, results = { - {type = "item", amount = 1, name = "science-pack-1"} + {type = "item", amount = 1, name = "automation-science-pack"} }, energy_required = 12 }, @@ -32,7 +32,7 @@ data:extend( {"sct-t1-magnet-coils", 2} }, results = { - {type = "item", amount = 1, name = "science-pack-1"} + {type = "item", amount = 1, name = "automation-science-pack"} }, energy_required = 5 } @@ -47,7 +47,7 @@ data:extend( type = "recipe", name = "sct-science-pack-t2", subgroup = "sct-sciencepack-2", - order = "e[t2]-a[science-pack-2]", + order = "e[t2]-a[logistic-science-pack]", --[[ expensive = { enabled = false, @@ -57,7 +57,7 @@ data:extend( {"sct-t2-reaction-nodes", 2} }, results = { - {type = "item", amount = 1, name = "science-pack-2"} + {type = "item", amount = 1, name = "logistic-science-pack"} }, energy_required = 15, enabled = false @@ -71,7 +71,7 @@ data:extend( {"sct-t2-reaction-nodes", 1} }, results = { - {type = "item", amount = 1, name = "science-pack-2"} + {type = "item", amount = 1, name = "logistic-science-pack"} }, energy_required = 6, enabled = false @@ -102,7 +102,7 @@ data:extend( type = "recipe", name = "sct-science-pack-t3", subgroup = "sct-sciencepack-3", - order = "f[t3]-a[science-pack-3]", + order = "f[t3]-a[chemical-science-pack]", --[[ expensive = { enabled = false, @@ -112,7 +112,7 @@ data:extend( {"sct-t3-atomic-sensors", 2} }, results = { - {type = "item", amount = 1, name = "science-pack-3"} + {type = "item", amount = 1, name = "chemical-science-pack"} }, energy_required = 30, enabled = false @@ -126,7 +126,7 @@ data:extend( {"sct-t3-atomic-sensors", 1} }, results = { - {type = "item", amount = 1, name = "science-pack-3"} + {type = "item", amount = 1, name = "chemical-science-pack"} }, energy_required = 12, enabled = false @@ -264,7 +264,7 @@ data:extend( {"sct-htech-random", 3} }, results = { - {type = "item", amount = 2, name = "high-tech-science-pack"} + {type = "item", amount = 2, name = "utility-science-pack"} }, energy_required = 35, enabled = false @@ -279,7 +279,7 @@ data:extend( {"sct-htech-random", 1} }, results = { - {type = "item", amount = 2, name = "high-tech-science-pack"} + {type = "item", amount = 2, name = "utility-science-pack"} }, energy_required = 14, }, @@ -303,16 +303,16 @@ for _, stp in pairs(sctpacks) do end local sciencepack1 = table.deepcopy(data.raw.recipe["sct-science-pack-t1"]) -sciencepack1.name = "science-pack-1" -data.raw.recipe["science-pack-1"] = sciencepack1 +sciencepack1.name = "automation-science-pack" +data.raw.recipe["automation-science-pack"] = sciencepack1 local sciencepack2 = table.deepcopy(data.raw.recipe["sct-science-pack-t2"]) -sciencepack2.name = "science-pack-2" -data.raw.recipe["science-pack-2"] = sciencepack2 +sciencepack2.name = "logistic-science-pack" +data.raw.recipe["logistic-science-pack"] = sciencepack2 local sciencepack3 = table.deepcopy(data.raw.recipe["sct-science-pack-t3"]) -sciencepack3.name = "science-pack-3" -data.raw.recipe["science-pack-3"] = sciencepack3 +sciencepack3.name = "chemical-science-pack" +data.raw.recipe["chemical-science-pack"] = sciencepack3 local sciencepackm = table.deepcopy(data.raw.recipe["sct-science-pack-mil"]) sciencepackm.name = "military-science-pack" @@ -323,6 +323,6 @@ sciencepackp.name = "production-science-pack" data.raw.recipe["production-science-pack"] = sciencepackp local sciencepackh = table.deepcopy(data.raw.recipe["sct-science-pack-ht"]) -sciencepackh.name = "high-tech-science-pack" -data.raw.recipe["high-tech-science-pack"] = sciencepackh +sciencepackh.name = "utility-science-pack" +data.raw.recipe["utility-science-pack"] = sciencepackh diff --git a/ScienceCostTweakerM_0.16.49/prototypes/technologies/labs.lua b/ScienceCostTweakerM_0.16.49/prototypes/technologies/labs.lua index 7c764e0..245a971 100644 --- a/ScienceCostTweakerM_0.16.49/prototypes/technologies/labs.lua +++ b/ScienceCostTweakerM_0.16.49/prototypes/technologies/labs.lua @@ -85,7 +85,7 @@ data:extend({ count = 30, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 2, }, @@ -154,8 +154,8 @@ data:extend({ count = 45, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 3, }, @@ -207,9 +207,9 @@ data:extend({ count = 60, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 4, }, diff --git a/ScienceCostTweakerM_0.16.49/prototypes/technologies/sciencepacks.lua b/ScienceCostTweakerM_0.16.49/prototypes/technologies/sciencepacks.lua index 149918b..5671497 100644 --- a/ScienceCostTweakerM_0.16.49/prototypes/technologies/sciencepacks.lua +++ b/ScienceCostTweakerM_0.16.49/prototypes/technologies/sciencepacks.lua @@ -11,7 +11,7 @@ data:extend({ { { type = "unlock-recipe", - recipe = "science-pack-1", + recipe = "automation-science-pack", }, { type = "unlock-recipe", @@ -49,7 +49,7 @@ data:extend({ { { type = "unlock-recipe", - recipe = "science-pack-2", + recipe = "logistic-science-pack", }, { type = "unlock-recipe", @@ -74,7 +74,7 @@ data:extend({ }, prerequisites = { - "automation-2", +-- "automation-2", "sct-lab-t2", }, unit = @@ -82,7 +82,7 @@ data:extend({ count = 60, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 2, }, @@ -100,7 +100,7 @@ data:extend({ { { type = "unlock-recipe", - recipe = "science-pack-3", + recipe = "chemical-science-pack", }, { type = "unlock-recipe", @@ -116,8 +116,8 @@ data:extend({ count = 90, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 3, }, @@ -174,8 +174,8 @@ data:extend({ count = 60, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 2, }, @@ -229,9 +229,9 @@ data:extend({ count = 90, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 3, }, @@ -249,7 +249,7 @@ data:extend({ { { type = "unlock-recipe", - recipe = "high-tech-science-pack", + recipe = "utility-science-pack", }, { type = "unlock-recipe", @@ -287,9 +287,9 @@ data:extend({ count = 120, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 4, }, @@ -302,7 +302,7 @@ if settings.startup["sct-military"].value == "tier2" then sctm.tech_dependency_add("sct-research-mil", "sct-research-t2") else sctm.tech_dependency_add("sct-research-mil", "sct-research-t3") - sctm.tech_pack_add("sct-research-mil", {"science-pack-3",1}) + sctm.tech_pack_add("sct-research-mil", {"chemical-science-pack",1}) data.raw.technology["sct-research-mil"].unit.time = 3 data.raw.technology["sct-research-mil"].unit.count = 90 end diff --git a/ScienceCostTweakerM_0.16.49/sctmlib.lua b/ScienceCostTweakerM_0.16.49/sctmlib.lua index 5d5d5c8..ac0c203 100644 --- a/ScienceCostTweakerM_0.16.49/sctmlib.lua +++ b/ScienceCostTweakerM_0.16.49/sctmlib.lua @@ -154,7 +154,7 @@ function sctm.tech_dependency_add(techname, depname) return added end --- ingredients = { ["science-pack-1"] = 1 } +-- ingredients = { ["automation-science-pack"] = 1 } local function rempack(ingredientstable, packname) local removed = false for _i, pack in pairs(ingredientstable) do @@ -197,7 +197,7 @@ function sctm.tech_pack_remove(techname, packname) return removed end --- ingredients = { ["science-pack-1"] = 1 } +-- ingredients = { ["automation-science-pack"] = 1 } local function addpack(ingredientstable, newpack) local added = false local found = false @@ -763,4 +763,4 @@ function sctm.recipe_find_techs(recipe, science_packs) return science_list; end -]]-- \ No newline at end of file +]]-- diff --git a/ScienceCostTweakerM_0.16.49/tweaks/aai/1_update.lua b/ScienceCostTweakerM_0.16.49/tweaks/aai/1_update.lua index 8480ab3..ad4909c 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/aai/1_update.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/aai/1_update.lua @@ -14,7 +14,7 @@ if mods["aai-industry"] then end for _i, tech in pairs(aaitech0) do - sctm.tech_pack_replace(tech, "science-pack-1", "sct-science-pack-0") + sctm.tech_pack_replace(tech, "automation-science-pack", "sct-science-pack-0") end -- if data.raw.technology["electric-lab"] then @@ -67,4 +67,4 @@ if mods["aai-industry"] then sctm.recipe_ingredient_replace("sct-t0-solvent", "iron-ore", "crushed-omnite") sctm.recipe_ingredient_replace("sct-t0-solvent", "iron-ore", "angels-ore1-crushed") sctm.recipe_ingredient_replace("sct-t0-solvent", "wood", "omniwood") -end \ No newline at end of file +end diff --git a/ScienceCostTweakerM_0.16.49/tweaks/aai/science_aai.lua b/ScienceCostTweakerM_0.16.49/tweaks/aai/science_aai.lua index 5de6cdd..0f6d8b4 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/aai/science_aai.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/aai/science_aai.lua @@ -14,7 +14,6 @@ data:extend({ name = "sct-t0-crate", icon = "__ScienceCostTweakerM__/graphics/aai/sct-t0-crate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-0", order = "d[t0]-b[crate]", stack_size = 200 @@ -25,7 +24,6 @@ data:extend({ name = "sct-t0-solvent", icon = "__ScienceCostTweakerM__/graphics/aai/sct-t0-solvent.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-0", order = "d[t0]-c[solvent]", stack_size = 200 @@ -108,7 +106,6 @@ data:extend({ name = "sct-science-pack-0", icon = "__ScienceCostTweakerM__/graphics/aai/sct-science-pack-0.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-0", order = "d[t0]-a[pack]", stack_size = 200, @@ -232,8 +229,8 @@ data:extend({ count = 40, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 20 }, @@ -257,11 +254,11 @@ data:extend({ count = 100, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, {"production-science-pack", 1}, - {"high-tech-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 40 }, @@ -285,14 +282,14 @@ data:extend({ count = 100, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, {"military-science-pack", 1}, {"production-science-pack", 1}, - {"high-tech-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 40 }, }, -}) \ No newline at end of file +}) diff --git a/ScienceCostTweakerM_0.16.49/tweaks/angelsmods/science_angels.lua b/ScienceCostTweakerM_0.16.49/tweaks/angelsmods/science_angels.lua index e6bf4ec..47c33f9 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/angelsmods/science_angels.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/angelsmods/science_angels.lua @@ -15,7 +15,6 @@ data:extend ({ name = "sct-science-pack-bio", icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-science-pack-bio.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-bio", order = "d_a[bio]", stack_size = 200, @@ -29,7 +28,6 @@ data:extend ({ name = "sct-bio-ground-sample", icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-bio-ground-sample.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-bio", order = "d_a[bio]-b[groundsample]", stack_size = 200, @@ -40,7 +38,6 @@ data:extend ({ name = "sct-bio-sample-scaffold", icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-bio-sample-scaffold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-bio", order = "d_a[bio]-c[scaffold]", stack_size = 200, @@ -51,7 +48,6 @@ data:extend ({ name = "sct-bio-sample-filling", icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-bio-sample-filling.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-bio", order = "d_a[bio]-d[filling]", stack_size = 200, @@ -258,7 +254,7 @@ data:extend({ count = 60, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 2, }, @@ -270,4 +266,4 @@ data:extend({ if settings.startup["sct-hd-icons"] and settings.startup["sct-hd-icons"].value == true then data.raw.tool["sct-science-pack-bio"].icon_size = 64 data.raw.tool["sct-science-pack-bio"].icon = "__ScienceCostTweakerM__/graphics/angelsmods/sct-science-pack-bio-64.png" -end \ No newline at end of file +end diff --git a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/1_update.lua b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/1_update.lua index 3ddf1cb..ad5227e 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/1_update.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/1_update.lua @@ -311,9 +311,9 @@ if mods["bobtech"] then sctm.tech_unlock_remove("alien-research", "lab-alien") sctm.tech_dependency_add("alien-research", "sct-research-alien") sctm.tech_dependency_remove("alien-research", "advanced-research") - sctm.tech_pack_replace("alien-research", "science-pack-1", "science-pack-gold") - sctm.tech_pack_replace("alien-research", "science-pack-2", "alien-science-pack") - sctm.tech_pack_remove("alien-research", "science-pack-3") + 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", "chemical-science-pack") end if data.raw.tool["logistic-science-pack"] and data.raw.recipe["logistic-science-pack"] then -- remove logistic pack from tier 1 lab diff --git a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/2_final.lua b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/2_final.lua index 2f6689f..b66d670 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/2_final.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/2_final.lua @@ -16,9 +16,9 @@ if mods["boblogistics"] then end if mods["bobplates"] then - sctm.recipe_ingredient_remove("science-pack-3", "bronze-alloy") - sctm.recipe_ingredient_remove("high-tech-science-pack", "lithium-ion-battery") - sctm.recipe_ingredient_remove("high-tech-science-pack", "silicon-nitride") + 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") end if mods["bobmodules"] then @@ -36,4 +36,4 @@ if mods["bobmodules"] then sctm.tech_unlock_remove("modules", "productivity-processor") sctm.tech_dependency_remove("bodies","modules") -end \ No newline at end of file +end diff --git a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_alien.lua b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_alien.lua index 3919c29..574bd72 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_alien.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_alien.lua @@ -41,9 +41,9 @@ data:extend({ count = 45, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, {"military-science-pack", 1}, }, time = 3, @@ -76,9 +76,9 @@ data:extend({ count = 90, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, {"military-science-pack", 1}, }, time = 3, @@ -140,4 +140,4 @@ data:extend({ }, order = "sct-pack-e[alien]", }, -}) \ No newline at end of file +}) diff --git a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_logistic.lua b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_logistic.lua index b02d825..5d43202 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_logistic.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_logistic.lua @@ -15,7 +15,6 @@ data:extend ({ name = "sct-logistic-cargo-unit", icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-cargo-unit.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-logistic", order = "h_a[logistic]-b[cargo]", stack_size = 200, @@ -26,7 +25,6 @@ data:extend ({ name = "sct-logistic-unimover", icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-unimover.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-logistic", order = "h_a[logistic]-c[unimover]", stack_size = 200, @@ -37,7 +35,6 @@ data:extend ({ name = "sct-logistic-automated-storage", icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-automated-storage.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-logistic", order = "h_a[logistic]-d[storage]", stack_size = 200, @@ -48,7 +45,6 @@ data:extend ({ name = "sct-logistic-memory-unit", icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-memory-unit.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-science-pack-logistic", order = "h_a[logistic]-e[memory-unit]", stack_size = 200, @@ -300,7 +296,7 @@ data:extend({ }, prerequisites = { - "robotics", +-- "robotics", "sct-research-t3", "circuit-network", }, @@ -309,9 +305,9 @@ data:extend({ count = 90, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 3, }, diff --git a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_modules.lua b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_modules.lua index ff05678..c11626b 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_modules.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_modules.lua @@ -46,11 +46,11 @@ data:extend({ count = 30, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 3, }, order = "sct-lab-c[modules]", }, -}) \ No newline at end of file +}) diff --git a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_tech.lua b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_tech.lua index ad17b2d..909e061 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_tech.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_tech.lua @@ -31,11 +31,11 @@ data:extend({ count = 60, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, {"production-science-pack", 1}, - {"high-tech-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 4, }, diff --git a/ScienceCostTweakerM_0.16.49/tweaks/omnimatter/science_omni.lua b/ScienceCostTweakerM_0.16.49/tweaks/omnimatter/science_omni.lua index d743910..5fcc6b5 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/omnimatter/science_omni.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/omnimatter/science_omni.lua @@ -23,11 +23,11 @@ data:extend({ count = 60, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 2, }, order = "sct-pack-c[omni]", }, -}) \ No newline at end of file +}) diff --git a/ScienceCostTweakerM_0.16.49/tweaks/productivity-limitations.lua b/ScienceCostTweakerM_0.16.49/tweaks/productivity-limitations.lua index ca28dd0..5f63cea 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/productivity-limitations.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/productivity-limitations.lua @@ -1,12 +1,12 @@ if mods["boblibrary"] then local science_packs_and_intermediates = { - "science-pack-1", - "science-pack-2", - "science-pack-3", + "automation-science-pack", + "logistic-science-pack", + "chemical-science-pack", "military-science-pack", "production-science-pack", - "high-tech-science-pack", + "utility-science-pack", "logistic-science-pack", "alien-science-pack", "science-pack-gold", diff --git a/ScienceCostTweakerM_0.16.49/tweaks/pymods/1_update.lua b/ScienceCostTweakerM_0.16.49/tweaks/pymods/1_update.lua index d25ec22..fbaef76 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/pymods/1_update.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/pymods/1_update.lua @@ -1,7 +1,7 @@ if mods["pycoalprocessing"] then require("pyscience") - local pybotle = table.deepcopy(data.raw.recipe["science-pack-1"]) + local pybotle = table.deepcopy(data.raw.recipe["automation-science-pack"]) pybotle.name = "sct-t1-pybotle" pybotle.subgroup = "sct-sciencepack-1" pybotle.order = "d[t1]-d[pybotle]" @@ -15,58 +15,58 @@ if mods["pycoalprocessing"] then data.raw.recipe["sct-t1-pybotle"] = pybotle data.raw.item["sct-t1-pybotle"].icon = table.deepcopy(data.raw.recipe["sct-t1-pybotle"].icon) data.raw.item["sct-t1-pybotle"].icon_size = data.raw.recipe["sct-t1-pybotle"].icon_size - sctm.recipe_result_replace("sct-t1-pybotle","science-pack-1","sct-t1-pybotle") + sctm.recipe_result_replace("sct-t1-pybotle","automation-science-pack","sct-t1-pybotle") local sp1 = table.deepcopy(data.raw.recipe["sct-science-pack-t1"]) - sp1.name = "science-pack-1" + sp1.name = "automation-science-pack" if sp1.expensive then sp1.expensive.results[1].amount = 2 end if sp1.normal then sp1.normal.results[1].amount = 2 end - data.raw.recipe["science-pack-1"] = sp1 - sctm.recipe_ingredient_add("science-pack-1", { type="item",name="sct-t1-pybotle",amount=2}, { type="item",name="sct-t1-pybotle",amount=2}) + data.raw.recipe["automation-science-pack"] = sp1 + sctm.recipe_ingredient_add("automation-science-pack", { type="item",name="sct-t1-pybotle",amount=2}, { type="item",name="sct-t1-pybotle",amount=2}) sctm.tech_unlock_add("sct-research-t1", "sct-t1-pybotle") - local pychip = table.deepcopy(data.raw.recipe["science-pack-2"]) + local pychip = table.deepcopy(data.raw.recipe["logistic-science-pack"]) pychip.name = "sct-t2-pychip" pychip.subgroup = "sct-sciencepack-2" pychip.order = "e[t2]-g[pychip]" data.raw.recipe["sct-t2-pychip"] = pychip data.raw.item["sct-t2-pychip"].icon = table.deepcopy(data.raw.recipe["sct-t2-pychip"].icon) data.raw.item["sct-t2-pychip"].icon_size = data.raw.recipe["sct-t2-pychip"].icon_size - sctm.recipe_result_replace("sct-t2-pychip","science-pack-2","sct-t2-pychip") + sctm.recipe_result_replace("sct-t2-pychip","logistic-science-pack","sct-t2-pychip") local sp2 = table.deepcopy(data.raw.recipe["sct-science-pack-t2"]) - sp2.name = "science-pack-2" + sp2.name = "logistic-science-pack" if sp2.expensive then sp2.expensive.results[1].amount = 2 end if sp2.normal then sp2.normal.results[1].amount = 2 end - data.raw.recipe["science-pack-2"] = sp2 - sctm.recipe_ingredient_add("science-pack-2", { type="item",name="sct-t2-pychip",amount=2}, { type="item",name="sct-t2-pychip",amount=2}) + data.raw.recipe["logistic-science-pack"] = sp2 + sctm.recipe_ingredient_add("logistic-science-pack", { type="item",name="sct-t2-pychip",amount=2}, { type="item",name="sct-t2-pychip",amount=2}) sctm.tech_unlock_add("sct-research-t2", "sct-t2-pychip") -- copy py recipe onto new one, and make it ingredient - local pybatery = table.deepcopy(data.raw.recipe["science-pack-3"]) + local pybatery = table.deepcopy(data.raw.recipe["chemical-science-pack"]) pybatery.name = "sct-t3-pybatery" pybatery.subgroup = "sct-sciencepack-3" pybatery.order = "f[t3]-h[pybatery]" data.raw.recipe["sct-t3-pybatery"] = pybatery data.raw.item["sct-t3-pybatery"].icon = table.deepcopy(data.raw.recipe["sct-t3-pybatery"].icon) data.raw.item["sct-t3-pybatery"].icon_size = data.raw.recipe["sct-t3-pybatery"].icon_size - sctm.recipe_result_replace("sct-t3-pybatery","science-pack-3","sct-t3-pybatery") + sctm.recipe_result_replace("sct-t3-pybatery","chemical-science-pack","sct-t3-pybatery") local sp3 = table.deepcopy(data.raw.recipe["sct-science-pack-t3"]) - sp3.name = "science-pack-3" + sp3.name = "chemical-science-pack" if sp3.expensive then sp3.expensive.results[1].amount = 2 end if sp3.normal then sp3.normal.results[1].amount = 2 end - data.raw.recipe["science-pack-3"] = sp3 - sctm.recipe_ingredient_add("science-pack-3", { type="item",name="sct-t3-pybatery",amount=2}, { type="item",name="sct-t3-pybatery",amount=2}) + data.raw.recipe["chemical-science-pack"] = sp3 + sctm.recipe_ingredient_add("chemical-science-pack", { type="item",name="sct-t3-pybatery",amount=2}, { type="item",name="sct-t3-pybatery",amount=2}) sctm.tech_unlock_add("sct-research-t3", "sct-t3-pybatery") if mods["pyfusionenergy"] then diff --git a/ScienceCostTweakerM_0.16.49/tweaks/pymods/2_final.lua b/ScienceCostTweakerM_0.16.49/tweaks/pymods/2_final.lua index 0793a7b..d294b47 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/pymods/2_final.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/pymods/2_final.lua @@ -1,15 +1,15 @@ -- fixes sctm.debug(serpent.block(data.raw.recipe["sct-t1-pybotle"])) - sctm.debug(serpent.block(data.raw.recipe["science-pack-1"])) + sctm.debug(serpent.block(data.raw.recipe["automation-science-pack"])) sctm.debug(serpent.block(data.raw.recipe["sct-t2-pychip"])) - sctm.debug(serpent.block(data.raw.recipe["science-pack-2"])) + sctm.debug(serpent.block(data.raw.recipe["logistic-science-pack"])) sctm.debug(serpent.block(data.raw.recipe["sct-t3-pybatery"])) - sctm.debug(serpent.block(data.raw.recipe["science-pack-3"])) + sctm.debug(serpent.block(data.raw.recipe["chemical-science-pack"])) sctm.debug(serpent.block(data.raw.recipe["sct-prod-pycontainer"])) sctm.debug(serpent.block(data.raw.recipe["production-science-pack"])) sctm.debug(serpent.block(data.raw.technology["sct-research-t1"])) sctm.debug(serpent.block(data.raw.technology["sct-research-t2"])) sctm.debug(serpent.block(data.raw.technology["sct-research-t3"])) sctm.debug(serpent.block(data.raw.technology["sct-research-prod"])) - \ No newline at end of file + diff --git a/ScienceCostTweakerM_0.16.49/tweaks/pymods/pycontainer.lua b/ScienceCostTweakerM_0.16.49/tweaks/pymods/pycontainer.lua index 3705f9d..b665796 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/pymods/pycontainer.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/pymods/pycontainer.lua @@ -5,7 +5,6 @@ data:extend({ name = "sct-prod-pycontainer", icon = "__ScienceCostTweakerM__/graphics/pymods/sct-prod-pycontainer.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "h[prod]-f[pycontainer]", stack_size = 200, diff --git a/ScienceCostTweakerM_0.16.49/tweaks/pymods/pyscience.lua b/ScienceCostTweakerM_0.16.49/tweaks/pymods/pyscience.lua index 3ade002..ad68adb 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/pymods/pyscience.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/pymods/pyscience.lua @@ -7,7 +7,6 @@ data:extend({ name = "sct-t1-pybotle", -- icon = "__ScienceCostTweakerM__/graphics/pymods/sct-prod-pycontainer.png", -- icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-1", order = "d[t1]-d[pybotle]", stack_size = 200, @@ -21,7 +20,6 @@ data:extend({ name = "sct-t2-pychip", -- icon = "__ScienceCostTweakerM__/graphics/pymods/sct-prod-pycontainer.png", -- icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "e[t2]-g[pychip]", stack_size = 200, @@ -35,7 +33,6 @@ data:extend({ name = "sct-t3-pybatery", -- icon = "__ScienceCostTweakerM__/graphics/pymods/sct-prod-pycontainer.png", -- icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "f[prod]-h[pybatery]", stack_size = 200, diff --git a/ScienceCostTweakerM_0.16.49/tweaks/xander/1_update.lua b/ScienceCostTweakerM_0.16.49/tweaks/xander/1_update.lua index f5abff8..37d8d3a 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/xander/1_update.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/xander/1_update.lua @@ -9,7 +9,7 @@ if mods["xander-mod"] then sctm.tech_dependency_remove("sct-research-t2", "automation-2") sctm.recipe_ingredient_replace("sct-lab1-mechanization", "electronic-circuit", "coil-1") sctm.recipe_ingredient_replace("sct-lab1-mechanization", "transport-belt", "slow-transport-belt") - sctm.recipe_ingredient_add("science-pack-1", { type="item", name="coil-1", amount=1}, { type="item", name="coil-1", amount=2}) + sctm.recipe_ingredient_add("automation-science-pack", { type="item", name="coil-1", amount=1}, { type="item", name="coil-1", amount=2}) if data.raw.tool["science-pack-0"] then data.raw.tool["science-pack-0"].icon_size = 32 data.raw.tool["science-pack-0"].icons = @@ -60,7 +60,7 @@ if mods["xander-mod"] then icon = "__ScienceCostTweakerM__/graphics/overlays/flame.png", }, } - sctm.lab_input_remove("lab-1", "science-pack-2") + sctm.lab_input_remove("lab-1", "logistic-science-pack") end if data.raw.technology["lab_2"] then data.raw.technology["lab_2"].enabled = false