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

tend ltend: Handle "cannot hold commodity" consistently

Browse source 
Transferring commodities from tenders to targets continues with the
next tender when a target can't hold this kind of commodity.
Transferring them from targets to tenders fails (ltend) or stops
tending (tend) when a tender can't hold this kind of commodity.  Has
always been that way.

Change the latter to continue with the next tender.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-09-14 12:14:14 +02:00
parent 3dc22e8497
commit f4dc2e1e79
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/commands/lten.c
View file

@ -92,7 +92,7 @@ ltend(void)
if (maxtender == 0) {
pr("A %s cannot hold any %s\n",
mchr[(int)tender.shp_type].m_name, ip->i_name);
return RET_FAIL;
continue;
}
if (!snxtitem(&targets, EF_LAND,
player->argp[4], "Units to be tended? "))

2
src/lib/commands/tend.c
View file

@ -126,7 +126,7 @@ tend(void)
if (maxtender == 0) {
pr("A %s cannot hold any %s\n",
mchr[(int)tender.shp_type].m_name, ip->i_name);
break;
continue;
}
if (!snxtitem(&targets, EF_SHIP,
player->argp[4], "Ships to be tended? "))

3
tests/load-tend/journal.log
View file

@ -2210,6 +2210,7 @@
Play#1 input tend u 170/171 -1 150
Play#1 command tend
Play#1 output Play#1 1 A frg frigate cannot hold any uncompensated workers
Play#1 output Play#1 1 A sb submarine cannot hold any uncompensated workers
Play#1 output Play#1 6 0 401
Play#1 input tend s 150/152 5 t
Play#1 command tend
@ -2567,7 +2568,7 @@
Play#1 input ltend i 200/201 -1 350/352
Play#1 command ltend
Play#1 output Play#1 1 A cs cargo ship cannot hold any iron ore
Play#1 output Play#1 1 command failed
Play#1 output Play#1 1 A cs cargo ship cannot hold any iron ore
Play#1 output Play#1 6 0 364
Play#1 input ltend c 200/201 -1 350/352
Play#1 command ltend