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

(pchrstr, MAXPRCON): Simplify variable-style storage of constituents.

Browse source 
Store only up to MAXPRCON constituents, not MAXCHRNV; code doesn't
fully support more than three anyway.  Remove member p_nv, use item
type I_NONE for unused slots.  Rename members p_vtype, p_vamt to
p_ctype, p_camt to avoid confusion with variable-style storage.
(pchr): Initializers adapted.
(nullify_objects, materials_cost, materials_charge, prod,
show_sect_capab, grind): Adapt, simplify where possible, protect
against bad item types in pchr[].
(MAXCHRNV): Unused, remove.
This commit is contained in:
Markus Armbruster 2004-08-17 15:19:46 +00:00
parent 15d4f89951
commit 4d154753b8
8 changed files with 103 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,58 +41,58 @@
struct pchrstr pchr[] = {
/* level cost nrndx nrdep nlndx nlmin nllag effic sname name */
{0, {0}, {0},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
0, 0, 0, 0, 0, 0, 0, 0, 0,
"unused", "",},
{2, {V_LCM, V_HCM}, {2, 1},
{{I_LCM, I_HCM, I_NONE}, {2, 1, 0},
V_SHELL, -1, 3, 0, 0, NAT_TLEV, 20, 10, 100,
"shells", "shells",},
{3, {V_OIL, V_LCM, V_HCM}, {1, 5, 10},
{{I_OIL, I_LCM, I_HCM}, {1, 5, 10},
V_GUN, -1, 30, 0, 0, NAT_TLEV, 20, 10, 100,
"guns", "guns",},
{1, {V_OIL}, {1},
{{I_OIL, I_NONE, I_NONE}, {1, 0, 0},
V_PETROL, -1, 1, 0, 0, NAT_TLEV, 20, 10, 1000,
"petrol", "petrol",},
{0, {0}, {0},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_IRON, -1, 0, offsetof(struct sctstr, sct_min), 0, -1, 0, 0, 100,
"iron ore", "iron",},
{0, {0}, {0},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0, 100,
"gold dust", "dust",},
{1, {V_DUST}, {5},
{{I_DUST, I_NONE, I_NONE}, {5, 0, 0},
V_BAR, -1, 10, 0, 0, -1, 0, 0, 100,
"gold bars", "bars",},
{0, {0}, {0},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_FOOD, -1, 0, offsetof(struct sctstr, sct_fertil), 0, NAT_TLEV, -10, 10, 900,
"food", "food",},
{0, {0}, {0},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_OIL, -1, 0, offsetof(struct sctstr, sct_oil), 10, NAT_TLEV, -10, 10, 100,
"oil", "oil",},
{1, {V_IRON}, {1},
{{I_IRON, I_NONE, I_NONE}, {1, 0, 0},
V_LCM, -1, 0, 0, 0, NAT_TLEV, -10, 10, 100,
"light construction materials", "lcm",},
{1, {V_IRON}, {2},
{{I_IRON, I_NONE, I_NONE}, {2, 0, 0},
V_HCM, -1, 0, 0, 0, NAT_TLEV, -10, 10, 100,
"heavy construction materials", "hcm",},
{3, {V_DUST, V_OIL, V_LCM}, {1, 5, 10},
{{I_DUST, I_OIL, I_LCM}, {1, 5, 10},
0, NAT_TLEV, 300, 0, 0, NAT_ELEV, 5, 10, 100,
"technological breakthroughs", "tech",},
{3, {V_DUST, V_OIL, V_LCM}, {1, 5, 10},
{{I_DUST, I_OIL, I_LCM}, {1, 5, 10},
0, NAT_RLEV, 90, 0, 0, NAT_ELEV, 5, 10, 100,
"medical discoveries", "medical",},
{1, {V_LCM}, {1},
{{I_LCM, I_NONE, I_NONE}, {1, 0, 0},
0, NAT_ELEV, 9, 0, 0, -1, 0, 0, 100,
"a class of graduates", "edu",},
{1, {V_LCM}, {1},
{{I_LCM, I_NONE, I_NONE}, {1, 0, 0},
0, NAT_HLEV, 9, 0, 0, -1, 0, 0, 100,
"happy strollers", "happy",},
{0, {0}, {0},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_RAD, -1, 2, offsetof(struct sctstr, sct_uran), 35, NAT_TLEV, 40, 10, 100,
"radioactive materials", "rad",},
{0, {0}, {0},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0, 75,
"gold dust", "dust",},
{0, {0}, {0},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
0, 0, 0, 0, 0, 0, 0, 0, 0, "", "",}
};