Difference for server/weather.c from version 1.17 to 1.18

version 1.17 version 1.18
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_weather_c =   * static char *rcsid_weather_c =
  *   "$Id: weather.c,v 1.17 2002/11/27 01:51:04 garbled Exp $";   *   "$Id: weather.c,v 1.18 2002/12/09 03:52:46 garbled Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 81
 
Line 81
     {"rain4", 1},      {"rain4", 1},
     {"rain5", 1},      {"rain5", 1},
     {"drifts", 0},      {"drifts", 0},
       {"glacier", 0},
     {"cforest1", 0},      {"cforest1", 0},
     {"sea", 0},      {"sea", 0},
     {"sea1", 0},      {"sea1", 0},
     {"deep_sea", 0},      {"deep_sea", 0},
     {"shallow_sea", 0},      {"shallow_sea", 0},
       {"lava", 0},
       {"permanent_lava", 0},
       {NULL, 0}
   };
   
   /*
    * this table is identical to the one above, except these are tiles to avoid
    * when processing growth.  IE, don't grow herbs in the ocean.  The second
    * field is unused.
    */
   
   weather_avoids_t growth_avoids[] = {
       {"cobblestones", 0},
       {"cobblestones2", 0},
       {"flagstone", 0},
       {"stonefloor2", 0},
       {"lava", 0},
       {"permanent_lava", 0},
       {"sea", 0},
       {"sea1", 0},
       {"deep_sea", 0},
       {"shallow_sea", 0},
       {"farmland", 0},
       {"dungeon_magic", 0},
       {"dungeon_floor", 0},
       {"lake", 0},
       {"grasspond", 0},
     {NULL, 0}      {NULL, 0}
 };   };
   
Line 99
 
Line 127
  */   */
   
 weather_replace_t weather_replace[] = {  weather_replace_t weather_replace[] = {
     {"impossible_match", "snow", NULL, 0},      {"impossible_match", "snow5", NULL, 0},
     {"impossible_match2", "snow2", NULL, 0}, /* placeholders */      {"impossible_match2", "snow4", NULL, 0}, /* placeholders */
       {"impossible_match3", "snow3", NULL, 0},
     {"hills", "drifts", NULL, 0},      {"hills", "drifts", NULL, 0},
     {"cobblestones", "snow4", NULL, 0},      {"grass", "snow3", NULL, 0},
     {"cobblestones2", "snow4", NULL, 1},      {"sand", "snow2", NULL, 0},
     {"stones", "snow4", NULL, 0},      {"stones", "snow2", NULL, 0},
     {"flagstone", "snow4", NULL, 0},      {"steppe", "snow2", NULL, 0},
     {"stonefloor2", "snow4", NULL, 0},      {"brush", "snow", NULL, 0},
       {"farmland", "snow", NULL, 0},
     {"wasteland", "glacier", NULL, 0},      {"wasteland", "glacier", NULL, 0},
     {"evergreens", NULL, "evergreens2", 1},      {"mountain", "glacier", NULL, 1},
     {"evergreen", NULL, "tree5", 0},      {"evergreens", "snow", "evergreens2", 1},
     {"tree", NULL, "tree3", 0},      {"evergreen","snow", "tree5", 1},
     {"woods", NULL, "woods4", 1},      {"tree", "snow", "tree3", 0},
     {"woods_3", NULL, "woods5", 1},      {"woods", "snow3", "woods4", 1},
       {"woods_3", "snow", "woods5", 1},
     {NULL, NULL, NULL, 0},      {NULL, NULL, NULL, 0},
 };  };
   
Line 122
 
Line 153
  */   */
   
 weather_grow_t weather_grow[] = {  weather_grow_t weather_grow[] = {
       /* herb, tile, random, rfmin, rfmax, humin, humax, tempmin, tempmax, elevmin, elevmax, season */
       {"mint", "grass", 10, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},
       {"rose_red", "grass", 15, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},
       {"mint", "brush", 8, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 2},
       {"blackroot", "swamp", 15, 1.6, 2.0, 60, 100, 20, 30, -100, 1500, 0},
       {"pipeweed", "farmland", 20, 1.0, 2.0, 30, 100, 10, 25, 100, 5000, 0},
       {"cabbage", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, -100, 9999, 0},
       {"onion", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, 100, 9999, 0},
       {"carrot", "farmland", 10, 1.0, 2.0, 30, 100, 10, 25, 100, 9999, 0},
       {"thorns", "brush", 15, 0.5, 1.3, 30, 100, 10, 25, -100, 9999, 0},
       {NULL, NULL, 1, 0.0, 0.0, 0, 0, 0, 0, 0, 0, 0}
   };
   
   /*
    * The table below uses the same format as the one above.  However this
    * table is used to change the layout of the worldmap itself.  The tile
    * parameter is a base tile to lay down underneath the herb tile.
    */
   
   weather_grow_t weather_tile[] = {
     /* herb, tile, random, rfmin, rfmax, humin, humax, tempmin, tempmax, elevmin, elevmax */      /* herb, tile, random, rfmin, rfmax, humin, humax, tempmin, tempmax, elevmin, elevmax */
     {"mint", "grass", 10, 14000, 60000, 30, 100, 10, 25, -100, 9999},      {"dunes", NULL, 2, 0.0, 0.03, 0, 20, 10, 99, 0, 4000, 0},
     {"mint", "brush", 8, 14000, 60000, 30, 100, 10, 25, -100, 9999},      {"desert", NULL, 1, 0.0, 0.05, 0, 20, 10, 99, 0, 4000, 0},
     {NULL, NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0}      {"pstone_2", NULL, 1, 0.0, 0.05, 0, 20, -30, 10, 0, 4000, 0},
       {"pstone_3", NULL, 1, 0.0, 0.05, 0, 20, -30, 10, 0, 4000, 0},
       {"grassbrown", NULL, 1, 0.05, 1.0, 20, 80, -20, -3, 0, 5000, 0},
       {"grass_br_gr", NULL, 1, 0.05, 1.0, 20, 80, -3, 5, 0, 5000, 0},
       {"grass", NULL, 1, 0.05, 1.0, 20, 80, 5, 15, 0, 5000, 0},
       {"grassmedium", NULL, 1, 0.05, 1.0, 20, 80, 15, 25, 0, 5000, 0},
       {"grassdark", NULL, 1, 0.05, 1.0, 20, 80, 25, 35, 0, 5000, 0},
       {"brush", NULL, 1, 0.2, 1.0, 25, 70, 0, 30, 500, 6000, 0},
       /* small */
       {"evergreens2", "brush", 1, 0.5, 1.8, 30, 90, -30, 24, 3000, 8000, 0},
       {"fernsdense", "brush", 1, 0.9, 2.5, 50, 100, 10, 35, 1000, 6000, 0},
       {"fernssparse", "brush", 1, 0.7, 2.0, 30, 90, -15, 35, 0, 4000, 0},
       {"woods4", "brush", 1, 0.1, 0.8, 30, 60, -5, 25, 1000, 4500, 0},
       {"woods5", "brush", 1, 0.6, 1.5, 20, 70, -15, 20, 2000, 5500, 0},
       {"forestsparse", "brush", 1, 0.3, 1.5, 15, 60, -20, 25, 0, 4500, 0},
       /* big */
       /*
         {"ytree_2", "brush", 2, 0.1, 0.6, 30, 60, 10, 25, 1000, 3500, 0},
         {"tree3", "grass", 2, 0.9, 2.5, 50, 100, 10, 35, 1000, 4000, 0},
         {"tree5", "grass", 2, 0.5, 1.5, 40, 90, -10, 24, 3000, 8000, 0},
         {"tree3", "grassmeduim", 2, 0.9, 2.5, 50, 100, 10, 35, 1000, 4000, 0},
         {"tree5", "grassmedium", 2, 0.5, 1.5, 40, 90, -10, 24, 3000, 8000, 0},
         {"tree3", "grassdark", 2, 0.9, 2.5, 50, 100, 10, 35, 1000, 4000, 0},
         {"tree5", "grassdark", 2, 0.5, 1.5, 40, 90, -10, 24, 3000, 8000, 0},*/
       /* mountians */
       {"steppe", NULL, 1, 0.5, 1.3, 0, 30, -20, 35, 1000, 6000, 0},
       {"steppelight", NULL, 1, 0.0, 0.6, 0, 20, -50, 35, 0, 5000, 0},
       {"hills", NULL, 1, 0.1, 0.9, 20, 80, -10, 30, 5000, 8500, 0},
       {"hills_rocky", NULL, 1, 0.0, 0.9, 0, 100, -50, 50, 5000, 8500, 0},
       {"swamp", NULL, 1, 1.0, 9.9, 55, 80, 10, 50, 0, 1000, 0},
       {"deep_swamp", NULL, 1, 1.0, 9.9, 80, 100, 10, 50, 0, 1000, 0},
       {"mountain", NULL, 1, 0.0, 9.9, 0, 100, -50, 50, 8000, 10000, 0},
       {"mountain2", NULL, 1, 0.0, 9.9, 0, 100, -50, 50, 9500, 11000, 0},
       {"mountain4", NULL, 1, 0.0, 9.9, 0, 100, -50, 50, 10500, 12000, 0},
       {"mountain5", NULL, 1, 0.0, 9.9, 0, 100, -50, 50, 11500, 13500, 0},
       {"wasteland", NULL, 1, 0.0, 9.9, 0, 100, -50, 50, 13000, 99999, 0},
       /* catchalls */
       {"palms", "pstone_1", 1, 0.01, 0.1, 0, 30, 5, 99, 0, 4000, 0},
       {"large_stones", NULL, 1, 0.0, 9.9, 0, 100, -50, 50, 6000, 8000, 0},
       {"earth", NULL, 1, 0.0, 1.0, 0, 70, -30, 15, 0, 6000, 0},
       {"medium_stones", NULL, 1, 1.0, 3.0, 70, 100, -30, 10,  0, 4000, 0}, /*unsure*/
       {"earth", NULL, 1, 0.1, 0.9, 20, 80, -30, 30, 0, 4999, 0}, /* tundra */
       {"swamp", NULL, 1, 1.0, 9.9, 50, 100, -30, 10, 0, 4000, 0},/* cold marsh */
       {"earth", NULL, 1, 0.0, 99.9, 0, 100, -99, 99, 0, 99999, 0}, /* debug */
       {NULL, NULL, 1, 0.0, 0.0, 0, 0, 0, 0, 0, 0}
 };  };
   
   
 /*  /*
  * Set the darkness level for a map.  Requires the map pointer.   * Set the darkness level for a map.  Requires the map pointer.
  */   */
Line 201
 
Line 297
      write_gulfstreammap();       write_gulfstreammap();
  if (todtick%28 == 0 && settings.fastclock > 0)   if (todtick%28 == 0 && settings.fastclock > 0)
      write_skymap();       write_skymap();
  if (todtick&29 == 0)   if (todtick%29 == 0)
      write_rainfallmap();       write_rainfallmap();
     }      }
     get_tod(&tod);      get_tod(&tod);
Line 1186
 
Line 1282
     if (worldmap_to_weathermap(x, y, &wx, &wy, filename) != 0)      if (worldmap_to_weathermap(x, y, &wx, &wy, filename) != 0)
  return;   return;
   
     if (settings.dynamiclevel < 2)      /* we change the world first, if needed */
  return;      if (settings.dynamiclevel >= 5) {
    change_the_world(m, wx, wy, filename);
       }
       if (settings.dynamiclevel >= 2) {
     let_it_snow(m, wx, wy, filename);      let_it_snow(m, wx, wy, filename);
     singing_in_the_rain(m, wx, wy, filename);      singing_in_the_rain(m, wx, wy, filename);
    feather_map(m, wx, wy, filename);
     if (settings.dynamiclevel < 3)      }
  return;      if (settings.dynamiclevel >= 3) {
   
     plant_a_garden(m, wx, wy, filename);      plant_a_garden(m, wx, wy, filename);
       }
 }  }
   
 /*  /*
Line 1204
 
Line 1301
  * weather processing.  Must pass av and gs, which will be filled in   * weather processing.  Must pass av and gs, which will be filled in
  * with 1 or 0.  gs will be 1 if we found snow/rain here.  av will be   * with 1 or 0.  gs will be 1 if we found snow/rain here.  av will be
  * 1 if we should avoid processing this tile. (don't rain on lakes)   * 1 if we should avoid processing this tile. (don't rain on lakes)
  * x and y are the coordinates inside the current map m.  Returns   * x and y are the coordinates inside the current map m. If grow is
  * the object pointer for any snow item it found, so you can destroy/melt it   * 1, we use the growth table, rather than the avoidance table.
    *
    * Returns the object pointer for any snow item it found, so you can
    * destroy/melt it.
  */   */
   
 object *avoid_weather(int *av, mapstruct *m, int x, int y, int *gs)  object *avoid_weather(int *av, mapstruct *m, int x, int y, int *gs, int grow)
 {  {
     int avoid, gotsnow, i;      int avoid, gotsnow, i, n;
   
     object *tmp;      object *tmp;
     avoid = 0;      avoid = 0;
     gotsnow = 0;      gotsnow = 0;
       if (grow) {
    for (tmp=GET_MAP_OB(m, x, y), n=0; tmp; tmp = tmp->above, n++) {
        /* look for things like walls, holes, etc */
        if (n)
    if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR) &&
        !(tmp->material & M_ICE || tmp->material & M_LIQUID))
        gotsnow++;
        for (i=0; growth_avoids[i].name != NULL; i++) {
    if (!strcmp(tmp->arch->name, growth_avoids[i].name)) {
        avoid++;
        break;
    }
    if (!strncmp(tmp->arch->name, "biglake_", 8)) {
        avoid++;
        break;
    }
        }
        if (avoid)
    break;
    }
       } else {
     for (tmp=GET_MAP_OB(m, x, y); tmp; tmp = tmp->above) {      for (tmp=GET_MAP_OB(m, x, y); tmp; tmp = tmp->above) {
  for (i=0; weather_avoids[i].name != NULL; i++) {   for (i=0; weather_avoids[i].name != NULL; i++) {
      if (!strcmp(tmp->arch->name, weather_avoids[i].name)) {       if (!strcmp(tmp->arch->name, weather_avoids[i].name)) {
Line 1228
 
Line 1349
  if (avoid || gotsnow)   if (avoid || gotsnow)
      break;       break;
     }      }
       }
     *gs = gotsnow;      *gs = gotsnow;
     *av = avoid;      *av = avoid;
     return tmp;      return tmp;
Line 1243
 
Line 1365
 void let_it_snow(mapstruct *m, int wx, int wy, char *filename)  void let_it_snow(mapstruct *m, int wx, int wy, char *filename)
 {  {
     int x, y, i;      int x, y, i;
     int avoid, two, temp, sky, gotsnow, found;      int avoid, two, temp, sky, gotsnow, found, nodstk;
     char *doublestack, *doublestack2;      char *doublestack, *doublestack2;
     object *ob, *tmp, *oldsnow;      object *ob, *tmp, *oldsnow, *topfloor;
     archetype *at;      archetype *at;
   
     for (x=0; x < settings.worldmaptilesizex; x++) {      for (x=0; x < settings.worldmaptilesizex; x++) {
Line 1257
 
Line 1379
      avoid = 0;       avoid = 0;
      two = 0;       two = 0;
      gotsnow = 0;       gotsnow = 0;
        nodstk = 0;
      temp = real_world_temperature(x, y, m);       temp = real_world_temperature(x, y, m);
      sky = weathermap[wx][wy].sky;       sky = weathermap[wx][wy].sky;
      if (temp <= 0 && sky > SKY_OVERCAST && sky < SKY_FOG)       if (temp <= 0 && sky > SKY_OVERCAST && sky < SKY_FOG)
  sky += 10; /*let it snow*/   sky += 10; /*let it snow*/
      oldsnow = avoid_weather(&avoid, m, x, y, &gotsnow);       oldsnow = avoid_weather(&avoid, m, x, y, &gotsnow, 0);
      if (!avoid) {       if (!avoid) {
  if (sky >= SKY_LIGHT_SNOW && sky < SKY_HEAVY_SNOW)   if (sky >= SKY_LIGHT_SNOW && sky < SKY_HEAVY_SNOW)
      at = find_archetype(weather_replace[0].special_snow);       at = find_archetype(weather_replace[0].special_snow);
  if (sky >= SKY_HEAVY_SNOW)   if (sky >= SKY_HEAVY_SNOW)
      at = find_archetype(weather_replace[1].special_snow);       at = find_archetype(weather_replace[1].special_snow);
  if (sky >= SKY_LIGHT_SNOW) {   if (sky >= SKY_LIGHT_SNOW) {
        /* the bottom floor of scorn is not IS_FLOOR */
        topfloor=NULL;
        for (tmp=GET_MAP_OB(m, x, y); tmp;
    topfloor = tmp,tmp = tmp->above) {
    if (strcmp(tmp->arch->name, "dungeon_magic") != 0)
        if (!QUERY_FLAG(tmp, FLAG_IS_FLOOR))
    break;
        }
        /* topfloor should now be the topmost IS_FLOOR=1 */
        if (topfloor == NULL)
    continue;
        if (tmp != NULL)
    nodstk++;
        /* something is wrong with that sector. just skip it */
      found = 0;       found = 0;
      for (i=0; weather_replace[i].tile != NULL; i++) {       for (i=0; weather_replace[i].tile != NULL; i++) {
  if (weather_replace[i].arch_or_name == 1) {   if (weather_replace[i].arch_or_name == 1) {
      if (!strcmp(GET_MAP_OB(m, x, y)->arch->name,       if (!strcmp(topfloor->arch->name,
  weather_replace[i].tile))   weather_replace[i].tile))
  found++;   found++;
  } else {   } else {
      if (!strcmp(GET_MAP_OB(m, x, y)->name,       if (!strcmp(topfloor->name, weather_replace[i].tile))
  weather_replace[i].tile))  
  found++;   found++;
  }   }
  if (found) {   if (found) {
      if (weather_replace[i].special_snow != NULL)       if (weather_replace[i].special_snow != NULL)
  at = find_archetype(weather_replace[i].special_snow);   at = find_archetype(weather_replace[i].special_snow);
      if (weather_replace[i].doublestack_arch != NULL) {       if (weather_replace[i].doublestack_arch != NULL
    && !nodstk) {
  two++;   two++;
  doublestack = weather_replace[i].doublestack_arch;   doublestack = weather_replace[i].doublestack_arch;
      }       }
Line 1290
 
Line 1427
  }   }
      }       }
  }   }
  /* special case scorn, where the no-magic field wrecks my  
     logic */  
  if (GET_MAP_OB(m, x, y)->above != NULL) {  
      if (!strcmp(GET_MAP_OB(m, x, y)->above->name,  
  "cobblestones") && sky >= SKY_LIGHT_SNOW)  
  at = find_archetype("snow4");  
      if (!strcmp(GET_MAP_OB(m, x, y)->above->arch->name,  
  "cobblestones2") && sky >= SKY_LIGHT_SNOW)  
  at = find_archetype("snow4");  
  }  
  if (gotsnow && at) {   if (gotsnow && at) {
      if (!strcmp(oldsnow->arch->name, at->name))       if (!strcmp(oldsnow->arch->name, at->name))
  at = NULL;   at = NULL;
Line 1340
 
Line 1467
      ob->x = x;       ob->x = x;
      ob->y = y;       ob->y = y;
      ob->material = M_ICE;       ob->material = M_ICE;
      if (!strcmp(ob->arch->name, "snow4"))  
  SET_FLAG(ob, FLAG_OVERLAY_FLOOR);   SET_FLAG(ob, FLAG_OVERLAY_FLOOR);
        CLEAR_FLAG(ob, FLAG_IS_FLOOR);
      insert_ob_in_map(ob, m, ob,       insert_ob_in_map(ob, m, ob,
          INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);           INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
      if (two) {       if (two) {
Line 1392
 
Line 1519
      if (temp < -8) {       if (temp < -8) {
  avoid = 0;   avoid = 0;
  for (tmp=GET_MAP_OB(m, x, y); tmp; tmp = tmp->above) {   for (tmp=GET_MAP_OB(m, x, y); tmp; tmp = tmp->above) {
      if (!strcasecmp(tmp->name, "glacier"))       if (!strcasecmp(tmp->name, "ice"))
  avoid--;   avoid--;
  }   }
  tmp = GET_MAP_OB(m, x, y);   tmp = GET_MAP_OB(m, x, y);
Line 1405
 
Line 1532
  else if (!strcasecmp(tmp->name, "shallow_sea"))   else if (!strcasecmp(tmp->name, "shallow_sea"))
      avoid++;       avoid++;
  if (avoid > 0) {   if (avoid > 0) {
      at = find_archetype("glacier");       at = find_archetype("ice");
      ob = get_object();       ob = get_object();
      copy_object(&at->clone, ob);       copy_object(&at->clone, ob);
      ob->x = x;       ob->x = x;
Line 1428
 
Line 1555
 void singing_in_the_rain(mapstruct *m, int wx, int wy, char *filename)  void singing_in_the_rain(mapstruct *m, int wx, int wy, char *filename)
 {  {
     int x, y, i;      int x, y, i;
     int avoid, two, temp, sky, gotsnow, found;      int avoid, two, temp, sky, gotsnow, found, nodstk;
     object *ob, *tmp, *oldsnow;      object *ob, *tmp, *oldsnow, *topfloor;
     char *doublestack, *doublestack2;      char *doublestack, *doublestack2;
     archetype *at;      archetype *at;
   
Line 1441
 
Line 1568
      avoid = 0;       avoid = 0;
      two = 0;       two = 0;
      gotsnow = 0;       gotsnow = 0;
        nodstk = 0;
      temp = real_world_temperature(x, y, m);       temp = real_world_temperature(x, y, m);
      sky = weathermap[wx][wy].sky;       sky = weathermap[wx][wy].sky;
      /* it's probably allready snowing */       /* it's probably allready snowing */
      if (temp < 0)       if (temp < 0)
  continue;   continue;
      oldsnow = avoid_weather(&avoid, m, x, y, &gotsnow);       oldsnow = avoid_weather(&avoid, m, x, y, &gotsnow, 0);
      if (!avoid) {       if (!avoid) {
  if (sky == SKY_LIGHT_RAIN || sky == SKY_RAIN)   if (sky == SKY_LIGHT_RAIN || sky == SKY_RAIN)
      switch (rndm(0, SKY_HAIL-sky)) {       switch (rndm(0, SKY_HAIL-sky)) {
Line 1461
 
Line 1589
      case 2: at = find_archetype("rain5"); break;       case 2: at = find_archetype("rain5"); break;
      default: at = NULL;       default: at = NULL;
      }       }
        /* the bottom floor of scorn is not IS_FLOOR */
        topfloor=NULL;
        for (tmp=GET_MAP_OB(m, x, y); tmp;
    topfloor = tmp,tmp = tmp->above) {
    if (strcmp(tmp->arch->name, "dungeon_magic") != 0)
        if (!QUERY_FLAG(tmp, FLAG_IS_FLOOR))
    break;
        }
        /* topfloor should now be the topmost IS_FLOOR=1 */
        if (topfloor == NULL)
    continue;
        if (tmp != NULL)
    nodstk++;
        /* something is wrong with that sector. just skip it */
  found = 0;   found = 0;
  for (i=0; weather_replace[i].tile != NULL; i++) {   for (i=0; weather_replace[i].tile != NULL; i++) {
      if (weather_replace[i].arch_or_name == 1) {       if (weather_replace[i].arch_or_name == 1) {
  if (!strcmp(GET_MAP_OB(m, x, y)->arch->name,   if (!strcmp(topfloor->arch->name,
      weather_replace[i].tile))       weather_replace[i].tile))
      found++;       found++;
      } else {       } else {
  if (!strcmp(GET_MAP_OB(m, x, y)->name,   if (!strcmp(topfloor->name, weather_replace[i].tile))
      weather_replace[i].tile))  
      found++;       found++;
      }       }
      if (found) {       if (found) {
  if (weather_replace[i].doublestack_arch != NULL) {   if (weather_replace[i].doublestack_arch != NULL
        && !nodstk) {
      two++;       two++;
      doublestack = weather_replace[i].doublestack_arch;       doublestack = weather_replace[i].doublestack_arch;
  }   }
Line 1600
 
Line 1742
 void plant_a_garden(mapstruct *m, int wx, int wy, char *filename)  void plant_a_garden(mapstruct *m, int wx, int wy, char *filename)
 {  {
     int x, y, i;      int x, y, i;
     int avoid, two, temp, sky, gotsnow, found;      int avoid, two, temp, sky, gotsnow, found, days;
     object *ob, *tmp, *oldherb;      object *ob, *tmp;
     archetype *at;      archetype *at;
   
       days = todtick / HOURS_PER_DAY;
     for (x=0; x < settings.worldmaptilesizex; x++) {      for (x=0; x < settings.worldmaptilesizex; x++) {
  for (y=0; y < settings.worldmaptilesizey; y++) {   for (y=0; y < settings.worldmaptilesizey; y++) {
      (void)worldmap_to_weathermap(x, y, &wx, &wy, filename);       (void)worldmap_to_weathermap(x, y, &wx, &wy, filename);
Line 1614
 
Line 1757
      gotsnow = 0;       gotsnow = 0;
      temp = real_world_temperature(x, y, m);       temp = real_world_temperature(x, y, m);
      sky = weathermap[wx][wy].sky;       sky = weathermap[wx][wy].sky;
      (void)avoid_weather(&avoid, m, x, y, &gotsnow);       (void)avoid_weather(&avoid, m, x, y, &gotsnow, 1);
      if (!avoid) {       if (!avoid) {
    found = 0;
  for (i=0; weather_grow[i].herb != NULL; i++) {   for (i=0; weather_grow[i].herb != NULL; i++) {
      for (tmp=GET_MAP_OB(m, x, y); tmp; tmp = tmp->above) {       for (tmp=GET_MAP_OB(m, x, y); tmp; tmp = tmp->above) {
  if (strcmp(tmp->arch->name, weather_grow[i].herb) != 0)   if (strcmp(tmp->arch->name, weather_grow[i].herb) != 0)
      continue;       continue;
  /* we found there is a herb here allready */   /* we found there is a herb here allready */
  if (weathermap[wx][wy].rainfall < weather_grow[i].rfmin ||   found++;
      weathermap[wx][wy].rainfall > weather_grow[i].rfmax ||   if ((float)weathermap[wx][wy].rainfall/days < weather_grow[i].rfmin ||
        (float)weathermap[wx][wy].rainfall/days > weather_grow[i].rfmax ||
      weathermap[wx][wy].humid < weather_grow[i].humin ||       weathermap[wx][wy].humid < weather_grow[i].humin ||
      weathermap[wx][wy].humid > weather_grow[i].humax ||       weathermap[wx][wy].humid > weather_grow[i].humax ||
      temp < weather_grow[i].tempmin ||       temp < weather_grow[i].tempmin ||
Line 1635
 
Line 1780
      break;       break;
  }   }
      }       }
        /* don't doublestack herbs */
        if (found)
    continue;
      /* add a random factor */       /* add a random factor */
      if (rndm(1, weather_grow[i].random) != 1)       if (rndm(1, weather_grow[i].random) != 1)
  continue;   continue;
Line 1649
 
Line 1797
      } else       } else
  continue;   continue;
      }       }
      if (weathermap[wx][wy].rainfall < weather_grow[i].rfmin ||       if ((float)weathermap[wx][wy].rainfall/days < weather_grow[i].rfmin ||
  weathermap[wx][wy].rainfall > weather_grow[i].rfmax)   (float)weathermap[wx][wy].rainfall/days > weather_grow[i].rfmax)
  continue;   continue;
      if (weathermap[wx][wy].humid < weather_grow[i].humin ||       if (weathermap[wx][wy].humid < weather_grow[i].humin ||
  weathermap[wx][wy].humid > weather_grow[i].humax)   weathermap[wx][wy].humid > weather_grow[i].humax)
Line 1670
 
Line 1818
      copy_object(&at->clone, ob);       copy_object(&at->clone, ob);
      ob->x = x;       ob->x = x;
      ob->y = y;       ob->y = y;
        /* XXX is this right?  maybe.. */
      SET_FLAG(ob, FLAG_OVERLAY_FLOOR);       SET_FLAG(ob, FLAG_OVERLAY_FLOOR);
      insert_ob_in_map(ob, m, ob,       insert_ob_in_map(ob, m, ob,
          INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);           INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
Line 1679
 
Line 1828
     }      }
 }  }
   
   /*
    * Process worldmap regrowth.  m is the map we are currently processing.
    * wx and wy are
    * the weathermap coordinates for the weathermap square we want to work on.
    * filename is the pathname for the current map.  This should be called from
    * weather_effect()
    */
   
   void change_the_world(mapstruct *m, int wx, int wy, char *filename)
   {
       int x, y, i;
       int avoid, two, temp, sky, gotsnow, found, days;
       object *ob, *tmp, *doublestack;
       archetype *at, *dat;
   
       days = todtick / HOURS_PER_DAY;
       for (x=0; x < settings.worldmaptilesizex; x++) {
    for (y=0; y < settings.worldmaptilesizey; y++) {
        (void)worldmap_to_weathermap(x, y, &wx, &wy, filename);
        ob = NULL;
        at = NULL;
        dat = NULL;
        avoid = 0;
        two = 0;
        gotsnow = 0;
        temp = real_world_temperature(x, y, m);
        sky = weathermap[wx][wy].sky;
        (void)avoid_weather(&avoid, m, x, y, &gotsnow, 1);
        if (!avoid) {
    for (i=0; weather_tile[i].herb != NULL; i++) {
        found=0;
        doublestack=NULL;
        for (tmp=GET_MAP_OB(m, x, y)->above; tmp; tmp = tmp->above) {
    if (weather_tile[i].tile != NULL)
        if (strcmp(tmp->arch->name,
           weather_tile[i].tile) == 0) {
    doublestack=tmp;
    continue;
        }
    if (strcmp(tmp->arch->name, weather_tile[i].herb) != 0)
        continue;
    if ((float)weathermap[wx][wy].rainfall/days < weather_tile[i].rfmin ||
        (float)weathermap[wx][wy].rainfall/days > weather_tile[i].rfmax ||
        weathermap[wx][wy].humid < weather_tile[i].humin ||
        weathermap[wx][wy].humid > weather_tile[i].humax ||
        temp < weather_tile[i].tempmin ||
        temp > weather_tile[i].tempmax) {
        remove_ob(tmp);
        free_object(tmp);
        if (doublestack) {
    remove_ob(doublestack);
    free_object(doublestack);
        }
        break;
    } else {
        found++; /* there is one here allready. leave it */
        break;
    }
        }
        if (found)
    break;
        /* add a random factor */
        if (rndm(1, weather_tile[i].random) != 1)
    continue;
        if ((float)weathermap[wx][wy].rainfall/days < weather_tile[i].rfmin ||
    (float)weathermap[wx][wy].rainfall/days > weather_tile[i].rfmax)
    continue;
        if (weathermap[wx][wy].humid < weather_tile[i].humin ||
    weathermap[wx][wy].humid > weather_tile[i].humax)
    continue;
        if (temp < weather_tile[i].tempmin ||
    temp > weather_tile[i].tempmax)
    continue;
        if (GET_MAP_OB(m, x, y)->elevation < weather_tile[i].elevmin ||
    GET_MAP_OB(m, x, y)->elevation > weather_tile[i].elevmax)
    continue;
        /* we got this far.. must be a match */
        if (strcmp(GET_MAP_OB(m, x, y)->arch->name,
           weather_tile[i].herb) == 0)
    break; /* no sense in doubling up */
        at = find_archetype(weather_tile[i].herb);
        break;
    }
    if (at != NULL) {
        if (weather_tile[i].tile != NULL &&
    strcmp(weather_tile[i].tile,
           GET_MAP_OB(m, x, y)->arch->name) != 0)
    dat = find_archetype(weather_tile[i].tile);
        if (dat != NULL) {
    ob = get_object();
    copy_object(&dat->clone, ob);
    ob->x = x;
    ob->y = y;
    insert_ob_in_map(ob, m, ob,
        INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
        }
        if (gotsnow == 0) {
    ob = get_object();
    copy_object(&at->clone, ob);
    ob->x = x;
    ob->y = y;
    if (dat != NULL)
        insert_ob_in_map(ob, m, ob,
    INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP);
    else
        insert_ob_in_map(ob, m, ob,
                    INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
        }
    }
        }
    }
       }
   }
   
   
   /*
    * Reduce the blockiness of the maps. m is the map we are currently processing.
    * wx and wy are
    * the weathermap coordinates for the weathermap square we want to work on.
    * filename is the pathname for the current map.  This should be called from
    * weather_effect()
    */
   
   void feather_map(mapstruct *m, int wx, int wy, char *filename)
   {
       int x, y, i, nx, ny, j;
       int avoid, two, temp, sky, gotsnow, found, nodstk;
       object *ob, *tmp, *oldsnow, *topfloor, *ntmp, *ntopfloor;
       char *doublestack, *doublestack2;
       archetype *at;
   
       for (x=0; x < settings.worldmaptilesizex; x++) {
    for (y=0; y < settings.worldmaptilesizey; y++) {
        (void)worldmap_to_weathermap(x, y, &wx, &wy, filename);
        ob = NULL;
        at = NULL;
        avoid = 0;
        two = 0;
        j = 0;
        gotsnow = 0;
        nodstk = 0;
        oldsnow = avoid_weather(&avoid, m, x, y, &gotsnow, 1);
        if (avoid)
    continue;
        if (rndm(0, 20) == 0)
    continue;
        /* the bottom floor of scorn is not IS_FLOOR */
        topfloor=NULL;
        for (tmp=GET_MAP_OB(m, x, y); tmp;
    topfloor = tmp,tmp = tmp->above) {
    if (strcmp(tmp->arch->name, "dungeon_magic") != 0)
        if (!QUERY_FLAG(tmp, FLAG_IS_FLOOR) &&
    !QUERY_FLAG(tmp, FLAG_OVERLAY_FLOOR))
    break;
        }
        /* topfloor should now be the topmost IS_FLOOR=1 */
        if (topfloor == NULL)
    continue;
        if (tmp != NULL)
    nodstk++;
        /* something is wrong with that sector. just skip it */
   
        j=rndm(1, 8);
        nx = freearr_x[j]+x;
        ny = freearr_y[j]+y;
        if (OUT_OF_REAL_MAP(m, nx, ny))
        continue;
        oldsnow = avoid_weather(&avoid, m, nx, ny, &gotsnow, 1);
        if (avoid)
    continue;
        ntopfloor=NULL;
        for (ntmp=GET_MAP_OB(m, nx, ny); ntmp;
    ntopfloor = ntmp,ntmp = ntmp->above) {
    if (strcmp(ntmp->arch->name, "dungeon_magic") != 0)
        if (!QUERY_FLAG(ntmp, FLAG_IS_FLOOR) &&
    !QUERY_FLAG(ntmp, FLAG_OVERLAY_FLOOR))
    break;
        }
        if (ntopfloor != NULL && QUERY_FLAG(ntopfloor, FLAG_IS_FLOOR)) {
    remove_ob(topfloor);
    free_object(topfloor);
    if (tmp != NULL) {
        for (i=0; weather_tile[i].herb != NULL; i++) {
    if (strcmp(tmp->arch->name, weather_tile[i].herb) == 0) {
        remove_ob(tmp);
        free_object(tmp);
        break;
    }
        }
    }
        } else {
    continue;
        }
        ob = get_object();
        copy_object(&ntopfloor->arch->clone, ob);
        ob->x = x;
        ob->y = y;
        insert_ob_in_map(ob, m, ob, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
        if (ntmp != NULL && nodstk == 0) {
    for (i=0; weather_tile[i].herb != NULL; i++) {
        if (strcmp(ntmp->arch->name, weather_tile[i].herb) == 0) {
    ob = get_object();
    copy_object(&ntmp->arch->clone, ob);
    ob->x = x;
    ob->y = y;
    insert_ob_in_map(ob, m, ob, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP);
    break;
        }
    }
        }
    }
       }
   }
   
   
 /* provide wx and wy. Will fill in with weathermap coordinates.  Requires  /* provide wx and wy. Will fill in with weathermap coordinates.  Requires
    the current mapname (must be a worldmap), and your coordinates on the     the current mapname (must be a worldmap), and your coordinates on the
    map.  returns -1 if you give it something it can't figure out. 0 normally.     map.  returns -1 if you give it something it can't figure out. 0 normally.

Legend:
line(s) removed in v.1.17 
line(s) changed
 line(s) added in v.1.18
File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:53