This commit is contained in:
2023-05-07 13:27:32 +09:00
parent 339e95dbc3
commit 228303a3d0
24 changed files with 1908 additions and 11 deletions

View File

@@ -2,6 +2,7 @@ local items = {
['assembling-machine'] = { ['assembling-machine'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'assembling-machine', name = 'assembling-machine',
ref_name = 'assembling-machine-3', ref_name = 'assembling-machine-3',
tech = 'automation-3', tech = 'automation-3',
@@ -11,6 +12,7 @@ local items = {
['electric-furnace'] = { ['electric-furnace'] = {
enabled = true, enabled = true,
type = 'furnace', type = 'furnace',
new_type = nil,
name = 'electric-furnace', name = 'electric-furnace',
ref_name = 'electric-furnace', ref_name = 'electric-furnace',
tech = 'advanced-material-processing-2', tech = 'advanced-material-processing-2',
@@ -20,6 +22,7 @@ local items = {
['oil-refinery'] = { ['oil-refinery'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'oil-refinery', name = 'oil-refinery',
ref_name = 'oil-refinery', ref_name = 'oil-refinery',
tech = 'oil-processing', tech = 'oil-processing',
@@ -29,6 +32,7 @@ local items = {
['chemical-plant'] = { ['chemical-plant'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'chemical-plant', name = 'chemical-plant',
ref_name = 'chemical-plant', ref_name = 'chemical-plant',
tech = 'oil-processing', tech = 'oil-processing',
@@ -38,6 +42,7 @@ local items = {
['centrifuge'] = { ['centrifuge'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'centrifuge', name = 'centrifuge',
ref_name = 'centrifuge', ref_name = 'centrifuge',
tech = 'uranium-processing', tech = 'uranium-processing',
@@ -47,6 +52,7 @@ local items = {
['lab'] = { ['lab'] = {
enabled = true, enabled = true,
type = 'lab', type = 'lab',
new_type = nil,
name = 'lab', name = 'lab',
ref_name = 'lab', ref_name = 'lab',
tech = 'automation', tech = 'automation',
@@ -55,10 +61,24 @@ local items = {
} }
} }
if mods['PHI-RS'] then
items['electric-filter-furnace'] = {
enabled = true,
type = 'assembling-machine',
new_type = 'assembling-machine',
name = 'electric-filter-furnace',
ref_name = 'electric-furnace',
tech = 'advanced-material-processing-2',
min = 2,
max = 3
}
end
if mods['aai-industry'] then if mods['aai-industry'] then
items['industrial-furnace'] = { items['industrial-furnace'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'industrial-furnace', name = 'industrial-furnace',
ref_name = 'industrial-furnace', ref_name = 'industrial-furnace',
tech = 'automation-3', tech = 'automation-3',
@@ -69,6 +89,7 @@ if mods['aai-industry'] then
items['fuel-processor'] = { items['fuel-processor'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'fuel-processor', name = 'fuel-processor',
ref_name = 'fuel-processor', ref_name = 'fuel-processor',
tech = 'automation', tech = 'automation',
@@ -81,6 +102,7 @@ if mods['space-exploration'] then
items['se-space-assembling-machine'] = { items['se-space-assembling-machine'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'se-space-assembling-machine', name = 'se-space-assembling-machine',
ref_name = 'se-space-assembling-machine', ref_name = 'se-space-assembling-machine',
tech = 'automation-3', tech = 'automation-3',
@@ -91,6 +113,7 @@ if mods['space-exploration'] then
items['se-space-manufactory'] = { items['se-space-manufactory'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'se-space-manufactory', name = 'se-space-manufactory',
ref_name = 'se-space-manufactory', ref_name = 'se-space-manufactory',
tech = 'automation-3', tech = 'automation-3',
@@ -101,6 +124,7 @@ if mods['space-exploration'] then
items['se-casting-machine'] = { items['se-casting-machine'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'se-casting-machine', name = 'se-casting-machine',
ref_name = 'se-casting-machine', ref_name = 'se-casting-machine',
tech = 'automation-3', tech = 'automation-3',
@@ -111,6 +135,7 @@ if mods['space-exploration'] then
items['se-pulveriser'] = { items['se-pulveriser'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'se-pulveriser', name = 'se-pulveriser',
ref_name = 'se-pulveriser', ref_name = 'se-pulveriser',
tech = 'automation-2', tech = 'automation-2',
@@ -121,6 +146,7 @@ if mods['space-exploration'] then
items['se-lifesupport-facility'] = { items['se-lifesupport-facility'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'se-lifesupport-facility', name = 'se-lifesupport-facility',
ref_name = 'se-lifesupport-facility', ref_name = 'se-lifesupport-facility',
tech = 'automation-2', tech = 'automation-2',
@@ -131,6 +157,7 @@ if mods['space-exploration'] then
items['se-fuel-refinery'] = { items['se-fuel-refinery'] = {
enabled = true, enabled = true,
type = 'assembling-machine', type = 'assembling-machine',
new_type = nil,
name = 'se-fuel-refinery', name = 'se-fuel-refinery',
ref_name = 'se-fuel-refinery', ref_name = 'se-fuel-refinery',
tech = 'automation', tech = 'automation',

View File

@@ -27,7 +27,11 @@ local function EE(source, tier)
if (tier <= source.max - 1) then if (tier <= source.max - 1) then
item.next_upgrade = source.name .. '-' .. (tier + 1) item.next_upgrade = source.name .. '-' .. (tier + 1)
end end
if (source.new_type ~= nil) then
item.type = source.new_type
end
data:extend({item}) data:extend({item})
end end
@@ -62,7 +66,7 @@ end
-- tech -- tech
local function ET(source, tier) local function ET(source, tier)
table.insert(data.raw.technology[source.tech].effects, {type='unlock-recipe', recipe=source.name .. '-' .. tier}) table.insert(data.raw.technology[source.tech].effects, {type='unlock-recipe', recipe=source.ref_name .. '-' .. tier})
end end
for _, v in pairs(items) do for _, v in pairs(items) do

View File

@@ -1,8 +1,8 @@
{ {
"name": "PHI-MB", "name": "PHI-MB",
"version": "1.0.9", "version": "1.0.10",
"factorio_version": "1.1", "factorio_version": "1.1",
"date": "2023-05-01", "date": "2023-05-07",
"title": "Phidias Megabase", "title": "Phidias Megabase",
"author": "PHIDIAS0303", "author": "PHIDIAS0303",
"contributers": "", "contributers": "",
@@ -10,6 +10,7 @@
"description": "Additional Machines for Megabase", "description": "Additional Machines for Megabase",
"dependencies": [ "dependencies": [
"base >= 1.1.0", "base >= 1.1.0",
"? PHI-RS >= 1.0.2",
"? space-exploration >= 0.6.0", "? space-exploration >= 0.6.0",
"? aai-industry >= 0.5.0" "? aai-industry >= 0.5.0"
] ]

View File

@@ -86,4 +86,4 @@ se-pulveriser-3=り硬い鉱物やコア断片などを粉砕・破砕するこ
se-lifesupport-facility-2=過酷な環境での生存を支えます。 se-lifesupport-facility-2=過酷な環境での生存を支えます。
se-lifesupport-facility-3=過酷な環境での生存を支えます。 se-lifesupport-facility-3=過酷な環境での生存を支えます。
se-fuel-refinery-2=燃料を自動で製作します。 se-fuel-refinery-2=燃料を自動で製作します。
se-fuel-refinery-3=燃料を自動で製作します。 se-fuel-refinery-3=燃料を自動で製作します。

View File

@@ -45,8 +45,11 @@ data.raw['module']['effectivity-module'].effect = {consumption = {bonus = -0.5},
data.raw['module']['effectivity-module-2'].effect = {consumption = {bonus = -1.0}, pollution = {bonus = -0.15}} data.raw['module']['effectivity-module-2'].effect = {consumption = {bonus = -1.0}, pollution = {bonus = -0.15}}
data.raw['module']['effectivity-module-3'].effect = {consumption = {bonus = -1.5}, pollution = {bonus = -0.2}} data.raw['module']['effectivity-module-3'].effect = {consumption = {bonus = -1.5}, pollution = {bonus = -0.2}}
data.raw['pipe']['pipe'].fluid_box.base_area = 4 data.raw['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input'
data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.base_area = 4 data.raw['decider-combinator']['decider-combinator'].energy_source.usage_priority = 'primary-input'
data.raw['pipe']['pipe'].fluid_box.height = 4
data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = 4
data.raw['pump']['pump'].fluid_box.height = 16 data.raw['pump']['pump'].fluid_box.height = 16
data.raw['pump']['pump'].pumping_speed = 800 data.raw['pump']['pump'].pumping_speed = 800
data.raw['storage-tank']['storage-tank'].fluid_box.base_area = 500 data.raw['storage-tank']['storage-tank'].fluid_box.base_area = 500

View File

@@ -1,8 +1,8 @@
{ {
"name": "PHI-MI", "name": "PHI-MI",
"version": "1.0.4", "version": "1.0.6",
"factorio_version": "1.1", "factorio_version": "1.1",
"date": "2023-04-13", "date": "2023-05-06",
"title": "Phidias Megabase Item", "title": "Phidias Megabase Item",
"author": "PHIDIAS0303", "author": "PHIDIAS0303",
"contributers": "", "contributers": "",

8
PHI-PB/.editorconfig Normal file
View File

@@ -0,0 +1,8 @@
root = true
[*]
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false

1597
PHI-PB/.luacheckrc Normal file

File diff suppressed because it is too large Load Diff

6
PHI-PB/changelog.txt Normal file
View File

@@ -0,0 +1,6 @@
---------------------------------------------------------------------------------------------------
Version: 1.1.0
Date: 2022-12-01
Added:
- Player Bonus

96
PHI-PB/config.lua Normal file
View File

@@ -0,0 +1,96 @@
local items = {
['manual_mining_speed_modifier'] = {
enabled = true,
val = 2
},
['character_running_speed_modifier'] = {
enabled = true,
val = 1
},
['manual_crafting_speed_modifier'] = {
enabled = true,
val = 5
},
['character_reach_distance_bonus'] = {
enabled = true,
val = 10
},
['character_resource_reach_distance_bonus'] = {
enabled = true,
val = 10
},
['character_build_distance_bonus'] = {
enabled = true,
val = 10
},
['character_item_pickup_distance_bonus'] = {
enabled = false,
val = 0
},
['character_loot_pickup_distance_bonus'] = {
enabled = false,
val = 0
},
['character_item_drop_distance_bonus'] = {
enabled = false,
val = 5
},
['character_inventory_slots_bonus'] = {
enabled = true,
val = 100
},
['character_health_bonus'] = {
enabled = true,
val = 200
},
['worker_robots_speed_modifier'] = {
enabled = true,
val = 1.3
},
['worker_robots_battery_modifier'] = {
enabled = true,
val = 1
},
['worker_robots_storage_bonus'] = {
enabled = true,
val = 1
},
['following_robots_lifetime_modifier'] = {
enabled = true,
val = 1
},
['character_trash_slot_count'] = {
enabled = false,
val = 20
},
['mining_drill_productivity_bonus'] = {
enabled = false,
val = 0
},
['train_braking_force_bonus'] = {
enabled = false,
val = 0
},
['laboratory_speed_modifier'] = {
enabled = false,
val = 0
},
['laboratory_productivity_bonus'] = {
enabled = false,
val = 0
},
['inserter_stack_size_bonus'] = {
enabled = false,
val = 0
},
['stack_inserter_capacity_bonus'] = {
enabled = false,
val = 0
},
['artillery_range_modifier'] = {
enabled = false,
val = 0
}
}
return items

19
PHI-PB/control.lua Normal file
View File

@@ -0,0 +1,19 @@
local config = require 'config'
script.on_event(defines.events.on_player_created, function(event)
if event.player_index == 1 then
for k, v in pairs(config) do
if (v.enabled) then
game.forces.player[k] = game.forces.player[k] + v.val
end
end
end
end)
script.on_event(defines.events.on_player_died, function(event)
local player = game.players[event.player_index]
if (player.character) then
player.ticks_to_respawn = 120
end
end)

14
PHI-PB/info.json Normal file
View File

@@ -0,0 +1,14 @@
{
"name": "PHI-PB",
"version": "1.0.2",
"factorio_version": "1.1",
"date": "2023-05-06",
"title": "Phidias Player Bonus",
"author": "PHIDIAS0303",
"contributers": "",
"homepage": "",
"description": "",
"dependencies": [
"base >= 1.1.0"
]
}

View File

View File

View File

View File

BIN
PHI-PB/thumbnail.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

View File

@@ -0,0 +1,3 @@
-- electric furnace
data.raw['furnace']['electric-furnace'].fast_replaceable_group = 'electric-furnace'
data.raw['assembling-machine']['electric-filter-furnace-1'].fast_replaceable_group = data.raw['furnace']['electric-furnace'].fast_replaceable_group

View File

@@ -402,3 +402,86 @@ for i=1, #recipe_list, 1 do
end end
end end
end end
-- entity
local function EE(source, tier)
local item = table.deepcopy(data.raw[source.type][source.ref_name])
item.name = source.name .. '-' .. tier
item.minable.result = source.name .. '-' .. tier
item.max_health = item.max_health * (2 ^ (tier - source.min + 1))
item.crafting_speed = item.crafting_speed * (2 ^ (tier - source.min + 1))
item.energy_source.emissions_per_minute = item.energy_source.emissions_per_minute * (2 ^ (tier - source.min + 1))
item.energy_usage = tonumber(string.match(item.energy_usage, '%d+')) * (2 ^ (tier - source.min + 1)) .. 'kW'
-- item.animation.layers[1].filename = graphics_location .. source .. '-e.png'
-- item.animation.layers[1].hr_version.filename = graphics_location .. source ..'-eh.png'
-- item.icon = graphics_location .. source .. '-i.png'
-- item.icon_size = 64
-- item.icon_mipmaps = 4
if (source.new_type ~= nil) then
item.type = source.new_type
end
data:extend({item})
end
-- item
local function EI(source, tier)
local item = table.deepcopy(data.raw.item[source.ref_name])
item.name = source.name .. '-' .. tier
item.place_result = source.name .. '-' .. tier
-- item.icons = {{icon = graphics_location .. source .. '-i.png', icon_mipmaps = 4, icon_size = 64}}
item.order = item.order .. tier
data:extend({item})
end
-- recipe
local function ER(source, tier)
local na = source.name
if tier > 2 then
na = na .. '-' .. (tier - 1)
end
data:extend({{
type = 'recipe',
name = source.name .. '-' .. tier,
energy_required = 2,
enabled = false,
ingredients = {{na, 2}},
result = source.name .. '-' .. tier,
}})
end
-- tech
local function ET(source, tier)
table.insert(data.raw.technology[source.tech].effects, {type='unlock-recipe', recipe=source.ref_name .. '-' .. tier})
end
items = {
['electric-filter-furnace'] = {
enabled = true,
type = 'furnace',
new_type = 'assembling-machine',
name = 'electric-filter-furnace',
ref_name = 'electric-furnace',
tech = 'advanced-material-processing-2',
min = 1,
max = 1
}
}
for _, v in pairs(items) do
if v.enabled then
for j=v.min, v.max, 1 do
EE(v, j)
EI(v, j)
ER(v, j)
ET(v, j)
end
end
end

View File

@@ -1,8 +1,8 @@
{ {
"name": "PHI-RS", "name": "PHI-RS",
"version": "1.0.1", "version": "1.0.2",
"factorio_version": "1.1", "factorio_version": "1.1",
"date": "2023-04-13", "date": "2023-05-07",
"title": "Phidias Recipe Scaling", "title": "Phidias Recipe Scaling",
"author": "PHIDIAS0303", "author": "PHIDIAS0303",
"contributers": "", "contributers": "",

View File

@@ -15,3 +15,12 @@ nuclear-fuel-reprocessing-s1=Nuclear fuel reprocessing
nuclear-fuel-reprocessing-s2=Nuclear fuel reprocessing nuclear-fuel-reprocessing-s2=Nuclear fuel reprocessing
coal-liquefaction-s1=Coal liquefaction coal-liquefaction-s1=Coal liquefaction
coal-liquefaction-s2=Coal liquefaction coal-liquefaction-s2=Coal liquefaction
[item-name]
electric-filter-furnace-1=Electric filter furnace
[entity-name]
electric-filter-furnace-1=Electric filter furnace
[entity-description]
electric-filter-furnace-1=Faster and more flexible furnaces.

View File

@@ -15,3 +15,12 @@ nuclear-fuel-reprocessing-s1=核燃料再処理
nuclear-fuel-reprocessing-s2=核燃料再処理 nuclear-fuel-reprocessing-s2=核燃料再処理
coal-liquefaction-s1=石炭液化 coal-liquefaction-s1=石炭液化
coal-liquefaction-s2=石炭液化 coal-liquefaction-s2=石炭液化
[item-name]
electric-filter-furnace-1=電気フィルター炉
[entity-name]
electric-filter-furnace-1=電気フィルター炉
[entity-description]
electric-filter-furnace-1=より高速で便利な炉です。

View File

@@ -15,3 +15,12 @@ nuclear-fuel-reprocessing-s1=核燃料後加工
nuclear-fuel-reprocessing-s2=核燃料後加工 nuclear-fuel-reprocessing-s2=核燃料後加工
coal-liquefaction-s1=液化煤 coal-liquefaction-s1=液化煤
coal-liquefaction-s2=液化煤 coal-liquefaction-s2=液化煤
[item-name]
electric-filter-furnace-1=智慧電爐
[entity-name]
electric-filter-furnace-1=智慧電爐
[entity-description]
electric-filter-furnace-1=更快速、更方便的熔爐。

View File

@@ -15,3 +15,12 @@ nuclear-fuel-reprocessing-s1=核燃料後加工
nuclear-fuel-reprocessing-s2=核燃料後加工 nuclear-fuel-reprocessing-s2=核燃料後加工
coal-liquefaction-s1=液化煤 coal-liquefaction-s1=液化煤
coal-liquefaction-s2=液化煤 coal-liquefaction-s2=液化煤
[item-name]
electric-filter-furnace-1=智慧電爐
[entity-name]
electric-filter-furnace-1=智慧電爐
[entity-description]
electric-filter-furnace-1=更快速、更方便的熔爐。