diff --git a/PHI-CL/data/b/main.lua b/PHI-CL/data/b/main.lua deleted file mode 100644 index 3f94b17..0000000 --- a/PHI-CL/data/b/main.lua +++ /dev/null @@ -1,304 +0,0 @@ -local research_modifier = { - ['ammo-turret'] = { - 'physical-projectile-damage-1', - 'physical-projectile-damage-2', - 'physical-projectile-damage-3', - 'physical-projectile-damage-4', - 'physical-projectile-damage-5', - 'physical-projectile-damage-6', - 'physical-projectile-damage-7' - }, - ['fluid-turret'] = { - 'refined-flammables-1', - 'refined-flammables-2', - 'refined-flammables-3', - 'refined-flammables-4', - 'refined-flammables-5', - 'refined-flammables-6', - 'refined-flammables-7' - } -} - -local mod_tint = { - [2] = {r=140, g=142, b=200}, - [3] = {r=242, g=161, b=26}, - [4] = {r=255, g=254, b=42}, - [5] = {r=54, g=228, b=255}, - [6] = {r=253, g=0, b=97}, - [7] = {r=0, g=209, b=102}, - [8] = {r=233, g=63, b=233} -} -local main = {} - -local function tint_handle(item, tier, tl) - for _, ve in pairs(tl) do - if item[ve] then - for _, tc in pairs({'layers', 'sheets', 'structure', 'frames'}) do - if item[ve][tc] and type(item[ve][tc]) == 'table' then - for _, v2 in pairs(item[ve][tc]) do - v2.tint = mod_tint[tier] - - if v2.frames then - for _, v3 in pairs(v2.frames) do - v3.tint = mod_tint[tier] - end - end - end - end - end - - item[ve].tint = mod_tint[tier] - end - end -end - --- entity -function main.EEE(source, tier) - local item = table.deepcopy(data.raw[source.type][source.ref_name]) - item.name = source.name .. '-' .. tier - item.minable.result = item.name - item.max_health = item.max_health * (tier - source.min + 2) - item.next_upgrade = ((tier < source.max) and source.name .. '-' .. (tier + 1)) or nil - item.production = item.production and (((source.tech == 'compound-energy' and source.type == 'solar-panel') and (tonumber(string.match(item.production, '[%d%.]+')) * (settings.startup['PHI-MB-ENERGY-SOLAR-RATIO'].value ^ (tier - source.min + 1)) .. (string.match(item.production, '%a+') or ''))) or (tonumber(string.match(item.production, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. (string.match(item.production, '%a+') or ''))) or nil - - for _, v in pairs({'researching_speed', 'mining_speed', 'crafting_speed'}) do - if item[v] then - item[v] = tonumber(string.match(item[v], '[%d%.]+')) * (2 ^ (tier - source.min + 1)) - end - end - - for _, v in pairs({'energy_usage', 'heating_energy', 'crane_energy_usage', 'energy_per_shot'}) do - if not (source.tech == 'compound-energy' and (source.type == 'solar-panel' or source.type == 'accumulator')) and item[v] then - item[v] = (tonumber(string.match(item[v], '[%d%.]+')) * (2 ^ (tier - source.min + 1))) .. (string.match(item[v], '%a+') or '') - end - end - - if item.energy_source then - for _, v in pairs({'buffer_capacity', 'input_flow_limit', 'output_flow_limit'}) do - if not (source.tech == 'compound-energy' and (source.type == 'solar-panel' or source.type == 'accumulator')) and item.energy_source[v] then - item.energy_source[v] = tonumber(string.match(item.energy_source[v], '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.energy_source[v], '%a+') - end - end - - if item.energy_source.emissions_per_minute then - for k, _ in pairs(item.energy_source.emissions_per_minute) do - item.energy_source.emissions_per_minute[k] = item.energy_source.emissions_per_minute[k] * (2 ^ (tier - source.min + 1)) - end - end - end - - if (source.type == 'electric-turret') or (source.type == 'ammo-turret') or (source.type == 'fluid-turret') then - if item.attack_parameters then - item.attack_parameters.damage_modifier = 2 ^ (tier - source.min + 1) - item.attack_parameters.range = item.attack_parameters.range + (2 * (tier - source.min + 1)) - item.attack_parameters.cooldown = (item.attack_parameters.cooldown and (item.attack_parameters.cooldown * ((24 - tier + source.min) / 25))) or nil - end - - item.call_for_help_radius = (item.call_for_help_radius and (item.call_for_help_radius + (2 * (tier - source.min + 1)))) or nil - - if source.type == 'electric-turret' then - item.glow_light_intensity = 1 - - if item.attack_parameters then - item.attack_parameters.damage_modifier = (item.attack_parameters.damage_modifier and (item.attack_parameters.damage_modifier * 2)) or nil - - if item.attack_parameters.ammo_type then - item.attack_parameters.ammo_type.action.action_delivery.max_length = ((item.attack_parameters.ammo_type.action and item.attack_parameters.ammo_type.action.action_delivery and item.attack_parameters.ammo_type.action.action_delivery.max_length) and (item.attack_parameters.ammo_type.action.action_delivery.max_length + (2 * (tier - source.min + 1)))) or nil - item.attack_parameters.ammo_type.energy_consumption = (item.attack_parameters.ammo_type.energy_consumption and (tonumber(string.match(item.attack_parameters.ammo_type.energy_consumption, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.attack_parameters.ammo_type.energy_consumption, '%a+'))) or nil - end - end - - elseif source.type == 'fluid-turret' then - item.prepare_range = item.prepare_range + (2 * (tier - source.min + 1)) - end - end - - if (source.type == 'lab') then - for _, v in pairs({{['a'] = 'on_animation', ['n'] = 3}, {['a'] = 'off_animation', ['n'] = 2}}) do - if item[v['a']] and item[v['a']].layers then - for i=1, v['n'], 1 do - if item[v['a']].layers[i] then - item[v['a']].layers[i].tint = mod_tint[tier] - end - end - end - end - - elseif (source.type == 'mining-drill') then - for _, e in pairs({'graphics_set', 'wet_mining_graphics_set'}) do - if item[e] and item[e].animation then - for _, d in pairs(item[e].animation) do - if d.layers then - d.layers[1].tint = mod_tint[tier] - d.layers[2].tint = mod_tint[tier] - end - end - end - end - - elseif source.type == 'radar' then - item.max_distance_of_sector_revealed = item.max_distance_of_sector_revealed + (2 * (tier - source.min + 1)) - item.max_distance_of_nearby_sector_revealed = item.max_distance_of_nearby_sector_revealed + (2 * (tier - source.min + 1)) - - elseif source.type == 'thruster' then - for _, v in pairs({'min_performance', 'max_performance'}) do - item[v].fluid_usage = (item[v].fluid_usage and item[v].fluid_usage * (2 ^ (tier - source.min + 1))) or nil - end - - elseif source.type == 'reactor' and source.name == 'heating-tower' then - item.consumption = tostring(tonumber(string.match(item.consumption, '[%d%.]+')) * (2 ^ (tier - source.min + 1))) .. string.match(item.consumption, '%a+') - - elseif source.type == 'agricultural-tower' then - item.radius = item.radius + (1 * (tier - source.min + 1)) - end - - tint_handle(item, tier, {'picture', 'pictures', 'animation', 'structure', 'integration_patch', 'horizontal_animation', 'vertical_animation'}) - - for _, v in pairs({'graphics_set', 'graphics_set_flipped'}) do - if item[v] then - tint_handle(item[v], tier, {'animation', 'idle_animation', 'frozen_patch'}) - - if item[v].working_visualisations then - tint_handle(item[v].working_visualisations, tier, {'north_animation', 'east_animation', 'south_animation', 'west_animation', 'animation'}) - end - end - end - - if item.idle_animation and item.idle_animation.layers then - local i = 1 - - while i < #item.idle_animation.layers do - if item.idle_animation.layers[i] then - item.idle_animation.layers[i].tint = mod_tint[tier] - end - - i = i + 2 - - if not item.idle_animation.layers[i] then - break - end - end - end - - if item.base_picture and item.base_picture.sheets then - item.base_picture.sheets[1].tint = mod_tint[tier] - end - - item.localised_name = (tier > 1 and {'phi-cl.combine', {'?', {'entity-name.' .. source.ref_name}, {'name.' .. source.ref_name}}, tostring(tier)}) or {'?', {'entity-name.' .. source.ref_name}, {'name.' .. source.ref_name}} - item.localised_description = {'?', {'entity-description.' .. source.ref_name}, {'description.' .. source.ref_name}} - - data:extend({item}) -end - --- item -function main.EI(source, tier) - local item = table.deepcopy(data.raw.item[source.ref_name]) - item.name = (source.category == 'equipment' and (source.name .. '-mk' .. tier .. '-equipment')) or (source.name .. ((tier > 1 and '-' .. tier) or '')) - item[(source.category == 'equipment' and 'place_as_equipment_result') or 'place_result'] = item.name - - if item.icons and item.icons[1] then - item.icons[1].tint = mod_tint[tier] - - elseif item.icon then - item.icons = {{icon = item.icon, tint = mod_tint[tier]}} - item.icon = nil - - if item.icon_size then - item.icons[1].icon_size = item.icon_size - item.icon_size = nil - end - end - - table.insert(item.icons, {icon = '__base__/graphics/icons/signal/signal_' .. tier .. '.png', icon_size = 64, scale = 0.25, shift = {12, 12}}) - item.order = item.order .. tier - item.localised_name = (tier > 1 and {'phi-cl.combine', {'?', {'entity-name.' .. source.ref_name}, {'equipment-name.' .. source.ref_name}, {'item-name.' .. source.ref_name}, {'name.' .. source.ref_name}}, tostring(tier)}) or {'?', {'entity-name.' .. source.ref_name}, {'equipment-name.' .. source.ref_name}, {'item-name.' .. source.ref_name}, {'name.' .. source.ref_name}} - item.localised_description = {'?', {'entity-description.' .. source.ref_name}, {'equipment-description.' .. source.ref_name}, {'item-description.' .. source.ref_name}, {'description.' .. source.ref_name}} - - data:extend({item}) -end - --- recipe -function main.ER(source, tier) - local result_name = source.name .. ((source.category == 'equipment' and ('-mk' .. tier .. '-equipment')) or ('-' .. tier)) - - data:extend({{ - type = 'recipe', - name = result_name, - icons = table.deepcopy(data.raw.item[source.ref_name].icons), - energy_required = 2, - enabled = false, - ingredients = {{type = 'item', name = (tier > source.min and (source.name .. '-' .. (tier - 1))) or source.ref_name, amount = 2}}, - results = {{type = 'item', name = result_name, amount = 1}}, - main_product = result_name, - localised_name = {'?', data.raw[source.type][result_name].localised_name, ''}, - localised_description = {'?', data.raw[source.type][result_name].localised_description, ''} - }}) -end - --- technology -function main.ET(source, tier) - if not data.raw.technology[source.tech] then - return - end - - if not data.raw.technology[source.tech].effects then - data.raw.technology[source.tech].effects = {} - end - - table.insert(data.raw.technology[source.tech].effects, {type = 'unlock-recipe', recipe = source.name .. '-' .. tier}) - - if source.type ~= 'ammo-turret' and source.type ~= 'fluid-turret' then - return - end - - for i=1, #research_modifier[source.type], 1 do - if data.raw.technology[research_modifier[source.type][i]] and data.raw.technology[research_modifier[source.type][i]].effects then - for j=1, #data.raw.technology[research_modifier[source.type][i]].effects, 1 do - if (data.raw.technology[research_modifier[source.type][i]].effects[j].type == 'turret-attack') and (data.raw.technology[research_modifier[source.type][i]].effects[j].turret_id == source.ref_name) then - table.insert(data.raw.technology[research_modifier[source.type][i]].effects, {type='turret-attack', turret_id=source.name .. '-' .. tier, modifier=data.raw.technology[research_modifier[source.type][i]].effects[j].modifier}) - end - end - end - end -end - --- fast replace group -function main.EL(source) - if not data.raw[source.type][source.ref_name].fast_replaceable_group then - data.raw[source.type][source.ref_name].fast_replaceable_group = source.ref_name - end - - if source.max > 2 then - data.raw[source.type][source.name .. '-' .. 2].fast_replaceable_group = data.raw[source.type][source.ref_name].fast_replaceable_group - end - - if source.max <= source.min then - return - end - - for j=source.min + 1, source.max do - data.raw[source.type][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.name .. '-' .. (j - 1)].fast_replaceable_group - end -end - --- entity category -function main.EEEC(source, tier) - local item_name = source.name .. '-' .. tier - - if not (data.raw[source.type][source.ref_name] and data.raw[source.type][item_name]) then - return - end - - if data.raw[source.type][source.ref_name].crafting_categories and data.raw[source.type][item_name].crafting_categories then - data.raw[source.type][item_name].crafting_categories = {table.unpack(data.raw[source.type][source.ref_name].crafting_categories)} - end - - if data.raw[source.type][source.ref_name].resource_categories and data.raw[source.type][item_name].resource_categories then - data.raw[source.type][item_name].resource_categories = {table.unpack(data.raw[source.type][source.ref_name].resource_categories)} - end - - data.raw[source.type][item_name].fuel_categories = (data.raw[source.type][source.ref_name].fuel_categories and table.deepcopy(data.raw[source.type][source.ref_name].fuel_categories)) or nil - data.raw[source.type][item_name].allowed_effects = (data.raw[source.type][source.ref_name].allowed_effects and table.deepcopy(data.raw[source.type][source.ref_name].allowed_effects)) or nil -end - -return main diff --git a/PHI-CL/data/b/mbm.lua b/PHI-CL/data/b/mbm.lua index 9a82327..3718913 100644 --- a/PHI-CL/data/b/mbm.lua +++ b/PHI-CL/data/b/mbm.lua @@ -1,6 +1,276 @@ -local main = require('main') local items = require('mbm-c') +local research_modifier = { + ['ammo-turret'] = { + 'physical-projectile-damage-1', + 'physical-projectile-damage-2', + 'physical-projectile-damage-3', + 'physical-projectile-damage-4', + 'physical-projectile-damage-5', + 'physical-projectile-damage-6', + 'physical-projectile-damage-7' + }, + ['fluid-turret'] = { + 'refined-flammables-1', + 'refined-flammables-2', + 'refined-flammables-3', + 'refined-flammables-4', + 'refined-flammables-5', + 'refined-flammables-6', + 'refined-flammables-7' + } +} + +local mod_tint = { + [2] = {r=140, g=142, b=200}, + [3] = {r=242, g=161, b=26}, + [4] = {r=255, g=254, b=42}, + [5] = {r=54, g=228, b=255}, + [6] = {r=253, g=0, b=97}, + [7] = {r=0, g=209, b=102}, + [8] = {r=233, g=63, b=233} +} + +local function tint_handle(item, tier, tl) + for _, ve in pairs(tl) do + if item[ve] then + for _, tc in pairs({'layers', 'sheets', 'structure', 'frames'}) do + if item[ve][tc] and type(item[ve][tc]) == 'table' then + for _, v2 in pairs(item[ve][tc]) do + v2.tint = mod_tint[tier] + + if v2.frames then + for _, v3 in pairs(v2.frames) do + v3.tint = mod_tint[tier] + end + end + end + end + end + + item[ve].tint = mod_tint[tier] + end + end +end + +function main_entity(source, tier) + local item = table.deepcopy(data.raw[source.type][source.ref_name]) + item.name = source.name .. '-' .. tier + item.minable.result = item.name + item.max_health = item.max_health * (tier - source.min + 2) + item.next_upgrade = ((tier < source.max) and source.name .. '-' .. (tier + 1)) or nil + + for _, v in pairs({'researching_speed', 'mining_speed', 'crafting_speed'}) do + if item[v] then + item[v] = tonumber(string.match(item[v], '[%d%.]+')) * (2 ^ (tier - source.min + 1)) + end + end + + for _, v in pairs({'energy_usage', 'heating_energy', 'crane_energy_usage', 'energy_per_shot'}) do + if not (source.tech == 'compound-energy' and (source.type == 'solar-panel' or source.type == 'accumulator')) and item[v] then + item[v] = (tonumber(string.match(item[v], '[%d%.]+')) * (2 ^ (tier - source.min + 1))) .. (string.match(item[v], '%a+') or '') + end + end + + if item.energy_source then + for _, v in pairs({'buffer_capacity', 'input_flow_limit', 'output_flow_limit'}) do + if not (source.tech == 'compound-energy' and (source.type == 'solar-panel' or source.type == 'accumulator')) and item.energy_source[v] then + item.energy_source[v] = tonumber(string.match(item.energy_source[v], '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.energy_source[v], '%a+') + end + end + + if item.energy_source.emissions_per_minute then + for k, _ in pairs(item.energy_source.emissions_per_minute) do + item.energy_source.emissions_per_minute[k] = item.energy_source.emissions_per_minute[k] * (2 ^ (tier - source.min + 1)) + end + end + end + + if (source.type == 'electric-turret') or (source.type == 'ammo-turret') or (source.type == 'fluid-turret') then + if item.attack_parameters then + item.attack_parameters.damage_modifier = 2 ^ (tier - source.min + 1) + item.attack_parameters.range = item.attack_parameters.range + (2 * (tier - source.min + 1)) + item.attack_parameters.cooldown = (item.attack_parameters.cooldown and (item.attack_parameters.cooldown * ((24 - tier + source.min) / 25))) or nil + end + + item.call_for_help_radius = (item.call_for_help_radius and (item.call_for_help_radius + (2 * (tier - source.min + 1)))) or nil + + if source.type == 'electric-turret' then + item.glow_light_intensity = 1 + + if item.attack_parameters then + item.attack_parameters.damage_modifier = (item.attack_parameters.damage_modifier and (item.attack_parameters.damage_modifier * 2)) or nil + + if item.attack_parameters.ammo_type then + item.attack_parameters.ammo_type.action.action_delivery.max_length = ((item.attack_parameters.ammo_type.action and item.attack_parameters.ammo_type.action.action_delivery and item.attack_parameters.ammo_type.action.action_delivery.max_length) and (item.attack_parameters.ammo_type.action.action_delivery.max_length + (2 * (tier - source.min + 1)))) or nil + item.attack_parameters.ammo_type.energy_consumption = (item.attack_parameters.ammo_type.energy_consumption and (tonumber(string.match(item.attack_parameters.ammo_type.energy_consumption, '[%d%.]+')) * (2 ^ (tier - source.min + 1)) .. string.match(item.attack_parameters.ammo_type.energy_consumption, '%a+'))) or nil + end + end + + elseif source.type == 'fluid-turret' then + item.prepare_range = item.prepare_range + (2 * (tier - source.min + 1)) + end + end + + if (source.type == 'lab') then + for _, v in pairs({{['a'] = 'on_animation', ['n'] = 3}, {['a'] = 'off_animation', ['n'] = 2}}) do + if item[v['a']] and item[v['a']].layers then + for i=1, v['n'], 1 do + if item[v['a']].layers[i] then + item[v['a']].layers[i].tint = mod_tint[tier] + end + end + end + end + + elseif (source.type == 'mining-drill') then + for _, e in pairs({'graphics_set', 'wet_mining_graphics_set'}) do + if item[e] and item[e].animation then + for _, d in pairs(item[e].animation) do + if d.layers then + d.layers[1].tint = mod_tint[tier] + d.layers[2].tint = mod_tint[tier] + end + end + end + end + + elseif source.type == 'radar' then + item.max_distance_of_sector_revealed = item.max_distance_of_sector_revealed + (2 * (tier - source.min + 1)) + item.max_distance_of_nearby_sector_revealed = item.max_distance_of_nearby_sector_revealed + (2 * (tier - source.min + 1)) + + elseif source.type == 'thruster' then + for _, v in pairs({'min_performance', 'max_performance'}) do + item[v].fluid_usage = (item[v].fluid_usage and item[v].fluid_usage * (2 ^ (tier - source.min + 1))) or nil + end + + elseif source.type == 'reactor' and source.name == 'heating-tower' then + item.consumption = tostring(tonumber(string.match(item.consumption, '[%d%.]+')) * (2 ^ (tier - source.min + 1))) .. string.match(item.consumption, '%a+') + + elseif source.type == 'agricultural-tower' then + item.radius = item.radius + (1 * (tier - source.min + 1)) + end + + tint_handle(item, tier, {'picture', 'pictures', 'animation', 'structure', 'integration_patch', 'horizontal_animation', 'vertical_animation'}) + + for _, v in pairs({'graphics_set', 'graphics_set_flipped'}) do + if item[v] then + tint_handle(item[v], tier, {'animation', 'idle_animation', 'frozen_patch'}) + + if item[v].working_visualisations then + tint_handle(item[v].working_visualisations, tier, {'north_animation', 'east_animation', 'south_animation', 'west_animation', 'animation'}) + end + end + end + + if item.idle_animation and item.idle_animation.layers then + local i = 1 + + while i < #item.idle_animation.layers do + if item.idle_animation.layers[i] then + item.idle_animation.layers[i].tint = mod_tint[tier] + end + + i = i + 2 + + if not item.idle_animation.layers[i] then + break + end + end + end + + if item.base_picture and item.base_picture.sheets then + item.base_picture.sheets[1].tint = mod_tint[tier] + end + + item.localised_name = (tier > 1 and {'phi-cl.combine', {'?', {'entity-name.' .. source.ref_name}, {'name.' .. source.ref_name}}, tostring(tier)}) or {'?', {'entity-name.' .. source.ref_name}, {'name.' .. source.ref_name}} + item.localised_description = {'?', {'entity-description.' .. source.ref_name}, {'description.' .. source.ref_name}} + + data:extend({item}) +end + +function main_item(source, tier) + local item = table.deepcopy(data.raw.item[source.ref_name]) + item.name = source.name .. ((tier > 1 and '-' .. tier) or '') + item['place_result'] = item.name + + if item.icons and item.icons[1] then + item.icons[1].tint = mod_tint[tier] + + elseif item.icon then + item.icons = {{icon = item.icon, icon_size = (item.icon_size and item.icon_size) or nil, tint = mod_tint[tier]}} + item.icon = nil + end + + table.insert(item.icons, {icon = '__base__/graphics/icons/signal/signal_' .. tier .. '.png', icon_size = 64, scale = 0.25, shift = {12, 12}}) + item.order = item.order .. tier + item.localised_name = (tier > 1 and {'phi-cl.combine', {'?', {'entity-name.' .. source.ref_name}, {'equipment-name.' .. source.ref_name}, {'item-name.' .. source.ref_name}, {'name.' .. source.ref_name}}, tostring(tier)}) or {'?', {'entity-name.' .. source.ref_name}, {'equipment-name.' .. source.ref_name}, {'item-name.' .. source.ref_name}, {'name.' .. source.ref_name}} + item.localised_description = {'?', {'entity-description.' .. source.ref_name}, {'equipment-description.' .. source.ref_name}, {'item-description.' .. source.ref_name}, {'description.' .. source.ref_name}} + + data:extend({item}) +end + +function main_recipe(source, tier) + local result_name = source.name .. '-' .. tier + + data:extend({{ + type = 'recipe', + name = result_name, + icons = table.deepcopy(data.raw.item[source.ref_name].icons), + energy_required = 2, + enabled = false, + ingredients = {{type = 'item', name = (tier > source.min and (source.name .. '-' .. (tier - 1))) or source.ref_name, amount = 2}}, + results = {{type = 'item', name = result_name, amount = 1}}, + main_product = result_name, + localised_name = {'?', data.raw[source.type][result_name].localised_name, ''}, + localised_description = {'?', data.raw[source.type][result_name].localised_description, ''} + }}) +end + +function main_technology(source, tier) + if not data.raw.technology[source.tech] then + return + end + + if not data.raw.technology[source.tech].effects then + data.raw.technology[source.tech].effects = {} + end + + table.insert(data.raw.technology[source.tech].effects, {type = 'unlock-recipe', recipe = source.name .. '-' .. tier}) + + if source.type ~= 'ammo-turret' and source.type ~= 'fluid-turret' then + return + end + + for i=1, #research_modifier[source.type], 1 do + if data.raw.technology[research_modifier[source.type][i]] and data.raw.technology[research_modifier[source.type][i]].effects then + for j=1, #data.raw.technology[research_modifier[source.type][i]].effects, 1 do + if (data.raw.technology[research_modifier[source.type][i]].effects[j].type == 'turret-attack') and (data.raw.technology[research_modifier[source.type][i]].effects[j].turret_id == source.ref_name) then + table.insert(data.raw.technology[research_modifier[source.type][i]].effects, {type='turret-attack', turret_id=source.name .. '-' .. tier, modifier=data.raw.technology[research_modifier[source.type][i]].effects[j].modifier}) + end + end + end + end +end + +function main_replace_group(source) + if not data.raw[source.type][source.ref_name].fast_replaceable_group then + data.raw[source.type][source.ref_name].fast_replaceable_group = source.ref_name + end + + if source.max > 2 then + data.raw[source.type][source.name .. '-' .. 2].fast_replaceable_group = data.raw[source.type][source.ref_name].fast_replaceable_group + end + + if source.max <= source.min then + return + end + + for j=source.min + 1, source.max do + data.raw[source.type][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.name .. '-' .. (j - 1)].fast_replaceable_group + end +end + -- MBE A 24 BASE ENTITY,RECIPE,RESEARCH_EFFECT -- MBE A 24 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT -- MBE A 2 QUALITY ENTITY,RECIPE,RESEARCH_EFFECT @@ -13,13 +283,13 @@ for _, v in pairs(items) do v.category = v.category or 'item' for j=v.min, v.max, 1 do - main.EEE(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) + main_entity(v, j) + main_item(v, j) + main_recipe(v, j) + main_technology(v, j) end - main.EL(v) + main_replace_group(v) end end diff --git a/PHI-CL/data/b/mbq.lua b/PHI-CL/data/b/mbq.lua index a9b1bee..31bf5da 100644 --- a/PHI-CL/data/b/mbq.lua +++ b/PHI-CL/data/b/mbq.lua @@ -164,13 +164,8 @@ function main_item(source, tier) item.icons[1].tint = mod_tint[tier] elseif item.icon then - item.icons = {{icon = item.icon, tint = mod_tint[tier]}} + item.icons = {{icon = item.icon, icon_size = (item.icon_size and item.icon_size) or nil, tint = mod_tint[tier]}} item.icon = nil - - if item.icon_size then - item.icons[1].icon_size = item.icon_size - item.icon_size = nil - end end table.insert(item.icons, {icon = '__base__/graphics/icons/signal/signal_' .. tier .. '.png', icon_size = 64, scale = 0.25, shift = {12, 12}})