diff --git a/.gitignore b/.gitignore index 2608ec2..b60d880 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store -.vscode \ No newline at end of file +.vscode +.luarc.json \ No newline at end of file diff --git a/compatibility/advanced-centrifuge/data.lua b/compatibility/advanced-centrifuge/data.lua index b9b26c3..98ac9e0 100644 --- a/compatibility/advanced-centrifuge/data.lua +++ b/compatibility/advanced-centrifuge/data.lua @@ -7,10 +7,14 @@ if not mods["advanced-centrifuge"] then return end local function k2_byproducts(index) local byproducts = { - [1] = { type = "item", name = "iron-ore", probability = 0.25, amount = 5 }, - [2] = { type = "item", name = "stone", probability = 0.5, amount = 5 } + [1] = { type = "item", name = "iron-ore", independent_probability = 0.25, amount = 5 }, + [2] = { type = "item", name = "stone", independent_probability = 0.5, amount = 5 } } - if mods["Krastorio2"] then return byproducts[index] else return nil end + if mods["Krastorio2"] then + return byproducts[index] + else + return nil + end end data:extend({ @@ -21,41 +25,46 @@ data:extend({ { type = "recipe", name = "ff-advanced-uranium-processing", - energy_required = 60, --was 12 + energy_required = 60, -- was 12 enabled = false, - category = "advanced-centrifuging", - ingredients = {{type="item", name="uranium-ore", amount=46}}, -- was 10 + categories = { "advanced-centrifuging" }, + ingredients = { { type = "item", name = "uranium-ore", amount = 46 } }, -- was 10 icons = { { icon = "__base__/graphics/icons/uranium-processing.png", - icon_size = 64, + icon_size = 64 }, { icon = "__core__/graphics/icons/technology/constants/constant-mining-productivity.png", icon_size = 128, scale = 0.25, - shift = {10, -8} + shift = { 10, -8 } } }, subgroup = "raw-material", - order = "k[uranium-processing]-2", -- k ordering so it shows up after explosives which is j ordering - results = - { + order = "k[uranium-processing]-2", -- k ordering so it shows up after explosives which is j ordering + results = { { + amount = 1, name = "uranium-235", - probability = 0.007, - amount_min = 4, - amount_max = 8 + shared_probability = { + max = 0.007, + min = 0 + }, + type = "item" }, { + amount = 1, name = "uranium-238", - probability = 0.993, - amount_min = 1, - amount_max = 9 + shared_probability = { + max = 1, + min = 0.007 + }, + type = "item" }, k2_byproducts(1), - k2_byproducts(2), + k2_byproducts(2) }, - allow_productivity = true, - }, + allow_productivity = true + } }) diff --git a/graphics/charging-station/battery-pack-tech.png b/graphics/charging-station/battery-pack-tech.png index 0e99378..2f2ad6d 100644 Binary files a/graphics/charging-station/battery-pack-tech.png and b/graphics/charging-station/battery-pack-tech.png differ diff --git a/graphics/charging-station/battery-pack.png b/graphics/charging-station/battery-pack.png index 0ffe29e..79957d8 100644 Binary files a/graphics/charging-station/battery-pack.png and b/graphics/charging-station/battery-pack.png differ diff --git a/graphics/charging-station/hr_space_charging_station.png b/graphics/charging-station/hr_space_charging_station.png deleted file mode 100644 index b07b1ce..0000000 Binary files a/graphics/charging-station/hr_space_charging_station.png and /dev/null differ diff --git a/graphics/charging-station/hr_space_charging_station_lightning.png b/graphics/charging-station/hr_space_charging_station_lightning.png deleted file mode 100644 index 6aad2a1..0000000 Binary files a/graphics/charging-station/hr_space_charging_station_lightning.png and /dev/null differ diff --git a/graphics/charging-station/hr_space_charging_station_shadow.png b/graphics/charging-station/hr_space_charging_station_shadow.png deleted file mode 100644 index 2f32722..0000000 Binary files a/graphics/charging-station/hr_space_charging_station_shadow.png and /dev/null differ diff --git a/graphics/charging-station/hr_space_discharging_station.png b/graphics/charging-station/hr_space_discharging_station.png deleted file mode 100644 index e232486..0000000 Binary files a/graphics/charging-station/hr_space_discharging_station.png and /dev/null differ diff --git a/graphics/charging-station/space-train-charging-station.png b/graphics/charging-station/space-train-charging-station.png index ea030ce..67add33 100644 Binary files a/graphics/charging-station/space-train-charging-station.png and b/graphics/charging-station/space-train-charging-station.png differ diff --git a/graphics/charging-station/space-train-discharging-station.png b/graphics/charging-station/space-train-discharging-station.png index e22ee8c..a907572 100644 Binary files a/graphics/charging-station/space-train-discharging-station.png and b/graphics/charging-station/space-train-discharging-station.png differ diff --git a/graphics/charging-station/space_charging_station.png b/graphics/charging-station/space_charging_station.png index db31f62..31b0ca8 100644 Binary files a/graphics/charging-station/space_charging_station.png and b/graphics/charging-station/space_charging_station.png differ diff --git a/graphics/charging-station/space_charging_station_lightning.png b/graphics/charging-station/space_charging_station_lightning.png index 7a913a7..87eb8c0 100644 Binary files a/graphics/charging-station/space_charging_station_lightning.png and b/graphics/charging-station/space_charging_station_lightning.png differ diff --git a/graphics/charging-station/space_charging_station_shadow.png b/graphics/charging-station/space_charging_station_shadow.png index 1c21b92..7a9a4d5 100644 Binary files a/graphics/charging-station/space_charging_station_shadow.png and b/graphics/charging-station/space_charging_station_shadow.png differ diff --git a/graphics/charging-station/space_discharging_station.png b/graphics/charging-station/space_discharging_station.png index b019193..1d22529 100644 Binary files a/graphics/charging-station/space_discharging_station.png and b/graphics/charging-station/space_discharging_station.png differ diff --git a/graphics/cobalt-ingot-technology.png b/graphics/cobalt-ingot-technology.png index 346bfc8..458b29b 100644 Binary files a/graphics/cobalt-ingot-technology.png and b/graphics/cobalt-ingot-technology.png differ diff --git a/graphics/compatibility/krastorio2/transport-tech-card-item.png b/graphics/compatibility/krastorio2/transport-tech-card-item.png index 88923b6..5cea3de 100644 Binary files a/graphics/compatibility/krastorio2/transport-tech-card-item.png and b/graphics/compatibility/krastorio2/transport-tech-card-item.png differ diff --git a/graphics/compatibility/krastorio2/transport-tech-card-technology.png b/graphics/compatibility/krastorio2/transport-tech-card-technology.png index 3e158d7..da91125 100644 Binary files a/graphics/compatibility/krastorio2/transport-tech-card-technology.png and b/graphics/compatibility/krastorio2/transport-tech-card-technology.png differ diff --git a/graphics/container/arrow-up.png b/graphics/container/arrow-up.png index 74a840d..a531026 100644 Binary files a/graphics/container/arrow-up.png and b/graphics/container/arrow-up.png differ diff --git a/graphics/container/arrow.png b/graphics/container/arrow.png index a1ce181..681c0cf 100644 Binary files a/graphics/container/arrow.png and b/graphics/container/arrow.png differ diff --git a/graphics/container/container-corner-left.png b/graphics/container/container-corner-left.png index 2e02ffe..03f6d23 100644 Binary files a/graphics/container/container-corner-left.png and b/graphics/container/container-corner-left.png differ diff --git a/graphics/container/container-corner-right.png b/graphics/container/container-corner-right.png index 9d74bea..7f20a0b 100644 Binary files a/graphics/container/container-corner-right.png and b/graphics/container/container-corner-right.png differ diff --git a/graphics/container/container-top.png b/graphics/container/container-top.png index 12cffeb..6f30495 100644 Binary files a/graphics/container/container-top.png and b/graphics/container/container-top.png differ diff --git a/graphics/container/container.png b/graphics/container/container.png index b373612..72d3764 100644 Binary files a/graphics/container/container.png and b/graphics/container/container.png differ diff --git a/graphics/container/load-background.png b/graphics/container/load-background.png index 0383458..c87b427 100644 Binary files a/graphics/container/load-background.png and b/graphics/container/load-background.png differ diff --git a/graphics/container/unload-background.png b/graphics/container/unload-background.png index 407f418..18852f6 100644 Binary files a/graphics/container/unload-background.png and b/graphics/container/unload-background.png differ diff --git a/graphics/dredger.png b/graphics/dredger.png index 8ce6043..b74c202 100755 Binary files a/graphics/dredger.png and b/graphics/dredger.png differ diff --git a/graphics/dredging-platform/concrete.png b/graphics/dredging-platform/concrete.png index c3059f2..d6ffce9 100644 Binary files a/graphics/dredging-platform/concrete.png and b/graphics/dredging-platform/concrete.png differ diff --git a/graphics/dredging-platform/hr-concrete.png b/graphics/dredging-platform/hr-concrete.png deleted file mode 100644 index 4902896..0000000 Binary files a/graphics/dredging-platform/hr-concrete.png and /dev/null differ diff --git a/graphics/hot-titansteel-light.png b/graphics/hot-titansteel-light.png index 9d7476d..7efb7a7 100644 Binary files a/graphics/hot-titansteel-light.png and b/graphics/hot-titansteel-light.png differ diff --git a/graphics/hot-titansteel.png b/graphics/hot-titansteel.png index 6bd1d84..754f9c6 100644 Binary files a/graphics/hot-titansteel.png and b/graphics/hot-titansteel.png differ diff --git a/graphics/item/cobalt-concentrate.png b/graphics/item/cobalt-concentrate.png index fe119fe..e47c9b7 100644 Binary files a/graphics/item/cobalt-concentrate.png and b/graphics/item/cobalt-concentrate.png differ diff --git a/graphics/item/cobalt-crust.png b/graphics/item/cobalt-crust.png index 5abca80..b9e18c6 100644 Binary files a/graphics/item/cobalt-crust.png and b/graphics/item/cobalt-crust.png differ diff --git a/graphics/item/cobalt-ingot.png b/graphics/item/cobalt-ingot.png index e56eebb..fa48e36 100644 Binary files a/graphics/item/cobalt-ingot.png and b/graphics/item/cobalt-ingot.png differ diff --git a/graphics/item/cobalt-ore.png b/graphics/item/cobalt-ore.png index cbddb3e..5c40c93 100644 Binary files a/graphics/item/cobalt-ore.png and b/graphics/item/cobalt-ore.png differ diff --git a/graphics/item/interstellar-communicator-light.png b/graphics/item/interstellar-communicator-light.png index 58a15dc..b589fc0 100644 Binary files a/graphics/item/interstellar-communicator-light.png and b/graphics/item/interstellar-communicator-light.png differ diff --git a/graphics/item/interstellar-communicator.png b/graphics/item/interstellar-communicator.png index 1cfe0dc..5f64382 100644 Binary files a/graphics/item/interstellar-communicator.png and b/graphics/item/interstellar-communicator.png differ diff --git a/graphics/item/limestone-nodule.png b/graphics/item/limestone-nodule.png index 186f9b3..e580216 100644 Binary files a/graphics/item/limestone-nodule.png and b/graphics/item/limestone-nodule.png differ diff --git a/graphics/item/offshore-tank.png b/graphics/item/offshore-tank.png index babb37d..ea37a6c 100644 Binary files a/graphics/item/offshore-tank.png and b/graphics/item/offshore-tank.png differ diff --git a/graphics/item/rocket-frame.png b/graphics/item/rocket-frame.png index 29d5d2b..ffeaf1d 100644 Binary files a/graphics/item/rocket-frame.png and b/graphics/item/rocket-frame.png differ diff --git a/graphics/item/shale-nodule.png b/graphics/item/shale-nodule.png index e29798a..15520b6 100644 Binary files a/graphics/item/shale-nodule.png and b/graphics/item/shale-nodule.png differ diff --git a/graphics/item/tailings-water.png b/graphics/item/tailings-water.png index 06ed20c..cfa1e54 100644 Binary files a/graphics/item/tailings-water.png and b/graphics/item/tailings-water.png differ diff --git a/graphics/lava-pool/lava-pool-icon.png b/graphics/lava-pool/lava-pool-icon.png index 7032457..c9fef97 100644 Binary files a/graphics/lava-pool/lava-pool-icon.png and b/graphics/lava-pool/lava-pool-icon.png differ diff --git a/graphics/lava-pool/lava-pool.png b/graphics/lava-pool/lava-pool.png index fd43739..ed0112f 100644 Binary files a/graphics/lava-pool/lava-pool.png and b/graphics/lava-pool/lava-pool.png differ diff --git a/graphics/lava-pool/small-lava-pool-icon.png b/graphics/lava-pool/small-lava-pool-icon.png index 421c539..2d1e42a 100644 Binary files a/graphics/lava-pool/small-lava-pool-icon.png and b/graphics/lava-pool/small-lava-pool-icon.png differ diff --git a/graphics/lava-pool/small-lava-pool.png b/graphics/lava-pool/small-lava-pool.png index c0163db..a66bf54 100644 Binary files a/graphics/lava-pool/small-lava-pool.png and b/graphics/lava-pool/small-lava-pool.png differ diff --git a/graphics/life-ring/life-ring-back.png b/graphics/life-ring/life-ring-back.png index 5f31031..f1652a0 100644 Binary files a/graphics/life-ring/life-ring-back.png and b/graphics/life-ring/life-ring-back.png differ diff --git a/graphics/life-ring/life-ring-front.png b/graphics/life-ring/life-ring-front.png index dd1a737..621b818 100644 Binary files a/graphics/life-ring/life-ring-front.png and b/graphics/life-ring/life-ring-front.png differ diff --git a/graphics/life-ring/life-ring.png b/graphics/life-ring/life-ring.png index 2f723ea..737d500 100644 Binary files a/graphics/life-ring/life-ring.png and b/graphics/life-ring/life-ring.png differ diff --git a/graphics/life-ring/water-legs.png b/graphics/life-ring/water-legs.png index 156a066..a42e065 100644 Binary files a/graphics/life-ring/water-legs.png and b/graphics/life-ring/water-legs.png differ diff --git a/graphics/offshore-tank.png b/graphics/offshore-tank.png index 567d153..311c6d7 100644 Binary files a/graphics/offshore-tank.png and b/graphics/offshore-tank.png differ diff --git a/graphics/pipe-covers/big_east_covers.png b/graphics/pipe-covers/big_east_covers.png index 6540bf3..bd81719 100644 Binary files a/graphics/pipe-covers/big_east_covers.png and b/graphics/pipe-covers/big_east_covers.png differ diff --git a/graphics/pipe-covers/big_west_covers.png b/graphics/pipe-covers/big_west_covers.png index 2824cca..eb7c9d9 100644 Binary files a/graphics/pipe-covers/big_west_covers.png and b/graphics/pipe-covers/big_west_covers.png differ diff --git a/graphics/pipe-covers/data_south_covers.png b/graphics/pipe-covers/data_south_covers.png index 73bb02a..8e7a451 100644 Binary files a/graphics/pipe-covers/data_south_covers.png and b/graphics/pipe-covers/data_south_covers.png differ diff --git a/graphics/pipe-covers/south_basic_covers.png b/graphics/pipe-covers/south_basic_covers.png index e7bc659..06d15df 100644 Binary files a/graphics/pipe-covers/south_basic_covers.png and b/graphics/pipe-covers/south_basic_covers.png differ diff --git a/graphics/rocket-silo/rocket-silo-hole.png b/graphics/rocket-silo/rocket-silo-hole.png index 0cdfc18..d5b88aa 100644 Binary files a/graphics/rocket-silo/rocket-silo-hole.png and b/graphics/rocket-silo/rocket-silo-hole.png differ diff --git a/graphics/seamount.png b/graphics/seamount.png index 982ab0d..3cad1a8 100644 Binary files a/graphics/seamount.png and b/graphics/seamount.png differ diff --git a/graphics/seismic-scanner/center-mask.png b/graphics/seismic-scanner/center-mask.png new file mode 100644 index 0000000..8446541 Binary files /dev/null and b/graphics/seismic-scanner/center-mask.png differ diff --git a/graphics/seismic-scanner/center-shadow.png b/graphics/seismic-scanner/center-shadow.png new file mode 100644 index 0000000..0b9a026 Binary files /dev/null and b/graphics/seismic-scanner/center-shadow.png differ diff --git a/graphics/seismic-scanner/center.png b/graphics/seismic-scanner/center.png new file mode 100644 index 0000000..b968b72 Binary files /dev/null and b/graphics/seismic-scanner/center.png differ diff --git a/graphics/seismic-scanner/hole-front.png b/graphics/seismic-scanner/hole-front.png new file mode 100644 index 0000000..05b85dd Binary files /dev/null and b/graphics/seismic-scanner/hole-front.png differ diff --git a/graphics/seismic-scanner/hole.png b/graphics/seismic-scanner/hole.png new file mode 100644 index 0000000..126b2ea Binary files /dev/null and b/graphics/seismic-scanner/hole.png differ diff --git a/graphics/seismic-scanner/hr-center-mask.png b/graphics/seismic-scanner/hr-center-mask.png deleted file mode 100644 index c8355da..0000000 Binary files a/graphics/seismic-scanner/hr-center-mask.png and /dev/null differ diff --git a/graphics/seismic-scanner/hr-center-shadow.png b/graphics/seismic-scanner/hr-center-shadow.png deleted file mode 100644 index 1dd5c65..0000000 Binary files a/graphics/seismic-scanner/hr-center-shadow.png and /dev/null differ diff --git a/graphics/seismic-scanner/hr-center.png b/graphics/seismic-scanner/hr-center.png deleted file mode 100644 index 16c0085..0000000 Binary files a/graphics/seismic-scanner/hr-center.png and /dev/null differ diff --git a/graphics/seismic-scanner/hr-hole-front.png b/graphics/seismic-scanner/hr-hole-front.png deleted file mode 100644 index 86c8d1f..0000000 Binary files a/graphics/seismic-scanner/hr-hole-front.png and /dev/null differ diff --git a/graphics/seismic-scanner/hr-hole.png b/graphics/seismic-scanner/hr-hole.png deleted file mode 100644 index 06dbd68..0000000 Binary files a/graphics/seismic-scanner/hr-hole.png and /dev/null differ diff --git a/graphics/seismic-scanner/seismic-scanner-icon.png b/graphics/seismic-scanner/seismic-scanner-icon.png index b83bef4..e8a345f 100644 Binary files a/graphics/seismic-scanner/seismic-scanner-icon.png and b/graphics/seismic-scanner/seismic-scanner-icon.png differ diff --git a/graphics/slag/hot-slag-1-light.png b/graphics/slag/hot-slag-1-light.png index b4ba610..f1918ea 100644 Binary files a/graphics/slag/hot-slag-1-light.png and b/graphics/slag/hot-slag-1-light.png differ diff --git a/graphics/slag/hot-slag-1.png b/graphics/slag/hot-slag-1.png index b416786..e21d0cd 100644 Binary files a/graphics/slag/hot-slag-1.png and b/graphics/slag/hot-slag-1.png differ diff --git a/graphics/slag/hot-slag-2-light.png b/graphics/slag/hot-slag-2-light.png index 1d2cf14..b44a32b 100644 Binary files a/graphics/slag/hot-slag-2-light.png and b/graphics/slag/hot-slag-2-light.png differ diff --git a/graphics/slag/hot-slag-2.png b/graphics/slag/hot-slag-2.png index b05bcee..703d671 100644 Binary files a/graphics/slag/hot-slag-2.png and b/graphics/slag/hot-slag-2.png differ diff --git a/graphics/slag/hot-slag-3-light.png b/graphics/slag/hot-slag-3-light.png index 7063ae9..3d1de1d 100644 Binary files a/graphics/slag/hot-slag-3-light.png and b/graphics/slag/hot-slag-3-light.png differ diff --git a/graphics/slag/hot-slag-3.png b/graphics/slag/hot-slag-3.png index 6aa90b1..da59cca 100644 Binary files a/graphics/slag/hot-slag-3.png and b/graphics/slag/hot-slag-3.png differ diff --git a/graphics/slag/hot-slag-light.png b/graphics/slag/hot-slag-light.png index 4881373..e217d5e 100644 Binary files a/graphics/slag/hot-slag-light.png and b/graphics/slag/hot-slag-light.png differ diff --git a/graphics/slag/hot-slag.png b/graphics/slag/hot-slag.png index cdead75..f676cbe 100755 Binary files a/graphics/slag/hot-slag.png and b/graphics/slag/hot-slag.png differ diff --git a/graphics/tips-and-tricks/rocket-silo.png b/graphics/tips-and-tricks/rocket-silo.png index 6a518d7..706e310 100644 Binary files a/graphics/tips-and-tricks/rocket-silo.png and b/graphics/tips-and-tricks/rocket-silo.png differ diff --git a/graphics/transport-science-pack-item.png b/graphics/transport-science-pack-item.png index 3aa3497..9f1ff02 100644 Binary files a/graphics/transport-science-pack-item.png and b/graphics/transport-science-pack-item.png differ diff --git a/graphics/transport-science-pack-technology.png b/graphics/transport-science-pack-technology.png index a547b56..8490640 100644 Binary files a/graphics/transport-science-pack-technology.png and b/graphics/transport-science-pack-technology.png differ diff --git a/info.json b/info.json index 7c9fd34..00105ea 100644 --- a/info.json +++ b/info.json @@ -5,18 +5,19 @@ "author": "Xorimuth", "homepage": "https://discord.gg/pkJc4v9nfT", "description": "A small overhaul with a focus on long-distance logistics variety.\nTransport containerized items across land and sea using trains and ships!\nUnlocks are balanced around the custom island-based terrain and resource spawning to provide a smooth progression.\nFirst, venture to the edge of your starting island using trains to find lead, then set sail for offshore oil using tanker ships, dredge metallic nodules from the seabed, and recover titanium from other islands. Finally you'll be transporting materials to faraway lava pools to smelt titansteel, an essential ingredient in rocket parts.\nAlong the way you'll unlock hovercrafts, automated spidertrons, and aircraft.", - "factorio_version": "2.0", + "factorio_version": "2.1", "dependencies": [ - "base > 1.1.93", + "base", "IntermodalContainers", "cargo-ships", + "cargo-ships-oil-rig", "Mini_Trains", "SpidertronPatrols >= 2.4.3", "lex-aircraft", "Hovercrafts", "bzlead", "bztitanium", - "? FreightForwardingPack", + "+ FreightForwardingPack", "? Milestones", "? aai-vehicles-ironclad", "? better-victory-screen > 0.2.3", diff --git a/prototypes/battery-transport.lua b/prototypes/battery-transport.lua index ea8d196..257ff9e 100644 --- a/prototypes/battery-transport.lua +++ b/prototypes/battery-transport.lua @@ -3,55 +3,33 @@ local hit_effects = require "__base__.prototypes.entity.hit-effects" local sounds = require "__base__.prototypes.entity.sounds" local function space_accumulator_picture(tint, repeat_count, discharging_graphics) - local filename = "__FreightForwarding__/graphics/charging-station/space_charging_station.png" - local hr_filename = "__FreightForwarding__/graphics/charging-station/hr_space_charging_station.png" - if discharging_graphics then - filename = "__FreightForwarding__/graphics/charging-station/space_discharging_station.png" - hr_filename = "__FreightForwarding__/graphics/charging-station/hr_space_discharging_station.png" + local filename = "space_charging_station.png" + if discharging_graphics then + filename = "space_discharging_station.png" end + return { layers = { { - filename = filename, + filename = "__FreightForwarding__/graphics/charging-station/" .. filename, priority = "high", - width = 64, - height = 96, + width = 128, + height = 192, repeat_count = repeat_count, shift = util.by_pixel(0, -16), tint = tint, animation_speed = 0.5, - scale = 1, - hr_version = { - filename = hr_filename, - priority = "high", - width = 128, - height = 192, - repeat_count = repeat_count, - shift = util.by_pixel(0, -16), - tint = tint, - animation_speed = 0.5, - scale = 0.5 - } + scale = 0.5 }, { filename = "__FreightForwarding__/graphics/charging-station/space_charging_station_shadow.png", priority = "high", - width = 144, - height = 45, + width = 285, + height = 91, repeat_count = repeat_count, shift = util.by_pixel(32, 11), draw_as_shadow = true, - scale = 1, - hr_version = { - filename = "__FreightForwarding__/graphics/charging-station/hr_space_charging_station_shadow.png", - priority = "high", - width = 285, - height = 91, - repeat_count = repeat_count, - shift = util.by_pixel(32, 11), - draw_as_shadow = true, - scale = 0.5 - } + scale = 0.5 } } } @@ -59,95 +37,92 @@ end local function space_accumulator_charge(discharging_graphics) return { - layers = {space_accumulator_picture({ - r = 1, - g = 1, - b = 1, - a = 1 - }, 30, discharging_graphics), { - filename = "__FreightForwarding__/graphics/charging-station/space_charging_station_lightning.png", - priority = "high", - width = 64, - height = 96, - line_length = 6, - frame_count = 30, - draw_as_glow = true, - shift = util.by_pixel(0, -16), - scale = 1, - animation_speed = 3, - hr_version = { - filename = "__FreightForwarding__/graphics/charging-station/hr_space_charging_station_lightning.png", - priority = "high", - width = 128, - height = 192, - line_length = 6, - frame_count = 30, - draw_as_glow = true, - shift = util.by_pixel(0, -16), - scale = 0.5, - animation_speed = 3 - } - }} + layers = { + space_accumulator_picture({ + r = 1, + g = 1, + b = 1, + a = 1 + }, 30, discharging_graphics), + { + filename = "__FreightForwarding__/graphics/charging-station/space_charging_station_lightning.png", + priority = "high", + width = 128, + height = 192, + line_length = 6, + frame_count = 30, + draw_as_glow = true, + shift = util.by_pixel(0, -16), + scale = 0.5, + animation_speed = 3 + } + } } end -data:extend{ -- Battery charging interface +data:extend { -- Battery charging interface { type = "furnace", name = "ff-charging-station", icon = "__FreightForwarding__/graphics/charging-station/space-train-charging-station.png", icon_size = 128, - flags = {"placeable-neutral", "placeable-player", "player-creation"}, + flags = { "placeable-neutral", "placeable-player", "player-creation" }, minable = { - mining_time = 0.1, - result = "ff-charging-station" + mining_time = 0.1, + result = "ff-charging-station" }, max_health = 150, - resistances = {{ + resistances = { + { type = "fire", percent = 70 - }}, + } + }, corpse = "accumulator-remnants", dying_explosion = "accumulator-explosion", - collision_box = {{-0.9, -0.9}, {0.9, 0.9}}, - selection_box = {{-1, -1}, {1, 1}}, + collision_box = { { -0.9, -0.9 }, { 0.9, 0.9 } }, + selection_box = { { -1, -1 }, { 1, 1 } }, damaged_trigger_effect = hit_effects.entity(), - drawing_box = {{-1, -1.5}, {1, 1}}, + drawing_box = { { -1, -1.5 }, { 1, 1 } }, energy_source = { - type = "electric", - buffer_capacity = "20MJ", - usage_priority = "primary-input", - input_flow_limit = "10MW", - output_flow_limit = "0kW", - drain = "0W" + type = "electric", + buffer_capacity = "20MJ", + usage_priority = "primary-input", + input_flow_limit = "10MW", + output_flow_limit = "0kW", + drain = "0W" }, fast_replaceable_group = "assembling-machine", - always_draw_idle_animation = true, - idle_animation = space_accumulator_picture(), - working_visualisations = {{ - effect = "flicker", - fadeout = true, - light = { + graphics_set = { + always_draw_idle_animation = true, + idle_animation = space_accumulator_picture(), + working_visualisations = { + { + effect = "flicker", + fadeout = true, + light = { intensity = 0.2, size = 9.9, - shift = {0.0, 0.0}, + shift = { 0.0, 0.0 }, color = { - r = 0.25, - g = 0.25, - b = 0.8 + r = 0.25, + g = 0.25, + b = 0.8 } + } + }, + { + effect = "flicker", + fadeout = true, + draw_as_light = true, + animation = space_accumulator_charge() } - }, { - effect = "flicker", - fadeout = true, - draw_as_light = true, - animation = space_accumulator_charge() - }}, - - water_reflection = accumulator_reflection(), + }, + water_reflection = accumulator_reflection() + }, energy_usage = "800kW", - crafting_categories = {"battery"}, + crafting_categories = { "battery" }, crafting_speed = 1, source_inventory_size = 1, result_inventory_size = 1, @@ -157,19 +132,19 @@ data:extend{ -- Battery charging interface open_sound = sounds.machine_open, close_sound = sounds.machine_close, working_sound = { - sound = { - filename = "__FreightForwarding__/sound/space-charging-sound.ogg", - volume = 0.35 - }, - idle_sound = { - filename = "__base__/sound/accumulator-idle.ogg", - volume = 0.3 - }, - -- persistent = true, - max_sounds_per_type = 3, - audible_distance_modifier = 0.5, - fade_in_ticks = 4, - fade_out_ticks = 20 + sound = { + filename = "__FreightForwarding__/sound/space-charging-sound.ogg", + volume = 0.35 + }, + idle_sound = { + filename = "__base__/sound/accumulator-idle.ogg", + volume = 0.3 + }, + -- persistent = true, + max_sounds_per_type = 3, + audible_distance_modifier = 0.5, + fade_in_ticks = 4, + fade_out_ticks = 20 } }, { @@ -177,63 +152,66 @@ data:extend{ -- Battery charging interface name = "ff-discharging-station", icon = "__FreightForwarding__/graphics/charging-station/space-train-discharging-station.png", icon_size = 128, - flags = {"placeable-neutral", "placeable-player", "player-creation"}, + flags = { "placeable-neutral", "placeable-player", "player-creation" }, minable = { - mining_time = 0.1, - result = "ff-discharging-station" + mining_time = 0.1, + result = "ff-discharging-station" }, max_health = 150, - resistances = {{ + resistances = { + { type = "fire", percent = 70 - }}, + } + }, corpse = "accumulator-remnants", dying_explosion = "accumulator-explosion", - collision_box = {{-0.9, -0.9}, {0.9, 0.9}}, - selection_box = {{-1, -1}, {1, 1}}, + collision_box = { { -0.9, -0.9 }, { 0.9, 0.9 } }, + selection_box = { { -1, -1 }, { 1, 1 } }, damaged_trigger_effect = hit_effects.entity(), - drawing_box = {{-1, -1.5}, {1, 1}}, + drawing_box = { { -1, -1.5 }, { 1, 1 } }, energy_source = { type = "electric", usage_priority = "secondary-output", - drain = "0kW", + drain = "0kW" }, max_power_output = "4MW", burner = { emissions_per_minute = { pollution = 0 }, - fuel_categories = {"battery"}, + fuel_categories = { "battery" }, fuel_inventory_size = 1, burnt_inventory_size = 1, type = "burner", light_flicker = { - minimum_intensity = 0, - maximum_intensity = 0, + minimum_intensity = 0, + maximum_intensity = 0 }, - ff_no_double_inventory_size = true, + ff_no_double_inventory_size = true }, fast_replaceable_group = "assembling-machine", + idle_animation = space_accumulator_picture(nil, 30, true), animation = space_accumulator_charge(true), - water_reflection = accumulator_reflection(), + vehicle_impact_sound = sounds.generic_impact, open_sound = sounds.machine_open, close_sound = sounds.machine_close, working_sound = { - sound = { - filename = "__FreightForwarding__/sound/space-charging-sound.ogg", - volume = 0.35 - }, - idle_sound = { - filename = "__base__/sound/accumulator-idle.ogg", - volume = 0.3 - }, - -- persistent = true, - max_sounds_per_type = 3, - audible_distance_modifier = 0.5, - fade_in_ticks = 4, - fade_out_ticks = 20 + sound = { + filename = "__FreightForwarding__/sound/space-charging-sound.ogg", + volume = 0.35 + }, + idle_sound = { + filename = "__base__/sound/accumulator-idle.ogg", + volume = 0.3 + }, + -- persistent = true, + max_sounds_per_type = 3, + audible_distance_modifier = 0.5, + fade_in_ticks = 4, + fade_out_ticks = 20 } }, { @@ -244,7 +222,7 @@ data:extend{ -- Battery charging interface subgroup = "production-machine", order = "h[train-system]", place_result = "ff-charging-station", - stack_size = 10, + stack_size = 10 }, { type = "item", @@ -254,7 +232,7 @@ data:extend{ -- Battery charging interface subgroup = "production-machine", order = "h[train-system]", place_result = "ff-discharging-station", - stack_size = 10, + stack_size = 10 }, { type = "recipe", @@ -262,11 +240,11 @@ data:extend{ -- Battery charging interface energy_required = 10, enabled = false, ingredients = { - {type="item", name="steel-plate", amount=15}, - {type="item", name="advanced-circuit", amount=5}, - {type="item", name="copper-cable", amount=20} + { type = "item", name = "steel-plate", amount = 15 }, + { type = "item", name = "advanced-circuit", amount = 5 }, + { type = "item", name = "copper-cable", amount = 20 } }, - results = {{type="item", name="ff-charging-station", amount=1}}, + results = { { type = "item", name = "ff-charging-station", amount = 1 } } }, { type = "recipe", @@ -274,16 +252,16 @@ data:extend{ -- Battery charging interface energy_required = 10, enabled = false, ingredients = { - {type="item", name="steel-plate", amount=15}, - {type="item", name="advanced-circuit", amount=5}, - {type="item", name="copper-cable", amount=20} + { type = "item", name = "steel-plate", amount = 15 }, + { type = "item", name = "advanced-circuit", amount = 5 }, + { type = "item", name = "copper-cable", amount = 20 } }, - results = {{type="item", name="ff-discharging-station", amount=1}}, + results = { { type = "item", name = "ff-discharging-station", amount = 1 } } }, { type = "item", name = "ff-charged-battery", - icons = {{icon = "__base__/graphics/icons/battery.png", tint = {r = 0.3, g = 0.5, b = 0.9, a = 0.8}}}, + icons = { { icon = "__base__/graphics/icons/battery.png", tint = { r = 0.3, g = 0.5, b = 0.9, a = 0.8 } } }, icon_size = 64, --[[pictures = { layers = {{ @@ -303,12 +281,12 @@ data:extend{ -- Battery charging interface burnt_result = "battery", subgroup = "raw-material", order = "h[battery]-c", - stack_size = 200 -- Will be halved in stack-sizes.lua + stack_size = 200 -- Will be halved in stack-sizes.lua }, { type = "recipe", name = "ff-charged-battery", - category = "battery", + categories = { "battery" }, --hide_from_player_crafting = true, energy_required = 5, enabled = false, @@ -316,36 +294,36 @@ data:extend{ -- Battery charging interface --icon_size = 128, subgroup = "raw-material", allow_as_intermediate = false, - ingredients = {{type="item", name="battery", amount=1}}, - results = {{ - type = "item", - name = "ff-charged-battery", - probability = 0.98, - amount = 1 - }}, + ingredients = { { type = "item", name = "battery", amount = 1 } }, + results = { + { + type = "item", + name = "ff-charged-battery", + independent_probability = 0.98, + amount = 1 + } + }, always_show_made_in = true, show_amount_in_title = false, - always_show_products = true, + always_show_products = true }, { type = "recipe", name = "ff-battery-pack", - category = "chemistry", + categories = { "chemistry" }, energy_required = 5, enabled = false, - ingredients = - { - {type="item", name="battery", amount=3}, - {type="item", name="advanced-circuit", amount=1}, - {type="item", name="ff-cobalt-ingot", amount=1}, + ingredients = { + { type = "item", name = "battery", amount = 3 }, + { type = "item", name = "advanced-circuit", amount = 1 }, + { type = "item", name = "ff-cobalt-ingot", amount = 1 } }, - results = {{type="item", name="ff-battery-pack", amount=1}}, - crafting_machine_tint = - { - primary = {r = 0.965, g = 0.482, b = 0.338, a = 1.000}, -- #f67a56ff - secondary = {r = 0.831, g = 0.560, b = 0.222, a = 1.000}, -- #d38e38ff - tertiary = {r = 0.728, g = 0.818, b = 0.443, a = 1.000}, -- #b9d070ff - quaternary = {r = 0.939, g = 0.763, b = 0.191, a = 1.000}, -- #efc230ff + results = { { type = "item", name = "ff-battery-pack", amount = 1 } }, + crafting_machine_tint = { + primary = { r = 0.965, g = 0.482, b = 0.338, a = 1.000 }, -- #f67a56ff + secondary = { r = 0.831, g = 0.560, b = 0.222, a = 1.000 }, -- #d38e38ff + tertiary = { r = 0.728, g = 0.818, b = 0.443, a = 1.000 }, -- #b9d070ff + quaternary = { r = 0.939, g = 0.763, b = 0.191, a = 1.000 } -- #efc230ff } }, { @@ -360,7 +338,17 @@ data:extend{ -- Battery charging interface { type = "item", name = "ff-charged-battery-pack", - icons = {{icon = "__FreightForwarding__/graphics/charging-station/battery-pack.png", tint = {r = 0.3, g = 0.5, b = 0.9, a = 0.8}}}, + icons = { + { + icon = "__FreightForwarding__/graphics/charging-station/battery-pack.png", + tint = { + r = 0.3, + g = 0.5, + b = 0.9, + a = 0.8 + } + } + }, icon_size = 64, --[[pictures = { layers = {{ @@ -382,12 +370,12 @@ data:extend{ -- Battery charging interface fuel_top_speed_multiplier = 1.5, subgroup = "raw-material", order = "h[battery]-d", - stack_size = 200 -- Will be halved in stack-sizes.lua + stack_size = 200 -- Will be halved in stack-sizes.lua }, { type = "recipe", name = "ff-charged-battery-pack", - category = "battery", + categories = { "battery" }, --hide_from_player_crafting = true, energy_required = 12.5, enabled = false, @@ -395,25 +383,26 @@ data:extend{ -- Battery charging interface --icon_size = 128, subgroup = "raw-material", allow_as_intermediate = false, - ingredients = {{type="item", name="ff-battery-pack", amount=1}}, - results = {{ - type = "item", - name = "ff-charged-battery-pack", - probability = 0.995, - amount = 1 - }}, + ingredients = { { type = "item", name = "ff-battery-pack", amount = 1 } }, + results = { + { + type = "item", + name = "ff-charged-battery-pack", + independent_probability = 0.995, + amount = 1 + } + }, always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - allow_productivity = true, + allow_productivity = true }, { type = "technology", name = "ff-battery-charging", icon_size = 128, icon = "__FreightForwarding__/graphics/charging-station/space-train-charging-station.png", - effects = - { + effects = { { type = "unlock-recipe", recipe = "ff-charging-station" @@ -425,17 +414,15 @@ data:extend{ -- Battery charging interface { type = "unlock-recipe", recipe = "ff-charged-battery" - }, + } }, - prerequisites = {"electric-energy-accumulators"}, - unit = - { + prerequisites = { "electric-energy-accumulators" }, + unit = { count = 150, - ingredients = - { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, + ingredients = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 } }, time = 60 }, @@ -446,8 +433,7 @@ data:extend{ -- Battery charging interface name = "ff-battery-pack", icon_size = 128, icon = "__FreightForwarding__/graphics/charging-station/battery-pack-tech.png", - effects = - { + effects = { { type = "unlock-recipe", recipe = "ff-battery-pack" @@ -455,28 +441,25 @@ data:extend{ -- Battery charging interface { type = "unlock-recipe", recipe = "ff-charged-battery-pack" - }, + } }, - prerequisites = {"ff-battery-charging", "utility-science-pack", "ff-cobalt-processing"}, - unit = - { + prerequisites = { "ff-battery-charging", "utility-science-pack", "ff-cobalt-processing" }, + unit = { count = 300, - ingredients = - { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"utility-science-pack", 1} + ingredients = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "utility-science-pack", 1 } }, time = 60 }, order = "a" - }, + } } -data:extend( -{ +data:extend({ { type = "fuel-category", name = "battery" diff --git a/prototypes/cargo-ships.lua b/prototypes/cargo-ships.lua index 237a6e3..84693d5 100644 --- a/prototypes/cargo-ships.lua +++ b/prototypes/cargo-ships.lua @@ -1,11 +1,13 @@ -- Much bigger supply area to make up for lack of floating pole -data.raw["electric-pole"]["or_pole"].supply_area_distance = 12.5 -- 4.5 +data.raw["electric-pole"]["or_pole"].supply_area_distance = 12.5 -- 4.5 -- Hide floating pole -data.raw["electric-pole"]["floating-electric-pole"].hidden = true -data.raw["item"]["floating-electric-pole"].hidden = true -data.raw["recipe"]["floating-electric-pole"].hidden = true -data.raw["technology"]["oversea-energy-distribution"].hidden = true +if mods["cargo-ships-floating-electric-pole"] then + data.raw["electric-pole"]["floating-electric-pole"].hidden = true + data.raw["item"]["floating-electric-pole"].hidden = true + data.raw["recipe"]["floating-electric-pole"].hidden = true + data.raw["technology"]["oversea-energy-distribution"].hidden = true +end -- Speed up small boat -data.raw["car"]["indep-boat"].friction = data.raw["car"]["indep-boat"].friction * 0.75 \ No newline at end of file +data.raw["car"]["indep-boat"].friction_force = data.raw["car"]["indep-boat"].friction_force * 0.75 diff --git a/prototypes/cobalt.lua b/prototypes/cobalt.lua index 6eecfe7..2901e6d 100644 --- a/prototypes/cobalt.lua +++ b/prototypes/cobalt.lua @@ -1,4 +1,4 @@ -data:extend{ +data:extend { { type = "item", name = "ff-cobalt-ore", @@ -6,7 +6,7 @@ data:extend{ icon_size = 64, subgroup = "raw-resource", order = "h[cobalt]-a[cobalt-ore]", - stack_size = 30, + stack_size = 30 }, { type = "item", @@ -15,7 +15,7 @@ data:extend{ icon_size = 64, subgroup = "raw-resource", order = "h[cobalt]-b[cobalt-concentrate]", - stack_size = 50, + stack_size = 50 }, { type = "item", @@ -23,18 +23,18 @@ data:extend{ icons = { { icon = "__FreightForwarding__/graphics/item/cobalt-concentrate.png", - icon_size = 64, + icon_size = 64 }, { icon = "__base__/graphics/icons/explosives.png", icon_size = 64, - scale = 0.33, - }, + scale = 0.33 + } }, subgroup = "raw-resource", order = "h[cobalt]-c[cobalt-blast-blend]", stack_size = 5, - ic_create_container = false, + ic_create_container = false }, { type = "item", @@ -43,7 +43,7 @@ data:extend{ icon_size = 64, subgroup = "raw-material", order = "e[cobalt-ingot]", - stack_size = 100, + stack_size = 100 }, { type = "fluid", @@ -52,129 +52,127 @@ data:extend{ icon_size = 64, subgroup = "fluid", default_temperature = 15, - base_color = {r=0.1, g=0.2, b=0.3}, -- TODO - flow_color = {r=0.4, g=0.4, b=0.4}, - order = "f[tailings]", + base_color = { r = 0.1, g = 0.2, b = 0.3 }, -- TODO + flow_color = { r = 0.4, g = 0.4, b = 0.4 }, + order = "f[tailings]" }, { type = "recipe", name = "ff-cobalt-concentrate", - category = "oil-processing", + categories = { "oil-processing" }, enabled = false, energy_required = 12, main_product = "ff-cobalt-concentrate", ingredients = { - {type = "item", name = "ff-cobalt-ore", amount = 10}, - {type = "fluid", name = "water", amount = 100, catalyst_amount = 100}, + { type = "item", name = "ff-cobalt-ore", amount = 10 }, + { type = "fluid", name = "water", amount = 100, catalyst_amount = 100 } }, results = { - {type = "item", name = "ff-cobalt-concentrate", amount = 5}, - {type = "fluid", name = "ff-tailings-water", amount = 100, catalyst_amount = 100}, + { type = "item", name = "ff-cobalt-concentrate", amount = 5 }, + { type = "fluid", name = "ff-tailings-water", amount = 100, catalyst_amount = 100 } }, - allow_productivity = true, + allow_productivity = true }, { type = "recipe", name = "ff-cobalt-blast-blend", - category = "crafting", + categories = { "crafting" }, enabled = false, energy_required = 0.5, main_product = "ff-cobalt-blast-blend", ingredients = { - {type = "item", name = "ff-cobalt-concentrate", amount = 4}, - {type = "item", name = "explosives", amount = 4}, + { type = "item", name = "ff-cobalt-concentrate", amount = 4 }, + { type = "item", name = "explosives", amount = 4 } }, results = { - {type = "item", name = "ff-cobalt-blast-blend", amount = 4}, - }, + { type = "item", name = "ff-cobalt-blast-blend", amount = 4 } + } }, { type = "recipe", name = "ff-cobalt-ingot", - category = "smelting", + categories = { "smelting" }, enabled = false, energy_required = 16, - ingredients = {{type="item", name="ff-cobalt-blast-blend", amount=5}}, - results = {{type="item", name="ff-cobalt-ingot", amount=1}}, - allow_productivity = true, + ingredients = { { type = "item", name = "ff-cobalt-blast-blend", amount = 5 } }, + results = { { type = "item", name = "ff-cobalt-ingot", amount = 1 } }, + allow_productivity = true }, { type = "recipe", name = "ff-tailings-filtration", - localised_name = {"recipe-name.ff-tailings-filtration"}, - category = "chemistry", + localised_name = { "recipe-name.ff-tailings-filtration" }, + categories = { "chemistry" }, subgroup = "fluid-recipes", order = "f[tailings]-a[filtration]", enabled = false, - icons = - { + icons = { { - icon = "__base__/graphics/icons/fluid/water.png", + icon = "__base__/graphics/icons/fluid/water.png" }, { icon = "__FreightForwarding__/graphics/item/tailings-water.png", scale = 0.25, - shift = {-8, -8}, - draw_background = true, - }, + shift = { -8, -8 }, + draw_background = true + } }, icon_size = 64, energy_required = 8, allow_decomposition = false, ingredients = { - {type = "fluid", name = "ff-tailings-water", amount = 100, catalyst_amount = 100}, - {type = "item", name = "coal", amount = 2}, + { type = "fluid", name = "ff-tailings-water", amount = 100, catalyst_amount = 100 }, + { type = "item", name = "coal", amount = 2 } }, results = { - {type = "fluid", name = "water", amount = 100, catalyst_amount = 100}, + { type = "fluid", name = "water", amount = 100, catalyst_amount = 100 } }, show_amount_in_title = false, always_show_products = true, - allow_productivity = true, + allow_productivity = true }, { type = "recipe", name = "ff-tailings-evaporation", - category = "chemistry", + categories = { "chemistry" }, subgroup = "fluid-recipes", order = "f[tailings]-b[evaporation]", enabled = false, allow_decomposition = false, - icons = - { + icons = { { - icon = "__base__/graphics/icons/fluid/water.png", + icon = "__base__/graphics/icons/fluid/water.png" }, { icon = "__FreightForwarding__/graphics/item/tailings-water.png", scale = 0.25, - shift = {-8, -8}, - draw_background = true, + shift = { -8, -8 }, + draw_background = true }, { icon = "__bzlead__/graphics/icons/lead-ore.png", scale = 0.23, - shift = {-8, 8}, - draw_background = true, + shift = { -8, 8 }, + draw_background = true }, { icon = "__bztitanium__/graphics/icons/titanium-ore.png", scale = 0.23, - shift = {8, 8}, - draw_background = true, - }, + shift = { 8, 8 }, + draw_background = true + } }, icon_size = 64, energy_required = 36, ingredients = { - {type = "fluid", name = "ff-tailings-water", amount = 100, catalyst_amount = 100}, + { type = "fluid", name = "ff-tailings-water", amount = 100, catalyst_amount = 100 } }, results = { - {type = "fluid", name = "water", amount = 20, catalyst_amount = 20}, - {type = "item", name = "lead-ore", amount_min = 0, amount_max = 8}, - {type = "item", name = "titanium-ore", amount_min = 0, amount_max = 4}, + { type = "fluid", name = "water", amount = 20, catalyst_amount = 20 }, + { type = "item", name = "lead-ore", amount_min = 0, amount_max = 8 }, + { type = "item", name = "titanium-ore", amount_min = 0, amount_max = 4 } }, - allow_productivity = true, + allow_productivity = true }, { type = "technology", @@ -182,14 +180,14 @@ data:extend{ icon = "__FreightForwarding__/graphics/cobalt-ingot-technology.png", icon_size = 100, order = "a", - prerequisites = {"utility-science-pack", "ff-dredging", "explosives"}, + prerequisites = { "utility-science-pack", "ff-dredging", "explosives" }, unit = { count = 150, ingredients = { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"utility-science-pack", 1}, + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "utility-science-pack", 1 } }, time = 30 }, @@ -221,7 +219,7 @@ data:extend{ { type = "unlock-recipe", recipe = "ff-tailings-evaporation" - }, + } } - }, -} \ No newline at end of file + } +} diff --git a/prototypes/dredger.lua b/prototypes/dredger.lua index f8dde89..d57fbdb 100644 --- a/prototypes/dredger.lua +++ b/prototypes/dredger.lua @@ -134,37 +134,19 @@ data:extend{ { filename = "__base__/graphics/entity/pumpjack/pumpjack-base.png", priority = "extra-high", - width = 131, - height = 137, - shift = util.by_pixel(-2.5, -4.5), - scale = 1.3, - hr_version = - { - filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 * 1.3 - } + width = 261, + height = 273, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 * 1.3 }, { filename = "__base__/graphics/entity/pumpjack/pumpjack-base-shadow.png", priority = "extra-high", - width = 110, - height = 111, + width = 220, + height = 220, draw_as_shadow = true, shift = util.by_pixel(6, 0.5), - scale = 1.3, - hr_version = - { - filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-base-shadow.png", - width = 220, - height = 220, - scale = 0.5 * 1.3, - draw_as_shadow = true, - shift = util.by_pixel(6, 0.5) - } + scale = 0.5 * 1.3 } } }, @@ -178,24 +160,12 @@ data:extend{ priority = "high", filename = "__base__/graphics/entity/pumpjack/pumpjack-horsehead.png", line_length = 8, - width = 104, - height = 102, + width = 206, + height = 202, frame_count = 40, shift = util.by_pixel(-4, -24), animation_speed = 0.5, - scale = 1.3, - hr_version = - { - priority = "high", - filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-horsehead.png", - animation_speed = 0.5, - scale = 0.5 * 1.3, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - } + scale = 0.5 * 1.3 }, { priority = "high", @@ -203,24 +173,11 @@ data:extend{ animation_speed = 0.5, draw_as_shadow = true, line_length = 8, - width = 155, - height = 41, + width = 309, + height = 82, frame_count = 40, - shift = util.by_pixel(17.5, 14.5), - scale = 1.3, - hr_version = - { - priority = "high", - filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.5, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5 * 1.3, - shift = util.by_pixel(17.75, 14.5) - } + shift = util.by_pixel(17.75, 14.5), + scale = 0.5 * 1.3 } } } @@ -294,37 +251,19 @@ data:extend{ { filename = "__base__/graphics/entity/pumpjack/pumpjack-base.png", priority = "extra-high", - width = 131, - height = 137, - shift = util.by_pixel(-2.5, -4.5), - scale = 1.3, - hr_version = - { - filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-base.png", - priority = "extra-high", - width = 261, - height = 273, - shift = util.by_pixel(-2.25, -4.75), - scale = 0.5 * 1.3 - } + width = 261, + height = 273, + shift = util.by_pixel(-2.25, -4.75), + scale = 0.5 * 1.3 }, { filename = "__base__/graphics/entity/pumpjack/pumpjack-base-shadow.png", priority = "extra-high", - width = 110, - height = 111, + width = 220, + height = 220, draw_as_shadow = true, shift = util.by_pixel(6, 0.5), - scale = 1.3, - hr_version = - { - filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-base-shadow.png", - width = 220, - height = 220, - scale = 0.5 * 1.3, - draw_as_shadow = true, - shift = util.by_pixel(6, 0.5) - } + scale = 0.5 * 1.3 } } }, @@ -338,24 +277,12 @@ data:extend{ priority = "high", filename = "__base__/graphics/entity/pumpjack/pumpjack-horsehead.png", line_length = 8, - width = 104, - height = 102, + width = 206, + height = 202, frame_count = 40, shift = util.by_pixel(-4, -24), animation_speed = 0.5, - scale = 1.3, - hr_version = - { - priority = "high", - filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-horsehead.png", - animation_speed = 0.5, - scale = 0.5 * 1.3, - line_length = 8, - width = 206, - height = 202, - frame_count = 40, - shift = util.by_pixel(-4, -24) - } + scale = 0.5 * 1.3 }, { priority = "high", @@ -363,24 +290,11 @@ data:extend{ animation_speed = 0.5, draw_as_shadow = true, line_length = 8, - width = 155, - height = 41, + width = 309, + height = 82, frame_count = 40, - shift = util.by_pixel(17.5, 14.5), - scale = 1.3, - hr_version = - { - priority = "high", - filename = "__base__/graphics/entity/pumpjack/hr-pumpjack-horsehead-shadow.png", - animation_speed = 0.5, - draw_as_shadow = true, - line_length = 8, - width = 309, - height = 82, - frame_count = 40, - scale = 0.5 * 1.3, - shift = util.by_pixel(17.75, 14.5) - } + shift = util.by_pixel(17.75, 14.5), + scale = 0.5 * 1.3 } } } @@ -469,11 +383,7 @@ local tile_variants = { material_background = { picture = "__FreightForwarding__/graphics/dredging-platform/concrete.png", count = 8, - hr_version = { - picture = "__FreightForwarding__/graphics/dredging-platform/hr-concrete.png", - count = 8, - scale = 0.5 - } + scale = 0.5 } } diff --git a/prototypes/endgame.lua b/prototypes/endgame.lua index 2e47996..4afe4a1 100644 --- a/prototypes/endgame.lua +++ b/prototypes/endgame.lua @@ -1,33 +1,30 @@ if mods["Krastorio2"] or mods["SpaceMod"] then return end -data:extend{ +data:extend { { type = "technology", name = "ff-interstellar-communication", icon_size = 64, icon = "__FreightForwarding__/graphics/item/interstellar-communicator.png", - effects = - { + effects = { { type = "unlock-recipe", recipe = "ff-interstellar-communicator" } }, - unit = - { + unit = { count = 2000, - ingredients = - { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"production-science-pack", 1}, - {"utility-science-pack", 1}, - {"space-science-pack", 1} + ingredients = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "production-science-pack", 1 }, + { "utility-science-pack", 1 }, + { "space-science-pack", 1 } }, time = 60 }, - prerequisites = {"space-science-pack"}, + prerequisites = { "space-science-pack" }, order = "c-a" }, { @@ -41,7 +38,7 @@ data:extend{ size = 64, filename = "__FreightForwarding__/graphics/item/interstellar-communicator.png", scale = 0.5, - mipmap_count = 4, + mipmap_count = 4 }, { draw_as_light = true, @@ -49,31 +46,30 @@ data:extend{ size = 64, filename = "__FreightForwarding__/graphics/item/interstellar-communicator-light.png", scale = 0.5, - mipmap_count = 4, - }, - }, + mipmap_count = 4 + } + } }, subgroup = "space-related", order = "n[interstellar-communicator]", stack_size = 1, - rocket_launch_products = {{type="item", name="space-science-pack", amount=1000}} + rocket_launch_products = { { type = "item", name = "space-science-pack", amount = 1000 } } }, { type = "recipe", name = "ff-interstellar-communicator", energy_required = 20, enabled = false, - category = "crafting", - ingredients = - { - {type="item", name="satellite", amount=1}, - {type="item", name="low-density-structure", amount=50}, + categories = { "crafting" }, + ingredients = { + { type = "item", name = "satellite", amount = 1 }, + { type = "item", name = "low-density-structure", amount = 50 }, --{type="item", name="rocket-control-unit", amount=50}, - {type="item", name="nuclear-fuel", amount=10} + { type = "item", name = "nuclear-fuel", amount = 10 } }, - results = {{type="item", name="ff-interstellar-communicator", amount=1}}, + results = { { type = "item", name = "ff-interstellar-communicator", amount = 1 } }, requester_paste_multiplier = 1 - }, + } } --[[ satellite recipe: @@ -85,9 +81,9 @@ data:extend{ {"rocket-fuel", 50} ]] local satellite_item = data.raw.item["satellite"] -satellite_item.rocket_launch_products = {{type="item", name="space-science-pack", amount=200}} +satellite_item.rocket_launch_products = { { type = "item", name = "space-science-pack", amount = 200 } } -- Reduce satellite cost x_util.set_ingredient("satellite", "low-density-structure", 50) x_util.set_ingredient("satellite", "solar-panel", 50) -x_util.set_ingredient("satellite", "accumulator", 50) -- Will be replaced by charged battery pack +x_util.set_ingredient("satellite", "accumulator", 50) -- Will be replaced by charged battery pack diff --git a/prototypes/lava-pool.lua b/prototypes/lava-pool.lua index bbfbae3..2bedd09 100644 --- a/prototypes/lava-pool.lua +++ b/prototypes/lava-pool.lua @@ -130,19 +130,7 @@ data:extend{ height = 300, --repeat_count = 48, shift = util.by_pixel(0, 10), - scale = 1.1, - hr_version = - { - filename = "__core__/graphics/light-medium.png", - blend_mode = "additive", - draw_as_light = true, - tint = {a = 0.8, r = 255, g = 80, b = 0}, - width = 300, - height = 300, - --repeat_count = 48, - shift = util.by_pixel(0, 10), - scale = 1.1, - } + scale = 1.1 }, integration_patch = { filename = "__FreightForwarding__/graphics/lava-pool/lava-pool.png", @@ -151,18 +139,8 @@ data:extend{ height = 512, --line_length = 8, --shift = util.by_pixel(0, 2), - scale = 0.275, --draw_as_glow = true, - hr_version = - { - filename = "__FreightForwarding__/graphics/lava-pool/lava-pool.png", - priority = "high", - width = 512, - height = 512, - --line_length = 8, - --shift = util.by_pixel(0, 2), - scale = 0.275, - }, + scale = 0.275 }, --always_draw_idle_animation = true, --[[idle_animation = @@ -178,19 +156,7 @@ data:extend{ --line_length = 8, --shift = util.by_pixel(0, 2), scale = 0.275, - animation_speed = 0.25, - hr_version = - { - filename = "__FreightForwarding__/graphics/lava-pool/lava-pool.png", - priority = "high", - width = 512, - height = 512, - frame_count = 10, - --line_length = 8, - --shift = util.by_pixel(0, 2), - scale = 0.275, - animation_speed = 0.25, - } + animation_speed = 0.25 }, } },]] @@ -242,19 +208,7 @@ data:extend{ --shift = util.by_pixel(0, 2), scale = 0.275, animation_speed = 0.2, - draw_as_glow = true, - hr_version = - { - filename = "__FreightForwarding__/graphics/lava-pool/lava-pool.png", - priority = "high", - width = 512, - height = 512, - frame_count = 10, - --line_length = 8, - --shift = util.by_pixel(0, 2), - scale = 0.275, - animation_speed = 0.2, - }, + draw_as_glow = true }, { type = "assembling-machine", @@ -274,20 +228,7 @@ data:extend{ height = 300, --repeat_count = 48, scale = 0.55, - shift = util.by_pixel(0, 6), - hr_version = - { - filename = "__core__/graphics/light-medium.png", - blend_mode = "additive", - draw_as_light = true, - tint = {a = 0.8, r = 255, g = 80, b = 0}, - width = 300, - height = 300, - --repeat_count = 48, - --shift = util.by_pixel(-1, 44), - scale = 0.55, - shift = util.by_pixel(0, 6), - } + shift = util.by_pixel(0, 6) }, integration_patch = { filename = "__FreightForwarding__/graphics/lava-pool/small-lava-pool.png", @@ -296,18 +237,8 @@ data:extend{ height = 128, --line_length = 8, --shift = util.by_pixel(0, 2), - scale = 0.6, --draw_as_glow = true, - hr_version = - { - filename = "__FreightForwarding__/graphics/lava-pool/small-lava-pool.png", - priority = "high", - width = 128, - height = 128, - --line_length = 8, - --shift = util.by_pixel(0, 2), - scale = 0.6, - }, + scale = 0.6 }, --map_color = {1, 0.4, 0}, crafting_categories = {"ff-lava-heating"}, @@ -357,19 +288,7 @@ data:extend{ --shift = util.by_pixel(0, 2), scale = 0.6, animation_speed = 0.2, - draw_as_glow = true, - hr_version = - { - filename = "__FreightForwarding__/graphics/lava-pool/small-lava-pool.png", - priority = "high", - width = 128, - height = 128, - frame_count = 10, - --line_length = 8, - --shift = util.by_pixel(0, 2), - scale = 0.6, - animation_speed = 0.2, - }, + draw_as_glow = true }, --[[{ type = "loader-1x1", diff --git a/prototypes/nodule.lua b/prototypes/nodule.lua index dbe2d48..5816382 100644 --- a/prototypes/nodule.lua +++ b/prototypes/nodule.lua @@ -1,4 +1,4 @@ -data:extend{ +data:extend { { type = "item", name = "ff-ferrous-nodule", @@ -7,39 +7,39 @@ data:extend{ subgroup = "raw-resource", order = "w[nodule]-a[ferrous]", stack_size = 1, - ic_create_container = false, + ic_create_container = false }, { type = "recipe", name = "ff-ferrous-nodule", - category = "ff-dredging", + categories = { "ff-dredging" }, enabled = false, energy_required = 50, ingredients = {}, results = { - {type = "item", name = "ff-ferrous-nodule", amount_min = 100, amount_max = 200} + { type = "item", name = "ff-ferrous-nodule", amount_min = 100, amount_max = 200 } }, show_amount_in_title = false, - always_show_products = true, + always_show_products = true }, { type = "recipe", - name = "ff-ferrous-nodule-washing", -- TODO 2.0 give unique icon - category = "chemistry", + name = "ff-ferrous-nodule-washing", -- TODO 2.0 give unique icon + categories = { "chemistry" }, enabled = false, energy_required = 15, allow_decomposition = false, main_product = "iron-ore", ingredients = { - {type = "item", name = "ff-ferrous-nodule", amount = 18}, - {type = "fluid", name = "sulfuric-acid", amount = 15}, + { type = "item", name = "ff-ferrous-nodule", amount = 18 }, + { type = "fluid", name = "sulfuric-acid", amount = 15 } }, results = { - {type = "item", name = "iron-ore", amount_min = 40, amount_max = 50}, - {type = "item", name = "copper-ore", amount_min = 0, amount_max = 8}, - {type = "item", name = "stone", amount_min = 0, amount_max = 4}, - {type = "item", name = "ff-ferrous-nodule", amount_min = 0, amount_max = 6}, - }, + { type = "item", name = "iron-ore", amount_min = 40, amount_max = 50 }, + { type = "item", name = "copper-ore", amount_min = 0, amount_max = 8 }, + { type = "item", name = "stone", amount_min = 0, amount_max = 4 }, + { type = "item", name = "ff-ferrous-nodule", amount_min = 0, amount_max = 6 } + } }, { type = "item", @@ -49,39 +49,39 @@ data:extend{ subgroup = "raw-resource", order = "w[nodule]-b[cupric]", stack_size = 1, - ic_create_container = false, + ic_create_container = false }, { type = "recipe", name = "ff-cupric-nodule", - category = "ff-dredging", + categories = { "ff-dredging" }, enabled = false, energy_required = 50, ingredients = {}, results = { - {type = "item", name = "ff-cupric-nodule", amount_min = 100, amount_max = 200} + { type = "item", name = "ff-cupric-nodule", amount_min = 100, amount_max = 200 } }, show_amount_in_title = false, - always_show_products = true, + always_show_products = true }, { type = "recipe", name = "ff-cupric-nodule-washing", - category = "chemistry", + categories = { "chemistry" }, enabled = false, energy_required = 15, allow_decomposition = false, main_product = "copper-ore", ingredients = { - {type = "item", name = "ff-cupric-nodule", amount = 18}, - {type = "fluid", name = "sulfuric-acid", amount = 15}, + { type = "item", name = "ff-cupric-nodule", amount = 18 }, + { type = "fluid", name = "sulfuric-acid", amount = 15 } }, results = { - {type = "item", name = "copper-ore", amount_min = 40, amount_max = 50}, - {type = "item", name = "iron-ore", amount_min = 0, amount_max = 8}, - {type = "item", name = "stone", amount_min = 0, amount_max = 4}, - {type = "item", name = "ff-cupric-nodule", amount_min = 0, amount_max = 6}, - }, + { type = "item", name = "copper-ore", amount_min = 40, amount_max = 50 }, + { type = "item", name = "iron-ore", amount_min = 0, amount_max = 8 }, + { type = "item", name = "stone", amount_min = 0, amount_max = 4 }, + { type = "item", name = "ff-cupric-nodule", amount_min = 0, amount_max = 6 } + } }, { type = "item", @@ -91,39 +91,39 @@ data:extend{ subgroup = "raw-resource", order = "w[nodule]-c[cobalt-crust]", stack_size = 1, - ic_create_container = false, + ic_create_container = false }, { type = "recipe", name = "ff-cobalt-crust", - category = "ff-dredging", + categories = { "ff-dredging" }, enabled = false, energy_required = 75, ingredients = {}, results = { - {type = "item", name = "ff-cobalt-crust", amount_min = 50, amount_max = 150} + { type = "item", name = "ff-cobalt-crust", amount_min = 50, amount_max = 150 } }, show_amount_in_title = false, - always_show_products = true, + always_show_products = true }, { type = "recipe", name = "ff-cobalt-crust-washing", - category = "chemistry", + categories = { "chemistry" }, enabled = false, energy_required = 15, allow_decomposition = false, main_product = "ff-cobalt-ore", ingredients = { - {type = "item", name = "ff-cobalt-crust", amount = 15}, - {type = "fluid", name = "sulfuric-acid", amount = 30}, + { type = "item", name = "ff-cobalt-crust", amount = 15 }, + { type = "fluid", name = "sulfuric-acid", amount = 30 } }, results = { - {type = "item", name = "ff-cobalt-ore", amount_min = 40, amount_max = 50}, - {type = "item", name = "iron-ore", amount_min = 0, amount_max = 8}, - {type = "item", name = "copper-ore", amount_min = 0, amount_max = 8}, - {type = "item", name = "stone", amount_min = 0, amount_max = 4}, - {type = "item", name = "ff-cobalt-crust", amount_min = 0, amount_max = 10}, - }, - }, -} \ No newline at end of file + { type = "item", name = "ff-cobalt-ore", amount_min = 40, amount_max = 50 }, + { type = "item", name = "iron-ore", amount_min = 0, amount_max = 8 }, + { type = "item", name = "copper-ore", amount_min = 0, amount_max = 8 }, + { type = "item", name = "stone", amount_min = 0, amount_max = 4 }, + { type = "item", name = "ff-cobalt-crust", amount_min = 0, amount_max = 10 } + } + } +} diff --git a/prototypes/offshore-tank.lua b/prototypes/offshore-tank.lua index 094a7c4..d59b2f8 100644 --- a/prototypes/offshore-tank.lua +++ b/prototypes/offshore-tank.lua @@ -5,19 +5,19 @@ local ei_tank_1 = { south = { layers = { { - filename = "__FreightForwarding__/graphics/pipe-covers/data_south_covers.png", + filename = "__FreightForwarding__/graphics/pipe-covers/data_south_covers.png", width = 512, height = 512, -- shift = {0,-2.15}, scale = 0.35, - shift = util.by_pixel(0, -96), + shift = util.by_pixel(0, -96) }, { filename = "__FreightForwarding__/graphics/pipe-covers/south_basic_covers.png", priority = "high", width = 55, height = 50, - shift = {0.01, -0.58}, + shift = { 0.01, -0.58 }, scale = 0.5 } } @@ -28,7 +28,7 @@ local ei_tank_1 = { width = 512, height = 512, scale = 0.35, - shift = util.by_pixel(96, 0), + shift = util.by_pixel(96, 0) }, east = { filename = "__FreightForwarding__/graphics/pipe-covers/big_east_covers.png", @@ -36,11 +36,11 @@ local ei_tank_1 = { width = 512, height = 512, scale = 0.35, - shift = util.by_pixel(-96, 0), + shift = util.by_pixel(-96, 0) } } -data:extend{ +data:extend { { name = "ff-offshore-storage-tank", type = "item", @@ -54,16 +54,15 @@ data:extend{ { name = "ff-offshore-storage-tank", type = "recipe", - category = "crafting", + categories = { "crafting" }, energy_required = 2, - ingredients = - { - {type="item", name="iron-plate", amount=25}, - {type="item", name="steel-plate", amount=40}, - {type="item", name="storage-tank", amount=2}, + ingredients = { + { type = "item", name = "iron-plate", amount = 25 }, + { type = "item", name = "steel-plate", amount = 40 }, + { type = "item", name = "storage-tank", amount = 2 } }, - results = {{type="item", name="ff-offshore-storage-tank", amount=1}}, - enabled = false, + results = { { type = "item", name = "ff-offshore-storage-tank", amount = 1 } }, + enabled = false --always_show_made_in = true, --main_product = "ff-offshore-storage-tank", }, @@ -72,52 +71,48 @@ data:extend{ type = "storage-tank", icon = "__FreightForwarding__/graphics/item/offshore-tank.png", icon_size = 64, - flags = {"placeable-neutral", "player-creation"}, - minable = {mining_time = 0.5, result = "ff-offshore-storage-tank"}, + flags = { "placeable-neutral", "player-creation" }, + minable = { mining_time = 0.5, result = "ff-offshore-storage-tank" }, max_health = 500, corpse = "big-remnants", - collision_box = {{-2.4, -2.4}, {2.4, 2.4}}, - selection_box = {{-2.5, -2.5}, {2.5, 2.5}}, + collision_box = { { -2.4, -2.4 }, { 2.4, 2.4 } }, + selection_box = { { -2.5, -2.5 }, { 2.5, 2.5 } }, --collision_mask = table.deepcopy(data.raw["pipe"]["storage-tank"].collision_mask), - collision_mask = {layers={ground_tile=true, object=true}}, -- Fixed in data-final-fixes + collision_mask = { layers = { ground_tile = true, object = true } }, -- Fixed in data-final-fixes circuit_wire_connection_points = circuit_connector_definitions["storage-tank"].points, circuit_connector_sprites = circuit_connector_definitions["storage-tank"].sprites, circuit_wire_max_distance = 20, flow_length_in_ticks = 1, map_color = data.raw["storage-tank"]["storage-tank"].map_color, - window_bounding_box = {{0,0},{1,1}}, + window_bounding_box = { { 0, 0 }, { 1, 1 } }, fluid_box = { volume = 100000, pipe_covers = pipecoverspictures(), pipe_picture = ei_tank_1, - pipe_connections = - { - { flow_direction = "input-output", direction = defines.direction.north, position = {0, -2} }, - { flow_direction = "input-output", direction = defines.direction.south, position = {0, 2} }, - { flow_direction = "input-output", direction = defines.direction.west, position = {-2, 0} }, - { flow_direction = "input-output", direction = defines.direction.east, position = {2, 0} }, + pipe_connections = { + { flow_direction = "input-output", direction = defines.direction.north, position = { 0, -2 } }, + { flow_direction = "input-output", direction = defines.direction.south, position = { 0, 2 } }, + { flow_direction = "input-output", direction = defines.direction.west, position = { -2, 0 } }, + { flow_direction = "input-output", direction = defines.direction.east, position = { 2, 0 } } }, - production_type = "input-output", + production_type = "input-output" }, pictures = { picture = { filename = "__FreightForwarding__/graphics/offshore-tank.png", - size = {512, 512}, - shift = {0, 0}, - scale = 0.35*2, + size = { 512, 512 }, + shift = { 0, 0 }, + scale = 0.35 * 2 }, window_background = util.empty_sprite(), fluid_background = util.empty_sprite(), flow_sprite = util.empty_sprite(), - gas_flow = util.empty_sprite(), + gas_flow = util.empty_sprite() } } } - -table.insert(data.raw["technology"]["tank_ship"].effects, 3, - { - type = "unlock-recipe", - recipe = "ff-offshore-storage-tank" - } -) \ No newline at end of file +table.insert(data.raw["technology"]["tank_ship"].effects, 3, { + type = "unlock-recipe", + recipe = "ff-offshore-storage-tank" +}) diff --git a/prototypes/remove_hr_version.lua b/prototypes/remove_hr_version.lua deleted file mode 100644 index fcc0b31..0000000 --- a/prototypes/remove_hr_version.lua +++ /dev/null @@ -1,98 +0,0 @@ --- process_lua.lua -local mlc = require("metalua.compiler").new() - --- Function to check if a table contains 'filename' and 'hr_version' keys -local function has_filename_and_hr_version(table_node) - if table_node.tag ~= 'Table' then return false end - local has_filename = false - local has_hr_version = false - for _, field in ipairs(table_node) do - if field.tag == 'Pair' then - local key = field[1] - if key.tag == 'String' and key[1] == 'filename' then - has_filename = true - elseif key.tag == 'String' and key[1] == 'hr_version' then - has_hr_version = true - end - end - end - return has_filename and has_hr_version -end - --- Recursive function to process the AST nodes -local function process_node(node) - if type(node) ~= 'table' then return end - - -- Check if the node is a table constructor with 'filename' and 'hr_version' - if has_filename_and_hr_version(node) then - local hr_version_value = nil - -- Find the 'hr_version' field - for _, field in ipairs(node) do - if field.tag == 'Pair' then - local key = field[1] - local value = field[2] - if key.tag == 'String' and key[1] == 'hr_version' then - hr_version_value = value - break - end - end - end - - if hr_version_value and hr_version_value.tag == 'Table' then - -- Replace the current table's fields with those from 'hr_version' - -- Clear the current table fields - for i = #node, 1, -1 do - table.remove(node, i) - end - -- Copy fields from 'hr_version' table - for _, field in ipairs(hr_version_value) do - table.insert(node, field) - end - end - else - -- Recurse into child nodes - for _, child in pairs(node) do - process_node(child) - end - end -end - --- Function to process a single Lua file -local function process_file(file_name) - local input_file = io.open(file_name, "r") - if not input_file then - print("Could not open file: " .. file_name) - return - end - local code = input_file:read("*all") - input_file:close() - - -- Parse the code into an AST - local ast = mlc:src_to_ast(code) - - -- Process the AST - process_node(ast) - - -- Convert the AST back to Lua code - local new_code = mlc:ast_to_src(ast) - - -- Write the modified code back to the file - local output_file = io.open(file_name, "w") - if not output_file then - print("Could not write to file: " .. file_name) - return - end - output_file:write(new_code) - output_file:close() - - print("Processed file: " .. file_name) -end - --- Main script execution -local lfs = require("lfs") - -for file in lfs.dir(".") do - if file:match("dredg%.lua$") then - process_file(file) - end -end diff --git a/prototypes/seamount.lua b/prototypes/seamount.lua index aa0ad4a..1aa94d0 100644 --- a/prototypes/seamount.lua +++ b/prototypes/seamount.lua @@ -64,18 +64,7 @@ data:extend{ frame_count = 1, variation_count = 1, scale = 0.6, - tint = {a=0.3, r=0.2,g=0.2,b=0.2}, - hr_version = - { - filename = "__FreightForwarding__/graphics/seamount.png", - priority = "extra-high", - width = 200, - height = 200, - frame_count = 1, - variation_count = 1, - tint = {a=0.3, r=0.2,g=0.2,b=0.2}, - scale = 0.6 - } + tint = {a=0.3, r=0.2,g=0.2,b=0.2} } }, map_color = {0, 0.6, 0.4}, diff --git a/prototypes/seismic-scanner.lua b/prototypes/seismic-scanner.lua index 1b805f3..6bec3a4 100644 --- a/prototypes/seismic-scanner.lua +++ b/prototypes/seismic-scanner.lua @@ -91,42 +91,23 @@ data:extend{ layers = { { - filename = "__FreightForwarding__/graphics/seismic-scanner/hr-hole.png", + filename = "__FreightForwarding__/graphics/seismic-scanner/hole.png", priority = "extra-high", width = 322, height = 300, scale = 0.5 * 3/4, variation_count = 1, - shift = {0.25, -0.5}, - hr_version = { - filename = "__FreightForwarding__/graphics/seismic-scanner/hr-hole.png", - priority = "extra-high", - width = 322, - height = 300, - scale = 0.5 * 3/4, - variation_count = 1, - shift = {0.25, -0.5}, - } + shift = {0.25, -0.5} }, { - filename = "__FreightForwarding__/graphics/seismic-scanner/hr-hole-front.png", + filename = "__FreightForwarding__/graphics/seismic-scanner/hole-front.png", priority = "extra-high", animation_speed = 0.5, width = 322, height = 300, scale = 0.5 * 3/4, direction_count = 1, - shift = {0.25, -0.5}, - hr_version = { - filename = "__FreightForwarding__/graphics/seismic-scanner/hr-hole-front.png", - priority = "extra-high", - animation_speed = 0.5, - width = 322, - height = 300, - scale = 0.5 * 3/4, - direction_count = 1, - shift = {0.25, -0.5}, - } + shift = {0.25, -0.5} }, }, }, @@ -135,7 +116,7 @@ data:extend{ { layers = { { - filename = "__FreightForwarding__/graphics/seismic-scanner/hr-center.png", + filename = "__FreightForwarding__/graphics/seismic-scanner/center.png", priority = "high", animation_speed = 0.5, line_length = 8, @@ -147,21 +128,10 @@ data:extend{ width = 139, height = 246, scale = 0.5 * 1.5, - shift = {-0.1 + shift.x, 0 + shift.y}, - hr_version = { - filename = "__FreightForwarding__/graphics/seismic-scanner/hr-center.png", - priority = "high", - line_length = 8, - animation_speed = 0.5, - direction_count = 64, - width = 139, - height = 246, - scale = 0.5 * 1.5, - shift = {-0.1 + shift.x, 0 + shift.y}, - } + shift = {-0.1 + shift.x, 0 + shift.y} }, { - filename = "__FreightForwarding__/graphics/seismic-scanner/hr-center-shadow.png", + filename = "__FreightForwarding__/graphics/seismic-scanner/center-shadow.png", draw_as_shadow = true, priority = "high", line_length = 8, @@ -173,18 +143,7 @@ data:extend{ width = 163, height = 123, scale = 0.5 * 1.4, - shift = {1.5 + shift.x, 0 + shift.y}, - hr_version = { - filename = "__FreightForwarding__/graphics/seismic-scanner/hr-center-shadow.png", - draw_as_shadow = true, - priority = "high", - line_length = 8, - direction_count = 64, - width = 163, - height = 123, - scale = 0.5 * 1.4, - shift = {1.5 + shift.x, 0 + shift.y}, - } + shift = {1.5 + shift.x, 0 + shift.y} }, } }, diff --git a/prototypes/slag.lua b/prototypes/slag.lua index 57baade..698bd51 100644 --- a/prototypes/slag.lua +++ b/prototypes/slag.lua @@ -1,11 +1,10 @@ -data:extend{ +data:extend { { type = "item", name = "ff-slag", icon = "__FreightForwarding__/graphics/slag/hot-slag.png", icon_size = 64, - pictures = - { + pictures = { { layers = { { @@ -81,57 +80,53 @@ data:extend{ size = 64 } } - }, - + } }, subgroup = "raw-resource", order = "z", stack_size = 1, - ic_create_container = false, + ic_create_container = false }, { type = "recipe", name = "ff-slag-leaching", - category = "chemistry", + categories = { "chemistry" }, enabled = false, - icons = - { + icons = { { - icon = "__FreightForwarding__/graphics/slag/hot-slag.png", + icon = "__FreightForwarding__/graphics/slag/hot-slag.png" }, { icon = "__base__/graphics/icons/iron-ore.png", scale = 0.5, - shift = {8, 8}, - draw_background = true, + shift = { 8, 8 }, + draw_background = true }, { icon = "__base__/graphics/icons/stone.png", scale = 0.5, - shift = {-8, 8}, - draw_background = true, - }, + shift = { -8, 8 }, + draw_background = true + } }, icon_size = 64, ingredients = { - {type = "item", name = "ff-slag", amount = 8}, - {type = "fluid", name = "sulfuric-acid", amount = 10}, + { type = "item", name = "ff-slag", amount = 8 }, + { type = "fluid", name = "sulfuric-acid", amount = 10 } }, results = { - {type = "item", name = "ff-slag", amount_min = 0, amount_max = 4}, - {type = "item", name = "stone", amount = 1, probability = 0.25}, - {type = "item", name = "iron-ore", amount = 1, probability = 0.25}, + { type = "item", name = "ff-slag", amount_min = 0, amount_max = 4 }, + { type = "item", name = "stone", amount = 1, independent_probability = 0.25 }, + { type = "item", name = "iron-ore", amount = 1, independent_probability = 0.25 } }, subgroup = "raw-material", order = "e[titansteel-plate]-d", - energy_required = 10, -- 3 lava pools : 5 chemical plants - crafting_machine_tint = -- Taken from base game's sulfuric acid recipe - { - primary = {r = 1.000, g = 0.958, b = 0.000, a = 1.000}, -- #fff400ff - secondary = {r = 1.000, g = 0.852, b = 0.172, a = 1.000}, -- #ffd92bff - tertiary = {r = 0.876, g = 0.869, b = 0.597, a = 1.000}, -- #dfdd98ff - quaternary = {r = 0.969, g = 1.000, b = 0.019, a = 1.000}, -- #f7ff04ff - } - - }, -} \ No newline at end of file + energy_required = 10, -- 3 lava pools : 5 chemical plants + crafting_machine_tint = { + primary = { r = 1.000, g = 0.958, b = 0.000, a = 1.000 }, -- #fff400ff + secondary = { r = 1.000, g = 0.852, b = 0.172, a = 1.000 }, -- #ffd92bff + tertiary = { r = 0.876, g = 0.869, b = 0.597, a = 1.000 }, -- #dfdd98ff + quaternary = { r = 0.969, g = 1.000, b = 0.019, a = 1.000 } -- #f7ff04ff + } -- Taken from base game's sulfuric acid recipe + } +} diff --git a/prototypes/sonar-buoy.lua b/prototypes/sonar-buoy.lua index 5c810ad..37e57a0 100644 --- a/prototypes/sonar-buoy.lua +++ b/prototypes/sonar-buoy.lua @@ -127,46 +127,24 @@ data:extend({ apply_projection = false, priority = "low", line_length = 8, - width = 98, - height = 128, + width = 196, + height = 254, + scale = 0.5, direction_count = 64, shift = { 0.03125, -0.5 }, tint = { r = 0.0, g = 0.8, b = 0.8, a = 1.0 }, - hr_version = { - filename = "__base__/graphics/entity/radar/hr-radar.png", - apply_projection = false, - priority = "low", - line_length = 8, - width = 196, - height = 254, - scale = 0.5, - direction_count = 64, - shift = { 0.03125, -0.5 }, - tint = { r = 0.0, g = 0.8, b = 0.8, a = 1.0 }, - }, }, { filename = "__base__/graphics/entity/radar/radar-shadow.png", apply_projection = false, priority = "low", line_length = 8, - width = 172, - height = 94, + width = 336, + height = 170, + scale = 0.5, direction_count = 64, draw_as_shadow = true, - shift = { 1.21875, 0.09375 }, - hr_version = { - filename = "__base__/graphics/entity/radar/hr-radar-shadow.png", - apply_projection = false, - priority = "low", - line_length = 8, - width = 343, - height = 186, - scale = 0.5, - direction_count = 64, - draw_as_shadow = true, - shift = { 1.2265625, 0.09375 }, - }, + shift = { 1.2265625, 0.09375 }, }, }, }, diff --git a/prototypes/titansteel.lua b/prototypes/titansteel.lua index 61d755a..5cf34dd 100644 --- a/prototypes/titansteel.lua +++ b/prototypes/titansteel.lua @@ -1,11 +1,11 @@ -data:extend{ +data:extend { { type = "recipe-category", - name = "ff-lava-smelting", -- Big lava pool + name = "ff-lava-smelting" -- Big lava pool }, { type = "recipe-category", - name = "ff-lava-heating", -- Small lava pool + name = "ff-lava-heating" -- Small lava pool }, { type = "technology", @@ -15,10 +15,9 @@ data:extend{ icon = "__base__/graphics/technology/steel-processing.png", icon_size = 256, tint = { b = 0.4, g = 0.4, r = 0.4 } - }, + } }, - effects = - { + effects = { { type = "unlock-recipe", recipe = "ff-hot-titansteel-plate" @@ -40,18 +39,16 @@ data:extend{ recipe = "ff-water-condensing" } }, - prerequisites = {"production-science-pack", "utility-science-pack", "ff-cobalt-processing"}, - unit = - { + prerequisites = { "production-science-pack", "utility-science-pack", "ff-cobalt-processing" }, + unit = { count = 1000, - ingredients = - { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"production-science-pack", 1}, - {"utility-science-pack", 1} + ingredients = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "production-science-pack", 1 }, + { "utility-science-pack", 1 } }, time = 60 }, @@ -60,21 +57,21 @@ data:extend{ { type = "recipe", name = "ff-hot-titansteel-plate", - category = "ff-lava-smelting", + categories = { "ff-lava-smelting" }, enabled = false, main_product = "ff-hot-titansteel-plate", ingredients = { - {type = "item", name = "steel-plate", amount = 1}, - {type = "item", name = "titanium-plate", amount = 1}, - {type = "item", name = "ff-cobalt-ingot", amount = 1}, + { type = "item", name = "steel-plate", amount = 1 }, + { type = "item", name = "titanium-plate", amount = 1 }, + { type = "item", name = "ff-cobalt-ingot", amount = 1 } }, results = { - {type = "item", name = "ff-hot-titansteel-plate", amount = 1}, - {type = "item", name = "ff-slag", amount = 15}, + { type = "item", name = "ff-hot-titansteel-plate", amount = 1 }, + { type = "item", name = "ff-slag", amount = 15 } }, energy_required = 15, always_show_made_in = true, - order = "e[titansteel-plate]-a", + order = "e[titansteel-plate]-a" }, { type = "recipe", @@ -82,69 +79,69 @@ data:extend{ icons = { { icon = "__FreightForwarding__/graphics/hot-titansteel.png", - icon_size = 64, + icon_size = 64 }, { icon = "__base__/graphics/icons/steel-plate.png", tint = { b = 0.32, g = 0.32, r = 0.32 }, icon_size = 64, scale = 0.32, - shift = {-8, -8}, - draw_background = true, - }, + shift = { -8, -8 }, + draw_background = true + } }, - category = "ff-lava-heating", + categories = { "ff-lava-heating" }, enabled = false, main_product = "ff-hot-titansteel-plate", ingredients = { - {type = "item", name = "ff-titansteel-plate", amount = 1}, + { type = "item", name = "ff-titansteel-plate", amount = 1 } }, results = { - {type = "item", name = "ff-hot-titansteel-plate", amount = 1, probability = 0.99}, - {type = "item", name = "ff-slag", amount = 3}, + { type = "item", name = "ff-hot-titansteel-plate", amount = 1, independent_probability = 0.99 }, + { type = "item", name = "ff-slag", amount = 3 } }, energy_required = 3, always_show_made_in = true, show_amount_in_title = false, always_show_products = true, - order = "e[titansteel-plate]-b", + order = "e[titansteel-plate]-b" }, { type = "recipe", name = "ff-titansteel-plate", - category = "chemistry", + categories = { "chemistry" }, main_product = "ff-titansteel-plate", enabled = false, ingredients = { - {type = "item", name = "ff-hot-titansteel-plate", amount = 1}, - {type = "fluid", name = "water", amount = 400}, + { type = "item", name = "ff-hot-titansteel-plate", amount = 1 }, + { type = "fluid", name = "water", amount = 400 } }, results = { - {type = "item", name = "ff-titansteel-plate", amount = 1}, - {type = "fluid", name = "steam", amount = 400, temperature = 500}, + { type = "item", name = "ff-titansteel-plate", amount = 1 }, + { type = "fluid", name = "steam", amount = 400, temperature = 500 } }, - energy_required = 10, -- 3 lava pools : 2 chemical plants + energy_required = 10 -- 3 lava pools : 2 chemical plants }, { type = "recipe", name = "ff-water-condensing", - localised_name = {"recipe-name.ff-water-condensing"}, - category = "chemistry", + localised_name = { "recipe-name.ff-water-condensing" }, + categories = { "chemistry" }, subgroup = "fluid-recipes", order = "g[steam]", main_product = "water", enabled = false, ingredients = { - {type = "fluid", name = "water", amount = 50}, - {type = "fluid", name = "steam", amount = 150}, + { type = "fluid", name = "water", amount = 50 }, + { type = "fluid", name = "steam", amount = 150 } }, results = { - {type = "fluid", name = "water", amount = 190}, + { type = "fluid", name = "water", amount = 190 } }, energy_required = 6, allow_decomposition = false, show_amount_in_title = false, - always_show_products = true, + always_show_products = true }, { type = "item", @@ -173,7 +170,7 @@ data:extend{ subgroup = "raw-material", order = "e[titansteel-plate]-a", stack_size = 1, - ic_create_container = false, + ic_create_container = false }, { type = "item", @@ -183,31 +180,30 @@ data:extend{ { icon = "__base__/graphics/icons/steel-plate.png", tint = { b = 0.32, g = 0.32, r = 0.32 } - }, + } }, icon_size = 64, subgroup = "raw-material", order = "e[titansteel-plate]-c", - stack_size = 30 -- Will be halved in stack-sizes.lua + stack_size = 30 -- Will be halved in stack-sizes.lua }, { type = "recipe", name = "ff-rocket-frame", - category = "crafting-with-fluid", + categories = { "crafting-with-fluid" }, energy_required = 15, enabled = false, - ingredients = - { - {type="item", name="low-density-structure", amount=1}, - {type="item", name="ff-titansteel-plate", amount=1}, - {type = "fluid", name = "lubricant", amount = 200}, + ingredients = { + { type = "item", name = "low-density-structure", amount = 1 }, + { type = "item", name = "ff-titansteel-plate", amount = 1 }, + { type = "fluid", name = "lubricant", amount = 200 } }, results = { - {type = "item", name = "ff-rocket-frame", amount = 1}, - {type = "fluid", name = "lubricant", amount = 180}, + { type = "item", name = "ff-rocket-frame", amount = 1 }, + { type = "fluid", name = "lubricant", amount = 180 } }, main_product = "ff-rocket-frame", - allow_productivity = true, + allow_productivity = true }, { type = "item", @@ -217,7 +213,7 @@ data:extend{ subgroup = "intermediate-product", order = "p[rocket-frame]", stack_size = 10 - }, + } } x_util.add_unlock("rocket-silo", "ff-rocket-frame") diff --git a/prototypes/underwater-pipe.lua b/prototypes/underwater-pipe.lua index d0f5f57..35f0b9a 100644 --- a/prototypes/underwater-pipe.lua +++ b/prototypes/underwater-pipe.lua @@ -26,9 +26,6 @@ local function underwater_hint(sprites, tint, depth) underwater_hint(sprite.layers, tint, depth) else sprite.tint = tint - if sprite.hr_version then - sprite.hr_version.tint = tint - end sprite.shift = sprite.shift or {0,0} sprite.shift[2] = sprite.shift[2] + depth end diff --git a/thumbnail.png b/thumbnail.png index 765b1d2..5a7e196 100644 Binary files a/thumbnail.png and b/thumbnail.png differ