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.80 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.101 by root, Mon Nov 9 18:47:55 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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 <support@deliantra.net> 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 */
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 -
421 } 423 }
422 424
423 /* becoming UNDEAD... a special treatment for this flag. Only those not 425 /* becoming UNDEAD... a special treatment for this flag. Only those not
424 * originally undead may change their status 426 * originally undead may change their status
425 */ 427 */
426 if (!QUERY_FLAG (op->arch, FLAG_UNDEAD)) 428 if (!op->arch->flag [FLAG_UNDEAD])
427 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 429 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
428 { 430 {
429 success = 1; 431 success = 1;
430 if (flag > 0) 432 if (flag > 0)
431 { 433 {
432 op->race = "undead"; 434 op->race = "undead";
437 op->race = op->arch->race; 439 op->race = op->arch->race;
438 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 440 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
439 } 441 }
440 } 442 }
441 443
442 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 444 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
443 { 445 {
444 success = 1; 446 success = 1;
445 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); 447 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
446 } 448 }
447 449
448 if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS)) 450 if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
449 { 451 {
450 success = 1; 452 success = 1;
451 DIFF_MSG (flag, "You become transparent.", "You can see yourself."); 453 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
452 } 454 }
453 455
454 /* blinded you can tell if more blinded since blinded player has minimal 456 /* blinded you can tell if more blinded since blinded player has minimal
455 * vision 457 * vision
456 */ 458 */
457 if (QUERY_FLAG (tmp, FLAG_BLIND)) 459 if (tmp->flag [FLAG_BLIND])
458 { 460 {
459 success = 1; 461 success = 1;
460 if (flag > 0) 462 if (flag > 0)
461 { 463 {
462 if (QUERY_FLAG (op, FLAG_WIZ)) 464 if (op->flag [FLAG_WIZ])
463 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded."); 465 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
464 else 466 else
465 { 467 {
466 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 468 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
467 SET_FLAG (op, FLAG_BLIND); 469 SET_FLAG (op, FLAG_BLIND);
469 op->contr->do_los = 1; 471 op->contr->do_los = 1;
470 } 472 }
471 } 473 }
472 else 474 else
473 { 475 {
474 if (QUERY_FLAG (op, FLAG_WIZ)) 476 if (op->flag [FLAG_WIZ])
475 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again."); 477 new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
476 else 478 else
477 { 479 {
478 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 480 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
479 CLEAR_FLAG (op, FLAG_BLIND); 481 CLEAR_FLAG (op, FLAG_BLIND);
481 op->contr->do_los = 1; 483 op->contr->do_los = 1;
482 } 484 }
483 } 485 }
484 } 486 }
485 487
486 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK)) 488 if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
487 { 489 {
488 success = 1; 490 success = 1;
489 if (op->type == PLAYER) 491 if (op->type == PLAYER)
490 op->contr->do_los = 1; 492 op->contr->do_los = 1;
491 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark."); 493 DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
492 } 494 }
493 495
494 if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) 496 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
495 { 497 {
496 success = 1; 498 success = 1;
497 if (flag > 0) 499 if (flag > 0)
498 { 500 {
499 if (QUERY_FLAG (op, FLAG_WIZ)) 501 if (op->flag [FLAG_WIZ])
500 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer."); 502 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
501 else 503 else
502 { 504 {
503 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent."); 505 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
504 if (op->type == PLAYER) 506 if (op->type == PLAYER)
505 op->contr->do_los = 1; 507 op->contr->do_los = 1;
506 } 508 }
507 } 509 }
508 else 510 else
509 { 511 {
510 if (QUERY_FLAG (op, FLAG_WIZ)) 512 if (op->flag [FLAG_WIZ])
511 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus."); 513 new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
512 else 514 else
513 { 515 {
514 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid."); 516 new_draw_info (NDI_UNIQUE, 0, op, "Everything suddenly looks very solid.");
515 if (op->type == PLAYER) 517 if (op->type == PLAYER)
553 for (int i = 0; i < NROFATTACKS; i++) 555 for (int i = 0; i < NROFATTACKS; i++)
554 { 556 {
555 if (i == ATNR_PHYSICAL) 557 if (i == ATNR_PHYSICAL)
556 continue; /* Don't display about armour */ 558 continue; /* Don't display about armour */
557 559
558 if (op->resist[i] != refop.resist[i]) 560 if (op->resist [i] != prev_resist [i])
559 { 561 {
560 success = 1; 562 success = 1;
563
561 if (op->resist[i] > refop.resist[i]) 564 if (op->resist [i] > prev_resist [i])
562 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]); 565 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
563 else 566 else
564 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]); 567 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
565 568
566 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); 569 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
567 } 570 }
568 } 571 }
569 572
570 if (!potion_max) 573 if (!potion_max)
571 {
572 for (int j = 0; j < NUM_STATS; j++) 574 for (int j = 0; j < NUM_STATS; j++)
573 {
574 if (int i = tmp->stats.stat (j)) 575 if (int i = tmp->stats.stat (j))
575 { 576 {
576 success = 1; 577 success = 1;
577 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 578 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
578 } 579 }
579 }
580 }
581 580
582 return success; 581 return success;
583} 582}
584 583
585/* 584/*
596object::drain_specific_stat (int deplete_stats) 595object::drain_specific_stat (int deplete_stats)
597{ 596{
598 object *tmp; 597 object *tmp;
599 archetype *at; 598 archetype *at;
600 599
601 at = archetype::find (ARCH_DEPLETION); 600 at = archetype::find (shstr_depletion);
602 if (!at) 601 if (!at)
603 { 602 {
604 LOG (llevError, "Couldn't find archetype depletion.\n"); 603 LOG (llevError, "Couldn't find archetype depletion.\n");
605 return; 604 return;
606 } 605 }
626 * via an applied bad_luck object. 625 * via an applied bad_luck object.
627 */ 626 */
628void 627void
629object::change_luck (int value) 628object::change_luck (int value)
630{ 629{
631 archetype *at = archetype::find ("luck"); 630 archetype *at = archetype::find (shstr_luck);
632 if (!at) 631 if (!at)
633 LOG (llevError, "Couldn't find archetype luck.\n"); 632 LOG (llevError, "Couldn't find archetype luck.\n");
634 else 633 else
635 { 634 {
636 object *tmp = present_arch_in_ob (at, this); 635 object *tmp = present_arch_in_ob (at, this);
860 * then calls this function. 859 * then calls this function.
861 */ 860 */
862 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 861 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
863 continue; 862 continue;
864 863
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; 864 glow_radius += tmp->glow_radius;
870 865
871 /* For some things, we don't care what is equipped */ 866 /* For some things, we don't care what is equipped */
872 if (tmp->type == SKILL) 867 if (tmp->type == SKILL)
873 { 868 {
874 /* Want to take the highest skill here. */ 869 /* Want to take the highest skill here. */
887 else if (tmp->level > grace_obj->level) 882 else if (tmp->level > grace_obj->level)
888 grace_obj = tmp; 883 grace_obj = tmp;
889 } 884 }
890 } 885 }
891 886
892 /* Container objects are not meant to adjust a players, but other applied 887 /* Container objects are not meant to adjust players, but other applied
893 * objects need to make adjustments. 888 * objects need to make adjustments.
894 * This block should handle all player specific changes 889 * This block should handle all player specific changes
895 * The check for Praying is a bit of a hack - god given bonuses are put 890 * 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. 891 * 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, 892 * It also means we need to put in additional checks for applied below,
920 915
921 if (digest_types [tmp->type]) 916 if (digest_types [tmp->type])
922 { 917 {
923 contr->digestion += tmp->stats.food; 918 contr->digestion += tmp->stats.food;
924 contr->gen_hp += tmp->stats.hp; 919 contr->gen_hp += tmp->stats.hp;
920 if (tmp->type != BOW) // ugly exception for bows
925 contr->gen_sp += tmp->stats.sp; 921 contr->gen_sp += tmp->stats.sp;
926 contr->gen_grace += tmp->stats.grace; 922 contr->gen_grace += tmp->stats.grace;
927 contr->gen_sp_armour += tmp->gen_sp_armour; 923 contr->gen_sp_armour += tmp->gen_sp_armour;
928 } 924 }
929 } /* if this is a player */ 925 } /* if this is a player */
930 else 926 else
940 936
941 if (tmp->type == SYMPTOM) 937 if (tmp->type == SYMPTOM)
942 speed_reduce_from_disease = 938 speed_reduce_from_disease =
943 min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f); 939 min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
944 940
945 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 941 /* Pos. and neg. protections are counted separate (-> pro/vuln).
946 * (Negative protections are calculated exactly like positive.) 942 * (Negative protections are calculated exactly like positive.)
947 * Resistance from potions are treated special as well. If there's 943 * Resistance from potions are treated special as well. If there's
948 * more than one potion-effect, the bigger prot.-value is taken. 944 * more than one potion-effect, the bigger prot.-value is taken.
949 */ 945 */
950 if (tmp->type != POTION) 946 if (tmp->type != POTION)
1139 else /* To nullify the below effect */ 1135 else /* To nullify the below effect */
1140 ac += tmp->stats.ac + tmp->magic; 1136 ac += tmp->stats.ac + tmp->magic;
1141 } 1137 }
1142 1138
1143 if (tmp->stats.wc) 1139 if (tmp->stats.wc)
1144 wc -= (tmp->stats.wc + tmp->magic); 1140 wc -= tmp->stats.wc + tmp->magic;
1145 1141
1146 if (tmp->stats.ac) 1142 if (tmp->stats.ac)
1147 ac -= (tmp->stats.ac + tmp->magic); 1143 ac -= tmp->stats.ac + tmp->magic;
1148 1144
1149 if (ARMOUR_SPEED (tmp)) 1145 if (ARMOUR_SPEED (tmp))
1150 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); 1146 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1151 1147
1152 break; 1148 break;
1153 } /* switch tmp->type */ 1149 } /* switch tmp->type */
1154 } /* item is equipped */ 1150 } /* item is equipped */
1155 } /* for loop of items */ 1151 } /* for loop of items */
1152
1153 glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
1156 1154
1157 /* We've gone through all the objects the player has equipped. For many things, we 1155 /* 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. 1156 * have generated intermediate values which we now need to assign.
1159 */ 1157 */
1160 1158
1330 1328
1331 speed = 1.f + speed_bonus[stats.Dex]; 1329 speed = 1.f + speed_bonus[stats.Dex];
1332 1330
1333 if (settings.search_items && contr->search_str[0]) 1331 if (settings.search_items && contr->search_str[0])
1334 speed -= 1; 1332 speed -= 1;
1335
1336 if (attacktype == 0)
1337 attacktype = arch->attacktype;
1338 } /* End if player */ 1333 } /* End if player */
1339 1334
1340 if (added_speed >= 0) 1335 if (added_speed >= 0)
1341 speed += added_speed / 10.f; 1336 speed += added_speed / 10.f;
1342 else /* Something wrong here...: */ 1337 else /* Something wrong here...: */
1410 move_type &= ~MOVE_WALK; 1405 move_type &= ~MOVE_WALK;
1411 1406
1412 /* It is quite possible that a player's spell costing might have changed, 1407 /* It is quite possible that a player's spell costing might have changed,
1413 * so we will check that now. 1408 * so we will check that now.
1414 */ 1409 */
1415 if (type == PLAYER) 1410 if (is_player ())
1416 { 1411 contr->update_spells ();
1417 esrv_update_stats (contr);
1418 esrv_update_spells (contr);
1419 }
1420 1412
1421 // update the mapspace, if we are on a map 1413 // update the mapspace, if we are on a map
1422 if (!flag [FLAG_REMOVED] && map) 1414 if (!flag [FLAG_REMOVED] && map)
1423 map->at (x, y).flags_ = 0; 1415 map->at (x, y).flags_ = 0;
1416}
1417
1418void
1419object::set_glow_radius (sint8 rad)
1420{
1421 glow_radius = rad;
1422
1423 if (is_on_map ())
1424 update_all_los (map, x, y);
1425 else if (object *env = outer_env ())
1426 {
1427 env->update_stats ();
1428
1429 if (env->is_on_map ())
1430 update_all_los (env->map, env->x, env->y);
1431 }
1424} 1432}
1425 1433
1426/* 1434/*
1427 * Returns true if the given player is a legal class. 1435 * Returns true if the given player is a legal class.
1428 * The function to add and remove class-bonuses to the stats doesn't 1436 * The function to add and remove class-bonuses to the stats doesn't
1444 1452
1445/* 1453/*
1446 * set the new dragon name after gaining levels or 1454 * set the new dragon name after gaining levels or
1447 * changing ability focus (later this can be extended to 1455 * changing ability focus (later this can be extended to
1448 * eventually change the player's face and animation) 1456 * 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 */ 1457 */
1455void 1458void
1456set_dragon_name (object *pl, const object *abil, const object *skin) 1459set_dragon_name (object *pl, const object *abil, const object *skin)
1457{ 1460{
1458 int atnr = -1; /* attacknumber of highest level */ 1461 int atnr = -1; /* attacknumber of highest level */
1476 /* now if there are equals at highest level, pick the one with focus, 1479 /* now if there are equals at highest level, pick the one with focus,
1477 or else at random */ 1480 or else at random */
1478 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1481 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1479 atnr = abil->stats.exp; 1482 atnr = abil->stats.exp;
1480 1483
1481 level = (int) (level / 5.);
1482
1483 /* now set the new title */ 1484 /* now set the new title */
1484 if (pl->contr)
1485 {
1486 if (level == 0)
1487 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1485 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]); 1486 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]); 1487 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]); 1488 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1494 else 1489 else
1495 { 1490 {
1496 /* special titles for extra high resistance! */ 1491 /* special titles for extra high resistance! */
1497 if (skin->resist[atnr] > 80)
1498 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1492 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]); 1493 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]); 1494 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1503 }
1504 } 1495 }
1505 1496
1506 strcpy (pl->contr->own_title, ""); 1497 strcpy (pl->contr->own_title, "");
1507} 1498}
1508 1499
1509/* 1500/*
1510 * This function is called when a dragon-player gains 1501 * This function is called when a dragon-player gains
1511 * an overall level. Here, the dragon might gain new abilities 1502 * an overall level. Here, the dragon might gain new abilities
1512 * or change the ability-focus. 1503 * or change the ability-focus.
1513 */ 1504 */
1514void 1505static void
1515dragon_level_gain (object *who) 1506dragon_level_gain (object *who)
1516{ 1507{
1517 object *abil = NULL; /* pointer to dragon ability force */ 1508 object *abil = NULL; /* pointer to dragon ability force */
1518 object *skin = NULL; /* pointer to dragon skin force */ 1509 object *skin = NULL; /* pointer to dragon skin force */
1519 object *tmp = NULL; /* tmp. object */ 1510 object *tmp = NULL; /* tmp. object */
1575 object *skill_obj; 1566 object *skill_obj;
1576 1567
1577 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1568 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1578 if (!skill_obj) 1569 if (!skill_obj)
1579 { 1570 {
1580 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1571 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1581 return NULL; 1572 return NULL;
1582 } 1573 }
1583 1574
1584 /* clear the flag - exp goes into this bucket, but player 1575 /* clear the flag - exp goes into this bucket, but player
1585 * still doesn't know it. 1576 * still doesn't know it.
1586 */ 1577 */
1587 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1578 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1588 skill_obj->stats.exp = 0; 1579 skill_obj->stats.exp = 0;
1589 skill_obj->level = 1; 1580 skill_obj->level = 1;
1590 insert_ob_in_ob (skill_obj, op); 1581 op->insert (skill_obj);
1591 1582
1592 if (player *pl = op->contr) 1583 if (player *pl = op->contr)
1593 { 1584 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 1585
1599 return skill_obj; 1586 return skill_obj;
1600} 1587}
1601 1588
1602/* player_lvl_adj() - for the new exp system. we are concerned with 1589/* player_lvl_adj() - for the new exp system. we are concerned with
1662 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1649 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1663 } 1650 }
1664 } 1651 }
1665 1652
1666 if (changed) 1653 if (changed)
1667 { 1654 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} 1655}
1674 1656
1675/* 1657/*
1676 * Returns how much experience is needed for a player to become 1658 * Returns how much experience is needed for a player to become
1677 * the given level. level should really never exceed max_level 1659 * the given level. level should really never exceed max_level
1721 * flag is what to do if the player doesn't have the skill: 1703 * flag is what to do if the player doesn't have the skill:
1722 */ 1704 */
1723static void 1705static void
1724add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1706add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1725{ 1707{
1726 object *skill_obj = NULL; 1708 object *skill_obj;
1727 sint64 limit, exp_to_add; 1709 sint64 limit, exp_to_add;
1728 int i; 1710 int i;
1729 1711
1730 /* prevents some forms of abuse. */ 1712 /* prevents some forms of abuse. */
1731 if (op->contr->braced) 1713 if (op->contr->braced)
1734 /* Try to find the matching skill. 1716 /* Try to find the matching skill.
1735 * We do a shortcut/time saving mechanism first - see if it matches 1717 * We do a shortcut/time saving mechanism first - see if it matches
1736 * chosen_skill. This means we don't need to search through 1718 * chosen_skill. This means we don't need to search through
1737 * the players inventory. 1719 * the players inventory.
1738 */ 1720 */
1721 skill_obj = 0;
1722
1739 if (skill_name) 1723 if (skill_name)
1740 { 1724 {
1741 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1725 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 1726
1752 /* Player doesn't have the skill. Check to see what to do, and give 1727 /* Player doesn't have the skill. Check to see what to do, and give
1753 * it to the player if necessary 1728 * it to the player if necessary
1754 */ 1729 */
1755 if (!skill_obj) 1730 if (!skill_obj)
1756 { 1731 {
1757 if (flag == SK_EXP_NONE) 1732 if (flag == SK_EXP_NONE)
1758 return; 1733 return;
1734
1759 else if (flag == SK_EXP_ADD_SKILL) 1735 if (flag == SK_EXP_ADD_SKILL)
1760 give_skill_by_name (op, skill_name); 1736 skill_obj = give_skill_by_name (op, skill_name);
1761 }
1762 } 1737 }
1763 } 1738 }
1764 1739
1765 if (flag != SK_EXP_SKILL_ONLY) 1740 if (flag != SK_EXP_SKILL_ONLY)
1766 { 1741 {
1799 player_lvl_adj (op, skill_obj); 1774 player_lvl_adj (op, skill_obj);
1800 } 1775 }
1801} 1776}
1802 1777
1803/* This function checks to make sure that object 'op' can 1778/* This function checks to make sure that object 'op' can
1804 * lost 'exp' experience. It returns the amount of exp 1779 * lose 'exp' experience. It returns the amount of exp
1805 * object 'op' can in fact lose - it basically makes 1780 * object 'op' can in fact lose - it basically makes
1806 * adjustments based on permanent exp and the like. 1781 * adjustments based on permanent exp and the like.
1807 * This function should always be used for losing experience - 1782 * This function should always be used for losing experience -
1808 * the 'exp' value passed should be positive - this is the 1783 * the 'exp' value passed should be positive - this is the
1809 * amount that should get subtract from the player. 1784 * amount that should get subtract from the player.
1810 */ 1785 */
1811sint64 1786static sint64
1812check_exp_loss (const object *op, sint64 exp) 1787check_exp_loss (const object *op, sint64 exp)
1813{ 1788{
1814 sint64 del_exp; 1789 sint64 del_exp;
1815 1790
1816 if (exp > op->stats.exp) 1791 if (exp > op->stats.exp)
1817 exp = op->stats.exp; 1792 exp = op->stats.exp;
1793
1818 if (settings.permanent_exp_ratio) 1794 if (settings.permanent_exp_ratio)
1819 { 1795 {
1820 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1796 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1797
1821 if (del_exp < 0) 1798 if (del_exp < 0)
1822 del_exp = 0; 1799 del_exp = 0;
1800
1823 if (exp > del_exp) 1801 if (exp > del_exp)
1824 exp = del_exp; 1802 exp = del_exp;
1825 } 1803 }
1804
1826 return exp; 1805 return exp;
1827} 1806}
1828 1807
1829sint64 1808sint64
1830check_exp_adjust (const object *op, sint64 exp) 1809check_exp_adjust (const object *op, sint64 exp)
1831{ 1810{
1832 if (exp < 0) 1811 if (exp < 0)
1833 return check_exp_loss (op, exp); 1812 return check_exp_loss (op, exp);
1834 else 1813 else
1835 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1814 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1836} 1815}
1837
1838 1816
1839/* Subtracts experience from player. 1817/* Subtracts experience from player.
1840 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1818 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1841 * only subtract from the matching skill. Otherwise, 1819 * only subtract from the matching skill. Otherwise,
1842 * this subtracts a portion from all 1820 * this subtracts a portion from all
1856 sint64 del_exp; 1834 sint64 del_exp;
1857 1835
1858 for (tmp = op->inv; tmp; tmp = tmp->below) 1836 for (tmp = op->inv; tmp; tmp = tmp->below)
1859 if (tmp->type == SKILL && tmp->stats.exp) 1837 if (tmp->type == SKILL && tmp->stats.exp)
1860 { 1838 {
1861 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1839 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1862 { 1840 {
1863 del_exp = check_exp_loss (tmp, exp); 1841 del_exp = check_exp_loss (tmp, exp);
1864 tmp->stats.exp -= del_exp; 1842 tmp->stats.exp -= del_exp;
1865 player_lvl_adj (op, tmp); 1843 player_lvl_adj (op, tmp);
1866 } 1844 }
1954 * amount of permenent experience, whichever gives the lowest loss. 1932 * amount of permenent experience, whichever gives the lowest loss.
1955 */ 1933 */
1956void 1934void
1957apply_death_exp_penalty (object *op) 1935apply_death_exp_penalty (object *op)
1958{ 1936{
1959 object *tmp;
1960 sint64 loss; 1937 sint64 loss;
1961 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1938 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
1962 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1939 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
1963 1940
1964 for (tmp = op->inv; tmp; tmp = tmp->below) 1941 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965 if (tmp->type == SKILL && tmp->stats.exp) 1942 if (tmp->type == SKILL && tmp->stats.exp)
1966 { 1943 {
1967
1968 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1944 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)]; 1945 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
1970 1946
1971 /* With the revised exp system, you can get cases where 1947 /* With the revised exp system, you can get cases where
1972 * losing several levels would still require that you have more 1948 * losing several levels would still require that you have more
1973 * exp than you currently have - this is true if the levels 1949 * exp than you currently have - this is true if the levels
1974 * tables is a lot harder. 1950 * tables is a lot harder.
1975 */ 1951 */
1976 if (level_loss < 0) 1952 if (level_loss < 0)
1977 level_loss = 0; 1953 level_loss = 0;
1978 1954
1979 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1955 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
1980 1956
1981 tmp->stats.exp -= loss; 1957 tmp->stats.exp -= loss;
1982 player_lvl_adj (op, tmp); 1958 player_lvl_adj (op, tmp);
1983 } 1959 }
1984 1960
1985 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1961 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)]; 1962 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1987 1963
1988 if (level_loss < 0) 1964 if (level_loss < 0)
1989 level_loss = 0; 1965 level_loss = 0;
1966
1990 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1967 loss = check_exp_loss (op, min (level_loss, percentage_loss));
1991 1968
1992 op->stats.exp -= loss; 1969 op->stats.exp -= loss;
1993 player_lvl_adj (op, NULL); 1970 player_lvl_adj (op, NULL);
1994} 1971}
1995 1972

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines