diff --git a/ScienceCostTweakerM_0.16.49/prototypes/0_itemgroups.lua b/ScienceCostTweakerM_0.16.49/prototypes/0_itemgroups.lua index 359812f..eb0fa9c 100644 --- a/ScienceCostTweakerM_0.16.49/prototypes/0_itemgroups.lua +++ b/ScienceCostTweakerM_0.16.49/prototypes/0_itemgroups.lua @@ -79,6 +79,13 @@ data:extend({ { type = "item-subgroup", + name = "sct-sciencepack-advanced-logistic", + group = "sct-science", + order = "j[al]", + }, + + { + type = "item-subgroup", name = "sct-sciencepack-space", group = "sct-science", order = "z[space]", @@ -88,4 +95,4 @@ data:extend({ -- move everything in science-pack subgroup to sct-science (bilka) data.raw["item-subgroup"]["science-pack"].group = "sct-science" -data.raw["item-subgroup"]["science-pack"].order = "z" \ No newline at end of file +data.raw["item-subgroup"]["science-pack"].order = "z" diff --git a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/1_update.lua b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/1_update.lua index ad5227e..316152d 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/1_update.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/1_update.lua @@ -312,27 +312,27 @@ if mods["bobtech"] then sctm.tech_dependency_add("alien-research", "sct-research-alien") 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_replace("alien-research", "advanced-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 + if data.raw.tool["advanced-logistic-science-pack"] and data.raw.recipe["advanced-logistic-science-pack"] then -- remove logistic pack from tier 1 lab - sctm.lab_input_remove("lab", "logistic-science-pack") - sctm.lab_input_add("sct-lab-t3", "logistic-science-pack") - sctm.lab_input_add("sct-lab-t4", "logistic-science-pack") + 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["logistic-science-pack"].subgroup = "sct-science-pack-logistic" - data.raw.tool["logistic-science-pack"].order = "h_a[logistic]" + data.raw.tool["advanced-logistic-science-pack"].subgroup = "sct-sciencepack-advanced-logistic" + data.raw.tool["advanced-logistic-science-pack"].order = "h_a[advanced-logistic]" if settings.startup["sct-hd-icons"] and settings.startup["sct-hd-icons"].value == true then - data.raw.tool["logistic-science-pack"].icon_size = 64 - data.raw.tool["logistic-science-pack"].icon = "__ScienceCostTweakerM__/graphics/bobmods/logistic-science-pack-64.png" + 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" else - data.raw.tool["logistic-science-pack"].icon_size = 32 - data.raw.tool["logistic-science-pack"].icon = "__ScienceCostTweakerM__/graphics/bobmods/logistic-science-pack.png" + data.raw.tool["advanced-logistic-science-pack"].icon_size = 32 + data.raw.tool["advanced-logistic-science-pack"].icon = "__ScienceCostTweakerM__/graphics/bobmods/logistic-science-pack.png" end local logisticrecipe = table.deepcopy(data.raw.recipe["sct-science-pack-logistic"]) - logisticrecipe.name = "logistic-science-pack" - data.raw.recipe["logistic-science-pack"] = logisticrecipe + 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-science-pack-alien" 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 5d43202..580f34d 100644 --- a/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_logistic.lua +++ b/ScienceCostTweakerM_0.16.49/tweaks/bobsmods/science_bobmods_logistic.lua @@ -4,7 +4,7 @@ data:extend ({ type = "item-subgroup", name = "sct-science-pack-logistic", group = "sct-science", - order = "h_a[logistic]", + order = "h_a[advanced-logistic]", }, }) @@ -16,7 +16,7 @@ data:extend ({ icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-cargo-unit.png", icon_size = 32, subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]-b[cargo]", + order = "h_a[advanced-logistic]-b[cargo]", stack_size = 200, }, @@ -26,7 +26,7 @@ data:extend ({ icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-unimover.png", icon_size = 32, subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]-c[unimover]", + order = "h_a[advanced-logistic]-c[unimover]", stack_size = 200, }, @@ -36,7 +36,7 @@ data:extend ({ icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-automated-storage.png", icon_size = 32, subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]-d[storage]", + order = "h_a[advanced-logistic]-d[storage]", stack_size = 200, }, @@ -46,7 +46,7 @@ data:extend ({ icon = "__ScienceCostTweakerM__/graphics/bobmods/sct-logistic-memory-unit.png", icon_size = 32, subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]-e[memory-unit]", + order = "h_a[advanced-logistic]-e[memory-unit]", stack_size = 200, }, }) @@ -57,7 +57,7 @@ data:extend({ type = "recipe", name = "sct-science-pack-logistic", subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]", + order = "h_a[advanced-logistic]", --[[ expensive = { @@ -70,7 +70,7 @@ data:extend({ }, results = { - { type="item", name="logistic-science-pack", amount=2 }, + { type="item", name="advanced-logistic-science-pack", amount=2 }, }, }, ]]-- @@ -85,7 +85,7 @@ data:extend({ }, results = { - { type="item", name="logistic-science-pack", amount=2 }, + { type="item", name="advanced-logistic-science-pack", amount=2 }, }, }, normal = @@ -99,7 +99,7 @@ data:extend({ }, results = { - { type="item", name="logistic-science-pack", amount=2 }, + { type="item", name="advanced-logistic-science-pack", amount=2 }, }, }, } @@ -111,7 +111,7 @@ data:extend ({ type = "recipe", name = "sct-logistic-cargo-unit", subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]-b[cargo]", + order = "h_a[advanced-logistic]-b[cargo]", --[[ expensive = { @@ -162,7 +162,7 @@ data:extend ({ type = "recipe", name = "sct-logistic-unimover", subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]-c[unimover]", + order = "h_a[advanced-logistic]-c[unimover]", expensive = { enabled = false, @@ -197,7 +197,7 @@ data:extend ({ type = "recipe", name = "sct-logistic-automated-storage", subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]-d[storage]", + order = "h_a[advanced-logistic]-d[storage]", expensive = { enabled = false, @@ -232,7 +232,7 @@ data:extend ({ type = "recipe", name = "sct-logistic-memory-unit", subgroup = "sct-science-pack-logistic", - order = "h_a[logistic]-e[memory-unit]", + order = "h_a[advanced-logistic]-e[memory-unit]", expensive = { enabled = false, @@ -275,7 +275,7 @@ data:extend({ { { type = "unlock-recipe", - recipe = "logistic-science-pack", + recipe = "advanced-logistic-science-pack", }, { type = "unlock-recipe", @@ -311,6 +311,6 @@ data:extend({ }, time = 3, }, - order = "sct-pack-d[logistic]", + order = "sct-pack-d[advanced-logistic]", }, })