Difference for common/living.c from version 1.2 to 1.3


version 1.2 version 1.3
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_living_c =   * static char *rcsid_living_c =
  *   "$Id: living.c,v 1.2 1999/07/13 06:02:41 cvs Exp $";   *   "$Id: living.c,v 1.3 1999/09/17 19:20:31 damn Exp $";
  */   */
   
 /*  /*
Line 220
 
Line 220
    1, 1, 1, 1, 1, 1, 1, 1, 1, 1     1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 };  };
   
 int object_saves[NROFATTACKS][NROFMATERIALS] = {  
   /* Paper, Iron, Glass, Leather, Wood, Organic, Stone, Cloth, Adamant */  
   {15, 2,14, 5,10, 3, 2,14,0}, /* Physical */  
   {10,12,11,10,11,12, 5,11,0}, /* Magic */  
   {17, 3, 8,10,13, 9, 2,13,0}, /* Fire */  
   { 9,12, 3, 3, 2,11, 2, 4,0}, /* Electricity */  
   { 5, 2,10, 3, 2, 3, 2, 4,0}, /* Cold */  
   { 7,10, 5,10,10,10, 2, 5,0}, /* Water */  
   {13, 7, 1,10, 9, 9, 1,10,0}, /* Acid */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* Drain */  
   {20,20,20,20,20,20,20,20,0}, /* Weaponmagic */  
   {15,15,15,15,15,15,15,15,0}, /* Ghosthit */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* IT */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* Disease */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* Paralyze */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* Turn undead */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* Fear */  
   {10,10, 0,12,12, 0, 5, 5,0}, /* Cancellation */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* Depletion */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* Death */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}, /* Chaos */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0},  /* Counterspell */  
   { 0, 0, 0, 0, 0, 0, 0, 0,0}  /* Godpower */  
 };  
   
 char *attacks[NROFATTACKS] = {  char *attacks[NROFATTACKS] = {
   "physical", "magical", "fire", "electricity", "cold", "confusion",    "physical", "magical", "fire", "electricity", "cold", "confusion",
   "acid", "drain", "weaponmagic", "ghosthit", "poison", "slow",    "acid", "drain", "weaponmagic", "ghosthit", "poison", "slow",
Line 904
 
Line 879
  op->contr->gen_hp = 0;   op->contr->gen_hp = 0;
  op->contr->gen_sp = 0;   op->contr->gen_sp = 0;
  op->contr->gen_grace = 0;   op->contr->gen_grace = 0;
    op->contr->gen_sp_armour = 10;
   }    }
   if(op->slaying!=NULL) {    if(op->slaying!=NULL) {
     free_string(op->slaying);      free_string(op->slaying);
Line 923
 
Line 899
   CLEAR_FLAG(op,FLAG_BLIND);    CLEAR_FLAG(op,FLAG_BLIND);
   CLEAR_FLAG(op,FLAG_SEE_IN_DARK);    CLEAR_FLAG(op,FLAG_SEE_IN_DARK);
   
     op->path_attuned=op->arch->clone.path_attuned;
     op->path_repelled=op->arch->clone.path_repelled;
     op->path_denied=op->arch->clone.path_denied;
   
   op->protected=op->arch->clone.protected;    op->protected=op->arch->clone.protected;
   op->vulnerable=op->arch->clone.vulnerable;    op->vulnerable=op->arch->clone.vulnerable;
   op->immune=op->arch->clone.immune;    op->immune=op->arch->clone.immune;
Line 966
 
Line 946
  op->contr->gen_hp += tmp->stats.hp;   op->contr->gen_hp += tmp->stats.hp;
  op->contr->gen_sp += tmp->stats.sp;   op->contr->gen_sp += tmp->stats.sp;
  op->contr->gen_grace += tmp->stats.grace;   op->contr->gen_grace += tmp->stats.grace;
      op->contr->gen_sp_armour += tmp->last_heal;
      if (tmp->last_heal) LOG(llevDebug,"Object %s applied, gen_sp_armour + %d = %d\n", tmp->name, tmp->last_heal, op->contr->gen_sp_armour);
  }   }
    }     }
   
Line 974
 
Line 956
    if(speed_reduce_from_disease ==0) speed_reduce_from_disease = 1;     if(speed_reduce_from_disease ==0) speed_reduce_from_disease = 1;
  }   }
        
      
       op->protected|=tmp->protected;        op->protected|=tmp->protected;
       op->vulnerable|=tmp->vulnerable;        op->vulnerable|=tmp->vulnerable;
       if (tmp->type!=BOW) {        if (tmp->type!=BOW) {


Legend:
line(s) removed in v.1.2 
line(s) changed
 line(s) added in v.1.3

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:09