Update copyright notice

[empserver] / src / lib / update / human.c

diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index e05aa6b8d304beb71d6df08c9dbda820e91f270d..a22d373e5c2db0922b1522ca02dde36218f75399 100644 (file)
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -37,22 +37,28 @@
 #include <math.h>
 #include "chance.h"
 #include "item.h"
+#include "optlist.h"
+#include "nat.h"
 #include "news.h"
 #include "player.h"
+#include "prototypes.h"
+#include "sect.h"
 #include "update.h"
 #include "xy.h"
 
+static int new_work(struct sctstr *, int);
 static int growfood(struct sctstr *, int, int);
 static int starve_some(short *, i_type, int);
 static void trunc_people(struct sctstr *, struct natstr *);
-static int grow_people(struct sctstr *, int, struct natstr *);
-static int babies(int, int, double, int, int);
+static int grow_people(struct sctstr *, int, struct natstr *, int);
+static int babies(int, int, double, int, int, int);
 
 /*
  * feed the individual sector
  */
-int
-do_feed(struct sctstr *sp, struct natstr *np, int etu)
+void
+do_feed(struct sctstr *sp, struct natstr *np, int etu,
+       int round_babies_down)
 {
     int work_avail;
     int starved, sctwork;
@@ -68,7 +74,7 @@ do_feed(struct sctstr *sp, struct natstr *np, int etu)
                                     sp->sct_item[I_UW],
                                     maxworkers));
 
-    if (sp->sct_type != SCT_SANCT) {
+    if (sp->sct_type != SCT_WATER && sp->sct_type != SCT_SANCT) {
        manna = 0;
        if (opt_NOFOOD == 0) {
            needed = (int)ceil(food_needed(sp->sct_item, etu));
@@ -100,7 +106,7 @@ do_feed(struct sctstr *sp, struct natstr *np, int etu)
                sctwork += 7 + roll(15);
            if (sctwork > 100)
                sctwork = 100;
-           grow_people(sp, etu, np);
+           grow_people(sp, etu, np, round_babies_down);
            work_avail = new_work(sp,
                                  total_work(sp->sct_work, etu,
                                             sp->sct_item[I_CIVIL],
@@ -121,16 +127,22 @@ do_feed(struct sctstr *sp, struct natstr *np, int etu)
     trunc_people(sp, np);
 
     sp->sct_work = sctwork;
-    return work_avail;
+    sp->sct_avail = work_avail;
 }
 
-int
+static int
 new_work(struct sctstr *sp, int delta)
 {
-    if (sp->sct_type == sp->sct_newtype)
-       return MIN(rollover_avail_max, sp->sct_avail) + delta;
+    int rollover = sp->sct_avail;
 
-    return delta;
+    if (sp->sct_type != sp->sct_newtype)
+       rollover = 0;
+    if (rollover > rollover_avail_max)
+       rollover = rollover_avail_max;
+    if (rollover > delta / 2 + 1)
+       rollover = delta / 2 + 1;
+
+    return rollover + delta;
 }
 
 static int
@@ -231,17 +243,17 @@ trunc_people(struct sctstr *sp, struct natstr *np)
  * production?  Maybe with just high education?
  */
 static int
-grow_people(struct sctstr *sp, int etu, struct natstr *np)
+grow_people(struct sctstr *sp, int etu, struct natstr *np, int round_down)
 {
     int newciv;
     int newuw;
     int maxpop = max_pop(np->nat_level[NAT_RLEV], sp);
 
     newciv = babies(sp->sct_item[I_CIVIL], etu, obrate,
-                   sp->sct_item[I_FOOD], maxpop);
+                   sp->sct_item[I_FOOD], maxpop, round_down);
     sp->sct_item[I_CIVIL] += newciv;
     newuw = babies(sp->sct_item[I_UW], etu, uwbrate,
-                  sp->sct_item[I_FOOD], maxpop);
+                  sp->sct_item[I_FOOD], maxpop, round_down);
     sp->sct_item[I_UW] += newuw;
     /*
      * subtract the baby eat food (if we are using FOOD) and return
@@ -257,24 +269,28 @@ grow_people(struct sctstr *sp, int etu, struct natstr *np)
  * @brate is the birth rate.
  * @food is the food available for growing babies.
  * @maxpop is the population limit.
+ * If @round_down, discard fractions instead of rounding them
+ * randomly.
  */
 static int
-babies(int adults, int etu, double brate, int food, int maxpop)
+babies(int adults, int etu, double brate, int food, int maxpop,
+       int round_down)
 {
-    int new_birth, new_food, new;
+    double new_birth;
+    int new_food, new;
 
     if (adults >= maxpop)
        return 0;
 
-    new_birth = roundavg(brate * etu * adults);
-    if (opt_NOFOOD)
-       new_food = new_birth;
-    else
+    new_birth = brate * etu * adults;
+    new = round_down ? (int)new_birth : roundavg(new_birth);
+
+    if (!opt_NOFOOD) {
        new_food = (int)(food / (2.0 * babyeat));
+       if (new > new_food)
+           new = new_food;
+    }
 
-    new = new_birth;
-    if (new > new_food)
-       new = new_food;
     if (adults + new > maxpop)
        new = maxpop - adults;