diff --git a/src/common/kernel/terrain.c b/src/common/kernel/terrain.c index 22368d0d3..e920acbe3 100644 --- a/src/common/kernel/terrain.c +++ b/src/common/kernel/terrain.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: terrain.c,v 1.2 2001/01/26 16:19:40 enno Exp $ + * $Id: terrain.c,v 1.3 2001/02/09 19:52:59 corwin Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -31,7 +31,7 @@ #include #ifdef NO_FOREST -static const char * plain_herbs[] = {"Flachwurz", "Würziger Wagemut", "Eulenauge", "Grüner Spinnerich", "Würziger Wagemut", "Elfenlieb", NULL}; +static const char * plain_herbs[] = {"Flachwurz", "Würziger Wagemut", "Eulenauge", "Grüner Spinnerich", "Blauer Baumringel", "Elfenlieb", NULL}; #else static const char * plain_herbs[] = {"Flachwurz", "Würziger Wagemut", "Eulenauge", NULL}; static const char * forest_herbs[] = {"Grüner Spinnerich", "Blauer Baumringel", "Elfenlieb", NULL}; diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index c4e104ec3..494f740f1 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: korrektur.c,v 1.16 2001/02/09 19:12:15 corwin Exp $ + * $Id: korrektur.c,v 1.17 2001/02/09 19:52:59 corwin Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -1781,6 +1781,20 @@ fix_targetregion_resolve(void) } } +void +fix_baumringel(void) +{ + region *r; + const item_type *itype = finditemtype("Blauer Baumringel", NULL); + const herb_type *htype = resource2herb(itype->rtype); + + for(r=regions; r; r=r->next) { + if(rterrain(r) == T_PLAIN && rand()%6 == 5) { + rsetherbtype(r, htype); + } + } +} + #include void setup_gm_faction(void); @@ -1850,8 +1864,9 @@ korrektur(void) } do_once(atoi36("fxfa"), fix_vertrautenmagie()); do_once(atoi36("uddp"), undo_deadpeasants()); - do_once(atoi36("lmsr"), lms_special(findunit(atoi36("tt3g")))) - /* fix_hp(); */ /* checkt, ob irgendwer absurde hitpoints hat. */ + do_once(atoi36("lmsr"), lms_special(findunit(atoi36("tt3g")))) + do_once(atoi36("brng"), fix_baumringel()); + do_once(atoi36("demd"), fix_demand()); /* trade_orders(); */ if (global.data_version < NEWROAD_VERSION) { @@ -1875,6 +1890,7 @@ korrektur(void) #endif } + void korrektur_end(void) { diff --git a/src/mapper/mapper.c b/src/mapper/mapper.c index 7f9ea8bee..ab3a05c4e 100644 --- a/src/mapper/mapper.c +++ b/src/mapper/mapper.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: mapper.c,v 1.9 2001/02/09 19:12:15 corwin Exp $ + * $Id: mapper.c,v 1.10 2001/02/09 19:52:59 corwin Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -214,6 +214,17 @@ RegionSymbol(region *r) { } } break; + case 4: + { + if(r->land) { + struct demand *dmd; + rs = '0'; + for (dmd=r->land->demands;dmd;dmd=dmd->next) rs++; + } else { + rs = terrain[rterrain(r)].symbol; + } + } + break; default: rs = terrain[rterrain(r)].symbol; if(rs == 'P' && rtrees(r) >= 600) rs = 'F'; @@ -296,6 +307,10 @@ drawmap(boolean maponly) { movexy(SX-14,SY-2); addstr(" Botanik "); break; + case 4: + movexy(SX-14,SY-2); + addstr(" Demand "); + break; } } @@ -915,7 +930,7 @@ movearound(int rx, int ry) { ch = -9; break; case 'k': - politkarte = (politkarte+1)%4; + politkarte = (politkarte+1)%5; ch = -9; break; case '{':