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

(ichr, pchr, dchr, intrchr): Move initializer to new builtin config

Browse source 
files item.config, product.config, sect.config, infra.config.
(empfile): Declare the new config files.  Reorder table entries so
that read_builtin_tables() reads the config files in the right order.

(bigcity_dchr, opt_BIG_CITY, init_dchr): Remove.  Deities can edit
sect.config instead.
This commit is contained in:
Markus Armbruster 2006-06-04 09:34:39 +00:00
parent a835a4b4d3
commit 3aea20e1de
13 changed files with 248 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,61 +35,19 @@
* Steve McClure, 1998
*/
/* order must agree with sect.h */
#include <config.h>
#include "misc.h"
#include "sect.h"
#include "product.h"
struct dchrstr bigcity_dchr = {
SCT_CAPIT, 'c', 0, 0, 2, NAV_CANAL, UPKG, 1.0, 2.0, 30, 0, 10, 1, 2, 999, "city"
};
/*
* Table of sector designations
* Initialized on startup from sect.config and deity custom config (if any).
*/
struct dchrstr dchr[SCT_MAXDEF + 1];
struct dchrstr dchr[] = {
/* 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, 0, 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, 0, 2, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "radar installation"},
{SCT_HEADQ, '!', 0, 0, 2, NAV_NONE, NPKG, 1.0, 1.5, 12, 0, 1, 0, 0, 999, "headquarters"},
{SCT_BHEAD, '#', 0, 0, 1, NAV_NONE, NPKG, 1.0, 1.5, 4, 0, 1, 0, 0, 999, "bridge head"},
{SCT_BSPAN, '=', 0, 0, 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[] = {
/* name lcm hcm dollars mobility */
{"road network", 2, 2, 2, 1},
{"rail network", 1, 1, 1, 1},
{"defense factor", 1, 1, 1, 1},
{0, 0, 0, 0, 0}
};
/*
* Table of infrastructure types
* Initialized on startup from infra.config and deity custom config (if any).
*/
struct sctintrins intrchr[INT_DEF + 2];