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

fairland: Tweak rural iron, fert, oil for simplicity

Browse source 
The previous commit's interpolation tables reproduce the historical
linear functions faithfully.  This exact fit requires an awkward data
point in each of the tables for iron fertility and oil.  Drop them.

No double-valued data points remain.  Adjust struct resource_point
member @res to int.

This results in slightly less rural iron (33 elevations down one
point), fertility (10 elevations down one point) and oil (14
elevations down one point, 5 down two points).  Only resource values
less than 100 are affected.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-21 08:31:56 +02:00
parent 8c15a3fe32
commit 6642878d5f
5 changed files with 541 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/util/fairland.c
View file

@ -144,14 +144,12 @@
*/
struct resource_point {
int elev;
double res;
int elev, res;
};
struct resource_point iron_conf[] = {
{ -127, 0 },
{ 21, 0 },
{ 84, 120.0 * 63 / 76 },
{ 85, 100 },
{ HIGHMIN - 1, 100 },
{ HIGHMIN , 0 },
@ -170,7 +168,6 @@ struct resource_point fert_conf[] = {
{ LANDMIN - 1, 41 },
{ LANDMIN, 100 },
{ 10, 100 },
{ 11, 120.0 * 45 / 55 },
{ 56, 0 },
{ 127, 0 } };
@ -180,7 +177,6 @@ struct resource_point oil_conf[] = {
{ LANDMIN - 1, 2 },
{ LANDMIN, 100 },
{ 6, 100 },
{ 7, 120.0 * 27 / 33 },
{ 34, 0 },
{ 127, 0 } };
@ -1406,8 +1402,7 @@ elev_to_sct_type(int elevation)
static int
elev_to_resource(int elev, struct resource_point conf[])
{
int i, elev1, elev2, delev;
double res1, res2, dres;
int i, elev1, elev2, delev, res1, res2, dres;
for (i = 1; elev > conf[i].elev; i++) ;
assert(conf[i - 1].elev <= elev);
@ -1418,7 +1413,7 @@ elev_to_resource(int elev, struct resource_point conf[])
res1 = conf[i - 1].res;
res2 = conf[i].res;
dres = res2 - res1;
return (int)(res1 + ((elev - elev1) * dres) / delev);
return (int)(res1 + (double)((elev - elev1) * dres) / delev);
}
static void