Initial 2.0 compatibility for angel and bob

data-final-fixes.lua

@@ -110,4 +110,4 @@ if (settings.startup["sct-difficulty-cost"].value ~= "noadjustment") then
 		end
 
 	end
-end
+end

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")

data.lua

@@ -1,5 +1,6 @@
 --INITIALIZE
 if not SCTTweaks then SCTTweaks = {} end
+SCTTweaks.item_icons = {}
 
 require("sctmlib")
 

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": [

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,15 +240,15 @@ 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__
 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__

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__

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,
 

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

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")

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

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)

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