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

(V_CIVIL, V_MILIT, V_SHELL, V_GUN, V_PETROL, V_IRON, V_DUST, V_BAR,

Browse source 
V_FOOD, V_OIL, V_LCM, V_HCM, V_UW, V_RAD, V_ITEM): Remove, use item
types instead.
This commit is contained in:
Markus Armbruster 2004-08-17 16:12:31 +00:00
parent 09def8f156
commit 8ef7f35a56
17 changed files with 64 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/global/init.c
View file

@ -92,7 +92,7 @@ init_pchr(void)
for (p = pchr, pcount = 0; pcount < prd_maxno; pcount++, p++) {
if (opt_GO_RENEW) {
if (p->p_type == V_DUST || p->p_type == V_OIL)
if (p->p_type == I_DUST || p->p_type == I_OIL)
p->p_nrdep = 0;
}
}

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

@ -43,20 +43,20 @@ struct ichrstr ichr[I_MAX + 2] = {
/* mnem vtype val sell lbs rg,wh,ur,bnk name */
{'?', 0, 0, 0, 0, {0, 0, 0, 0}, "unused"},
/* STM CHANGED HERE */
{'c', V_CIVIL, 1, 0, 1, {10, 10, 10, 10}, "civilians"},
{'m', V_MILIT, 0, 0, 1, {1, 1, 1, 1}, "military"},
{'s', V_SHELL, 5, 1, 1, {1, 10, 1, 1}, "shells"},
{'g', V_GUN, 60, 1, 10, {1, 10, 1, 1}, "guns"},
{'p', V_PETROL, 4, 1, 1, {1, 10, 1, 1}, "petrol"},
{'i', V_IRON, 2, 1, 1, {1, 10, 1, 1}, "iron ore"},
{'d', V_DUST, 20, 1, 5, {1, 10, 1, 1}, "dust (gold)"},
{'b', V_BAR, 280, 1, 50, {1, 5, 1, 4}, "bars of gold"},
{'f', V_FOOD, 0, 1, 1, {1, 10, 1, 1}, "food"},
{'o', V_OIL, 8, 1, 1, {1, 10, 1, 1}, "oil"},
{'l', V_LCM, 2, 1, 1, {1, 10, 1, 1}, "light products"},
{'h', V_HCM, 4, 1, 1, {1, 10, 1, 1}, "heavy products"},
{'u', V_UW, 1, 1, 2, {1, 2, 1, 1}, "uncompensated workers"},
{'r', V_RAD, 150, 1, 8, {1, 10, 1, 1}, "radioactive materials"},
{'c', I_CIVIL, 1, 0, 1, {10, 10, 10, 10}, "civilians"},
{'m', I_MILIT, 0, 0, 1, {1, 1, 1, 1}, "military"},
{'s', I_SHELL, 5, 1, 1, {1, 10, 1, 1}, "shells"},
{'g', I_GUN, 60, 1, 10, {1, 10, 1, 1}, "guns"},
{'p', I_PETROL, 4, 1, 1, {1, 10, 1, 1}, "petrol"},
{'i', I_IRON, 2, 1, 1, {1, 10, 1, 1}, "iron ore"},
{'d', I_DUST, 20, 1, 5, {1, 10, 1, 1}, "dust (gold)"},
{'b', I_BAR, 280, 1, 50, {1, 5, 1, 4}, "bars of gold"},
{'f', I_FOOD, 0, 1, 1, {1, 10, 1, 1}, "food"},
{'o', I_OIL, 8, 1, 1, {1, 10, 1, 1}, "oil"},
{'l', I_LCM, 2, 1, 1, {1, 10, 1, 1}, "light products"},
{'h', I_HCM, 4, 1, 1, {1, 10, 1, 1}, "heavy products"},
{'u', I_UW, 1, 1, 2, {1, 2, 1, 1}, "uncompensated workers"},
{'r', I_RAD, 150, 1, 8, {1, 10, 1, 1}, "radioactive materials"},
{0, 0, 0, 0, 0, {0, 0, 0, 0}, 0}
};

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

@ -45,34 +45,34 @@ struct pchrstr pchr[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0,
"unused", "",},
{{I_LCM, I_HCM, I_NONE}, {2, 1, 0},
V_SHELL, -1, 3, 0, 0, NAT_TLEV, 20, 10, 100,
I_SHELL, -1, 3, 0, 0, NAT_TLEV, 20, 10, 100,
"shells", "shells",},
{{I_OIL, I_LCM, I_HCM}, {1, 5, 10},
V_GUN, -1, 30, 0, 0, NAT_TLEV, 20, 10, 100,
I_GUN, -1, 30, 0, 0, NAT_TLEV, 20, 10, 100,
"guns", "guns",},
{{I_OIL, I_NONE, I_NONE}, {1, 0, 0},
V_PETROL, -1, 1, 0, 0, NAT_TLEV, 20, 10, 1000,
I_PETROL, -1, 1, 0, 0, NAT_TLEV, 20, 10, 1000,
"petrol", "petrol",},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_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, 100,
"iron ore", "iron",},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_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, 100,
"gold dust", "dust",},
{{I_DUST, I_NONE, I_NONE}, {5, 0, 0},
V_BAR, -1, 10, 0, 0, -1, 0, 0, 100,
I_BAR, -1, 10, 0, 0, -1, 0, 0, 100,
"gold bars", "bars",},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_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, 900,
"food", "food",},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_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, 100,
"oil", "oil",},
{{I_IRON, I_NONE, I_NONE}, {1, 0, 0},
V_LCM, -1, 0, 0, 0, NAT_TLEV, -10, 10, 100,
I_LCM, -1, 0, 0, 0, NAT_TLEV, -10, 10, 100,
"light construction materials", "lcm",},
{{I_IRON, I_NONE, I_NONE}, {2, 0, 0},
V_HCM, -1, 0, 0, 0, NAT_TLEV, -10, 10, 100,
I_HCM, -1, 0, 0, 0, NAT_TLEV, -10, 10, 100,
"heavy construction materials", "hcm",},
{{I_DUST, I_OIL, I_LCM}, {1, 5, 10},
0, NAT_TLEV, 300, 0, 0, NAT_ELEV, 5, 10, 100,
@ -87,10 +87,10 @@ struct pchrstr pchr[] = {
0, NAT_HLEV, 9, 0, 0, -1, 0, 0, 100,
"happy strollers", "happy",},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_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, 100,
"radioactive materials", "rad",},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
V_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0, 75,
I_DUST, -1, 0, offsetof(struct sctstr, sct_gmin), 20, -1, 0, 0, 75,
"gold dust", "dust",},
{{I_NONE, I_NONE, I_NONE}, {0, 0, 0},
0, 0, 0, 0, 0, 0, 0, 0, 0, "", "",}