diff --git a/PHI-EQ/config.lua b/PHI-EQ/config.lua index 06c8a59..28af8e7 100644 --- a/PHI-EQ/config.lua +++ b/PHI-EQ/config.lua @@ -8,6 +8,7 @@ local items = { min = 2, max = 8, base = 30, + order = 'a[energy-source]-a[solar-panel]', graphics_name = 'solar-panel-equipment' }, ['fusion-reactor'] = { @@ -19,6 +20,7 @@ local items = { min = 2, max = 8, base = 750, + order = 'a[energy-source]-b[fusion-reactor]', graphics_name = 'fusion-reactor-equipment' }, ['battery'] = { @@ -30,6 +32,7 @@ local items = { min = 3, max = 8, base = 100, + order = 'b[battery]-b[battery-equipment-mk2]', graphics_name = 'battery-mk2-equipment' }, ['personal-laser-defense'] = { @@ -41,6 +44,7 @@ local items = { min = 2, max = 8, base = 3, + order = 'b[active-defense]-a[personal-laser-defense-equipment]', graphics_name = 'personal-laser-defense-equipment' }, ['energy-shield'] = { @@ -52,6 +56,7 @@ local items = { min = 3, max = 8, base = 150, + order = 'a[shield]-b[energy-shield-equipment-mk2]', graphics_name = 'energy-shield-mk2-equipment' }, ['personal-roboport'] = { @@ -63,6 +68,7 @@ local items = { min = 3, max = 8, base = 0.5, + order = 'e[robotics]-b[personal-roboport-equipment-mk2]', graphics_name = 'personal-roboport-mk2-equipment' }, ['night-vision'] = { @@ -74,6 +80,7 @@ local items = { min = 2, max = 2, base = 1, + order = 'f[night-vision]-a[night-vision-equipment]', graphics_name = 'night-vision-equipment' }, ['exoskeleton'] = { @@ -85,6 +92,7 @@ local items = { min = 2, max = 2, base = 0.6, + order = 'd[exoskeleton]-a[exoskeleton-equipment]', graphics_name = 'exoskeleton-equipment' } } diff --git a/PHI-EQ/data.lua b/PHI-EQ/data.lua index e06122d..3aca2ff 100644 --- a/PHI-EQ/data.lua +++ b/PHI-EQ/data.lua @@ -93,7 +93,7 @@ local function EI(source, tier) item.stack_size = 20 item.default_request_amount = 5 item.icons = {{icon = '__base__/graphics/icons/' .. source.graphics_name .. '.png', icon_mipmaps = 4, icon_size = 64}} - item.order = item.order .. tier + item.order = source.order .. tier data:extend({item}) end diff --git a/PHI-EQ/info.json b/PHI-EQ/info.json index f624099..277cf40 100644 --- a/PHI-EQ/info.json +++ b/PHI-EQ/info.json @@ -1,8 +1,8 @@ { "name": "PHI-EQ", - "version": "1.1.15", + "version": "1.1.16", "factorio_version": "1.1", - "date": "2023-05-09", + "date": "2023-05-10", "title": "Phidias Equipment", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-MI/data-final-fixes.lua b/PHI-MI/data-final-fixes.lua new file mode 100644 index 0000000..d350a06 --- /dev/null +++ b/PHI-MI/data-final-fixes.lua @@ -0,0 +1 @@ +data.raw['utility-constants'].default.zoom_to_world_effect_strength = 0 \ No newline at end of file diff --git a/PHI-MI/info.json b/PHI-MI/info.json index 72bcb6f..cd2e802 100644 --- a/PHI-MI/info.json +++ b/PHI-MI/info.json @@ -1,8 +1,8 @@ { "name": "PHI-MI", - "version": "1.0.8", + "version": "1.0.9", "factorio_version": "1.1", - "date": "2023-05-08", + "date": "2023-05-11", "title": "Phidias Megabase Item", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-RS/config.lua b/PHI-RS/config.lua new file mode 100644 index 0000000..b22f3ed --- /dev/null +++ b/PHI-RS/config.lua @@ -0,0 +1,304 @@ +local items = { + { + name='iron-plate', + tech='automation' + }, + { + name='copper-plate', + tech='automation' + }, + { + name='stone-brick', + tech='automation' + }, + { + name='steel-plate', + tech='steel-processing' + }, + { + name='basic-oil-processing', + tech='oil-processing' + }, + { + name='advanced-oil-processing', + tech='advanced-oil-processing' + }, + { + name='heavy-oil-cracking', + tech='advanced-oil-processing' + }, + { + name='light-oil-cracking', + tech='advanced-oil-processing' + }, + { + name='solid-fuel-from-light-oil', + tech='advanced-oil-processing' + }, + { + name='solid-fuel-from-heavy-oil', + tech='advanced-oil-processing' + }, + { + name='solid-fuel-from-petroleum-gas', + tech='oil-processing' + }, + { + name='coal-liquefaction', + tech='coal-liquefaction' + }, + { + name='sulfur', + tech='sulfur-processing' + }, + { + name='sulfuric-acid', + tech='sulfur-processing' + }, + { + name='lubricant', + tech='lubricant' + }, + { + name='plastic-bar', + tech='plastics' + }, + { + name='battery', + tech='battery' + }, + { + name='explosives', + tech='explosives' + }, + { + name='cliff-explosives', + tech='cliff-explosives' + }, + { + name='empty-barrel', + tech='fluid-handling' + }, + { + name='copper-cable', + tech='automation' + }, + { + name='iron-stick', + tech='automation' + }, + { + name='iron-gear-wheel', + tech='automation' + }, + { + name='pipe', + tech='automation' + }, + { + name='electronic-circuit', + tech='automation' + }, + { + name='advanced-circuit', + tech='advanced-electronics' + }, + { + name='processing-unit', + tech='advanced-electronics-2' + }, + { + name='engine-unit', + tech='engine' + }, + { + name='electric-engine-unit', + tech='electric-engine' + }, + { + name='flying-robot-frame', + tech='robotics' + }, + { + name='low-density-structure', + tech='low-density-structure' + }, + { + name='rocket-fuel', + tech='rocket-fuel' + }, + { + name='rocket-control-unit', + tech='rocket-control-unit' + }, + { + name='automation-science-pack', + tech='automation' + }, + { + name='logistic-science-pack', + tech='logistic-science-pack' + }, + { + name='chemical-science-pack', + tech='chemical-science-pack' + }, + { + name='military-science-pack', + tech='military-science-pack' + }, + { + name='production-science-pack', + tech='production-science-pack' + }, + { + name='utility-science-pack', + tech='utility-science-pack' + }, + { + name='inserter', + tech='automation' + }, + { + name='transport-belt', + tech='automation' + }, + { + name='grenade', + tech='military-2' + }, + { + name='firearm-magazine', + tech='automation' + }, + { + name='piercing-rounds-magazine', + tech='military-2' + }, + { + name='stone-wall', + tech='stone-wall' + }, + { + name='rail', + tech='railway' + }, + { + name='electric-furnace', + tech='advanced-material-processing-2' + }, + { + name='concrete', + tech='concrete' + }, + { + name='uranium-processing', + tech='uranium-processing' + }, + { + name='uranium-fuel-cell', + tech='uranium-processing' + }, + { + name='nuclear-fuel-reprocessing', + tech='nuclear-fuel-reprocessing' + }, + { + name='kovarex-enrichment-process', + tech='kovarex-enrichment-process' + }, + { + name='nuclear-fuel', + tech='kovarex-enrichment-process' + }, + { + name='speed-module', + tech='speed-module' + }, + { + name='speed-module-2', + tech='speed-module-2' + }, + { + name='speed-module-3', + tech='speed-module-3' + }, + { + name='productivity-module', + tech='productivity-module' + }, + { + name='productivity-module-2', + tech='productivity-module-2' + }, + { + name='productivity-module-3', + tech='productivity-module-3' + }, + { + name='effectivity-module', + tech='effectivity-module' + }, + { + name='effectivity-module-2', + tech='effectivity-module-2' + }, + { + name='effectivity-module-3', + tech='effectivity-module-3' + }, + { + name='fast-inserter', + tech='fast-inserter' + }, + { + name='filter-inserter', + tech='fast-inserter' + }, + { + name='long-handed-inserter', + tech='automation' + }, + { + name='stack-inserter', + tech='stack-inserter' + }, + { + name='stack-filter-inserter', + tech='stack-inserter' + }, + { + name='uranium-rounds-magazine', + tech='uranium-ammo' + }, + { + name='explosive-cannon-shell', + tech='tank' + }, + { + name='artillery-shell', + tech='artillery' + }, + { + name='rocket', + tech='rocketry' + }, + { + name='explosive-rocket', + tech='explosive-rocketry' + }, + { + name='solar-panel', + tech='solar-energy' + }, + { + name='accumulator', + tech='electric-energy-accumulators' + }, + { + name='radar', + tech='automation' + } +} + +return items \ No newline at end of file diff --git a/PHI-RS/data.lua b/PHI-RS/data.lua index a20115b..7813c2a 100644 --- a/PHI-RS/data.lua +++ b/PHI-RS/data.lua @@ -1,302 +1,10 @@ local recipe_multiplier = {4, 8} +local items = require 'config' -local recipe_list = { - { - name='iron-plate', - tech='automation' - }, - { - name='copper-plate', - tech='automation' - }, - { - name='stone-brick', - tech='automation' - }, - { - name='steel-plate', - tech='steel-processing' - }, - { - name='basic-oil-processing', - tech='oil-processing' - }, - { - name='advanced-oil-processing', - tech='advanced-oil-processing' - }, - { - name='heavy-oil-cracking', - tech='advanced-oil-processing' - }, - { - name='light-oil-cracking', - tech='advanced-oil-processing' - }, - { - name='solid-fuel-from-light-oil', - tech='advanced-oil-processing' - }, - { - name='solid-fuel-from-heavy-oil', - tech='advanced-oil-processing' - }, - { - name='solid-fuel-from-petroleum-gas', - tech='oil-processing' - }, - { - name='coal-liquefaction', - tech='coal-liquefaction' - }, - { - name='sulfur', - tech='sulfur-processing' - }, - { - name='sulfuric-acid', - tech='sulfur-processing' - }, - { - name='lubricant', - tech='lubricant' - }, - { - name='plastic-bar', - tech='plastics' - }, - { - name='battery', - tech='battery' - }, - { - name='explosives', - tech='explosives' - }, - { - name='cliff-explosives', - tech='cliff-explosives' - }, - { - name='empty-barrel', - tech='fluid-handling' - }, - { - name='copper-cable', - tech='automation' - }, - { - name='iron-stick', - tech='automation' - }, - { - name='iron-gear-wheel', - tech='automation' - }, - { - name='pipe', - tech='automation' - }, - { - name='electronic-circuit', - tech='automation' - }, - { - name='advanced-circuit', - tech='advanced-electronics' - }, - { - name='processing-unit', - tech='advanced-electronics-2' - }, - { - name='engine-unit', - tech='engine' - }, - { - name='electric-engine-unit', - tech='electric-engine' - }, - { - name='flying-robot-frame', - tech='robotics' - }, - { - name='low-density-structure', - tech='low-density-structure' - }, - { - name='rocket-fuel', - tech='rocket-fuel' - }, - { - name='rocket-control-unit', - tech='rocket-control-unit' - }, - { - name='automation-science-pack', - tech='automation' - }, - { - name='logistic-science-pack', - tech='logistic-science-pack' - }, - { - name='chemical-science-pack', - tech='chemical-science-pack' - }, - { - name='military-science-pack', - tech='military-science-pack' - }, - { - name='production-science-pack', - tech='production-science-pack' - }, - { - name='utility-science-pack', - tech='utility-science-pack' - }, - { - name='inserter', - tech='automation' - }, - { - name='transport-belt', - tech='automation' - }, - { - name='grenade', - tech='military-2' - }, - { - name='firearm-magazine', - tech='automation' - }, - { - name='piercing-rounds-magazine', - tech='military-2' - }, - { - name='stone-wall', - tech='stone-wall' - }, - { - name='rail', - tech='railway' - }, - { - name='electric-furnace', - tech='advanced-material-processing-2' - }, - { - name='concrete', - tech='concrete' - }, - { - name='uranium-processing', - tech='uranium-processing' - }, - { - name='uranium-fuel-cell', - tech='uranium-processing' - }, - { - name='nuclear-fuel-reprocessing', - tech='nuclear-fuel-reprocessing' - }, - { - name='kovarex-enrichment-process', - tech='kovarex-enrichment-process' - }, - { - name='nuclear-fuel', - tech='kovarex-enrichment-process' - }, - { - name='speed-module', - tech='speed-module' - }, - { - name='speed-module-2', - tech='speed-module-2' - }, - { - name='speed-module-3', - tech='speed-module-3' - }, - { - name='productivity-module', - tech='productivity-module' - }, - { - name='productivity-module-2', - tech='productivity-module-2' - }, - { - name='productivity-module-3', - tech='productivity-module-3' - }, - { - name='effectivity-module', - tech='effectivity-module' - }, - { - name='effectivity-module-2', - tech='effectivity-module-2' - }, - { - name='effectivity-module-3', - tech='effectivity-module-3' - }, - { - name='fast-inserter', - tech='fast-inserter' - }, - { - name='filter-inserter', - tech='fast-inserter' - }, - { - name='long-handed-inserter', - tech='automation' - }, - { - name='stack-inserter', - tech='stack-inserter' - }, - { - name='stack-filter-inserter', - tech='stack-inserter' - }, - { - name='uranium-rounds-magazine', - tech='uranium-ammo' - }, - { - name='explosive-cannon-shell', - tech='tank' - }, - { - name='artillery-shell', - tech='artillery' - }, - { - name='rocket', - tech='rocketry' - }, - { - name='explosive-rocket', - tech='explosive-rocketry' - }, -} - - - -for i=1, #recipe_list, 1 do - if data.raw.recipe[recipe_list[i].name] ~= nil then +for i=1, #items, 1 do + if data.raw.recipe[items[i].name] ~= nil then for j=1, #recipe_multiplier, 1 do - local item = table.deepcopy(data.raw.recipe[recipe_list[i].name]) + local item = table.deepcopy(data.raw.recipe[items[i].name]) item.enabled = false if (item.normal ~= nil) and (item.normal ~= false) then @@ -399,7 +107,7 @@ for i=1, #recipe_list, 1 do item.name = item.name .. '-s' .. j data:extend({item}) - table.insert(data.raw.technology[recipe_list[i].tech].effects, {type='unlock-recipe', recipe=item.name}) + table.insert(data.raw.technology[items[i].tech].effects, {type='unlock-recipe', recipe=item.name}) end end end diff --git a/PHI-RS/info.json b/PHI-RS/info.json index 9410ad6..5cf2705 100644 --- a/PHI-RS/info.json +++ b/PHI-RS/info.json @@ -1,8 +1,8 @@ { "name": "PHI-RS", - "version": "1.0.4", + "version": "1.0.5", "factorio_version": "1.1", - "date": "2023-05-08", + "date": "2023-05-13", "title": "Phidias Recipe Scaling", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-RS/migrations/migrations.lua b/PHI-RS/migrations/migrations.lua index 66fda1d..1d84bff 100644 --- a/PHI-RS/migrations/migrations.lua +++ b/PHI-RS/migrations/migrations.lua @@ -1,3 +1,5 @@ +local items = require '__PHI-RS__/config' + for index, force in pairs(game.forces) do local technologies = force.technologies local recipes = force.recipes @@ -6,4 +8,15 @@ for index, force in pairs(game.forces) do recipes['electric-filter-furnace'].enabled = true recipes['electric-filter-furnace'].reload() end + + for _, v in pairs(items) do + if technologies[v.tech] ~= nil then + if technologies[v.tech].researched then + recipes[v.name .. '-s1'].enabled = true + recipes[v.name .. '-s1'].reload() + recipes[v.name .. '-s2'].enabled = true + recipes[v.name .. '-s2'].reload() + end + end + end end diff --git a/PHI-WE/data.lua b/PHI-WE/data.lua index 9556cd2..196bc2b 100644 --- a/PHI-WE/data.lua +++ b/PHI-WE/data.lua @@ -1,5 +1,37 @@ local items = require 'config' +local research_modifier = { + --[[ + ['electric-turret'] = { + 'energy-weapons-damage-1', + 'energy-weapons-damage-2', + 'energy-weapons-damage-3', + 'energy-weapons-damage-4', + 'energy-weapons-damage-5', + 'energy-weapons-damage-6', + 'energy-weapons-damage-7' + }, + ]] + ['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' + } +} + -- entity local function EE(source, tier) local item = table.deepcopy(data.raw[source.type][source.ref_name]) @@ -74,6 +106,18 @@ end -- tech local function ET(source, tier) table.insert(data.raw.technology[source.tech].effects, {type='unlock-recipe', recipe=source.name .. '-' .. tier}) + + if source.type == 'ammo-turret' or source.type == 'fluid-turret' then + for i=1, #research_modifier[source.type], 1 do + 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') then + if (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 end for _, v in pairs(items) do diff --git a/PHI-WE/info.json b/PHI-WE/info.json index 8b213c9..24b9526 100644 --- a/PHI-WE/info.json +++ b/PHI-WE/info.json @@ -1,8 +1,8 @@ { "name": "PHI-WE", - "version": "1.0.3", + "version": "1.0.4", "factorio_version": "1.1", - "date": "2023-05-09", + "date": "2023-05-13", "title": "Phidias Warfare", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-WE/locale/en/locale.cfg b/PHI-WE/locale/en/locale.cfg index 1ec0ab4..82fe3ec 100644 --- a/PHI-WE/locale/en/locale.cfg +++ b/PHI-WE/locale/en/locale.cfg @@ -27,3 +27,9 @@ flamethrower-turret-2=Fires a stream of burning liquid at enemies. flamethrower-turret-3=Fires a stream of burning liquid at enemies. radar-2=Scans the nearby sectors, and actively reveals an area around it. radar-3=Scans the nearby sectors, and actively reveals an area around it. + +[modifier-description] +gun-turret-2-attack-bonus=Gun turret damage: +__1__ +gun-turret-3-attack-bonus=Gun turret damage: +__1__ +flamethrower-turret-2-attack-bonus=Fire damage: +__1__ +flamethrower-turret-3-attack-bonus=Fire damage: +__1__ diff --git a/PHI-WE/locale/ja/locale.cfg b/PHI-WE/locale/ja/locale.cfg index 98e6bd5..7aa3dee 100644 --- a/PHI-WE/locale/ja/locale.cfg +++ b/PHI-WE/locale/ja/locale.cfg @@ -3,8 +3,8 @@ laser-turret-2=レーザータレット 2 laser-turret-3=レーザータレット 3 gun-turret-2=ガンタレット 2 gun-turret-3=ガンタレット 3 -flamethrower-turret-2=火炎放射器 2 -flamethrower-turret-3=火炎放射器 3 +flamethrower-turret-2=火炎放射タレット 2 +flamethrower-turret-3=火炎放射タレット 3 radar-2=レーダー 2 radar-3=レーダー 3 @@ -13,8 +13,8 @@ laser-turret-2=レーザータレット 2 laser-turret-3=レーザータレット 3 gun-turret-2=ガンタレット 2 gun-turret-3=ガンタレット 3 -flamethrower-turret-2=火炎放射器 2 -flamethrower-turret-3=火炎放射器 3 +flamethrower-turret-2=火炎放射タレット 2 +flamethrower-turret-3=火炎放射タレット 3 radar-2=レーダー 2 radar-3=レーダー 3 @@ -27,3 +27,9 @@ flamethrower-turret-2=敵に火のついた液体を投射します。 flamethrower-turret-3=敵に火のついた液体を投射します。 radar-2=近隣の領域をスキャンし、その周囲のエリアを探索します。 radar-3=近隣の領域をスキャンし、その周囲のエリアを探索します。 + +[modifier-description] +gun-turret-2-attack-bonus=ガンタレットダメージ: +__1__ +gun-turret-3-attack-bonus=ガンタレットダメージ: +__1__ +flamethrower-turret-2-attack-bonus=火炎放射タレット ダメージ: +__1__ +flamethrower-turret-3-attack-bonus=火炎放射タレット ダメージ: +__1__ diff --git a/PHI-WE/locale/zh-CN/locale.cfg b/PHI-WE/locale/zh-CN/locale.cfg index 4a13385..93eba96 100644 --- a/PHI-WE/locale/zh-CN/locale.cfg +++ b/PHI-WE/locale/zh-CN/locale.cfg @@ -27,3 +27,9 @@ flamethrower-turret-2=噴射燃燒的油料燒灼敵人。 flamethrower-turret-3=噴射燃燒的油料燒灼敵人。 radar-2=掃描並顯示附近的未知區域。 radar-3=掃描並顯示附近的未知區域。 + +[modifier-description] +gun-turret-2-attack-bonus=機槍炮塔傷害:+__1__ +gun-turret-3-attack-bonus=機槍炮塔傷害:+__1__ +flamethrower-turret-2-attack-bonus=火焰噴射炮塔傷害:+__1__ +flamethrower-turret-3-attack-bonus=火焰噴射炮塔傷害:+__1__ diff --git a/PHI-WE/locale/zh-TW/locale.cfg b/PHI-WE/locale/zh-TW/locale.cfg index 4a13385..93eba96 100644 --- a/PHI-WE/locale/zh-TW/locale.cfg +++ b/PHI-WE/locale/zh-TW/locale.cfg @@ -27,3 +27,9 @@ flamethrower-turret-2=噴射燃燒的油料燒灼敵人。 flamethrower-turret-3=噴射燃燒的油料燒灼敵人。 radar-2=掃描並顯示附近的未知區域。 radar-3=掃描並顯示附近的未知區域。 + +[modifier-description] +gun-turret-2-attack-bonus=機槍炮塔傷害:+__1__ +gun-turret-3-attack-bonus=機槍炮塔傷害:+__1__ +flamethrower-turret-2-attack-bonus=火焰噴射炮塔傷害:+__1__ +flamethrower-turret-3-attack-bonus=火焰噴射炮塔傷害:+__1__