Difference for server/spell_effect.c from version 1.61 to 1.62

version 1.61 version 1.62
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_spell_effect_c =   * static char *rcsid_spell_effect_c =
  *   "$Id: spell_effect.c,v 1.61 2001/08/29 07:14:16 mwedel Exp $";   *   "$Id: spell_effect.c,v 1.62 2001/09/26 21:34:08 garbled Exp $";
  */   */
   
   
Line 176
 
Line 176
       break;        break;
   if(wand == NULL)    if(wand == NULL)
     return 0;      return 0;
   if(!(RANDOM()%4)) {    if(!(random_roll(0, 3, op, PREFER_LOW))) {
     new_draw_info_format(NDI_UNIQUE, 0, op,      new_draw_info_format(NDI_UNIQUE, 0, op,
  "The %s vibrates violently, then explodes!",query_name(wand));   "The %s vibrates violently, then explodes!",query_name(wand));
     play_sound_map(op->map, op->x, op->y, SOUND_OB_EXPLODE);      play_sound_map(op->map, op->x, op->y, SOUND_OB_EXPLODE);
Line 229
 
Line 229
     /* High level creatures are immune, as are creatures immune to magic.  Otherwise,      /* High level creatures are immune, as are creatures immune to magic.  Otherwise,
      * give the creature a saving throw.       * give the creature a saving throw.
      */       */
     if (op->level>=20 || ((RANDOM()%20 +1 + op->resist[ATNR_MAGIC]/10) > savethrow[op->level]) ||      if (op->level>=20 || random_roll(1, 20, op, PREFER_HIGH) +
    op->resist[ATNR_MAGIC]/10 > savethrow[op->level] ||
  (op->resist[ATNR_MAGIC]==100))   (op->resist[ATNR_MAGIC]==100))
  return;   return;
   
Line 1295
 
Line 1296
            success = 1;             success = 1;
  break;   break;
   case SP_MINOR_HEAL:    case SP_MINOR_HEAL:
     heal=(RANDOM()%7)+1;      heal=random_roll(1, 7, op, PREFER_HIGH);
     new_draw_info(NDI_UNIQUE, 0,tmp, "Your wounds start to close.");      new_draw_info(NDI_UNIQUE, 0,tmp, "Your wounds start to close.");
     break;      break;
   case SP_MED_HEAL:    case SP_MED_HEAL:
     heal=(RANDOM()%6)+(RANDOM()%6)+(RANDOM()%6)+7;      heal=die_roll(3, 6, op, PREFER_HIGH)+4;
     new_draw_info(NDI_UNIQUE, 0,tmp, "Your wounds start to fade.");      new_draw_info(NDI_UNIQUE, 0,tmp, "Your wounds start to fade.");
     break;      break;
   case SP_MAJOR_HEAL:    case SP_MAJOR_HEAL:
     new_draw_info(NDI_UNIQUE, 0,tmp, "Your skin looks as good as new!");      new_draw_info(NDI_UNIQUE, 0,tmp, "Your skin looks as good as new!");
     heal=(RANDOM()%8)+(RANDOM()%8)+(RANDOM()%8)+(RANDOM()%8)+12;      heal=die_roll(4, 8, op, PREFER_HIGH)+8;
     break;      break;
   case SP_HEAL:    case SP_HEAL:
     heal=tmp->stats.maxhp;  /* or should be this tmp->stats.maxhp? */      heal=tmp->stats.maxhp;  /* or should be this tmp->stats.maxhp? */
Line 1459
 
Line 1460
   case SP_STRENGTH:    case SP_STRENGTH:
     if(tmp->type!=PLAYER)      if(tmp->type!=PLAYER)
       break;        break;
     if(!(RANDOM()%(MAX(1,(10 - MAX_STAT + tmp->stats.Str))))) {      if(!(random_roll(0, (MAX(1,(10 - MAX_STAT + tmp->stats.Str)))-1, op, PREFER_LOW))) {
     for(i=20,force->stats.Str=1;i>tmp->stats.Str;i-=2)      for(i=20,force->stats.Str=1;i>tmp->stats.Str;i-=2)
       force->stats.Str++; }        force->stats.Str++; }
         else { new_draw_info(NDI_UNIQUE, 0,op,"You grow no stronger."); force->stats.Str=0; }          else { new_draw_info(NDI_UNIQUE, 0,op,"You grow no stronger."); force->stats.Str=0; }
Line 1467
 
Line 1468
   case SP_DEXTERITY:    case SP_DEXTERITY:
     if(tmp->type!=PLAYER)      if(tmp->type!=PLAYER)
       break;        break;
     if(!(RANDOM()%(MAX(1,(10 - MAX_STAT + tmp->stats.Dex))))) {      if(!(random_roll(0, (MAX(1,(10 - MAX_STAT + tmp->stats.Dex)))-1, op, PREFER_LOW))) {
     for(i=20,force->stats.Dex=1;i>tmp->stats.Dex;i-=2)      for(i=20,force->stats.Dex=1;i>tmp->stats.Dex;i-=2)
       force->stats.Dex++; }        force->stats.Dex++; }
         else { new_draw_info(NDI_UNIQUE, 0,op,"You grow no more agile."); force->stats.Dex=0; }          else { new_draw_info(NDI_UNIQUE, 0,op,"You grow no more agile."); force->stats.Dex=0; }
Line 1476
 
Line 1477
   case SP_CONSTITUTION:    case SP_CONSTITUTION:
     if(tmp->type!=PLAYER)      if(tmp->type!=PLAYER)
       break;        break;
     if(!(RANDOM()%(MAX(1,(10 - MAX_STAT + tmp->stats.Con))))) {      if(!(random_roll(0, (MAX(1,(10 - MAX_STAT + tmp->stats.Con)))-1, op, PREFER_LOW))) {
     for(i=20,force->stats.Con=1;i>tmp->stats.Con;i-=2)      for(i=20,force->stats.Con=1;i>tmp->stats.Con;i-=2)
       force->stats.Con++;}        force->stats.Con++;}
         else { new_draw_info(NDI_UNIQUE, 0,op,"You don't feel any healthier."); force->stats.Con=0; }          else { new_draw_info(NDI_UNIQUE, 0,op,"You don't feel any healthier."); force->stats.Con=0; }
Line 1485
 
Line 1486
   case SP_CHARISMA:    case SP_CHARISMA:
     if(tmp->type!=PLAYER)      if(tmp->type!=PLAYER)
       break;        break;
     if(!(RANDOM()%(MAX(1,(10 - MAX_STAT + tmp->stats.Cha))))) {      if(!(random_roll(0, (MAX(1,(10 - MAX_STAT + tmp->stats.Cha)))-1, op, PREFER_LOW))) {
     for(i=20,force->stats.Cha=1;i>tmp->stats.Cha;i-=2)      for(i=20,force->stats.Cha=1;i>tmp->stats.Cha;i-=2)
       force->stats.Cha++;}        force->stats.Cha++;}
         else { new_draw_info(NDI_UNIQUE, 0,op,"You are no easier to look at."); force->stats.Cha=0; }          else { new_draw_info(NDI_UNIQUE, 0,op,"You are no easier to look at."); force->stats.Cha=0; }
Line 2286
 
Line 2287
  }   }
       }        }
   
       if ((random_val=RANDOM()%chance) > (chance - ++success - 2))        if ((random_val=random_roll(0, chance-1, op, PREFER_LOW)) >
      (chance - ++success - 2))
         break;          break;
     }      }
   /* If all the power of the spell has been used up, don't go and identify    /* If all the power of the spell has been used up, don't go and identify
Line 2308
 
Line 2310
  }   }
  esrv_send_item(op, tmp);   esrv_send_item(op, tmp);
       }        }
       if (RANDOM() %chance > (chance - ++success - 2))        if (random_roll(0, chance-1, op, PREFER_LOW) > (chance - ++success - 2))
  break;   break;
     }      }
   }    }
Line 2421
 
Line 2423
  tmp->type==TRIGGER_PEDESTAL || tmp->type==SPECIAL_KEY ||   tmp->type==TRIGGER_PEDESTAL || tmp->type==SPECIAL_KEY ||
  tmp->type==TREASURE || tmp->type==BOOK ||   tmp->type==TREASURE || tmp->type==BOOK ||
  tmp->type==HOLY_ALTAR)) {   tmp->type==HOLY_ALTAR)) {
  if(RANDOM()%(SK_level(op)) > tmp->level/4) {   if(random_roll(0, SK_level(op)-1, op, PREFER_HIGH) >
       tmp->level/4) {
      tmp->invisible=0;       tmp->invisible=0;
      done_one = 1;       done_one = 1;
  }   }
Line 2525
 
Line 2528
    if(weap->slaying) /* selective pacify */      if(weap->slaying) /* selective pacify */
  if(tmp->race != weap->slaying && tmp->name != weap->slaying) continue;   if(tmp->race != weap->slaying && tmp->name != weap->slaying) continue;
         /* if(op->level <( (RANDOM()%(2*tmp->level+1))-(op->stats.Cha-10)/2)) continue; */           /* if(op->level <( (RANDOM()%(2*tmp->level+1))-(op->stats.Cha-10)/2)) continue; */
           if(SK_level(op) <( (RANDOM()%(2*tmp->level+1))-(op->stats.Cha-10)/2)) continue;            if(SK_level(op) < random_roll(0, 2*tmp->level, op, PREFER_LOW)-(op->stats.Cha-10)/2) continue;
         }          }
   
         if((effect=get_archetype("detect_magic"))){          if((effect=get_archetype("detect_magic"))){
Line 2865
 
Line 2868
  if(QUERY_FLAG(tmp,FLAG_UNDEAD)) continue;   if(QUERY_FLAG(tmp,FLAG_UNDEAD)) continue;
  if(tmp->more || tmp->head) continue;  /* multiple square monsters NOT */   if(tmp->more || tmp->head) continue;  /* multiple square monsters NOT */
  /* if(op->level <( (RANDOM()%(2*tmp->level+1))-(op->stats.Cha-10)/2)) continue; */    /* if(op->level <( (RANDOM()%(2*tmp->level+1))-(op->stats.Cha-10)/2)) continue; */
  if(SK_level(op) <( (RANDOM()%(2*tmp->level+1))-(op->stats.Cha-10)/2)) continue;   if(SK_level(op) <random_roll(0, 2*tmp->level, op, PREFER_LOW)-(op->stats.Cha-10)/2) continue;
   
  if((effect=get_archetype("detect_magic"))){   if((effect=get_archetype("detect_magic"))){
  effect->x = tmp->x;   effect->x = tmp->x;
Line 2905
 
Line 2908
         if(tmp->resist[ATNR_MAGIC]==100) continue;          if(tmp->resist[ATNR_MAGIC]==100) continue;
         if(!QUERY_FLAG(tmp,FLAG_UNDEAD)) continue;          if(!QUERY_FLAG(tmp,FLAG_UNDEAD)) continue;
         if(tmp->more || tmp->head) continue;  /* multiple square monsters NOT */          if(tmp->more || tmp->head) continue;  /* multiple square monsters NOT */
         if(SK_level(op)+bonus < ( (RANDOM()%(2*tmp->level+1))-(op->stats.Wis-10)/2)) continue;          if(SK_level(op)+bonus < random_roll(0, 2*tmp->level, op, PREFER_LOW)-(op->stats.Wis-10)/2) continue;
   
         if((effect=get_archetype("detect_magic"))){          if((effect=get_archetype("detect_magic"))){
                 effect->x = tmp->x;                  effect->x = tmp->x;
Line 3016
 
Line 3019
     /* the summon level */      /* the summon level */
     i=SK_level(op)+op->stats.Wis/10;      i=SK_level(op)+op->stats.Wis/10;
     if (i==0) i=1;      if (i==0) i=1;
     summon_level = RANDOM()%i;      summon_level = random_roll(0, i-1, op, PREFER_HIGH);
     if(op->path_attuned&PATH_SUMMON) summon_level += 5;      if(op->path_attuned&PATH_SUMMON) summon_level += 5;
     if(op->path_repelled&PATH_SUMMON) summon_level -= 5;      if(op->path_repelled&PATH_SUMMON) summon_level -= 5;
   
Line 3058
 
Line 3061
      */       */
   
     if(mon->level>(summon_level/2))      if(mon->level>(summon_level/2))
  number = RANDOM()%2 + 1;   number = random_roll(1, 2, op, PREFER_HIGH);
     else      else
  number = RANDOM()%2 + RANDOM()%2 + 2;   number = die_roll(2, 2, op, PREFER_HIGH);
   
     for (i = 1; i < number + 1; i++) {      for (i = 1; i < number + 1; i++) {
  object *head;   object *head;
Line 3350
 
Line 3353
   /* there are 'grave' consequences for using this spell on the unliving! */    /* there are 'grave' consequences for using this spell on the unliving! */
   if(QUERY_FLAG(target,FLAG_UNDEAD)) {    if(QUERY_FLAG(target,FLAG_UNDEAD)) {
       success = 0;        success = 0;
       if(RANDOM()%3) {         if(random_roll(0, 2, op, PREFER_LOW)) {
         new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!");           new_draw_info(NDI_UNIQUE,0,op,"Idiot! Your spell boomerangs!");
  hitter->x=op->x;   hitter->x=op->x;
  hitter->y=op->y;    hitter->y=op->y;
Line 3966
 
Line 3969
               
       /* OK, now set the monster on other monsters */        /* OK, now set the monster on other monsters */
       level = MAX(1,SK_level(caster)/2);        level = MAX(1,SK_level(caster)/2);
       if(RANDOM()%level > tmp->level) {  /* successfully induced conflict */        if(random_roll(0, level-1, op, PREFER_HIGH) > tmp->level) {
    /* successfully induced conflict */
  char buf[MAX_BUF];   char buf[MAX_BUF];
  SET_FLAG(tmp,FLAG_BERSERK);   SET_FLAG(tmp,FLAG_BERSERK);
  if(tmp->name) {   if(tmp->name) {
Line 3979
 
Line 3983
     }      }
   return 1;    return 1;
 }  }
   

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