This commit is contained in:
2024-10-30 20:21:37 +09:00
parent c1d8ac912d
commit b1a6e68c38
8 changed files with 85 additions and 129 deletions

View File

@@ -5,6 +5,69 @@ local file_stage = 3
if settings.startup['PHI-CT'].value then if settings.startup['PHI-CT'].value then
data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-CT-ROCKET-CAPACITY'].value * 100000 data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-CT-ROCKET-CAPACITY'].value * 100000
data.raw['utility-constants'].default.default_item_weight = settings.startup['PHI-CT-CARGO-WEIGHT'].value data.raw['utility-constants'].default.default_item_weight = settings.startup['PHI-CT-CARGO-WEIGHT'].value
if settings.startup['PHI-CT-UTILITY'].value then
for _, t in pairs({'arithmetic-combinator', 'decider-combinator', 'programmable-speaker', 'selector-combinator'}) do
data.raw[t][t].energy_source.usage_priority = 'primary-input'
end
end
if settings.startup['PHI-CT-TILE'].value then
for _, v in pairs(data.raw) do
for _, e in pairs(v) do
if e.surface_conditions then
e.surface_conditions = nil
end
end
end
for _, tile in pairs (data.raw.tile) do
tile.autoplace = nil
end
data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace = {
probability_expression = 1
}
for _, t in pairs({data.raw['simple-entity'], data.raw['optimized-decorative'], data.raw['fish']}) do
for _, e in pairs(t) do
e.autoplace = nil
end
end
local autoplace_controls = {}
for k, _ in pairs (data.raw['autoplace-control']) do
autoplace_controls[k] = {
size = 'none'
}
end
data.raw['map-gen-presets']['default']['empty-world'] = {
order = 'zz',
basic_settings = {
autoplace_controls = autoplace_controls,
water = 'none',
cliff_settings = {
name = 'none',
cliff_elevation_interval = 100,
cliff_elevation_0 = 100,
richness = 0
}
},
advanced_settings = {
pollution = {
enabled = false
},
enemy_evolution = {
enabled = false
},
enemy_expansion = {
enabled = false
}
}
}
end
end end
for _, v in pairs(items['item']) do for _, v in pairs(items['item']) do

View File

@@ -1,6 +1,6 @@
{ {
"name": "PHI-CL", "name": "PHI-CL",
"version": "3.0.2", "version": "3.0.3",
"factorio_version": "2.0", "factorio_version": "2.0",
"date": "2024-10-30", "date": "2024-10-30",
"title": "Phidias Collection", "title": "Phidias Collection",
@@ -15,7 +15,7 @@
"? elevated-rails > 2.0.0" "? elevated-rails > 2.0.0"
], ],
"quality_required": false, "quality_required": false,
"space_travel_required": false, "space_travel_required": true,
"spoiling_required": false, "spoiling_required": false,
"freezing_required": false, "freezing_required": false,
"segmented_units_required": false, "segmented_units_required": false,

View File

@@ -116,7 +116,6 @@ PHI-MI-BOILER=MI4 Electric boiler
PHI-MI-PIPE=MI5 Pipe efficiency PHI-MI-PIPE=MI5 Pipe efficiency
PHI-MI-ROBOT=MI6 Robot efficiency PHI-MI-ROBOT=MI6 Robot efficiency
PHI-MI-TRAIN=MI7 Train efficiency PHI-MI-TRAIN=MI7 Train efficiency
PHI-MI-ARTILLERY=MI8 Artillery range
PHI-CT=CT Creative testing tools PHI-CT=CT Creative testing tools
PHI-CT-TOOL=CT1 Tool PHI-CT-TOOL=CT1 Tool

View File

@@ -115,7 +115,6 @@ PHI-MI-REPAIR=MI4 リペア効率
PHI-MI-PIPE=MI5 パイプ効率 PHI-MI-PIPE=MI5 パイプ効率
PHI-MI-ROBOT=MI6 ロボット効率 PHI-MI-ROBOT=MI6 ロボット効率
PHI-MI-TRAIN=MI7 列車効率 PHI-MI-TRAIN=MI7 列車効率
PHI-MI-ARTILLERY=MI8 長距離砲射程
PHI-CT=CT クリエイティブテストツール PHI-CT=CT クリエイティブテストツール
PHI-CT-TOOL=CT1 ツール PHI-CT-TOOL=CT1 ツール

View File

@@ -115,7 +115,6 @@ PHI-MI-REPAIR=MI4 維修效率
PHI-MI-PIPE=MI5 水管效率 PHI-MI-PIPE=MI5 水管效率
PHI-MI-ROBOT=MI6 無人機效率 PHI-MI-ROBOT=MI6 無人機效率
PHI-MI-TRAIN=MI7 火車效率 PHI-MI-TRAIN=MI7 火車效率
PHI-MI-ARTILLERY=MI8 火炮炮彈射程
PHI-CT=CT 創意測試工具 PHI-CT=CT 創意測試工具
PHI-CT-TOOL=CT1 工具 PHI-CT-TOOL=CT1 工具

View File

@@ -115,7 +115,6 @@ PHI-MI-REPAIR=MI4 維修效率
PHI-MI-PIPE=MI5 水管效率 PHI-MI-PIPE=MI5 水管效率
PHI-MI-ROBOT=MI6 無人機效率 PHI-MI-ROBOT=MI6 無人機效率
PHI-MI-TRAIN=MI7 火車效率 PHI-MI-TRAIN=MI7 火車效率
PHI-MI-ARTILLERY=MI8 火炮炮彈射程
PHI-CT=CT 創意測試工具 PHI-CT=CT 創意測試工具
PHI-CT-TOOL=CT1 工具 PHI-CT-TOOL=CT1 工具

View File

@@ -701,32 +701,18 @@
for _, tc in pairs({'layers', 'sheets'}) do for _, tc in pairs({'layers', 'sheets'}) do
if item[ve][tc] and item[ve][tc][1] then if item[ve][tc] and item[ve][tc][1] then
item[ve][tc][1].tint = items['tint'][tier] item[ve][tc][1].tint = items['tint'][tier]
if item[ve][tc][1].hr_version then
item[ve][tc][1].hr_version.tint = items['tint'][tier]
end
end end
for _, v in pairs(item[ve]) do for _, v in pairs(item[ve]) do
if type(v) == 'table' then if type(v) == 'table' then
if v[tc] then if v[tc] and v[tc][1] then
if v[tc][1] then v[tc][1].tint = items['tint'][tier]
v[tc][1].tint = items['tint'][tier]
if v[tc][1].hr_version then
v[tc][1].hr_version.tint = items['tint'][tier]
end
end
end end
for i=1, #v, 1 do for i=1, #v, 1 do
if v[i] and type(v[i]) == 'table' then if v[i] and type(v[i]) == 'table' then
if v[i][tc] and v[i][tc][1] then if v[i][tc] and v[i][tc][1] then
v[i][tc][1].tint = items['tint'][tier] v[i][tc][1].tint = items['tint'][tier]
if v[i][tc][1].hr_version then
v[i][tc][1].hr_version.tint = items['tint'][tier]
end
end end
end end
end end
@@ -977,25 +963,7 @@ end
if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-PIPE'].value then
local s = (1 + settings.startup['PHI-MI-PIPE'].value) / 2 local s = (1 + settings.startup['PHI-MI-PIPE'].value) / 2
for _, t in pairs({data.raw['pipe'], data.raw['pipe-to-ground']}) do
for _, v in pairs(t) do
if v.fluid_box.height then
v.fluid_box.height = v.fluid_box.height * s
else
v.fluid_box.height = s
end
end
end
for _, v in pairs(data.raw['pump']) do for _, v in pairs(data.raw['pump']) do
if v.fluid_box.height then
v.fluid_box.height = v.fluid_box.height * s
else
v.fluid_box.height = s
end
v.pumping_speed = v.pumping_speed * s v.pumping_speed = v.pumping_speed * s
end end
end end
@@ -1031,19 +999,13 @@ if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-TRAIN'].value t
end end
** DATA FINAL FIXES ** DATA FINAL FIXES
data.raw['utility-constants'].default.zoom_to_world_effect_strength = 0
data.raw['utility-constants'].default.zoom_to_world_can_use_nightvision = true
data.raw['utility-constants'].default.train_inactivity_wait_condition_default = 60 data.raw['utility-constants'].default.train_inactivity_wait_condition_default = 60
data.raw['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input'
data.raw['decider-combinator']['decider-combinator'].energy_source.usage_priority = 'primary-input'
data.raw['active-defense-equipment']['discharge-defense-equipment'].automatic = true data.raw['active-defense-equipment']['discharge-defense-equipment'].automatic = true
data.raw['gui-style']['default'].machine_slots_scroll_pane.maximal_height = nil data.raw['gui-style'].default.machine_slots_scroll_pane.maximal_height = nil
data.raw['gui-style']['default'].machine_ingredients_scroll_pane.maximal_height = nil data.raw['gui-style'].default.machine_ingredients_scroll_pane.maximal_height = nil
data.raw['gui-style']['default'].machine_outputs_scroll_pane.maximal_height = nil data.raw['gui-style'].default.machine_outputs_scroll_pane.maximal_height = nil
data.raw['gui-style']['default'].module_inventory_scroll_pane.maximal_height = nil data.raw['gui-style'].default.module_inventory_scroll_pane.maximal_height = nil
data.raw['utility-constants'].select_group_row_count data.raw['utility-constants'].select_group_row_count
for _,name in pairs({'furnace', 'lab', 'beacon'}) do for _,name in pairs({'furnace', 'lab', 'beacon'}) do
@@ -1063,65 +1025,6 @@ for _, t in pairs(data.raw['tree']) do
t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}} t.collision_box = {{-0.05, -0.05}, {0.05, 0.05}}
end end
if settings.startup['PHI-MI'].value and settings.startup['PHI-MI-ARTILLERY'].value then
for _, t in pairs({data.raw['artillery-turret'], data.raw['artillery-wagon']}) do
for _, v in pairs(t) do
v.manual_range_modifier = 1
end
end
-- data.raw['artillery-projectile']['artillery-projectile'].reveal_map = false
end
if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TILE'].value then
for _, tile in pairs (data.raw.tile) do
tile.autoplace = nil
end
data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace = {}
for _, t in pairs({data.raw['simple-entity'], data.raw['optimized-decorative'], data.raw['fish']}) do
for _, e in pairs(t) do
e.autoplace = nil
end
end
local autoplace_controls = {}
for k, _ in pairs (data.raw['autoplace-control']) do
autoplace_controls[k] = {
size = 'none'
}
end
data.raw['map-gen-presets']['default']['empty-world'] = {
order = 'zz',
basic_settings = {
autoplace_controls = autoplace_controls,
water = 'none',
cliff_settings = {
name = 'none',
cliff_elevation_interval = 100,
cliff_elevation_0 = 100,
richness = 0
}
},
advanced_settings = {
pollution = {enabled = false},
enemy_evolution = {enabled = false},
enemy_expansion = {enabled = false}
}
}
end
for _, c in pairs(data.raw) do
for _, t in pairs(c) do
if t.surface_conditions then
t.surface_conditions = nil
end
end
end
** MIGRATION ** MIGRATION
if script.active_mods['space-exploration'] then if script.active_mods['space-exploration'] then
if technologies['se-core-miner'].researched then if technologies['se-core-miner'].researched then
@@ -1197,25 +1100,6 @@ end
default_value = 1, default_value = 1,
allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
order = 'E09' order = 'E09'
}, {
type = 'bool-setting',
name = 'PHI-MI-ARTILLERY',
setting_type = 'startup',
default_value = true,
order = 'E10'
}, {
type = 'bool-setting',
name = 'PHI-CT-TILE',
setting_type = 'startup',
default_value = true,
order = 'F04'
}, {
type = 'string-setting',
name = 'PHI-CT-TILE-CHOICE',
setting_type = 'startup',
default_value = 'grass-1',
allowed_values = {'concrete', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4', 'hazard-concrete-left', 'hazard-concrete-right', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'landfill', 'out-of-map', 'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3', 'refined-concrete', 'refined-hazard-concrete-left', 'refined-hazard-concrete-right', 'sand-1', 'sand-2', 'sand-3', 'stone-path', 'tutorial-grid', 'water', 'water-green', 'water-mud', 'water-shallow'},
order = 'F05'
}, },
"? aai-industry >= 0.5.0", "? aai-industry >= 0.5.0",

View File

@@ -118,5 +118,18 @@ data:extend({
minimum_value = 1, minimum_value = 1,
maximum_value = 1000, maximum_value = 1000,
order = 'F05' order = 'F05'
} }, {
type = 'bool-setting',
name = 'PHI-CT-TILE',
setting_type = 'startup',
default_value = true,
order = 'F06'
}, {
type = 'string-setting',
name = 'PHI-CT-TILE-CHOICE',
setting_type = 'startup',
default_value = 'grass-1',
allowed_values = {'concrete', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4', 'hazard-concrete-left', 'hazard-concrete-right', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'landfill', 'out-of-map', 'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3', 'refined-concrete', 'refined-hazard-concrete-left', 'refined-hazard-concrete-right', 'sand-1', 'sand-2', 'sand-3', 'stone-path', 'tutorial-grid', 'water', 'water-green', 'water-mud', 'water-shallow'},
order = 'F07'
},
}) })