pioneerspacesim/pioneer — pull request #3267 by impaktor (2014-12-03 11:08:34+00:00)
Title: Two in one!

## Kill off individual scoop slots ##

This PR moves the `cargo_scoop` and `fuel_scoop` slots into a single `scoop` slot. All ships have been updated to the sum of what they had. Thus, some have `scoop=0`,`1` or `2`. So this moves control of fitting the ship from the `.json` file to the player, who can now decide if they want a fuel scoop or cargo scoop. Default is `scoop=2` (sum of previous defaults).

__Note:__ There is no check made to prevent players from buying two scoops of the same kind.
__Idea:__ We could even have a feature, that two fuel scoops scoop twice as fast. For cargo scoop I don't see how to make a similar benefit of multiple of same kind.

## New Multi Scoop equipment ##

This new equipment combines cargo scoop with fuel scoop, and costs quite a bunch (12000). But the benefit is it takes 4t less space/mass (7+6-4)t. (cargo and fuel scoop costs 3500 + 3900)

__Question:__ Should the ship info (and ship market info) say "Scoop: 2" or "Scoop slots: 2"? Or "Max scoops: 2"? It's the former now.

## Something I noticed ##

1. By the way, very many ships had `cargoscoop` instead of `cargo_scoop` (and same for `fuel`). Mostly they had the default values anyway, so probably not noticeable for most ships.

2. Kanara only had one scoop slot defined (to 0). I put `scoop=0` for now. ping @nozmajner.