Remove option TRADESHIPS, customize table ship-chr instead

Trade ships are now enabled when a ship type with capability trade
exists.  No such type exists by default; to enable trade ships,
deities have to customize table ship-chr.

Before, trade ship types were ignored when option TRADESHIPS was
disabled.  Except for xdump ship-chr, which happily dumped unusable
trade ship types.
This commit is contained in:
Markus Armbruster 2011-05-22 16:49:17 +02:00
parent c4254764bf
commit 352bc320d2
19 changed files with 32 additions and 41 deletions

View file

@ -238,9 +238,9 @@ RAILWAYS and rollover_avail. Options SHOWPLANE, SHIPNAMES, NEWPOWER,
NEW_STARVE, NEW_WORK, ORBIT and PLANENAMES are no longer configurable.
Options NUKEFAILDETONATE, SLOW_WAR, SNEAK_ATTACK, FUEL, GRAB_THINGS
and SHIP_DECAY are gone. Options PINPOINTMISSILE, DEMANDUPDATE,
UPDATESCHED, DRNUKE, NONUKES, NEUTRON, BIG_CITY, DEFENSE_INFRA,
NO_LCMS, NO_HCMS and NO_OIL got replaced by more flexible
configuration.
UPDATESCHED, DRNUKE, TRADESHIPS, NONUKES, NEUTRON, BIG_CITY,
DEFENSE_INFRA, NO_LCMS, NO_HCMS and NO_OIL
got replaced by more flexible configuration.
The xdump command lets client writers access more game more easily.

View file

@ -12,7 +12,6 @@ EASY_BRIDGES: bridges can be built from any sector
SUPER_BARS: gold bars aren't destroyed by shelling or bombing
ALL_BLEED: you get tech bleed from all countries, not just allies
NOMOBCOST: ships pay 0 mob to fire. Subs pay 1/2 a sect's movement cost
TRADESHIPS: you can build/nav/scuttle trade ships to make money
RES_POP: Research affects max sector population.
NOFOOD: No food is required.
BLITZ: Players get infinite BTU's.

View file

@ -256,7 +256,7 @@ The vessel can be used as a semi-landing craft. (see info assault)
.L sub-torp
The vessel can torpedo submarines
.L trade
The vessel is a trade ship. (only if TRADESHIPS are enabled)
The vessel is a trade ship.
.L supply
The vessel can supply other units.
Unless the vessel is a submarine, it can load non-light land units.

View file

@ -2,7 +2,7 @@
.NA Trade-ships "How to use trade ships"
.LV Basic
Trade ships are special ships, with a different function than most Empire
ships. They are in the game only if the TRADESHIPS option is enabled.
ships. They are in the game only if the deity enabled them.
.s1
Trade ships simulate internal or external trade. In the real world, countries
make goods that they can make cheaply, ship them somewhere they're expensive,

View file

@ -35,6 +35,4 @@ shp# ship type orig x,y x,y dist $$
1 ship
.FI
.s1
Note that this command is only enabled if the TRADESHIPS option is in use.
.s1
.SA "Trade-ships, sonar, torpedo, upgrade, Ships"

View file

@ -13,7 +13,7 @@ be transferred to land (if a unit, or if the ship is in a harbor), or will die
.s1
Units on ships may not be scuttled.
.s1
Scuttling trade-ships (if the TRADESHIPS option is enabled) has other effects.
Scuttling trade-ships has other effects.
See info Trade-ships.
.s1
.SA "scrap, Trade-ships, build, ship, plane, land, Ships, Planes, LandUnits"

View file

@ -81,7 +81,7 @@ Options enabled in this game:
Options disabled in this game:
AUTO_POWER, BRIDGETOWERS, GO_RENEW, GUINEA_PIGS, HIDDEN, LOANS,
LOSE_CONTACT, MARKET, MOB_ACCESS, NO_FORT_FIRE, RES_POP, SUPER_BARS,
TECH_POP, TRADESHIPS
TECH_POP
See "info Options" for a detailed list of options and descriptions.