ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/living.C
(Generate patch)

Comparing deliantra/server/common/living.C (file contents):
Revision 1.76 by root, Tue Aug 7 22:57:57 2007 UTC vs.
Revision 1.129 by root, Mon Nov 12 03:14:32 2012 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <funcpoint.h>
26 26
27/* Handy little macro that adds exp and keeps it within bounds. Since 27/* Handy little macro that adds exp and keeps it within bounds. Since
28 * we are now using 64 bit values, I'm not all concerned about overflow issues 28 * we are now using 64 bit values, I'm not all concerned about overflow issues
29 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp 29 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp
30 */ 30 */
… …
108 * These limits are probably overly generous, but being there were no values 108 * These limits are probably overly generous, but being there were no values
109 * before, you need to start someplace. 109 * before, you need to start someplace.
110 */ 110 */
111 111
112const uint32 weight_limit[MAX_STAT + 1] = { 112const uint32 weight_limit[MAX_STAT + 1] = {
113 200000, /* 0 */ 113 200000, /* 0 */
114 250000, 300000, 350000, 400000, 500000, /* 5 */ 114 250000, 300000, 350000, 400000, 500000, /* 5 */
115 600000, 700000, 800000, 900000, 1000000, /* 10 */ 115 600000, 700000, 800000, 900000, 1000000, /* 10 */
116 1100000, 1200000, 1300000, 1400000, 1500000, /* 15 */ 116 1100000, 1200000, 1300000, 1400000, 1500000, /* 15 */
117 1650000, 1800000, 1950000, 2100000, 2250000, /* 20 */ 117 1650000, 1800000, 1950000, 2100000, 2250000, /* 20 */
118 2400000, 2550000, 2700000, 2850000, 3000000, /* 25 */ 118 2400000, 2550000, 2700000, 2850000, 3000000, /* 25 */
119 3250000, 3500000, 3750000, 4000000, 4500000 /*30 */ 119 3250000, 3500000, 3750000, 4000000, 4500000 /* 30 */
120}; 120};
121 121
122const int learn_spell[MAX_STAT + 1] = { 122const int learn_spell[MAX_STAT + 1] = {
123 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, 123 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,
124 100, 100, 100, 100, 100, 100 124 100, 100, 100, 100, 100, 100
… …
139/* 139/*
140 Since this is nowhere defined ... 140 Since this is nowhere defined ...
141 Both come in handy at least in function add_exp() 141 Both come in handy at least in function add_exp()
142*/ 142*/
143 143
144#define MAX_EXPERIENCE levels[settings.max_level] 144#define MAX_EXPERIENCE levels [settings.max_level]
145 145
146/* because exp_obj sum to make the total score, 146/* because exp_obj sum to make the total score,
147 * we cannot allow that sum to exceed the maximum 147 * we cannot allow that sum to exceed the maximum
148 * amount of experience a player can gain. Thus 148 * amount of experience a player can gain. Thus
149 * we define MAX_EXP_IN_OBJ. It is important to try 149 * we define MAX_EXP_IN_OBJ. It is important to try
… …
156 * line with progression of previous levels, so 156 * line with progression of previous levels, so
157 * if more levels are desired, this should be fixed. 157 * if more levels are desired, this should be fixed.
158 * -b.t. 158 * -b.t.
159 */ 159 */
160 160
161#define MAX_EXP_IN_OBJ levels[settings.max_level]/(MAX_EXP_CAT - 1) 161#define MAX_EXP_IN_OBJ MAX_EXP_IN_OBJ / (MAX_EXP_CAT - 1)
162
163extern sint64 *levels;
164 162
165#define MAX_SAVE_LEVEL 110 163#define MAX_SAVE_LEVEL 110
166 164
167/* This no longer needs to be changed anytime the number of 165/* This no longer needs to be changed anytime the number of
168 * levels is increased - rather, did_make_save will do the 166 * levels is increased - rather, did_make_save will do the
… …
262/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, 260/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw,
263 * make this macro to clean those up. Not usuable outside change_abil 261 * make this macro to clean those up. Not usuable outside change_abil
264 * function since some of the values passed to new_draw_info are hardcoded. 262 * function since some of the values passed to new_draw_info are hardcoded.
265 */ 263 */
266#define DIFF_MSG(flag, msg1, msg2) \ 264#define DIFF_MSG(flag, msg1, msg2) \
267 new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2); 265 new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
268 266
269/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */ 267/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
270 268
271/* flag is set to 1 if we are applying the object, -1 if we are removing 269/* flag is set to 1 if we are applying the object, -1 if we are removing
272 * the object. 270 * the object.
… …
280 * that gives them that ability. 278 * that gives them that ability.
281 */ 279 */
282int 280int
283change_abil (object *op, object *tmp) 281change_abil (object *op, object *tmp)
284{ 282{
285 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0; 283 int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
284 int success = 0;
286 char message[MAX_BUF]; 285 char message[MAX_BUF];
287 int potion_max = 0; 286 int potion_max = 0;
288 287
289 /* remember what object was like before it was changed. note that 288 // keep some stats for comparison purposes
290 * refop is a local copy of op only to be used for detecting changes 289 object::flags_t prev_flag = op->flag;
291 * found by update_stats. refop is not a real object 290 MoveType prev_move_type = op->move_type;
292 */ 291 sint16 prev_resist [NROFATTACKS]; // clumsy
293 object_copy refop = *op; 292 assert (sizeof (prev_resist) == sizeof (op->resist));
293 memcpy (prev_resist, op->resist, sizeof (prev_resist));
294 294
295 if (op->type == PLAYER) 295 if (op->type == PLAYER)
296 { 296 {
297 if (tmp->type == POTION) 297 if (tmp->type == POTION)
298 { 298 {
299 potion_max = 1; 299 potion_max = 1;
300
300 for (int j = 0; j < NUM_STATS; j++) 301 for (int j = 0; j < NUM_STATS; j++)
301 { 302 {
302 int ostat = op->contr->orig_stats.stat (j); 303 int ostat = op->contr->orig_stats.stat (j);
303 int i = tmp->stats.stat (j); 304 int i = tmp->stats.stat (j);
304 305
305 /* nstat is what the stat will be after use of the potion */ 306 /* nstat is what the stat will be after use of the potion */
306 int nstat = flag * i + ostat; 307 int nstat = flag * i + ostat;
307 308
308 /* Do some bounds checking. While I don't think any 309 /* Do some bounds checking. There is the potential for potions
309 * potions do so right now, there is the potential for potions
310 * that adjust that stat by more than one point, so we need 310 * that adjust that stat by more than one point, so we need
311 * to allow for that. 311 * to allow for that.
312 */ 312 */
313 if (nstat < 1 && i * flag < 0) 313 if (nstat < 1 && i * flag < 0)
314 nstat = 1; 314 nstat = 1;
… …
366 { 366 {
367 success = 1; 367 success = 1;
368 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red."); 368 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
369 } 369 }
370 370
371 if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE)) 371 if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
372 { 372 {
373 success = 1; 373 success = 1;
374 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore."); 374 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
375 } 375 }
376 376
377 if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE)) 377 if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE])
378 { 378 {
379 success = 1; 379 success = 1;
380 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away."); 380 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
381 } 381 }
382 382
383 if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL)) 383 if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL])
384 { 384 {
385 success = 1; 385 success = 1;
386 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow."); 386 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
387 } 387 }
388 388
… …
390 * user has multiple items giving the same type appled like we 390 * user has multiple items giving the same type appled like we
391 * used to - that is more work than what we gain, plus messages 391 * used to - that is more work than what we gain, plus messages
392 * can be misleading (a little higher could be miscontrued from 392 * can be misleading (a little higher could be miscontrued from
393 * from fly high) 393 * from fly high)
394 */ 394 */
395 if (tmp->move_type && op->move_type != refop.move_type) 395 if (tmp->move_type && op->move_type != prev_move_type)
396 { 396 {
397 success = 1; 397 success = 1;
398 398
399 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low 399 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
400 * status doesn't make a difference if you are flying high 400 * status doesn't make a difference if you are flying high
401 */ 401 */
402 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH)) 402 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
403 { 403 {
404 DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground."); 404 DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
405 } 405 }
406 406
407 if (tmp->move_type & MOVE_FLY_HIGH) 407 if (tmp->move_type & MOVE_FLY_HIGH)
408 { 408 {
409 /* double conditional - second case covers if you have move_fly_low - 409 /* double conditional - second case covers if you have move_fly_low -
… …
413 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground.")); 413 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
414 } 414 }
415 415
416 if (tmp->move_type & MOVE_SWIM) 416 if (tmp->move_type & MOVE_SWIM)
417 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); 417 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
418
419 /* Changing move status may mean you are affected by things you weren't before */
420 check_move_on (op, op);
421 } 418 }
422 419
423 /* becoming UNDEAD... a special treatment for this flag. Only those not 420 /* becoming UNDEAD... a special treatment for this flag. Only those not
424 * originally undead may change their status 421 * originally undead may change their status
425 */ 422 */
426 if (!QUERY_FLAG (op->arch, FLAG_UNDEAD)) 423 if (!op->arch->flag [FLAG_UNDEAD])
427 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 424 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
428 { 425 {
429 success = 1; 426 success = 1;
430 if (flag > 0) 427 if (flag > 0)
431 { 428 {
432 op->race = "undead"; 429 op->race = "undead";
… …
437 op->race = op->arch->race; 434 op->race = op->arch->race;
438 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 435 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
439 } 436 }
440 } 437 }
441 438
442 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 439 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
443 { 440 {
444 success = 1; 441 success = 1;
445 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); 442 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
446 } 443 }
447 444
448 if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS)) 445 if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
449 { 446 {
450 success = 1; 447 success = 1;
451 DIFF_MSG (flag, "You become transparent.", "You can see yourself."); 448 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
452 } 449 }
453 450
454 /* blinded you can tell if more blinded since blinded player has minimal 451 /* blinded you can tell if more blinded since blinded player has minimal
455 * vision 452 * vision
456 */ 453 */
457 if (QUERY_FLAG (tmp, FLAG_BLIND)) 454 if (tmp->flag [FLAG_BLIND])
458 { 455 {
459 success = 1; 456 success = 1;
460 if (flag > 0) 457 if (flag > 0)
461 { 458 {
462 if (QUERY_FLAG (op, FLAG_WIZ)) 459 if (op->flag [FLAG_WIZ])
463 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded."); 460 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
464 else 461 else
465 { 462 {
466 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 463 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
467 SET_FLAG (op, FLAG_BLIND); 464 op->set_flag (FLAG_BLIND);
468 if (op->type == PLAYER) 465 if (op->type == PLAYER)
469 op->contr->do_los = 1; 466 op->contr->do_los = 1;
470 } 467 }
471 } 468 }
472 else 469 else
473 { 470 {
474 if (QUERY_FLAG (op, FLAG_WIZ)) 471 if (op->flag [FLAG_WIZ])
475 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again."); 472 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
476 else 473 else
477 { 474 {
478 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 475 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
479 CLEAR_FLAG (op, FLAG_BLIND); 476 op->clr_flag (FLAG_BLIND);
480 if (op->type == PLAYER) 477 if (op->type == PLAYER)
481 op->contr->do_los = 1; 478 op->contr->do_los = 1;
482 } 479 }
483 } 480 }
484 } 481 }
485 482
486 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK)) 483 if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
487 { 484 {
488 success = 1; 485 success = 1;
489 if (op->type == PLAYER) 486 if (op->type == PLAYER)
490 op->contr->do_los = 1; 487 op->contr->do_los = 1;
491 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark."); 488 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
492 } 489 }
493 490
494 if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) 491 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
495 { 492 {
496 success = 1; 493 success = 1;
497 if (flag > 0) 494 if (flag > 0)
498 { 495 {
499 if (QUERY_FLAG (op, FLAG_WIZ)) 496 if (op->flag [FLAG_WIZ])
500 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer."); 497 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
501 else 498 else
502 { 499 {
503 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent."); 500 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
504 if (op->type == PLAYER) 501 if (op->type == PLAYER)
505 op->contr->do_los = 1; 502 op->contr->do_los = 1;
506 } 503 }
507 } 504 }
508 else 505 else
509 { 506 {
510 if (QUERY_FLAG (op, FLAG_WIZ)) 507 if (op->flag [FLAG_WIZ])
511 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus."); 508 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
512 else 509 else
513 { 510 {
514 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid."); 511 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
515 if (op->type == PLAYER) 512 if (op->type == PLAYER)
… …
522 { 519 {
523 success = 1; 520 success = 1;
524 DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky."); 521 DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky.");
525 } 522 }
526 523
524 if (digest_types [tmp->type])
525 {
527 if (tmp->stats.hp && op->type == PLAYER) 526 if (tmp->stats.hp && op->type == PLAYER)
528 { 527 {
529 success = 1; 528 success = 1;
530 DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!"); 529 DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!");
531 } 530 }
532 531
533 if (tmp->stats.sp && op->type == PLAYER && tmp->type != SKILL) 532 if (tmp->stats.sp && op->type == PLAYER
534 { 533 && tmp->type != SKILL && tmp->type != BOW)
534 {
535 success = 1; 535 success = 1;
536 DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane."); 536 DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane.");
537 } 537 }
538 538
539 /* for the future when artifacts set this -b.t. */ 539 /* for the future when artifacts set this -b.t. */
540 if (tmp->stats.grace && op->type == PLAYER) 540 if (tmp->stats.grace && op->type == PLAYER)
541 { 541 {
542 success = 1; 542 success = 1;
543 DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy."); 543 DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy.");
544 } 544 }
545 545
546 if (tmp->stats.food && op->type == PLAYER) 546 if (tmp->stats.food && op->type == PLAYER)
547 { 547 {
548 success = 1; 548 success = 1;
549 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up."); 549 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
550 }
550 } 551 }
551 552
552 /* Messages for changed resistance */ 553 /* Messages for changed resistance */
553 for (int i = 0; i < NROFATTACKS; i++) 554 for (int i = 0; i < NROFATTACKS; i++)
554 { 555 {
555 if (i == ATNR_PHYSICAL) 556 if (i == ATNR_PHYSICAL)
556 continue; /* Don't display about armour */ 557 continue; /* Don't display about armour */
557 558
558 if (op->resist[i] != refop.resist[i]) 559 if (op->resist [i] != prev_resist [i])
559 { 560 {
560 success = 1; 561 success = 1;
562
561 if (op->resist[i] > refop.resist[i]) 563 if (op->resist [i] > prev_resist [i])
562 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]); 564 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
563 else 565 else
564 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]); 566 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
565 567
566 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); 568 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
567 } 569 }
568 } 570 }
569 571
570 if (!potion_max) 572 if (!potion_max)
571 {
572 for (int j = 0; j < NUM_STATS; j++) 573 for (int j = 0; j < NUM_STATS; j++)
573 {
574 if (int i = tmp->stats.stat (j)) 574 if (int i = tmp->stats.stat (j))
575 { 575 {
576 success = 1; 576 success = 1;
577 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 577 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
578 } 578 }
579 }
580 }
581 579
582 return success; 580 return success;
583} 581}
584 582
585/* 583/*
… …
596object::drain_specific_stat (int deplete_stats) 594object::drain_specific_stat (int deplete_stats)
597{ 595{
598 object *tmp; 596 object *tmp;
599 archetype *at; 597 archetype *at;
600 598
601 at = archetype::find (ARCH_DEPLETION); 599 at = archetype::find (shstr_depletion);
602 if (!at) 600 if (!at)
603 { 601 {
604 LOG (llevError, "Couldn't find archetype depletion.\n"); 602 LOG (llevError, "Couldn't find archetype depletion.\n");
605 return; 603 return;
606 } 604 }
… …
608 { 606 {
609 tmp = present_arch_in_ob (at, this); 607 tmp = present_arch_in_ob (at, this);
610 608
611 if (!tmp) 609 if (!tmp)
612 { 610 {
613 tmp = arch_to_object (at); 611 tmp = at->instance ();
614 tmp = insert_ob_in_ob (tmp, this); 612 tmp = insert_ob_in_ob (tmp, this);
615 SET_FLAG (tmp, FLAG_APPLIED); 613 tmp->set_flag (FLAG_APPLIED);
616 } 614 }
617 } 615 }
618 616
619 new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]); 617 new_draw_info (NDI_UNIQUE, 0, this, drain_msg[deplete_stats]);
620 change_attr_value (&tmp->stats, deplete_stats, -1); 618 change_attr_value (&tmp->stats, deplete_stats, -1);
… …
626 * via an applied bad_luck object. 624 * via an applied bad_luck object.
627 */ 625 */
628void 626void
629object::change_luck (int value) 627object::change_luck (int value)
630{ 628{
631 archetype *at = archetype::find ("luck"); 629 archetype *at = archetype::find (shstr_luck);
632 if (!at) 630 if (!at)
633 LOG (llevError, "Couldn't find archetype luck.\n"); 631 LOG (llevError, "Couldn't find archetype luck.\n");
634 else 632 else
635 { 633 {
636 object *tmp = present_arch_in_ob (at, this); 634 object *tmp = present_arch_in_ob (at, this);
… …
638 if (!tmp) 636 if (!tmp)
639 { 637 {
640 if (!value) 638 if (!value)
641 return; 639 return;
642 640
643 tmp = arch_to_object (at); 641 tmp = at->instance ();
644 tmp = insert_ob_in_ob (tmp, this); 642 tmp = insert_ob_in_ob (tmp, this);
645 SET_FLAG (tmp, FLAG_APPLIED); 643 tmp->set_flag (FLAG_APPLIED);
646 } 644 }
647 645
648 if (value) 646 if (value)
649 { 647 {
650 /* Limit the luck value of the bad luck object to +/-100. This 648 /* Limit the luck value of the bad luck object to +/-100. This
… …
703 sint8 v = arch->stats.stat (i); 701 sint8 v = arch->stats.stat (i);
704 stats.stat (i) += v; 702 stats.stat (i) += v;
705 contr->orig_stats.stat (i) += v; 703 contr->orig_stats.stat (i) += v;
706 } 704 }
707} 705}
708
709/* These are the items that currently can change digestion, regeneration,
710 * spell point recovery and mana point recovery. Seems sort of an arbitary
711 * list, but other items store other info into stats array.
712 */
713static struct digest_types : std::bitset<NUM_TYPES>
714{
715 digest_types ()
716 {
717 set (WEAPON);
718 set (BOW);
719 set (ARMOUR);
720 set (HELMET);
721 set (SHIELD);
722 set (RING);
723 set (BOOTS);
724 set (GLOVES);
725 set (AMULET);
726 set (GIRDLE);
727 set (BRACERS);
728 set (CLOAK);
729 set (DISEASE);
730 set (FORCE);
731 set (SKILL);
732 }
733} digest_types;
734 706
735static struct copy_flags : object::flags_t 707static struct copy_flags : object::flags_t
736{ 708{
737 copy_flags () 709 copy_flags ()
738 { 710 {
… …
757 * spell system split, grace points now added to system --peterm 729 * spell system split, grace points now added to system --peterm
758 */ 730 */
759void 731void
760object::update_stats () 732object::update_stats ()
761{ 733{
762 float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1; 734 float max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
763 int weapon_weight = 0, weapon_speed = 0; 735 int weapon_weight = 0, weapon_speed = 0;
764 int best_wc = 0, best_ac = 0, wc = 0, ac = 0; 736 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
765 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 737 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
766 object *grace_obj = NULL, *mana_obj = NULL, *tmp; 738 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
767 float old_speed = speed; 739 float old_speed = speed;
768 int stat_sum [NUM_STATS]; 740 int stat_sum [NUM_STATS];
769 741
742 MoveType move_type; // we use change_move_type to change it, so use a local copy
743
770 /* First task is to clear all the values back to their original values */ 744 /* First task is to clear all the values back to their original values */
771 if (type == PLAYER) 745 if (type == PLAYER)
772 { 746 {
747 contr->delayed_update = false;
748
773 for (int i = 0; i < NUM_STATS; i++) 749 for (int i = 0; i < NUM_STATS; i++)
774 stat_sum [i] = contr->orig_stats.stat (i); 750 stat_sum [i] = contr->orig_stats.stat (i);
775 751
776 if (settings.spell_encumbrance == TRUE) 752 if (settings.spell_encumbrance == TRUE)
777 contr->encumbrance = 0; 753 contr->encumbrance = 0;
… …
789 for (int i = NUM_BODY_LOCATIONS; i--; ) 765 for (int i = NUM_BODY_LOCATIONS; i--; )
790 slot[i].used = slot[i].info; 766 slot[i].used = slot[i].info;
791 767
792 slaying = 0; 768 slaying = 0;
793 769
794 if (!QUERY_FLAG (this, FLAG_WIZ)) 770 if (!this->flag [FLAG_WIZ])
795 {
796 CLEAR_FLAG (this, FLAG_XRAYS);
797 CLEAR_FLAG (this, FLAG_MAKE_INVIS);
798 } 771 {
772 this->clr_flag (FLAG_XRAYS);
773 this->clr_flag (FLAG_MAKE_INVIS);
774 }
799 775
800 CLEAR_FLAG (this, FLAG_LIFESAVE); 776 this->clr_flag (FLAG_LIFESAVE);
801 CLEAR_FLAG (this, FLAG_STEALTH); 777 this->clr_flag (FLAG_STEALTH);
802 CLEAR_FLAG (this, FLAG_BLIND); 778 this->clr_flag (FLAG_BLIND);
803 779
804 if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 780 if (!arch->flag [FLAG_REFL_SPELL ]) this->clr_flag (FLAG_REFL_SPELL);
805 if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 781 if (!arch->flag [FLAG_REFL_MISSILE]) this->clr_flag (FLAG_REFL_MISSILE);
806 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 782 if (!arch->flag [FLAG_UNDEAD ]) this->clr_flag (FLAG_UNDEAD);
807 if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 783 if (!arch->flag [FLAG_SEE_IN_DARK ]) this->clr_flag (FLAG_SEE_IN_DARK);
808 784
809 path_attuned = arch->path_attuned; 785 path_attuned = arch->path_attuned;
810 path_repelled = arch->path_repelled; 786 path_repelled = arch->path_repelled;
811 path_denied = arch->path_denied; 787 path_denied = arch->path_denied;
812 glow_radius = arch->glow_radius; 788 glow_radius = arch->glow_radius;
813 move_type = arch->move_type; 789 move_type = arch->move_type;
814 790
815 chosen_skill = 0;
816
817 /* initializing resistances from the values in player/monster's 791 /* initializing resistances from the values in player/monster's
818 * archetype clone 792 * archetype clone
819 */ 793 */
820 memcpy (&resist, &arch->resist, sizeof (resist)); 794 memcpy (&resist, &arch->resist, sizeof (resist));
821 795
822 for (int i = 0; i < NROFATTACKS; i++) 796 for (int i = 0; i < NROFATTACKS; i++)
823 { 797 {
824 if (resist[i] > 0) 798 if (resist[i] > 0)
825 prot[i] = resist[i], vuln[i] = 0; 799 prot[i] = resist[i], vuln[i] = 0;
826 else 800 else
827 vuln[i] = -(resist[i]), prot[i] = 0; 801 vuln[i] = -resist[i], prot[i] = 0;
828 802
829 potion_resist[i] = 0; 803 potion_resist[i] = -1000;
830 } 804 }
831 805
832 wc = arch->stats.wc; 806 wc = arch->stats.wc;
833 stats.dam = arch->stats.dam; 807 stats.dam = arch->stats.dam;
834 808
… …
837 * the fact that maxlevel is factored in could be considered sort of bogus - 811 * the fact that maxlevel is factored in could be considered sort of bogus -
838 * we should probably give them some bonus and cap it off - otherwise, 812 * we should probably give them some bonus and cap it off - otherwise,
839 * basically, if a server updates its max level, these playes may find 813 * basically, if a server updates its max level, these playes may find
840 * that their protection from physical goes down 814 * that their protection from physical goes down
841 */ 815 */
842 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 816 if (!this->flag [FLAG_USE_ARMOUR] && type == PLAYER)
843 { 817 {
844 ac = max (-10, arch->stats.ac - level / 3); 818 ac = max (-10, arch->stats.ac - level / 3);
845 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 819 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
846 } 820 }
847 else 821 else
848 ac = arch->stats.ac; 822 ac = arch->stats.ac;
849 823
850 stats.luck = arch->stats.luck; 824 stats.luck = arch->stats.luck;
851 speed = arch->speed; 825 speed = arch->speed;
826
827 chosen_skill = 0;
852 828
853 /* OK - we've reset most all the objects attributes to sane values. 829 /* OK - we've reset most all the objects attributes to sane values.
854 * now go through and make adjustments for what the player has equipped. 830 * now go through and make adjustments for what the player has equipped.
855 */ 831 */
856 for (tmp = inv; tmp; tmp = tmp->below) 832 for (tmp = inv; tmp; tmp = tmp->below)
857 { 833 {
858 /* This happens because apply_potion calls change_abil with the potion 834 /* This happens because apply_potion calls change_abil with the potion
859 * applied so we can tell the player what changed. But change_abil 835 * applied so we can tell the player what changed. But change_abil
860 * then calls this function. 836 * then calls this function.
861 */ 837 */
862 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 838 if (tmp->flag [FLAG_APPLIED] && tmp->type == POTION)
863 continue; 839 continue;
864 840
865 /* See note in map.c:update_position about making this additive
866 * since light sources are never applied, need to put check here.
867 */
868 if (tmp->glow_radius > glow_radius)
869 glow_radius = tmp->glow_radius; 841 glow_radius += tmp->glow_radius;
870 842
871 /* For some things, we don't care what is equipped */ 843 /* For some things, we don't care what is equipped */
872 if (tmp->type == SKILL) 844 if (tmp->type == SKILL)
873 { 845 {
874 /* Want to take the highest skill here. */ 846 /* Want to take the highest skill here. */
… …
887 else if (tmp->level > grace_obj->level) 859 else if (tmp->level > grace_obj->level)
888 grace_obj = tmp; 860 grace_obj = tmp;
889 } 861 }
890 } 862 }
891 863
892 /* Container objects are not meant to adjust a players, but other applied 864 /* Container objects are not meant to adjust players, but other applied
893 * objects need to make adjustments. 865 * objects need to make adjustments.
894 * This block should handle all player specific changes 866 * This block should handle all player specific changes
895 * The check for Praying is a bit of a hack - god given bonuses are put 867 * The check for Praying is a bit of a hack - god given bonuses are put
896 * in the praying skill, and the player should always get those. 868 * in the praying skill, and the player should always get those.
897 * It also means we need to put in additional checks for applied below, 869 * It also means we need to put in additional checks for applied below,
898 * because the skill shouldn't count against body positions being used 870 * because the skill shouldn't count against body positions being used
899 * up, etc. 871 * up, etc.
900 */ 872 */
901 if ((tmp->flag [FLAG_APPLIED] 873 if ((tmp->flag [FLAG_APPLIED]
902 && tmp->type != CONTAINER 874 && tmp->type != CONTAINER
903 && tmp->type != CLOSE_CON) 875 && tmp->type != CLOSE_CON
904 || (tmp->type == SKILL 876 && tmp->type != SPELL)
905 && tmp->subtype == SK_PRAYING)) 877 || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
906 { 878 {
907 if (type == PLAYER) 879 if (type == PLAYER)
908 { 880 {
909 contr->item_power += tmp->item_power; 881 contr->item_power += tmp->item_power;
910 882
911 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
912 if (tmp != current_weapon
913 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
914 && !tmp->flag [FLAG_CURSED]
915 && !tmp->flag [FLAG_DAMNED])
916 continue;
917
918 for (int i = 0; i < NUM_STATS; i++) 883 for (int i = 0; i < NUM_STATS; i++)
919 stat_sum [i] = stat_sum [i] + tmp->stats.stat (i); 884 stat_sum [i] += tmp->stats.stat (i);
920 885
921 if (digest_types [tmp->type]) 886 if (digest_types [tmp->type])
922 { 887 {
923 contr->digestion += tmp->stats.food; 888 contr->digestion += tmp->stats.food;
924 contr->gen_hp += tmp->stats.hp; 889 contr->gen_hp += tmp->stats.hp;
890 if (tmp->type != BOW) // ugly exception for bows
925 contr->gen_sp += tmp->stats.sp; 891 contr->gen_sp += tmp->stats.sp;
926 contr->gen_grace += tmp->stats.grace; 892 contr->gen_grace += tmp->stats.grace;
927 contr->gen_sp_armour += tmp->gen_sp_armour; 893 contr->gen_sp_armour += tmp->gen_sp_armour;
928 } 894 }
929 } /* if this is a player */ 895 } /* if this is a player */
930 else 896 else
… …
932 if (tmp->type == WEAPON) 898 if (tmp->type == WEAPON)
933 current_weapon = tmp; 899 current_weapon = tmp;
934 } 900 }
935 901
936 /* Update slots used for items */ 902 /* Update slots used for items */
937 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 903 if (tmp->flag [FLAG_APPLIED]) // exclude praying...
938 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 904 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
939 slot[i].used += tmp->slot[i].info; 905 slot[i].used += tmp->slot[i].info;
940 906
941 if (tmp->type == SYMPTOM) 907 if (tmp->type == SYMPTOM)
942 {
943 speed_reduce_from_disease = tmp->last_sp / 100.f; 908 min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
944 909
945 if (speed_reduce_from_disease == 0)
946 speed_reduce_from_disease = 1;
947 }
948
949 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 910 /* Pos. and neg. protections are counted separate (-> pro/vuln).
950 * (Negative protections are calculated exactly like positive.) 911 * (Negative protections are calculated exactly like positive.)
951 * Resistance from potions are treated special as well. If there's 912 * Resistance from potions are treated special as well. If there's
952 * more than one potion-effect, the bigger prot.-value is taken. 913 * more than one potion-effect, the bigger prot.-value is taken.
953 */ 914 */
954 if (tmp->type != POTION) 915 if (tmp->type == POTION_EFFECT)
955 {
956 for (int i = 0; i < NROFATTACKS; i++) 916 for (int i = 0; i < NROFATTACKS; i++)
957 {
958 /* Potential for cursed potions, in which case we just can use
959 * a straight MAX, as potion_resist is initialised to zero.
960 */
961 if (tmp->type == POTION_EFFECT)
962 {
963 if (potion_resist[i])
964 potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
965 else
966 potion_resist[i] = tmp->resist[i]; 917 max_it (potion_resist[i], tmp->resist[i]);
967 } 918 else if (tmp->type != POTION)
919 for (int i = 0; i < NROFATTACKS; i++)
968 else if (tmp->resist[i] > 0) 920 if (tmp->resist[i] > 0)
969 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 921 prot[i] += (100 - prot[i]) * tmp->resist[i] / 100;
970 else if (tmp->resist[i] < 0) 922 else if (tmp->resist[i] < 0)
971 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 923 vuln[i] += (100 - vuln[i]) * -tmp->resist[i] / 100;
972 }
973 }
974 924
975 /* There may be other things that should not adjust the attacktype */ 925 /* There may be other things that should not adjust the attacktype */
976 if (tmp->type != SYMPTOM) 926 if (tmp->type != SYMPTOM)
977 { 927 {
978 attacktype |= tmp->attacktype; 928 attacktype |= tmp->attacktype;
… …
983 stats.luck += tmp->stats.luck; 933 stats.luck += tmp->stats.luck;
984 } 934 }
985 935
986 flag |= tmp->flag & copy_flags; 936 flag |= tmp->flag & copy_flags;
987 937
988 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD)) 938 if (tmp->flag [FLAG_UNDEAD] && !arch->flag [FLAG_UNDEAD])
989 SET_FLAG (this, FLAG_UNDEAD); 939 this->set_flag (FLAG_UNDEAD);
990 940
991 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 941 //TODO: copy_flags?
942 if (tmp->flag [FLAG_MAKE_INVIS])
992 { 943 {
993 SET_FLAG (this, FLAG_MAKE_INVIS); 944 set_flag (FLAG_MAKE_INVIS);
994 invisible = 1; 945 invisible = 1;
995 } 946 }
996 947
997 if (tmp->stats.exp && tmp->type != SKILL) 948 if (tmp->stats.exp && tmp->type != SKILL)
998 { 949 {
… …
1005 added_speed += tmp->stats.exp; 956 added_speed += tmp->stats.exp;
1006 } 957 }
1007 958
1008 switch (tmp->type) 959 switch (tmp->type)
1009 { 960 {
1010#if 0
1011 case WAND:
1012 case ROD:
1013 case HORN:
1014 if (type != PLAYER || current_weapon == tmp)
1015 chosen_skill = tmp;
1016 break;
1017#endif
1018
1019 /* skills modifying the character -b.t. */
1020 /* for all skills and skill granting objects */
1021 case SKILL: 961 case SKILL:
1022 { 962 {
963 // some skills will end up here without counting as "applied"
1023 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY) 964 if (!tmp->flag [FLAG_APPLIED] || skill_flags [tmp->subtype] & SF_AUTARK)
1024 break; 965 break;
1025 966
1026 if (chosen_skill) 967 if (chosen_skill)
1027 { 968 {
1028 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n", 969 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
… …
1030 971
1031 tmp->flag [FLAG_APPLIED] = false; 972 tmp->flag [FLAG_APPLIED] = false;
1032 update_stats (); 973 update_stats ();
1033 return; 974 return;
1034 } 975 }
1035 else 976
1036 chosen_skill = tmp; 977 chosen_skill = tmp;
1037 978
1038 if (tmp->stats.dam > 0) 979 if (tmp->stats.dam > 0)
1039 { /* skill is a 'weapon' */ 980 { /* skill is a 'weapon' */
1040 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 981 if (!this->flag [FLAG_READY_WEAPON])
1041 weapon_speed = WEAPON_SPEED (tmp); 982 weapon_speed = max (0, WEAPON_SPEED (tmp));
1042
1043 if (weapon_speed < 0)
1044 weapon_speed = 0;
1045 983
1046 weapon_weight = tmp->weight; 984 weapon_weight = tmp->weight;
1047 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9; 985 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1048 986
1049 if (tmp->magic) 987 if (tmp->magic)
… …
1058 996
1059 if (tmp->stats.ac) 997 if (tmp->stats.ac)
1060 ac -= tmp->stats.ac + tmp->magic; 998 ac -= tmp->stats.ac + tmp->magic;
1061 999
1062 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1000 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1063 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1001 contr->encumbrance += weight_to_kg_approx (3 * tmp->weight);
1064 } 1002 }
1065 1003
1066 break; 1004 break;
1067 1005
1068 case SHIELD: 1006 case SHIELD:
1069 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1007 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1070 contr->encumbrance += (int) tmp->weight / 2000; 1008 contr->encumbrance += weight_to_kg_approx (tmp->weight) >> 1;
1009 //FALLTHROUGH
1071 case RING: 1010 case RING:
1072 case AMULET: 1011 case AMULET:
1073 case GIRDLE: 1012 case GIRDLE:
1074 case HELMET: 1013 case HELMET:
1075 case BOOTS: 1014 case BOOTS:
… …
1084 if (tmp->stats.ac) 1023 if (tmp->stats.ac)
1085 ac -= tmp->stats.ac + tmp->magic; 1024 ac -= tmp->stats.ac + tmp->magic;
1086 1025
1087 break; 1026 break;
1088 1027
1028 case RANGED:
1089 case BOW: 1029 case BOW:
1090 case WEAPON: 1030 case WEAPON:
1091 if (type != PLAYER || current_weapon == tmp)
1092 {
1093 wc -= tmp->stats.wc + tmp->magic; 1031 wc -= tmp->stats.wc + tmp->magic;
1094 1032
1095 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1033 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1096 ac -= tmp->stats.ac + tmp->magic; 1034 ac -= tmp->stats.ac + tmp->magic;
1097 1035
1098 stats.dam += tmp->stats.dam + tmp->magic; 1036 stats.dam += tmp->stats.dam + tmp->magic;
1099 weapon_weight = tmp->weight; 1037 weapon_weight = tmp->weight;
1100 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1038 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1101 1039
1102 if (weapon_speed < 0) 1040 if (weapon_speed < 0)
1103 weapon_speed = 0; 1041 weapon_speed = 0;
1104 1042
1105 slaying = tmp->slaying; 1043 slaying = tmp->slaying;
1106 1044
1107 /* If there is desire that two handed weapons should do 1045 /* If there is desire that two handed weapons should do
1108 * extra strength damage, this is where the code should 1046 * extra strength damage, this is where the code should
1109 * go. 1047 * go.
1110 */ 1048 */
1111 1049
1112 if (type == PLAYER) 1050 if (type == PLAYER)
1113 if (settings.spell_encumbrance) 1051 if (settings.spell_encumbrance)
1114 contr->encumbrance += tmp->weight * 3 / 1000; 1052 contr->encumbrance += weight_to_kg_approx (3 * tmp->weight);
1115 }
1116 1053
1117 break; 1054 break;
1118 1055
1119 case ARMOUR: /* Only the best of these three are used: */ 1056 case ARMOUR: /* Only the best of these three are used: */
1120 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1057 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1121 contr->encumbrance += tmp->weight / 1000; 1058 contr->encumbrance += weight_to_kg_approx (tmp->weight);
1122 1059
1123 case BRACERS: 1060 case BRACERS:
1124 case FORCE: 1061 case FORCE:
1125 if (tmp->stats.wc) 1062 if (tmp->stats.wc)
1126 { 1063 {
… …
1143 else /* To nullify the below effect */ 1080 else /* To nullify the below effect */
1144 ac += tmp->stats.ac + tmp->magic; 1081 ac += tmp->stats.ac + tmp->magic;
1145 } 1082 }
1146 1083
1147 if (tmp->stats.wc) 1084 if (tmp->stats.wc)
1148 wc -= (tmp->stats.wc + tmp->magic); 1085 wc -= tmp->stats.wc + tmp->magic;
1149 1086
1150 if (tmp->stats.ac) 1087 if (tmp->stats.ac)
1151 ac -= (tmp->stats.ac + tmp->magic); 1088 ac -= tmp->stats.ac + tmp->magic;
1152 1089
1153 if (ARMOUR_SPEED (tmp)) 1090 if (ARMOUR_SPEED (tmp))
1154 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); 1091 min_it (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1155 1092
1156 break; 1093 break;
1157 } /* switch tmp->type */ 1094 } /* switch tmp->type */
1158 } /* item is equipped */ 1095 } /* item is equipped */
1159 } /* for loop of items */ 1096 } /* for loop of items */
1097
1098 min_it (glow_radius, MAX_LIGHT_RADIUS);
1160 1099
1161 /* We've gone through all the objects the player has equipped. For many things, we 1100 /* We've gone through all the objects the player has equipped. For many things, we
1162 * have generated intermediate values which we now need to assign. 1101 * have generated intermediate values which we now need to assign.
1163 */ 1102 */
1164 1103
… …
1170 */ 1109 */
1171 for (int i = 0; i < NROFATTACKS; i++) 1110 for (int i = 0; i < NROFATTACKS; i++)
1172 { 1111 {
1173 resist[i] = prot[i] - vuln[i]; 1112 resist[i] = prot[i] - vuln[i];
1174 1113
1175 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1114 if (potion_resist[i] != -1000
1115 && (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
1176 resist[i] = potion_resist[i]; 1116 resist[i] = potion_resist[i];
1177 } 1117 }
1178 1118
1179 if (type == PLAYER) 1119 if (type == PLAYER)
1180 { 1120 {
1181 // clamp various player stats 1121 // clamp various player stats
1182 for (int i = 0; i < NUM_STATS; ++i) 1122 for (int i = 0; i < NUM_STATS; ++i)
1183 stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT); 1123 stats.stat (i) = stat_sum [i];
1124
1125 check_stat_bounds (&stats);
1184 1126
1185 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION); 1127 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1186 1128
1187 /* Figure out the players sp/mana/hp totals. */ 1129 /* Figure out the players sp/mana/hp totals. */
1188 int pl_level; 1130 int pl_level;
1189 1131
1190 check_stat_bounds (&(stats));
1191 pl_level = level;
1192
1193 if (pl_level < 1)
1194 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1132 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1195 1133
1196 /* You basically get half a con bonus/level. But we do take into account rounding, 1134 /* You basically get half a con bonus/level. But we do take into account rounding,
1197 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1135 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1198 */ 1136 */
1199 stats.maxhp = 0; 1137 stats.maxhp = 0;
… …
1334 1272
1335 speed = 1.f + speed_bonus[stats.Dex]; 1273 speed = 1.f + speed_bonus[stats.Dex];
1336 1274
1337 if (settings.search_items && contr->search_str[0]) 1275 if (settings.search_items && contr->search_str[0])
1338 speed -= 1; 1276 speed -= 1;
1339
1340 if (attacktype == 0)
1341 attacktype = arch->attacktype;
1342 } /* End if player */ 1277 } /* End if player */
1343 1278
1344 if (added_speed >= 0) 1279 if (added_speed >= 0)
1345 speed += added_speed / 10.f; 1280 speed += added_speed / 10.f;
1346 else /* Something wrong here...: */ 1281 else /* Something wrong here...: */
… …
1354 /* f is a number the represents the number of kg above (positive num) 1289 /* f is a number the represents the number of kg above (positive num)
1355 * or below (negative number) that the player is carrying. If above 1290 * or below (negative number) that the player is carrying. If above
1356 * weight limit, then player suffers a speed reduction based on how 1291 * weight limit, then player suffers a speed reduction based on how
1357 * much above he is, and what is max carry is 1292 * much above he is, and what is max carry is
1358 */ 1293 */
1359 f = (carrying / 1000) - max_carry[stats.Str]; 1294 double f = weight_to_kg_approx (carrying) - max_carry[stats.Str];
1360 if (f > 0) 1295 if (f > 0.f)
1361 speed = speed / (1.f + f / max_carry[stats.Str]); 1296 speed /= (1.f + f / max_carry[stats.Str]);
1362 } 1297 }
1363 1298
1364 speed += bonus_speed / 10.f; /* Not affected by limits */ 1299 speed += bonus_speed / 10.f; /* Not affected by limits */
1300 speed *= speed_reduce_from_disease;
1365 1301
1366 /* Put a lower limit on speed. Note with this speed, you move once every 1302 /* Put a lower limit on speed. Note with this speed, you move once every
1367 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1303 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1368 */ 1304 */
1369 speed = speed * speed_reduce_from_disease; 1305 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1370 1306
1371 if (speed < 0.01f && type == PLAYER) 1307 if (speed != old_speed)
1372 speed = 0.01f; 1308 set_speed (speed);
1373 1309
1374 if (type == PLAYER) 1310 if (type == PLAYER)
1375 { 1311 {
1376 /* (This formula was made by vidarl@ifi.uio.no) 1312 /* (This formula was made by vidarl@ifi.uio.no)
1377 * Note that we never used these values again - basically 1313 * Note that we never used these values again - basically
… …
1409 if (move_type == 0) 1345 if (move_type == 0)
1410 move_type = MOVE_WALK; 1346 move_type = MOVE_WALK;
1411 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1347 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1412 move_type &= ~MOVE_WALK; 1348 move_type &= ~MOVE_WALK;
1413 1349
1414 if (speed != old_speed) 1350 // now apply the new move_type
1415 set_speed (speed); 1351 if (this->move_type != move_type)
1352 change_move_type (move_type);
1416 1353
1417 /* It is quite possible that a player's spell costing might have changed, 1354 /* It is quite possible that a player's spell costing might have changed,
1418 * so we will check that now. 1355 * so we will check that now.
1419 */ 1356 */
1420 if (type == PLAYER) 1357 if (is_player ())
1421 { 1358 contr->update_spells ();
1422 esrv_update_stats (contr);
1423 esrv_update_spells (contr);
1424 }
1425 1359
1426 // update the mapspace, if we are on a map 1360 // update the mapspace, if we are on a map
1427 if (!flag [FLAG_REMOVED] && map) 1361 if (!flag [FLAG_REMOVED] && map)
1428 map->at (x, y).flags_ = 0; 1362 map->at (x, y).flags_ = 0;
1363}
1364
1365void
1366object::set_glow_radius (sint8 rad)
1367{
1368 glow_radius = rad;
1369
1370 if (is_on_map ())
1371 update_all_los (map, x, y);
1372 else if (object *env = outer_env ())
1373 {
1374 env->update_stats ();
1375
1376 if (env->is_on_map ())
1377 update_all_los (env->map, env->x, env->y);
1378 }
1429} 1379}
1430 1380
1431/* 1381/*
1432 * Returns true if the given player is a legal class. 1382 * Returns true if the given player is a legal class.
1433 * The function to add and remove class-bonuses to the stats doesn't 1383 * The function to add and remove class-bonuses to the stats doesn't
… …
1449 1399
1450/* 1400/*
1451 * set the new dragon name after gaining levels or 1401 * set the new dragon name after gaining levels or
1452 * changing ability focus (later this can be extended to 1402 * changing ability focus (later this can be extended to
1453 * eventually change the player's face and animation) 1403 * eventually change the player's face and animation)
1454 *
1455 * Note that the title is written to 'own_title' in the
1456 * player struct. This should be changed to 'ext_title'
1457 * as soon as clients support this!
1458 * Please, anyone, write support for 'ext_title'.
1459 */ 1404 */
1460void 1405void
1461set_dragon_name (object *pl, const object *abil, const object *skin) 1406set_dragon_name (object *pl, const object *abil, const object *skin)
1462{ 1407{
1463 int atnr = -1; /* attacknumber of highest level */ 1408 int atnr = -1; /* attacknumber of highest level */
… …
1481 /* now if there are equals at highest level, pick the one with focus, 1426 /* now if there are equals at highest level, pick the one with focus,
1482 or else at random */ 1427 or else at random */
1483 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1428 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1484 atnr = abil->stats.exp; 1429 atnr = abil->stats.exp;
1485 1430
1486 level = (int) (level / 5.);
1487
1488 /* now set the new title */ 1431 /* now set the new title */
1489 if (pl->contr != NULL)
1490 {
1491 if (level == 0)
1492 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1432 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1493 else if (level == 1)
1494 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1433 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1495 else if (level == 2)
1496 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1434 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1497 else if (level == 3)
1498 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1435 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1499 else 1436 else
1500 { 1437 {
1501 /* special titles for extra high resistance! */ 1438 /* special titles for extra high resistance! */
1502 if (skin->resist[atnr] > 80)
1503 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1439 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1504 else if (skin->resist[atnr] > 50)
1505 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1440 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1506 else
1507 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1441 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1508 }
1509 } 1442 }
1510 1443
1511 strcpy (pl->contr->own_title, ""); 1444 strcpy (pl->contr->own_title, "");
1512} 1445}
1513 1446
1514/* 1447/*
1515 * This function is called when a dragon-player gains 1448 * This function is called when a dragon-player gains
1516 * an overall level. Here, the dragon might gain new abilities 1449 * an overall level. Here, the dragon might gain new abilities
1517 * or change the ability-focus. 1450 * or change the ability-focus.
1518 */ 1451 */
1519void 1452static void
1520dragon_level_gain (object *who) 1453dragon_level_gain (object *who)
1521{ 1454{
1522 object *abil = NULL; /* pointer to dragon ability force */ 1455 object *abil = NULL; /* pointer to dragon ability force */
1523 object *skin = NULL; /* pointer to dragon skin force */ 1456 object *skin = NULL; /* pointer to dragon skin force */
1524 object *tmp = NULL; /* tmp. object */ 1457 object *tmp = NULL; /* tmp. object */
… …
1580 object *skill_obj; 1513 object *skill_obj;
1581 1514
1582 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1515 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1583 if (!skill_obj) 1516 if (!skill_obj)
1584 { 1517 {
1585 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1518 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1586 return NULL; 1519 return NULL;
1587 } 1520 }
1588 1521
1589 /* clear the flag - exp goes into this bucket, but player 1522 /* clear the flag - exp goes into this bucket, but player
1590 * still doesn't know it. 1523 * still doesn't know it.
1591 */ 1524 */
1592 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1525 skill_obj->clr_flag (FLAG_CAN_USE_SKILL);
1593 skill_obj->stats.exp = 0; 1526 skill_obj->stats.exp = 0;
1594 skill_obj->level = 1; 1527 skill_obj->level = 1;
1595 insert_ob_in_ob (skill_obj, op); 1528 op->insert (skill_obj);
1596 1529
1597 if (player *pl = op->contr) 1530 if (player *pl = op->contr)
1598 { 1531 pl->link_skills ();
1599 pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1600 if (pl->ns)
1601 pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1602 }
1603 1532
1604 return skill_obj; 1533 return skill_obj;
1605} 1534}
1606 1535
1607/* player_lvl_adj() - for the new exp system. we are concerned with 1536/* player_lvl_adj() - for the new exp system. we are concerned with
… …
1624 { 1553 {
1625 changed = true; 1554 changed = true;
1626 1555
1627 op->level++; 1556 op->level++;
1628 1557
1629 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1558 if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1630 dragon_level_gain (who); 1559 dragon_level_gain (who);
1631 1560
1632 /* Only roll these if it is the player (who) that gained the level */ 1561 /* Only roll these if it is the player (who) that gained the level */
1633 if (op == who && (who->level < 11) && who->type == PLAYER) 1562 if (op == who && (who->level < 11) && who->type == PLAYER)
1634 { 1563 {
… …
1667 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1596 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1668 } 1597 }
1669 } 1598 }
1670 1599
1671 if (changed) 1600 if (changed)
1672 { 1601 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1673 who->update_stats ();
1674 esrv_update_stats (who->contr);
1675 /* check if the spell data has changed */
1676 esrv_update_spells (who->contr);
1677 }
1678} 1602}
1679 1603
1680/* 1604/*
1681 * Returns how much experience is needed for a player to become 1605 * Returns how much experience is needed for a player to become
1682 * the given level. level should really never exceed max_level 1606 * the given level. level should really never exceed max_level
1683 */ 1607 */
1684 1608
1685sint64 1609sint64
1686level_exp (int level, double expmul) 1610level_exp (int level, double expmul)
1687{ 1611{
1688 if (level > settings.max_level) 1612 return expmul * level_to_min_exp (level);
1689 return (sint64) (expmul * levels[settings.max_level]);
1690
1691 return (sint64) (expmul * levels[level]);
1692} 1613}
1693 1614
1694/* 1615/*
1695 * Ensure that the permanent experience requirements in an exp object are met. 1616 * Ensure that the permanent experience requirements in an exp object are met.
1696 * This really just checks 'op to make sure the perm_exp value is within 1617 * This really just checks 'op to make sure the perm_exp value is within
… …
1724 * NULL, in which case exp increases the players general 1645 * NULL, in which case exp increases the players general
1725 * total, but not any particular skill. 1646 * total, but not any particular skill.
1726 * flag is what to do if the player doesn't have the skill: 1647 * flag is what to do if the player doesn't have the skill:
1727 */ 1648 */
1728static void 1649static void
1729add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1650add_player_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
1730{ 1651{
1731 object *skill_obj = NULL; 1652 object *skill_obj;
1732 sint64 limit, exp_to_add; 1653 sint64 limit, exp_to_add;
1733 int i;
1734 1654
1735 /* prevents some forms of abuse. */ 1655 /* prevents some forms of abuse. */
1736 if (op->contr->braced) 1656 if (op->contr->braced)
1737 exp /= 5; 1657 exp /= 5;
1738 1658
1739 /* Try to find the matching skill. 1659 /* Try to find the matching skill.
1740 * We do a shortcut/time saving mechanism first - see if it matches 1660 * We do a shortcut/time saving mechanism first - see if it matches
1741 * chosen_skill. This means we don't need to search through 1661 * chosen_skill. This means we don't need to search through
1742 * the players inventory. 1662 * the players inventory.
1743 */ 1663 */
1664 skill_obj = 0;
1665
1744 if (skill_name) 1666 if (skill_name)
1745 { 1667 {
1746 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1668 skill_obj = op->contr->find_skill (skill_name);
1747 skill_obj = op->chosen_skill;
1748 else
1749 {
1750 for (i = 0; i < NUM_SKILLS; i++)
1751 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1752 {
1753 skill_obj = op->contr->last_skill_ob[i];
1754 break;
1755 }
1756 1669
1757 /* Player doesn't have the skill. Check to see what to do, and give 1670 /* Player doesn't have the skill. Check to see what to do, and give
1758 * it to the player if necessary 1671 * it to the player if necessary
1759 */ 1672 */
1760 if (!skill_obj) 1673 if (!skill_obj)
1761 { 1674 {
1762 if (flag == SK_EXP_NONE) 1675 if (flag == SK_EXP_NONE)
1763 return; 1676 return;
1677
1764 else if (flag == SK_EXP_ADD_SKILL) 1678 if (flag == SK_EXP_ADD_SKILL)
1765 give_skill_by_name (op, skill_name); 1679 skill_obj = give_skill_by_name (op, skill_name);
1766 }
1767 } 1680 }
1768 } 1681 }
1769 1682
1770 if (flag != SK_EXP_SKILL_ONLY) 1683 if (flag != SK_EXP_SKILL_ONLY)
1771 { 1684 {
1772 /* Basically, you can never gain more experience in one shot 1685 /* Basically, you can never gain more experience in one shot
1773 * than half what you need to gain for next level. 1686 * than half what you need to gain for next level.
1774 */ 1687 */
1775 exp_to_add = exp; 1688 exp_to_add = exp;
1776 limit = (levels[op->level + 1] - levels[op->level]) / 2; 1689 limit = (levels [op->level + 1] - levels [op->level]) / 2;
1777 if (exp_to_add > limit) 1690 if (exp_to_add > limit)
1778 exp_to_add = limit; 1691 exp_to_add = limit;
1779 1692
1780 ADD_EXP (op->stats.exp, (sint64) ((float) exp_to_add * (skill_obj ? skill_obj->expmul : 1))); 1693 ADD_EXP (op->stats.exp, (sint64) ((float) exp_to_add * (skill_obj ? skill_obj->expmul : 1)));
1781 if (settings.permanent_exp_ratio) 1694 if (settings.permanent_exp_ratio)
… …
1788 } 1701 }
1789 1702
1790 if (skill_obj) 1703 if (skill_obj)
1791 { 1704 {
1792 exp_to_add = exp; 1705 exp_to_add = exp;
1793 limit = (levels[skill_obj->level + 1] - levels[skill_obj->level]) / 2; 1706 limit = (levels [skill_obj->level + 1] - levels [skill_obj->level]) / 2;
1794 if (exp_to_add > limit) 1707 if (exp_to_add > limit)
1795 exp_to_add = limit; 1708 exp_to_add = limit;
1796 1709
1797 ADD_EXP (skill_obj->stats.exp, exp_to_add); 1710 ADD_EXP (skill_obj->stats.exp, exp_to_add);
1798 if (settings.permanent_exp_ratio) 1711 if (settings.permanent_exp_ratio)
… …
1804 player_lvl_adj (op, skill_obj); 1717 player_lvl_adj (op, skill_obj);
1805 } 1718 }
1806} 1719}
1807 1720
1808/* This function checks to make sure that object 'op' can 1721/* This function checks to make sure that object 'op' can
1809 * lost 'exp' experience. It returns the amount of exp 1722 * lose 'exp' experience. It returns the amount of exp
1810 * object 'op' can in fact lose - it basically makes 1723 * object 'op' can in fact lose - it basically makes
1811 * adjustments based on permanent exp and the like. 1724 * adjustments based on permanent exp and the like.
1812 * This function should always be used for losing experience - 1725 * This function should always be used for losing experience -
1813 * the 'exp' value passed should be positive - this is the 1726 * the 'exp' value passed should be positive - this is the
1814 * amount that should get subtract from the player. 1727 * amount that should get subtract from the player.
1815 */ 1728 */
1816sint64 1729static sint64
1817check_exp_loss (const object *op, sint64 exp) 1730check_exp_loss (const object *op, sint64 exp)
1818{ 1731{
1819 sint64 del_exp; 1732 sint64 del_exp;
1820 1733
1821 if (exp > op->stats.exp) 1734 if (exp > op->stats.exp)
1822 exp = op->stats.exp; 1735 exp = op->stats.exp;
1736
1823 if (settings.permanent_exp_ratio) 1737 if (settings.permanent_exp_ratio)
1824 { 1738 {
1825 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1739 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1740
1826 if (del_exp < 0) 1741 if (del_exp < 0)
1827 del_exp = 0; 1742 del_exp = 0;
1743
1828 if (exp > del_exp) 1744 if (exp > del_exp)
1829 exp = del_exp; 1745 exp = del_exp;
1830 } 1746 }
1747
1831 return exp; 1748 return exp;
1832} 1749}
1833 1750
1834sint64 1751sint64
1835check_exp_adjust (const object *op, sint64 exp) 1752check_exp_adjust (const object *op, sint64 exp)
1836{ 1753{
1837 if (exp < 0) 1754 if (exp < 0)
1838 return check_exp_loss (op, exp); 1755 return check_exp_loss (op, exp);
1839 else 1756 else
1840 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1757 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1841} 1758}
1842
1843 1759
1844/* Subtracts experience from player. 1760/* Subtracts experience from player.
1845 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1761 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1846 * only subtract from the matching skill. Otherwise, 1762 * only subtract from the matching skill. Otherwise,
1847 * this subtracts a portion from all 1763 * this subtracts a portion from all
… …
1852 * where everything is at the minimum perm exp, he would lose nothing. 1768 * where everything is at the minimum perm exp, he would lose nothing.
1853 * exp is the amount of exp to subtract - thus, it should be 1769 * exp is the amount of exp to subtract - thus, it should be
1854 * a postive number. 1770 * a postive number.
1855 */ 1771 */
1856static void 1772static void
1857subtract_player_exp (object *op, sint64 exp, const char *skill, int flag) 1773subtract_player_exp (object *op, sint64 exp, shstr_tmp skill, int flag)
1858{ 1774{
1859 float fraction = (float) exp / (float) op->stats.exp; 1775 float fraction = (float) exp / (float) op->stats.exp;
1860 object *tmp; 1776 object *tmp;
1861 sint64 del_exp; 1777 sint64 del_exp;
1862 1778
1863 for (tmp = op->inv; tmp; tmp = tmp->below) 1779 for (tmp = op->inv; tmp; tmp = tmp->below)
1864 if (tmp->type == SKILL && tmp->stats.exp) 1780 if (tmp->type == SKILL && tmp->stats.exp)
1865 { 1781 {
1866 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1782 if (flag == SK_SUBTRACT_SKILL_EXP && skill && tmp->skill == skill)
1867 { 1783 {
1868 del_exp = check_exp_loss (tmp, exp); 1784 del_exp = check_exp_loss (tmp, exp);
1869 tmp->stats.exp -= del_exp; 1785 tmp->stats.exp -= del_exp;
1870 player_lvl_adj (op, tmp); 1786 player_lvl_adj (op, tmp);
1871 } 1787 }
1872 else if (flag != SK_SUBTRACT_SKILL_EXP) 1788 else if (flag != SK_SUBTRACT_SKILL_EXP)
1873 { 1789 {
1874 /* only want to process other skills if we are not trying 1790 /* only want to process other skills if we are not trying
1875 * to match a specific skill. 1791 * to match a specific skill.
1876 */ 1792 */
1877 del_exp = check_exp_loss (tmp, (sint64) (tmp->stats.exp * fraction)); 1793 del_exp = check_exp_loss (tmp, tmp->stats.exp * fraction);
1878 tmp->stats.exp -= del_exp; 1794 tmp->stats.exp -= del_exp;
1879 player_lvl_adj (op, tmp); 1795 player_lvl_adj (op, tmp);
1880 } 1796 }
1881 } 1797 }
1882 1798
… …
1896 * skill_name is the skill that should get the exp added. 1812 * skill_name is the skill that should get the exp added.
1897 * flag is what to do if player doesn't have the skill. 1813 * flag is what to do if player doesn't have the skill.
1898 * these last two values are only used for players. 1814 * these last two values are only used for players.
1899 */ 1815 */
1900void 1816void
1901change_exp (object *op, sint64 exp, const char *skill_name, int flag) 1817change_exp (object *op, sint64 exp, shstr_tmp skill_name, int flag)
1902{ 1818{
1903#ifdef EXP_DEBUG 1819#ifdef EXP_DEBUG
1904 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp); 1820 LOG (llevDebug, "change_exp() called for %s, exp = %" PRId64 "\n", query_name (op), exp);
1905#endif 1821#endif
1906 1822
… …
1923 * worth. 1839 * worth.
1924 */ 1840 */
1925 if (op->type != PLAYER) 1841 if (op->type != PLAYER)
1926 { 1842 {
1927 /* Sanity check */ 1843 /* Sanity check */
1928 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1844 if (!op->flag [FLAG_ALIVE])
1929 return; 1845 return;
1930 1846
1931 /* reset exp to max allowed value. We subtract from 1847 /* reset exp to max allowed value. We subtract from
1932 * MAX_EXPERIENCE to prevent overflows. If the player somehow has 1848 * MAX_EXPERIENCE to prevent overflows. If the player somehow has
1933 * more than max exp, just return. 1849 * more than max exp, just return.
… …
1959 * amount of permenent experience, whichever gives the lowest loss. 1875 * amount of permenent experience, whichever gives the lowest loss.
1960 */ 1876 */
1961void 1877void
1962apply_death_exp_penalty (object *op) 1878apply_death_exp_penalty (object *op)
1963{ 1879{
1964 object *tmp;
1965 sint64 loss; 1880 sint64 loss;
1966 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1881 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1967 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1882 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1968 1883
1969 for (tmp = op->inv; tmp; tmp = tmp->below) 1884 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1970 if (tmp->type == SKILL && tmp->stats.exp) 1885 if (tmp->type == SKILL && tmp->stats.exp)
1971 { 1886 {
1972
1973 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1887 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
1974 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1888 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
1975 1889
1976 /* With the revised exp system, you can get cases where 1890 /* With the revised exp system, you can get cases where
1977 * losing several levels would still require that you have more 1891 * losing several levels would still require that you have more
1978 * exp than you currently have - this is true if the levels 1892 * exp than you currently have - this is true if the levels
1979 * tables is a lot harder. 1893 * tables is a lot harder.
1980 */ 1894 */
1981 if (level_loss < 0) 1895 if (level_loss < 0)
1982 level_loss = 0; 1896 level_loss = 0;
1983 1897
1984 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1898 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1985 1899
1986 tmp->stats.exp -= loss; 1900 tmp->stats.exp -= loss;
1987 player_lvl_adj (op, tmp); 1901 player_lvl_adj (op, tmp);
1988 } 1902 }
1989 1903
1990 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1904 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1991 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1905 level_loss = op->stats.exp - levels [max (0, op->level - settings.death_penalty_level)];
1992 1906
1993 if (level_loss < 0) 1907 if (level_loss < 0)
1994 level_loss = 0; 1908 level_loss = 0;
1909
1995 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1910 loss = check_exp_loss (op, min (level_loss, percentage_loss));
1996 1911
1997 op->stats.exp -= loss; 1912 op->stats.exp -= loss;
1998 player_lvl_adj (op, NULL); 1913 player_lvl_adj (op, NULL);
1999} 1914}
2000 1915

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines