This commit is contained in:
2024-10-08 19:33:53 +09:00
parent ce00df0933
commit 0d05192ade
2 changed files with 12 additions and 10 deletions

View File

@@ -783,10 +783,12 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t
type = 'armor', type = 'armor',
name = 'power-armor-mk3', name = 'power-armor-mk3',
icons = { icons = {
icon = '__base__/graphics/icons/power-armor-mk2.png', {
tint = items['tint'][2], icon = '__base__/graphics/icons/power-armor-mk2.png',
icon_size = 64, tint = items['tint'][2],
icon_mipmaps = 4 icon_size = 64,
icon_mipmaps = 4
}
}, },
resistances = { resistances = {
{ {
@@ -961,7 +963,7 @@ if settings.startup['PHI-RS'].value then
item = table.deepcopy(data.raw.recipe[k]) item = table.deepcopy(data.raw.recipe[k])
item.enabled = false item.enabled = false
item.name = k .. '-s' .. j item.name = k .. '-s' .. j
if other_recipe_name[k] then if other_recipe_name[k] then
item.localised_name = {'phi-cl.combine', {'name.' .. k}, j} item.localised_name = {'phi-cl.combine', {'name.' .. k}, j}
item.localised_description = {'description.' .. k} item.localised_description = {'description.' .. k}

View File

@@ -303,7 +303,7 @@ function main.EEQ(source, tier)
elseif item.attack_parameters then elseif item.attack_parameters then
if item.attack_parameters.cooldown then if item.attack_parameters.cooldown then
item.attack_parameters.cooldown = math.floor(item.attack_parameters.cooldown * ((32 - tier) / 32)) item.attack_parameters.cooldown = math.floor(item.attack_parameters.cooldown * ((32 - (tier - source.min + 1)) / 32))
end end
if item.attack_parameters.damage_modifier then if item.attack_parameters.damage_modifier then
@@ -318,25 +318,25 @@ function main.EEQ(source, tier)
if item.attack_parameters.ammo_type.action_delivery then if item.attack_parameters.ammo_type.action_delivery then
if item.attack_parameters.ammo_type.action_delivery then if item.attack_parameters.ammo_type.action_delivery then
item.attack_parameters.ammo_type.action_delivery.max_length = item.attack_parameters.ammo_type.action_delivery.max_length + tier - 1 item.attack_parameters.ammo_type.action_delivery.max_length = item.attack_parameters.ammo_type.action_delivery.max_length + (tier - source.min + 1)
end end
end end
end end
if item.attack_parameters.range then if item.attack_parameters.range then
item.attack_parameters.range = item.attack_parameters.range + tier - 1 item.attack_parameters.range = item.attack_parameters.range + (tier - source.min + 1)
end end
elseif item.max_shield_value and item.energy_per_shield then elseif item.max_shield_value and item.energy_per_shield then
item.max_shield_value = item.max_shield_value * (2 ^ (tier - source.min + 1)) item.max_shield_value = item.max_shield_value * (2 ^ (tier - source.min + 1))
item.energy_per_shield = math.floor(item.energy_per_shield * ((32 - tier) / 32)) item.energy_per_shield = tostring(math.floor(tonumber(string.match(item.energy_per_shield, '[%d%.]+')) * ((32 - (tier - source.min + 1)) / 32))) .. string.match(item.energy_per_shield, '%a+')
elseif item.movement_bonus then elseif item.movement_bonus then
item.movement_bonus = item.movement_bonus * (2 ^ (tier - source.min + 1)) item.movement_bonus = item.movement_bonus * (2 ^ (tier - source.min + 1))
elseif item.charging_energy and item.charging_station_count then elseif item.charging_energy and item.charging_station_count then
item.charging_energy = tostring(tonumber(string.match(item.charging_energy, '[%d%.]+')) * (2 ^ (tier - source.min + 1))) .. string.match(item.charging_energy, '%a+')
item.charging_station_count = math.max(item.charging_station_count, 8) item.charging_station_count = math.max(item.charging_station_count, 8)
item.charging_energy = tostring(tonumber(string.match(item.charging_energy, '[%d%.]+')) * (2 ^ (tier - source.min + 2))) .. string.match(item.charging_energy, '%a+')
end end
if item.sprite then if item.sprite then