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

Spell BTU and ETU consistently

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-07-30 16:55:04 +02:00
parent e6ce36df64
commit 2bcd875715
21 changed files with 57 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/com.h
View file

@ -35,7 +35,7 @@
struct cmndstr { struct cmndstr {
char *c_form; /* prototype of command */ char *c_form; /* prototype of command */
int c_cost; /* btu cost of command */ int c_cost; /* BTU cost of command */
int (*c_addr)(void); /* core addr of appropriate routine */ int (*c_addr)(void); /* core addr of appropriate routine */
int c_flags; /* command flags */ int c_flags; /* command flags */
int c_permit; /* command capabilities required */ int c_permit; /* command capabilities required */

2
include/econfig-spec.h
View file

@ -333,7 +333,7 @@ EMPCFBOTH("money_uw", money_uw, double, NSC_DOUBLE, 0,
EMPCFBOTH("babyeat", babyeat, double, NSC_DOUBLE, 0, EMPCFBOTH("babyeat", babyeat, double, NSC_DOUBLE, 0,
"Amount of food to mature 1 baby into a civilian") "Amount of food to mature 1 baby into a civilian")
EMPCFBOTH("bankint", bankint, double, NSC_DOUBLE, 0, EMPCFBOTH("bankint", bankint, double, NSC_DOUBLE, 0,
"Bank dollar gain (per bar per etu)") "Bank dollar gain (per bar per ETU)")
EMPCFBOTH("eatrate", eatrate, double, NSC_DOUBLE, 0, EMPCFBOTH("eatrate", eatrate, double, NSC_DOUBLE, 0,
"Food eating rate for mature people") "Food eating rate for mature people")
EMPCFBOTH("fcrate", fcrate, double, NSC_DOUBLE, 0, EMPCFBOTH("fcrate", fcrate, double, NSC_DOUBLE, 0,

2
include/game.h
View file

@ -50,7 +50,7 @@ struct gamestr {
* Access it through game_tick_tick(), or else it'll be late. * Access it through game_tick_tick(), or else it'll be late.
*/ */
short game_turn; /* turn number */ short game_turn; /* turn number */
short game_tick; /* elapsed etus in this turn */ short game_tick; /* elapsed ETUs in this turn */
time_t game_rt; /* when game_tick last ticked */ time_t game_rt; /* when game_tick last ticked */
}; };

2
include/land.h
View file

@ -73,7 +73,7 @@ struct lndstr {
unsigned char lnd_scar; /* how experienced the unit is (not used) */ unsigned char lnd_scar; /* how experienced the unit is (not used) */
short lnd_item[I_MAX+1]; /* amount of items on board */ short lnd_item[I_MAX+1]; /* amount of items on board */
short lnd_pstage; /* plague stage */ short lnd_pstage; /* plague stage */
short lnd_ptime; /* how many etus remain in this stage */ short lnd_ptime; /* how many ETUs remain in this stage */
int lnd_land; /* uid of transporting land unit, or -1 */ int lnd_land; /* uid of transporting land unit, or -1 */
short lnd_access; /* Last tick mob was updated (MOB_ACCESS) */ short lnd_access; /* Last tick mob was updated (MOB_ACCESS) */
}; };

2
include/sect.h
View file

@ -82,7 +82,7 @@ struct sctstr {
short sct_dist[I_MAX+1]; /* distribution thresholds */ short sct_dist[I_MAX+1]; /* distribution thresholds */
short sct_mines; /* number of mines */ short sct_mines; /* number of mines */
short sct_pstage; /* plague stage */ short sct_pstage; /* plague stage */
short sct_ptime; /* how many etus remain in this stage */ short sct_ptime; /* how many ETUs remain in this stage */
unsigned char sct_che; /* number of guerrillas */ unsigned char sct_che; /* number of guerrillas */
natid sct_che_target; /* nation targeted by che */ natid sct_che_target; /* nation targeted by che */
unsigned short sct_fallout; unsigned short sct_fallout;

2
include/ship.h
View file

@ -69,7 +69,7 @@ struct shpstr {
/* end of part matching struct empobj */ /* end of part matching struct empobj */
short shp_item[I_MAX+1]; /* amount of items on board */ short shp_item[I_MAX+1]; /* amount of items on board */
short shp_pstage; /* plague stage */ short shp_pstage; /* plague stage */
short shp_ptime; /* how many etus remain in this stage */ short shp_ptime; /* how many ETUs remain in this stage */
short shp_access; /* Last tick mob was updated (MOB_ACCESS) */ short shp_access; /* Last tick mob was updated (MOB_ACCESS) */
char shp_name[MAXSHPNAMLEN]; /* name set with the "name" command */ char shp_name[MAXSHPNAMLEN]; /* name set with the "name" command */
coord shp_orig_x; coord shp_orig_x;

2
info/lookout.t
View file

@ -19,7 +19,7 @@ out from a ship! In order to detect subs at sea, you need to use sonar.
Submarines have a very limited range for what ships they Submarines have a very limited range for what ships they
can see using their periscope--they can usually only see ships in the can see using their periscope--they can usually only see ships in the
same sector. However, all ships (including subs) which are docked in same sector. However, all ships (including subs) which are docked in
a harbour are visible to all ships (including subs) in adjacent sectors. a harbor are visible to all ships (including subs) in adjacent sectors.
(see also \*Qinfo sonar\*U) (see also \*Qinfo sonar\*U)
.in .in
.s1 .s1

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

@ -57,10 +57,10 @@ chan(void)
if (us->nat_stat == STAT_ACTIVE) { if (us->nat_stat == STAT_ACTIVE) {
if (opt_BLITZ == 0) { if (opt_BLITZ == 0) {
if (us->nat_btu < 254) { if (us->nat_btu < 254) {
pr("You need 254 btus to change your country name!\n"); pr("You need 254 BTUs to change your country name!\n");
return RET_FAIL; return RET_FAIL;
} }
pr("This command costs 254 BTU's and 10%% of your money.\n"); pr("This command costs 254 BTUs and 10%% of your money.\n");
if (!confirm("Are you sure you want to do this? ")) if (!confirm("Are you sure you want to do this? "))
return RET_FAIL; return RET_FAIL;
btucost = 254; btucost = 254;

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

@ -83,7 +83,7 @@ spy(void)
btucost = (nsects / 40) + 1; btucost = (nsects / 40) + 1;
natp = getnatp(player->cnum); natp = getnatp(player->cnum);
if (natp->nat_btu < btucost) { if (natp->nat_btu < btucost) {
pr("You don't have the BTU's for spying on that scale!\n"); pr("You don't have the BTUs for spying on that scale!\n");
return RET_FAIL; return RET_FAIL;
} }
bitmap = calloc((WORLD_SZ() + 7) / 8, 1); bitmap = calloc((WORLD_SZ() + 7) / 8, 1);

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

@ -75,11 +75,11 @@ vers(void)
(1.0 / (btu_build_rate * 100.0))); (1.0 / (btu_build_rate * 100.0)));
pr("\n"); pr("\n");
pr("A non-aggi, 100 fertility sector can grow %.2f food per etu.\n", pr("A non-aggi, 100 fertility sector can grow %.2f food per ETU.\n",
100.0 * fgrate); 100.0 * fgrate);
pr("1000 civilians will harvest %.1f food per etu.\n", pr("1000 civilians will harvest %.1f food per ETU.\n",
1000.0 * fcrate); 1000.0 * fcrate);
pr("1000 civilians will give birth to %.1f babies per etu.\n", pr("1000 civilians will give birth to %.1f babies per ETU.\n",
1000.0 * obrate); 1000.0 * obrate);
pr("1000 uncompensated workers will give birth to %.1f babies.\n", pr("1000 uncompensated workers will give birth to %.1f babies.\n",
1000.0 * uwbrate); 1000.0 * uwbrate);
@ -92,7 +92,7 @@ vers(void)
pr("\n"); pr("\n");
pr("Banks pay $%.2f in interest per 1000 gold bars per etu.\n", pr("Banks pay $%.2f in interest per 1000 gold bars per ETU.\n",
bankint * 1000.0); bankint * 1000.0);
pr("1000 civilians generate $%.2f, uncompensated workers $%.2f each time unit.\n", pr("1000 civilians generate $%.2f, uncompensated workers $%.2f each time unit.\n",
1000.0 * money_civ, 1000.0 * money_uw); 1000.0 * money_civ, 1000.0 * money_uw);

8
src/lib/global/constants.c
View file

@ -58,7 +58,7 @@ int MARK_DELAY = 7200; /* Seconds to bid on commodities */
int TRADE_DELAY = 7200; /* Seconds to bid on units */ int TRADE_DELAY = 7200; /* Seconds to bid on units */
int m_m_p_d = 1440; /* max mins of play per day (per country) */ int m_m_p_d = 1440; /* max mins of play per day (per country) */
int etu_per_update = 60; /* # of etu's per update */ int etu_per_update = 60; /* # of ETUs per update */
int update_window = 0; /* update window adjustment, in seconds */ int update_window = 0; /* update window adjustment, in seconds */
int update_demand = UPD_DEMAND_NONE; int update_demand = UPD_DEMAND_NONE;
int update_wantmin = 1; /* votes required for demand update */ int update_wantmin = 1; /* votes required for demand update */
@ -118,7 +118,7 @@ double uwbrate = 0.0025; /* uncompensated worker birth rate */
int rollover_avail_max = 50; /* max. avail that can roll over an update */ int rollover_avail_max = 50; /* max. avail that can roll over an update */
/* opt_FALLOUT */ /* opt_FALLOUT */
double decay_per_etu = 0.006; /* This gives a half life of ? etus, double decay_per_etu = 0.006; /* This gives a half life of ? ETUs,
about ? days. about ? days.
half life in Jt half life in Jt
log(.5) / log(1-decay_per_etu) log(.5) / log(1-decay_per_etu)
@ -174,7 +174,7 @@ float easy_tech = 1.00; /* amount of tech built with no penality */
float tech_log_base = 2.0; /* base of log to take of in-efficient tech */ float tech_log_base = 2.0; /* base of log to take of in-efficient tech */
float ally_factor = 2.0; /* shared tech with allies = 1/factor */ float ally_factor = 2.0; /* shared tech with allies = 1/factor */
float level_age_rate = 96.0; /* 1% per 96 etu's; 0 -> no decline */ float level_age_rate = 96.0; /* 1% per 96 ETUs; 0 -> no decline */
int players_at_00 = 0; /* players coord system on deity 0,0? */ int players_at_00 = 0; /* players coord system on deity 0,0? */
@ -184,7 +184,7 @@ int at_least_one_100 = 1; /* init player with 100/100/100/100 sector? */
float btu_build_rate = 0.0012; /* etu * civ * eff * btu_build_rate */ float btu_build_rate = 0.0012; /* etu * civ * eff * btu_build_rate */
/* 8 * 999 * 100 * 0.0004 = 319 */ /* 8 * 999 * 100 * 0.0004 = 319 */
int max_btus = 640; /* maximum # of btu's */ int max_btus = 640; /* maximum # of BTUs */
double buil_bt = 10.0; /* tech level required to build a bridge */ double buil_bt = 10.0; /* tech level required to build a bridge */
int buil_bh = 100; /* hcm required to build a bridge */ int buil_bh = 100; /* hcm required to build a bridge */

2
src/lib/player/dispatch.c
View file

@ -83,7 +83,7 @@ dispatch(char *buf, char *redir)
if (player->god || opt_BLITZ) if (player->god || opt_BLITZ)
np->nat_btu = max_btus; np->nat_btu = max_btus;
else { else {
pr("You don't have the BTU's, bozo\n"); pr("You don't have the BTUs, bozo\n");
return 0; return 0;
} }
} }

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

@ -113,7 +113,7 @@ explain(void)
pr("\t\tCurrent EMPIRE Command List\n" pr("\t\tCurrent EMPIRE Command List\n"
"\t\t------- ------ ------- ----\n" "\t\t------- ------ ------- ----\n"
"Initial number is cost in B.T.U. units.\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" "Args in [brackets] are optional.\n"

2
src/lib/subs/attsub.c
View file

@ -1902,7 +1902,7 @@ att_fight(int combat_mode, struct combat *off, struct emp_qelem *olist,
pr("- Casualties -\n Yours: %d\n", a_cas); pr("- Casualties -\n Yours: %d\n", a_cas);
pr(" Theirs: %d\n", d_cas); pr(" Theirs: %d\n", d_cas);
pr("Papershuffling ... %.1f B.T.U\n", (d_cas + a_cas) * 0.15); pr("Paper-shuffling ... %.1f BTU\n", (d_cas + a_cas) * 0.15);
player->btused += (int)((d_cas + a_cas) * 0.015 + 0.5); player->btused += (int)((d_cas + a_cas) * 0.015 + 0.5);
if (success) { if (success) {

2
src/lib/update/age.c
View file

@ -40,7 +40,7 @@
int int
age_people(int n, int etu) age_people(int n, int etu)
{ {
/* age by 1% per 24 etus */ /* age by 1% per 24 ETUs */
return roundavg(n * (1.0 - etu / 2400.0)); return roundavg(n * (1.0 - etu / 2400.0));
} }

2
src/lib/update/main.c
View file

@ -63,7 +63,7 @@ update_main(void)
struct natstr *np; struct natstr *np;
update_running = 1; update_running = 1;
logerror("production update (%d etus)", etu); logerror("production update (%d ETUs)", etu);
getrusage(RUSAGE_SELF, &rus1); getrusage(RUSAGE_SELF, &rus1);
game_record_update(time(NULL)); game_record_update(time(NULL));
journal_update(etu); journal_update(etu);

4
tests/retreat/journal.log
View file

@ -655,7 +655,7 @@
Play#1 output Play#1 1 - Casualties - Play#1 output Play#1 1 - Casualties -
Play#1 output Play#1 1 Yours: 1 Play#1 output Play#1 1 Yours: 1
Play#1 output Play#1 1 Theirs: 0 Play#1 output Play#1 1 Theirs: 0
Play#1 output Play#1 1 Papershuffling ... 0.1 B.T.U Play#1 output Play#1 1 Paper-shuffling ... 0.1 BTU
Play#1 output Play#1 1 You have been repelled Play#1 output Play#1 1 You have been repelled
Play#1 output Play#1 6 0 569 Play#1 output Play#1 6 0 569
Play#1 input board 132 5 Play#1 input board 132 5
@ -673,7 +673,7 @@
Play#1 output Play#1 1 - Casualties - Play#1 output Play#1 1 - Casualties -
Play#1 output Play#1 1 Yours: 50 Play#1 output Play#1 1 Yours: 50
Play#1 output Play#1 1 Theirs: 15 Play#1 output Play#1 1 Theirs: 15
Play#1 output Play#1 1 Papershuffling ... 9.8 B.T.U Play#1 output Play#1 1 Paper-shuffling ... 9.8 BTU
Play#1 output Play#1 1 You have been repelled Play#1 output Play#1 1 You have been repelled
Play#1 output Play#1 1 Ship #132 is not in the same sector! Play#1 output Play#1 1 Ship #132 is not in the same sector!
Play#1 output Play#1 6 0 565 Play#1 output Play#1 6 0 565

4
tests/smoke/journal.log
View file

@ -2556,7 +2556,7 @@
Play#1 output Play#1 1 - Casualties - Play#1 output Play#1 1 - Casualties -
Play#1 output Play#1 1 Yours: 0 Play#1 output Play#1 1 Yours: 0
Play#1 output Play#1 1 Theirs: 0 Play#1 output Play#1 1 Theirs: 0
Play#1 output Play#1 1 Papershuffling ... 0.0 B.T.U Play#1 output Play#1 1 Paper-shuffling ... 0.0 BTU
Play#1 output Play#1 1 We have secured a beachhead at 11,-1, sir! Play#1 output Play#1 1 We have secured a beachhead at 11,-1, sir!
Play#1 output Play#1 1 1 mil from frg frigate (#0) moves into 11,-1 Play#1 output Play#1 1 1 mil from frg frigate (#0) moves into 11,-1
Play#1 output Play#1 1 35 of your troops now occupy 11,-1 Play#1 output Play#1 1 35 of your troops now occupy 11,-1
@ -13045,7 +13045,7 @@
Play#1 output Play#1 1 - Casualties - Play#1 output Play#1 1 - Casualties -
Play#1 output Play#1 1 Yours: 6 Play#1 output Play#1 1 Yours: 6
Play#1 output Play#1 1 Theirs: 0 Play#1 output Play#1 1 Theirs: 0
Play#1 output Play#1 1 Papershuffling ... 0.9 B.T.U Play#1 output Play#1 1 Paper-shuffling ... 0.9 BTU
Play#1 output Play#1 1 You have been defeated! Play#1 output Play#1 1 You have been defeated!
Play#1 output Play#1 1 cav cavalry #4 damaged from 98% to 73% Play#1 output Play#1 1 cav cavalry #4 damaged from 98% to 73%
Play#1 output Play#1 1 You have a new telegram waiting ... Play#1 output Play#1 1 You have a new telegram waiting ...

34
tests/smoke/server.log
View file

@ -57,7 +57,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -85,7 +85,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -112,7 +112,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -143,7 +143,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -174,7 +174,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -201,7 +201,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -232,7 +232,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -263,7 +263,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -294,7 +294,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -325,7 +325,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -356,7 +356,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -387,7 +387,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -418,7 +418,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -453,7 +453,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -488,7 +488,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -522,7 +522,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...
@ -556,7 +556,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...

2
tests/update/server.log
View file

@ -37,7 +37,7 @@ Connect from 127.0.0.1
tester@127.0.0.1 using country #0 tester@127.0.0.1 using country #0
tester@127.0.0.1 logged in as country #0 tester@127.0.0.1 logged in as country #0
Triggering unscheduled update Triggering unscheduled update
production update (60 etus) production update (60 ETUs)
preparing sectors... preparing sectors...
done preparing sectors. done preparing sectors.
producing for countries... producing for countries...

24
tests/version/journal.log
View file

@ -35,15 +35,15 @@
Play#0 output Play#0 1 Each country is allowed to be logged in 1440 minutes a day. Play#0 output Play#0 1 Each country is allowed to be logged in 1440 minutes a day.
Play#0 output Play#0 1 It takes 8.33 civilians to produce a BTU in one time unit. Play#0 output Play#0 1 It takes 8.33 civilians to produce a BTU in one time unit.
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 A non-aggi, 100 fertility sector can grow 0.12 food per etu. Play#0 output Play#0 1 A non-aggi, 100 fertility sector can grow 0.12 food per ETU.
Play#0 output Play#0 1 1000 civilians will harvest 1.3 food per etu. Play#0 output Play#0 1 1000 civilians will harvest 1.3 food per ETU.
Play#0 output Play#0 1 1000 civilians will give birth to 5.0 babies per etu. Play#0 output Play#0 1 1000 civilians will give birth to 5.0 babies per ETU.
Play#0 output Play#0 1 1000 uncompensated workers will give birth to 2.5 babies. Play#0 output Play#0 1 1000 uncompensated workers will give birth to 2.5 babies.
Play#0 output Play#0 1 In one time unit, 1000 people eat 0.5 units of food. Play#0 output Play#0 1 In one time unit, 1000 people eat 0.5 units of food.
Play#0 output Play#0 1 1000 babies eat 6.0 units of food becoming adults. Play#0 output Play#0 1 1000 babies eat 6.0 units of food becoming adults.
Play#0 output Play#0 1 No food is needed! Play#0 output Play#0 1 No food is needed!
Play#0 output Play#0 1 Play#0 output Play#0 1
Play#0 output Play#0 1 Banks pay $250.00 in interest per 1000 gold bars per etu. Play#0 output Play#0 1 Banks pay $250.00 in interest per 1000 gold bars per ETU.
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.
@ -2831,15 +2831,15 @@
Play#2 output Play#2 1 Each country is allowed to be logged in 1440 minutes a day. Play#2 output Play#2 1 Each country is allowed to be logged in 1440 minutes a day.
Play#2 output Play#2 1 It takes 8.33 civilians to produce a BTU in one time unit. Play#2 output Play#2 1 It takes 8.33 civilians to produce a BTU in one time unit.
Play#2 output Play#2 1 Play#2 output Play#2 1
Play#2 output Play#2 1 A non-aggi, 100 fertility sector can grow 0.12 food per etu. Play#2 output Play#2 1 A non-aggi, 100 fertility sector can grow 0.12 food per ETU.
Play#2 output Play#2 1 1000 civilians will harvest 1.3 food per etu. Play#2 output Play#2 1 1000 civilians will harvest 1.3 food per ETU.
Play#2 output Play#2 1 1000 civilians will give birth to 5.0 babies per etu. Play#2 output Play#2 1 1000 civilians will give birth to 5.0 babies per ETU.
Play#2 output Play#2 1 1000 uncompensated workers will give birth to 2.5 babies. Play#2 output Play#2 1 1000 uncompensated workers will give birth to 2.5 babies.
Play#2 output Play#2 1 In one time unit, 1000 people eat 0.5 units of food. Play#2 output Play#2 1 In one time unit, 1000 people eat 0.5 units of food.
Play#2 output Play#2 1 1000 babies eat 6.0 units of food becoming adults. Play#2 output Play#2 1 1000 babies eat 6.0 units of food becoming adults.
Play#2 output Play#2 1 No food is needed! Play#2 output Play#2 1 No food is needed!
Play#2 output Play#2 1 Play#2 output Play#2 1
Play#2 output Play#2 1 Banks pay $250.00 in interest per 1000 gold bars per etu. Play#2 output Play#2 1 Banks pay $250.00 in interest per 1000 gold bars per ETU.
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.
@ -2946,15 +2946,15 @@
Play#1 output Play#1 1 Game hours are 00:00-24:00. Play#1 output Play#1 1 Game hours are 00:00-24:00.
Play#1 output Play#1 1 It takes 8.33 civilians to produce a BTU in one time unit. Play#1 output Play#1 1 It takes 8.33 civilians to produce a BTU in one time unit.
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 A non-aggi, 100 fertility sector can grow 0.12 food per etu. Play#1 output Play#1 1 A non-aggi, 100 fertility sector can grow 0.12 food per ETU.
Play#1 output Play#1 1 1000 civilians will harvest 1.3 food per etu. Play#1 output Play#1 1 1000 civilians will harvest 1.3 food per ETU.
Play#1 output Play#1 1 1000 civilians will give birth to 5.0 babies per etu. Play#1 output Play#1 1 1000 civilians will give birth to 5.0 babies per ETU.
Play#1 output Play#1 1 1000 uncompensated workers will give birth to 2.5 babies. Play#1 output Play#1 1 1000 uncompensated workers will give birth to 2.5 babies.
Play#1 output Play#1 1 In one time unit, 1000 people eat 0.5 units of food. Play#1 output Play#1 1 In one time unit, 1000 people eat 0.5 units of food.
Play#1 output Play#1 1 1000 babies eat 6.0 units of food becoming adults. Play#1 output Play#1 1 1000 babies eat 6.0 units of food becoming adults.
Play#1 output Play#1 1 No food is needed! Play#1 output Play#1 1 No food is needed!
Play#1 output Play#1 1 Play#1 output Play#1 1
Play#1 output Play#1 1 Banks pay $250.00 in interest per 1000 gold bars per etu. Play#1 output Play#1 1 Banks pay $250.00 in interest per 1000 gold bars per ETU.
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.