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

Expand a few unnecessary abbreviations in output text

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-08-05 18:48:22 +02:00
parent 90f5822a85
commit ab004fed13
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
info/list.t
View file

@ -15,8 +15,8 @@ which generates a brief summary of each command.
Initial number is cost in B.T.U. units. Initial number is cost in B.T.U. units.
Next 2 chars (if present) are: Next 2 chars (if present) are:
$ - must be non-broke c -- must have capital $ - must be non-broke c -- must have capital
Args in [brackets] are optional. Arguments in [brackets] are optional.
All-caps args in <angle brackets> have the following meanings: All-caps arguments in <angle brackets> have the following meanings:
<NUM> :: a number in unspecified units <NUM> :: a number in unspecified units
<COMM> :: a commodity such as `food', `guns', etc <COMM> :: a commodity such as `food', `guns', etc
<TYPE> :: an item type such as `ship', `plane', etc <TYPE> :: an item type such as `ship', `plane', etc

4
src/lib/commands/vers.c
View file

@ -101,9 +101,9 @@ vers(void)
if (rollover_avail_max) if (rollover_avail_max)
pr("Up to %d avail can roll over an update.\n", pr("Up to %d avail can roll over an update.\n",
rollover_avail_max); rollover_avail_max);
pr("Happiness p.e. requires 1 happy stroller per %d civ.\n", pr("Happiness p.e. requires 1 happy stroller per %d civilians.\n",
(int)hap_cons / etu_per_update); (int)hap_cons / etu_per_update);
pr("Education p.e. requires 1 class of graduates per %d civ.\n", pr("Education p.e. requires 1 class of graduates per %d civilians.\n",
(int)edu_cons / etu_per_update); (int)edu_cons / etu_per_update);
pr("Happiness is averaged over %d time units.\n", (int)hap_avg); pr("Happiness is averaged over %d time units.\n", (int)hap_avg);
pr("Education is averaged over %d time units.\n", (int)edu_avg); pr("Education is averaged over %d time units.\n", (int)edu_avg);

2
src/lib/lwp/sel.c
View file

@ -99,7 +99,7 @@ lwpSleepFd(int fd, int mask, struct timeval *timeout)
if (LwpMaxfd == 0 && !LwpDelayq.head) { if (LwpMaxfd == 0 && !LwpDelayq.head) {
/* select process is sleeping until first waiter arrives */ /* select process is sleeping until first waiter arrives */
lwpStatus(LwpCurrent, "going to resched fd %d", fd); lwpStatus(LwpCurrent, "going to reschedule fd %d", fd);
lwpReady(LwpSelProc); lwpReady(LwpSelProc);
} }
lwpStatus(LwpCurrent, "going to wait on fd %d", fd); lwpStatus(LwpCurrent, "going to wait on fd %d", fd);

4
src/lib/player/empdis.c
View file

@ -116,8 +116,8 @@ explain(void)
"Initial number is cost in BTUs.\n" "Initial number is cost in BTUs.\n"
"Next 2 chars (if present) are:\n" "Next 2 chars (if present) are:\n"
"$ - must be non-broke\tc -- must have capital\n" "$ - must be non-broke\tc -- must have capital\n"
"Args in [brackets] are optional.\n" "Arguments in [brackets] are optional.\n"
"All-caps args in <angle brackets>" "All-caps arguments in <angle brackets>"
" have the following meanings:\n" " have the following meanings:\n"
/* FIXME incomplete */ /* FIXME incomplete */
" <NUM> :: a number in unspecified units\n" " <NUM> :: a number in unspecified units\n"

12
tests/version/journal.log
View file

@ -47,8 +47,8 @@
Play#0 output Play#0 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit. Play#0 output Play#0 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit.
Play#0 output Play#0 1 1000 active military cost $83.33, reserves cost $8.33. Play#0 output Play#0 1 1000 active military cost $83.33, reserves cost $8.33.
Play#0 output Play#0 1 Up to 50 avail can roll over an update. Play#0 output Play#0 1 Up to 50 avail can roll over an update.
Play#0 output Play#0 1 Happiness p.e. requires 1 happy stroller per 10000 civ. Play#0 output Play#0 1 Happiness p.e. requires 1 happy stroller per 10000 civilians.
Play#0 output Play#0 1 Education p.e. requires 1 class of graduates per 10000 civ. Play#0 output Play#0 1 Education p.e. requires 1 class of graduates per 10000 civilians.
Play#0 output Play#0 1 Happiness is averaged over 48 time units. Play#0 output Play#0 1 Happiness is averaged over 48 time units.
Play#0 output Play#0 1 Education is averaged over 192 time units. Play#0 output Play#0 1 Education is averaged over 192 time units.
Play#0 output Play#0 1 The technology/research boost you get from the world is 50.00%. Play#0 output Play#0 1 The technology/research boost you get from the world is 50.00%.
@ -2843,8 +2843,8 @@
Play#2 output Play#2 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit. Play#2 output Play#2 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit.
Play#2 output Play#2 1 1000 active military cost $83.33, reserves cost $8.33. Play#2 output Play#2 1 1000 active military cost $83.33, reserves cost $8.33.
Play#2 output Play#2 1 Up to 50 avail can roll over an update. Play#2 output Play#2 1 Up to 50 avail can roll over an update.
Play#2 output Play#2 1 Happiness p.e. requires 1 happy stroller per 10000 civ. Play#2 output Play#2 1 Happiness p.e. requires 1 happy stroller per 10000 civilians.
Play#2 output Play#2 1 Education p.e. requires 1 class of graduates per 10000 civ. Play#2 output Play#2 1 Education p.e. requires 1 class of graduates per 10000 civilians.
Play#2 output Play#2 1 Happiness is averaged over 48 time units. Play#2 output Play#2 1 Happiness is averaged over 48 time units.
Play#2 output Play#2 1 Education is averaged over 192 time units. Play#2 output Play#2 1 Education is averaged over 192 time units.
Play#2 output Play#2 1 The technology/research boost you get from the world is 50.00%. Play#2 output Play#2 1 The technology/research boost you get from the world is 50.00%.
@ -2958,8 +2958,8 @@
Play#1 output Play#1 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit. Play#1 output Play#1 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit.
Play#1 output Play#1 1 1000 active military cost $83.33, reserves cost $8.33. Play#1 output Play#1 1 1000 active military cost $83.33, reserves cost $8.33.
Play#1 output Play#1 1 Up to 50 avail can roll over an update. Play#1 output Play#1 1 Up to 50 avail can roll over an update.
Play#1 output Play#1 1 Happiness p.e. requires 1 happy stroller per 10000 civ. Play#1 output Play#1 1 Happiness p.e. requires 1 happy stroller per 10000 civilians.
Play#1 output Play#1 1 Education p.e. requires 1 class of graduates per 10000 civ. Play#1 output Play#1 1 Education p.e. requires 1 class of graduates per 10000 civilians.
Play#1 output Play#1 1 Happiness is averaged over 48 time units. Play#1 output Play#1 1 Happiness is averaged over 48 time units.
Play#1 output Play#1 1 Education is averaged over 192 time units. Play#1 output Play#1 1 Education is averaged over 192 time units.
Play#1 output Play#1 1 The technology/research boost you get from your allies is 50.00%. Play#1 output Play#1 1 The technology/research boost you get from your allies is 50.00%.