From 1f7d8879ca45b6cc9541ffc6026bb4c022a4c73d Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 31 May 2008 18:50:03 +0200 Subject: [PATCH] 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. --- info/cutoff.t | 40 ++++++++++++++++++++++------------------ info/route.t | 4 +++- src/lib/commands/deli.c | 6 ------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/info/cutoff.t b/info/cutoff.t index 1a6ca7d9..3a95bd9f 100644 --- a/info/cutoff.t +++ b/info/cutoff.t @@ -25,9 +25,13 @@ These columns represent: .L sect the x and y coordinates of the sector .L ufsgpidbolhr -the twelve delivery direction columns correspond to the delivery -direction for food, guns, petroleum (refined), iron ore, dust (gold), -bars (dust), oil, lcm, and hcm. +the fourteen delivery direction columns correspond to the delivery +direction for civilians, military, food, guns, petroleum (refined), +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 the delivery cutoff threshold for uncompensated workers in that sector .L food @@ -60,22 +64,22 @@ For example: .EX cutoff -3:3,-2:0 .NF .ps -1 -Wed Nov 12 00:15:51 1986 +Sat May 31 18:40:57 2008 DELIVERY CUTOFF LEVELS - sect ufsgpidbolhr uw food sh gun pet iron dust bar oil lcm hcm rad - 0,0 c ............ 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 - -6,-2 k j........... 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 - -2,-2 m ....n....... 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 - -1,-1 w ....j....... 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 - 3,-1 j .....j...... 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 - 0,0 c y........... 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 - -5,1 l ........j... 0 0 0 0 0 0 0 0 0 0 0 0 + 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 + -5,-3 a ..n........... 0 0 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 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 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 0 0 800 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 0 0 104 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 0 0 200 0 0 0 0 0 0 0 0 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 0 0 12 sectors .ps +1 .FI diff --git a/info/route.t b/info/route.t index 977348ad..97c80bcd 100644 --- a/info/route.t +++ b/info/route.t @@ -10,13 +10,15 @@ in a given sector area. The argument is as described in \*Qinfo syntax\*U. is one of the following: .NF +c civilians +m military u uncompensated workers f food s shells g guns (not gold) p planes i iron ore -d dust, (gold) +d dust (gold) b bars of gold o oil l light construction materials diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c index bded1201..bb7cbd62 100644 --- a/src/lib/commands/deli.c +++ b/src/lib/commands/deli.c @@ -52,12 +52,6 @@ deli(void) if ((ich = whatitem(player->argp[1], "deliver what? ")) == 0) 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])) return RET_SYN;