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

Age che just like reserves (1% per 24 ETUs)

Browse source 
Factor aging out of age_levels() into new age_people().  Use it in
do_feed() to age che.
This commit is contained in:
Markus Armbruster 2008-10-26 13:08:01 -04:00
parent a090b7878a
commit cacc393c53
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/prototypes.h
View file

@ -704,6 +704,7 @@ extern int wu(natid, natid, char *, ...) ATTRIBUTE((format (printf, 3, 4)));
* src/lib/update/ *.c * src/lib/update/ *.c
*/ */
/* age.c */ /* age.c */
extern int age_people(int, int);
extern void age_levels(int); extern void age_levels(int);
/* anno.c */ /* anno.c */
extern void delete_old_announcements(void); extern void delete_old_announcements(void);

17
src/lib/update/age.c
View file

@ -35,6 +35,13 @@
#include "update.h" #include "update.h"
int
age_people(int n, int etu)
{
/* age by 1% per 24 etus */
return roundavg(n * (1.0 - etu / 2400.0));
}
void void
age_levels(int etu) age_levels(int etu)
{ {
@ -43,7 +50,6 @@ age_levels(int etu)
int i; int i;
double level; double level;
double delta; double delta;
int deltares;
best_tech = 0.0; best_tech = 0.0;
best_res = 0.0; best_res = 0.0;
@ -61,14 +67,7 @@ age_levels(int etu)
delta = np->nat_level[NAT_TLEV] * etu / (100 * level_age_rate); delta = np->nat_level[NAT_TLEV] * etu / (100 * level_age_rate);
np->nat_level[NAT_TLEV] -= delta; np->nat_level[NAT_TLEV] -= delta;
} }
/* np->nat_reserve = age_people(np->nat_reserve, etu);
* age reserves by 1% per every 24 etus
*/
deltares = -roundavg(np->nat_reserve * etu / 2400.0);
if (deltares != 0)
np->nat_reserve += deltares;
/* Chad Zabel - above number is negative ( was a -= there
which was wrong. */
} }
best_tech /= 5; best_tech /= 5;
best_res /= 5; best_res /= 5;

3
src/lib/update/human.c
View file

@ -114,6 +114,9 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
if (!player->simulation) if (!player->simulation)
sp->sct_work = sctwork; sp->sct_work = sctwork;
grow_people(sp, etu, np, &work_avail, sctwork, vec); grow_people(sp, etu, np, &work_avail, sctwork, vec);
/* age che */
if (!player->simulation)
sp->sct_che = age_people(sp->sct_che, etu);
} }
if (manna) if (manna)
/* Take away food we conjured up */ /* Take away food we conjured up */