(infect_people): Use max_pop() to compute space. This makes all

crowded sectors equally vulnerable, including mountains, plains, and
inefficient big cities.  Closes #917488.
Update info.
This commit is contained in:
Markus Armbruster 2004-08-10 07:56:34 +00:00
parent d721ba3b5c
commit 298ba998e4
2 changed files with 2 additions and 2 deletions

View file

@ -83,7 +83,7 @@ technology, population, standard of living and the Empire Plague:
Likelihood of plague outbreak (in percent) is Likelihood of plague outbreak (in percent) is
civ + mil + uw t_level + (iron + oil + rad * 2) / 10 + 100 civ + mil + uw t_level + (iron + oil + rad * 2) / 10 + 100
max (0, -------------- * ------------------------------------------- - 1) max (0, -------------- * ------------------------------------------- - 1)
999 r_level + effic + mobil + 100 max_pop r_level + effic + mobil + 100
.FI .FI
.s1 .s1
Later formulations of this relationship show great similarity Later formulations of this relationship show great similarity

View file

@ -133,7 +133,7 @@ infect_people(struct natstr *np, struct sctstr *sp)
* make plague where there was none before... * make plague where there was none before...
*/ */
pop = sp->sct_item[I_CIVIL] + sp->sct_item[I_MILIT] + sp->sct_item[I_UW]; pop = sp->sct_item[I_CIVIL] + sp->sct_item[I_MILIT] + sp->sct_item[I_UW];
pop_space = opt_BIG_CITY && (sp->sct_type == SCT_CAPIT) ? 9999.0 : 999.0; pop_space = max_pop(np->nat_level[NAT_RLEV], sp);
bad_stuff bad_stuff
= sp->sct_item[I_IRON] + sp->sct_item[I_OIL] + sp->sct_item[I_RAD] * 2; = sp->sct_item[I_IRON] + sp->sct_item[I_OIL] + sp->sct_item[I_RAD] * 2;
pollution = bad_stuff / 10.0 + np->nat_level[NAT_TLEV] + 100.0; pollution = bad_stuff / 10.0 + np->nat_level[NAT_TLEV] + 100.0;