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

Require friendly relations for trade ship to pay off

Browse source
This commit is contained in:
Markus Armbruster 2008-09-13 18:05:58 -04:00
parent faca0eeac5
commit 3318e4e4e5
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
info/Trade-ships.t
View file

@ -12,8 +12,8 @@ In the empire version, you make a trade ship, using lots of cm's, and costing
$2500. You then sail it to a harbor somewhere and scuttle it. You then receive $2500. You then sail it to a harbor somewhere and scuttle it. You then receive
money, with a varying rate of return. money, with a varying rate of return.
.s1 .s1
The trade ship MUST be scuttled in a harbor that is at least 2% efficient to The trade ship MUST be scuttled in a friendly harbor that is at least
make money. (In other sectors, 2% efficient to make money. (In other sectors,
it sinks quietly, like most ships) You may scuttle it in either a harbor you it sinks quietly, like most ships) You may scuttle it in either a harbor you
own, or the harbor of an ally. Pirates who capture a trade ship may also gain own, or the harbor of an ally. Pirates who capture a trade ship may also gain
money from it, just as if they were the lawful owner (although the news knows money from it, just as if they were the lawful owner (although the news knows

3
src/lib/commands/scut.c
View file

@ -165,7 +165,8 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
mp = &mchr[(int)sp->shp_type]; mp = &mchr[(int)sp->shp_type];
getsect(sp->shp_x, sp->shp_y, &sect); getsect(sp->shp_x, sp->shp_y, &sect);
if (sect.sct_own && sect.sct_type == SCT_HARBR && sect.sct_effic >= 2) { if (sect.sct_own && sect.sct_type == SCT_HARBR && sect.sct_effic >= 2
&& getrel(getnatp(sect.sct_own), sp->shp_own) >= FRIENDLY) {
dist = mapdist(sp->shp_x, sp->shp_y, dist = mapdist(sp->shp_x, sp->shp_y,
sp->shp_orig_x, sp->shp_orig_y); sp->shp_orig_x, sp->shp_orig_y);
/* Don't disclose distance to to pirates */ /* Don't disclose distance to to pirates */