From: Markus Armbruster Date: Sun, 30 Jul 2017 14:55:04 +0000 (+0200) Subject: Spell BTU and ETU consistently X-Git-Tag: v4.4.0~55 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=2bcd875715aa6a77bd444047625a7d16c18125dd Spell BTU and ETU consistently Signed-off-by: Markus Armbruster --- diff --git a/include/com.h b/include/com.h index 850d13f61..bd561984c 100644 --- a/include/com.h +++ b/include/com.h @@ -35,7 +35,7 @@ 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 */ diff --git a/include/econfig-spec.h b/include/econfig-spec.h index 16ac229a0..1fac4c631 100644 --- 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, - "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, diff --git a/include/game.h b/include/game.h index 62659f260..c235f237c 100644 --- 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 */ - 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 */ }; diff --git a/include/land.h b/include/land.h index 0cdd30284..2f378647f 100644 --- 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 */ - 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) */ }; diff --git a/include/sect.h b/include/sect.h index 87368ee5e..8abfc0500 100644 --- 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_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; diff --git a/include/ship.h b/include/ship.h index 2019c458a..8457bb915 100644 --- 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 */ - 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; diff --git a/info/lookout.t b/info/lookout.t index e22d2cc73..96716cc4a 100644 --- 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 -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 diff --git a/src/lib/commands/chan.c b/src/lib/commands/chan.c index 8bb275403..6c15bca64 100644 --- 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) { - 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; } - 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; diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c index b5d14def4..81e16e3ea 100644 --- 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) { - 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); diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c index d95de6cf7..07d4bc11c 100644 --- 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"); - 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); - pr("1000 civilians will harvest %.1f food per etu.\n", + pr("1000 civilians will harvest %.1f food per ETU.\n", 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); @@ -92,7 +92,7 @@ vers(void) 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); diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c index 4869f66fe..af7b929ec 100644 --- 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 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 */ @@ -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 */ -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) @@ -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 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? */ @@ -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 */ -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 */ diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c index a4ecf09af..2c926b3ed 100644 --- 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 { - pr("You don't have the BTU's, bozo\n"); + pr("You don't have the BTUs, bozo\n"); return 0; } } diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index c66504f51..84f990d66 100644 --- 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" - "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" diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index b9ede3477..e4eead29d 100644 --- 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("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) { diff --git a/src/lib/update/age.c b/src/lib/update/age.c index e27504bb6..6c7de80a3 100644 --- a/src/lib/update/age.c +++ b/src/lib/update/age.c @@ -40,7 +40,7 @@ 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)); } diff --git a/src/lib/update/main.c b/src/lib/update/main.c index 80c9be1ff..874190153 100644 --- 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; - logerror("production update (%d etus)", etu); + logerror("production update (%d ETUs)", 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 d57d80b73..9f1b99e98 100644 --- 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 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 @@ -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 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 diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log index f5585bef3..2fbe50c0e 100644 --- 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 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 @@ -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 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 ... diff --git a/tests/smoke/server.log b/tests/smoke/server.log index 24f482571..863fd28a9 100644 --- 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) 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 -production update (60 etus) +production update (60 ETUs) preparing sectors... done preparing sectors. producing for countries... diff --git a/tests/update/server.log b/tests/update/server.log index 5ed5ea33e..ced92ee2a 100644 --- 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 -production update (60 etus) +production update (60 ETUs) preparing sectors... done preparing sectors. producing for countries... diff --git a/tests/version/journal.log b/tests/version/journal.log index 1acf63936..cd5c4ef9e 100644 --- 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 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 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. @@ -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 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 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. @@ -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 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 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.