empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove option TRADESHIPS, customize table ship-chr instead

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/global/constants.c
View file

@ -195,7 +195,7 @@ float drnuke_const = 0.0; /* research must be at least drnuke_const*tech */
* drnuke_const is .25, you need a 75 res to
* build a nuke that takes 300 tech
*/
/* opt_TRADESHIPS */
/* trade ships */
int trade_1_dist = 8; /* less than this gets no money */
int trade_2_dist = 14; /* less than this gets trade_1 money */
int trade_3_dist = 25; /* less than this gets trade_2 money */
@ -204,7 +204,6 @@ float trade_2 = 0.035; /* return on trade_2 distance */
float trade_3 = 0.050; /* return on trade_3 distance */
float trade_ally_bonus = 0.20; /* 20% bonus for trading with allies */
float trade_ally_cut = 0.10; /* 10% bonus for ally you trade with */
/* end opt_TRADESHIPS */
int torpedo_damage = 40; /* damage is X + 1dX + 1dX, so 40+1d40+1d40 */

1
src/lib/global/options.c
View file

@ -60,5 +60,4 @@ int opt_RES_POP = 0;
int opt_SAIL = 1;
int opt_SUPER_BARS = 0;
int opt_TECH_POP = 0;
int opt_TRADESHIPS = 0;
int opt_TREATIES = 1;

7
src/lib/global/ship.config
View file

@ -54,7 +54,8 @@ type name l_b h_b tech cost ...
2 "cs cargo ship" 60 40 20 500
3 "os ore ship" 60 40 20 500
4 "ss slave ship" 60 40 0 300
5 "ts trade ship" 200 100 30 1750
# Uncomment to enable trade ships
# 5 "ts trade ship" 200 100 30 1750
6 "frg frigate" 30 30 0 600
7 "oe oil exploration boat" 25 15 40 800
8 "od oil derrick" 60 60 50 1500
@ -95,7 +96,7 @@ type name arm spe vis vrn frn gli nla npl nch nxl ...
2 "cs cargo ship" 20 25 35 3 0 0 2 0 0 1
3 "os ore ship" 20 25 35 3 0 0 0 0 0 1
4 "ss slave ship" 20 10 35 3 0 0 0 0 0 1
5 "ts trade ship" 20 25 35 3 0 0 0 0 0 1
# 5 "ts trade ship" 20 25 35 3 0 0 0 0 0 1
6 "frg frigate" 50 25 25 3 1 1 2 0 0 1
7 "oe oil exploration boat" 10 25 15 2 0 0 0 0 0 0
8 "od oil derrick" 30 15 65 3 0 0 0 0 0 2
@ -136,7 +137,7 @@ type name civ mil she gun pet iro dus bar foo oil lcm hcm
2 "cs cargo ship" 600 50 300 50 0 0 0 0 900 0 1400 900 250 0 (supply)
3 "os ore ship" 30 5 0 0 0 990 990 0 200 0 0 0 45 990 ()
4 "ss slave ship" 20 80 0 0 0 0 0 0 200 0 0 0 1200 0 ()
5 "ts trade ship" 50 50 0 0 0 0 0 0 100 0 0 0 0 0 (trade)
# 5 "ts trade ship" 50 50 0 0 0 0 0 0 100 0 0 0 0 0 (trade)
6 "frg frigate" 0 60 10 2 0 0 0 0 60 0 0 0 0 0 (semi-land)
7 "oe oil exploration boat" 10 5 0 0 0 0 0 0 100 1 0 0 0 0 (oil canal)
8 "od oil derrick" 990 80 0 0 0 0 0 0 990 990 0 0 990 0 (oil)