diff --git a/changelog.txt b/changelog.txt index 27eec30..56c6f9d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Version: 1.0.29 Date: 08.06.2022 Features: - added option for legacy icons on rare metals + - added miner modules Changes: - made roboports and bots more tanky diff --git a/locale/en/lang_en.cfg b/locale/en/lang_en.cfg index 443596a..3cd9c40 100644 --- a/locale/en/lang_en.cfg +++ b/locale/en/lang_en.cfg @@ -184,6 +184,11 @@ el_grenade=Charged grenade fi_grenade=Overcharged grenade fu_grenade=Hypercharged grenade +fi_materials_upgrade=Basic upgrade +fu_materials_upgrade=Advanced upgrade +gr_materials_upgrade=Ultimate upgrade + + #overhaul uranium-fuel-cell-updated=Uranium fuel cell (old) @@ -294,6 +299,9 @@ fu_materials_energy_charged_crystal=A charged energy crystal. Can be used in the el_charger_item=Can be used to charge items like [color=purple]energy crystals[/color] with energy or seperate water[fluid=water] using various catalysts. fu_miner_item=Can mine stone[item=stone] from anywhere on the map. Needs a constant supply of drills[item=fu_miner_fuel_item] to work. +fu_miner_item_2=Can mine stone[item=stone] from anywhere on the map. Needs a constant supply of drills[item=fu_miner_fuel_item] to work. Upgraded version of [item=fu_miner_item]. +fu_miner_item_3=Can mine stone[item=stone] from anywhere on the map. Needs a constant supply of drills[item=fu_miner_fuel_item] to work. Upgraded version of [item=fu_miner_item_2]. +fu_miner_item_4=Can mine stone[item=stone] from anywhere on the map. Needs a constant supply of drills[item=fu_miner_fuel_item] to work. Upgraded version of [item=fu_miner_item_3]. el_burner_kerosene_item=A compact burner generator, that uses desulfurized kerosene[fluid=el_desulfurized_kerosene]. el_arc_furnace_item=A furnace that can heat metals into thier molten form. el_caster_item=Casts molten metals into plates or ingots. @@ -351,6 +359,10 @@ fu_ingot_tech=Build a ingot factory to smelt your ore and make ingots from 248ks gr_stage_tech=Using exotic matter you will be able to exceed limits of known technology. Even Fusion will be nothing compared to those infinite possibilities. +fi_upgrade_tech=Upgrade machines using this technology. +fu_upgrade_tech=Upgrade machines using this technology. +gr_upgrade_tech=Upgrade machines using this technology. + #buildable entities [entity-name] el_solar_entity=Solar panel 2.0 @@ -418,6 +430,9 @@ fu_laser_entity=Laser facility fu_plasma_entity=Plasma facility fu_magnet_entity=Magnetising facility fu_miner_entity=Stone quarry +fu_miner_entity_2=Stone quarry 2 +fu_miner_entity_3=Stone quarry 3 +fu_miner_entity_4=Stone quarry 4 gr_crafter_entity=Fusion assembling machine gr_magnet_train_pre_entity=EM suspension train 1 @@ -597,6 +612,10 @@ fu_titan_ingot_tech=Titan ingot refining fu_gold_ingot_tech=Gold ingot refining fu_neodym_ingot_tech=Neodymium ingot refining +fi_upgrade_tech=Advanced upgrade +fu_upgrade_tech=Very advanced upgrade +gr_upgrade_tech=Extremely advanced upgrade + #effects [description] x2_ki_tech_eff=Double the module effects of all your KI cores! (Only works on KI3 beacon) diff --git a/prototypes/248k_subgroups.lua b/prototypes/248k_subgroups.lua index f28cfdc..8d7ef23 100644 --- a/prototypes/248k_subgroups.lua +++ b/prototypes/248k_subgroups.lua @@ -337,6 +337,10 @@ data:extend({ name = '248k_productivity_category', type = 'module-category', }, + { + name = '248k_mining_category', + type = 'module-category', + }, --============================================================================================================================================================ --fu fusor diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index 1e6ff26..adba950 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -1855,6 +1855,32 @@ data:extend({ time = 30, }, }, + { + name = 'fi_upgrade_tech', + type = 'technology', + icon = sprite('fi_upgrade_tech.png'), + icon_size = 128, + prerequisites = {'fu_miner_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_upgrade_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_miner_upgrade_recipe', + }, + }, + unit = { + count = '100', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, --============================================================================================================================================================ --fu { @@ -3085,6 +3111,36 @@ data:extend({ time = 100, }, }, + { + name = 'fu_upgrade_tech', + type = 'technology', + icon = sprite('fu_upgrade_tech.png'), + icon_size = 128, + prerequisites = { + 'fi_upgrade_tech', + 'fu_magnet_tech' + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_upgrade_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_miner_upgrade_recipe', + }, + }, + unit = { + count = '100', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'utility-science-pack',1} + }, + time = 30, + }, + }, --============================================================================================================================================================ --gravitational { @@ -3869,4 +3925,37 @@ data:extend({ time = 100, }, }, + { + name = 'gr_upgrade_tech', + type = 'technology', + icon = sprite('gr_upgrade_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_upgrade_tech', + 'gr_plasma_cube_tech' + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'gr_upgrade_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'gr_miner_upgrade_recipe', + }, + }, + unit = { + count = '100', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + {'space-science-pack',1}, + {'fu_space_probe_science_item',1} + }, + time = 30, + }, + }, }) \ No newline at end of file diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index 7c8319a..1fee9bf 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -1625,4 +1625,109 @@ data:extend({ subgroup = 'fi_item_subgroup_f', order = 'f-a', }, + { + name = 'fi_upgrade_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fi_materials_upgrade', + ingredients = { + {type="item", name="fi_modules_core_item", amount=2}, + {type="item", name="speed-module-2", amount=2}, + {type="item", name="el_energy_crystal_charged_item", amount=10}, + }, + results = { + {type="item", name="fi_materials_upgrade", amount=2}, + }, + result_count = 1, + energy_required = 10, + always_show_made_in = true, + }, + { + name = 'fi_miner_upgrade_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fu_miner_item_2', + ingredients = { + {type="item", name="fu_miner_item", amount=1}, + {type="item", name="fi_materials_upgrade", amount=1}, + }, + results = { + {type="item", name="fu_miner_item_2", amount=1}, + }, + result_count = 1, + energy_required = 10, + always_show_made_in = true, + }, + { + name = 'fu_upgrade_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fu_materials_upgrade', + ingredients = { + {type="item", name="fi_modules_core_item", amount=2}, + {type="item", name="fi_materials_upgrade", amount=2}, + {type="item", name="fu_materials_magnet", amount=10}, + }, + results = { + {type="item", name="fu_materials_upgrade", amount=2}, + }, + result_count = 1, + energy_required = 10, + always_show_made_in = true, + }, + { + name = 'fu_miner_upgrade_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fu_miner_item_3', + ingredients = { + {type="item", name="fu_miner_item", amount=1}, + {type="item", name="fu_materials_upgrade", amount=1}, + }, + results = { + {type="item", name="fu_miner_item_3", amount=1}, + }, + result_count = 1, + energy_required = 10, + always_show_made_in = true, + }, + { + name = 'gr_upgrade_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'gr_materials_upgrade', + ingredients = { + {type="item", name="fu_materials_upgrade", amount=2}, + {type="item", name="fi_modules_core_item", amount=2}, + {type="item", name="gr_materials_plasma_cube", amount=2}, + }, + results = { + {type="item", name="gr_materials_upgrade", amount=2}, + }, + result_count = 1, + energy_required = 10, + always_show_made_in = true, + }, + { + name = 'gr_miner_upgrade_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fu_miner_item_4', + ingredients = { + {type="item", name="fu_miner_item", amount=1}, + {type="item", name="gr_materials_upgrade", amount=1}, + }, + results = { + {type="item", name="fu_miner_item_4", amount=1}, + }, + result_count = 1, + energy_required = 10, + always_show_made_in = true, + }, }) \ No newline at end of file diff --git a/prototypes/fission/fi_materials.lua b/prototypes/fission/fi_materials.lua index a03ec77..bc8538c 100644 --- a/prototypes/fission/fi_materials.lua +++ b/prototypes/fission/fi_materials.lua @@ -198,5 +198,14 @@ data:extend({ subgroup = 'fi_item_subgroup_b', order = 'f-b', }, + { + name = 'fi_materials_upgrade', + type = 'item', + icon = sprite('upgrade.png'), + icon_size = 64, + stack_size = 20, + subgroup = 'fi_item_subgroup_j', + order = 'b-a', + }, }) diff --git a/prototypes/fusion/fu_materials.lua b/prototypes/fusion/fu_materials.lua index a568e55..71ef2f0 100644 --- a/prototypes/fusion/fu_materials.lua +++ b/prototypes/fusion/fu_materials.lua @@ -202,4 +202,13 @@ data:extend({ subgroup = 'fu_item_subgroup_a', order = 'f-a', }, + { + name = 'fu_materials_upgrade', + type = 'item', + icon = sprite('upgrade.png'), + icon_size = 64, + stack_size = 20, + subgroup = 'fu_item_subgroup_b', + order = 'x-a', + }, }) diff --git a/prototypes/fusion/fu_miner.lua b/prototypes/fusion/fu_miner.lua index 3f46e32..51521e1 100644 --- a/prototypes/fusion/fu_miner.lua +++ b/prototypes/fusion/fu_miner.lua @@ -52,6 +52,8 @@ data:extend({ mining_time = 1, result = 'fu_miner_item', }, + fast_replaceable_group = 'fu_miner_entity', + next_upgrade = 'fu_miner_entity_2', crafting_categories = {'fu_miner_category'}, crafting_speed = 1, ingredient_count = 2, @@ -106,4 +108,97 @@ data:extend({ apparent_volume = 0.3, }, }, -}) \ No newline at end of file +}) + +local miner2 = util.table.deepcopy(data.raw['assembling-machine']['fu_miner_entity']) +miner2.name = 'fu_miner_entity_2' +miner2.icons = { + { + icon = miner2.icon + }, + { + icon = "__248k__/ressources/icons/fi_upgrade.png" + } +} +miner2.icon = nil +miner2.minable.result = 'fu_miner_item_2' +miner2.crafting_speed = 2 +miner2.next_upgrade = 'fu_miner_entity_3' + +local miner3 = util.table.deepcopy(data.raw['assembling-machine']['fu_miner_entity']) +miner3.name = 'fu_miner_entity_3' +miner3.icons = { + { + icon = miner3.icon + }, + { + icon = "__248k__/ressources/icons/fu_upgrade.png" + } +} +miner3.icon = nil +miner3.minable.result = 'fu_miner_item_3' +miner3.crafting_speed = 3 +miner3.base_productivity = 0.5 +miner3.next_upgrade = 'fu_miner_entity_4' + +local miner4 = util.table.deepcopy(data.raw['assembling-machine']['fu_miner_entity']) +miner4.name = 'fu_miner_entity_4' +miner4.icons = { + { + icon = miner4.icon + }, + { + icon = "__248k__/ressources/icons/gr_upgrade.png" + } +} +miner4.icon = nil +miner4.minable.result = 'fu_miner_item_4' +miner4.crafting_speed = 8 +miner4.base_productivity = 4 + +--items +local miner2_item = util.table.deepcopy(data.raw['item']['fu_miner_item']) +miner2_item.name = 'fu_miner_item_2' +miner2_item.icons = { + { + icon = miner2_item.icon + }, + { + icon = "__248k__/ressources/icons/fi_upgrade.png" + } +} +miner2_item.icon = nil +miner2_item.place_result = 'fu_miner_entity_2' + +local miner3_item = util.table.deepcopy(data.raw['item']['fu_miner_item']) +miner3_item.name = 'fu_miner_item_3' +miner3_item.icons = { + { + icon = miner3_item.icon + }, + { + icon = "__248k__/ressources/icons/fu_upgrade.png" + } +} +miner3_item.icon = nil +miner3_item.place_result = 'fu_miner_entity_3' +miner3_item.subgroup = 'fu_item_subgroup_c' +miner3_item.order = 'a-b' + +local miner4_item = util.table.deepcopy(data.raw['item']['fu_miner_item']) +miner4_item.name = 'fu_miner_item_4' +miner4_item.icons = { + { + icon = miner4_item.icon + }, + { + icon = "__248k__/ressources/icons/gr_upgrade.png" + } +} +miner4_item.icon = nil +miner4_item.place_result = 'fu_miner_entity_4' +miner4_item.subgroup = 'gr_item_subgroup_c' +miner4_item.order = 'a-b' + + +data:extend({miner2,miner3,miner4,miner2_item,miner3_item,miner4_item}) diff --git a/prototypes/gravitation/gr_materials.lua b/prototypes/gravitation/gr_materials.lua index 3cf5cf4..3dd143b 100644 --- a/prototypes/gravitation/gr_materials.lua +++ b/prototypes/gravitation/gr_materials.lua @@ -447,5 +447,14 @@ data:extend({ subgroup = 'gr_item_subgroup_a', order = 'a-a', }, + { + name = 'gr_materials_upgrade', + type = 'item', + icon = sprite('upgrade.png'), + icon_size = 64, + stack_size = 20, + subgroup = 'gr_item_subgroup_d', + order = 'x-a', + }, }) \ No newline at end of file diff --git a/ressources/fission/fi_materials/fi_materials_upgrade.png b/ressources/fission/fi_materials/fi_materials_upgrade.png new file mode 100644 index 0000000..f9ac0f6 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_upgrade.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_upgrade.png b/ressources/fusion/fu_materials/fu_materials_upgrade.png new file mode 100644 index 0000000..6db843c Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_upgrade.png differ diff --git a/ressources/gravitation/gr_materials/gr_materials_upgrade.png b/ressources/gravitation/gr_materials/gr_materials_upgrade.png new file mode 100644 index 0000000..7fa9091 Binary files /dev/null and b/ressources/gravitation/gr_materials/gr_materials_upgrade.png differ diff --git a/ressources/icons/fi_upgrade.png b/ressources/icons/fi_upgrade.png new file mode 100644 index 0000000..06ed3a0 Binary files /dev/null and b/ressources/icons/fi_upgrade.png differ diff --git a/ressources/icons/fu_upgrade.png b/ressources/icons/fu_upgrade.png new file mode 100644 index 0000000..309a79d Binary files /dev/null and b/ressources/icons/fu_upgrade.png differ diff --git a/ressources/icons/gr_upgrade.png b/ressources/icons/gr_upgrade.png new file mode 100644 index 0000000..235447c Binary files /dev/null and b/ressources/icons/gr_upgrade.png differ diff --git a/ressources/techs/fi_upgrade_tech.png b/ressources/techs/fi_upgrade_tech.png new file mode 100644 index 0000000..985cbd3 Binary files /dev/null and b/ressources/techs/fi_upgrade_tech.png differ diff --git a/ressources/techs/fu_upgrade_tech.png b/ressources/techs/fu_upgrade_tech.png new file mode 100644 index 0000000..c870379 Binary files /dev/null and b/ressources/techs/fu_upgrade_tech.png differ diff --git a/ressources/techs/gr_upgrade_tech.png b/ressources/techs/gr_upgrade_tech.png new file mode 100644 index 0000000..c1f82f6 Binary files /dev/null and b/ressources/techs/gr_upgrade_tech.png differ diff --git a/scripts/overhaul.lua b/scripts/overhaul.lua index 942f5dd..5aaa71c 100644 --- a/scripts/overhaul.lua +++ b/scripts/overhaul.lua @@ -155,6 +155,7 @@ tech_table = { {"fi_crafter_tech", "fi_refining_tech"}, {"el_solar_tech", "concrete"}, {"fusion-reactor-equipment","fu_energy_tech"}, + {"fi_upgrade_tech", "speed-module-2"}, --add science packs {"fi_stage_tech", "chemical-science-pack"},