/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* nat.c: Accumulate tech, edu, research and happiness.
- *
+ *
* Known contributors to this file:
* Dave Pare, 1989
* Steve McClure, 1997
*/
+#include <config.h>
+
#include <math.h>
-#include "misc.h"
-#include "var.h"
-#include "sect.h"
-#include "nat.h"
+#include "budg.h"
+#include "game.h"
#include "item.h"
-#include "news.h"
-#include "file.h"
-#include "xy.h"
-#include "optlist.h"
#include "update.h"
-#include "subs.h"
-#include "budg.h"
/*
* hap and edu avg mean that the weight on current happiness is
* level of 0 yields (1) 0.4, (6) 2.2, (12) 3.9, (18) 5.2.
*/
-extern float hap_avg;
-extern float edu_avg;
-extern float ally_factor;
-
-static void share_incr(register double *, register double *);
+static void share_incr(double *, double *);
/*
* for values below the "easy level" values, production is
* They are changed later in the limit_level routine.
*/
/*tech res edu hap */
-float level_easy[4] = { 0.75, 0.75, 5.00, 5.00 };
-float level_log[4] = { 1.75, 2.00, 4.00, 6.00 };
+static float level_easy[4] = { 0.75, 0.75, 5.00, 5.00 };
+static float level_log[4] = { 1.75, 2.00, 4.00, 6.00 };
float levels[MAXNOC][4];
* into tech plants overnight...
*/
-double
+static double
logx(double d, double base)
{
if (base == 1.0)
above = logx(above_easy + 1.0, logbase);
if (above > 250)
above = 250;
- return ((above) < 0) ? easy : (easy + above);
+ return above < 0 ? easy : easy + above;
} else
return level;
}
double res[MAXNOC];
double newvalue;
natid n;
- int cn, cont;
+ int cn;
+ struct natstr *cnp;
for (n = 0; NULL != (np = getnatp(n)); n++) {
- if ((np->nat_stat & STAT_NORM) == 0)
+ grant_btus(np, game_reset_tick(&np->nat_access));
+ if (np->nat_stat < STAT_ACTIVE)
continue;
/*
* hap_edu: the more education people have, the
hap = levels[n][NAT_HLEV] * hap_edu * hap_cons /
((float)pop * etu);
edu = levels[n][NAT_ELEV] * edu_cons / ((float)pop * etu);
- wu((natid)0, n, "%3.0f happiness, %3.0f education produced\n",
+ wu(0, n, "%3.0f happiness, %3.0f education produced\n",
levels[n][NAT_HLEV], levels[n][NAT_ELEV]);
hap = limit_level(hap, NAT_HLEV, 1);
edu = limit_level(edu, NAT_ELEV, 1);
limit_level(levels[n][NAT_TLEV] / 1, NAT_TLEV, 0) * 1;
levels[n][NAT_RLEV] =
limit_level(levels[n][NAT_RLEV] / 1, NAT_RLEV, 0) * 1;
- wu((natid)0, n,
- "total pop is %d, yielding %4.2f hap, %4.2f edu\n",
+ wu(0, n, "total pop was %ld, yielding %4.2f hap, %4.2f edu\n",
pop - 1, hap, edu);
}
if (ally_factor > 0.0)
memset(tech, 0, sizeof(tech));
}
for (n = 0; NULL != (np = getnatp(n)); n++) {
- if ((np->nat_stat & STAT_NORM) == 0)
+ if (np->nat_stat < STAT_ACTIVE)
continue;
tlev = levels[n][NAT_TLEV];
rlev = levels[n][NAT_RLEV];
if (tech[n] != 0.0 || res[n] != 0.0) {
- wu((natid)0, n,
- "%5.4f technology (%5.4f + %5.4f), ",
+ wu(0, n, "%5.4f technology (%5.4f + %5.4f), ",
tlev + tech[n], tlev, tech[n]);
- wu((natid)0, n,
- "%5.4f research (%5.4f + %5.4f) produced\n",
+ wu(0, n, "%5.4f research (%5.4f + %5.4f) produced\n",
rlev + res[n], rlev, res[n]);
} else
- wu((natid)0, n,
- "%5.4f tech, %5.4f research produced\n", tlev, rlev);
+ wu(0, n, "%5.4f tech, %5.4f research produced\n", tlev, rlev);
rlev += res[n];
tlev += tech[n];
if (rlev != 0.0)
np->nat_level[NAT_TLEV] += tlev;
if ((sea_money[n] != 0) || (air_money[n] != 0) ||
(lnd_money[n] != 0))
- wu((natid)0, n,
- "Army delta $%d, Navy delta $%d, Air force delta $%d\n",
+ wu(0, n,
+ "Army delta $%ld, Navy delta $%ld, Air force delta $%ld\n",
lnd_money[n], sea_money[n], air_money[n]);
- wu((natid)0, n, "money delta was $%d for this update\n",
+ wu(0, n, "money delta was $%ld for this update\n",
np->nat_money - money[n]);
if (opt_LOSE_CONTACT) {
- for (cn = 0; cn <= MAXNOC; cn++) {
- cont = getcontact(np, cn);
- if (cont > 0) {
- logerror("country %d at level %d with country %d.\n",
- n, cont, cn);
- setcont(n, cn, cont - 1);
- }
+ for (cn = 1; cn < MAXNOC; cn++) {
+ if ((cnp = getnatp(cn)) != NULL)
+ agecontact(cnp);
}
}
}
* find out everyones increment
*/
static void
-share_incr(register double *res, register double *tech)
+share_incr(double *res, double *tech)
{
- register struct natstr *np;
- register struct natstr *other;
- register natid i;
- register natid j;
+ struct natstr *np;
+ struct natstr *other;
+ natid i;
+ natid j;
int rnc;
int tnc;
for (i = 0; NULL != (np = getnatp(i)); i++) {
res[i] = tech[i] = 0.0;
- if ((np->nat_stat & STAT_INUSE) == 0)
- continue;
- if (np->nat_stat & STAT_GOD)
- continue;
- if (np->nat_stat == VIS)
+ if (np->nat_stat < STAT_SANCT || np->nat_stat == STAT_GOD)
continue;
rnc = tnc = 0;
for (j = 0; NULL != (other = getnatp(j)); j++) {
if (j == i)
continue;
- if (other->nat_stat & STAT_GOD)
- continue;
- if (other->nat_stat == VIS)
- continue;
- if ((other->nat_stat & STAT_INUSE) == 0)
+ if (other->nat_stat != STAT_ACTIVE)
continue;
if (opt_HIDDEN) {
if (!getcontact(np, j))
continue;
}
if (!opt_ALL_BLEED) {
- if (getrel(np, j) != ALLIED)
+ if (relations_with(i, j) != ALLIED)
continue;
- if (getrel(other, i) != ALLIED)
+ if (relations_with(j, i) != ALLIED)
continue;
res[i] += levels[j][NAT_RLEV];
tech[i] += levels[j][NAT_TLEV];
}
}
}
- if (rnc == 0 && tnc == 0)
- continue;
if (rnc > 0) {
res[i] /= rnc * ally_factor;
}
if (tnc > 0) {
tech[i] /= tnc * ally_factor;
}
-/* logerror("Country #%d gets %g res from %d allies, %g tech from %d allies", i, res[i], rnc, tech[i], tnc);*/
}
}
projects / empserver / blobdiff