Document delivery of civilians and military

People can be delivered since v4.0.0 (the check that disabled that was
commented out), and cutoff shows these deliveries since v4.0.2.  The
change was documented in info Empire4, but info pages weren't updated.
Do that, and remove the commented out code.
This commit is contained in:
Markus Armbruster 2008-05-31 18:50:03 +02:00
parent 6e998a46e2
commit 1f7d8879ca
3 changed files with 25 additions and 25 deletions

View file

@ -25,9 +25,13 @@ These columns represent:
.L sect .L sect
the x and y coordinates of the sector the x and y coordinates of the sector
.L ufsgpidbolhr .L ufsgpidbolhr
the twelve delivery direction columns correspond to the delivery the fourteen delivery direction columns correspond to the delivery
direction for food, guns, petroleum (refined), iron ore, dust (gold), direction for civilians, military, food, guns, petroleum (refined),
bars (dust), oil, lcm, and hcm. iron ore, dust (gold), bars (dust), oil, lcm, and hcm.
.L civ
the delivery cutoff threshold for civilians in that sector
.L mil
the delivery cutoff threshold for military in that sector
.L uw .L uw
the delivery cutoff threshold for uncompensated workers in that sector the delivery cutoff threshold for uncompensated workers in that sector
.L food .L food
@ -60,22 +64,22 @@ For example:
.EX cutoff -3:3,-2:0 .EX cutoff -3:3,-2:0
.NF .NF
.ps -1 .ps -1
Wed Nov 12 00:15:51 1986 Sat May 31 18:40:57 2008
DELIVERY CUTOFF LEVELS DELIVERY CUTOFF LEVELS
sect ufsgpidbolhr uw food sh gun pet iron dust bar oil lcm hcm rad sect cmufsgpidbolhr civ mil uw food sh gun pet irn dst bar oil lcm hcm rad
0,0 c ............ 0 0 0 0 0 0 0 0 0 0 0 0 0,0 c .............. 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-5,-3 a n........... 0 400 0 0 0 0 0 0 0 0 0 0 -5,-3 a ..n........... 0 0 0 400 0 0 0 0 0 0 0 0 0 0
-6,-2 k j........... 0 400 0 0 0 0 0 0 0 0 0 0 -6,-2 k ..j........... 0 0 0 400 0 0 0 0 0 0 0 0 0 0
-4,-2 + j........... 0 400 0 0 0 0 0 0 0 0 0 0 -4,-2 + ..j........... 0 0 0 400 0 0 0 0 0 0 0 0 0 0
-2,-2 m ....n....... 0 0 0 0 0 0 0 0 0 0 0 0 -2,-2 m ......n....... 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-5,-1 t ............ 0 0 0 0 0 0 0 0 0 0 0 0 -5,-1 t .............. 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-1,-1 w ....j....... 0 0 0 0 0 800 0 0 0 0 0 0 -1,-1 w ......j....... 0 0 0 0 0 0 0 800 0 0 0 0 0 0
1,-1 m ....j...b... 0 0 0 0 0 40 0 0 0 0 0 0 1,-1 m ......j...b... 0 0 0 0 0 0 0 40 0 0 0 0 0 0
3,-1 j .....j...... 0 0 0 0 0 0 104 0 0 0 0 0 3,-1 j .......j...... 0 0 0 0 0 0 0 0 104 0 0 0 0 0
5,-1 b ............ 0 0 0 0 0 0 0 0 0 0 0 0 5,-1 b .............. 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0,0 c y........... 0 200 0 0 0 0 0 0 0 0 0 0 0,0 c ..y........... 0 0 0 200 0 0 0 0 0 0 0 0 0 0
2,0 + g.......j... 0 200 0 0 0 0 0 0 0 80 0 0 2,0 + ..g.......j... 0 0 0 200 0 0 0 0 0 0 0 80 0 0
-5,1 l ........j... 0 0 0 0 0 0 0 0 0 0 0 0 -5,1 l ..........j... 0 0 0 0 0 0 0 0 0 0 0 0 0 0
12 sectors 12 sectors
.ps +1 .ps +1
.FI .FI

View file

@ -10,13 +10,15 @@ in a given sector area.
The <SECTS> argument is as described in \*Qinfo syntax\*U. The <SECTS> argument is as described in \*Qinfo syntax\*U.
<ITEM> is one of the following: <ITEM> is one of the following:
.NF .NF
c civilians
m military
u uncompensated workers u uncompensated workers
f food f food
s shells s shells
g guns (not gold) g guns (not gold)
p planes p planes
i iron ore i iron ore
d dust, (gold) d dust (gold)
b bars of gold b bars of gold
o oil o oil
l light construction materials l light construction materials

View file

@ -52,12 +52,6 @@ deli(void)
if ((ich = whatitem(player->argp[1], "deliver what? ")) == 0) if ((ich = whatitem(player->argp[1], "deliver what? ")) == 0)
return RET_SYN; return RET_SYN;
/*
if (ich->i_uid == I_CIVIL || ich->i_uid == I_MILIT) {
pr("You cannot deliver people!\n");
return RET_FAIL;
}
*/
if (!snxtsct(&nstr, player->argp[2])) if (!snxtsct(&nstr, player->argp[2]))
return RET_SYN; return RET_SYN;