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.79 by root, Thu Nov 8 01:14:12 2007 UTC vs.
Revision 1.117 by root, Tue Apr 6 21:11:48 2010 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 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 */
… …
262/* Rather than having a whole bunch of if (flag) new_draw.. else new_draw, 262/* 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 263 * 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. 264 * function since some of the values passed to new_draw_info are hardcoded.
265 */ 265 */
266#define DIFF_MSG(flag, msg1, msg2) \ 266#define DIFF_MSG(flag, msg1, msg2) \
267 new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2); 267 new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
268 268
269/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */ 269/* return 1 if we sucessfully changed a stat, 0 if nothing was changed. */
270 270
271/* flag is set to 1 if we are applying the object, -1 if we are removing 271/* flag is set to 1 if we are applying the object, -1 if we are removing
272 * the object. 272 * the object.
… …
280 * that gives them that ability. 280 * that gives them that ability.
281 */ 281 */
282int 282int
283change_abil (object *op, object *tmp) 283change_abil (object *op, object *tmp)
284{ 284{
285 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0; 285 int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
286 int success = 0;
286 char message[MAX_BUF]; 287 char message[MAX_BUF];
287 int potion_max = 0; 288 int potion_max = 0;
288 289
289 /* remember what object was like before it was changed. note that 290 // keep some stats for comparison purposes
290 * refop is a local copy of op only to be used for detecting changes 291 object::flags_t prev_flag = op->flag;
291 * found by update_stats. refop is not a real object 292 MoveType prev_move_type = op->move_type;
292 */ 293 sint16 prev_resist [NROFATTACKS]; // clumsy
293 object_copy refop = *op; 294 assert (sizeof (prev_resist) == sizeof (op->resist));
295 memcpy (prev_resist, op->resist, sizeof (prev_resist));
294 296
295 if (op->type == PLAYER) 297 if (op->type == PLAYER)
296 { 298 {
297 if (tmp->type == POTION) 299 if (tmp->type == POTION)
298 { 300 {
299 potion_max = 1; 301 potion_max = 1;
302
300 for (int j = 0; j < NUM_STATS; j++) 303 for (int j = 0; j < NUM_STATS; j++)
301 { 304 {
302 int ostat = op->contr->orig_stats.stat (j); 305 int ostat = op->contr->orig_stats.stat (j);
303 int i = tmp->stats.stat (j); 306 int i = tmp->stats.stat (j);
304 307
305 /* nstat is what the stat will be after use of the potion */ 308 /* nstat is what the stat will be after use of the potion */
306 int nstat = flag * i + ostat; 309 int nstat = flag * i + ostat;
307 310
308 /* Do some bounds checking. While I don't think any 311 /* 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 312 * that adjust that stat by more than one point, so we need
311 * to allow for that. 313 * to allow for that.
312 */ 314 */
313 if (nstat < 1 && i * flag < 0) 315 if (nstat < 1 && i * flag < 0)
314 nstat = 1; 316 nstat = 1;
… …
366 { 368 {
367 success = 1; 369 success = 1;
368 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red."); 370 DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
369 } 371 }
370 372
371 if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE)) 373 if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
372 { 374 {
373 success = 1; 375 success = 1;
374 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore."); 376 DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
375 } 377 }
376 378
377 if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE)) 379 if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE])
378 { 380 {
379 success = 1; 381 success = 1;
380 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away."); 382 DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
381 } 383 }
382 384
383 if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL)) 385 if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL])
384 { 386 {
385 success = 1; 387 success = 1;
386 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow."); 388 DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
387 } 389 }
388 390
… …
390 * user has multiple items giving the same type appled like we 392 * user has multiple items giving the same type appled like we
391 * used to - that is more work than what we gain, plus messages 393 * used to - that is more work than what we gain, plus messages
392 * can be misleading (a little higher could be miscontrued from 394 * can be misleading (a little higher could be miscontrued from
393 * from fly high) 395 * from fly high)
394 */ 396 */
395 if (tmp->move_type && op->move_type != refop.move_type) 397 if (tmp->move_type && op->move_type != prev_move_type)
396 { 398 {
397 success = 1; 399 success = 1;
398 400
399 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low 401 /* MOVE_FLY_HIGH trumps MOVE_FLY_LOW - changing your move_fly_low
400 * status doesn't make a difference if you are flying high 402 * status doesn't make a difference if you are flying high
401 */ 403 */
402 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH)) 404 if (tmp->move_type & MOVE_FLY_LOW && !(op->move_type & MOVE_FLY_HIGH))
403 { 405 {
404 DIFF_MSG (flag, "You start to float in the air!.", "You float down to the ground."); 406 DIFF_MSG (flag, "You start to float in the air!", "You float down to the ground.");
405 } 407 }
406 408
407 if (tmp->move_type & MOVE_FLY_HIGH) 409 if (tmp->move_type & MOVE_FLY_HIGH)
408 { 410 {
409 /* double conditional - second case covers if you have move_fly_low - 411 /* 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.")); 415 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
414 } 416 }
415 417
416 if (tmp->move_type & MOVE_SWIM) 418 if (tmp->move_type & MOVE_SWIM)
417 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); 419 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 } 420 }
422 421
423 /* becoming UNDEAD... a special treatment for this flag. Only those not 422 /* becoming UNDEAD... a special treatment for this flag. Only those not
424 * originally undead may change their status 423 * originally undead may change their status
425 */ 424 */
426 if (!QUERY_FLAG (op->arch, FLAG_UNDEAD)) 425 if (!op->arch->flag [FLAG_UNDEAD])
427 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 426 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
428 { 427 {
429 success = 1; 428 success = 1;
430 if (flag > 0) 429 if (flag > 0)
431 { 430 {
432 op->race = "undead"; 431 op->race = "undead";
… …
437 op->race = op->arch->race; 436 op->race = op->arch->race;
438 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 437 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
439 } 438 }
440 } 439 }
441 440
442 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 441 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
443 { 442 {
444 success = 1; 443 success = 1;
445 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); 444 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
446 } 445 }
447 446
448 if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS)) 447 if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
449 { 448 {
450 success = 1; 449 success = 1;
451 DIFF_MSG (flag, "You become transparent.", "You can see yourself."); 450 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
452 } 451 }
453 452
454 /* blinded you can tell if more blinded since blinded player has minimal 453 /* blinded you can tell if more blinded since blinded player has minimal
455 * vision 454 * vision
456 */ 455 */
457 if (QUERY_FLAG (tmp, FLAG_BLIND)) 456 if (tmp->flag [FLAG_BLIND])
458 { 457 {
459 success = 1; 458 success = 1;
460 if (flag > 0) 459 if (flag > 0)
461 { 460 {
462 if (QUERY_FLAG (op, FLAG_WIZ)) 461 if (op->flag [FLAG_WIZ])
463 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded."); 462 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
464 else 463 else
465 { 464 {
466 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 465 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
467 SET_FLAG (op, FLAG_BLIND); 466 SET_FLAG (op, FLAG_BLIND);
… …
469 op->contr->do_los = 1; 468 op->contr->do_los = 1;
470 } 469 }
471 } 470 }
472 else 471 else
473 { 472 {
474 if (QUERY_FLAG (op, FLAG_WIZ)) 473 if (op->flag [FLAG_WIZ])
475 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again."); 474 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
476 else 475 else
477 { 476 {
478 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 477 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
479 CLEAR_FLAG (op, FLAG_BLIND); 478 CLEAR_FLAG (op, FLAG_BLIND);
… …
481 op->contr->do_los = 1; 480 op->contr->do_los = 1;
482 } 481 }
483 } 482 }
484 } 483 }
485 484
486 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK)) 485 if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
487 { 486 {
488 success = 1; 487 success = 1;
489 if (op->type == PLAYER) 488 if (op->type == PLAYER)
490 op->contr->do_los = 1; 489 op->contr->do_los = 1;
491 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark."); 490 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
492 } 491 }
493 492
494 if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) 493 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
495 { 494 {
496 success = 1; 495 success = 1;
497 if (flag > 0) 496 if (flag > 0)
498 { 497 {
499 if (QUERY_FLAG (op, FLAG_WIZ)) 498 if (op->flag [FLAG_WIZ])
500 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer."); 499 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
501 else 500 else
502 { 501 {
503 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent."); 502 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
504 if (op->type == PLAYER) 503 if (op->type == PLAYER)
505 op->contr->do_los = 1; 504 op->contr->do_los = 1;
506 } 505 }
507 } 506 }
508 else 507 else
509 { 508 {
510 if (QUERY_FLAG (op, FLAG_WIZ)) 509 if (op->flag [FLAG_WIZ])
511 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus."); 510 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
512 else 511 else
513 { 512 {
514 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid."); 513 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
515 if (op->type == PLAYER) 514 if (op->type == PLAYER)
… …
522 { 521 {
523 success = 1; 522 success = 1;
524 DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky."); 523 DIFF_MSG (flag * tmp->stats.luck, "You feel more lucky.", "You feel less lucky.");
525 } 524 }
526 525
526 if (digest_types [tmp->type])
527 {
527 if (tmp->stats.hp && op->type == PLAYER) 528 if (tmp->stats.hp && op->type == PLAYER)
528 { 529 {
529 success = 1; 530 success = 1;
530 DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!"); 531 DIFF_MSG (flag * tmp->stats.hp, "You feel much more healthy!", "You feel much less healthy!");
531 } 532 }
532 533
533 if (tmp->stats.sp && op->type == PLAYER && tmp->type != SKILL) 534 if (tmp->stats.sp && op->type == PLAYER
534 { 535 && tmp->type != SKILL && tmp->type != BOW)
536 {
535 success = 1; 537 success = 1;
536 DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane."); 538 DIFF_MSG (flag * tmp->stats.sp, "You feel one with the powers of magic!", "You suddenly feel very mundane.");
537 } 539 }
538 540
539 /* for the future when artifacts set this -b.t. */ 541 /* for the future when artifacts set this -b.t. */
540 if (tmp->stats.grace && op->type == PLAYER) 542 if (tmp->stats.grace && op->type == PLAYER)
541 { 543 {
542 success = 1; 544 success = 1;
543 DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy."); 545 DIFF_MSG (flag * tmp->stats.grace, "You feel closer to your god!", "You suddenly feel less holy.");
544 } 546 }
545 547
546 if (tmp->stats.food && op->type == PLAYER) 548 if (tmp->stats.food && op->type == PLAYER)
547 { 549 {
548 success = 1; 550 success = 1;
549 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up."); 551 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
552 }
550 } 553 }
551 554
552 /* Messages for changed resistance */ 555 /* Messages for changed resistance */
553 for (int i = 0; i < NROFATTACKS; i++) 556 for (int i = 0; i < NROFATTACKS; i++)
554 { 557 {
555 if (i == ATNR_PHYSICAL) 558 if (i == ATNR_PHYSICAL)
556 continue; /* Don't display about armour */ 559 continue; /* Don't display about armour */
557 560
558 if (op->resist[i] != refop.resist[i]) 561 if (op->resist [i] != prev_resist [i])
559 { 562 {
560 success = 1; 563 success = 1;
564
561 if (op->resist[i] > refop.resist[i]) 565 if (op->resist [i] > prev_resist [i])
562 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]); 566 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
563 else 567 else
564 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]); 568 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
565 569
566 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); 570 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
567 } 571 }
568 } 572 }
569 573
570 if (!potion_max) 574 if (!potion_max)
571 {
572 for (int j = 0; j < NUM_STATS; j++) 575 for (int j = 0; j < NUM_STATS; j++)
573 {
574 if (int i = tmp->stats.stat (j)) 576 if (int i = tmp->stats.stat (j))
575 { 577 {
576 success = 1; 578 success = 1;
577 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 579 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
578 } 580 }
579 }
580 }
581 581
582 return success; 582 return success;
583} 583}
584 584
585/* 585/*
… …
596object::drain_specific_stat (int deplete_stats) 596object::drain_specific_stat (int deplete_stats)
597{ 597{
598 object *tmp; 598 object *tmp;
599 archetype *at; 599 archetype *at;
600 600
601 at = archetype::find (ARCH_DEPLETION); 601 at = archetype::find (shstr_depletion);
602 if (!at) 602 if (!at)
603 { 603 {
604 LOG (llevError, "Couldn't find archetype depletion.\n"); 604 LOG (llevError, "Couldn't find archetype depletion.\n");
605 return; 605 return;
606 } 606 }
… …
608 { 608 {
609 tmp = present_arch_in_ob (at, this); 609 tmp = present_arch_in_ob (at, this);
610 610
611 if (!tmp) 611 if (!tmp)
612 { 612 {
613 tmp = arch_to_object (at); 613 tmp = at->instance ();
614 tmp = insert_ob_in_ob (tmp, this); 614 tmp = insert_ob_in_ob (tmp, this);
615 SET_FLAG (tmp, FLAG_APPLIED); 615 SET_FLAG (tmp, FLAG_APPLIED);
616 } 616 }
617 } 617 }
618 618
… …
626 * via an applied bad_luck object. 626 * via an applied bad_luck object.
627 */ 627 */
628void 628void
629object::change_luck (int value) 629object::change_luck (int value)
630{ 630{
631 archetype *at = archetype::find ("luck"); 631 archetype *at = archetype::find (shstr_luck);
632 if (!at) 632 if (!at)
633 LOG (llevError, "Couldn't find archetype luck.\n"); 633 LOG (llevError, "Couldn't find archetype luck.\n");
634 else 634 else
635 { 635 {
636 object *tmp = present_arch_in_ob (at, this); 636 object *tmp = present_arch_in_ob (at, this);
… …
638 if (!tmp) 638 if (!tmp)
639 { 639 {
640 if (!value) 640 if (!value)
641 return; 641 return;
642 642
643 tmp = arch_to_object (at); 643 tmp = at->instance ();
644 tmp = insert_ob_in_ob (tmp, this); 644 tmp = insert_ob_in_ob (tmp, this);
645 SET_FLAG (tmp, FLAG_APPLIED); 645 SET_FLAG (tmp, FLAG_APPLIED);
646 } 646 }
647 647
648 if (value) 648 if (value)
… …
703 sint8 v = arch->stats.stat (i); 703 sint8 v = arch->stats.stat (i);
704 stats.stat (i) += v; 704 stats.stat (i) += v;
705 contr->orig_stats.stat (i) += v; 705 contr->orig_stats.stat (i) += v;
706 } 706 }
707} 707}
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 708
735static struct copy_flags : object::flags_t 709static struct copy_flags : object::flags_t
736{ 710{
737 copy_flags () 711 copy_flags ()
738 { 712 {
… …
765 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 739 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
766 object *grace_obj = NULL, *mana_obj = NULL, *tmp; 740 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
767 float old_speed = speed; 741 float old_speed = speed;
768 int stat_sum [NUM_STATS]; 742 int stat_sum [NUM_STATS];
769 743
744 MoveType move_type; // we use change_move_type to change it, so use a local copy
745
770 /* First task is to clear all the values back to their original values */ 746 /* First task is to clear all the values back to their original values */
771 if (type == PLAYER) 747 if (type == PLAYER)
772 { 748 {
749 contr->delayed_update = false;
750
773 for (int i = 0; i < NUM_STATS; i++) 751 for (int i = 0; i < NUM_STATS; i++)
774 stat_sum [i] = contr->orig_stats.stat (i); 752 stat_sum [i] = contr->orig_stats.stat (i);
775 753
776 if (settings.spell_encumbrance == TRUE) 754 if (settings.spell_encumbrance == TRUE)
777 contr->encumbrance = 0; 755 contr->encumbrance = 0;
… …
810 path_repelled = arch->path_repelled; 788 path_repelled = arch->path_repelled;
811 path_denied = arch->path_denied; 789 path_denied = arch->path_denied;
812 glow_radius = arch->glow_radius; 790 glow_radius = arch->glow_radius;
813 move_type = arch->move_type; 791 move_type = arch->move_type;
814 792
815 chosen_skill = 0;
816
817 /* initializing resistances from the values in player/monster's 793 /* initializing resistances from the values in player/monster's
818 * archetype clone 794 * archetype clone
819 */ 795 */
820 memcpy (&resist, &arch->resist, sizeof (resist)); 796 memcpy (&resist, &arch->resist, sizeof (resist));
821 797
822 for (int i = 0; i < NROFATTACKS; i++) 798 for (int i = 0; i < NROFATTACKS; i++)
823 { 799 {
824 if (resist[i] > 0) 800 if (resist[i] > 0)
825 prot[i] = resist[i], vuln[i] = 0; 801 prot[i] = resist[i], vuln[i] = 0;
826 else 802 else
827 vuln[i] = -(resist[i]), prot[i] = 0; 803 vuln[i] = -resist[i], prot[i] = 0;
828 804
829 potion_resist[i] = 0; 805 potion_resist[i] = -1000;
830 } 806 }
831 807
832 wc = arch->stats.wc; 808 wc = arch->stats.wc;
833 stats.dam = arch->stats.dam; 809 stats.dam = arch->stats.dam;
834 810
… …
848 ac = arch->stats.ac; 824 ac = arch->stats.ac;
849 825
850 stats.luck = arch->stats.luck; 826 stats.luck = arch->stats.luck;
851 speed = arch->speed; 827 speed = arch->speed;
852 828
829 chosen_skill = 0;
830
853 /* OK - we've reset most all the objects attributes to sane values. 831 /* 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. 832 * now go through and make adjustments for what the player has equipped.
855 */ 833 */
856 for (tmp = inv; tmp; tmp = tmp->below) 834 for (tmp = inv; tmp; tmp = tmp->below)
857 { 835 {
… …
860 * then calls this function. 838 * then calls this function.
861 */ 839 */
862 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 840 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
863 continue; 841 continue;
864 842
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; 843 glow_radius += tmp->glow_radius;
870 844
871 /* For some things, we don't care what is equipped */ 845 /* For some things, we don't care what is equipped */
872 if (tmp->type == SKILL) 846 if (tmp->type == SKILL)
873 { 847 {
874 /* Want to take the highest skill here. */ 848 /* Want to take the highest skill here. */
… …
887 else if (tmp->level > grace_obj->level) 861 else if (tmp->level > grace_obj->level)
888 grace_obj = tmp; 862 grace_obj = tmp;
889 } 863 }
890 } 864 }
891 865
892 /* Container objects are not meant to adjust a players, but other applied 866 /* Container objects are not meant to adjust players, but other applied
893 * objects need to make adjustments. 867 * objects need to make adjustments.
894 * This block should handle all player specific changes 868 * This block should handle all player specific changes
895 * The check for Praying is a bit of a hack - god given bonuses are put 869 * 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. 870 * 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, 871 * It also means we need to put in additional checks for applied below,
… …
899 * up, etc. 873 * up, etc.
900 */ 874 */
901 if ((tmp->flag [FLAG_APPLIED] 875 if ((tmp->flag [FLAG_APPLIED]
902 && tmp->type != CONTAINER 876 && tmp->type != CONTAINER
903 && tmp->type != CLOSE_CON) 877 && tmp->type != CLOSE_CON)
904 || (tmp->type == SKILL
905 && tmp->subtype == SK_PRAYING)) 878 || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
906 { 879 {
907 if (type == PLAYER) 880 if (type == PLAYER)
908 { 881 {
909 contr->item_power += tmp->item_power; 882 contr->item_power += tmp->item_power;
910 883
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++) 884 for (int i = 0; i < NUM_STATS; i++)
919 stat_sum [i] = stat_sum [i] + tmp->stats.stat (i); 885 stat_sum [i] += tmp->stats.stat (i);
920 886
921 if (digest_types [tmp->type]) 887 if (digest_types [tmp->type])
922 { 888 {
923 contr->digestion += tmp->stats.food; 889 contr->digestion += tmp->stats.food;
924 contr->gen_hp += tmp->stats.hp; 890 contr->gen_hp += tmp->stats.hp;
891 if (tmp->type != BOW) // ugly exception for bows
925 contr->gen_sp += tmp->stats.sp; 892 contr->gen_sp += tmp->stats.sp;
926 contr->gen_grace += tmp->stats.grace; 893 contr->gen_grace += tmp->stats.grace;
927 contr->gen_sp_armour += tmp->gen_sp_armour; 894 contr->gen_sp_armour += tmp->gen_sp_armour;
928 } 895 }
929 } /* if this is a player */ 896 } /* if this is a player */
930 else 897 else
… …
932 if (tmp->type == WEAPON) 899 if (tmp->type == WEAPON)
933 current_weapon = tmp; 900 current_weapon = tmp;
934 } 901 }
935 902
936 /* Update slots used for items */ 903 /* Update slots used for items */
937 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 904 if (tmp->flag [FLAG_APPLIED]) // exclude praying...
938 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 905 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
939 slot[i].used += tmp->slot[i].info; 906 slot[i].used += tmp->slot[i].info;
940 907
941 if (tmp->type == SYMPTOM) 908 if (tmp->type == SYMPTOM)
942 speed_reduce_from_disease =
943 min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f); 909 min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
944 910
945 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 911 /* Pos. and neg. protections are counted separate (-> pro/vuln).
946 * (Negative protections are calculated exactly like positive.) 912 * (Negative protections are calculated exactly like positive.)
947 * Resistance from potions are treated special as well. If there's 913 * Resistance from potions are treated special as well. If there's
948 * more than one potion-effect, the bigger prot.-value is taken. 914 * more than one potion-effect, the bigger prot.-value is taken.
949 */ 915 */
950 if (tmp->type != POTION) 916 if (tmp->type == POTION_EFFECT)
951 {
952 for (int i = 0; i < NROFATTACKS; i++) 917 for (int i = 0; i < NROFATTACKS; i++)
953 {
954 /* Potential for cursed potions, in which case we just can use
955 * a straight MAX, as potion_resist is initialised to zero.
956 */
957 if (tmp->type == POTION_EFFECT)
958 {
959 if (potion_resist[i])
960 potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
961 else
962 potion_resist[i] = tmp->resist[i]; 918 max_it (potion_resist[i], tmp->resist[i]);
963 } 919 else if (tmp->type != POTION)
920 for (int i = 0; i < NROFATTACKS; i++)
964 else if (tmp->resist[i] > 0) 921 if (tmp->resist[i] > 0)
965 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 922 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
966 else if (tmp->resist[i] < 0) 923 else if (tmp->resist[i] < 0)
967 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 924 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
968 }
969 }
970 925
971 /* There may be other things that should not adjust the attacktype */ 926 /* There may be other things that should not adjust the attacktype */
972 if (tmp->type != SYMPTOM) 927 if (tmp->type != SYMPTOM)
973 { 928 {
974 attacktype |= tmp->attacktype; 929 attacktype |= tmp->attacktype;
… …
982 flag |= tmp->flag & copy_flags; 937 flag |= tmp->flag & copy_flags;
983 938
984 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD)) 939 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
985 SET_FLAG (this, FLAG_UNDEAD); 940 SET_FLAG (this, FLAG_UNDEAD);
986 941
942 //TODO: copy_flags?
987 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 943 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
988 { 944 {
989 SET_FLAG (this, FLAG_MAKE_INVIS); 945 SET_FLAG (this, FLAG_MAKE_INVIS);
990 invisible = 1; 946 invisible = 1;
991 } 947 }
… …
1001 added_speed += tmp->stats.exp; 957 added_speed += tmp->stats.exp;
1002 } 958 }
1003 959
1004 switch (tmp->type) 960 switch (tmp->type)
1005 { 961 {
1006#if 0
1007 case WAND:
1008 case ROD:
1009 case HORN:
1010 if (type != PLAYER || current_weapon == tmp)
1011 chosen_skill = tmp;
1012 break;
1013#endif
1014
1015 /* skills modifying the character -b.t. */
1016 /* for all skills and skill granting objects */
1017 case SKILL: 962 case SKILL:
1018 { 963 {
964 // some skills will end up here without counting as "applied"
1019 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY) 965 if (!tmp->flag [FLAG_APPLIED] || skill_flags [tmp->subtype] & SF_AUTARK)
1020 break; 966 break;
1021 967
1022 if (chosen_skill) 968 if (chosen_skill)
1023 { 969 {
1024 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n", 970 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
… …
1026 972
1027 tmp->flag [FLAG_APPLIED] = false; 973 tmp->flag [FLAG_APPLIED] = false;
1028 update_stats (); 974 update_stats ();
1029 return; 975 return;
1030 } 976 }
1031 else 977
1032 chosen_skill = tmp; 978 chosen_skill = tmp;
1033 979
1034 if (tmp->stats.dam > 0) 980 if (tmp->stats.dam > 0)
1035 { /* skill is a 'weapon' */ 981 { /* skill is a 'weapon' */
1036 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 982 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1037 weapon_speed = WEAPON_SPEED (tmp); 983 weapon_speed = max (0, WEAPON_SPEED (tmp));
1038
1039 if (weapon_speed < 0)
1040 weapon_speed = 0;
1041 984
1042 weapon_weight = tmp->weight; 985 weapon_weight = tmp->weight;
1043 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9; 986 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1044 987
1045 if (tmp->magic) 988 if (tmp->magic)
… …
1054 997
1055 if (tmp->stats.ac) 998 if (tmp->stats.ac)
1056 ac -= tmp->stats.ac + tmp->magic; 999 ac -= tmp->stats.ac + tmp->magic;
1057 1000
1058 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1001 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1059 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1002 contr->encumbrance += 3 * tmp->weight / 1000;
1060 } 1003 }
1061 1004
1062 break; 1005 break;
1063 1006
1064 case SHIELD: 1007 case SHIELD:
1065 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1008 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1066 contr->encumbrance += (int) tmp->weight / 2000; 1009 contr->encumbrance += tmp->weight / 2000;
1010 //FALLTHROUGH
1067 case RING: 1011 case RING:
1068 case AMULET: 1012 case AMULET:
1069 case GIRDLE: 1013 case GIRDLE:
1070 case HELMET: 1014 case HELMET:
1071 case BOOTS: 1015 case BOOTS:
… …
1080 if (tmp->stats.ac) 1024 if (tmp->stats.ac)
1081 ac -= tmp->stats.ac + tmp->magic; 1025 ac -= tmp->stats.ac + tmp->magic;
1082 1026
1083 break; 1027 break;
1084 1028
1029 case WAND:
1030 case ROD:
1031 case HORN:
1032 break;
1033
1085 case BOW: 1034 case BOW:
1086 case WEAPON: 1035 case WEAPON:
1087 if (type != PLAYER || current_weapon == tmp)
1088 {
1089 wc -= tmp->stats.wc + tmp->magic; 1036 wc -= tmp->stats.wc + tmp->magic;
1090 1037
1091 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1038 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1092 ac -= tmp->stats.ac + tmp->magic; 1039 ac -= tmp->stats.ac + tmp->magic;
1093 1040
1094 stats.dam += tmp->stats.dam + tmp->magic; 1041 stats.dam += tmp->stats.dam + tmp->magic;
1095 weapon_weight = tmp->weight; 1042 weapon_weight = tmp->weight;
1096 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1043 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1097 1044
1098 if (weapon_speed < 0) 1045 if (weapon_speed < 0)
1099 weapon_speed = 0; 1046 weapon_speed = 0;
1100 1047
1101 slaying = tmp->slaying; 1048 slaying = tmp->slaying;
1102 1049
1103 /* If there is desire that two handed weapons should do 1050 /* If there is desire that two handed weapons should do
1104 * extra strength damage, this is where the code should 1051 * extra strength damage, this is where the code should
1105 * go. 1052 * go.
1106 */ 1053 */
1107 1054
1108 if (type == PLAYER) 1055 if (type == PLAYER)
1109 if (settings.spell_encumbrance) 1056 if (settings.spell_encumbrance)
1110 contr->encumbrance += tmp->weight * 3 / 1000; 1057 contr->encumbrance += tmp->weight * 3 / 1000;
1111 }
1112 1058
1113 break; 1059 break;
1114 1060
1115 case ARMOUR: /* Only the best of these three are used: */ 1061 case ARMOUR: /* Only the best of these three are used: */
1116 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1062 if (settings.spell_encumbrance == TRUE && type == PLAYER)
… …
1139 else /* To nullify the below effect */ 1085 else /* To nullify the below effect */
1140 ac += tmp->stats.ac + tmp->magic; 1086 ac += tmp->stats.ac + tmp->magic;
1141 } 1087 }
1142 1088
1143 if (tmp->stats.wc) 1089 if (tmp->stats.wc)
1144 wc -= (tmp->stats.wc + tmp->magic); 1090 wc -= tmp->stats.wc + tmp->magic;
1145 1091
1146 if (tmp->stats.ac) 1092 if (tmp->stats.ac)
1147 ac -= (tmp->stats.ac + tmp->magic); 1093 ac -= tmp->stats.ac + tmp->magic;
1148 1094
1149 if (ARMOUR_SPEED (tmp)) 1095 if (ARMOUR_SPEED (tmp))
1150 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); 1096 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1151 1097
1152 break; 1098 break;
1153 } /* switch tmp->type */ 1099 } /* switch tmp->type */
1154 } /* item is equipped */ 1100 } /* item is equipped */
1155 } /* for loop of items */ 1101 } /* for loop of items */
1102
1103 min_it (glow_radius, MAX_LIGHT_RADIUS);
1156 1104
1157 /* We've gone through all the objects the player has equipped. For many things, we 1105 /* We've gone through all the objects the player has equipped. For many things, we
1158 * have generated intermediate values which we now need to assign. 1106 * have generated intermediate values which we now need to assign.
1159 */ 1107 */
1160 1108
… …
1166 */ 1114 */
1167 for (int i = 0; i < NROFATTACKS; i++) 1115 for (int i = 0; i < NROFATTACKS; i++)
1168 { 1116 {
1169 resist[i] = prot[i] - vuln[i]; 1117 resist[i] = prot[i] - vuln[i];
1170 1118
1171 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1119 if (potion_resist[i] != -1000
1120 && (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
1172 resist[i] = potion_resist[i]; 1121 resist[i] = potion_resist[i];
1173 } 1122 }
1174 1123
1175 if (type == PLAYER) 1124 if (type == PLAYER)
1176 { 1125 {
1177 // clamp various player stats 1126 // clamp various player stats
1178 for (int i = 0; i < NUM_STATS; ++i) 1127 for (int i = 0; i < NUM_STATS; ++i)
1179 stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT); 1128 stats.stat (i) = stat_sum [i];
1129
1130 check_stat_bounds (&stats);
1180 1131
1181 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION); 1132 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1182 1133
1183 /* Figure out the players sp/mana/hp totals. */ 1134 /* Figure out the players sp/mana/hp totals. */
1184 int pl_level; 1135 int pl_level;
1185 1136
1186 check_stat_bounds (&(stats));
1187 pl_level = level;
1188
1189 if (pl_level < 1)
1190 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1137 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1191 1138
1192 /* You basically get half a con bonus/level. But we do take into account rounding, 1139 /* You basically get half a con bonus/level. But we do take into account rounding,
1193 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1140 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1194 */ 1141 */
1195 stats.maxhp = 0; 1142 stats.maxhp = 0;
… …
1330 1277
1331 speed = 1.f + speed_bonus[stats.Dex]; 1278 speed = 1.f + speed_bonus[stats.Dex];
1332 1279
1333 if (settings.search_items && contr->search_str[0]) 1280 if (settings.search_items && contr->search_str[0])
1334 speed -= 1; 1281 speed -= 1;
1335
1336 if (attacktype == 0)
1337 attacktype = arch->attacktype;
1338 } /* End if player */ 1282 } /* End if player */
1339 1283
1340 if (added_speed >= 0) 1284 if (added_speed >= 0)
1341 speed += added_speed / 10.f; 1285 speed += added_speed / 10.f;
1342 else /* Something wrong here...: */ 1286 else /* Something wrong here...: */
… …
1361 speed *= speed_reduce_from_disease; 1305 speed *= speed_reduce_from_disease;
1362 1306
1363 /* Put a lower limit on speed. Note with this speed, you move once every 1307 /* Put a lower limit on speed. Note with this speed, you move once every
1364 * 25 ticks or so. This amounts to once every 3 seconds of realtime. 1308 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1365 */ 1309 */
1366 if (speed < 0.04f && type == PLAYER) 1310 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1367 speed = 0.04f;
1368 1311
1369 if (speed != old_speed) 1312 if (speed != old_speed)
1370 set_speed (speed); 1313 set_speed (speed);
1371 1314
1372 if (type == PLAYER) 1315 if (type == PLAYER)
… …
1407 if (move_type == 0) 1350 if (move_type == 0)
1408 move_type = MOVE_WALK; 1351 move_type = MOVE_WALK;
1409 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1352 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1410 move_type &= ~MOVE_WALK; 1353 move_type &= ~MOVE_WALK;
1411 1354
1355 // now apply the new move_type
1356 if (this->move_type != move_type)
1357 change_move_type (move_type);
1358
1412 /* It is quite possible that a player's spell costing might have changed, 1359 /* It is quite possible that a player's spell costing might have changed,
1413 * so we will check that now. 1360 * so we will check that now.
1414 */ 1361 */
1415 if (type == PLAYER) 1362 if (is_player ())
1416 { 1363 contr->update_spells ();
1417 esrv_update_stats (contr);
1418 esrv_update_spells (contr);
1419 }
1420 1364
1421 // update the mapspace, if we are on a map 1365 // update the mapspace, if we are on a map
1422 if (!flag [FLAG_REMOVED] && map) 1366 if (!flag [FLAG_REMOVED] && map)
1423 map->at (x, y).flags_ = 0; 1367 map->at (x, y).flags_ = 0;
1368}
1369
1370void
1371object::set_glow_radius (sint8 rad)
1372{
1373 glow_radius = rad;
1374
1375 if (is_on_map ())
1376 update_all_los (map, x, y);
1377 else if (object *env = outer_env ())
1378 {
1379 env->update_stats ();
1380
1381 if (env->is_on_map ())
1382 update_all_los (env->map, env->x, env->y);
1383 }
1424} 1384}
1425 1385
1426/* 1386/*
1427 * Returns true if the given player is a legal class. 1387 * Returns true if the given player is a legal class.
1428 * The function to add and remove class-bonuses to the stats doesn't 1388 * The function to add and remove class-bonuses to the stats doesn't
… …
1444 1404
1445/* 1405/*
1446 * set the new dragon name after gaining levels or 1406 * set the new dragon name after gaining levels or
1447 * changing ability focus (later this can be extended to 1407 * changing ability focus (later this can be extended to
1448 * eventually change the player's face and animation) 1408 * eventually change the player's face and animation)
1449 *
1450 * Note that the title is written to 'own_title' in the
1451 * player struct. This should be changed to 'ext_title'
1452 * as soon as clients support this!
1453 * Please, anyone, write support for 'ext_title'.
1454 */ 1409 */
1455void 1410void
1456set_dragon_name (object *pl, const object *abil, const object *skin) 1411set_dragon_name (object *pl, const object *abil, const object *skin)
1457{ 1412{
1458 int atnr = -1; /* attacknumber of highest level */ 1413 int atnr = -1; /* attacknumber of highest level */
… …
1476 /* now if there are equals at highest level, pick the one with focus, 1431 /* now if there are equals at highest level, pick the one with focus,
1477 or else at random */ 1432 or else at random */
1478 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1433 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1479 atnr = abil->stats.exp; 1434 atnr = abil->stats.exp;
1480 1435
1481 level = (int) (level / 5.);
1482
1483 /* now set the new title */ 1436 /* now set the new title */
1484 if (pl->contr)
1485 {
1486 if (level == 0)
1487 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1437 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1488 else if (level == 1)
1489 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1438 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1490 else if (level == 2)
1491 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1439 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1492 else if (level == 3)
1493 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1440 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1494 else 1441 else
1495 { 1442 {
1496 /* special titles for extra high resistance! */ 1443 /* special titles for extra high resistance! */
1497 if (skin->resist[atnr] > 80)
1498 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1444 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1499 else if (skin->resist[atnr] > 50)
1500 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1445 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1501 else
1502 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1446 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1503 }
1504 } 1447 }
1505 1448
1506 strcpy (pl->contr->own_title, ""); 1449 strcpy (pl->contr->own_title, "");
1507} 1450}
1508 1451
1509/* 1452/*
1510 * This function is called when a dragon-player gains 1453 * This function is called when a dragon-player gains
1511 * an overall level. Here, the dragon might gain new abilities 1454 * an overall level. Here, the dragon might gain new abilities
1512 * or change the ability-focus. 1455 * or change the ability-focus.
1513 */ 1456 */
1514void 1457static void
1515dragon_level_gain (object *who) 1458dragon_level_gain (object *who)
1516{ 1459{
1517 object *abil = NULL; /* pointer to dragon ability force */ 1460 object *abil = NULL; /* pointer to dragon ability force */
1518 object *skin = NULL; /* pointer to dragon skin force */ 1461 object *skin = NULL; /* pointer to dragon skin force */
1519 object *tmp = NULL; /* tmp. object */ 1462 object *tmp = NULL; /* tmp. object */
… …
1575 object *skill_obj; 1518 object *skill_obj;
1576 1519
1577 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1520 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1578 if (!skill_obj) 1521 if (!skill_obj)
1579 { 1522 {
1580 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1523 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1581 return NULL; 1524 return NULL;
1582 } 1525 }
1583 1526
1584 /* clear the flag - exp goes into this bucket, but player 1527 /* clear the flag - exp goes into this bucket, but player
1585 * still doesn't know it. 1528 * still doesn't know it.
1586 */ 1529 */
1587 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1530 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1588 skill_obj->stats.exp = 0; 1531 skill_obj->stats.exp = 0;
1589 skill_obj->level = 1; 1532 skill_obj->level = 1;
1590 insert_ob_in_ob (skill_obj, op); 1533 op->insert (skill_obj);
1591 1534
1592 if (player *pl = op->contr) 1535 if (player *pl = op->contr)
1593 { 1536 pl->link_skills ();
1594 pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1595 if (pl->ns)
1596 pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1597 }
1598 1537
1599 return skill_obj; 1538 return skill_obj;
1600} 1539}
1601 1540
1602/* player_lvl_adj() - for the new exp system. we are concerned with 1541/* player_lvl_adj() - for the new exp system. we are concerned with
… …
1619 { 1558 {
1620 changed = true; 1559 changed = true;
1621 1560
1622 op->level++; 1561 op->level++;
1623 1562
1624 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1563 if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1625 dragon_level_gain (who); 1564 dragon_level_gain (who);
1626 1565
1627 /* Only roll these if it is the player (who) that gained the level */ 1566 /* Only roll these if it is the player (who) that gained the level */
1628 if (op == who && (who->level < 11) && who->type == PLAYER) 1567 if (op == who && (who->level < 11) && who->type == PLAYER)
1629 { 1568 {
… …
1662 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1601 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1663 } 1602 }
1664 } 1603 }
1665 1604
1666 if (changed) 1605 if (changed)
1667 { 1606 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1668 who->update_stats ();
1669 esrv_update_stats (who->contr);
1670 /* check if the spell data has changed */
1671 esrv_update_spells (who->contr);
1672 }
1673} 1607}
1674 1608
1675/* 1609/*
1676 * Returns how much experience is needed for a player to become 1610 * Returns how much experience is needed for a player to become
1677 * the given level. level should really never exceed max_level 1611 * the given level. level should really never exceed max_level
… …
1721 * flag is what to do if the player doesn't have the skill: 1655 * flag is what to do if the player doesn't have the skill:
1722 */ 1656 */
1723static void 1657static void
1724add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1658add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1725{ 1659{
1726 object *skill_obj = NULL; 1660 object *skill_obj;
1727 sint64 limit, exp_to_add; 1661 sint64 limit, exp_to_add;
1728 int i; 1662 int i;
1729 1663
1730 /* prevents some forms of abuse. */ 1664 /* prevents some forms of abuse. */
1731 if (op->contr->braced) 1665 if (op->contr->braced)
… …
1734 /* Try to find the matching skill. 1668 /* Try to find the matching skill.
1735 * We do a shortcut/time saving mechanism first - see if it matches 1669 * We do a shortcut/time saving mechanism first - see if it matches
1736 * chosen_skill. This means we don't need to search through 1670 * chosen_skill. This means we don't need to search through
1737 * the players inventory. 1671 * the players inventory.
1738 */ 1672 */
1673 skill_obj = 0;
1674
1739 if (skill_name) 1675 if (skill_name)
1740 { 1676 {
1741 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1677 skill_obj = op->contr->find_skill (skill_name);
1742 skill_obj = op->chosen_skill;
1743 else
1744 {
1745 for (i = 0; i < NUM_SKILLS; i++)
1746 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1747 {
1748 skill_obj = op->contr->last_skill_ob[i];
1749 break;
1750 }
1751 1678
1752 /* Player doesn't have the skill. Check to see what to do, and give 1679 /* Player doesn't have the skill. Check to see what to do, and give
1753 * it to the player if necessary 1680 * it to the player if necessary
1754 */ 1681 */
1755 if (!skill_obj) 1682 if (!skill_obj)
1756 { 1683 {
1757 if (flag == SK_EXP_NONE) 1684 if (flag == SK_EXP_NONE)
1758 return; 1685 return;
1686
1759 else if (flag == SK_EXP_ADD_SKILL) 1687 if (flag == SK_EXP_ADD_SKILL)
1760 give_skill_by_name (op, skill_name); 1688 skill_obj = give_skill_by_name (op, skill_name);
1761 }
1762 } 1689 }
1763 } 1690 }
1764 1691
1765 if (flag != SK_EXP_SKILL_ONLY) 1692 if (flag != SK_EXP_SKILL_ONLY)
1766 { 1693 {
… …
1799 player_lvl_adj (op, skill_obj); 1726 player_lvl_adj (op, skill_obj);
1800 } 1727 }
1801} 1728}
1802 1729
1803/* This function checks to make sure that object 'op' can 1730/* This function checks to make sure that object 'op' can
1804 * lost 'exp' experience. It returns the amount of exp 1731 * lose 'exp' experience. It returns the amount of exp
1805 * object 'op' can in fact lose - it basically makes 1732 * object 'op' can in fact lose - it basically makes
1806 * adjustments based on permanent exp and the like. 1733 * adjustments based on permanent exp and the like.
1807 * This function should always be used for losing experience - 1734 * This function should always be used for losing experience -
1808 * the 'exp' value passed should be positive - this is the 1735 * the 'exp' value passed should be positive - this is the
1809 * amount that should get subtract from the player. 1736 * amount that should get subtract from the player.
1810 */ 1737 */
1811sint64 1738static sint64
1812check_exp_loss (const object *op, sint64 exp) 1739check_exp_loss (const object *op, sint64 exp)
1813{ 1740{
1814 sint64 del_exp; 1741 sint64 del_exp;
1815 1742
1816 if (exp > op->stats.exp) 1743 if (exp > op->stats.exp)
1817 exp = op->stats.exp; 1744 exp = op->stats.exp;
1745
1818 if (settings.permanent_exp_ratio) 1746 if (settings.permanent_exp_ratio)
1819 { 1747 {
1820 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1748 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1749
1821 if (del_exp < 0) 1750 if (del_exp < 0)
1822 del_exp = 0; 1751 del_exp = 0;
1752
1823 if (exp > del_exp) 1753 if (exp > del_exp)
1824 exp = del_exp; 1754 exp = del_exp;
1825 } 1755 }
1756
1826 return exp; 1757 return exp;
1827} 1758}
1828 1759
1829sint64 1760sint64
1830check_exp_adjust (const object *op, sint64 exp) 1761check_exp_adjust (const object *op, sint64 exp)
1831{ 1762{
1832 if (exp < 0) 1763 if (exp < 0)
1833 return check_exp_loss (op, exp); 1764 return check_exp_loss (op, exp);
1834 else 1765 else
1835 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1766 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1836} 1767}
1837
1838 1768
1839/* Subtracts experience from player. 1769/* Subtracts experience from player.
1840 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1770 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1841 * only subtract from the matching skill. Otherwise, 1771 * only subtract from the matching skill. Otherwise,
1842 * this subtracts a portion from all 1772 * this subtracts a portion from all
… …
1856 sint64 del_exp; 1786 sint64 del_exp;
1857 1787
1858 for (tmp = op->inv; tmp; tmp = tmp->below) 1788 for (tmp = op->inv; tmp; tmp = tmp->below)
1859 if (tmp->type == SKILL && tmp->stats.exp) 1789 if (tmp->type == SKILL && tmp->stats.exp)
1860 { 1790 {
1861 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1791 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1862 { 1792 {
1863 del_exp = check_exp_loss (tmp, exp); 1793 del_exp = check_exp_loss (tmp, exp);
1864 tmp->stats.exp -= del_exp; 1794 tmp->stats.exp -= del_exp;
1865 player_lvl_adj (op, tmp); 1795 player_lvl_adj (op, tmp);
1866 } 1796 }
… …
1954 * amount of permenent experience, whichever gives the lowest loss. 1884 * amount of permenent experience, whichever gives the lowest loss.
1955 */ 1885 */
1956void 1886void
1957apply_death_exp_penalty (object *op) 1887apply_death_exp_penalty (object *op)
1958{ 1888{
1959 object *tmp;
1960 sint64 loss; 1889 sint64 loss;
1961 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1890 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1962 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1891 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1963 1892
1964 for (tmp = op->inv; tmp; tmp = tmp->below) 1893 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965 if (tmp->type == SKILL && tmp->stats.exp) 1894 if (tmp->type == SKILL && tmp->stats.exp)
1966 { 1895 {
1967
1968 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1896 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
1969 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1897 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
1970 1898
1971 /* With the revised exp system, you can get cases where 1899 /* With the revised exp system, you can get cases where
1972 * losing several levels would still require that you have more 1900 * losing several levels would still require that you have more
1973 * exp than you currently have - this is true if the levels 1901 * exp than you currently have - this is true if the levels
1974 * tables is a lot harder. 1902 * tables is a lot harder.
1975 */ 1903 */
1976 if (level_loss < 0) 1904 if (level_loss < 0)
1977 level_loss = 0; 1905 level_loss = 0;
1978 1906
1979 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1907 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1980 1908
1981 tmp->stats.exp -= loss; 1909 tmp->stats.exp -= loss;
1982 player_lvl_adj (op, tmp); 1910 player_lvl_adj (op, tmp);
1983 } 1911 }
1984 1912
1985 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1913 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
1986 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1914 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1987 1915
1988 if (level_loss < 0) 1916 if (level_loss < 0)
1989 level_loss = 0; 1917 level_loss = 0;
1918
1990 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1919 loss = check_exp_loss (op, min (level_loss, percentage_loss));
1991 1920
1992 op->stats.exp -= loss; 1921 op->stats.exp -= loss;
1993 player_lvl_adj (op, NULL); 1922 player_lvl_adj (op, NULL);
1994} 1923}
1995 1924

Diff Legend

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