Difference for common/living.c from version 1.72 to 1.73

version 1.72 version 1.73
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_living_c =   * static char *rcsid_living_c =
  *   "$Id: living.c,v 1.72 2005/08/12 13:46:34 ryo_saeba Exp $";   *   "$Id: living.c,v 1.73 2005/08/15 22:40:14 akirschbaum Exp $";
  */   */
   
 /*  /*
Line 35
 
Line 35
  */   */
 #define ADD_EXP(exptotal, exp) {exptotal += exp; if (exptotal > MAX_EXPERIENCE) exptotal = MAX_EXPERIENCE; }  #define ADD_EXP(exptotal, exp) {exptotal += exp; if (exptotal > MAX_EXPERIENCE) exptotal = MAX_EXPERIENCE; }
   
 static int con_bonus[MAX_STAT + 1]={  static const int con_bonus[MAX_STAT + 1]={
   -6,-5,-4,-3,-2,-1,-1,0,0,0,0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,    -6,-5,-4,-3,-2,-1,-1,0,0,0,0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,
   22,25,30,40,50    22,25,30,40,50
 };  };
Line 44
 
Line 44
  * because Pow can now be the stat that controls spellpoint   * because Pow can now be the stat that controls spellpoint
  * advancement. -b.t.   * advancement. -b.t.
  */   */
 static int sp_bonus[MAX_STAT + 1]={  static const int sp_bonus[MAX_STAT + 1]={
   -10,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12,15,20,25,    -10,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12,15,20,25,
   30,40,50,70,100    30,40,50,70,100
 };  };
   
 static int grace_bonus[MAX_STAT +1] = {  static const int grace_bonus[MAX_STAT +1] = {
     -10,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12,15,20,25,      -10,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12,15,20,25,
   30,40,50,70,100    30,40,50,70,100
 };  };
Line 70
 
Line 70
  * it is 1-diff   * it is 1-diff
  */   */
   
 float cha_bonus[MAX_STAT + 1]={10.0, 10.0, 9.0, 8.0, 7.0, 6.0, /*<-5*/  const float cha_bonus[MAX_STAT + 1]={10.0, 10.0, 9.0, 8.0, 7.0, 6.0, /*<-5*/
     5.0, 4.5, 4.0, 3.5, 3.0, /*<-10*/ 2.9, 2.8, 2.7, 2.6, 2.5, /*<-15*/      5.0, 4.5, 4.0, 3.5, 3.0, /*<-10*/ 2.9, 2.8, 2.7, 2.6, 2.5, /*<-15*/
     2.4, 2.3, 2.2, 2.1, 2.0, /*<-20*/ 1.95, 1.90, 1.85, 1.80, 1.75, /*25 */      2.4, 2.3, 2.2, 2.1, 2.0, /*<-20*/ 1.95, 1.90, 1.85, 1.80, 1.75, /*25 */
     1.70, 1.65, 1.60, 1.55, 1.50 /*30 */      1.70, 1.65, 1.60, 1.55, 1.50 /*30 */
 };  };
   
 int dex_bonus[MAX_STAT + 1]={  const int dex_bonus[MAX_STAT + 1]={
   -4,-3,-2,-2,-1,-1,-1,0,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,4,5,5,6,6,7    -4,-3,-2,-2,-1,-1,-1,0,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,4,5,5,6,6,7
 };  };
   
 /* speed_bonus uses dex as its stat */  /* speed_bonus uses dex as its stat */
 float speed_bonus[MAX_STAT + 1]={  const float speed_bonus[MAX_STAT + 1]={
   -0.4, -0.4, -0.3, -0.3, -0.2, -0.2, -0.2, -0.1, -0.1, -0.1, -0.05, 0, 0, 0,    -0.4, -0.4, -0.3, -0.3, -0.2, -0.2, -0.2, -0.1, -0.1, -0.1, -0.05, 0, 0, 0,
   0.05, 0.1, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.8, 1.0, 1.2, 1.4,    0.05, 0.1, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.8, 1.0, 1.2, 1.4,
   1.6, 1.8, 2.0, 2.5, 3.0    1.6, 1.8, 2.0, 2.5, 3.0
Line 90
 
Line 90
 /* dam_bonus, thaco_bonus, max_carry, weight limit all are based on  /* dam_bonus, thaco_bonus, max_carry, weight limit all are based on
  * strength.   * strength.
  */   */
 int dam_bonus[MAX_STAT + 1]={  const int dam_bonus[MAX_STAT + 1]={
   -2,-2,-2,-1,-1,-1,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,6,7,8,10,15    -2,-2,-2,-1,-1,-1,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,6,7,8,10,15
 };  };
 int thaco_bonus[MAX_STAT + 1]={  
   const int thaco_bonus[MAX_STAT + 1]={
   -2,-2,-1,-1,0,0,0,0,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,7,8,10    -2,-2,-1,-1,0,0,0,0,0,0,0,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,7,8,10
 };  };
   
 /* Max you can carry before you start getting extra speed penalties */  /* Max you can carry before you start getting extra speed penalties */
 int max_carry[MAX_STAT + 1]={  const int max_carry[MAX_STAT + 1]={
   2,4,7,11,16,22,29,37,46,56,67,79,92,106,121,137,154,172,191,211,232,254,277,    2,4,7,11,16,22,29,37,46,56,67,79,92,106,121,137,154,172,191,211,232,254,277,
   301,326,352,400,450,500,600,1000    301,326,352,400,450,500,600,1000
 };  };
Line 110
 
Line 111
  * before, you need to start someplace.   * before, you need to start someplace.
  */   */
   
 uint32 weight_limit[MAX_STAT+ 1] = {  const uint32 weight_limit[MAX_STAT+ 1] = {
     200000,  /* 0 */      200000,  /* 0 */
     250000,300000,350000,400000,500000,     /* 5*/      250000,300000,350000,400000,500000,     /* 5*/
     600000,700000,800000,900000,1000000,    /* 10 */      600000,700000,800000,900000,1000000,    /* 10 */
Line 120
 
Line 121
     3250000,3500000,3750000,4000000,4500000  /*30 */       3250000,3500000,3750000,4000000,4500000  /*30 */
 };  };
   
 int learn_spell[MAX_STAT + 1]={  const int learn_spell[MAX_STAT + 1]={
   0,0,0,1,2,4,8,12,16,25,36,45,55,65,70,75,80,85,90,95,100,100,100,100,100,    0,0,0,1,2,4,8,12,16,25,36,45,55,65,70,75,80,85,90,95,100,100,100,100,100,
   100,100,100,100,100,100    100,100,100,100,100,100
 };  };
 int cleric_chance[MAX_STAT + 1]={  
   const int cleric_chance[MAX_STAT + 1]={
   100,100,100,100,90,80,70,60,50,40,35,30,25,20,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0,0    100,100,100,100,90,80,70,60,50,40,35,30,25,20,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0,0
 };  };
 int turn_bonus[MAX_STAT + 1]={  
   const int turn_bonus[MAX_STAT + 1]={
   -1,-1,-1,-1,-1,-1,-1,-1,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,7,8,9,10,12,15    -1,-1,-1,-1,-1,-1,-1,-1,0,0,0,1,1,1,2,2,2,3,3,3,4,4,5,5,6,7,8,9,10,12,15
 };  };
 int fear_bonus[MAX_STAT + 1]={  
   const int fear_bonus[MAX_STAT + 1]={
   3,3,3,3,2,2,2,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0    3,3,3,3,2,2,2,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 };  };
   
Line 171
 
Line 175
  * for safety, savethrow should not be accessed directly anymore,   * for safety, savethrow should not be accessed directly anymore,
  * and instead did_make_save should be used instead.   * and instead did_make_save should be used instead.
  */   */
 static int savethrow[MAX_SAVE_LEVEL+1]={  static const int savethrow[MAX_SAVE_LEVEL+1]={
   18,    18,
   18,17,16,15,14,14,13,13,12,12,12,11,11,11,11,10,10,10,10, 9,    18,17,16,15,14,14,13,13,12,12,12,11,11,11,11,10,10,10,10, 9,
    9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,     9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
Line 181
 
Line 185
    1, 1, 1, 1, 1, 1, 1, 1, 1, 1     1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 };  };
   
 const char *attacks[NROFATTACKS] = {  const char *const 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",
   "paralyze", "turn undead", "fear", "cancellation", "depletion", "death",    "paralyze", "turn undead", "fear", "cancellation", "depletion", "death",
Line 189
 
Line 193
   "life stealing"    "life stealing"
 };  };
   
 static const char *drain_msg[NUM_STATS] = {  static const char *const drain_msg[NUM_STATS] = {
   "Oh no! You are weakened!",    "Oh no! You are weakened!",
   "You're feeling clumsy!",    "You're feeling clumsy!",
   "You feel less healthy",    "You feel less healthy",
Line 198
 
Line 202
   "Watch out, your mind is going!",     "Watch out, your mind is going!",
   "Your spirit feels drained!"    "Your spirit feels drained!"
 };  };
 const char *restore_msg[NUM_STATS] = {  const char *const restore_msg[NUM_STATS] = {
   "You feel your strength return.",    "You feel your strength return.",
   "You feel your agility return.",    "You feel your agility return.",
   "You feel your health return.",    "You feel your health return.",
Line 207
 
Line 211
   "You feel your memory return.",     "You feel your memory return.",
   "You feel your spirits return."    "You feel your spirits return."
 };  };
 const char *gain_msg[NUM_STATS] = {  const char *const gain_msg[NUM_STATS] = {
  "You feel stronger.",   "You feel stronger.",
  "You feel more agile.",   "You feel more agile.",
  "You feel healthy.",   "You feel healthy.",
Line 216
 
Line 220
  "You feel smarter.",    "You feel smarter.",
  "You feel more potent."   "You feel more potent."
 };  };
 const char *lose_msg[NUM_STATS] = {  const char *const lose_msg[NUM_STATS] = {
  "You feel weaker!",   "You feel weaker!",
  "You feel clumsy!",   "You feel clumsy!",
  "You feel less healthy!",   "You feel less healthy!",
Line 226
 
Line 230
  "You feel less potent!"   "You feel less potent!"
 };  };
   
 const char *statname[NUM_STATS] = {  const char *const statname[NUM_STATS] = {
   "strength", "dexterity", "constitution", "wisdom", "charisma", "intelligence","power"     "strength", "dexterity", "constitution", "wisdom", "charisma", "intelligence","power"
 };  };
   
 const char *short_stat_name[NUM_STATS] = {  const char *const short_stat_name[NUM_STATS] = {
   "Str", "Dex", "Con", "Wis", "Cha", "Int","Pow"     "Str", "Dex", "Con", "Wis", "Cha", "Int","Pow"
 };  };
   

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