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

navigate: Don't disclose whether unfriendly canal is navigable

Browse source 
When you try to navigate a ship without canal capability into an
unfriendly canal, you get "can't go" when it's below 2%, else "too
large to fit".  Always report "can't go" for unfriendly sectors.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-12-28 22:43:47 +01:00
parent 4bc51f75f8
commit b1b072448d
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/subs/shpsub.c
View file

@ -793,7 +793,9 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor)
if (stuck != SHP_STUCK_NOT || if (stuck != SHP_STUCK_NOT ||
(sect.sct_own (sect.sct_own
&& relations_with(sect.sct_own, actor) < FRIENDLY)) { && relations_with(sect.sct_own, actor) < FRIENDLY)) {
if (stuck == SHP_STUCK_CANAL) if (stuck == SHP_STUCK_CANAL &&
(!sect.sct_own
|| relations_with(sect.sct_own, actor) >= FRIENDLY))
sprintf(dp, sprintf(dp,
"is too large to fit into the canal system at %s", "is too large to fit into the canal system at %s",
xyas(newx, newy, actor)); xyas(newx, newy, actor));

1
tests/navi-march/01-navigate-1
View file

@ -63,7 +63,6 @@ h
| enter unfriendly canal -10,2 | enter unfriendly canal -10,2
navi 65 bX navi 65 bX
h h
| BUG: reports "too large"
| enter unowned bridge 10,0, friendly -6,0, unfriendly bridge -10,0 | enter unowned bridge 10,0, friendly -6,0, unfriendly bridge -10,0
navi 70 gh navi 70 gh
navi 71 gh navi 71 gh

2
tests/navi-march/journal.log
View file

@ -291,7 +291,7 @@
Play#1 input navi 65 bX Play#1 input navi 65 bX
Play#1 command navigate Play#1 command navigate
Play#1 output Play#1 1 Flagship is cs cargo ship (#65) Play#1 output Play#1 1 Flagship is cs cargo ship (#65)
Play#1 output Play#1 1 is too large to fit into the canal system at -10,2 Play#1 output Play#1 1 can't go to -10,2
Play#1 output Play#1 1 = . Play#1 output Play#1 1 = .
Play#1 output Play#1 1 h h h Play#1 output Play#1 1 h h h
Play#1 output Play#1 1 c c Play#1 output Play#1 1 c c