Skip to content

Update data-final-fixes.lua #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cbow2018 wants to merge 2 commits into
base: V2.1support
Choose a base branch
from
Open

Update data-final-fixes.lua #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e1d761
Update data-final-fixes.lua
Cbow2018 Jul 14, 2026
f97e561
Move next_upgrade clearing to data stage per review.
Cbow2018 Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data-final-fixes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ for _, character in pairs(data.raw.character) do
character.collision_mask = collision_mask
end
end

6 changes: 6 additions & 0 deletions prototypes/ships.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ indep_boat.corpse = nil
local boat_max_speed = 0.27*speed_modifier

local boat = table.deepcopy(data.raw["cargo-wagon"]["cargo-wagon"])
boat.next_upgrade = nil
boat.name = "boat"
boat.icons = {{icon=GRAPHICSPATH .. "icons/boat.png", icon_size = 64}}
boat.icon = nil
Expand Down Expand Up @@ -492,7 +493,9 @@ boat.corpse = nil

local boat_engine_power = 300 + (speed_modifier -1) * 150


local boat_engine = table.deepcopy(data.raw["locomotive"]["locomotive"])
boat_engine.next_upgrade = nil
boat_engine.name = "boat_engine"
boat_engine.flags = {"placeable-neutral",
"placeable-off-grid",
Expand Down Expand Up @@ -578,6 +581,7 @@ local cargo_ship_capacity = settings.startup["cargo_ship_capacity"].value
local ship_max_speed = 0.15 * speed_modifier

local cargo_ship = table.deepcopy(data.raw["cargo-wagon"]["cargo-wagon"])
cargo_ship.next_upgrade = nil
cargo_ship.name = "cargo_ship"
cargo_ship.icons = {{icon=GRAPHICSPATH .. "icons/cargoship_icon.png", icon_size = 64}}
cargo_ship.icon = nil
Expand Down Expand Up @@ -649,6 +653,7 @@ cargo_ship.corpse = nil
local tanker_capacity = settings.startup["tanker_capacity"].value

local oil_tanker = table.deepcopy(data.raw["fluid-wagon"]["fluid-wagon"])
oil_tanker.next_upgrade = nil
oil_tanker.name = "oil_tanker"
oil_tanker.icon = GRAPHICSPATH .. "icons/tanker.png"
oil_tanker.icon_size = 64
Expand Down Expand Up @@ -701,6 +706,7 @@ oil_tanker.connection_category = "ship_pump"
local cargo_ship_engine_power = 2000 + (speed_modifier-1)*1200

local cargo_ship_engine = table.deepcopy(data.raw["locomotive"]["locomotive"])
cargo_ship_engine.next_upgrade = nil
cargo_ship_engine.name = "cargo_ship_engine"
cargo_ship_engine.minable = {mining_time = 1, result = nil}
cargo_ship_engine.flags = {"placeable-neutral",
Expand Down