Spell BTU and ETU consistently

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/com.h b/include/com.h
index 850d13f61fe16131ddd7978ac468e45dd410118e..bd561984cb39a9c57028ea5714c5e634a9b10740 100644 (file)
--- a/include/com.h
+++ b/include/com.h
@@ -35,7 +35,7 @@
 
 struct cmndstr {
     char *c_form;              /* prototype of command */
 
 struct cmndstr {
     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_flags;               /* command flags */
     int c_permit;              /* command capabilities required */
     int (*c_addr)(void);       /* core addr of appropriate routine */
     int c_flags;               /* command flags */
     int c_permit;              /* command capabilities required */

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 16ac229a0cc0c39aedf008f4fe5093c071b22241..1fac4c631e15f93bc17cb10ce9b0e17810dc745b 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -333,7 +333,7 @@ EMPCFBOTH("money_uw", money_uw, double, NSC_DOUBLE, 0,
 EMPCFBOTH("babyeat", babyeat, double, NSC_DOUBLE, 0,
     "Amount of food to mature 1 baby into a civilian")
 EMPCFBOTH("bankint", bankint, double, NSC_DOUBLE, 0,
 EMPCFBOTH("babyeat", babyeat, double, NSC_DOUBLE, 0,
     "Amount of food to mature 1 baby into a civilian")
 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,
     "Food eating rate for mature people")
 EMPCFBOTH("fcrate", fcrate, double, NSC_DOUBLE, 0,
 EMPCFBOTH("eatrate", eatrate, double, NSC_DOUBLE, 0,
     "Food eating rate for mature people")
 EMPCFBOTH("fcrate", fcrate, double, NSC_DOUBLE, 0,

diff --git a/include/game.h b/include/game.h
index 62659f26094cc0f4759f9b3c1117292cf7b2b514..c235f237c0bcf82540ea5713f779102dea3252ce 100644 (file)
--- a/include/game.h
+++ b/include/game.h
@@ -50,7 +50,7 @@ struct gamestr {
      * Access it through game_tick_tick(), or else it'll be late.
      */
     short game_turn;           /* turn number */
      * Access it through game_tick_tick(), or else it'll be late.
      */
     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 */
 };
 

diff --git a/include/land.h b/include/land.h
index 0cdd302846b83ae0589e339b05031b0b00fcdc79..2f378647f3c1260584c3ccb072eaea5b1bf315fb 100644 (file)
--- a/include/land.h
+++ b/include/land.h
@@ -73,7 +73,7 @@ struct lndstr {
     unsigned char lnd_scar;    /* how experienced the unit is (not used) */
     short lnd_item[I_MAX+1];   /* amount of items on board */
     short lnd_pstage;          /* plague stage */
     unsigned char lnd_scar;    /* how experienced the unit is (not used) */
     short lnd_item[I_MAX+1];   /* amount of items on board */
     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 */
     short lnd_access;          /* Last tick mob was updated (MOB_ACCESS) */
 };
     int lnd_land;              /* uid of transporting land unit, or -1 */
     short lnd_access;          /* Last tick mob was updated (MOB_ACCESS) */
 };

diff --git a/include/sect.h b/include/sect.h
index 87368ee5e211079b3e3dbe0fa4b72a370670c1d4..8abfc0500f95ba0748c0f2d73f46d333dfc5390f 100644 (file)
--- a/include/sect.h
+++ b/include/sect.h
@@ -82,7 +82,7 @@ struct sctstr {
     short sct_dist[I_MAX+1];   /* distribution thresholds */
     short sct_mines;           /* number of mines */
     short sct_pstage;          /* plague stage */
     short sct_dist[I_MAX+1];   /* distribution thresholds */
     short sct_mines;           /* number of mines */
     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 */
     natid sct_che_target;      /* nation targeted by che */
     unsigned short sct_fallout;
     unsigned char sct_che;     /* number of guerrillas */
     natid sct_che_target;      /* nation targeted by che */
     unsigned short sct_fallout;

diff --git a/include/ship.h b/include/ship.h
index 2019c458ab0ae32c9488ebff03d0988a43afeed4..8457bb9151419eb35e29d8b1af9fa1ff59736c59 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -69,7 +69,7 @@ struct shpstr {
     /* end of part matching struct empobj */
     short shp_item[I_MAX+1];   /* amount of items on board */
     short shp_pstage;          /* plague stage */
     /* end of part matching struct empobj */
     short shp_item[I_MAX+1];   /* amount of items on board */
     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) */
     char shp_name[MAXSHPNAMLEN]; /* name set with the "name" command */
     coord shp_orig_x;
     short shp_access;          /* Last tick mob was updated (MOB_ACCESS) */
     char shp_name[MAXSHPNAMLEN]; /* name set with the "name" command */
     coord shp_orig_x;

diff --git a/info/lookout.t b/info/lookout.t
index e22d2cc735941a093fbe3e250a8b439bfacfff91..96716cc4a2d04569a927038fa4fcc56cf902b552 100644 (file)
--- a/info/lookout.t
+++ b/info/lookout.t
@@ -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
 can see using their periscope--they can usually only see ships in the
 same sector.  However, all ships (including subs) which are docked in
 Submarines have a very limited range for what ships they
 can see using their periscope--they can usually only see ships in the
 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)
 .in
 .s1
 (see also \*Qinfo sonar\*U)
 .in
 .s1

diff --git a/src/lib/commands/chan.c b/src/lib/commands/chan.c
index 8bb275403772ccd74cb7a3a72bd3e451ad143a7e..6c15bca64eb41ccd61d2fb69b5a9abd93f0bf866 100644 (file)
--- a/src/lib/commands/chan.c
+++ b/src/lib/commands/chan.c
@@ -57,10 +57,10 @@ chan(void)
        if (us->nat_stat == STAT_ACTIVE) {
            if (opt_BLITZ == 0) {
                if (us->nat_btu < 254) {
        if (us->nat_stat == STAT_ACTIVE) {
            if (opt_BLITZ == 0) {
                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? "))
                    return RET_FAIL;
                btucost = 254;
                if (!confirm("Are you sure you want to do this? "))
                    return RET_FAIL;
                btucost = 254;

diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c
index b5d14def482fce37bffe979a8740edff431fec7e..81e16e3eaf072f325035fa94d48a8b2ff7d96ae1 100644 (file)
--- a/src/lib/commands/spy.c
+++ b/src/lib/commands/spy.c
@@ -83,7 +83,7 @@ spy(void)
     btucost = (nsects / 40) + 1;
     natp = getnatp(player->cnum);
     if (natp->nat_btu < btucost) {
     btucost = (nsects / 40) + 1;
     natp = getnatp(player->cnum);
     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;
     }
     bitmap = calloc((WORLD_SZ() + 7) / 8, 1);
        return RET_FAIL;
     }
     bitmap = calloc((WORLD_SZ() + 7) / 8, 1);

diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c
index d95de6cf752ab5d4a7d6b991643a11cae87a8382..07d4bc11ca99469f081bd101e33e9e961b9963e9 100644 (file)
--- a/src/lib/commands/vers.c
+++ b/src/lib/commands/vers.c
@@ -75,11 +75,11 @@ vers(void)
        (1.0 / (btu_build_rate * 100.0)));
     pr("\n");
 
        (1.0 / (btu_build_rate * 100.0)));
     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);
     pr("1000 uncompensated workers will give birth to %.1f babies.\n",
        1000.0 * uwbrate);
        1000.0 * obrate);
     pr("1000 uncompensated workers will give birth to %.1f babies.\n",
        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);
     pr("1000 civilians generate $%.2f, uncompensated workers $%.2f each time unit.\n",
        1000.0 * money_civ, 1000.0 * money_uw);
        bankint * 1000.0);
     pr("1000 civilians generate $%.2f, uncompensated workers $%.2f each time unit.\n",
        1000.0 * money_civ, 1000.0 * money_uw);

diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index 4869f66fe50e540305d201943b4838196e4f31f0..af7b929ec6b7e57bd08865fab104da11208ec814 100644 (file)
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.c
@@ -58,7 +58,7 @@ int MARK_DELAY = 7200;                /* Seconds to bid on commodities */
 int TRADE_DELAY = 7200;                /* Seconds to bid on units */
 
 int m_m_p_d = 1440;            /* max mins of play per day (per country) */
 int TRADE_DELAY = 7200;                /* Seconds to bid on units */
 
 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_demand = UPD_DEMAND_NONE;
 int update_wantmin = 1;                /* votes required for demand update */
 int update_window = 0;         /* update window adjustment, in seconds */
 int update_demand = UPD_DEMAND_NONE;
 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 */
 
 /* opt_FALLOUT */
 int rollover_avail_max = 50;   /* max. avail that can roll over an update */
 
 /* 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.
                                   half life in Jt
                                   log(.5) / log(1-decay_per_etu)
                                   about ? days.
                                   half life in Jt
                                   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 ally_factor = 2.0;       /* shared tech with allies = 1/factor */
 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 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 */
                                /* 8 * 999 * 100 * 0.0004 = 319 */
 
 float btu_build_rate = 0.0012; /* etu * civ * eff * btu_build_rate */
                                /* 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 */
 int buil_bh = 100;             /* hcm 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 */

diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c
index a4ecf09af2e1a9afaec2a0f806d4598df48de9ab..2c926b3ed8485a786ca7dafbed308f6d1506a17e 100644 (file)
--- a/src/lib/player/dispatch.c
+++ b/src/lib/player/dispatch.c
@@ -83,7 +83,7 @@ dispatch(char *buf, char *redir)
        if (player->god || opt_BLITZ)
            np->nat_btu = max_btus;
        else {
        if (player->god || opt_BLITZ)
            np->nat_btu = max_btus;
        else {

-           pr("You don't have the BTU's, bozo\n");
+           pr("You don't have the BTUs, bozo\n");

            return 0;
        }
     }
            return 0;
        }
     }

diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c
index c66504f516e09e9c40015bb77c2907ddc008462a..84f990d6649259c6d8547b7ca07815fd7aa72a62 100644 (file)
--- a/src/lib/player/empdis.c
+++ b/src/lib/player/empdis.c
@@ -113,7 +113,7 @@ explain(void)
 
     pr("\t\tCurrent EMPIRE Command List\n"
        "\t\t------- ------ ------- ----\n"
 
     pr("\t\tCurrent EMPIRE Command List\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"
        "$ - must be non-broke\tc -- must have capital\n"
        "Args in [brackets] are optional.\n"
        "Next 2 chars (if present) are:\n"
        "$ - must be non-broke\tc -- must have capital\n"
        "Args in [brackets] are optional.\n"

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index b9ede347780c7941bf54a791bd975b164b6b37f1..e4eead29daa90d5df45a4d485247c33acd1b4292 100644 (file)
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -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("    Theirs: %d\n", d_cas);
 
     pr("- Casualties -\n     Yours: %d\n", a_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);
 
     if (success) {
     player->btused += (int)((d_cas + a_cas) * 0.015 + 0.5);
 
     if (success) {

diff --git a/src/lib/update/age.c b/src/lib/update/age.c
index e27504bb67c98aff5e34c7af43a26cdf9755b150..6c7de80a32ef5724f11bd11c742772dced5d19fe 100644 (file)
--- a/src/lib/update/age.c
+++ b/src/lib/update/age.c
@@ -40,7 +40,7 @@
 int
 age_people(int n, int etu)
 {
 int
 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));
 }
 

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 80c9be1ffb726447d85896c3d1c88245e9a7fded..8741901534d250e983f0d921349b249f1558e675 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -63,7 +63,7 @@ update_main(void)
     struct natstr *np;
 
     update_running = 1;
     struct natstr *np;
 
     update_running = 1;

-    logerror("production update (%d etus)", etu);
+    logerror("production update (%d ETUs)", etu);

     getrusage(RUSAGE_SELF, &rus1);
     game_record_update(time(NULL));
     journal_update(etu);
     getrusage(RUSAGE_SELF, &rus1);
     game_record_update(time(NULL));
     journal_update(etu);

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index d57d80b73d6c17a1c102b45ed4e64b4546bb0351..9f1b99e98511725dd604b5d966d156a600216dc5 100644 (file)
--- a/tests/retreat/journal.log
+++ b/tests/retreat/journal.log
@@ -655,7 +655,7 @@
     Play#1 output Play#1 1 - Casualties -
     Play#1 output Play#1 1      Yours: 1
     Play#1 output Play#1 1     Theirs: 0
     Play#1 output Play#1 1 - Casualties -
     Play#1 output Play#1 1      Yours: 1
     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 6 0 569
     Play#1 input board 132 5
     Play#1 output Play#1 1 You have been repelled
     Play#1 output Play#1 6 0 569
     Play#1 input board 132 5


@@ -673,7 +673,7 @@
     Play#1 output Play#1 1 - Casualties -
     Play#1 output Play#1 1      Yours: 50
     Play#1 output Play#1 1     Theirs: 15
     Play#1 output Play#1 1 - Casualties -
     Play#1 output Play#1 1      Yours: 50
     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 Ship #132 is not in the same sector!
     Play#1 output Play#1 6 0 565
     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 6 0 565

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index f5585bef32352b56bb98823c2da2f0ec7df02b0c..2fbe50c0ebbc5c3ddeb577a9eeb187a76265e562 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -2556,7 +2556,7 @@
     Play#1 output Play#1 1 - Casualties -
     Play#1 output Play#1 1      Yours: 0
     Play#1 output Play#1 1     Theirs: 0
     Play#1 output Play#1 1 - Casualties -
     Play#1 output Play#1 1      Yours: 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 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 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 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      Yours: 6
     Play#1 output Play#1 1     Theirs: 0
     Play#1 output Play#1 1 - Casualties -
     Play#1 output Play#1 1      Yours: 6
     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 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 been defeated!
     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 ...

diff --git a/tests/smoke/server.log b/tests/smoke/server.log
index 24f4825712d32707716178c3a5dab169ad321765..863fd28a9cb99393164a4eb3cc72f6bbfda01bd5 100644 (file)
--- a/tests/smoke/server.log
+++ b/tests/smoke/server.log
@@ -57,7 +57,7 @@ Connect from 127.0.0.1
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 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 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 producing for countries...

diff --git a/tests/update/server.log b/tests/update/server.log
index 5ed5ea33e14224c85b52ad3df0fd093ff8b6565e..ced92ee2addc1db23bb50946b79692c1085d54a1 100644 (file)
--- a/tests/update/server.log
+++ b/tests/update/server.log
@@ -37,7 +37,7 @@ Connect from 127.0.0.1
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update
 tester@127.0.0.1 using country #0
 tester@127.0.0.1 logged in as country #0
 Triggering unscheduled update

-production update (60 etus)
+production update (60 ETUs)

 preparing sectors...
 done preparing sectors.
 producing for countries...
 preparing sectors...
 done preparing sectors.
 producing for countries...

diff --git a/tests/version/journal.log b/tests/version/journal.log
index 1acf6393663559b82350274d6940758d079dba08..cd5c4ef9e4c7b9253541b1b75ef173becf891362 100644 (file)
--- a/tests/version/journal.log
+++ b/tests/version/journal.log
@@ -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 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 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

-    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 give birth to 5.0 babies 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 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 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 No food is needed!
     Play#0 output Play#0 1
     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 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

-    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 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 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 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 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 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

-    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 give birth to 5.0 babies 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 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 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 No food is needed!
     Play#2 output Play#2 1
     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 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

-    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 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 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 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 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 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

-    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 give birth to 5.0 babies 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 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 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 No food is needed!
     Play#1 output Play#1 1
     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 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

-    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 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 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 Up to 50 avail can roll over an update.