Skip to content

Commit

Permalink
Remove ships tip in favour of the one provided by Cargo Ships
Browse files Browse the repository at this point in the history
  • Loading branch information
tburrows13 committed Jun 19, 2023
1 parent b6b3bbb commit c339e0a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
1 change: 0 additions & 1 deletion locale/en/FreightForwarding.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ freight-forwarding=Welcome to Freight Forwarding!\n\nYou must launch an [item=ff
ff-containerization=Containers are a new way to transport items.\nItems are loaded onto containers in a [entity=ic-containerization-machine-1]. Each container can hold 20 stacks of that item. Trains and ships have extremely low inventory sizes, so containerizing cargo before transport is essential. If an item cannot be containerized, then that is a hint that you should process it where it is rather than loading it onto trains and ships.
ff-container-limits=Containers cannot be carried by bots. There are some ways to get this to happen, but they shouldn't be used and may get patched out in future updates.\n\nSpidertrons and aircraft can carry empty containers, but not loaded ones.
ff-water-types=There are three types of water: shallow, regular, and deep water.\n\nPlayers, vehicles, and aliens can all traverse shallow water. Shallow water can be created using [item=waterfill-item].\nLandfill and train bridges can only be placed on shallow or regular water. Landfill can be removed by __ALT_CONTROL__2__mine__ on it with a tile in hand.\nDeep water contains offshore oil and seamounts, and can only be traversed by ships, hovercrafts, and aircraft.
ff-ships=Ships are placed on [entity=straight-water-way].\n[item=boat] can be placed on waterways or independently, so that it can be driven like a car.
ff-oil=Oil can only be obtained from offshore oil deposits. Each tanker ship can be loaded with up to three [entity=pump]. Hold a pump in hand to see the valid placement positions.\nPumping directly from oil rig to tanker ship is much faster than pumping from underwater pipes.
ff-power=There is no way to transfer electricity over oceans using electric poles. Instead, you must set up individual power generation on each island, or store electricity in [item=ff-charged-battery] using a [entity=ff-charging-station], and transport them by ship or aircraft.
ff-dredging=Dredging platforms can be placed over seamounts.\nDredging for [item=ff-ferrous-nodule] and [item=ff-cupric-nodule] allows infinite production of [item=iron-ore], [item=copper-ore], and [item=stone], to supplement regular resource production.\nDredging for [item=ff-cobalt-crust] allows infinite production of [item=ff-cobalt-ore], which doesn't spawn elsewhere.\nNodules and crusts have low stack sizes and cannot be loaded into containers, so processing them into ores on the dredging platform itself is recommended.\n\nUnderground belts cannot be placed on dredging platforms.
20 changes: 10 additions & 10 deletions prototypes/tips-and-tricks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,7 @@ data:extend{
order = "d",
--trigger = {type = "build-entity", entity = "spidertron", match_type_only = true},
},
{
type = "tips-and-tricks-item",
name = "ff-ships",
tag = "[entity=cargo_ship]",
category = "freight-forwarding",
indent = 1,
order = "e",
--trigger = {type = "build-entity", entity = "spidertron", match_type_only = true},
},
-- Cargo ships tip fits in here, see below
{
type = "tips-and-tricks-item",
name = "ff-oil",
Expand Down Expand Up @@ -203,4 +195,12 @@ data:extend{
order = "h",
--trigger = {type = "build-entity", entity = "spidertron", match_type_only = true},
},]]
}
}

-- Convert cargo ships tip to fit in with the rest
local ships_tip = data.raw["tips-and-tricks-item"]["cargo-ships"]
ships_tip.category = "freight-forwarding"
ships_tip.tag = "[entity=cargo_ship]"
ships_tip.indent = 1
ships_tip.order = "e"
ships_tip.is_title = false

0 comments on commit c339e0a

Please sign in to comment.