Difference for server/spell_attack.c from version 1.26 to 1.27

version 1.26 version 1.27
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_spell_attack_c =   * static char *rcsid_spell_attack_c =
  *   "$Id: spell_attack.c,v 1.26 2005/11/01 10:08:17 akirschbaum Exp $";   *   "$Id: spell_attack.c,v 1.27 2005/11/16 08:16:09 mwedel Exp $";
  */   */
   
   
Line 84
 
Line 84
    
  /* surface area? -tm */   /* surface area? -tm */
    
  if(QUERY_FLAG(tmp, FLAG_FLYING))   if (tmp->move_type & MOVE_FLYING)
  frictionmod = 1 ; /* flying objects loose the friction modifier */   frictionmod = 1 ; /* flying objects loose the friction modifier */
    
  if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) {  /* move it. */   if(rndm(0, weight_move-1) > ((tmp->weight / num_sections) * frictionmod)) {  /* move it. */
Line 114
 
Line 114
 void forklightning(object *op, object *tmp) {  void forklightning(object *op, object *tmp) {
     int new_dir=1;  /* direction or -1 for left, +1 for right 0 if no new bolt */      int new_dir=1;  /* direction or -1 for left, +1 for right 0 if no new bolt */
     int t_dir; /* stores temporary dir calculation */      int t_dir; /* stores temporary dir calculation */
       mapstruct *m;
       sint16  sx,sy;
   
     /* pick a fork direction.  tmp->stats.Con is the left bias      /* pick a fork direction.  tmp->stats.Con is the left bias
      * i.e., the chance in 100 of forking LEFT       * i.e., the chance in 100 of forking LEFT
Line 127
 
Line 129
     /* check the new dir for a wall and in the map*/      /* check the new dir for a wall and in the map*/
     t_dir = absdir(tmp->direction + new_dir);      t_dir = absdir(tmp->direction + new_dir);
   
     if(get_map_flags(tmp->map,NULL, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir],      if(get_map_flags(tmp->map,&m, tmp->x + freearr_x[t_dir],tmp->y + freearr_y[t_dir],
       NULL, NULL) & (P_WALL | P_OUT_OF_MAP))        &sx, &sy) & P_OUT_OF_MAP)
    new_dir = 0;
   
       if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(m, sx, sy)))
  new_dir = 0;   new_dir = 0;
   
     if(new_dir) { /* OK, we made a fork */      if(new_dir) { /* OK, we made a fork */
Line 189
 
Line 194
  * on the space.  So only call reflwall if we think the data it returns   * on the space.  So only call reflwall if we think the data it returns
  * will be useful.   * will be useful.
  */   */
  if ((mflags & P_WALL) || ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) {   if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y)) ||
      ((mflags & P_IS_ALIVE) && reflwall(m, x, y, op))) {
   
      if(!QUERY_FLAG(op, FLAG_REFLECTING))       if(!QUERY_FLAG(op, FLAG_REFLECTING))
  return;   return;
Line 207
 
Line 213
      else {       else {
  int left, right;   int left, right;
   
  left = get_map_flags(op->map, NULL, op->x+freearr_x[absdir(op->direction-1)],   get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction-1)],
         op->y+freearr_y[absdir(op->direction-1)], NULL, NULL) & P_WALL;          op->y+freearr_y[absdir(op->direction-1)], &x, &y);
   
  right = get_map_flags(op->map,NULL, op->x+freearr_x[absdir(op->direction+1)],   left = OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y));
                               op->y+freearr_y[absdir(op->direction+1)], NULL, NULL) & P_WALL;  
    get_map_flags(op->map, &m, op->x+freearr_x[absdir(op->direction+1)],
                                 op->y+freearr_y[absdir(op->direction+1)], &x, &y);
    right = OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y));
   
  if(left==right)   if(left==right)
      op->direction=absdir(op->direction+4);       op->direction=absdir(op->direction+4);
Line 292
 
Line 301
  free_object(tmp);   free_object(tmp);
  return 0;   return 0;
     }      }
     if (mflags & P_WALL) {      if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) {
  if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {   if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
      free_object(tmp);       free_object(tmp);
      return 0;       return 0;
Line 439
 
Line 448
  tmp->stats.sp = op->direction;   tmp->stats.sp = op->direction;
   
     /* Prevent recursion */      /* Prevent recursion */
     CLEAR_FLAG (op, FLAG_WALK_ON);      op->move_on = 0;
     CLEAR_FLAG (op, FLAG_FLY_ON);  
   
     insert_ob_in_map(tmp, op->map, op, 0);      insert_ob_in_map(tmp, op->map, op, 0);
     /* remove the firebullet */      /* remove the firebullet */
Line 461
 
Line 469
     tag_t op_tag = op->count, tmp_tag;      tag_t op_tag = op->count, tmp_tag;
     object *tmp;      object *tmp;
     int dam, mflags;      int dam, mflags;
       mapstruct *m;
       sint16 sx, sy;
   
     mflags = get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL);      mflags = get_map_flags(op->map,&m, op->x, op->y, &sx, &sy);
   
     if ( ! (mflags & (P_BLOCKED)))      if ( !OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, sx, sy)))
         return;          return;
   
     if (op->other_arch) {      if (op->other_arch) {
Line 542
 
Line 552
         return;          return;
     }      }
   
     if ( ! op->direction || (mflags & P_WALL)) {      if ( ! op->direction || OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y))) {
         if (op->other_arch) {          if (op->other_arch) {
             explode_bullet (op);              explode_bullet (op);
         } else {          } else {
Line 617
 
Line 627
  free_object(tmp);   free_object(tmp);
  return 0;   return 0;
     }      }
     if (mflags & P_WALL) {      if (OB_TYPE_MOVE_BLOCK(tmp, GET_MAP_MOVE_BLOCK(tmp->map, tmp->x, tmp->y))) {
  if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {   if(!QUERY_FLAG(tmp, FLAG_REFLECTING)) {
      free_object(tmp);       free_object(tmp);
      return 0;       return 0;
Line 752
 
Line 762
 {  {
     object *tmp;      object *tmp;
     int i,success=0,range_min= -1,range_max=1;      int i,success=0,range_min= -1,range_max=1;
       mapstruct *m;
       sint16  sx, sy;
       MoveType movetype;
   
     if (!spell->other_arch) return 0;      if (!spell->other_arch) return 0;
   
Line 767
 
Line 780
  range_max=8;   range_max=8;
     }      }
   
       /* Need to know what the movetype of the object we are about
        * to create is, so we can know if the space we are about to
        * insert it into is blocked.
        */
       movetype = spell->other_arch->clone.move_type;
   
     for(i=range_min;i<=range_max;i++) {      for(i=range_min;i<=range_max;i++) {
  sint16 x,y, d;   sint16 x,y, d;
   
Line 794
 
Line 813
  x = op->x+freearr_x[d];   x = op->x+freearr_x[d];
  y = op->y+freearr_y[d];   y = op->y+freearr_y[d];
   
  if(get_map_flags(op->map,NULL, x,y, NULL, NULL) & (P_WALL | P_OUT_OF_MAP))   if(get_map_flags(op->map, &m, x,y, &sx, &sy) & P_OUT_OF_MAP)
        continue;
   
    if ((movetype & GET_MAP_MOVE_BLOCK(m, sx, sy)) == movetype)
      continue;       continue;
   
  success=1;   success=1;
Line 838
 
Line 860
  }   }
   
   
  if ( ! QUERY_FLAG (tmp, FLAG_FLYING))   if ( !(tmp->move_type & MOVE_FLY_LOW))
      LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n",       LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n",
  spell->other_arch->name);   spell->other_arch->name);
   
  if (( ! QUERY_FLAG (tmp, FLAG_WALK_ON) || ! QUERY_FLAG (tmp, FLAG_FLY_ON))   if (!tmp->move_on && tmp->stats.dam) {
      && tmp->stats.dam) {  
      LOG (llevDebug,        LOG (llevDebug,
  "cast_cone(): arch %s doesn't have walk_on 1 and fly_on 1\n",    "cast_cone(): arch %s doesn't have move_on set\n",
  spell->other_arch->name);   spell->other_arch->name);
  }   }
  insert_ob_in_map(tmp,op->map,op,0);   insert_ob_in_map(tmp,m,op,0);
   
  /* This is used for tracking spells so that one effect doesn't hit   /* This is used for tracking spells so that one effect doesn't hit
  * a single space too many times.   * a single space too many times.
Line 929
 
Line 950
 int create_bomb(object *op,object *caster,int dir, object *spell) {  int create_bomb(object *op,object *caster,int dir, object *spell) {
   
     object *tmp;      object *tmp;
       int mflags;
     sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir];      sint16 dx=op->x+freearr_x[dir], dy=op->y+freearr_y[dir];
       mapstruct *m;
   
     if(get_map_flags(op->map,NULL, dx,dy, NULL,NULL) & (P_OUT_OF_MAP | P_WALL)) {      mflags = get_map_flags(op->map, &m, dx,dy, &dx,&dy);
       if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK(m, dx, dy) & MOVE_WALK)) {
  new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way.");   new_draw_info(NDI_UNIQUE, 0,op,"There is something in the way.");
  return 0;   return 0;
     }      }
Line 948
 
Line 971
     set_spell_skill(op, caster, spell, tmp);      set_spell_skill(op, caster, spell, tmp);
     tmp->x=dx;      tmp->x=dx;
     tmp->y=dy;      tmp->y=dy;
     insert_ob_in_map(tmp,op->map,op,0);      insert_ob_in_map(tmp,m,op,0);
     return 1;      return 1;
 }  }
   
Line 982
 
Line 1005
  mp = op->map;   mp = op->map;
  mflags = get_map_flags(op->map, &mp, x, y, &x, &y);   mflags = get_map_flags(op->map, &mp, x, y, &x, &y);
   
  if (mflags & (P_OUT_OF_MAP | P_WALL)) return NULL;   if (mflags & P_OUT_OF_MAP)  return NULL;
  if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL;   if ((type & SPELL_MANA) && (mflags & P_NO_MAGIC)) return NULL;
  if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL;   if ((type & SPELL_GRACE) && (mflags & P_NO_CLERIC)) return NULL;
    if (GET_MAP_MOVE_BLOCK(mp, x, y) & MOVE_FLY_LOW) return NULL;
   
  if (mflags & P_IS_ALIVE) {   if (mflags & P_IS_ALIVE) {
      for(target=get_map_ob(mp,x,y); target; target=target->above) {       for(target=get_map_ob(mp,x,y); target; target=target->above) {
  if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) {   if(QUERY_FLAG(target->head?target->head:target,FLAG_MONSTER)) {
Line 1103
 
Line 1128
     int i, mflags;      int i, mflags;
     object *owner;      object *owner;
     sint16 new_x, new_y;      sint16 new_x, new_y;
       mapstruct *m;
   
     if (op->range-- <=0) {      if (op->range-- <=0) {
  remove_ob(op);   remove_ob(op);
Line 1125
 
Line 1151
     new_x = op->x + DIRX(op);      new_x = op->x + DIRX(op);
     new_y = op->y + DIRY(op);      new_y = op->y + DIRY(op);
   
     mflags = get_map_flags(op->map, NULL, new_x, new_y, NULL, NULL);      mflags = get_map_flags(op->map, &m, new_x, new_y, &new_x, &new_y);
   
     if (mflags & P_BLOCKED) {      if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, new_x, new_y))) {
  tag_t tag = op->count;   tag_t tag = op->count;
  hit_map (op, op->direction, AT_MAGIC, 1);   hit_map (op, op->direction, AT_MAGIC, 1);
  /* Basically, missile only hits one thing then goes away.   /* Basically, missile only hits one thing then goes away.
Line 1141
 
Line 1167
     }      }
   
     remove_ob(op);      remove_ob(op);
     if ( ! op->direction || (mflags & (P_WALL | P_OUT_OF_MAP))) {      if ( ! op->direction || (mflags & P_OUT_OF_MAP)) {
  free_object(op);   free_object(op);
  return;   return;
     }      }
     op->x = new_x;      op->x = new_x;
     op->y = new_y;      op->y = new_y;
       op->map = m;
     i=spell_find_dir(op->map, op->x, op->y, get_owner(op));      i=spell_find_dir(op->map, op->x, op->y, get_owner(op));
     if(i > 0 && i != op->direction){      if(i > 0 && i != op->direction){
  op->direction=i;   op->direction=i;
Line 1509
 
Line 1536
   
 void move_ball_spell(object *op) {  void move_ball_spell(object *op) {
     int i,j,dam_save,dir, mflags;      int i,j,dam_save,dir, mflags;
     sint16 nx,ny;      sint16 nx,ny, hx, hy;
     object *owner;      object *owner;
     mapstruct *m;      mapstruct *m;
   
Line 1537
 
Line 1564
   
  nx = op->x + freearr_x[tmpdir];   nx = op->x + freearr_x[tmpdir];
  ny = op->y + freearr_y[tmpdir];   ny = op->y + freearr_y[tmpdir];
  if ( ! (get_map_flags(op->map, NULL, nx, ny, NULL, NULL) & (P_WALL | P_OUT_OF_MAP))) {   if ( ! (get_map_flags(op->map, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP) &&
        !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, nx, ny)))) {
      dir = tmpdir;       dir = tmpdir;
      break;       break;
  }   }
Line 1545
 
Line 1573
     if (dir == 0) {      if (dir == 0) {
  nx = op->x;   nx = op->x;
  ny = op->y;   ny = op->y;
    m = op->map;
     }      }
   
     remove_ob(op);      remove_ob(op);
     op->y=ny;      op->y=ny;
     op->x=nx;      op->x=nx;
     insert_ob_in_map(op,op->map,op,0);      insert_ob_in_map(op,m,op,0);
    
     dam_save = op->stats.dam;  /* save the original dam: we do halfdam on       dam_save = op->stats.dam;  /* save the original dam: we do halfdam on
                                 surrounding squares */                                  surrounding squares */
Line 1560
 
Line 1589
      * the surround spaces.       * the surround spaces.
      */       */
     for(j=0;j<9;j++) {      for(j=0;j<9;j++) {
  sint16 hx,hy;  /* hit these squares */  
  object *new_ob;   object *new_ob;
   
  hx = nx+freearr_x[j];   hx = nx+freearr_x[j];
Line 1575
 
Line 1603
  * of the map either.   * of the map either.
  */   */
   
  if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || owner->map != m)) {   if((mflags & P_IS_ALIVE) && (!owner || owner->x!=hx || owner->y!=hy || !on_same_map(owner,op))) {
      if(j) op->stats.dam = dam_save/2;       if(j) op->stats.dam = dam_save/2;
      hit_map(op,j,op->attacktype,1);       hit_map(op,j,op->attacktype,1);
   
  }   }
  if(!(mflags & P_WALL) && op->other_arch) { /* insert the other arch */  
    /* insert the other arch */
    if(op->other_arch && !(OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy)))) {
      new_ob = arch_to_object(op->other_arch);       new_ob = arch_to_object(op->other_arch);
      new_ob->x = hx;       new_ob->x = hx;
      new_ob->y = hy;       new_ob->y = hy;
Line 1595
 
Line 1625
   
     if(i>=0) { /* we have a preferred direction!  */      if(i>=0) { /* we have a preferred direction!  */
  /* pick another direction if the preferred dir is blocked. */   /* pick another direction if the preferred dir is blocked. */
  if(get_map_flags(op->map,NULL, nx + freearr_x[i], ny + freearr_y[i],NULL,NULL) & P_WALL) {   if (get_map_flags(op->map,&m, nx + freearr_x[i], ny + freearr_y[i],&hx,&hy) & P_OUT_OF_MAP ||
       OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, hx, hy))) {
      i= absdir(i + rndm(0, 2) -1);  /* -1, 0, +1 */       i= absdir(i + rndm(0, 2) -1);  /* -1, 0, +1 */
  }   }
  op->direction=i;   op->direction=i;
Line 1617
 
Line 1648
     static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };      static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
     sint16 target_x, target_y, origin_x, origin_y;      sint16 target_x, target_y, origin_x, origin_y;
     int basedir, adjustdir;      int basedir, adjustdir;
       mapstruct *m;
     object *owner;      object *owner;
   
     owner = get_owner(op);      owner = get_owner(op);
Line 1663
 
Line 1695
      */       */
          
     if (op->spell && op->spell->type == SPELL &&       if (op->spell && op->spell->type == SPELL &&
  !(get_map_flags(op->map, NULL, target_x, target_y, NULL, NULL) & (P_WALL | P_OUT_OF_MAP))) {   !(get_map_flags(op->map, &m, target_x, target_y, &target_x, &target_y) & P_OUT_OF_MAP) &&
    !(OB_TYPE_MOVE_BLOCK(op->spell, GET_MAP_MOVE_BLOCK(m, target_x, target_y)))) {
   
  /* Bullet spells have a bunch more customization that needs to be done */   /* Bullet spells have a bunch more customization that needs to be done */
  if (op->spell->subtype == SP_BULLET)   if (op->spell->subtype == SP_BULLET)
Line 1759
 
Line 1792
     }      }
   
     /* no live target, perhaps a wall is in the way? */      /* no live target, perhaps a wall is in the way? */
     if(mflags & P_BLOCKED) {      if (OB_TYPE_MOVE_BLOCK(op, GET_MAP_MOVE_BLOCK(m, x, y))) {
  new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way.");   new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way.");
  return 0;   return 0;
     }      }
Line 1821
 
Line 1854
   
  if (mflags & P_OUT_OF_MAP) return 0;   if (mflags & P_OUT_OF_MAP) return 0;
   
  /* don't go through walls */   /* don't go through walls - presume diseases are airborne */
  if (mflags & P_NO_PASS) return 0;   if (GET_MAP_MOVE_BLOCK(m, x, y) &  MOVE_FLY_LOW) return 0;
   
  /* Only bother looking on this space if there is something living here */   /* Only bother looking on this space if there is something living here */
  if (mflags & P_IS_ALIVE) {   if (mflags & P_IS_ALIVE) {

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