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.41 by root, Sun Apr 29 18:11:39 2007 UTC vs.
Revision 1.114 by root, Sun Mar 28 18:44:21 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h>
27 26
28/* 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
29 * 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
30 * 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
31 */ 30 */
… …
233const char *const short_stat_name[NUM_STATS] = { 232const char *const short_stat_name[NUM_STATS] = {
234 "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha" 233 "Str", "Dex", "Con", "Int", "Wis", "Pow", "Cha"
235}; 234};
236 235
237/* 236/*
238 * sets Str/Dex/con/Wis/Cha/Int/Pow in stats to value, depending on
239 * what attr is (STR to POW).
240 */
241void
242set_attr_value (living *stats, int attr, sint8 value)
243{
244 switch (attr)
245 {
246 case STR:
247 stats->Str = value;
248 break;
249 case DEX:
250 stats->Dex = value;
251 break;
252 case CON:
253 stats->Con = value;
254 break;
255 case WIS:
256 stats->Wis = value;
257 break;
258 case POW:
259 stats->Pow = value;
260 break;
261 case CHA:
262 stats->Cha = value;
263 break;
264 case INT:
265 stats->Int = value;
266 break;
267 }
268}
269
270/*
271 * Like set_attr_value(), but instead the value (which can be negative) 237 * Like set_attr_value(), but instead the value (which can be negative)
272 * is added to the specified stat. 238 * is added to the specified stat.
273 */ 239 */
274void 240void
275change_attr_value (living *stats, int attr, sint8 value) 241change_attr_value (living *stats, int attr, sint8 value)
276{ 242{
277 if (value == 0) 243 stats->stat (attr) += value;
278 return;
279
280 switch (attr)
281 {
282 case STR:
283 stats->Str += value;
284 break;
285 case DEX:
286 stats->Dex += value;
287 break;
288 case CON:
289 stats->Con += value;
290 break;
291 case WIS:
292 stats->Wis += value;
293 break;
294 case POW:
295 stats->Pow += value;
296 break;
297 case CHA:
298 stats->Cha += value;
299 break;
300 case INT:
301 stats->Int += value;
302 break;
303 default:
304 LOG (llevError, "Invalid attribute in change_attr_value: %d\n", attr);
305 }
306}
307
308/*
309 * returns the specified stat. See also set_attr_value().
310 */
311
312sint8
313get_attr_value (const living *stats, int attr)
314{
315 switch (attr)
316 {
317 case STR: return stats->Str;
318 case DEX: return stats->Dex;
319 case CON: return stats->Con;
320 case WIS: return stats->Wis;
321 case CHA: return stats->Cha;
322 case INT: return stats->Int;
323 case POW: return stats->Pow;
324 }
325
326 return 0;
327} 244}
328 245
329/* 246/*
330 * Ensures that all stats (str/dex/con/wis/cha/int) are within the 247 * Ensures that all stats (str/dex/con/wis/cha/int) are within the
331 * 1-30 stat limit. 248 * 1-30 stat limit.
332 */ 249 */
333
334void 250void
335check_stat_bounds (living *stats) 251check_stat_bounds (living *stats)
336{ 252{
337 int i, v;
338
339 for (i = 0; i < NUM_STATS; i++) 253 for (int i = 0; i < NUM_STATS; i++)
340 if ((v = get_attr_value (stats, i)) > MAX_STAT) 254 {
341 set_attr_value (stats, i, MAX_STAT); 255 sint8 &v = stats->stat (i);
342 else if (v < MIN_STAT) 256 v = clamp (v, MIN_STAT, MAX_STAT);
343 set_attr_value (stats, i, MIN_STAT); 257 }
344} 258}
345 259
346#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc) 260#define ORIG_S(xyz,abc) (op->contr->orig_stats.abc)
347 261
348/* 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,
349 * 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
350 * 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.
351 */ 265 */
352#define DIFF_MSG(flag, msg1, msg2) \ 266#define DIFF_MSG(flag, msg1, msg2) \
353 new_draw_info(NDI_UNIQUE, 0, op, (flag>0)?msg1:msg2); 267 new_draw_info (NDI_UNIQUE, 0, op, (flag > 0) ? msg1 : msg2);
354 268
355/* 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. */
356 270
357/* 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
358 * the object. 272 * the object.
359 * It is the calling functions responsibilty to check to see if the object 273 * It is the calling functions responsibilty to check to see if the object
360 * can be applied or not. 274 * can be applied or not.
361 * The main purpose of calling this function is the messages that are 275 * The main purpose of calling this function is the messages that are
362 * displayed - fix_player should really always be called after this when 276 * displayed - update_stats should really always be called after this when
363 * removing an object - that is because it is impossible to know if some object 277 * removing an object - that is because it is impossible to know if some object
364 * is the only source of an attacktype or spell attunement, so this function 278 * is the only source of an attacktype or spell attunement, so this function
365 * will clear the bits, but the player may still have some other object 279 * will clear the bits, but the player may still have some other object
366 * that gives them that ability. 280 * that gives them that ability.
367 */ 281 */
368int 282int
369change_abil (object *op, object *tmp) 283change_abil (object *op, object *tmp)
370{ 284{
371 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, i, j, success = 0; 285 int flag = tmp->flag [FLAG_APPLIED] ? 1 : -1;
286 int success = 0;
372 char message[MAX_BUF]; 287 char message[MAX_BUF];
373 int potion_max = 0; 288 int potion_max = 0;
374 289
375 /* remember what object was like before it was changed. note that 290 // keep some stats for comparison purposes
376 * refop is a local copy of op only to be used for detecting changes 291 object::flags_t prev_flag = op->flag;
377 * found by update_stats. refop is not a real object 292 MoveType prev_move_type = op->move_type;
378 */ 293 sint16 prev_resist [NROFATTACKS]; // clumsy
379 object_copy refop = *op; 294 assert (sizeof (prev_resist) == sizeof (op->resist));
295 memcpy (prev_resist, op->resist, sizeof (prev_resist));
380 296
381 if (op->type == PLAYER) 297 if (op->type == PLAYER)
382 { 298 {
383 if (tmp->type == POTION) 299 if (tmp->type == POTION)
384 { 300 {
385 potion_max = 1; 301 potion_max = 1;
302
386 for (j = 0; j < NUM_STATS; j++) 303 for (int j = 0; j < NUM_STATS; j++)
387 { 304 {
388 int nstat, ostat; 305 int ostat = op->contr->orig_stats.stat (j);
389 306 int i = tmp->stats.stat (j);
390 ostat = get_attr_value (&(op->contr->orig_stats), j);
391 i = get_attr_value (&(tmp->stats), j);
392 307
393 /* 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 */
394 nstat = flag * i + ostat; 309 int nstat = flag * i + ostat;
395 310
396 /* Do some bounds checking. While I don't think any 311 /* Do some bounds checking. There is the potential for potions
397 * potions do so right now, there is the potential for potions
398 * 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
399 * to allow for that. 313 * to allow for that.
400 */ 314 */
401 if (nstat < 1 && i * flag < 0) 315 if (nstat < 1 && i * flag < 0)
402 nstat = 1; 316 nstat = 1;
403 else if (nstat > 20 + get_attr_value (&(op->arch->clone.stats), j)) 317 else if (nstat > 20 + op->arch->stats.stat (j))
404 { 318 nstat = 20 + op->arch->stats.stat (j);
405 nstat = 20 + get_attr_value (&(op->arch->clone.stats), j);
406 }
407 319
408 if (nstat != ostat) 320 if (nstat != ostat)
409 { 321 {
410 set_attr_value (&(op->contr->orig_stats), j, nstat); 322 op->contr->orig_stats.stat (j) = nstat;
411 potion_max = 0; 323 potion_max = 0;
412 } 324 }
413 else if (i) 325 else if (i)
414 { 326 {
415 /* potion is useless - player has already hit the natural maximum */ 327 /* potion is useless - player has already hit the natural maximum */
… …
419 331
420 /* This section of code ups the characters normal stats also. I am not 332 /* This section of code ups the characters normal stats also. I am not
421 * sure if this is strictly necessary, being that fix_player probably 333 * sure if this is strictly necessary, being that fix_player probably
422 * recalculates this anyway. 334 * recalculates this anyway.
423 */ 335 */
424 for (j = 0; j < NUM_STATS; j++) 336 for (int j = 0; j < NUM_STATS; j++)
425 change_attr_value (&(op->stats), j, flag * get_attr_value (&(tmp->stats), j)); 337 change_attr_value (&op->stats, j, flag * tmp->stats.stat (j));
426 338
427 check_stat_bounds (&(op->stats)); 339 check_stat_bounds (&op->stats);
428 } /* end of potion handling code */ 340 } /* end of potion handling code */
429 } 341 }
430 342
431 /* reset attributes that fix_player doesn't reset since it doesn't search 343 /* reset attributes that update_stats doesn't reset since it doesn't search
432 * everything to set 344 * everything to set
433 */ 345 */
434 if (flag == -1) 346 if (flag == -1)
435 { 347 {
436 op->attacktype &= ~tmp->attacktype; 348 op->attacktype &= ~tmp->attacktype;
437 op->path_attuned &= ~tmp->path_attuned; 349 op->path_attuned &= ~tmp->path_attuned;
438 op->path_repelled &= ~tmp->path_repelled; 350 op->path_repelled &= ~tmp->path_repelled;
439 op->path_denied &= ~tmp->path_denied; 351 op->path_denied &= ~tmp->path_denied;
440 /* Presuming here that creatures only have move_type, 352 /* Presuming here that creatures only have move_type,
441 * and not the other move_ fields. 353 * and not the other move_ fields.
442 */ 354 */
443 op->move_type &= ~tmp->move_type; 355 op->move_type &= ~tmp->move_type;
444 } 356 }
445 357
446 /* call fix_player since op object could have whatever attribute due 358 /* call fix_player since op object could have whatever attribute due
447 * to multiple items. if fix_player always has to be called after 359 * to multiple items. if update_stats always has to be called after
448 * change_ability then might as well call it from here 360 * change_ability then might as well call it from here
449 */ 361 */
450 op->update_stats (); 362 op->update_stats ();
451 363
452 /* Fix player won't add the bows ability to the player, so don't 364 /* update_stats won't add the bows ability to the player, so don't
453 * print out message if this is a bow. 365 * print out message if this is a bow.
454 */ 366 */
455 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW) 367 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
456 { 368 {
457 success = 1; 369 success = 1;
458 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.");
459 } 371 }
460 372
461 if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE)) 373 if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
462 { 374 {
463 success = 1; 375 success = 1;
464 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.");
465 } 377 }
466 378
467 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])
468 { 380 {
469 success = 1; 381 success = 1;
470 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.");
471 } 383 }
472 384
473 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])
474 { 386 {
475 success = 1; 387 success = 1;
476 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.");
477 } 389 }
478 390
… …
480 * user has multiple items giving the same type appled like we 392 * user has multiple items giving the same type appled like we
481 * 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
482 * can be misleading (a little higher could be miscontrued from 394 * can be misleading (a little higher could be miscontrued from
483 * from fly high) 395 * from fly high)
484 */ 396 */
485 if (tmp->move_type && op->move_type != refop.move_type) 397 if (tmp->move_type && op->move_type != prev_move_type)
486 { 398 {
487 success = 1; 399 success = 1;
488 400
489 /* 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
490 * status doesn't make a difference if you are flying high 402 * status doesn't make a difference if you are flying high
491 */ 403 */
492 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))
493 { 405 {
494 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.");
495 } 407 }
496 408
497 if (tmp->move_type & MOVE_FLY_HIGH) 409 if (tmp->move_type & MOVE_FLY_HIGH)
498 { 410 {
499 /* double conditional - second case covers if you have move_fly_low - 411 /* double conditional - second case covers if you have move_fly_low -
500 * in that case, you don't actually land 412 * in that case, you don't actually land
501 */ 413 */
502 DIFF_MSG (flag, "You soar into the air air!.", 414 DIFF_MSG (flag, "You soar into the air!",
503 (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."));
504 } 416 }
417
505 if (tmp->move_type & MOVE_SWIM) 418 if (tmp->move_type & MOVE_SWIM)
506 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");
507
508 /* Changing move status may mean you are affected by things you weren't before */
509 check_move_on (op, op);
510 } 420 }
511 421
512 /* becoming UNDEAD... a special treatment for this flag. Only those not 422 /* becoming UNDEAD... a special treatment for this flag. Only those not
513 * originally undead may change their status 423 * originally undead may change their status
514 */ 424 */
515 if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 425 if (!op->arch->flag [FLAG_UNDEAD])
516 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 426 if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
517 { 427 {
518 success = 1; 428 success = 1;
519 if (flag > 0) 429 if (flag > 0)
520 { 430 {
521 op->race = "undead"; 431 op->race = "undead";
522 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!"); 432 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
523 } 433 }
524 else 434 else
525 { 435 {
526 op->race = op->arch->clone.race; 436 op->race = op->arch->race;
527 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 437 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
528 } 438 }
529 } 439 }
530 440
531 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 441 if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
532 { 442 {
533 success = 1; 443 success = 1;
534 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily."); 444 DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
535 } 445 }
536 446
537 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])
538 { 448 {
539 success = 1; 449 success = 1;
540 DIFF_MSG (flag, "You become transparent.", "You can see yourself."); 450 DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
541 } 451 }
542 452
543 /* 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
544 * vision 454 * vision
545 */ 455 */
546 if (QUERY_FLAG (tmp, FLAG_BLIND)) 456 if (tmp->flag [FLAG_BLIND])
547 { 457 {
548 success = 1; 458 success = 1;
549 if (flag > 0) 459 if (flag > 0)
550 { 460 {
551 if (QUERY_FLAG (op, FLAG_WIZ)) 461 if (op->flag [FLAG_WIZ])
552 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.");
553 else 463 else
554 { 464 {
555 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded."); 465 new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
556 SET_FLAG (op, FLAG_BLIND); 466 SET_FLAG (op, FLAG_BLIND);
… …
558 op->contr->do_los = 1; 468 op->contr->do_los = 1;
559 } 469 }
560 } 470 }
561 else 471 else
562 { 472 {
563 if (QUERY_FLAG (op, FLAG_WIZ)) 473 if (op->flag [FLAG_WIZ])
564 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.");
565 else 475 else
566 { 476 {
567 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns."); 477 new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
568 CLEAR_FLAG (op, FLAG_BLIND); 478 CLEAR_FLAG (op, FLAG_BLIND);
… …
570 op->contr->do_los = 1; 480 op->contr->do_los = 1;
571 } 481 }
572 } 482 }
573 } 483 }
574 484
575 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])
576 { 486 {
577 success = 1; 487 success = 1;
578 if (op->type == PLAYER) 488 if (op->type == PLAYER)
579 op->contr->do_los = 1; 489 op->contr->do_los = 1;
580 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.");
581 } 491 }
582 492
583 if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS)) 493 if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
584 { 494 {
585 success = 1; 495 success = 1;
586 if (flag > 0) 496 if (flag > 0)
587 { 497 {
588 if (QUERY_FLAG (op, FLAG_WIZ)) 498 if (op->flag [FLAG_WIZ])
589 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.");
590 else 500 else
591 { 501 {
592 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent."); 502 new_draw_info (NDI_UNIQUE, 0, op, "Everything becomes transparent.");
593 if (op->type == PLAYER) 503 if (op->type == PLAYER)
594 op->contr->do_los = 1; 504 op->contr->do_los = 1;
595 } 505 }
596 } 506 }
597 else 507 else
598 { 508 {
599 if (QUERY_FLAG (op, FLAG_WIZ)) 509 if (op->flag [FLAG_WIZ])
600 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.");
601 else 511 else
602 { 512 {
603 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.");
604 if (op->type == PLAYER) 514 if (op->type == PLAYER)
… …
637 success = 1; 547 success = 1;
638 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up."); 548 DIFF_MSG (flag * tmp->stats.food, "You feel your digestion slowing down.", "You feel your digestion speeding up.");
639 } 549 }
640 550
641 /* Messages for changed resistance */ 551 /* Messages for changed resistance */
642 for (i = 0; i < NROFATTACKS; i++) 552 for (int i = 0; i < NROFATTACKS; i++)
643 { 553 {
644 if (i == ATNR_PHYSICAL) 554 if (i == ATNR_PHYSICAL)
645 continue; /* Don't display about armour */ 555 continue; /* Don't display about armour */
646 556
647 if (op->resist[i] != refop.resist[i]) 557 if (op->resist [i] != prev_resist [i])
648 { 558 {
649 success = 1; 559 success = 1;
560
650 if (op->resist[i] > refop.resist[i]) 561 if (op->resist [i] > prev_resist [i])
651 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]); 562 sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
652 else 563 else
653 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]); 564 sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
654 565
655 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message); 566 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
656 } 567 }
657 } 568 }
658 569
659 if (!potion_max) 570 if (!potion_max)
660 {
661 for (j = 0; j < NUM_STATS; j++) 571 for (int j = 0; j < NUM_STATS; j++)
662 { 572 if (int i = tmp->stats.stat (j))
663 if ((i = get_attr_value (&(tmp->stats), j)) != 0)
664 { 573 {
665 success = 1; 574 success = 1;
666 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 575 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
667 } 576 }
668 }
669 }
670 577
671 return success; 578 return success;
672} 579}
673 580
674/* 581/*
675 * Stat draining by Vick 930307 582 * Stat draining by Vick 930307
676 * (Feeling evil, I made it work as well now. -Frank 8) 583 * (Feeling evil, I made it work as well now. -Frank 8)
677 */ 584 */
678
679void 585void
680object::drain_stat () 586object::drain_stat ()
681{ 587{
682 drain_specific_stat (rndm (NUM_STATS)); 588 drain_specific_stat (rndm (NUM_STATS));
683} 589}
… …
686object::drain_specific_stat (int deplete_stats) 592object::drain_specific_stat (int deplete_stats)
687{ 593{
688 object *tmp; 594 object *tmp;
689 archetype *at; 595 archetype *at;
690 596
691 at = archetype::find (ARCH_DEPLETION); 597 at = archetype::find (shstr_depletion);
692 if (!at) 598 if (!at)
693 { 599 {
694 LOG (llevError, "Couldn't find archetype depletion.\n"); 600 LOG (llevError, "Couldn't find archetype depletion.\n");
695 return; 601 return;
696 } 602 }
… …
698 { 604 {
699 tmp = present_arch_in_ob (at, this); 605 tmp = present_arch_in_ob (at, this);
700 606
701 if (!tmp) 607 if (!tmp)
702 { 608 {
703 tmp = arch_to_object (at); 609 tmp = at->instance ();
704 tmp = insert_ob_in_ob (tmp, this); 610 tmp = insert_ob_in_ob (tmp, this);
705 SET_FLAG (tmp, FLAG_APPLIED); 611 SET_FLAG (tmp, FLAG_APPLIED);
706 } 612 }
707 } 613 }
708 614
… …
716 * via an applied bad_luck object. 622 * via an applied bad_luck object.
717 */ 623 */
718void 624void
719object::change_luck (int value) 625object::change_luck (int value)
720{ 626{
721 archetype *at = archetype::find ("luck"); 627 archetype *at = archetype::find (shstr_luck);
722 if (!at) 628 if (!at)
723 LOG (llevError, "Couldn't find archetype luck.\n"); 629 LOG (llevError, "Couldn't find archetype luck.\n");
724 else 630 else
725 { 631 {
726 object *tmp = present_arch_in_ob (at, this); 632 object *tmp = present_arch_in_ob (at, this);
… …
728 if (!tmp) 634 if (!tmp)
729 { 635 {
730 if (!value) 636 if (!value)
731 return; 637 return;
732 638
733 tmp = arch_to_object (at); 639 tmp = at->instance ();
734 tmp = insert_ob_in_ob (tmp, this); 640 tmp = insert_ob_in_ob (tmp, this);
735 SET_FLAG (tmp, FLAG_APPLIED); 641 SET_FLAG (tmp, FLAG_APPLIED);
736 } 642 }
737 643
738 if (value) 644 if (value)
… …
772 * Subtracts stat-bonuses given by the class which the player has chosen. 678 * Subtracts stat-bonuses given by the class which the player has chosen.
773 */ 679 */
774void 680void
775object::remove_statbonus () 681object::remove_statbonus ()
776{ 682{
777 stats.Str -= arch->clone.stats.Str; 683 for (int i = 0; i < NUM_STATS; ++i)
778 stats.Dex -= arch->clone.stats.Dex; 684 {
779 stats.Con -= arch->clone.stats.Con; 685 sint8 v = arch->stats.stat (i);
780 stats.Wis -= arch->clone.stats.Wis; 686 stats.stat (i) -= v;
781 stats.Pow -= arch->clone.stats.Pow; 687 contr->orig_stats.stat (i) -= v;
782 stats.Cha -= arch->clone.stats.Cha; 688 }
783 stats.Int -= arch->clone.stats.Int;
784
785 contr->orig_stats.Str -= arch->clone.stats.Str;
786 contr->orig_stats.Dex -= arch->clone.stats.Dex;
787 contr->orig_stats.Con -= arch->clone.stats.Con;
788 contr->orig_stats.Wis -= arch->clone.stats.Wis;
789 contr->orig_stats.Pow -= arch->clone.stats.Pow;
790 contr->orig_stats.Cha -= arch->clone.stats.Cha;
791 contr->orig_stats.Int -= arch->clone.stats.Int;
792} 689}
793 690
794/* 691/*
795 * Adds stat-bonuses given by the class which the player has chosen. 692 * Adds stat-bonuses given by the class which the player has chosen.
796 */ 693 */
797void 694void
798object::add_statbonus () 695object::add_statbonus ()
799{ 696{
800 stats.Str += arch->clone.stats.Str; 697 for (int i = 0; i < NUM_STATS; ++i)
801 stats.Dex += arch->clone.stats.Dex; 698 {
802 stats.Con += arch->clone.stats.Con; 699 sint8 v = arch->stats.stat (i);
803 stats.Wis += arch->clone.stats.Wis; 700 stats.stat (i) += v;
804 stats.Pow += arch->clone.stats.Pow; 701 contr->orig_stats.stat (i) += v;
805 stats.Cha += arch->clone.stats.Cha; 702 }
806 stats.Int += arch->clone.stats.Int;
807
808 contr->orig_stats.Str += arch->clone.stats.Str;
809 contr->orig_stats.Dex += arch->clone.stats.Dex;
810 contr->orig_stats.Con += arch->clone.stats.Con;
811 contr->orig_stats.Wis += arch->clone.stats.Wis;
812 contr->orig_stats.Pow += arch->clone.stats.Pow;
813 contr->orig_stats.Cha += arch->clone.stats.Cha;
814 contr->orig_stats.Int += arch->clone.stats.Int;
815} 703}
704
705/* These are the items that currently can change digestion, regeneration,
706 * spell point recovery and mana point recovery. Seems sort of an arbitary
707 * list, but other items store other info into stats array.
708 */
709static struct digest_types : std::bitset<NUM_TYPES>
710{
711 digest_types ()
712 {
713 set (WEAPON);
714 set (BOW);
715 set (ARMOUR);
716 set (HELMET);
717 set (SHIELD);
718 set (RING);
719 set (BOOTS);
720 set (GLOVES);
721 set (AMULET);
722 set (GIRDLE);
723 set (BRACERS);
724 set (CLOAK);
725 set (DISEASE);
726 set (FORCE);
727 set (SKILL);
728 }
729} digest_types;
730
731static struct copy_flags : object::flags_t
732{
733 copy_flags ()
734 {
735 set (FLAG_LIFESAVE);
736 set (FLAG_REFL_SPELL);
737 set (FLAG_REFL_MISSILE);
738 set (FLAG_STEALTH);
739 set (FLAG_XRAYS);
740 set (FLAG_BLIND);
741 set (FLAG_SEE_IN_DARK);
742 }
743} copy_flags;
816 744
817/* 745/*
818 * Updates all abilities given by applied objects in the inventory 746 * Updates all abilities given by applied objects in the inventory
819 * of the given object. Note: This function works for both monsters 747 * of the given object. Note: This function works for both monsters
820 * and players; the "player" in the name is purely an archaic inheritance. 748 * and players; the "player" in the name is purely an archaic inheritance.
… …
825 * spell system split, grace points now added to system --peterm 753 * spell system split, grace points now added to system --peterm
826 */ 754 */
827void 755void
828object::update_stats () 756object::update_stats ()
829{ 757{
830 int i, j;
831 float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; 758 float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
832 int weapon_weight = 0, weapon_speed = 0; 759 int weapon_weight = 0, weapon_speed = 0;
833 int best_wc = 0, best_ac = 0, wc = 0, ac = 0; 760 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
834 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 761 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
835 object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp; 762 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
836 float old_speed = speed; 763 float old_speed = speed;
764 int stat_sum [NUM_STATS];
765
766 MoveType move_type; // we use change_move_type to change it, so use a local copy
837 767
838 /* First task is to clear all the values back to their original values */ 768 /* First task is to clear all the values back to their original values */
839 if (type == PLAYER) 769 if (type == PLAYER)
840 { 770 {
771 contr->delayed_update = false;
772
841 for (i = 0; i < NUM_STATS; i++) 773 for (int i = 0; i < NUM_STATS; i++)
842 set_attr_value (&(stats), i, get_attr_value (&(contr->orig_stats), i)); 774 stat_sum [i] = contr->orig_stats.stat (i);
843 775
844 if (settings.spell_encumbrance == TRUE) 776 if (settings.spell_encumbrance == TRUE)
845 contr->encumbrance = 0; 777 contr->encumbrance = 0;
846 778
847 attacktype = 0; 779 attacktype = 0;
… …
850 contr->gen_hp = 0; 782 contr->gen_hp = 0;
851 contr->gen_sp = 0; 783 contr->gen_sp = 0;
852 contr->gen_grace = 0; 784 contr->gen_grace = 0;
853 contr->gen_sp_armour = 10; 785 contr->gen_sp_armour = 10;
854 contr->item_power = 0; 786 contr->item_power = 0;
855
856 /* Don't clobber all the range_ values. range_golem otherwise
857 * gets reset for no good reason, and we don't want to reset
858 * range_magic (what spell is readied). These three below
859 * well get filled in based on what the player has equipped.
860 */
861 contr->ranges[range_bow] = 0;
862 contr->ranges[range_misc] = 0;
863 contr->ranges[range_skill] = 0;
864 } 787 }
865 788
866 memcpy (body_used, body_info, sizeof (body_info)); 789 for (int i = NUM_BODY_LOCATIONS; i--; )
790 slot[i].used = slot[i].info;
867 791
868 slaying = 0; 792 slaying = 0;
869 793
870 if (!QUERY_FLAG (this, FLAG_WIZ)) 794 if (!QUERY_FLAG (this, FLAG_WIZ))
871 { 795 {
… …
875 799
876 CLEAR_FLAG (this, FLAG_LIFESAVE); 800 CLEAR_FLAG (this, FLAG_LIFESAVE);
877 CLEAR_FLAG (this, FLAG_STEALTH); 801 CLEAR_FLAG (this, FLAG_STEALTH);
878 CLEAR_FLAG (this, FLAG_BLIND); 802 CLEAR_FLAG (this, FLAG_BLIND);
879 803
880 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 804 if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
881 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 805 if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
882 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 806 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
883 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 807 if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
884 808
885 path_attuned = arch->clone.path_attuned; 809 path_attuned = arch->path_attuned;
886 path_repelled = arch->clone.path_repelled; 810 path_repelled = arch->path_repelled;
887 path_denied = arch->clone.path_denied; 811 path_denied = arch->path_denied;
888 glow_radius = arch->clone.glow_radius; 812 glow_radius = arch->glow_radius;
889 move_type = arch->clone.move_type; 813 move_type = arch->move_type;
890 814
891 chosen_skill = NULL; 815 object *chosen_skill = 0;
892 816
893 /* initializing resistances from the values in player/monster's 817 /* initializing resistances from the values in player/monster's
894 * archetype clone 818 * archetype clone
895 */ 819 */
896 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 820 memcpy (&resist, &arch->resist, sizeof (resist));
897 821
898 for (i = 0; i < NROFATTACKS; i++) 822 for (int i = 0; i < NROFATTACKS; i++)
899 { 823 {
900 if (resist[i] > 0) 824 if (resist[i] > 0)
901 prot[i] = resist[i], vuln[i] = 0; 825 prot[i] = resist[i], vuln[i] = 0;
902 else 826 else
903 vuln[i] = -(resist[i]), prot[i] = 0; 827 vuln[i] = -resist[i], prot[i] = 0;
828
904 potion_resist[i] = 0; 829 potion_resist[i] = -1000;
905 } 830 }
906 831
907 wc = arch->clone.stats.wc; 832 wc = arch->stats.wc;
908 stats.dam = arch->clone.stats.dam; 833 stats.dam = arch->stats.dam;
909 834
910 /* for players which cannot use armour, they gain AC -1 per 3 levels, 835 /* for players which cannot use armour, they gain AC -1 per 3 levels,
911 * plus a small amount of physical resist, those poor suckers. ;) 836 * plus a small amount of physical resist, those poor suckers. ;)
912 * the fact that maxlevel is factored in could be considered sort of bogus - 837 * the fact that maxlevel is factored in could be considered sort of bogus -
913 * we should probably give them some bonus and cap it off - otherwise, 838 * we should probably give them some bonus and cap it off - otherwise,
914 * basically, if a server updates its max level, these playes may find 839 * basically, if a server updates its max level, these playes may find
915 * that their protection from physical goes down 840 * that their protection from physical goes down
916 */ 841 */
917 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 842 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
918 { 843 {
919 ac = MAX (-10, arch->clone.stats.ac - level / 3); 844 ac = max (-10, arch->stats.ac - level / 3);
920 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 845 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
921 } 846 }
922 else 847 else
923 ac = arch->clone.stats.ac; 848 ac = arch->stats.ac;
924 849
925 stats.luck = arch->clone.stats.luck; 850 stats.luck = arch->stats.luck;
926 speed = arch->clone.speed; 851 speed = arch->speed;
927 852
928 /* OK - we've reset most all the objects attributes to sane values. 853 /* OK - we've reset most all the objects attributes to sane values.
929 * now go through and make adjustments for what the player has equipped. 854 * now go through and make adjustments for what the player has equipped.
930 */ 855 */
931 for (tmp = inv; tmp; tmp = tmp->below) 856 for (tmp = inv; tmp; tmp = tmp->below)
932 { 857 {
933 /* See note in map.c:update_position about making this additive
934 * since light sources are never applied, need to put check here.
935 */
936 if (tmp->glow_radius > glow_radius)
937 glow_radius = tmp->glow_radius;
938
939 /* This happens because apply_potion calls change_abil with the potion 858 /* This happens because apply_potion calls change_abil with the potion
940 * applied so we can tell the player what changed. But change_abil 859 * applied so we can tell the player what changed. But change_abil
941 * then calls this function. 860 * then calls this function.
942 */ 861 */
943 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 862 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
944 continue; 863 continue;
864
865 glow_radius += tmp->glow_radius;
945 866
946 /* For some things, we don't care what is equipped */ 867 /* For some things, we don't care what is equipped */
947 if (tmp->type == SKILL) 868 if (tmp->type == SKILL)
948 { 869 {
949 /* Want to take the highest skill here. */ 870 /* Want to take the highest skill here. */
… …
962 else if (tmp->level > grace_obj->level) 883 else if (tmp->level > grace_obj->level)
963 grace_obj = tmp; 884 grace_obj = tmp;
964 } 885 }
965 } 886 }
966 887
967 /* Container objects are not meant to adjust a players, but other applied 888 /* Container objects are not meant to adjust players, but other applied
968 * objects need to make adjustments. 889 * objects need to make adjustments.
969 * This block should handle all player specific changes 890 * This block should handle all player specific changes
970 * The check for Praying is a bit of a hack - god given bonuses are put 891 * The check for Praying is a bit of a hack - god given bonuses are put
971 * in the praying skill, and the player should always get those. 892 * in the praying skill, and the player should always get those.
972 * It also means we need to put in additional checks for applied below, 893 * It also means we need to put in additional checks for applied below,
973 * because the skill shouldn't count against body positions being used 894 * because the skill shouldn't count against body positions being used
974 * up, etc. 895 * up, etc.
975 */ 896 */
976 if ((QUERY_FLAG (tmp, FLAG_APPLIED) 897 if ((tmp->flag [FLAG_APPLIED]
977 && tmp->type != CONTAINER 898 && tmp->type != CONTAINER
978 && tmp->type != CLOSE_CON) 899 && tmp->type != CLOSE_CON)
979 || (tmp->type == SKILL
980 && tmp->subtype == SK_PRAYING)) 900 || (tmp->type == SKILL && tmp->subtype == SK_PRAYING))
981 { 901 {
982 if (type == PLAYER) 902 if (type == PLAYER)
983 { 903 {
984 if (tmp->type == BOW) 904 contr->item_power += tmp->item_power;
985 contr->ranges[range_bow] = tmp;
986 905
987 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 906 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
988 contr->ranges[range_misc] = tmp; 907 if (tmp != current_weapon
908 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
909 && !tmp->flag [FLAG_CURSED]
910 && !tmp->flag [FLAG_DAMNED])
911 continue;
989 912
990 for (i = 0; i < NUM_STATS; i++) 913 for (int i = 0; i < NUM_STATS; i++)
991 change_attr_value (&stats, i, get_attr_value (&tmp->stats, i)); 914 stat_sum [i] += tmp->stats.stat (i);
992 915
993 /* these are the items that currently can change digestion, regeneration, 916 if (digest_types [tmp->type])
994 * spell point recovery and mana point recovery. Seems sort of an arbitary
995 * list, but other items store other info into stats array.
996 */
997 if ((tmp->type == WEAPON) || (tmp->type == BOW) ||
998 (tmp->type == ARMOUR) || (tmp->type == HELMET) ||
999 (tmp->type == SHIELD) || (tmp->type == RING) ||
1000 (tmp->type == BOOTS) || (tmp->type == GLOVES) ||
1001 (tmp->type == AMULET) || (tmp->type == GIRDLE) ||
1002 (tmp->type == BRACERS) || (tmp->type == CLOAK) ||
1003 (tmp->type == DISEASE) || (tmp->type == FORCE) ||
1004 (tmp->type == SKILL))
1005 { 917 {
1006 contr->digestion += tmp->stats.food; 918 contr->digestion += tmp->stats.food;
1007 contr->gen_hp += tmp->stats.hp; 919 contr->gen_hp += tmp->stats.hp;
920 if (tmp->type != BOW) // ugly exception for bows
1008 contr->gen_sp += tmp->stats.sp; 921 contr->gen_sp += tmp->stats.sp;
1009 contr->gen_grace += tmp->stats.grace; 922 contr->gen_grace += tmp->stats.grace;
1010 contr->gen_sp_armour += tmp->gen_sp_armour; 923 contr->gen_sp_armour += tmp->gen_sp_armour;
1011 contr->item_power += tmp->item_power;
1012 } 924 }
1013 } /* if this is a player */ 925 } /* if this is a player */
926 else
927 {
928 if (tmp->type == WEAPON)
929 current_weapon = tmp;
930 }
1014 931
1015 /* Update slots used for items */ 932 /* Update slots used for items */
1016 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 933 if (tmp->flag [FLAG_APPLIED])
1017 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 934 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1018 body_used[i] += tmp->body_info[i]; 935 slot[i].used += tmp->slot[i].info;
1019 936
1020 if (tmp->type == SYMPTOM) 937 if (tmp->type == SYMPTOM)
1021 {
1022 speed_reduce_from_disease = tmp->last_sp / 100.f; 938 min_it (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
1023 939
1024 if (speed_reduce_from_disease == 0)
1025 speed_reduce_from_disease = 1;
1026 }
1027
1028 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 940 /* Pos. and neg. protections are counted separate (-> pro/vuln).
1029 * (Negative protections are calculated exactly like positive.) 941 * (Negative protections are calculated exactly like positive.)
1030 * Resistance from potions are treated special as well. If there's 942 * Resistance from potions are treated special as well. If there's
1031 * more than one potion-effect, the bigger prot.-value is taken. 943 * more than one potion-effect, the bigger prot.-value is taken.
1032 */ 944 */
1033 if (tmp->type != POTION) 945 if (tmp->type == POTION_EFFECT)
1034 {
1035 for (i = 0; i < NROFATTACKS; i++) 946 for (int i = 0; i < NROFATTACKS; i++)
1036 {
1037 /* Potential for cursed potions, in which case we just can use
1038 * a straight MAX, as potion_resist is initialised to zero.
1039 */
1040 if (tmp->type == POTION_EFFECT)
1041 {
1042 if (potion_resist[i])
1043 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]);
1044 else
1045 potion_resist[i] = tmp->resist[i]; 947 max_it (potion_resist[i], tmp->resist[i]);
1046 } 948 else if (tmp->type != POTION)
949 for (int i = 0; i < NROFATTACKS; i++)
1047 else if (tmp->resist[i] > 0) 950 if (tmp->resist[i] > 0)
1048 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 951 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
1049 else if (tmp->resist[i] < 0) 952 else if (tmp->resist[i] < 0)
1050 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 953 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
1051 }
1052 }
1053 954
1054 /* There may be other things that should not adjust the attacktype */ 955 /* There may be other things that should not adjust the attacktype */
1055 if (tmp->type != SYMPTOM) 956 if (tmp->type != SYMPTOM)
957 {
1056 attacktype |= tmp->attacktype; 958 attacktype |= tmp->attacktype;
1057
1058 path_attuned |= tmp->path_attuned; 959 path_attuned |= tmp->path_attuned;
1059 path_repelled |= tmp->path_repelled; 960 path_repelled |= tmp->path_repelled;
1060 path_denied |= tmp->path_denied; 961 path_denied |= tmp->path_denied;
1061 move_type |= tmp->move_type; 962 move_type |= tmp->move_type;
1062 stats.luck += tmp->stats.luck; 963 stats.luck += tmp->stats.luck;
964 }
1063 965
1064 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 966 flag |= tmp->flag & copy_flags;
1065 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1066 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1067 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
1068 if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
1069 if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
1070 if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1071 967
1072 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD)) 968 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
1073 SET_FLAG (this, FLAG_UNDEAD); 969 SET_FLAG (this, FLAG_UNDEAD);
1074 970
1075 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 971 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1076 { 972 {
1077 SET_FLAG (this, FLAG_MAKE_INVIS); 973 SET_FLAG (this, FLAG_MAKE_INVIS);
… …
1081 if (tmp->stats.exp && tmp->type != SKILL) 977 if (tmp->stats.exp && tmp->type != SKILL)
1082 { 978 {
1083 if (tmp->stats.exp > 0) 979 if (tmp->stats.exp > 0)
1084 { 980 {
1085 added_speed += tmp->stats.exp / 3.f; 981 added_speed += tmp->stats.exp / 3.f;
1086 bonus_speed += 1.f + tmp->stats.exp / 3.f; 982 bonus_speed += tmp->stats.exp / 3.f + 1.f;
1087 } 983 }
1088 else 984 else
1089 added_speed += tmp->stats.exp; 985 added_speed += tmp->stats.exp;
1090 } 986 }
1091 987
1092 switch (tmp->type) 988 switch (tmp->type)
1093 { 989 {
1094 /* skills modifying the character -b.t. */ 990 /* skills modifying the character -b.t. */
1095 /* for all skills and skill granting objects */ 991 /* for all skills and skill granting objects */
1096 case SKILL: 992 case SKILL:
1097 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 993 {
994 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
1098 break; 995 break;
1099 996
1100 if (IS_COMBAT_SKILL (tmp->subtype))
1101 wc_obj = tmp;
1102
1103 if (chosen_skill) 997 if (chosen_skill)
998 {
1104 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 999 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
1000 &name, &chosen_skill->name, &tmp->name);
1105 1001
1002 tmp->flag [FLAG_APPLIED] = false;
1003 update_stats ();
1004 return;
1005 }
1006 else
1106 chosen_skill = tmp; 1007 chosen_skill = tmp;
1107 1008
1108 if (tmp->stats.dam > 0) 1009 if (tmp->stats.dam > 0)
1109 { /* skill is a 'weapon' */ 1010 { /* skill is a 'weapon' */
1110 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1011 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1111 weapon_speed = WEAPON_SPEED (tmp); 1012 weapon_speed = WEAPON_SPEED (tmp);
1112 1013
1113 if (weapon_speed < 0) 1014 if (weapon_speed < 0)
1114 weapon_speed = 0; 1015 weapon_speed = 0;
1115 1016
1116 weapon_weight = tmp->weight; 1017 weapon_weight = tmp->weight;
1117 stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9)); 1018 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1118 1019
1119 if (tmp->magic) 1020 if (tmp->magic)
1120 stats.dam += tmp->magic; 1021 stats.dam += tmp->magic;
1121 } 1022 }
1122 1023
1123 if (tmp->stats.wc) 1024 if (tmp->stats.wc)
1124 wc -= (tmp->stats.wc + tmp->magic); 1025 wc -= tmp->stats.wc + tmp->magic;
1125 1026
1126 if (tmp->slaying != NULL) 1027 if (tmp->slaying)
1127 slaying = tmp->slaying; 1028 slaying = tmp->slaying;
1128 1029
1129 if (tmp->stats.ac) 1030 if (tmp->stats.ac)
1130 ac -= (tmp->stats.ac + tmp->magic); 1031 ac -= tmp->stats.ac + tmp->magic;
1131 1032
1132 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1033 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1133 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1034 contr->encumbrance += 3 * tmp->weight / 1000;
1134
1135 if (type == PLAYER)
1136 contr->ranges[range_skill] = this;
1137
1138 break; 1035 }
1139 1036
1140 case SKILL_TOOL:
1141 if (chosen_skill)
1142 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1143
1144 chosen_skill = tmp;
1145
1146 if (type == PLAYER)
1147 contr->ranges[range_skill] = this;
1148 break; 1037 break;
1149 1038
1150 case SHIELD: 1039 case SHIELD:
1151 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1040 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1152 contr->encumbrance += (int) tmp->weight / 2000; 1041 contr->encumbrance += tmp->weight / 2000;
1042 //FALLTHROUGH
1153 case RING: 1043 case RING:
1154 case AMULET: 1044 case AMULET:
1155 case GIRDLE: 1045 case GIRDLE:
1156 case HELMET: 1046 case HELMET:
1157 case BOOTS: 1047 case BOOTS:
… …
1166 if (tmp->stats.ac) 1056 if (tmp->stats.ac)
1167 ac -= tmp->stats.ac + tmp->magic; 1057 ac -= tmp->stats.ac + tmp->magic;
1168 1058
1169 break; 1059 break;
1170 1060
1061 case WAND:
1062 case ROD:
1063 case HORN:
1064 case SKILL_TOOL:
1065 if (type != PLAYER)
1066 chosen_skill = find_skill_by_name (this, tmp->skill);
1067 break;
1068
1171 case BOW: 1069 case BOW:
1172 case WEAPON: 1070 case WEAPON:
1071 if (type != PLAYER || current_weapon == tmp)
1072 {
1073 chosen_skill = find_skill_by_name (this, tmp->skill);
1074
1173 wc -= tmp->stats.wc + tmp->magic; 1075 wc -= tmp->stats.wc + tmp->magic;
1174 1076
1175 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0) 1077 if (tmp->stats.ac && tmp->stats.ac + tmp->magic > 0)
1176 ac -= tmp->stats.ac + tmp->magic; 1078 ac -= tmp->stats.ac + tmp->magic;
1177 1079
1178 stats.dam += tmp->stats.dam + tmp->magic; 1080 stats.dam += tmp->stats.dam + tmp->magic;
1179 weapon_weight = tmp->weight; 1081 weapon_weight = tmp->weight;
1180 weapon_speed = ((int) WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2; 1082 weapon_speed = (WEAPON_SPEED (tmp) * 2 - tmp->magic) / 2;
1181 1083
1182 if (weapon_speed < 0) 1084 if (weapon_speed < 0)
1183 weapon_speed = 0; 1085 weapon_speed = 0;
1184 1086
1185 slaying = tmp->slaying; 1087 slaying = tmp->slaying;
1186 1088
1187 /* If there is desire that two handed weapons should do 1089 /* If there is desire that two handed weapons should do
1188 * extra strength damage, this is where the code should 1090 * extra strength damage, this is where the code should
1189 * go. 1091 * go.
1190 */ 1092 */
1191 1093
1192 current_weapon = tmp; 1094 if (type == PLAYER)
1193 if (type == PLAYER && settings.spell_encumbrance) 1095 if (settings.spell_encumbrance)
1194 contr->encumbrance += tmp->weight * 3 / 1000; 1096 contr->encumbrance += tmp->weight * 3 / 1000;
1097 }
1195 1098
1196 break; 1099 break;
1197 1100
1198 case ARMOUR: /* Only the best of these three are used: */ 1101 case ARMOUR: /* Only the best of these three are used: */
1199 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1102 if (settings.spell_encumbrance == TRUE && type == PLAYER)
… …
1222 else /* To nullify the below effect */ 1125 else /* To nullify the below effect */
1223 ac += tmp->stats.ac + tmp->magic; 1126 ac += tmp->stats.ac + tmp->magic;
1224 } 1127 }
1225 1128
1226 if (tmp->stats.wc) 1129 if (tmp->stats.wc)
1227 wc -= (tmp->stats.wc + tmp->magic); 1130 wc -= tmp->stats.wc + tmp->magic;
1228 1131
1229 if (tmp->stats.ac) 1132 if (tmp->stats.ac)
1230 ac -= (tmp->stats.ac + tmp->magic); 1133 ac -= tmp->stats.ac + tmp->magic;
1231 1134
1232 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max) 1135 if (ARMOUR_SPEED (tmp))
1233 max = ARMOUR_SPEED (tmp) / 10.f; 1136 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1234 1137
1235 break; 1138 break;
1236 } /* switch tmp->type */ 1139 } /* switch tmp->type */
1237 } /* item is equipped */ 1140 } /* item is equipped */
1238 } /* for loop of items */ 1141 } /* for loop of items */
1142
1143 if (type != PLAYER)
1144 this->chosen_skill = chosen_skill;
1145
1146 min_it (glow_radius, MAX_LIGHT_RADIUS);
1239 1147
1240 /* We've gone through all the objects the player has equipped. For many things, we 1148 /* We've gone through all the objects the player has equipped. For many things, we
1241 * have generated intermediate values which we now need to assign. 1149 * have generated intermediate values which we now need to assign.
1242 */ 1150 */
1243 1151
… …
1245 * If there is an uncursed potion in effect, granting more protection 1153 * If there is an uncursed potion in effect, granting more protection
1246 * than that, we take: 'total resistance = resistance from potion'. 1154 * than that, we take: 'total resistance = resistance from potion'.
1247 * If there is a cursed (and no uncursed) potion in effect, we take 1155 * If there is a cursed (and no uncursed) potion in effect, we take
1248 * 'total resistance = vulnerability from cursed potion'. 1156 * 'total resistance = vulnerability from cursed potion'.
1249 */ 1157 */
1250 for (i = 0; i < NROFATTACKS; i++) 1158 for (int i = 0; i < NROFATTACKS; i++)
1251 { 1159 {
1252 resist[i] = prot[i] - vuln[i]; 1160 resist[i] = prot[i] - vuln[i];
1253 1161
1254 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1162 if (potion_resist[i] != -1000
1163 && (potion_resist[i] < 0 || potion_resist[i] > resist[i]))
1255 resist[i] = potion_resist[i]; 1164 resist[i] = potion_resist[i];
1256 } 1165 }
1257 1166
1258 /* Figure out the players sp/mana/hp totals. */
1259 if (type == PLAYER) 1167 if (type == PLAYER)
1260 { 1168 {
1169 // clamp various player stats
1170 for (int i = 0; i < NUM_STATS; ++i)
1171 stats.stat (i) = stat_sum [i];
1172
1173 check_stat_bounds (&stats);
1174
1175 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1176
1177 /* Figure out the players sp/mana/hp totals. */
1261 int pl_level; 1178 int pl_level;
1262 1179
1263 check_stat_bounds (&(stats));
1264 pl_level = level;
1265
1266 if (pl_level < 1)
1267 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1180 pl_level = max (1, level); /* safety, we should always get 1 levels worth of hp! */
1268 1181
1269 /* You basically get half a con bonus/level. But we do take into account rounding, 1182 /* You basically get half a con bonus/level. But we do take into account rounding,
1270 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1183 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1271 */ 1184 */
1272 for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++) 1185 stats.maxhp = 0;
1186 for (int i = 1; i <= min (10, pl_level); i++)
1273 { 1187 {
1274 j = contr->levhp[i] + con_bonus[stats.Con] / 2; 1188 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1275 1189
1276 if (i % 2 && con_bonus[stats.Con] % 2) 1190 if (i % 2 && con_bonus[stats.Con] % 2)
1277 {
1278 if (con_bonus[stats.Con] > 0) 1191 if (con_bonus[stats.Con] > 0)
1279 j++; 1192 j++;
1280 else 1193 else
1281 j--; 1194 j--;
1282 }
1283 1195
1284 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */ 1196 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1285 } 1197 }
1286 1198
1287 for (i = 11; i <= level; i++) 1199 stats.maxhp += 2 * max (0, level - 10);
1288 stats.maxhp += 2;
1289 1200
1290 if (stats.hp > stats.maxhp) 1201 if (stats.hp > stats.maxhp)
1291 stats.hp = stats.maxhp; 1202 stats.hp = stats.maxhp;
1292 1203
1293 /* Sp gain is controlled by the level of the player's 1204 /* Sp gain is controlled by the level of the player's
… …
1306 1217
1307 if (mana_obj == this && type == PLAYER) 1218 if (mana_obj == this && type == PLAYER)
1308 stats.maxsp = 1; 1219 stats.maxsp = 1;
1309 else 1220 else
1310 { 1221 {
1311 sp_tmp = 0.f; 1222 float sp_tmp = 0.f;
1312 1223
1313 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1224 for (int i = 1; i <= min (10, mana_obj->level); i++)
1314 { 1225 {
1315 float stmp; 1226 float stmp;
1316 1227
1317 /* Got some extra bonus at first level */ 1228 /* Got some extra bonus at first level */
1318 if (i < 2) 1229 if (i < 2)
1319 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f; 1230 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1320 else 1231 else
1321 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f; 1232 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1322 1233
1323 if (stmp < 1.f)
1324 stmp = 1.f;
1325
1326 sp_tmp += stmp; 1234 sp_tmp += max (1.f, stmp);
1327 } 1235 }
1328 1236
1329 stats.maxsp = (sint16)sp_tmp; 1237 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1330
1331 for (i = 11; i <= mana_obj->level; i++)
1332 stats.maxsp += 2;
1333 } 1238 }
1239
1334 /* Characters can get their sp supercharged via rune of transferrance */ 1240 /* Characters can get their sp supercharged via rune of transferrance */
1335 if (stats.sp > stats.maxsp * 2) 1241 stats.sp = min (stats.sp, stats.maxsp * 2);
1336 stats.sp = stats.maxsp * 2;
1337 1242
1338 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */ 1243 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1339 if (!grace_obj || !grace_obj->level || type != PLAYER) 1244 if (!grace_obj || !grace_obj->level || type != PLAYER)
1340 grace_obj = this; 1245 grace_obj = this;
1341 1246
… …
1346 /* store grace in a float - this way, the divisions below don't create 1251 /* store grace in a float - this way, the divisions below don't create
1347 * big jumps when you go from level to level - with int's, it then 1252 * big jumps when you go from level to level - with int's, it then
1348 * becomes big jumps when the sums of the bonuses jump to the next 1253 * becomes big jumps when the sums of the bonuses jump to the next
1349 * step of 8 - with floats, even fractional ones are useful. 1254 * step of 8 - with floats, even fractional ones are useful.
1350 */ 1255 */
1351 sp_tmp = 0.f; 1256 float sp_tmp = 0.f;
1352 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1257
1258 for (int i = 1; i <= min (10, grace_obj->level); i++)
1353 { 1259 {
1354 float grace_tmp = 0.f; 1260 float grace_tmp = 0.f;
1355 1261
1356 /* Got some extra bonus at first level */ 1262 /* Got some extra bonus at first level */
1357 if (i < 2) 1263 if (i < 2)
1358 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f; 1264 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1359 else 1265 else
1360 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f; 1266 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1361 1267
1362 if (grace_tmp < 1.f)
1363 grace_tmp = 1.f;
1364
1365 sp_tmp += grace_tmp; 1268 sp_tmp += max (1.f, grace_tmp);
1366 } 1269 }
1367 1270
1368 stats.maxgrace = (sint16)sp_tmp;
1369
1370 /* two grace points per level after 11 */ 1271 /* two grace points per level after 10 */
1371 for (i = 11; i <= grace_obj->level; i++) 1272 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1372 stats.maxgrace += 2;
1373 } 1273 }
1274
1374 /* No limit on grace vs maxgrace */ 1275 /* No limit on grace vs maxgrace */
1375 1276
1376 if (contr->braced) 1277 if (contr->braced)
1377 { 1278 {
1378 ac += 2; 1279 ac += 2;
… …
1390 * improvement every level, now its fighterlevel/5. So 1291 * improvement every level, now its fighterlevel/5. So
1391 * we give the player a bonus here in wc and dam 1292 * we give the player a bonus here in wc and dam
1392 * to make up for the change. Note that I left the 1293 * to make up for the change. Note that I left the
1393 * monster bonus the same as before. -b.t. 1294 * monster bonus the same as before. -b.t.
1394 */ 1295 */
1296 object *wc_obj = chosen_skill;
1395 1297
1396 if (type == PLAYER && wc_obj && wc_obj->level > 1) 1298 if (contr && wc_obj && wc_obj->level > 1)
1397 { 1299 {
1398 wc -= wc_obj->level + thaco_bonus[stats.Str]; 1300 wc -= wc_obj->level + thaco_bonus[stats.Str];
1399 1301
1400 for (i = 1; i < wc_obj->level; i++) 1302 for (int i = 1; i < wc_obj->level; i++)
1401 { 1303 {
1402 /* addtional wc every 6 levels */ 1304 /* additional wc every 6 levels */
1403 if (!(i % 6)) 1305 if (!(i % 6))
1404 wc--; 1306 wc--;
1405 1307
1406 /* addtional dam every 4 levels. */ 1308 /* additional dam every 4 levels. */
1407 if (!(i % 4) && dam_bonus[stats.Str] >= 0) 1309 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1408 stats.dam += 1 + dam_bonus[stats.Str] / 5; 1310 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1409 } 1311 }
1410 } 1312 }
1411 else 1313 else
… …
1418 1320
1419 speed = 1.f + speed_bonus[stats.Dex]; 1321 speed = 1.f + speed_bonus[stats.Dex];
1420 1322
1421 if (settings.search_items && contr->search_str[0]) 1323 if (settings.search_items && contr->search_str[0])
1422 speed -= 1; 1324 speed -= 1;
1423
1424 if (attacktype == 0)
1425 attacktype = arch->clone.attacktype;
1426
1427 } /* End if player */ 1325 } /* End if player */
1428 1326
1429 if (added_speed >= 0) 1327 if (added_speed >= 0)
1430 speed += added_speed / 10.f; 1328 speed += added_speed / 10.f;
1431 else /* Something wrong here...: */ 1329 else /* Something wrong here...: */
1432 speed /= 1.f - added_speed; 1330 speed /= 1.f - added_speed;
1433 1331
1434 /* Max is determined by armour */ 1332 /* Max is determined by armour */
1435 if (speed > max) 1333 speed = min (speed, max_speed);
1436 speed = max;
1437 1334
1438 if (type == PLAYER) 1335 if (type == PLAYER)
1439 { 1336 {
1440 /* f is a number the represents the number of kg above (positive num) 1337 /* f is a number the represents the number of kg above (positive num)
1441 * or below (negative number) that the player is carrying. If above 1338 * or below (negative number) that the player is carrying. If above
1442 * weight limit, then player suffers a speed reduction based on how 1339 * weight limit, then player suffers a speed reduction based on how
1443 * much above he is, and what is max carry is 1340 * much above he is, and what is max carry is
1444 */ 1341 */
1445 f = (carrying / 1000) - max_carry[stats.Str]; 1342 float f = (carrying / 1000) - max_carry[stats.Str];
1446 if (f > 0) 1343 if (f > 0.f)
1447 speed = speed / (1.f + f / max_carry[stats.Str]); 1344 speed = speed / (1.f + f / max_carry[stats.Str]);
1448 } 1345 }
1449 1346
1450 speed += bonus_speed / 10.f; /* Not affected by limits */ 1347 speed += bonus_speed / 10.f; /* Not affected by limits */
1348 speed *= speed_reduce_from_disease;
1451 1349
1452 /* Put a lower limit on speed. Note with this speed, you move once every 1350 /* Put a lower limit on speed. Note with this speed, you move once every
1453 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1351 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1454 */ 1352 */
1455 speed = speed * speed_reduce_from_disease; 1353 max_it (speed, is_player () ? MIN_PLAYER_SPEED : MIN_ACTIVE_SPEED);
1456 1354
1457 if (speed < 0.01f && type == PLAYER) 1355 if (speed != old_speed)
1458 speed = 0.01f; 1356 set_speed (speed);
1459 1357
1460 if (type == PLAYER) 1358 if (type == PLAYER)
1461 { 1359 {
1462 /* (This formula was made by vidarl@ifi.uio.no) 1360 /* (This formula was made by vidarl@ifi.uio.no)
1463 * Note that we never used these values again - basically 1361 * Note that we never used these values again - basically
… …
1465 * that would just be a real pain to read. 1363 * that would just be a real pain to read.
1466 */ 1364 */
1467 float M = (max_carry[stats.Str] - 121) / 121.f; 1365 float M = (max_carry[stats.Str] - 121) / 121.f;
1468 float M2 = max_carry[stats.Str] / 100.f; 1366 float M2 = max_carry[stats.Str] / 100.f;
1469 float W = weapon_weight / 20000.f; 1367 float W = weapon_weight / 20000.f;
1470 float s = 2 - weapon_speed / 10.f; 1368 float s = (20 - weapon_speed) / 10.f;
1471 float D = (stats.Dex - 14) / 14.f; 1369 float D = (stats.Dex - 14) / 14.f;
1472 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f; 1370 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1473 1371
1474 K *= (4 + level) *1.2f / (6 + level); 1372 K *= (4 + level) * 1.2f / (6 + level);
1475 1373
1476 if (K <= 0.f) 1374 if (K <= 0.01f)
1477 K = 0.01f; 1375 K = 0.01f;
1478 1376
1479 float S = speed / (K * s); 1377 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1480
1481 contr->weapon_sp = S;
1482 } 1378 }
1483 1379
1484 /* I want to limit the power of small monsters with big weapons: */ 1380 /* I want to limit the power of small monsters with big weapons: */
1485 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) 1381 if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1486 stats.dam = arch->clone.stats.dam * 3; 1382 stats.dam = arch->stats.dam * 3;
1487 1383
1488 /* Prevent overflows of wc - best you can get is ABS(120) - this 1384 stats.wc = clamp (wc, MIN_WC, MAX_WC);
1489 * should be more than enough - remember, AC is also in 8 bits, 1385 stats.ac = clamp (ac, MIN_AC, MAX_AC);
1490 * so its value is the same.
1491 */
1492 if (wc > 120)
1493 wc = 120;
1494 else if (wc < -120)
1495 wc = -120;
1496
1497 stats.wc = wc;
1498
1499 if (ac > 120)
1500 ac = 120;
1501 else if (ac < -120)
1502 ac = -120;
1503
1504 stats.ac = ac;
1505 1386
1506 /* if for some reason the creature doesn't have any move type, 1387 /* if for some reason the creature doesn't have any move type,
1507 * give them walking as a default. 1388 * give them walking as a default.
1508 * The second case is a special case - to more closely mimic the 1389 * The second case is a special case - to more closely mimic the
1509 * old behaviour - if your flying, your not walking - just 1390 * old behaviour - if your flying, your not walking - just
… …
1512 if (move_type == 0) 1393 if (move_type == 0)
1513 move_type = MOVE_WALK; 1394 move_type = MOVE_WALK;
1514 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1395 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1515 move_type &= ~MOVE_WALK; 1396 move_type &= ~MOVE_WALK;
1516 1397
1517 if (speed != old_speed) 1398 // now apply the new move_type
1518 set_speed (speed); 1399 if (this->move_type != move_type)
1400 change_move_type (move_type);
1519 1401
1520 /* It is quite possible that a player's spell costing might have changed, 1402 /* It is quite possible that a player's spell costing might have changed,
1521 * so we will check that now. 1403 * so we will check that now.
1522 */ 1404 */
1523 if (type == PLAYER) 1405 if (is_player ())
1524 { 1406 contr->update_spells ();
1525 esrv_update_stats (contr);
1526 esrv_update_spells (contr);
1527 }
1528 1407
1529 // update the mapspace, if we are on a map 1408 // update the mapspace, if we are on a map
1530 if (!flag [FLAG_REMOVED] && map) 1409 if (!flag [FLAG_REMOVED] && map)
1531 map->at (x, y).flags_ = 0; 1410 map->at (x, y).flags_ = 0;
1411}
1412
1413void
1414object::set_glow_radius (sint8 rad)
1415{
1416 glow_radius = rad;
1417
1418 if (is_on_map ())
1419 update_all_los (map, x, y);
1420 else if (object *env = outer_env ())
1421 {
1422 env->update_stats ();
1423
1424 if (env->is_on_map ())
1425 update_all_los (env->map, env->x, env->y);
1426 }
1532} 1427}
1533 1428
1534/* 1429/*
1535 * Returns true if the given player is a legal class. 1430 * Returns true if the given player is a legal class.
1536 * The function to add and remove class-bonuses to the stats doesn't 1431 * The function to add and remove class-bonuses to the stats doesn't
… …
1552 1447
1553/* 1448/*
1554 * set the new dragon name after gaining levels or 1449 * set the new dragon name after gaining levels or
1555 * changing ability focus (later this can be extended to 1450 * changing ability focus (later this can be extended to
1556 * eventually change the player's face and animation) 1451 * eventually change the player's face and animation)
1557 *
1558 * Note that the title is written to 'own_title' in the
1559 * player struct. This should be changed to 'ext_title'
1560 * as soon as clients support this!
1561 * Please, anyone, write support for 'ext_title'.
1562 */ 1452 */
1563void 1453void
1564set_dragon_name (object *pl, const object *abil, const object *skin) 1454set_dragon_name (object *pl, const object *abil, const object *skin)
1565{ 1455{
1566 int atnr = -1; /* attacknumber of highest level */ 1456 int atnr = -1; /* attacknumber of highest level */
… …
1584 /* now if there are equals at highest level, pick the one with focus, 1474 /* now if there are equals at highest level, pick the one with focus,
1585 or else at random */ 1475 or else at random */
1586 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1476 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1587 atnr = abil->stats.exp; 1477 atnr = abil->stats.exp;
1588 1478
1589 level = (int) (level / 5.);
1590
1591 /* now set the new title */ 1479 /* now set the new title */
1592 if (pl->contr != NULL)
1593 {
1594 if (level == 0)
1595 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1480 if (level < 25) sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1596 else if (level == 1)
1597 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1481 else if (level < 50) sprintf (pl->contr->title, "%s wyrm" , attacks[atnr]);
1598 else if (level == 2)
1599 sprintf (pl->contr->title, "%s wyvern", attacks[atnr]); 1482 else if (level < 75) sprintf (pl->contr->title, "%s wyvern" , attacks[atnr]);
1600 else if (level == 3)
1601 sprintf (pl->contr->title, "%s dragon", attacks[atnr]); 1483 else if (level < 100) sprintf (pl->contr->title, "%s dragon" , attacks[atnr]);
1602 else 1484 else
1603 { 1485 {
1604 /* special titles for extra high resistance! */ 1486 /* special titles for extra high resistance! */
1605 if (skin->resist[atnr] > 80)
1606 sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]); 1487 if (skin->resist[atnr] > 80) sprintf (pl->contr->title, "legendary %s dragon", attacks[atnr]);
1607 else if (skin->resist[atnr] > 50)
1608 sprintf (pl->contr->title, "ancient %s dragon", attacks[atnr]); 1488 else if (skin->resist[atnr] > 50) sprintf (pl->contr->title, "ancient %s dragon" , attacks[atnr]);
1609 else
1610 sprintf (pl->contr->title, "big %s dragon", attacks[atnr]); 1489 else sprintf (pl->contr->title, "big %s dragon" , attacks[atnr]);
1611 }
1612 } 1490 }
1613 1491
1614 strcpy (pl->contr->own_title, ""); 1492 strcpy (pl->contr->own_title, "");
1615} 1493}
1616 1494
1617/* 1495/*
1618 * This function is called when a dragon-player gains 1496 * This function is called when a dragon-player gains
1619 * an overall level. Here, the dragon might gain new abilities 1497 * an overall level. Here, the dragon might gain new abilities
1620 * or change the ability-focus. 1498 * or change the ability-focus.
1621 */ 1499 */
1622void 1500static void
1623dragon_level_gain (object *who) 1501dragon_level_gain (object *who)
1624{ 1502{
1625 object *abil = NULL; /* pointer to dragon ability force */ 1503 object *abil = NULL; /* pointer to dragon ability force */
1626 object *skin = NULL; /* pointer to dragon skin force */ 1504 object *skin = NULL; /* pointer to dragon skin force */
1627 object *tmp = NULL; /* tmp. object */ 1505 object *tmp = NULL; /* tmp. object */
1628 char buf[MAX_BUF]; /* tmp. string buffer */ 1506 char buf[MAX_BUF]; /* tmp. string buffer */
1629 1507
1630 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1508 /* now grab the 'dragon_ability'-forces from the player's inventory */
1631 shstr_cmp dragon_ability_force ("dragon_ability_force");
1632 shstr_cmp dragon_skin_force ("dragon_skin_force");
1633
1634 for (tmp = who->inv; tmp; tmp = tmp->below) 1509 for (tmp = who->inv; tmp; tmp = tmp->below)
1635 if (tmp->type == FORCE) 1510 if (tmp->type == FORCE)
1636 if (tmp->arch->name == dragon_ability_force) 1511 if (tmp->arch->archname == shstr_dragon_ability_force)
1637 abil = tmp; 1512 abil = tmp;
1638 else if (tmp->arch->name == dragon_skin_force) 1513 else if (tmp->arch->archname == shstr_dragon_skin_force)
1639 skin = tmp; 1514 skin = tmp;
1640 1515
1641 /* if the force is missing -> bail out */ 1516 /* if the force is missing -> bail out */
1642 if (abil == NULL) 1517 if (abil == NULL)
1643 return; 1518 return;
… …
1686 object *skill_obj; 1561 object *skill_obj;
1687 1562
1688 skill_obj = get_archetype_by_skill_name (skill_name, SKILL); 1563 skill_obj = get_archetype_by_skill_name (skill_name, SKILL);
1689 if (!skill_obj) 1564 if (!skill_obj)
1690 { 1565 {
1691 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1566 LOG (llevError, "give_skill_by_name: couldn't find skill %s\n", skill_name);
1692 return NULL; 1567 return NULL;
1693 } 1568 }
1569
1694 /* clear the flag - exp goes into this bucket, but player 1570 /* clear the flag - exp goes into this bucket, but player
1695 * still doesn't know it. 1571 * still doesn't know it.
1696 */ 1572 */
1697 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1573 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1698 skill_obj->stats.exp = 0; 1574 skill_obj->stats.exp = 0;
1699 skill_obj->level = 1; 1575 skill_obj->level = 1;
1700 insert_ob_in_ob (skill_obj, op); 1576 op->insert (skill_obj);
1701 1577
1702 if (op->contr) 1578 if (player *pl = op->contr)
1703 { 1579 pl->link_skills ();
1704 op->contr->last_skill_ob [skill_obj->subtype] = skill_obj;
1705 if (op->contr->ns)
1706 op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1707 }
1708 1580
1709 return skill_obj; 1581 return skill_obj;
1710} 1582}
1711
1712 1583
1713/* player_lvl_adj() - for the new exp system. we are concerned with 1584/* player_lvl_adj() - for the new exp system. we are concerned with
1714 * whether the player gets more hp, sp and new levels. 1585 * whether the player gets more hp, sp and new levels.
1715 * Note this this function should only be called for players. Monstes 1586 * Note this this function should only be called for players. Monstes
1716 * don't really gain levels 1587 * don't really gain levels
… …
1719 */ 1590 */
1720void 1591void
1721player_lvl_adj (object *who, object *op) 1592player_lvl_adj (object *who, object *op)
1722{ 1593{
1723 char buf[MAX_BUF]; 1594 char buf[MAX_BUF];
1595 bool changed = false;
1724 1596
1725 if (!op) /* when rolling stats */ 1597 if (!op) /* when rolling stats */
1726 op = who; 1598 op = who;
1727 1599
1728 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1600 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1729 { 1601 {
1602 changed = true;
1603
1730 op->level++; 1604 op->level++;
1731 1605
1732 if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1606 if (op && op == who && op->stats.exp > 1 && who->is_dragon ())
1733 dragon_level_gain (who); 1607 dragon_level_gain (who);
1734 1608
1735 /* Only roll these if it is the player (who) that gained the level */ 1609 /* Only roll these if it is the player (who) that gained the level */
1736 if (op == who && (who->level < 11) && who->type == PLAYER) 1610 if (op == who && (who->level < 11) && who->type == PLAYER)
1737 { 1611 {
1738 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1612 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1739 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1613 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1740 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1614 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1741 } 1615 }
1742 1616
1743 who->update_stats ();
1744 if (op->level > 1) 1617 if (op->level > 1)
1745 { 1618 {
1746 if (op->type != PLAYER) 1619 if (op->type != PLAYER)
1620 {
1621 who->contr->play_sound (sound_find ("skill_up"));
1747 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1622 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1623 }
1748 else 1624 else
1625 {
1626 who->contr->play_sound (sound_find ("level_up"));
1749 sprintf (buf, "You are now level %d.", op->level); 1627 sprintf (buf, "You are now level %d.", op->level);
1628 }
1629
1750 if (who) 1630 if (who)
1751 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1631 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1752 } 1632 }
1753 player_lvl_adj (who, op); /* To increase more levels */
1754 } 1633 }
1634
1755 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1635 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1756 { 1636 {
1637 changed = true;
1638
1757 op->level--; 1639 op->level--;
1758 who->update_stats (); 1640
1759 if (op->type != PLAYER) 1641 if (op->type != PLAYER)
1760 { 1642 {
1761 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1643 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1762 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1644 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1763 } 1645 }
1764 player_lvl_adj (who, op); /* To decrease more levels */
1765 } 1646 }
1766 1647
1767 /* check if the spell data has changed */ 1648 if (changed)
1768 esrv_update_stats (who->contr); 1649 who->update_stats (); // should cause esrv_update_stats and esrv_update_spells
1769 esrv_update_spells (who->contr);
1770} 1650}
1771 1651
1772/* 1652/*
1773 * Returns how much experience is needed for a player to become 1653 * Returns how much experience is needed for a player to become
1774 * the given level. level should really never exceed max_level 1654 * the given level. level should really never exceed max_level
… …
1818 * flag is what to do if the player doesn't have the skill: 1698 * flag is what to do if the player doesn't have the skill:
1819 */ 1699 */
1820static void 1700static void
1821add_player_exp (object *op, sint64 exp, const char *skill_name, int flag) 1701add_player_exp (object *op, sint64 exp, const char *skill_name, int flag)
1822{ 1702{
1823 object *skill_obj = NULL; 1703 object *skill_obj;
1824 sint64 limit, exp_to_add; 1704 sint64 limit, exp_to_add;
1825 int i; 1705 int i;
1826 1706
1827 /* prevents some forms of abuse. */ 1707 /* prevents some forms of abuse. */
1828 if (op->contr->braced) 1708 if (op->contr->braced)
1829 exp = exp / 5; 1709 exp /= 5;
1830 1710
1831 /* Try to find the matching skill. 1711 /* Try to find the matching skill.
1832 * We do a shortcut/time saving mechanism first - see if it matches 1712 * We do a shortcut/time saving mechanism first - see if it matches
1833 * chosen_skill. This means we don't need to search through 1713 * chosen_skill. This means we don't need to search through
1834 * the players inventory. 1714 * the players inventory.
1835 */ 1715 */
1716 skill_obj = 0;
1717
1836 if (skill_name) 1718 if (skill_name)
1837 { 1719 {
1838 if (op->chosen_skill && op->chosen_skill->type == SKILL && !strcmp (skill_name, op->chosen_skill->skill)) 1720 skill_obj = op->contr->find_skill (skill_name);
1839 skill_obj = op->chosen_skill;
1840 else
1841 {
1842 for (i = 0; i < NUM_SKILLS; i++)
1843 if (op->contr->last_skill_ob[i] && !strcmp (op->contr->last_skill_ob[i]->skill, skill_name))
1844 {
1845 skill_obj = op->contr->last_skill_ob[i];
1846 break;
1847 }
1848 1721
1849 /* Player doesn't have the skill. Check to see what to do, and give 1722 /* Player doesn't have the skill. Check to see what to do, and give
1850 * it to the player if necessary 1723 * it to the player if necessary
1851 */ 1724 */
1852 if (!skill_obj) 1725 if (!skill_obj)
1853 { 1726 {
1854 if (flag == SK_EXP_NONE) 1727 if (flag == SK_EXP_NONE)
1855 return; 1728 return;
1729
1856 else if (flag == SK_EXP_ADD_SKILL) 1730 if (flag == SK_EXP_ADD_SKILL)
1857 give_skill_by_name (op, skill_name); 1731 skill_obj = give_skill_by_name (op, skill_name);
1858 }
1859 } 1732 }
1860 } 1733 }
1861 1734
1862 if (flag != SK_EXP_SKILL_ONLY) 1735 if (flag != SK_EXP_SKILL_ONLY)
1863 { 1736 {
… …
1896 player_lvl_adj (op, skill_obj); 1769 player_lvl_adj (op, skill_obj);
1897 } 1770 }
1898} 1771}
1899 1772
1900/* This function checks to make sure that object 'op' can 1773/* This function checks to make sure that object 'op' can
1901 * lost 'exp' experience. It returns the amount of exp 1774 * lose 'exp' experience. It returns the amount of exp
1902 * object 'op' can in fact lose - it basically makes 1775 * object 'op' can in fact lose - it basically makes
1903 * adjustments based on permanent exp and the like. 1776 * adjustments based on permanent exp and the like.
1904 * This function should always be used for losing experience - 1777 * This function should always be used for losing experience -
1905 * the 'exp' value passed should be positive - this is the 1778 * the 'exp' value passed should be positive - this is the
1906 * amount that should get subtract from the player. 1779 * amount that should get subtract from the player.
1907 */ 1780 */
1908sint64 1781static sint64
1909check_exp_loss (const object *op, sint64 exp) 1782check_exp_loss (const object *op, sint64 exp)
1910{ 1783{
1911 sint64 del_exp; 1784 sint64 del_exp;
1912 1785
1913 if (exp > op->stats.exp) 1786 if (exp > op->stats.exp)
1914 exp = op->stats.exp; 1787 exp = op->stats.exp;
1788
1915 if (settings.permanent_exp_ratio) 1789 if (settings.permanent_exp_ratio)
1916 { 1790 {
1917 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO); 1791 del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
1792
1918 if (del_exp < 0) 1793 if (del_exp < 0)
1919 del_exp = 0; 1794 del_exp = 0;
1795
1920 if (exp > del_exp) 1796 if (exp > del_exp)
1921 exp = del_exp; 1797 exp = del_exp;
1922 } 1798 }
1799
1923 return exp; 1800 return exp;
1924} 1801}
1925 1802
1926sint64 1803sint64
1927check_exp_adjust (const object *op, sint64 exp) 1804check_exp_adjust (const object *op, sint64 exp)
1928{ 1805{
1929 if (exp < 0) 1806 if (exp < 0)
1930 return check_exp_loss (op, exp); 1807 return check_exp_loss (op, exp);
1931 else 1808 else
1932 return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp); 1809 return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
1933} 1810}
1934
1935 1811
1936/* Subtracts experience from player. 1812/* Subtracts experience from player.
1937 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we 1813 * if skill is set and flag == SK_SUBTRACT_SKILL_EXP, then we
1938 * only subtract from the matching skill. Otherwise, 1814 * only subtract from the matching skill. Otherwise,
1939 * this subtracts a portion from all 1815 * this subtracts a portion from all
… …
1953 sint64 del_exp; 1829 sint64 del_exp;
1954 1830
1955 for (tmp = op->inv; tmp; tmp = tmp->below) 1831 for (tmp = op->inv; tmp; tmp = tmp->below)
1956 if (tmp->type == SKILL && tmp->stats.exp) 1832 if (tmp->type == SKILL && tmp->stats.exp)
1957 { 1833 {
1958 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (tmp->skill, skill)) 1834 if (flag == SK_SUBTRACT_SKILL_EXP && skill && !strcmp (&tmp->skill, skill))
1959 { 1835 {
1960 del_exp = check_exp_loss (tmp, exp); 1836 del_exp = check_exp_loss (tmp, exp);
1961 tmp->stats.exp -= del_exp; 1837 tmp->stats.exp -= del_exp;
1962 player_lvl_adj (op, tmp); 1838 player_lvl_adj (op, tmp);
1963 } 1839 }
… …
2051 * amount of permenent experience, whichever gives the lowest loss. 1927 * amount of permenent experience, whichever gives the lowest loss.
2052 */ 1928 */
2053void 1929void
2054apply_death_exp_penalty (object *op) 1930apply_death_exp_penalty (object *op)
2055{ 1931{
2056 object *tmp;
2057 sint64 loss; 1932 sint64 loss;
2058 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */ 1933 sint64 percentage_loss; /* defined by the setting 'death_penalty_percent' */
2059 sint64 level_loss; /* defined by the setting 'death_penalty_levels */ 1934 sint64 level_loss; /* defined by the setting 'death_penalty_levels */
2060 1935
2061 for (tmp = op->inv; tmp; tmp = tmp->below) 1936 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2062 if (tmp->type == SKILL && tmp->stats.exp) 1937 if (tmp->type == SKILL && tmp->stats.exp)
2063 { 1938 {
2064
2065 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100; 1939 percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
2066 level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)]; 1940 level_loss = tmp->stats.exp - levels [max (0, tmp->level - settings.death_penalty_level)];
2067 1941
2068 /* With the revised exp system, you can get cases where 1942 /* With the revised exp system, you can get cases where
2069 * losing several levels would still require that you have more 1943 * losing several levels would still require that you have more
2070 * exp than you currently have - this is true if the levels 1944 * exp than you currently have - this is true if the levels
2071 * tables is a lot harder. 1945 * tables is a lot harder.
2072 */ 1946 */
2073 if (level_loss < 0) 1947 if (level_loss < 0)
2074 level_loss = 0; 1948 level_loss = 0;
2075 1949
2076 loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss)); 1950 loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
2077 1951
2078 tmp->stats.exp -= loss; 1952 tmp->stats.exp -= loss;
2079 player_lvl_adj (op, tmp); 1953 player_lvl_adj (op, tmp);
2080 } 1954 }
2081 1955
2082 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1956 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2083 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1957 level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
1958
2084 if (level_loss < 0) 1959 if (level_loss < 0)
2085 level_loss = 0; 1960 level_loss = 0;
1961
2086 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1962 loss = check_exp_loss (op, min (level_loss, percentage_loss));
2087 1963
2088 op->stats.exp -= loss; 1964 op->stats.exp -= loss;
2089 player_lvl_adj (op, NULL); 1965 player_lvl_adj (op, NULL);
2090} 1966}
2091 1967

Diff Legend

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