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

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

@ -114,7 +114,6 @@ struct castr pchr_ca[] = {
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlndx), "nlndx", EF_LEVEL},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlmin), "nlmin", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nllag), "nllag", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_effic), "effic", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
@ -172,6 +171,7 @@ struct castr dchr_ca[] = {
{NSC_STRINGY, NSC_CONST, 1, offsetof(struct dchrstr, d_mnem), "mnem",
EF_BAD},
{NSC_INT, 0, 0, offsetof(struct dchrstr, d_prd), "prd", EF_PRODUCT},
{NSC_INT, 0, 0, offsetof(struct dchrstr, d_peffic), "effic", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct dchrstr, d_mcst), "mcst", EF_BAD},
{NSC_SITYPE(d_navigation), 0, 0, offsetof(struct dchrstr, d_nav), "nav",
EF_SECTOR_NAVIGATION},

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,}
};

74
src/lib/global/sect.c
View file

@ -44,46 +44,46 @@
#include "product.h"
struct dchrstr bigcity_dchr = {
SCT_CAPIT, 'c', 0, 2, NAV_CANAL, UPKG, 1.0, 2.0, 30, 0, 10, 1, 2, 999, "city"
SCT_CAPIT, 'c', 0, 0, 2, NAV_CANAL, UPKG, 1.0, 2.0, 30, 0, 10, 1, 2, 999, "city"
};
struct dchrstr dchr[] = {
/* mnem prd mcst flg pkg ostr dstr value $ bld lcm hcm maxpop name */
{SCT_WATER, '.', 0, 0, NAVOK, NPKG, 0.0, 0.0, 0, -1, 0, 0, 0, 0, "sea"},
{SCT_MOUNT, '^', P_MDUST, 25, NAV_NONE, NPKG, 1.0, 4.0, 5, -1, 1, 0, 0, 99, "mountain"},
{SCT_SANCT, 's', 0, 0, NAV_NONE, NPKG, 0.0, 99.0, 127, -1, 0, 0, 0, 999, "sanctuary"},
{SCT_WASTE, '\\', 0, 0, NAV_NONE, NPKG, 0.0, 99.0, 0, -1, 0, 0, 0, 0, "wasteland"},
{SCT_RURAL, '-', 0, 3, NAV_NONE, NPKG, 1.0, 2.0, 1, 0, 0, 0, 0, 999, "wilderness"},
{SCT_CAPIT, 'c', 0, 2, NAV_NONE, NPKG, 1.0, 2.0, 30, 0, 1, 0, 0, 999, "capital"},
{SCT_URAN, 'u', P_URAN, 2, NAV_NONE, NPKG, 1.0, 2.0, 15, 0, 1, 0, 0, 999, "uranium mine"},
{SCT_PARK, 'p', P_HLEV, 2, NAV_NONE, NPKG, 1.0, 1.5, 5, 0, 1, 0, 0, 999, "park"},
{SCT_ARMSF, 'd', P_GUN, 2, NAV_NONE, NPKG, 1.0, 1.5, 7, 0, 1, 0, 0, 999, "defense plant"},
{SCT_AMMOF, 'i', P_SHELL, 2, NAV_NONE, NPKG, 1.0, 1.5, 6, 0, 1, 0, 0, 999, "shell industry"},
{SCT_MINE, 'm', P_IRON, 2, NAV_NONE, NPKG, 1.0, 2.0, 5, 0, 1, 0, 0, 999, "mine"},
{SCT_GMINE, 'g', P_DUST, 2, NAV_NONE, NPKG, 1.0, 2.0, 8, 0, 1, 0, 0, 999, "gold mine"},
{SCT_HARBR, 'h', 0, 2, NAV_02, WPKG, 1.0, 1.5, 12, 0, 1, 0, 0, 999, "harbor"},
{SCT_WAREH, 'w', 0, 2, NAV_NONE, WPKG, 1.0, 1.5, 7, 0, 1, 0, 0, 999, "warehouse"},
{SCT_AIRPT, '*', 0, 2, NAV_NONE, NPKG, 1.0, 1.25, 12, 0, 1, 0, 0, 999, "airfield"},
{SCT_AGRI, 'a', P_FOOD, 2, NAV_NONE, NPKG, 1.0, 1.5, 2, 0, 1, 0, 0, 999, "agribusiness"},
{SCT_OIL, 'o', P_OIL, 2, NAV_NONE, NPKG, 1.0, 1.5, 5, 0, 1, 0, 0, 999, "oil field"},
{SCT_LIGHT, 'j', P_LCM, 2, NAV_NONE, NPKG, 1.0, 1.5, 3, 0, 1, 0, 0, 999, "light manufacturing"},
{SCT_HEAVY, 'k', P_HCM, 2, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "heavy manufacturing"},
{SCT_FORTR, 'f', 0, 2, NAV_NONE, NPKG, 2.0, 4.0, 10, 0, 5, 0, 1, 999, "fortress"},
{SCT_TECH, 't', P_TLEV, 2, NAV_NONE, NPKG, 1.0, 1.5, 10, 0, 1, 0, 0, 999, "technical center"},
{SCT_RSRCH, 'r', P_RLEV, 2, NAV_NONE, NPKG, 1.0, 1.5, 9, 0, 1, 0, 0, 999, "research lab"},
{SCT_NUKE, 'n', 0, 2, NAV_NONE, NPKG, 1.0, 2.0, 10, 0, 1, 0, 0, 999, "nuclear plant"},
{SCT_LIBR, 'l', P_ELEV, 2, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "library/school"},
{SCT_HIWAY, '+', 0, 1, NAV_NONE, NPKG, 1.0, 1.0, 3, 0, 1, 0, 0, 999, "highway"},
{SCT_RADAR, ')', 0, 2, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "radar installation"},
{SCT_HEADQ, '!', 0, 2, NAV_NONE, NPKG, 1.0, 1.5, 12, 0, 1, 0, 0, 999, "headquarters"},
{SCT_BHEAD, '#', 0, 1, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "bridge head"},
{SCT_BSPAN, '=', 0, 1, NAV_60, NPKG, 1.0, 1.0, 5, -1, 1, 0, 0, 999, "bridge span"},
{SCT_BANK, 'b', P_BAR, 2, NAV_NONE, BPKG, 1.0, 2.25, 10, 0, 1, 0, 0, 999, "bank"},
{SCT_REFINE, '%', P_PETROL, 2, NAV_NONE, NPKG, 1.0, 1.5, 2, 0, 1, 0, 0, 999, "refinery"},
{SCT_ENLIST, 'e', 0, 2, NAV_NONE, NPKG, 1.0, 2.0, 7, 0, 1, 0, 0, 999, "enlistment center"},
{SCT_PLAINS, '~', 0, 2, NAV_NONE, NPKG, 1.0, 1.5, 1, -1, 1, 0, 0, 49, "plains"},
{SCT_BTOWER, '@', 0, 1, NAV_NONE, NPKG, 1.0, 1.5, 4, -1, 1, 0, 0, 999, "bridge tower"},
{0, 0, 0, 0, NAV_NONE, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL},
/* mnem prd peffic mcst flg pkg ostr dstr value $ bld lcm hcm maxpop name */
{SCT_WATER, '.', 0, 0, 0, NAVOK, NPKG, 0.0, 0.0, 0, -1, 0, 0, 0, 0, "sea"},
{SCT_MOUNT, '^', P_DUST, 75, 25, NAV_NONE, NPKG, 1.0, 4.0, 5, -1, 1, 0, 0, 99, "mountain"},
{SCT_SANCT, 's', 0, 100, 0, NAV_NONE, NPKG, 0.0, 99.0, 127, -1, 0, 0, 0, 999, "sanctuary"},
{SCT_WASTE, '\\', 0, 0, 0, NAV_NONE, NPKG, 0.0, 99.0, 0, -1, 0, 0, 0, 0, "wasteland"},
{SCT_RURAL, '-', 0, 0, 3, NAV_NONE, NPKG, 1.0, 2.0, 1, 0, 0, 0, 0, 999, "wilderness"},
{SCT_CAPIT, 'c', 0, 0, 2, NAV_NONE, NPKG, 1.0, 2.0, 30, 0, 1, 0, 0, 999, "capital"},
{SCT_URAN, 'u', P_URAN, 100, 2, NAV_NONE, NPKG, 1.0, 2.0, 15, 0, 1, 0, 0, 999, "uranium mine"},
{SCT_PARK, 'p', P_HLEV, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 5, 0, 1, 0, 0, 999, "park"},
{SCT_ARMSF, 'd', P_GUN, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 7, 0, 1, 0, 0, 999, "defense plant"},
{SCT_AMMOF, 'i', P_SHELL, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 6, 0, 1, 0, 0, 999, "shell industry"},
{SCT_MINE, 'm', P_IRON, 100, 2, NAV_NONE, NPKG, 1.0, 2.0, 5, 0, 1, 0, 0, 999, "mine"},
{SCT_GMINE, 'g', P_DUST, 100, 2, NAV_NONE, NPKG, 1.0, 2.0, 8, 0, 1, 0, 0, 999, "gold mine"},
{SCT_HARBR, 'h', 0, 0, 2, NAV_02, WPKG, 1.0, 1.5, 12, 0, 1, 0, 0, 999, "harbor"},
{SCT_WAREH, 'w', 0, 0, 2, NAV_NONE, WPKG, 1.0, 1.5, 7, 0, 1, 0, 0, 999, "warehouse"},
{SCT_AIRPT, '*', 0, 0, 2, NAV_NONE, NPKG, 1.0, 1.25, 12, 0, 1, 0, 0, 999, "airfield"},
{SCT_AGRI, 'a', P_FOOD, 900, 2, NAV_NONE, NPKG, 1.0, 1.5, 2, 0, 1, 0, 0, 999, "agribusiness"},
{SCT_OIL, 'o', P_OIL, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 5, 0, 1, 0, 0, 999, "oil field"},
{SCT_LIGHT, 'j', P_LCM, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 3, 0, 1, 0, 0, 999, "light manufacturing"},
{SCT_HEAVY, 'k', P_HCM, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "heavy manufacturing"},
{SCT_FORTR, 'f', 0, 0, 2, NAV_NONE, NPKG, 2.0, 4.0, 10, 0, 5, 0, 1, 999, "fortress"},
{SCT_TECH, 't', P_TLEV, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 10, 0, 1, 0, 0, 999, "technical center"},
{SCT_RSRCH, 'r', P_RLEV, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 9, 0, 1, 0, 0, 999, "research lab"},
{SCT_NUKE, 'n', 0, 0, 2, NAV_NONE, NPKG, 1.0, 2.0, 10, 0, 1, 0, 0, 999, "nuclear plant"},
{SCT_LIBR, 'l', P_ELEV, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "library/school"},
{SCT_HIWAY, '+', 0, 0, 1, NAV_NONE, NPKG, 1.0, 1.0, 3, 0, 1, 0, 0, 999, "highway"},
{SCT_RADAR, ')', 0, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "radar installation"},
{SCT_HEADQ, '!', 0, 100, 2, NAV_NONE, NPKG, 1.0, 1.5, 12, 0, 1, 0, 0, 999, "headquarters"},
{SCT_BHEAD, '#', 0, 100, 1, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "bridge head"},
{SCT_BSPAN, '=', 0, 100, 1, NAV_60, NPKG, 1.0, 1.0, 5, -1, 1, 0, 0, 999, "bridge span"},
{SCT_BANK, 'b', P_BAR, 100, 2, NAV_NONE, BPKG, 1.0, 2.25, 10, 0, 1, 0, 0, 999, "bank"},
{SCT_REFINE, '%', P_PETROL, 1000, 2, NAV_NONE, NPKG, 1.0, 1.5, 2, 0, 1, 0, 0, 999, "refinery"},
{SCT_ENLIST, 'e', 0, 0, 2, NAV_NONE, NPKG, 1.0, 2.0, 7, 0, 1, 0, 0, 999, "enlistment center"},
{SCT_PLAINS, '~', 0, 0, 2, NAV_NONE, NPKG, 1.0, 1.5, 1, -1, 1, 0, 0, 49, "plains"},
{SCT_BTOWER, '@', 0, 0, 1, NAV_NONE, NPKG, 1.0, 1.5, 4, -1, 1, 0, 0, 999, "bridge tower"},
{0, 0, 0, 0, 0, NAV_NONE, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL},
};
struct sctintrins intrchr[] = {