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

(meltitems): Move melt_item_denom into the ichr structure.

Browse source
This commit is contained in:
Ron Koenderink 2005-07-24 22:20:05 +00:00
parent 193b7fdbad
commit 7920252986
4 changed files with 21 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/global/constants.c
View file

@ -124,14 +124,6 @@ double uwbrate = 0.0025; /* uncompensated worker birth rate */
int rollover_avail_max = 0; /* max. avail that can roll over an update */
/* opt_FALLOUT */
/* these are the radioactive decay constants */
/* fraction of commodity destroyed is
etus*fallout/(1000*melt_item_denom[item])
higher denominators for tougher commodities */
int melt_item_denom[] = {
/* civ mil shell gun pet iron dust bar food oil lcm hcm uw rads */
4, 20, 80, 100, 50, 100, 100, 200, 2, 50, 100, 100, 2, 1000
};
double decay_per_etu = 0.006; /* This gives a half life of ? etus,
about ? days.
half life in Jt

32
src/lib/global/item.c
View file

@ -35,22 +35,22 @@
#include "item.h"
struct ichrstr ichr[I_MAX + 2] = {
/* mnem vtype val sell lbs {in rg wh ur bnk} name */
{'c', I_CIVIL, 1, 0, 1, {1, 10, 10, 10, 10}, "civilians"},
{'m', I_MILIT, 0, 0, 1, {1, 1, 1, 1, 1}, "military"},
{'s', I_SHELL, 5, 1, 1, {1, 1, 10, 1, 1}, "shells"},
{'g', I_GUN, 60, 1, 10, {1, 1, 10, 1, 1}, "guns"},
{'p', I_PETROL, 4, 1, 1, {1, 1, 10, 1, 1}, "petrol"},
{'i', I_IRON, 2, 1, 1, {1, 1, 10, 1, 1}, "iron ore"},
{'d', I_DUST, 20, 1, 5, {1, 1, 10, 1, 1}, "dust (gold)"},
{'b', I_BAR, 280, 1, 50, {1, 1, 5, 1, 4}, "bars of gold"},
{'f', I_FOOD, 0, 1, 1, {1, 1, 10, 1, 1}, "food"},
{'o', I_OIL, 8, 1, 1, {1, 1, 10, 1, 1}, "oil"},
{'l', I_LCM, 2, 1, 1, {1, 1, 10, 1, 1}, "light products"},
{'h', I_HCM, 4, 1, 1, {1, 1, 10, 1, 1}, "heavy products"},
{'u', I_UW, 1, 1, 2, {1, 1, 2, 1, 1}, "uncompensated workers"},
{'r', I_RAD, 150, 1, 8, {1, 1, 10, 1, 1}, "radioactive materials"},
{0, I_NONE, 0, 0, 0, {0, 0, 0, 0, 0}, NULL}
/* mnem vtype val sell lbs {in rg wh ur bnk} melt name */
{'c', I_CIVIL, 1, 0, 1, {1, 10, 10, 10, 10}, 4, "civilians"},
{'m', I_MILIT, 0, 0, 1, {1, 1, 1, 1, 1}, 20, "military"},
{'s', I_SHELL, 5, 1, 1, {1, 1, 10, 1, 1}, 80, "shells"},
{'g', I_GUN, 60, 1, 10, {1, 1, 10, 1, 1}, 100, "guns"},
{'p', I_PETROL, 4, 1, 1, {1, 1, 10, 1, 1}, 50, "petrol"},
{'i', I_IRON, 2, 1, 1, {1, 1, 10, 1, 1}, 100, "iron ore"},
{'d', I_DUST, 20, 1, 5, {1, 1, 10, 1, 1}, 100, "dust (gold)"},
{'b', I_BAR, 280, 1, 50, {1, 1, 5, 1, 4}, 200, "bars of gold"},
{'f', I_FOOD, 0, 1, 1, {1, 1, 10, 1, 1}, 2, "food"},
{'o', I_OIL, 8, 1, 1, {1, 1, 10, 1, 1}, 50, "oil"},
{'l', I_LCM, 2, 1, 1, {1, 1, 10, 1, 1}, 100, "light products"},
{'h', I_HCM, 4, 1, 1, {1, 1, 10, 1, 1}, 100, "heavy products"},
{'u', I_UW, 1, 1, 2, {1, 1, 2, 1, 1}, 2, "uncompensated workers"},
{'r', I_RAD, 150, 1, 8, {1, 1, 10, 1, 1},1000, "radioactive materials"},
{0, I_NONE, 0, 0, 0, {0, 0, 0, 0, 0}, 0, NULL}
};
int itm_maxno = (sizeof(ichr) / sizeof(struct ichrstr)) - 1;