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

(pchrstr, pchr_ca, pchr, sctstr, dchr_ca, dchr): Replace pchrstr

Browse source 
member p_effic by sctstr member d_peffic.  Tables updated.
(show_sect_capab): Adapted.
(prod_eff): Adapted; requires changing first parameter to sector type.
Callers changed.
(P_MDUST): Remove, because pchr[P_MDUST] now identical to
pchr[P_DUST].
This commit is contained in:
Markus Armbruster 2006-06-02 05:35:54 +00:00
parent 568b9d6639
commit da88d91899
10 changed files with 69 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/lib/global/product.c
View file

@ -43,56 +43,53 @@
struct pchrstr pchr[] = {
/* level cost nrndx nrdep nlndx nlmin nllag effic sname name */
{0, {I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_NONE, 0, 0, 0, 0, 0, 0, 0, 0,
I_NONE, 0, 0, 0, 0, 0, 0, 0,
"unused", "",},
{P_SHELL, {I_LCM, I_HCM, I_NONE}, {2, 1, 0},
I_SHELL, -1, 3, 0, 0, NAT_TLEV, 20, 10, 100,
I_SHELL, -1, 3, 0, 0, NAT_TLEV, 20, 10,
"shells", "shells",},
{P_GUN, {I_OIL, I_LCM, I_HCM}, {1, 5, 10},
I_GUN, -1, 30, 0, 0, NAT_TLEV, 20, 10, 100,
I_GUN, -1, 30, 0, 0, NAT_TLEV, 20, 10,
"guns", "guns",},
{P_PETROL, {I_OIL, I_NONE, I_NONE}, {1, 0, 0},
I_PETROL, -1, 1, 0, 0, NAT_TLEV, 20, 10, 1000,
I_PETROL, -1, 1, 0, 0, NAT_TLEV, 20, 10,
"petrol", "petrol",},
{P_IRON, {I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_IRON, -1, 0, offsetof(struct sctstr, sct_min), 0, -1, 0, 0, 100,
I_IRON, -1, 0, offsetof(struct sctstr, sct_min), 0, -1, 0, 0,
"iron ore", "iron",},
{P_DUST, {I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0, 100,
I_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0,
"gold dust", "dust",},
{P_BAR, {I_DUST, I_NONE, I_NONE}, {5, 0, 0},
I_BAR, -1, 10, 0, 0, -1, 0, 0, 100,
I_BAR, -1, 10, 0, 0, -1, 0, 0,
"gold bars", "bars",},
{P_FOOD, {I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_FOOD, -1, 0, offsetof(struct sctstr, sct_fertil), 0, NAT_TLEV, -10, 10, 900,
I_FOOD, -1, 0, offsetof(struct sctstr, sct_fertil), 0, NAT_TLEV, -10, 10,
"food", "food",},
{P_OIL, {I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_OIL, -1, 0, offsetof(struct sctstr, sct_oil), 10, NAT_TLEV, -10, 10, 100,
I_OIL, -1, 0, offsetof(struct sctstr, sct_oil), 10, NAT_TLEV, -10, 10,
"oil", "oil",},
{P_LCM, {I_IRON, I_NONE, I_NONE}, {1, 0, 0},
I_LCM, -1, 0, 0, 0, NAT_TLEV, -10, 10, 100,
I_LCM, -1, 0, 0, 0, NAT_TLEV, -10, 10,
"light construction materials", "lcm",},
{P_HCM, {I_IRON, I_NONE, I_NONE}, {2, 0, 0},
I_HCM, -1, 0, 0, 0, NAT_TLEV, -10, 10, 100,
I_HCM, -1, 0, 0, 0, NAT_TLEV, -10, 10,
"heavy construction materials", "hcm",},
{P_TLEV, {I_DUST, I_OIL, I_LCM}, {1, 5, 10},
I_NONE, NAT_TLEV, 300, 0, 0, NAT_ELEV, 5, 10, 100,
I_NONE, NAT_TLEV, 300, 0, 0, NAT_ELEV, 5, 10,
"technological breakthroughs", "tech",},
{P_RLEV, {I_DUST, I_OIL, I_LCM}, {1, 5, 10},
I_NONE, NAT_RLEV, 90, 0, 0, NAT_ELEV, 5, 10, 100,
I_NONE, NAT_RLEV, 90, 0, 0, NAT_ELEV, 5, 10,
"medical discoveries", "medical",},
{P_ELEV, {I_LCM, I_NONE, I_NONE}, {1, 0, 0},
I_NONE, NAT_ELEV, 9, 0, 0, -1, 0, 0, 100,
I_NONE, NAT_ELEV, 9, 0, 0, -1, 0, 0,
"a class of graduates", "edu",},
{P_HLEV, {I_LCM, I_NONE, I_NONE}, {1, 0, 0},
I_NONE, NAT_HLEV, 9, 0, 0, -1, 0, 0, 100,
I_NONE, NAT_HLEV, 9, 0, 0, -1, 0, 0,
"happy strollers", "happy",},
{P_URAN, {I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_RAD, -1, 2, offsetof(struct sctstr, sct_uran), 35, NAT_TLEV, 40, 10, 100,
I_RAD, -1, 2, offsetof(struct sctstr, sct_uran), 35, NAT_TLEV, 40, 10,
"radioactive materials", "rad",},
{P_MDUST, {I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0, 75,
"gold dust", "dust",},
{0, {I_NONE, I_NONE, I_NONE}, {0, 0, 0},
I_NONE, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL,}
I_NONE, 0, 0, 0, 0, 0, 0, 0, NULL, NULL,}
};