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

(hard_tech): Unused, remove.

Browse source 
(configkeys): Fix km_flags of key anno_keep_days.
This commit is contained in:
Markus Armbruster 2004-08-30 21:12:15 +00:00
parent 7362ad6c19
commit 7a4f133d1c
3 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/econfig-spec.h
View file

@ -123,8 +123,6 @@ EMPCFBOTH("war_cost", War_Cost, int, intset, 0,
EMPCF_COMMENT("\n\n### Technology/Research/Education/Happiness") EMPCF_COMMENT("\n\n### Technology/Research/Education/Happiness")
EMPCFBOTH("easy_tech", easy_tech, float, floatset, 0, EMPCFBOTH("easy_tech", easy_tech, float, floatset, 0,
"Amount of tech built with no penalty") "Amount of tech built with no penalty")
EMPCFBOTH("hard_tech", hard_tech, float, floatset, 0,
"Amount of in-efficiently built tech")
EMPCFBOTH("start_tech", start_technology, float, floatset, 0, EMPCFBOTH("start_tech", start_technology, float, floatset, 0,
"Starting technology for new countries") "Starting technology for new countries")
EMPCFBOTH("start_happy", start_happiness, float, floatset, 0, EMPCFBOTH("start_happy", start_happiness, float, floatset, 0,
@ -291,7 +289,7 @@ EMPCFBOTH("trade_ally_cut", trade_ally_cut, float, floatset, 0,
"Bonus your ally gets for you cashing in with them") "Bonus your ally gets for you cashing in with them")
EMPCF_COMMENT("\n\n### Misc.") EMPCF_COMMENT("\n\n### Misc.")
EMPCFBOTH("anno_keep_days", anno_keep_days, int, intset, 7, EMPCFBOTH("anno_keep_days", anno_keep_days, int, intset, 0,
"How long until announcements expire (<0 means never)") "How long until announcements expire (<0 means never)")
EMPCFBOTH("fuel_mult", fuel_mult, int, intset, 0, EMPCFBOTH("fuel_mult", fuel_mult, int, intset, 0,
"Multiplier for fuel to mobility calculation") "Multiplier for fuel to mobility calculation")

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

@ -114,7 +114,6 @@ vers(void)
(int)(level_age_rate)); (int)(level_age_rate));
pr("Tech Buildup is "); pr("Tech Buildup is ");
/* if (tech_log_base <= 1.0 && hard_tech == 0.0) { */
if (tech_log_base <= 1.0) { if (tech_log_base <= 1.0) {
pr("not limited\n"); pr("not limited\n");
} }
@ -125,14 +124,6 @@ vers(void)
else else
pr(" after %0.2f.\n", easy_tech); pr(" after %0.2f.\n", easy_tech);
} }
/*else {
pr("limited to asymptotic growth towards %.2f",
hard_tech + easy_tech);
if (easy_tech == 0.00)
pr(".\n");
else
pr("after %.2f\n",easy_tech);
} */
pr("\n"); pr("\n");
pr("\t\t\t\tSectors\tShips\tPlanes\tUnits\n"); pr("\t\t\t\tSectors\tShips\tPlanes\tUnits\n");
pr("Maximum mobility\t\t%d\t%d\t%d\t%d\n", sect_mob_max, pr("Maximum mobility\t\t%d\t%d\t%d\t%d\n", sect_mob_max,

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

@ -184,15 +184,8 @@ float hap_avg = 16.0 * 3.0;
float edu_avg = 16.0 * 12.0; float edu_avg = 16.0 * 12.0;
/* tech build limitations. Tech limits only apply after easy_tech. /* tech build limitations. */
* Two ways of limiting tech: asymptotic or logrithmic:
* tech_hard is asymptopic limitation, tech_log_base is the logrithmic
* limitation. set tech_log_base > 1.0 to have it take effect,
* set hard_tech > 0 to have it take effect
* for log based, only tech values where the slop is < 1 are used */
float easy_tech = 1.00; /* amount of tech built with no penality */ float easy_tech = 1.00; /* amount of tech built with no penality */
float hard_tech = 10.0; /* amount of in-efficiently built tech */
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 */