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.50 by root, Sat May 12 18:14:47 2007 UTC vs.
Revision 1.82 by root, Mon Apr 21 23:35:24 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h>
27 25
28/* Handy little macro that adds exp and keeps it within bounds. Since 26/* 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 27 * 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 28 * with exptotal wrapping. exptotal is typically op->exp, or op->perm_exp
31 */ 29 */
… …
242change_attr_value (living *stats, int attr, sint8 value) 240change_attr_value (living *stats, int attr, sint8 value)
243{ 241{
244 stats->stat (attr) += value; 242 stats->stat (attr) += value;
245} 243}
246 244
247sint8 &
248living::stat (int index)
249{
250 switch (index)
251 {
252 case STR: return Str;
253 case DEX: return Dex;
254 case CON: return Con;
255 case INT: return Int;
256 case WIS: return Wis;
257 case POW: return Pow;
258 case CHA: return Cha;
259 }
260
261 LOG (llevError | logBacktrace, "living.stat() called with out-of-range stat index");
262 static sint8 dummy;
263 return dummy;
264}
265
266sint8
267living::stat (int index) const
268{
269 switch (index)
270 {
271 case STR: return Str;
272 case DEX: return Dex;
273 case CON: return Con;
274 case INT: return Int;
275 case WIS: return Wis;
276 case POW: return Pow;
277 case CHA: return Cha;
278 }
279
280 LOG (llevError | logBacktrace, "living.stat() called with out-of-range stat index");
281 static sint8 dummy;
282 return dummy;
283}
284
285/* 245/*
286 * Ensures that all stats (str/dex/con/wis/cha/int) are within the 246 * Ensures that all stats (str/dex/con/wis/cha/int) are within the
287 * 1-30 stat limit. 247 * 1-30 stat limit.
288 */ 248 */
289void 249void
… …
319 * that gives them that ability. 279 * that gives them that ability.
320 */ 280 */
321int 281int
322change_abil (object *op, object *tmp) 282change_abil (object *op, object *tmp)
323{ 283{
324 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, i, j, success = 0; 284 int flag = QUERY_FLAG (tmp, FLAG_APPLIED) ? 1 : -1, success = 0;
325 char message[MAX_BUF]; 285 char message[MAX_BUF];
326 int potion_max = 0; 286 int potion_max = 0;
327 287
328 /* remember what object was like before it was changed. note that 288 /* remember what object was like before it was changed. note that
329 * refop is a local copy of op only to be used for detecting changes 289 * refop is a local copy of op only to be used for detecting changes
… …
334 if (op->type == PLAYER) 294 if (op->type == PLAYER)
335 { 295 {
336 if (tmp->type == POTION) 296 if (tmp->type == POTION)
337 { 297 {
338 potion_max = 1; 298 potion_max = 1;
339 for (j = 0; j < NUM_STATS; j++) 299 for (int j = 0; j < NUM_STATS; j++)
340 { 300 {
341 int nstat, ostat;
342
343 ostat = op->contr->orig_stats.stat (j); 301 int ostat = op->contr->orig_stats.stat (j);
344 i = tmp->stats.stat (j); 302 int i = tmp->stats.stat (j);
345 303
346 /* nstat is what the stat will be after use of the potion */ 304 /* nstat is what the stat will be after use of the potion */
347 nstat = flag * i + ostat; 305 int nstat = flag * i + ostat;
348 306
349 /* Do some bounds checking. While I don't think any 307 /* Do some bounds checking. While I don't think any
350 * potions do so right now, there is the potential for potions 308 * potions do so right now, there is the potential for potions
351 * that adjust that stat by more than one point, so we need 309 * that adjust that stat by more than one point, so we need
352 * to allow for that. 310 * to allow for that.
353 */ 311 */
354 if (nstat < 1 && i * flag < 0) 312 if (nstat < 1 && i * flag < 0)
355 nstat = 1; 313 nstat = 1;
356 else if (nstat > 20 + op->arch->clone.stats.stat (j)) 314 else if (nstat > 20 + op->arch->stats.stat (j))
357 nstat = 20 + op->arch->clone.stats.stat (j); 315 nstat = 20 + op->arch->stats.stat (j);
358 316
359 if (nstat != ostat) 317 if (nstat != ostat)
360 { 318 {
361 op->contr->orig_stats.stat (j) = nstat; 319 op->contr->orig_stats.stat (j) = nstat;
362 potion_max = 0; 320 potion_max = 0;
… …
370 328
371 /* This section of code ups the characters normal stats also. I am not 329 /* This section of code ups the characters normal stats also. I am not
372 * sure if this is strictly necessary, being that fix_player probably 330 * sure if this is strictly necessary, being that fix_player probably
373 * recalculates this anyway. 331 * recalculates this anyway.
374 */ 332 */
375 for (j = 0; j < NUM_STATS; j++) 333 for (int j = 0; j < NUM_STATS; j++)
376 change_attr_value (&op->stats, j, flag * tmp->stats.stat (j)); 334 change_attr_value (&op->stats, j, flag * tmp->stats.stat (j));
377 335
378 check_stat_bounds (&op->stats); 336 check_stat_bounds (&op->stats);
379 } /* end of potion handling code */ 337 } /* end of potion handling code */
380 } 338 }
381 339
382 /* reset attributes that fix_player doesn't reset since it doesn't search 340 /* reset attributes that update_stats doesn't reset since it doesn't search
383 * everything to set 341 * everything to set
384 */ 342 */
385 if (flag == -1) 343 if (flag == -1)
386 { 344 {
387 op->attacktype &= ~tmp->attacktype; 345 op->attacktype &= ~tmp->attacktype;
… …
393 */ 351 */
394 op->move_type &= ~tmp->move_type; 352 op->move_type &= ~tmp->move_type;
395 } 353 }
396 354
397 /* call fix_player since op object could have whatever attribute due 355 /* call fix_player since op object could have whatever attribute due
398 * to multiple items. if fix_player always has to be called after 356 * to multiple items. if update_stats always has to be called after
399 * change_ability then might as well call it from here 357 * change_ability then might as well call it from here
400 */ 358 */
401 op->update_stats (); 359 op->update_stats ();
402 360
403 /* Fix player won't add the bows ability to the player, so don't 361 /* update_stats won't add the bows ability to the player, so don't
404 * print out message if this is a bow. 362 * print out message if this is a bow.
405 */ 363 */
406 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW) 364 if (tmp->attacktype & AT_CONFUSION && tmp->type != BOW)
407 { 365 {
408 success = 1; 366 success = 1;
… …
448 if (tmp->move_type & MOVE_FLY_HIGH) 406 if (tmp->move_type & MOVE_FLY_HIGH)
449 { 407 {
450 /* double conditional - second case covers if you have move_fly_low - 408 /* double conditional - second case covers if you have move_fly_low -
451 * in that case, you don't actually land 409 * in that case, you don't actually land
452 */ 410 */
453 DIFF_MSG (flag, "You soar into the air air!.", 411 DIFF_MSG (flag, "You soar into the air!",
454 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground.")); 412 (op->move_type & MOVE_FLY_LOW ? "You fly lower in the air" : "You float down to the ground."));
455 } 413 }
456 414
457 if (tmp->move_type & MOVE_SWIM) 415 if (tmp->move_type & MOVE_SWIM)
458 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming"); 416 DIFF_MSG (flag, "You feel ready for a swim", "You no longer feel like swimming");
… …
462 } 420 }
463 421
464 /* becoming UNDEAD... a special treatment for this flag. Only those not 422 /* becoming UNDEAD... a special treatment for this flag. Only those not
465 * originally undead may change their status 423 * originally undead may change their status
466 */ 424 */
467 if (!QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 425 if (!QUERY_FLAG (op->arch, FLAG_UNDEAD))
468 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD)) 426 if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD))
469 { 427 {
470 success = 1; 428 success = 1;
471 if (flag > 0) 429 if (flag > 0)
472 { 430 {
473 op->race = "undead"; 431 op->race = "undead";
474 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!"); 432 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce drains away!");
475 } 433 }
476 else 434 else
477 { 435 {
478 op->race = op->arch->clone.race; 436 op->race = op->arch->race;
479 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!"); 437 new_draw_info (NDI_UNIQUE, 0, op, "Your lifeforce returns!");
480 } 438 }
481 } 439 }
482 440
483 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH)) 441 if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))
… …
589 success = 1; 547 success = 1;
590 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.");
591 } 549 }
592 550
593 /* Messages for changed resistance */ 551 /* Messages for changed resistance */
594 for (i = 0; i < NROFATTACKS; i++) 552 for (int i = 0; i < NROFATTACKS; i++)
595 { 553 {
596 if (i == ATNR_PHYSICAL) 554 if (i == ATNR_PHYSICAL)
597 continue; /* Don't display about armour */ 555 continue; /* Don't display about armour */
598 556
599 if (op->resist[i] != refop.resist[i]) 557 if (op->resist[i] != refop.resist[i])
… …
608 } 566 }
609 } 567 }
610 568
611 if (!potion_max) 569 if (!potion_max)
612 { 570 {
613 for (j = 0; j < NUM_STATS; j++) 571 for (int j = 0; j < NUM_STATS; j++)
614 { 572 {
615 if ((i = tmp->stats.stat (j))) 573 if (int i = tmp->stats.stat (j))
616 { 574 {
617 success = 1; 575 success = 1;
618 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]); 576 DIFF_MSG (i * flag, gain_msg[j], lose_msg[j]);
619 } 577 }
620 } 578 }
… …
723 * Subtracts stat-bonuses given by the class which the player has chosen. 681 * Subtracts stat-bonuses given by the class which the player has chosen.
724 */ 682 */
725void 683void
726object::remove_statbonus () 684object::remove_statbonus ()
727{ 685{
728 stats.Str -= arch->clone.stats.Str; 686 for (int i = 0; i < NUM_STATS; ++i)
729 stats.Dex -= arch->clone.stats.Dex; 687 {
730 stats.Con -= arch->clone.stats.Con; 688 sint8 v = arch->stats.stat (i);
731 stats.Wis -= arch->clone.stats.Wis; 689 stats.stat (i) -= v;
732 stats.Pow -= arch->clone.stats.Pow; 690 contr->orig_stats.stat (i) -= v;
733 stats.Cha -= arch->clone.stats.Cha; 691 }
734 stats.Int -= arch->clone.stats.Int;
735
736 contr->orig_stats.Str -= arch->clone.stats.Str;
737 contr->orig_stats.Dex -= arch->clone.stats.Dex;
738 contr->orig_stats.Con -= arch->clone.stats.Con;
739 contr->orig_stats.Wis -= arch->clone.stats.Wis;
740 contr->orig_stats.Pow -= arch->clone.stats.Pow;
741 contr->orig_stats.Cha -= arch->clone.stats.Cha;
742 contr->orig_stats.Int -= arch->clone.stats.Int;
743} 692}
744 693
745/* 694/*
746 * Adds stat-bonuses given by the class which the player has chosen. 695 * Adds stat-bonuses given by the class which the player has chosen.
747 */ 696 */
748void 697void
749object::add_statbonus () 698object::add_statbonus ()
750{ 699{
751 stats.Str += arch->clone.stats.Str; 700 for (int i = 0; i < NUM_STATS; ++i)
752 stats.Dex += arch->clone.stats.Dex; 701 {
753 stats.Con += arch->clone.stats.Con; 702 sint8 v = arch->stats.stat (i);
754 stats.Wis += arch->clone.stats.Wis; 703 stats.stat (i) += v;
755 stats.Pow += arch->clone.stats.Pow; 704 contr->orig_stats.stat (i) += v;
756 stats.Cha += arch->clone.stats.Cha; 705 }
757 stats.Int += arch->clone.stats.Int;
758
759 contr->orig_stats.Str += arch->clone.stats.Str;
760 contr->orig_stats.Dex += arch->clone.stats.Dex;
761 contr->orig_stats.Con += arch->clone.stats.Con;
762 contr->orig_stats.Wis += arch->clone.stats.Wis;
763 contr->orig_stats.Pow += arch->clone.stats.Pow;
764 contr->orig_stats.Cha += arch->clone.stats.Cha;
765 contr->orig_stats.Int += arch->clone.stats.Int;
766} 706}
707
708/* These are the items that currently can change digestion, regeneration,
709 * spell point recovery and mana point recovery. Seems sort of an arbitary
710 * list, but other items store other info into stats array.
711 */
712static struct digest_types : std::bitset<NUM_TYPES>
713{
714 digest_types ()
715 {
716 set (WEAPON);
717 set (BOW);
718 set (ARMOUR);
719 set (HELMET);
720 set (SHIELD);
721 set (RING);
722 set (BOOTS);
723 set (GLOVES);
724 set (AMULET);
725 set (GIRDLE);
726 set (BRACERS);
727 set (CLOAK);
728 set (DISEASE);
729 set (FORCE);
730 set (SKILL);
731 }
732} digest_types;
733
734static struct copy_flags : object::flags_t
735{
736 copy_flags ()
737 {
738 set (FLAG_LIFESAVE);
739 set (FLAG_REFL_SPELL);
740 set (FLAG_REFL_MISSILE);
741 set (FLAG_STEALTH);
742 set (FLAG_XRAYS);
743 set (FLAG_BLIND);
744 set (FLAG_SEE_IN_DARK);
745 }
746} copy_flags;
767 747
768/* 748/*
769 * Updates all abilities given by applied objects in the inventory 749 * Updates all abilities given by applied objects in the inventory
770 * of the given object. Note: This function works for both monsters 750 * of the given object. Note: This function works for both monsters
771 * and players; the "player" in the name is purely an archaic inheritance. 751 * and players; the "player" in the name is purely an archaic inheritance.
… …
776 * spell system split, grace points now added to system --peterm 756 * spell system split, grace points now added to system --peterm
777 */ 757 */
778void 758void
779object::update_stats () 759object::update_stats ()
780{ 760{
781 int i, j;
782 float f, max = 9, added_speed = 0, bonus_speed = 0, sp_tmp, speed_reduce_from_disease = 1; 761 float f, max_speed = 9, added_speed = 0, bonus_speed = 0, speed_reduce_from_disease = 1;
783 int weapon_weight = 0, weapon_speed = 0; 762 int weapon_weight = 0, weapon_speed = 0;
784 int best_wc = 0, best_ac = 0, wc = 0, ac = 0; 763 int best_wc = 0, best_ac = 0, wc = 0, ac = 0;
785 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS]; 764 int prot[NROFATTACKS], vuln[NROFATTACKS], potion_resist[NROFATTACKS];
786 object *grace_obj = NULL, *mana_obj = NULL, *wc_obj = NULL, *tmp; 765 object *grace_obj = NULL, *mana_obj = NULL, *tmp;
787 float old_speed = speed; 766 float old_speed = speed;
767 int stat_sum [NUM_STATS];
788 768
789 /* First task is to clear all the values back to their original values */ 769 /* First task is to clear all the values back to their original values */
790 if (type == PLAYER) 770 if (type == PLAYER)
791 { 771 {
792 for (i = 0; i < NUM_STATS; i++) 772 for (int i = 0; i < NUM_STATS; i++)
793 stats.stat (i) = contr->orig_stats.stat (i); 773 stat_sum [i] = contr->orig_stats.stat (i);
794 774
795 if (settings.spell_encumbrance == TRUE) 775 if (settings.spell_encumbrance == TRUE)
796 contr->encumbrance = 0; 776 contr->encumbrance = 0;
797 777
798 attacktype = 0; 778 attacktype = 0;
… …
818 798
819 CLEAR_FLAG (this, FLAG_LIFESAVE); 799 CLEAR_FLAG (this, FLAG_LIFESAVE);
820 CLEAR_FLAG (this, FLAG_STEALTH); 800 CLEAR_FLAG (this, FLAG_STEALTH);
821 CLEAR_FLAG (this, FLAG_BLIND); 801 CLEAR_FLAG (this, FLAG_BLIND);
822 802
823 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL); 803 if (!QUERY_FLAG (arch, FLAG_REFL_SPELL )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
824 if (!QUERY_FLAG (&arch->clone, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE); 804 if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
825 if (!QUERY_FLAG (&arch->clone, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD); 805 if (!QUERY_FLAG (arch, FLAG_UNDEAD )) CLEAR_FLAG (this, FLAG_UNDEAD);
826 if (!QUERY_FLAG (&arch->clone, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK); 806 if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
827 807
828 path_attuned = arch->clone.path_attuned; 808 path_attuned = arch->path_attuned;
829 path_repelled = arch->clone.path_repelled; 809 path_repelled = arch->path_repelled;
830 path_denied = arch->clone.path_denied; 810 path_denied = arch->path_denied;
831 glow_radius = arch->clone.glow_radius; 811 glow_radius = arch->glow_radius;
832 move_type = arch->clone.move_type; 812 move_type = arch->move_type;
833 813
834 chosen_skill = 0; 814 chosen_skill = 0;
835 815
836 /* initializing resistances from the values in player/monster's 816 /* initializing resistances from the values in player/monster's
837 * archetype clone 817 * archetype clone
838 */ 818 */
839 memcpy (&resist, &arch->clone.resist, sizeof (resist)); 819 memcpy (&resist, &arch->resist, sizeof (resist));
840 820
841 for (i = 0; i < NROFATTACKS; i++) 821 for (int i = 0; i < NROFATTACKS; i++)
842 { 822 {
843 if (resist[i] > 0) 823 if (resist[i] > 0)
844 prot[i] = resist[i], vuln[i] = 0; 824 prot[i] = resist[i], vuln[i] = 0;
845 else 825 else
846 vuln[i] = -(resist[i]), prot[i] = 0; 826 vuln[i] = -(resist[i]), prot[i] = 0;
847 827
848 potion_resist[i] = 0; 828 potion_resist[i] = 0;
849 } 829 }
850 830
851 wc = arch->clone.stats.wc; 831 wc = arch->stats.wc;
852 stats.dam = arch->clone.stats.dam; 832 stats.dam = arch->stats.dam;
853 833
854 /* for players which cannot use armour, they gain AC -1 per 3 levels, 834 /* for players which cannot use armour, they gain AC -1 per 3 levels,
855 * plus a small amount of physical resist, those poor suckers. ;) 835 * plus a small amount of physical resist, those poor suckers. ;)
856 * the fact that maxlevel is factored in could be considered sort of bogus - 836 * the fact that maxlevel is factored in could be considered sort of bogus -
857 * we should probably give them some bonus and cap it off - otherwise, 837 * we should probably give them some bonus and cap it off - otherwise,
858 * basically, if a server updates its max level, these playes may find 838 * basically, if a server updates its max level, these playes may find
859 * that their protection from physical goes down 839 * that their protection from physical goes down
860 */ 840 */
861 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER) 841 if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
862 { 842 {
863 ac = MAX (-10, arch->clone.stats.ac - level / 3); 843 ac = max (-10, arch->stats.ac - level / 3);
864 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100; 844 prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
865 } 845 }
866 else 846 else
867 ac = arch->clone.stats.ac; 847 ac = arch->stats.ac;
868 848
869 stats.luck = arch->clone.stats.luck; 849 stats.luck = arch->stats.luck;
870 speed = arch->clone.speed; 850 speed = arch->speed;
871 851
872 /* OK - we've reset most all the objects attributes to sane values. 852 /* OK - we've reset most all the objects attributes to sane values.
873 * now go through and make adjustments for what the player has equipped. 853 * now go through and make adjustments for what the player has equipped.
874 */ 854 */
875 for (tmp = inv; tmp; tmp = tmp->below) 855 for (tmp = inv; tmp; tmp = tmp->below)
876 { 856 {
877 /* See note in map.c:update_position about making this additive
878 * since light sources are never applied, need to put check here.
879 */
880 if (tmp->glow_radius > glow_radius)
881 glow_radius = tmp->glow_radius;
882
883 /* This happens because apply_potion calls change_abil with the potion 857 /* This happens because apply_potion calls change_abil with the potion
884 * applied so we can tell the player what changed. But change_abil 858 * applied so we can tell the player what changed. But change_abil
885 * then calls this function. 859 * then calls this function.
886 */ 860 */
887 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 861 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
888 continue; 862 continue;
863
864 /* See note in map.c:update_position about making this additive
865 * since light sources are never applied, need to put check here.
866 */
867 if (tmp->glow_radius > glow_radius)
868 glow_radius = tmp->glow_radius;
889 869
890 /* For some things, we don't care what is equipped */ 870 /* For some things, we don't care what is equipped */
891 if (tmp->type == SKILL) 871 if (tmp->type == SKILL)
892 { 872 {
893 /* Want to take the highest skill here. */ 873 /* Want to take the highest skill here. */
… …
923 || (tmp->type == SKILL 903 || (tmp->type == SKILL
924 && tmp->subtype == SK_PRAYING)) 904 && tmp->subtype == SK_PRAYING))
925 { 905 {
926 if (type == PLAYER) 906 if (type == PLAYER)
927 { 907 {
908 contr->item_power += tmp->item_power;
909
928 if (tmp == contr->combat_ob || tmp == contr->ranged_ob) 910 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
911 if (tmp != current_weapon
929 if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)) 912 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
913 && !tmp->flag [FLAG_CURSED]
914 && !tmp->flag [FLAG_DAMNED])
930 continue; 915 continue;
931 916
932 for (i = 0; i < NUM_STATS; i++) 917 for (int i = 0; i < NUM_STATS; i++)
933 change_attr_value (&stats, i, tmp->stats.stat (i)); 918 stat_sum [i] = stat_sum [i] + tmp->stats.stat (i);
934 919
935 /* these are the items that currently can change digestion, regeneration, 920 if (digest_types [tmp->type])
936 * spell point recovery and mana point recovery. Seems sort of an arbitary
937 * list, but other items store other info into stats array.
938 */
939 if (tmp->type == WEAPON || tmp->type == BOW ||
940 tmp->type == ARMOUR || tmp->type == HELMET ||
941 tmp->type == SHIELD || tmp->type == RING ||
942 tmp->type == BOOTS || tmp->type == GLOVES ||
943 tmp->type == AMULET || tmp->type == GIRDLE ||
944 tmp->type == BRACERS || tmp->type == CLOAK ||
945 tmp->type == DISEASE || tmp->type == FORCE ||
946 tmp->type == SKILL)
947 { 921 {
948 contr->digestion += tmp->stats.food; 922 contr->digestion += tmp->stats.food;
949 contr->gen_hp += tmp->stats.hp; 923 contr->gen_hp += tmp->stats.hp;
950 contr->gen_sp += tmp->stats.sp; 924 contr->gen_sp += tmp->stats.sp;
951 contr->gen_grace += tmp->stats.grace; 925 contr->gen_grace += tmp->stats.grace;
952 contr->gen_sp_armour += tmp->gen_sp_armour; 926 contr->gen_sp_armour += tmp->gen_sp_armour;
953 contr->item_power += tmp->item_power;
954 } 927 }
955 } /* if this is a player */ 928 } /* if this is a player */
956 else 929 else
957 { 930 {
958 if (tmp->type == WEAPON) 931 if (tmp->type == WEAPON)
959 current_weapon = tmp; 932 current_weapon = tmp;
960 } 933 }
961 934
962 /* Update slots used for items */ 935 /* Update slots used for items */
963 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 936 if (QUERY_FLAG (tmp, FLAG_APPLIED))
964 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 937 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
965 slot[i].used += tmp->slot[i].info; 938 slot[i].used += tmp->slot[i].info;
966 939
967 if (tmp->type == SYMPTOM) 940 if (tmp->type == SYMPTOM)
968 {
969 speed_reduce_from_disease = tmp->last_sp / 100.f;
970
971 if (speed_reduce_from_disease == 0)
972 speed_reduce_from_disease = 1; 941 speed_reduce_from_disease =
973 } 942 min (speed_reduce_from_disease, tmp->last_sp ? tmp->last_sp / 100.f : 1.f);
974 943
975 /* Pos. and neg. protections are counted seperate (-> pro/vuln). 944 /* Pos. and neg. protections are counted seperate (-> pro/vuln).
976 * (Negative protections are calculated exactly like positive.) 945 * (Negative protections are calculated exactly like positive.)
977 * Resistance from potions are treated special as well. If there's 946 * Resistance from potions are treated special as well. If there's
978 * more than one potion-effect, the bigger prot.-value is taken. 947 * more than one potion-effect, the bigger prot.-value is taken.
979 */ 948 */
980 if (tmp->type != POTION) 949 if (tmp->type != POTION)
981 { 950 {
982 for (i = 0; i < NROFATTACKS; i++) 951 for (int i = 0; i < NROFATTACKS; i++)
983 { 952 {
984 /* Potential for cursed potions, in which case we just can use 953 /* Potential for cursed potions, in which case we just can use
985 * a straight MAX, as potion_resist is initialised to zero. 954 * a straight MAX, as potion_resist is initialised to zero.
986 */ 955 */
987 if (tmp->type == POTION_EFFECT) 956 if (tmp->type == POTION_EFFECT)
988 { 957 {
989 if (potion_resist[i]) 958 if (potion_resist[i])
990 potion_resist[i] = MAX (potion_resist[i], tmp->resist[i]); 959 potion_resist[i] = max (potion_resist[i], tmp->resist[i]);
991 else 960 else
992 potion_resist[i] = tmp->resist[i]; 961 potion_resist[i] = tmp->resist[i];
993 } 962 }
994 else if (tmp->resist[i] > 0) 963 else if (tmp->resist[i] > 0)
995 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100; 964 prot[i] += ((100 - prot[i]) * tmp->resist[i]) / 100;
… …
997 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100; 966 vuln[i] += ((100 - vuln[i]) * -tmp->resist[i]) / 100;
998 } 967 }
999 } 968 }
1000 969
1001 /* There may be other things that should not adjust the attacktype */ 970 /* There may be other things that should not adjust the attacktype */
1002 if ((tmp->type != WEAPON && tmp->type != BOW && tmp->type != SYMPTOM) 971 if (tmp->type != SYMPTOM)
1003 || current_weapon == tmp)
1004 { 972 {
1005 attacktype |= tmp->attacktype; 973 attacktype |= tmp->attacktype;
1006 path_attuned |= tmp->path_attuned; 974 path_attuned |= tmp->path_attuned;
1007 path_repelled |= tmp->path_repelled; 975 path_repelled |= tmp->path_repelled;
1008 path_denied |= tmp->path_denied; 976 path_denied |= tmp->path_denied;
1009 move_type |= tmp->move_type; 977 move_type |= tmp->move_type;
1010 stats.luck += tmp->stats.luck; 978 stats.luck += tmp->stats.luck;
1011 } 979 }
1012 980
1013 if (QUERY_FLAG (tmp, FLAG_LIFESAVE )) SET_FLAG (this, FLAG_LIFESAVE); 981 flag |= tmp->flag & copy_flags;
1014 if (QUERY_FLAG (tmp, FLAG_REFL_SPELL )) SET_FLAG (this, FLAG_REFL_SPELL);
1015 if (QUERY_FLAG (tmp, FLAG_REFL_MISSILE)) SET_FLAG (this, FLAG_REFL_MISSILE);
1016 if (QUERY_FLAG (tmp, FLAG_STEALTH )) SET_FLAG (this, FLAG_STEALTH);
1017 if (QUERY_FLAG (tmp, FLAG_XRAYS )) SET_FLAG (this, FLAG_XRAYS);
1018 if (QUERY_FLAG (tmp, FLAG_BLIND )) SET_FLAG (this, FLAG_BLIND);
1019 if (QUERY_FLAG (tmp, FLAG_SEE_IN_DARK )) SET_FLAG (this, FLAG_SEE_IN_DARK);
1020 982
1021 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (&arch->clone, FLAG_UNDEAD)) 983 if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
1022 SET_FLAG (this, FLAG_UNDEAD); 984 SET_FLAG (this, FLAG_UNDEAD);
1023 985
1024 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS)) 986 if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
1025 { 987 {
1026 SET_FLAG (this, FLAG_MAKE_INVIS); 988 SET_FLAG (this, FLAG_MAKE_INVIS);
… …
1050#endif 1012#endif
1051 1013
1052 /* skills modifying the character -b.t. */ 1014 /* skills modifying the character -b.t. */
1053 /* for all skills and skill granting objects */ 1015 /* for all skills and skill granting objects */
1054 case SKILL: 1016 case SKILL:
1055 if (!QUERY_FLAG (tmp, FLAG_APPLIED)) 1017 {
1018 if (!QUERY_FLAG (tmp, FLAG_APPLIED) || skill_flags [tmp->subtype] & SF_APPLY)
1056 break; 1019 break;
1057 1020
1058 if (IS_COMBAT_SKILL (tmp->subtype))
1059 wc_obj = tmp;
1060
1061 if (chosen_skill) 1021 if (chosen_skill)
1022 {
1062 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name); 1023 LOG (llevDebug, "fix_player, op %s has multiple skills applied (%s and %s)\n",
1024 &name, &chosen_skill->name, &tmp->name);
1063 1025
1026 tmp->flag [FLAG_APPLIED] = false;
1027 update_stats ();
1028 return;
1029 }
1030 else
1064 chosen_skill = tmp; 1031 chosen_skill = tmp;
1065 1032
1066 if (tmp->stats.dam > 0) 1033 if (tmp->stats.dam > 0)
1067 { /* skill is a 'weapon' */ 1034 { /* skill is a 'weapon' */
1068 if (!QUERY_FLAG (this, FLAG_READY_WEAPON)) 1035 if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
1069 weapon_speed = WEAPON_SPEED (tmp); 1036 weapon_speed = WEAPON_SPEED (tmp);
1070 1037
1071 if (weapon_speed < 0) 1038 if (weapon_speed < 0)
1072 weapon_speed = 0; 1039 weapon_speed = 0;
1073 1040
1074 weapon_weight = tmp->weight; 1041 weapon_weight = tmp->weight;
1075 stats.dam += tmp->stats.dam * (1 + (chosen_skill->level / 9)); 1042 stats.dam += 1 + chosen_skill->level * tmp->stats.dam / 9;
1076 1043
1077 if (tmp->magic) 1044 if (tmp->magic)
1078 stats.dam += tmp->magic; 1045 stats.dam += tmp->magic;
1079 } 1046 }
1080 1047
1081 if (tmp->stats.wc) 1048 if (tmp->stats.wc)
1082 wc -= tmp->stats.wc + tmp->magic; 1049 wc -= tmp->stats.wc + tmp->magic;
1083 1050
1084 if (tmp->slaying) 1051 if (tmp->slaying)
1085 slaying = tmp->slaying; 1052 slaying = tmp->slaying;
1086 1053
1087 if (tmp->stats.ac) 1054 if (tmp->stats.ac)
1088 ac -= tmp->stats.ac + tmp->magic; 1055 ac -= tmp->stats.ac + tmp->magic;
1089 1056
1090 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1057 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1091 contr->encumbrance += (int) 3 *tmp->weight / 1000; 1058 contr->encumbrance += (int) 3 *tmp->weight / 1000;
1092
1093 break; 1059 }
1094 1060
1095 case SKILL_TOOL:
1096 if (chosen_skill)
1097 LOG (llevDebug, "fix_player, op %s has multiple skills applied\n", &name);
1098
1099 chosen_skill = tmp;
1100 break; 1061 break;
1101 1062
1102 case SHIELD: 1063 case SHIELD:
1103 if (settings.spell_encumbrance == TRUE && type == PLAYER) 1064 if (settings.spell_encumbrance == TRUE && type == PLAYER)
1104 contr->encumbrance += (int) tmp->weight / 2000; 1065 contr->encumbrance += (int) tmp->weight / 2000;
… …
1182 wc -= (tmp->stats.wc + tmp->magic); 1143 wc -= (tmp->stats.wc + tmp->magic);
1183 1144
1184 if (tmp->stats.ac) 1145 if (tmp->stats.ac)
1185 ac -= (tmp->stats.ac + tmp->magic); 1146 ac -= (tmp->stats.ac + tmp->magic);
1186 1147
1187 if (ARMOUR_SPEED (tmp) && ARMOUR_SPEED (tmp) / 10.f < max) 1148 if (ARMOUR_SPEED (tmp))
1188 max = ARMOUR_SPEED (tmp) / 10.f; 1149 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1189 1150
1190 break; 1151 break;
1191 } /* switch tmp->type */ 1152 } /* switch tmp->type */
1192 } /* item is equipped */ 1153 } /* item is equipped */
1193 } /* for loop of items */ 1154 } /* for loop of items */
… …
1200 * If there is an uncursed potion in effect, granting more protection 1161 * If there is an uncursed potion in effect, granting more protection
1201 * than that, we take: 'total resistance = resistance from potion'. 1162 * than that, we take: 'total resistance = resistance from potion'.
1202 * If there is a cursed (and no uncursed) potion in effect, we take 1163 * If there is a cursed (and no uncursed) potion in effect, we take
1203 * 'total resistance = vulnerability from cursed potion'. 1164 * 'total resistance = vulnerability from cursed potion'.
1204 */ 1165 */
1205 for (i = 0; i < NROFATTACKS; i++) 1166 for (int i = 0; i < NROFATTACKS; i++)
1206 { 1167 {
1207 resist[i] = prot[i] - vuln[i]; 1168 resist[i] = prot[i] - vuln[i];
1208 1169
1209 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0))) 1170 if (potion_resist[i] && ((potion_resist[i] > resist[i]) || (potion_resist[i] < 0)))
1210 resist[i] = potion_resist[i]; 1171 resist[i] = potion_resist[i];
1211 } 1172 }
1212 1173
1213 /* Figure out the players sp/mana/hp totals. */
1214 if (type == PLAYER) 1174 if (type == PLAYER)
1215 { 1175 {
1176 // clamp various player stats
1177 for (int i = 0; i < NUM_STATS; ++i)
1178 stats.stat (i) = clamp (stat_sum [i], MIN_STAT, MAX_STAT);
1179
1180 contr->digestion = clamp (contr->digestion, MIN_DIGESTION, MAX_DIGESTION);
1181
1182 /* Figure out the players sp/mana/hp totals. */
1216 int pl_level; 1183 int pl_level;
1217 1184
1218 check_stat_bounds (&(stats)); 1185 check_stat_bounds (&(stats));
1219 pl_level = level; 1186 pl_level = level;
1220 1187
… …
1222 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */ 1189 pl_level = 1; /* safety, we should always get 1 levels worth of hp! */
1223 1190
1224 /* You basically get half a con bonus/level. But we do take into account rounding, 1191 /* You basically get half a con bonus/level. But we do take into account rounding,
1225 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels. 1192 * so if your bonus is 7, you still get 7 worth of bonus every 2 levels.
1226 */ 1193 */
1227 for (i = 1, stats.maxhp = 0; i <= pl_level && i <= 10; i++) 1194 stats.maxhp = 0;
1195 for (int i = 1; i <= min (10, pl_level); i++)
1228 { 1196 {
1229 j = contr->levhp[i] + con_bonus[stats.Con] / 2; 1197 int j = contr->levhp[i] + con_bonus[stats.Con] / 2;
1230 1198
1231 if (i % 2 && con_bonus[stats.Con] % 2) 1199 if (i % 2 && con_bonus[stats.Con] % 2)
1232 {
1233 if (con_bonus[stats.Con] > 0) 1200 if (con_bonus[stats.Con] > 0)
1234 j++; 1201 j++;
1235 else 1202 else
1236 j--; 1203 j--;
1237 }
1238 1204
1239 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */ 1205 stats.maxhp += j > 1 ? j : 1; /* always get at least 1 hp/level */
1240 } 1206 }
1241 1207
1242 for (i = 11; i <= level; i++) 1208 stats.maxhp += 2 * max (0, level - 10);
1243 stats.maxhp += 2;
1244 1209
1245 if (stats.hp > stats.maxhp) 1210 if (stats.hp > stats.maxhp)
1246 stats.hp = stats.maxhp; 1211 stats.hp = stats.maxhp;
1247 1212
1248 /* Sp gain is controlled by the level of the player's 1213 /* Sp gain is controlled by the level of the player's
… …
1261 1226
1262 if (mana_obj == this && type == PLAYER) 1227 if (mana_obj == this && type == PLAYER)
1263 stats.maxsp = 1; 1228 stats.maxsp = 1;
1264 else 1229 else
1265 { 1230 {
1266 sp_tmp = 0.f; 1231 float sp_tmp = 0.f;
1267 1232
1268 for (i = 1; i <= mana_obj->level && i <= 10; i++) 1233 for (int i = 1; i <= min (10, mana_obj->level); i++)
1269 { 1234 {
1270 float stmp; 1235 float stmp;
1271 1236
1272 /* Got some extra bonus at first level */ 1237 /* Got some extra bonus at first level */
1273 if (i < 2) 1238 if (i < 2)
1274 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f; 1239 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 6.f;
1275 else 1240 else
1276 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f; 1241 stmp = contr->levsp[i] + (2.f * sp_bonus[stats.Pow] + sp_bonus[stats.Int]) / 12.f;
1277 1242
1278 if (stmp < 1.f)
1279 stmp = 1.f;
1280
1281 sp_tmp += stmp; 1243 sp_tmp += max (1.f, stmp);
1282 } 1244 }
1283 1245
1284 stats.maxsp = (sint16)sp_tmp; 1246 stats.maxsp = int (sp_tmp) + 2 * max (0, mana_obj->level - 10);
1285
1286 for (i = 11; i <= mana_obj->level; i++)
1287 stats.maxsp += 2;
1288 } 1247 }
1248
1289 /* Characters can get their sp supercharged via rune of transferrance */ 1249 /* Characters can get their sp supercharged via rune of transferrance */
1290 if (stats.sp > stats.maxsp * 2) 1250 stats.sp = min (stats.sp, stats.maxsp * 2);
1291 stats.sp = stats.maxsp * 2;
1292 1251
1293 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */ 1252 /* set maxgrace, notice 3-4 lines below it depends on both Wis and Pow */
1294 if (!grace_obj || !grace_obj->level || type != PLAYER) 1253 if (!grace_obj || !grace_obj->level || type != PLAYER)
1295 grace_obj = this; 1254 grace_obj = this;
1296 1255
… …
1301 /* store grace in a float - this way, the divisions below don't create 1260 /* store grace in a float - this way, the divisions below don't create
1302 * big jumps when you go from level to level - with int's, it then 1261 * big jumps when you go from level to level - with int's, it then
1303 * becomes big jumps when the sums of the bonuses jump to the next 1262 * becomes big jumps when the sums of the bonuses jump to the next
1304 * step of 8 - with floats, even fractional ones are useful. 1263 * step of 8 - with floats, even fractional ones are useful.
1305 */ 1264 */
1306 sp_tmp = 0.f; 1265 float sp_tmp = 0.f;
1307 for (i = 1, stats.maxgrace = 0; i <= grace_obj->level && i <= 10; i++) 1266
1267 for (int i = 1; i <= min (10, grace_obj->level); i++)
1308 { 1268 {
1309 float grace_tmp = 0.f; 1269 float grace_tmp = 0.f;
1310 1270
1311 /* Got some extra bonus at first level */ 1271 /* Got some extra bonus at first level */
1312 if (i < 2) 1272 if (i < 2)
1313 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f; 1273 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 6.f;
1314 else 1274 else
1315 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f; 1275 grace_tmp = contr->levgrace[i] + (grace_bonus[stats.Pow] + 2.f * grace_bonus[stats.Wis]) / 12.f;
1316 1276
1317 if (grace_tmp < 1.f)
1318 grace_tmp = 1.f;
1319
1320 sp_tmp += grace_tmp; 1277 sp_tmp += max (1.f, grace_tmp);
1321 } 1278 }
1322 1279
1323 stats.maxgrace = (sint16)sp_tmp;
1324
1325 /* two grace points per level after 11 */ 1280 /* two grace points per level after 10 */
1326 for (i = 11; i <= grace_obj->level; i++) 1281 stats.maxgrace = int (sp_tmp) + 2 * max (0, grace_obj->level - 10);
1327 stats.maxgrace += 2;
1328 } 1282 }
1283
1329 /* No limit on grace vs maxgrace */ 1284 /* No limit on grace vs maxgrace */
1330 1285
1331 if (contr->braced) 1286 if (contr->braced)
1332 { 1287 {
1333 ac += 2; 1288 ac += 2;
… …
1345 * improvement every level, now its fighterlevel/5. So 1300 * improvement every level, now its fighterlevel/5. So
1346 * we give the player a bonus here in wc and dam 1301 * we give the player a bonus here in wc and dam
1347 * to make up for the change. Note that I left the 1302 * to make up for the change. Note that I left the
1348 * monster bonus the same as before. -b.t. 1303 * monster bonus the same as before. -b.t.
1349 */ 1304 */
1305 object *wc_obj = chosen_skill;
1350 1306
1351 if (type == PLAYER && wc_obj && wc_obj->level > 1) 1307 if (contr && wc_obj && wc_obj->level > 1)
1352 { 1308 {
1353 wc -= wc_obj->level + thaco_bonus[stats.Str]; 1309 wc -= wc_obj->level + thaco_bonus[stats.Str];
1354 1310
1355 for (i = 1; i < wc_obj->level; i++) 1311 for (int i = 1; i < wc_obj->level; i++)
1356 { 1312 {
1357 /* addtional wc every 6 levels */ 1313 /* additional wc every 6 levels */
1358 if (!(i % 6)) 1314 if (!(i % 6))
1359 wc--; 1315 wc--;
1360 1316
1361 /* addtional dam every 4 levels. */ 1317 /* additional dam every 4 levels. */
1362 if (!(i % 4) && dam_bonus[stats.Str] >= 0) 1318 if (!(i % 4) && dam_bonus[stats.Str] >= 0)
1363 stats.dam += 1 + dam_bonus[stats.Str] / 5; 1319 stats.dam += 1 + dam_bonus[stats.Str] / 5;
1364 } 1320 }
1365 } 1321 }
1366 else 1322 else
… …
1375 1331
1376 if (settings.search_items && contr->search_str[0]) 1332 if (settings.search_items && contr->search_str[0])
1377 speed -= 1; 1333 speed -= 1;
1378 1334
1379 if (attacktype == 0) 1335 if (attacktype == 0)
1380 attacktype = arch->clone.attacktype; 1336 attacktype = arch->attacktype;
1381
1382 } /* End if player */ 1337 } /* End if player */
1383 1338
1384 if (added_speed >= 0) 1339 if (added_speed >= 0)
1385 speed += added_speed / 10.f; 1340 speed += added_speed / 10.f;
1386 else /* Something wrong here...: */ 1341 else /* Something wrong here...: */
1387 speed /= 1.f - added_speed; 1342 speed /= 1.f - added_speed;
1388 1343
1389 /* Max is determined by armour */ 1344 /* Max is determined by armour */
1390 if (speed > max) 1345 speed = min (speed, max_speed);
1391 speed = max;
1392 1346
1393 if (type == PLAYER) 1347 if (type == PLAYER)
1394 { 1348 {
1395 /* f is a number the represents the number of kg above (positive num) 1349 /* f is a number the represents the number of kg above (positive num)
1396 * or below (negative number) that the player is carrying. If above 1350 * or below (negative number) that the player is carrying. If above
1397 * weight limit, then player suffers a speed reduction based on how 1351 * weight limit, then player suffers a speed reduction based on how
1398 * much above he is, and what is max carry is 1352 * much above he is, and what is max carry is
1399 */ 1353 */
1400 f = (carrying / 1000) - max_carry[stats.Str]; 1354 float f = (carrying / 1000) - max_carry[stats.Str];
1401 if (f > 0) 1355 if (f > 0.f)
1402 speed = speed / (1.f + f / max_carry[stats.Str]); 1356 speed = speed / (1.f + f / max_carry[stats.Str]);
1403 } 1357 }
1404 1358
1405 speed += bonus_speed / 10.f; /* Not affected by limits */ 1359 speed += bonus_speed / 10.f; /* Not affected by limits */
1360 speed *= speed_reduce_from_disease;
1406 1361
1407 /* Put a lower limit on speed. Note with this speed, you move once every 1362 /* Put a lower limit on speed. Note with this speed, you move once every
1408 * 100 ticks or so. This amounts to once every 12 seconds of realtime. 1363 * 25 ticks or so. This amounts to once every 3 seconds of realtime.
1409 */ 1364 */
1410 speed = speed * speed_reduce_from_disease;
1411
1412 if (speed < 0.01f && type == PLAYER) 1365 if (speed < 0.04f && type == PLAYER)
1413 speed = 0.01f; 1366 speed = 0.04f;
1367
1368 if (speed != old_speed)
1369 set_speed (speed);
1414 1370
1415 if (type == PLAYER) 1371 if (type == PLAYER)
1416 { 1372 {
1417 /* (This formula was made by vidarl@ifi.uio.no) 1373 /* (This formula was made by vidarl@ifi.uio.no)
1418 * Note that we never used these values again - basically 1374 * Note that we never used these values again - basically
… …
1420 * that would just be a real pain to read. 1376 * that would just be a real pain to read.
1421 */ 1377 */
1422 float M = (max_carry[stats.Str] - 121) / 121.f; 1378 float M = (max_carry[stats.Str] - 121) / 121.f;
1423 float M2 = max_carry[stats.Str] / 100.f; 1379 float M2 = max_carry[stats.Str] / 100.f;
1424 float W = weapon_weight / 20000.f; 1380 float W = weapon_weight / 20000.f;
1425 float s = 2 - weapon_speed / 10.f; 1381 float s = (20 - weapon_speed) / 10.f;
1426 float D = (stats.Dex - 14) / 14.f; 1382 float D = (stats.Dex - 14) / 14.f;
1427 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f; 1383 float K = 1 + M / 3.f - W / (3 * M2) + speed / 5.f + D / 2.f;
1428 1384
1429 K *= (4 + level) *1.2f / (6 + level); 1385 K *= (4 + level) * 1.2f / (6 + level);
1430 1386
1431 if (K <= 0.f) 1387 if (K <= 0.01f)
1432 K = 0.01f; 1388 K = 0.01f;
1433 1389
1434 float S = speed / (K * s); 1390 contr->weapon_sp = K * s * .5f; //TODO: balance the .5
1435
1436 contr->weapon_sp = S;
1437 } 1391 }
1438 1392
1439 /* I want to limit the power of small monsters with big weapons: */ 1393 /* I want to limit the power of small monsters with big weapons: */
1440 if (type != PLAYER && arch && stats.dam > arch->clone.stats.dam * 3) 1394 if (type != PLAYER && arch && stats.dam > arch->stats.dam * 3)
1441 stats.dam = arch->clone.stats.dam * 3; 1395 stats.dam = arch->stats.dam * 3;
1442 1396
1443 /* Prevent overflows of wc - best you can get is ABS(120) - this 1397 stats.wc = clamp (wc, MIN_WC, MAX_WC);
1444 * should be more than enough - remember, AC is also in 8 bits, 1398 stats.ac = clamp (ac, MIN_AC, MAX_AC);
1445 * so its value is the same.
1446 */
1447 if (wc > 120)
1448 wc = 120;
1449 else if (wc < -120)
1450 wc = -120;
1451
1452 stats.wc = wc;
1453
1454 if (ac > 120)
1455 ac = 120;
1456 else if (ac < -120)
1457 ac = -120;
1458
1459 stats.ac = ac;
1460 1399
1461 /* if for some reason the creature doesn't have any move type, 1400 /* if for some reason the creature doesn't have any move type,
1462 * give them walking as a default. 1401 * give them walking as a default.
1463 * The second case is a special case - to more closely mimic the 1402 * The second case is a special case - to more closely mimic the
1464 * old behaviour - if your flying, your not walking - just 1403 * old behaviour - if your flying, your not walking - just
… …
1467 if (move_type == 0) 1406 if (move_type == 0)
1468 move_type = MOVE_WALK; 1407 move_type = MOVE_WALK;
1469 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) 1408 else if (move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH))
1470 move_type &= ~MOVE_WALK; 1409 move_type &= ~MOVE_WALK;
1471 1410
1472 if (speed != old_speed)
1473 set_speed (speed);
1474
1475 /* It is quite possible that a player's spell costing might have changed, 1411 /* It is quite possible that a player's spell costing might have changed,
1476 * so we will check that now. 1412 * so we will check that now.
1477 */ 1413 */
1478 if (type == PLAYER) 1414 if (type == PLAYER)
1479 { 1415 {
… …
1539 /* now if there are equals at highest level, pick the one with focus, 1475 /* now if there are equals at highest level, pick the one with focus,
1540 or else at random */ 1476 or else at random */
1541 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level) 1477 if (atnr_is_dragon_enabled (abil->stats.exp) && abil->resist[abil->stats.exp] >= level)
1542 atnr = abil->stats.exp; 1478 atnr = abil->stats.exp;
1543 1479
1544 level = (int) (level / 5.); 1480 level = (int) (level / 25.);
1545 1481
1546 /* now set the new title */ 1482 /* now set the new title */
1547 if (pl->contr != NULL) 1483 if (pl->contr)
1548 { 1484 {
1549 if (level == 0) 1485 if (level == 0)
1550 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]); 1486 sprintf (pl->contr->title, "%s hatchling", attacks[atnr]);
1551 else if (level == 1) 1487 else if (level == 1)
1552 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]); 1488 sprintf (pl->contr->title, "%s wyrm", attacks[atnr]);
… …
1581 object *skin = NULL; /* pointer to dragon skin force */ 1517 object *skin = NULL; /* pointer to dragon skin force */
1582 object *tmp = NULL; /* tmp. object */ 1518 object *tmp = NULL; /* tmp. object */
1583 char buf[MAX_BUF]; /* tmp. string buffer */ 1519 char buf[MAX_BUF]; /* tmp. string buffer */
1584 1520
1585 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1521 /* now grab the 'dragon_ability'-forces from the player's inventory */
1586 shstr_cmp dragon_ability_force ("dragon_ability_force");
1587 shstr_cmp dragon_skin_force ("dragon_skin_force");
1588
1589 for (tmp = who->inv; tmp; tmp = tmp->below) 1522 for (tmp = who->inv; tmp; tmp = tmp->below)
1590 if (tmp->type == FORCE) 1523 if (tmp->type == FORCE)
1591 if (tmp->arch->name == dragon_ability_force) 1524 if (tmp->arch->archname == shstr_dragon_ability_force)
1592 abil = tmp; 1525 abil = tmp;
1593 else if (tmp->arch->name == dragon_skin_force) 1526 else if (tmp->arch->archname == shstr_dragon_skin_force)
1594 skin = tmp; 1527 skin = tmp;
1595 1528
1596 /* if the force is missing -> bail out */ 1529 /* if the force is missing -> bail out */
1597 if (abil == NULL) 1530 if (abil == NULL)
1598 return; 1531 return;
… …
1644 if (!skill_obj) 1577 if (!skill_obj)
1645 { 1578 {
1646 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name); 1579 LOG (llevError, "add_player_exp: couldn't find skill %s\n", skill_name);
1647 return NULL; 1580 return NULL;
1648 } 1581 }
1582
1649 /* clear the flag - exp goes into this bucket, but player 1583 /* clear the flag - exp goes into this bucket, but player
1650 * still doesn't know it. 1584 * still doesn't know it.
1651 */ 1585 */
1652 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL); 1586 CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
1653 skill_obj->stats.exp = 0; 1587 skill_obj->stats.exp = 0;
1654 skill_obj->level = 1; 1588 skill_obj->level = 1;
1655 insert_ob_in_ob (skill_obj, op); 1589 insert_ob_in_ob (skill_obj, op);
1656 1590
1657 if (op->contr) 1591 if (player *pl = op->contr)
1658 { 1592 {
1659 op->contr->last_skill_ob [skill_obj->subtype] = skill_obj; 1593 pl->last_skill_ob [skill_obj->subtype] = skill_obj;
1660 if (op->contr->ns) 1594 if (pl->ns)
1661 op->contr->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous 1595 pl->ns->last_skill_exp[skill_obj->subtype] = -1;//TODO: should be made superfluous
1662 } 1596 }
1663 1597
1664 return skill_obj; 1598 return skill_obj;
1665} 1599}
1666
1667 1600
1668/* player_lvl_adj() - for the new exp system. we are concerned with 1601/* player_lvl_adj() - for the new exp system. we are concerned with
1669 * whether the player gets more hp, sp and new levels. 1602 * whether the player gets more hp, sp and new levels.
1670 * Note this this function should only be called for players. Monstes 1603 * Note this this function should only be called for players. Monstes
1671 * don't really gain levels 1604 * don't really gain levels
… …
1674 */ 1607 */
1675void 1608void
1676player_lvl_adj (object *who, object *op) 1609player_lvl_adj (object *who, object *op)
1677{ 1610{
1678 char buf[MAX_BUF]; 1611 char buf[MAX_BUF];
1612 bool changed = false;
1679 1613
1680 if (!op) /* when rolling stats */ 1614 if (!op) /* when rolling stats */
1681 op = who; 1615 op = who;
1682 1616
1683 if (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul)) 1617 while (op->level < settings.max_level && op->stats.exp >= level_exp (op->level + 1, who->expmul))
1684 { 1618 {
1619 changed = true;
1620
1685 op->level++; 1621 op->level++;
1686 1622
1687 if (op != NULL && op == who && op->stats.exp > 1 && is_dragon_pl (who)) 1623 if (op && op == who && op->stats.exp > 1 && is_dragon_pl (who))
1688 dragon_level_gain (who); 1624 dragon_level_gain (who);
1689 1625
1690 /* Only roll these if it is the player (who) that gained the level */ 1626 /* Only roll these if it is the player (who) that gained the level */
1691 if (op == who && (who->level < 11) && who->type == PLAYER) 1627 if (op == who && (who->level < 11) && who->type == PLAYER)
1692 { 1628 {
1693 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1; 1629 who->contr->levhp[who->level] = die_roll (2, 4, who, PREFER_HIGH) + 1;
1694 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH); 1630 who->contr->levsp[who->level] = die_roll (2, 3, who, PREFER_HIGH);
1695 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1; 1631 who->contr->levgrace[who->level] = die_roll (2, 2, who, PREFER_HIGH) - 1;
1696 } 1632 }
1697 1633
1698 who->update_stats ();
1699 if (op->level > 1) 1634 if (op->level > 1)
1700 { 1635 {
1701 if (op->type != PLAYER) 1636 if (op->type != PLAYER)
1637 {
1638 who->contr->play_sound (sound_find ("skill_up"));
1702 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1639 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1640 }
1703 else 1641 else
1642 {
1643 who->contr->play_sound (sound_find ("level_up"));
1704 sprintf (buf, "You are now level %d.", op->level); 1644 sprintf (buf, "You are now level %d.", op->level);
1645 }
1646
1705 if (who) 1647 if (who)
1706 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1648 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1707 } 1649 }
1708 player_lvl_adj (who, op); /* To increase more levels */
1709 } 1650 }
1651
1710 else if (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul)) 1652 while (op->level > 1 && op->stats.exp < level_exp (op->level, who->expmul))
1711 { 1653 {
1654 changed = true;
1655
1712 op->level--; 1656 op->level--;
1713 who->update_stats (); 1657
1714 if (op->type != PLAYER) 1658 if (op->type != PLAYER)
1715 { 1659 {
1716 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name); 1660 sprintf (buf, "You are now level %d in the %s skill.", op->level, &op->name);
1717 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf); 1661 new_draw_info (NDI_UNIQUE | NDI_RED, 0, who, buf);
1718 } 1662 }
1719 player_lvl_adj (who, op); /* To decrease more levels */ 1663 }
1664
1665 if (changed)
1720 } 1666 {
1721 1667 who->update_stats ();
1668 esrv_update_stats (who->contr);
1722 /* check if the spell data has changed */ 1669 /* check if the spell data has changed */
1723 esrv_update_stats (who->contr);
1724 esrv_update_spells (who->contr); 1670 esrv_update_spells (who->contr);
1671 }
1725} 1672}
1726 1673
1727/* 1674/*
1728 * Returns how much experience is needed for a player to become 1675 * Returns how much experience is needed for a player to become
1729 * the given level. level should really never exceed max_level 1676 * the given level. level should really never exceed max_level
… …
2034 player_lvl_adj (op, tmp); 1981 player_lvl_adj (op, tmp);
2035 } 1982 }
2036 1983
2037 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100; 1984 percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
2038 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)]; 1985 level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];
1986
2039 if (level_loss < 0) 1987 if (level_loss < 0)
2040 level_loss = 0; 1988 level_loss = 0;
2041 loss = check_exp_loss (op, MIN (level_loss, percentage_loss)); 1989 loss = check_exp_loss (op, MIN (level_loss, percentage_loss));
2042 1990
2043 op->stats.exp -= loss; 1991 op->stats.exp -= loss;

Diff Legend

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