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

(hap_req): New.

Browse source 
(nati, populace): Use it.

(populace, nati): Change hap, pct from float to double, because they
are used as double.

(nati): Print happiness needed with just two decimals, like the other
levels.
This commit is contained in:
Markus Armbruster 2006-05-06 11:07:35 +00:00
parent 222847bb75
commit 97be5018e2
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/lib/update/populace.c
View file

@ -49,10 +49,7 @@
void
populace(struct natstr *np, struct sctstr *sp, int etu)
{
float hap;
float tech;
float edu;
float pct;
double hap, pct;
int n;
int civ = sp->sct_item[I_CIVIL];
int mil = sp->sct_item[I_MILIT];
@ -74,11 +71,9 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
}
hap = np->nat_level[NAT_HLEV];
edu = np->nat_level[NAT_ELEV];
tech = np->nat_level[NAT_TLEV];
pct = (double)((tech - 40) / 40.0 + edu / 3.0);
pct = hap_req(np);
if (sp->sct_own == sp->sct_oldown && hap < pct &&
chance(((double)pct - (double)hap) / (double)5.0)) {
chance((pct - hap) / 5.0)) {
/*
* zap the loyalty of unhappy civilians.
* there is a 20% chance per hap point below the