diff --git a/info.json b/info.json index c55ee1e..af8ebd6 100644 --- a/info.json +++ b/info.json @@ -1,10 +1,10 @@ { "name": "ScienceCostTweakerM", - "version": "0.16.49", - "factorio_version":"0.16", + "version": "0.17.00", + "factorio_version":"0.17", "title": "ScienceCostTweaker Mod (mexmer)", "author": "mexmer", - "dependencies": ["base >= 0.16.0" ], + "dependencies": ["base >= 0.17" ], "contact": "mexmer@github.com", "homepage": "https://github.com/mexmer/ScienceCostTweaker", "description": "Allows the cost of research to be tweaked, in terms of count, science packs and time. Edit its configs costs *.lua to tweak the multipliers. - Original mod made by UberWafe, this is adopted 0.16 version" diff --git a/locale/ja/sciencecosttweaker.cfg b/locale/ja/sciencecosttweaker.cfg index 82c90b3..3a03582 100644 --- a/locale/ja/sciencecosttweaker.cfg +++ b/locale/ja/sciencecosttweaker.cfg @@ -235,7 +235,7 @@ utility-science-pack=__ITEM__utility-science-pack__ ;sct-research-t1=__ITEM__automation-science-pack__ ;sct-research-t2=__ITEM__logistic-science-pack__ ;sct-research-t3=__ITEM__chemical-science-pack__ -;sct-research-mil=__ITEM__military-science-pack__ +;sct-military-science-pack=__ITEM__military-science-pack__ ;sct-research-prod=__ITEM__production-science-pack__ ;sct-research-ht=__ITEM__utility-science-pack__ ;angelmods @@ -270,7 +270,7 @@ utility-science-pack=__ITEM__utility-science-pack__ ;sct-research-t1=__ITEM__automation-science-pack__ ;sct-research-t2=__ITEM__logistic-science-pack__ ;sct-research-t3=__ITEM__chemical-science-pack__ -;sct-research-mil=__ITEM__military-science-pack__ +;sct-military-science-pack=__ITEM__military-science-pack__ ;sct-research-prod=__ITEM__production-science-pack__ ;sct-research-ht=__ITEM__utility-science-pack__ ;angelmods diff --git a/migrations/ScienceCostTweaker_0.16.28.lua b/migrations/ScienceCostTweaker_0.16.28.lua index 8cfb0fd..ed50de0 100644 --- a/migrations/ScienceCostTweaker_0.16.28.lua +++ b/migrations/ScienceCostTweaker_0.16.28.lua @@ -31,13 +31,13 @@ for index, force in pairs(game.forces) do end if force.technologies["military-2"] and force.technologies["military-2"].researched then - for prereq,_obj in pairs(force.technologies["sct-research-mil"].prerequisites) do + for prereq,_obj in pairs(force.technologies["sct-military-science-pack"].prerequisites) do if prereq == "sct-research-t2" and force.technologies["sct-research-t2"] and force.technologies["sct-research-t2"].researched then - force.technologies["sct-research-mil"].researched = true + force.technologies["sct-military-science-pack"].researched = true break end if prereq == "sct-research-t3" and force.technologies["sct-research-t3"] and force.technologies["sct-research-t3"].researched then - force.technologies["sct-research-mil"].researched = true + force.technologies["sct-military-science-pack"].researched = true break end end @@ -91,7 +91,7 @@ for index, force in pairs(game.forces) do -- vanilla continue "sct-lab-t3", "sct-research-t3", - "sct-research-mil", + "sct-military-science-pack", "sct-research-prod", "sct-lab-t4", "sct-research-t4", diff --git a/prototypes/technologies/sciencepacks.lua b/prototypes/technologies/sciencepacks.lua index 67f14cb..b4ead48 100644 --- a/prototypes/technologies/sciencepacks.lua +++ b/prototypes/technologies/sciencepacks.lua @@ -7,7 +7,7 @@ data:extend({ name = "sct-automation-science-pack", icon = "__ScienceCostTweakerM__/graphics/icons/science-pack-1-128.png", icon_size = 128, - effects = + effects = { { type = "unlock-recipe", @@ -324,7 +324,7 @@ data:extend({ {"military-science-pack",5}, {"chemical-science-pack", 5}, {"production-science-pack",5}, - {"utility-science-pack",5}, + {"utility-science-pack",5}, }, time = 60, }, @@ -334,10 +334,10 @@ data:extend({ -- military tech dependencies, based on settings if settings.startup["sct-military"].value == "tier2" then - sctm.tech_dependency_add("sct-research-mil", "automation-science-pack") + sctm.tech_dependency_add("sct-military-science-pack", "automation-science-pack") else - sctm.tech_dependency_add("sct-research-mil", "chemical-science-pack") - sctm.tech_pack_add("sct-research-mil", {"chemical-science-pack",1}) - data.raw.technology["sct-research-mil"].unit.time = 4 - data.raw.technology["sct-research-mil"].unit.count = 90 + sctm.tech_dependency_add("sct-military-science-pack", "chemical-science-pack") + sctm.tech_pack_add("sct-military-science-pack", {"chemical-science-pack",1}) + data.raw.technology["sct-military-science-pack"].unit.time = 4 + data.raw.technology["sct-military-science-pack"].unit.count = 90 end diff --git a/tweaks/bobsmods/science_bobmods_alien.lua b/tweaks/bobsmods/science_bobmods_alien.lua index f89fa7b..25ff991 100644 --- a/tweaks/bobsmods/science_bobmods_alien.lua +++ b/tweaks/bobsmods/science_bobmods_alien.lua @@ -34,7 +34,7 @@ data:extend({ { "advanced-research", "sct-research-t3", - "sct-research-mil", + "sct-military-science-pack", }, unit = { @@ -69,7 +69,7 @@ data:extend({ prerequisites = { "sct-research-t3", - "sct-research-mil", + "sct-military-science-pack", }, unit = { @@ -140,4 +140,4 @@ data:extend({ }, order = "sct-pack-e[alien]", }, -}) \ No newline at end of file +})