This commit is contained in:
2024-08-09 23:56:37 +09:00
parent b26149a1bc
commit 0be8e955d4
10 changed files with 122 additions and 86 deletions

View File

@@ -87,6 +87,7 @@ if settings.startup['PHI-CT'].value then
local entity = table.deepcopy(data.raw['container']['steel-chest']) local entity = table.deepcopy(data.raw['container']['steel-chest'])
entity.name = 'trash-chest' entity.name = 'trash-chest'
entity.minable.result = 'trash-chest' entity.minable.result = 'trash-chest'
entity.inventory_type = 'with_filters_and_bar'
entity.inventory_size = 1 entity.inventory_size = 1
entity.type = 'infinity-container' entity.type = 'infinity-container'
entity.gui_mode = 'none' entity.gui_mode = 'none'
@@ -166,7 +167,7 @@ if settings.startup['PHI-CT'].value then
entity.minable.result = 'large-area-electric-mining-drill' entity.minable.result = 'large-area-electric-mining-drill'
entity.max_health = entity.max_health * 16 entity.max_health = entity.max_health * 16
entity.energy_usage = (tonumber(string.match(entity.energy_usage, '%d+')) * 16) .. 'kW' entity.energy_usage = (tonumber(string.match(entity.energy_usage, '%d+')) * 16) .. 'kW'
entity.resource_searching_radius = 12.49 entity.resource_searching_radius = 9.99
entity.mining_speed = entity.mining_speed * 16 entity.mining_speed = entity.mining_speed * 16
entity.energy_source.emissions_per_minute = entity.energy_source.emissions_per_minute * 16 entity.energy_source.emissions_per_minute = entity.energy_source.emissions_per_minute * 16
entity.module_specification.module_slots = 8 entity.module_specification.module_slots = 8
@@ -189,6 +190,10 @@ if settings.startup['PHI-CT'].value then
data:extend({item}) data:extend({item})
local entity = table.deepcopy(data.raw['linked-container']['linked-chest']) local entity = table.deepcopy(data.raw['linked-container']['linked-chest'])
entity.circuit_wire_connection_point = data.raw['container']['steel-chest'].circuit_wire_connection_point
entity.circuit_connector_sprites = data.raw['container']['steel-chest'].circuit_connector_sprites
entity.circuit_wire_max_distance = data.raw['container']['steel-chest'].circuit_wire_max_distance
entity.inventory_type = 'with_filters_and_bar'
entity.inventory_size = 48 entity.inventory_size = 48
entity.gui_mode = 'all' entity.gui_mode = 'all'
data:extend({entity}) data:extend({entity})

View File

@@ -3,6 +3,7 @@ local main = require 'main'
local file_stage = 1 local file_stage = 1
if settings.startup['PHI-CT'].value then if settings.startup['PHI-CT'].value then
if settings.startup['PHI-CT-RECIPE'].value then
data:extend({{ data:extend({{
type = 'recipe', type = 'recipe',
name = 'wood-production', name = 'wood-production',
@@ -80,6 +81,7 @@ if settings.startup['PHI-CT'].value then
end end
end end
end end
end
if settings.startup['PHI-MI'].value then if settings.startup['PHI-MI'].value then
data.raw['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input' data.raw['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input'
@@ -262,6 +264,7 @@ if settings.startup['PHI-MI'].value then
item.order = 'b[storage]-d[basic-' .. item.order .. ']' item.order = 'b[storage]-d[basic-' .. item.order .. ']'
data:extend({item}) data:extend({item})
entity.inventory_type = 'with_filters_and_bar'
entity.inventory_size = 1 entity.inventory_size = 1
entity.name = 'basic-' .. chests[i] entity.name = 'basic-' .. chests[i]
entity.minable.result = 'basic-' .. chests[i] entity.minable.result = 'basic-' .. chests[i]

View File

@@ -1,6 +1,6 @@
{ {
"name": "PHI-CL", "name": "PHI-CL",
"version": "2.0.14", "version": "2.0.15",
"factorio_version": "1.1", "factorio_version": "1.1",
"date": "2024-08-11", "date": "2024-08-11",
"title": "Phidias Collection", "title": "Phidias Collection",

View File

@@ -905,7 +905,9 @@ PHI-CT-TILE=World tile
PHI-CT-TILE-CHOICE=Tile choice PHI-CT-TILE-CHOICE=Tile choice
PHI-CT-TRASH=Trash chest PHI-CT-TRASH=Trash chest
PHI-CT-MINER=Large miner PHI-CT-MINER=Large miner
PHI-CT-LINKED=Linked chest
PHI-CT-LOADER=Loader enable PHI-CT-LOADER=Loader enable
PHI-CT-RECIPE=Recipe
[mod-setting-description] [mod-setting-description]
PHI-EN-SOLAR-TIER=Default 8 ; Disable 1 PHI-EN-SOLAR-TIER=Default 8 ; Disable 1

View File

@@ -905,7 +905,9 @@ PHI-CT-TILE=ワールドタイル
PHI-CT-TILE-CHOICE=ドタイル選択 PHI-CT-TILE-CHOICE=ドタイル選択
PHI-CT-TRASH=ごみチェスト PHI-CT-TRASH=ごみチェスト
PHI-CT-MINER=大型電動掘削機 PHI-CT-MINER=大型電動掘削機
PHI-CT-LINKED=リンクされたチェスト
PHI-CT-LOADER=ローダーを有効にする PHI-CT-LOADER=ローダーを有効にする
PHI-CT-RECIPE=レシピ
[mod-setting-description] [mod-setting-description]
PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1 PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1

View File

@@ -905,7 +905,9 @@ PHI-CT-TILE=世界地磚
PHI-CT-TILE-CHOICE=地磚選擇 PHI-CT-TILE-CHOICE=地磚選擇
PHI-CT-TRASH=垃圾箱 PHI-CT-TRASH=垃圾箱
PHI-CT-MINER=大型電能採礦機 PHI-CT-MINER=大型電能採礦機
PHI-CT-LINKED=連結箱
PHI-CT-LOADER=裝卸機啟用 PHI-CT-LOADER=裝卸機啟用
PHI-CT-RECIPE=配方
[mod-setting-description] [mod-setting-description]
PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1

View File

@@ -905,7 +905,9 @@ PHI-CT-TILE=世界地磚
PHI-CT-TILE-CHOICE=地磚選擇 PHI-CT-TILE-CHOICE=地磚選擇
PHI-CT-TRASH=垃圾箱 PHI-CT-TRASH=垃圾箱
PHI-CT-MINER=大型電能採礦機 PHI-CT-MINER=大型電能採礦機
PHI-CT-LINKED=連結箱
PHI-CT-LOADER=裝卸機啟用 PHI-CT-LOADER=裝卸機啟用
PHI-CT-RECIPE=配方
[mod-setting-description] [mod-setting-description]
PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1

View File

@@ -359,7 +359,7 @@ function main.ER(source, tier)
result_name = result_name .. '-' .. tier result_name = result_name .. '-' .. tier
end end
if (source.tech == 'compound-energy') and (tier > 2) then if (source.tech == 'compound-energy') then
if (source.type == 'solar-panel') or (source.type == 'accumulator') then if (source.type == 'solar-panel') or (source.type == 'accumulator') then
data:extend({{ data:extend({{
type = 'recipe', type = 'recipe',
@@ -371,6 +371,7 @@ function main.ER(source, tier)
}}) }})
else else
if tier > 2 then
data:extend({{ data:extend({{
type = 'recipe', type = 'recipe',
name = new_name , name = new_name ,
@@ -379,6 +380,17 @@ function main.ER(source, tier)
ingredients = {{name=ingredient_name, amount=1}, {name=source.name, amount=1}}, ingredients = {{name=ingredient_name, amount=1}, {name=source.name, amount=1}},
result = result_name, result = result_name,
}}) }})
else
data:extend({{
type = 'recipe',
name = new_name ,
energy_required = 2,
enabled = false,
ingredients = {{name=ingredient_name, amount=2}},
result = result_name,
}})
end
end end
else else
@@ -416,7 +428,7 @@ function main.ET(source, tier)
}, },
prerequisites = prereq, prerequisites = prereq,
unit = { unit = {
count = 100, count = 200 * (tier - 1),
ingredients = { ingredients = {
{'automation-science-pack', 2}, {'automation-science-pack', 2},
{'logistic-science-pack', 2} {'logistic-science-pack', 2}

View File

@@ -88,10 +88,12 @@ for _, force in pairs(game.forces) do
end end
if settings.startup['PHI-CT'].value then if settings.startup['PHI-CT'].value then
if settings.startup['PHI-CT-RECIPE'].value then
recipes['wood-production'].enabled = true recipes['wood-production'].enabled = true
recipes['wood-production'].reload() recipes['wood-production'].reload()
recipes['fish-production'].enabled = true recipes['fish-production'].enabled = true
recipes['fish-production'].reload() recipes['fish-production'].reload()
end
if settings.startup['PHI-CT-OIL'].value then if settings.startup['PHI-CT-OIL'].value then
recipes['oil-pump'].enabled = true recipes['oil-pump'].enabled = true

View File

@@ -490,6 +490,12 @@ data:extend({
setting_type = 'startup', setting_type = 'startup',
default_value = true, default_value = true,
order = 'JA06' order = 'JA06'
}, {
type = 'bool-setting',
name = 'PHI-CT-RECIPE',
setting_type = 'startup',
default_value = true,
order = 'JA07'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-CT-TILE', name = 'PHI-CT-TILE',