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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.85 by root, Tue Sep 1 22:40:26 2009 UTC vs.
Revision 1.111 by root, Fri Jan 27 22:01:46 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
… …
36/* this function checks to see if a spell pushes objects as well 37/* this function checks to see if a spell pushes objects as well
37 * as flies over and damages them (only used for cones for now) 38 * as flies over and damages them (only used for cones for now)
38 * but moved here so it could be applied to bolts too 39 * but moved here so it could be applied to bolts too
39 * op is the spell object. 40 * op is the spell object.
40 */ 41 */
41void 42static void
42check_spell_knockback (object *op) 43check_spell_knockback (object *op)
43{ 44{
44 int weight_move; 45 int weight_move;
45 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */ 46 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
46 47
… …
58 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 59 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
59 { 60 {
60 int num_sections = 1; 61 int num_sections = 1;
61 62
62 /* don't move DM */ 63 /* don't move DM */
63 if (QUERY_FLAG (tmp, FLAG_WIZ)) 64 if (tmp->flag [FLAG_WIZ])
64 return; 65 return;
65 66
66 /* don't move parts of objects */ 67 /* don't move parts of objects */
67 if (tmp->head) 68 if (tmp->head)
68 continue; 69 continue;
69 70
70 /* don't move floors or immobile objects */ 71 /* don't move floors or immobile objects */
71 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK))) 72 if (tmp->flag [FLAG_IS_FLOOR] || (!tmp->flag [FLAG_ALIVE] && tmp->flag [FLAG_NO_PICK]))
72 continue; 73 continue;
73 74
74 /* count the object's sections */ 75 /* count the object's sections */
75 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more) 76 for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
76 num_sections++; 77 num_sections++;
… …
92 * also be safe for objects. 93 * also be safe for objects.
93 * This does return if successful or not, but 94 * This does return if successful or not, but
94 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
95 * right now. 96 * right now.
96 */ 97 */
97 move_object (tmp, absdir (op->stats.sp)); 98 tmp->move (absdir (op->stats.sp));
98 } 99 }
99 100
100 } 101 }
101} 102}
102 103
… …
107 ***************************************************************************/ 108 ***************************************************************************/
108 109
109/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
110 * is the first piece of the fork. 111 * is the first piece of the fork.
111 */ 112 */
112void 113static void
113forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
114{ 115{
115 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 116 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
116 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
117 maptile *m; 118 maptile *m;
… …
193 * on the space. So only call reflwall if we think the data it returns 194 * on the space. So only call reflwall if we think the data it returns
194 * will be useful. 195 * will be useful.
195 */ 196 */
196 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 197 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
197 { 198 {
198 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 199 if (!op->flag [FLAG_REFLECTING])
199 return; 200 return;
200 201
201 /* Since walls don't run diagonal, if the bolt is in 202 /* Since walls don't run diagonal, if the bolt is in
202 * one of 4 main directions, it just reflects back in the 203 * one of 4 main directions, it just reflects back in the
203 * opposite direction. However, if the bolt is travelling 204 * opposite direction. However, if the bolt is travelling
… …
276 int mflags; 277 int mflags;
277 278
278 if (!spob->other_arch) 279 if (!spob->other_arch)
279 return 0; 280 return 0;
280 281
281 tmp = arch_to_object (spob->other_arch); 282 tmp = spob->other_arch->instance ();
282 if (tmp == NULL) 283 if (tmp == NULL)
283 return 0; 284 return 0;
284 285
285 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
286 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 287 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
… …
293 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob); 294 tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
294 tmp->stats.Dex = spob->stats.Dex; 295 tmp->stats.Dex = spob->stats.Dex;
295 tmp->stats.Con = spob->stats.Con; 296 tmp->stats.Con = spob->stats.Con;
296 297
297 tmp->direction = dir; 298 tmp->direction = dir;
298 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 299 if (tmp->flag [FLAG_IS_TURNABLE])
299 SET_ANIMATION (tmp, dir); 300 SET_ANIMATION (tmp, dir);
300 301
301 tmp->set_owner (op); 302 tmp->set_owner (op);
302 set_spell_skill (op, caster, spob, tmp); 303 set_spell_skill (op, caster, spob, tmp);
303 304
… …
315 316
316 tmp->map = newmap; 317 tmp->map = newmap;
317 318
318 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 319 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
319 { 320 {
320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 321 if (!tmp->flag [FLAG_REFLECTING])
321 { 322 {
322 tmp->drop_and_destroy (); 323 tmp->drop_and_destroy ();
323 return 0; 324 return 0;
324 } 325 }
325 326
… …
388 389
389/* Causes an object to explode, eg, a firebullet, 390/* Causes an object to explode, eg, a firebullet,
390 * poison cloud ball, etc. op is the object to 391 * poison cloud ball, etc. op is the object to
391 * explode. 392 * explode.
392 */ 393 */
393void 394static void
394explode_bullet (object *op) 395explode_bullet (object *op)
395{ 396{
396 object *tmp, *owner; 397 object *tmp, *owner;
397 398
398 if (!op->other_arch) 399 if (!op->other_arch)
… …
438 if (op->destroyed ()) 439 if (op->destroyed ())
439 return; 440 return;
440 } 441 }
441 442
442 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
443 tmp = arch_to_object (op->other_arch); 444 tmp = op->other_arch->instance ();
444 445
445 tmp->set_owner (op); 446 tmp->set_owner (op);
446 tmp->skill = op->skill; 447 tmp->skill = op->skill;
447 448
448 owner = op->owner; 449 owner = op->owner;
… …
520 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
521 return; 522 return;
522 523
523 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 524 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
524 { 525 {
525 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (tmp->flag [FLAG_ALIVE])
526 { 527 {
527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
528 529
529 // TODO: can't understand the following if's 530 // TODO: can't understand the following if's
530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 531 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
531 { 532 {
532 if (!QUERY_FLAG (op, FLAG_REMOVED)) 533 if (!op->flag [FLAG_REMOVED])
533 { 534 {
534 op->destroy (); 535 op->destroy ();
535 return; 536 return;
536 } 537 }
537 } 538 }
… …
545 * fired arches (eg, bolts). 546 * fired arches (eg, bolts).
546 */ 547 */
547void 548void
548move_bullet (object *op) 549move_bullet (object *op)
549{ 550{
550 sint16 new_x, new_y;
551 int mflags;
552 maptile *m;
553
554#if 0 551#if 0
555 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
556 553
557 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
558 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
… …
573 op->destroy (); 570 op->destroy ();
574 571
575 return; 572 return;
576 } 573 }
577 574
578 new_x = op->x + DIRX (op); 575 mapxy pos (op);
579 new_y = op->y + DIRY (op); 576 pos.move (op->direction);
580 m = op->map;
581 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
582 577
583 if (mflags & P_OUT_OF_MAP) 578 if (!pos.normalise ())
584 { 579 {
585 op->destroy (); 580 op->destroy ();
586 return; 581 return;
587 } 582 }
588 583
589 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 584 mapspace &ms = pos.ms ();
585
586 ms.update ();
587
588 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, ms.move_block))
590 { 589 {
591 if (op->other_arch) 590 if (op->other_arch)
592 explode_bullet (op); 591 explode_bullet (op);
593 else 592 else
594 op->destroy (); 593 op->destroy ();
595 594
596 return; 595 return;
597 } 596 }
598 597
599 if (!(op = m->insert (op, new_x, new_y, op))) 598 if (!(op = pos.insert (op, op)))
600 return; 599 return;
601 600
602 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
603 { 602 {
604 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
… …
641 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob); 640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
642 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob); 641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
643 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob); 642 tmp->dam_modifier = spob->stats.food + SP_level_dam_adjust (caster, spob);
644 643
645 tmp->direction = dir; 644 tmp->direction = dir;
646 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (tmp->flag [FLAG_IS_TURNABLE])
647 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
648 647
649 tmp->set_owner (op); 648 tmp->set_owner (op);
650 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
651 650
… …
661 return 0; 660 return 0;
662 } 661 }
663 662
664 tmp->map = newmap; 663 tmp->map = newmap;
665 664
665 // in case the bullet has direction 0 we explode it in place.
666 // direction 0 is possible for instance when a poison cloud trap springs.
667 if (tmp->direction == 0)
668 {
669 if (tmp->other_arch
670 && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
671 explode_bullet (tmp); // explode object will/should remove tmp
672 else
673 tmp->destroy ();
674
675 return 0;
676 }
677
666 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 678 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
667 { 679 {
668 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!tmp->flag [FLAG_REFLECTING])
669 { 681 {
670 tmp->destroy (); 682 tmp->destroy ();
671 return 0; 683 return 0;
672 } 684 }
673 685
… …
688 * CONE RELATED FUNCTIONS 700 * CONE RELATED FUNCTIONS
689 * 701 *
690 *****************************************************************************/ 702 *****************************************************************************/
691 703
692/* drops an object based on what is in the cone's "other_arch" */ 704/* drops an object based on what is in the cone's "other_arch" */
693void 705static void
694cone_drop (object *op) 706cone_drop (object *op)
695{ 707{
696 object *new_ob = arch_to_object (op->other_arch); 708 object *new_ob = op->other_arch->instance ();
697 709
698 new_ob->level = op->level; 710 new_ob->level = op->level;
699 new_ob->set_owner (op->owner); 711 new_ob->set_owner (op->owner);
700 712
701 /* preserve skill ownership */ 713 /* preserve skill ownership */
… …
717 op->set_speed (0); 729 op->set_speed (0);
718 return; 730 return;
719 } 731 }
720 732
721 /* lava saves it's life, but not yours :) */ 733 /* lava saves it's life, but not yours :) */
722 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 734 if (op->flag [FLAG_LIFESAVE])
723 { 735 {
724 hit_map (op, 0, op->attacktype, 0); 736 hit_map (op, 0, op->attacktype, 0);
725 return; 737 return;
726 } 738 }
727 739
… …
808 MoveType movetype; 820 MoveType movetype;
809 821
810 if (!spell->other_arch) 822 if (!spell->other_arch)
811 return 0; 823 return 0;
812 824
813 if (op->type == PLAYER && QUERY_FLAG (op, FLAG_UNDEAD) && op->attacktype & AT_TURN_UNDEAD) 825 if (op->type == PLAYER && op->flag [FLAG_UNDEAD] && op->attacktype & AT_TURN_UNDEAD)
814 { 826 {
815 new_draw_info (NDI_UNIQUE, 0, op, "Your undead nature prevents you from turning undead!"); 827 op->failmsg ("Your undead nature prevents you from turning undead!");
816 return 0; 828 return 0;
817 } 829 }
818 830
819 if (!dir) 831 if (!dir)
820 { 832 {
… …
862 874
863 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
864 continue; 876 continue;
865 877
866 success = 1; 878 success = 1;
867 tmp = arch_to_object (spell->other_arch); 879 tmp = spell->other_arch->instance ();
868 tmp->set_owner (op); 880 tmp->set_owner (op);
869 set_spell_skill (op, caster, spell, tmp); 881 set_spell_skill (op, caster, spell, tmp);
870 tmp->level = casting_level (caster, spell); 882 tmp->level = casting_level (caster, spell);
871 tmp->attacktype = spell->attacktype; 883 tmp->attacktype = spell->attacktype;
872 884
… …
974 for (int i = 1; i < 9; i++) 986 for (int i = 1; i < 9; i++)
975 { 987 {
976 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 988 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
977 continue; 989 continue;
978 990
979 object *tmp = arch_to_object (at); 991 object *tmp = at->instance ();
980 tmp->direction = i; 992 tmp->direction = i;
981 tmp->range = op->range; 993 tmp->range = op->range;
982 tmp->stats.dam = op->stats.dam; 994 tmp->stats.dam = op->stats.dam;
983 tmp->duration = op->duration; 995 tmp->duration = op->duration;
984 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
985 tmp->set_owner (op); 997 tmp->set_owner (op);
986 if (op->skill && op->skill != tmp->skill) 998 if (op->skill && op->skill != tmp->skill)
987 tmp->skill = op->skill; 999 tmp->skill = op->skill;
988 1000
989 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1001 if (tmp->flag [FLAG_IS_TURNABLE])
990 SET_ANIMATION (tmp, i); 1002 SET_ANIMATION (tmp, i);
991 1003
992 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op); 1004 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
993 move_bullet (tmp); 1005 move_bullet (tmp);
994 } 1006 }
… …
1013 // to fix create bomb traps in doors, which cast with dir=0). 1025 // to fix create bomb traps in doors, which cast with dir=0).
1014 if (dir) 1026 if (dir)
1015 { 1027 {
1016 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1028 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1017 { 1029 {
1018 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 op->failmsg ("There is something in the way.");
1019 return 0; 1031 return 0;
1020 } 1032 }
1021 } 1033 }
1022 1034
1023 tmp = arch_to_object (spell->other_arch); 1035 tmp = spell->other_arch->instance ();
1024 1036
1025 /* level dependencies for bomb */ 1037 /* level dependencies for bomb */
1026 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1038 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1027 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1039 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1028 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1040 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
… …
1048 * dir is the direction to look in. 1060 * dir is the direction to look in.
1049 * range is how far out to look. 1061 * range is how far out to look.
1050 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1062 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1051 * this info is used for blocked magic/unholy spaces. 1063 * this info is used for blocked magic/unholy spaces.
1052 */ 1064 */
1053object * 1065static object *
1054get_pointed_target (object *op, int dir, int range, int type) 1066get_pointed_target (object *op, int dir, int range, int type)
1055{ 1067{
1056 object *target; 1068 object *target;
1057 sint16 x, y; 1069 sint16 x, y;
1058 int dist, mflags; 1070 int dist, mflags;
… …
1077 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1078 return NULL; 1090 return NULL;
1079 1091
1080 if (mflags & P_IS_ALIVE) 1092 if (mflags & P_IS_ALIVE)
1081 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1093 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1082 if (QUERY_FLAG (target, FLAG_MONSTER)) 1094 if (target->flag [FLAG_MONSTER])
1083 return target; 1095 return target;
1084 } 1096 }
1085 1097
1086 return NULL; 1098 return NULL;
1087} 1099}
1088 1100
1089/* cast_smite_arch() - the priest points to a creature and causes 1101/* cast_smite_spell() - the priest points to a creature and causes
1090 * a 'godly curse' to decend. 1102 * a 'godly curse' to decend.
1091 * usual params - 1103 * usual params -
1092 * op = player 1104 * op = player
1093 * caster = object casting the spell. 1105 * caster = object casting the spell.
1094 * dir = direction being cast 1106 * dir = direction being cast
… …
1097int 1109int
1098cast_smite_spell (object *op, object *caster, int dir, object *spell) 1110cast_smite_spell (object *op, object *caster, int dir, object *spell)
1099{ 1111{
1100 object *effect, *target; 1112 object *effect, *target;
1101 object *god = find_god (determine_god (op)); 1113 object *god = find_god (determine_god (op));
1102 int range;
1103 1114
1104 range = spell->range + SP_level_range_adjust (caster, spell);
1105 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA); 1115 target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA);
1106 1116
1107 /* Bunch of conditions for casting this spell. Note that only 1117 /* Bunch of conditions for casting this spell. Note that only
1108 * require a god if this is a cleric spell (requires grace). 1118 * require a god if this is a cleric spell (requires grace).
1109 * This makes this spell much more general purpose - it can be used 1119 * This makes this spell much more general purpose - it can be used
… …
1117 || target->flag [FLAG_REFL_SPELL] 1127 || target->flag [FLAG_REFL_SPELL]
1118 || (!god && spell->stats.grace) 1128 || (!god && spell->stats.grace)
1119 || (god && target->title == god->name) 1129 || (god && target->title == god->name)
1120 || (god && target->race.contains (god->race))) 1130 || (god && target->race.contains (god->race)))
1121 { 1131 {
1122 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1132 op->failmsg ("Your request is unheeded.");
1123 return 0; 1133 return 0;
1124 } 1134 }
1125 1135
1126 if (spell->other_arch) 1136 if (spell->other_arch)
1127 effect = arch_to_object (spell->other_arch); 1137 effect = spell->other_arch->instance ();
1128 else 1138 else
1129 return 0; 1139 return 0;
1130 1140
1131 /* tailor the effect by priest level and worshipped God */ 1141 /* tailor the effect by priest level and worshipped God */
1132 effect->level = casting_level (caster, spell); 1142 effect->level = casting_level (caster, spell);
… …
1135 { 1145 {
1136 if (tailor_god_spell (effect, op)) 1146 if (tailor_god_spell (effect, op))
1137 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op)); 1147 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1138 else 1148 else
1139 { 1149 {
1140 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1150 op->failmsg ("Your request is ignored.");
1141 return 0; 1151 return 0;
1142 } 1152 }
1143 } 1153 }
1144 1154
1145 /* size of the area of destruction */ 1155 /* size of the area of destruction */
… …
1149 if (effect->attacktype & AT_DEATH) 1159 if (effect->attacktype & AT_DEATH)
1150 { 1160 {
1151 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1161 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1152 1162
1153 /* casting death spells at undead isn't a good thing */ 1163 /* casting death spells at undead isn't a good thing */
1154 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1164 if (target->flag [FLAG_UNDEAD])
1155 { 1165 {
1156 if (random_roll (0, 2, op, PREFER_LOW)) 1166 if (random_roll (0, 2, op, PREFER_LOW))
1157 { 1167 {
1158 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1168 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1159 effect->x = op->x; 1169 effect->x = op->x;
… …
1245 * we do this by creating a force and inserting it in the 1255 * we do this by creating a force and inserting it in the
1246 * object. if time is 0, the object glows permanently. To truely 1256 * object. if time is 0, the object glows permanently. To truely
1247 * make this work for non-living objects, we would have to 1257 * make this work for non-living objects, we would have to
1248 * give them the capability to have an inventory. b.t. 1258 * give them the capability to have an inventory. b.t.
1249 */ 1259 */
1250int 1260static int
1251make_object_glow (object *op, int radius, int time) 1261make_object_glow (object *op, int radius, int time)
1252{ 1262{
1253 /* some things are unaffected... */ 1263 /* some things are unaffected... */
1254 if (op->path_denied & PATH_LIGHT) 1264 if (op->path_denied & PATH_LIGHT)
1255 return 0; 1265 return 0;
1256 1266
1257 object *tmp = get_archetype (FORCE_NAME); 1267 object *tmp = archetype::get (FORCE_NAME);
1258 tmp->speed = 0.01; 1268 tmp->set_speed (0.01);
1259 tmp->stats.food = time; 1269 tmp->stats.food = time;
1260 SET_FLAG (tmp, FLAG_IS_USED_UP); 1270 tmp->set_flag (FLAG_IS_USED_UP);
1261 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1271 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1262 tmp = insert_ob_in_ob (tmp, op); 1272 tmp = insert_ob_in_ob (tmp, op);
1263 1273
1264 if (tmp->glow_radius > op->glow_radius) 1274 if (tmp->glow_radius > op->glow_radius)
1265 op->set_glow_radius (tmp->glow_radius); 1275 op->set_glow_radius (tmp->glow_radius);
… …
1274 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1284 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1275 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1285 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1276 1286
1277 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1287 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1278 1288
1279 /* destruction doesn't use another spell object, so we need 1289 dynbuf buf;
1280 * update op's skill pointer so that exp is properly awarded.
1281 */
1282 const shstr skill = op->skill;
1283
1284 if (caster == op)
1285 op->skill = spell_ob->skill;
1286 else if (caster->skill)
1287 op->skill = caster->skill;
1288 else
1289 op->skill = 0;
1290
1291 op->change_skill (find_skill_by_name (op, op->skill));
1292
1293 unordered_mapwalk (op, -range, -range, range, range) 1290 unordered_mapwalk (buf, op, -range, -range, range, range)
1294 { 1291 {
1295 mapspace &ms = m->at (nx, ny); 1292 mapspace &ms = m->at (nx, ny);
1296 1293
1297 if (ms.flags () & P_IS_ALIVE) 1294 if (ms.flags () & P_IS_ALIVE)
1298 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1295 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1296 {
1297 next = tmp->above;
1298
1299 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ()) 1299 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1300 { 1300 {
1301 tmp = tmp->head_ (); 1301 tmp = tmp->head_ ();
1302 1302
1303 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ()) 1303 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1304 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ()))) 1304 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1305 { 1305 {
1306 if (spell_ob->subtype == SP_DESTRUCTION) 1306 if (spell_ob->subtype == SP_DESTRUCTION)
1307 { 1307 {
1308 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1308 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1309 1309
1310 if (spell_ob->other_arch) 1310 if (spell_ob->other_arch)
1311 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1311 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1312 } 1312 }
1313 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100) 1313 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1314 { 1314 {
1315 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1315 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1316 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1316 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1317 } 1317 }
1318 } 1318 }
1319 } 1319 }
1320 }
1320 } 1321 }
1321 1322
1322 op->skill = skill;
1323 return 1; 1323 return 1;
1324} 1324}
1325 1325
1326/*************************************************************************** 1326/***************************************************************************
1327 * 1327 *
1328 * CURSE 1328 * CURSE
1329 * 1329 *
1330 ***************************************************************************/ 1330 ***************************************************************************/
1331
1332int 1331int
1333cast_curse (object *op, object *caster, object *spell_ob, int dir) 1332cast_curse (object *op, object *caster, object *spell_ob, int dir)
1334{ 1333{
1335 object *god = find_god (determine_god (op)); 1334 object *god = find_god (determine_god (op));
1336 object *tmp, *force; 1335 object *tmp, *force;
1337 1336
1338 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE); 1337 tmp = get_pointed_target (op, (dir == 0) ? op->direction : dir, spell_ob->range, SPELL_GRACE);
1339 if (!tmp) 1338 if (!tmp)
1340 { 1339 {
1341 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1340 op->failmsg ("There is no one in that direction to curse.");
1342 return 0; 1341 return 0;
1343 } 1342 }
1344 1343
1345 tmp = tmp->head_ (); 1344 tmp = tmp->head_ ();
1346 1345
… …
1361 } 1360 }
1362 } 1361 }
1363 1362
1364 if (!force) 1363 if (!force)
1365 { 1364 {
1366 force = get_archetype (FORCE_NAME); 1365 force = archetype::get (FORCE_NAME);
1367 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1368 1367
1369 if (spell_ob->race) 1368 if (spell_ob->race)
1370 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1371 else 1370 else
… …
1389 1388
1390 return 1; 1389 return 1;
1391 } 1390 }
1392 1391
1393 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1392 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1394 force->speed = 1.f;
1395 force->speed_left = -1.f; 1393 force->speed_left = -1.f;
1396 SET_FLAG (force, FLAG_APPLIED); 1394 force->set_speed (1.f);
1395 force->set_flag (FLAG_APPLIED);
1397 1396
1398 if (god) 1397 if (god)
1399 { 1398 {
1400 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
1401 force->path_repelled = god->path_repelled; 1400 force->path_repelled = god->path_repelled;
… …
1414 force->stats.wc = spell_ob->stats.wc; 1413 force->stats.wc = spell_ob->stats.wc;
1415 1414
1416 change_abil (tmp, force); /* Mostly to display any messages */ 1415 change_abil (tmp, force); /* Mostly to display any messages */
1417 insert_ob_in_ob (force, tmp); 1416 insert_ob_in_ob (force, tmp);
1418 tmp->update_stats (); 1417 tmp->update_stats ();
1418
1419 return 1; 1419 return 1;
1420
1421} 1420}
1422 1421
1423/********************************************************************** 1422/**********************************************************************
1424 * mood change 1423 * mood change
1425 * Arguably, this may or may not be an attack spell. But since it 1424 * Arguably, this may or may not be an attack spell. But since it
… …
1454 else if (god && spell->race == shstr_GOD_FRIEND) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1455 race = god->race; 1454 race = god->race;
1456 else 1455 else
1457 race = spell->race; 1456 race = spell->race;
1458 1457
1458 dynbuf buf;
1459 unordered_mapwalk (op, -range, -range, range, range) 1459 unordered_mapwalk (buf, op, -range, -range, range, range)
1460 { 1460 {
1461 mapspace &ms = m->at (nx, ny); 1461 mapspace &ms = m->at (nx, ny);
1462 1462
1463 /* If there is nothing living on this space, no need to go further */ 1463 /* If there is nothing living on this space, no need to go further */
1464 if (!ms.flags () & P_IS_ALIVE) 1464 if (!(ms.flags () & P_IS_ALIVE))
1465 continue; 1465 continue;
1466 1466
1467 // players can only affect spaces that they can actually see 1467 // players can only affect spaces that they can actually see
1468 if (caster 1468 if (caster
1469 && caster->contr 1469 && caster->contr
… …
1483 1483
1484 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1484 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1485 if (race && head->race && !strstr (race, head->race)) 1485 if (race && head->race && !strstr (race, head->race))
1486 continue; 1486 continue;
1487 1487
1488 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1488 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1489 continue; 1489 continue;
1490 1490
1491 /* Now do a bunch of stuff related to saving throws */ 1491 /* Now do a bunch of stuff related to saving throws */
1492 best_at = -1; 1492 best_at = -1;
1493 if (spell->attacktype) 1493 if (spell->attacktype)
… …
1526 Ryo, august 14th 1526 Ryo, august 14th
1527 */ 1527 */
1528 if (head->level > level) 1528 if (head->level > level)
1529 continue; 1529 continue;
1530 1530
1531 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1531 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1532 /* Failed, no effect */ 1532 /* Failed, no effect */
1533 continue; 1533 continue;
1534 } 1534 }
1535 1535
1536 /* Done with saving throw. Now start affecting the monster */ 1536 /* Done with saving throw. Now start affecting the monster */
1537 done_one = 0; 1537 done_one = 0;
1538 1538
1539 /* aggravation */ 1539 /* aggravation */
1540 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1540 if (spell->flag [FLAG_MONSTER])
1541 { 1541 {
1542 CLEAR_FLAG (head, FLAG_SLEEP); 1542 head->clr_flag (FLAG_SLEEP);
1543 remove_friendly_object (head); 1543 remove_friendly_object (head);
1544 done_one = 1; 1544 done_one = 1;
1545 head->enemy = op; 1545 head->enemy = op;
1546 } 1546 }
1547 1547
1548 /* calm monsters */ 1548 /* calm monsters */
1549 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1549 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1550 { 1550 {
1551 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1551 head->set_flag (FLAG_UNAGGRESSIVE);
1552 head->enemy = NULL; 1552 head->enemy = NULL;
1553 done_one = 1; 1553 done_one = 1;
1554 } 1554 }
1555 1555
1556 /* berserk monsters */ 1556 /* berserk monsters */
1557 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1557 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1558 { 1558 {
1559 SET_FLAG (head, FLAG_BERSERK); 1559 head->set_flag (FLAG_BERSERK);
1560 done_one = 1; 1560 done_one = 1;
1561 } 1561 }
1562 1562
1563 /* charm */ 1563 /* charm */
1564 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1564 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1565 { 1565 {
1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1567 1567
1568 /* Prevent uncontrolled outbreaks of self replicating monsters. 1568 /* Prevent uncontrolled outbreaks of self replicating monsters.
1569 Typical use case is charm, go somwhere, use aggravation to make hostile. 1569 Typical use case is charm, go somwhere, use aggravation to make hostile.
1570 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1570 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1571 CLEAR_FLAG (head, FLAG_GENERATOR); 1571 head->clr_flag (FLAG_GENERATOR);
1572 head->set_owner (op); 1572 head->set_owner (op);
1573 set_spell_skill (op, caster, spell, head); 1573 set_spell_skill (op, caster, spell, head);
1574 add_friendly_object (head); 1574 add_friendly_object (head);
1575 head->attack_movement = PETMOVE; 1575 head->attack_movement = PETMOVE;
1576 done_one = 1; 1576 done_one = 1;
… …
1578 head->stats.exp = 0; 1578 head->stats.exp = 0;
1579 } 1579 }
1580 1580
1581 /* If a monster was effected, put an effect in */ 1581 /* If a monster was effected, put an effect in */
1582 if (done_one && spell->other_arch) 1582 if (done_one && spell->other_arch)
1583 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1583 m->insert (spell->other_arch->instance (), nx, ny, op);
1584 } 1584 }
1585 1585
1586 return 1; 1586 return 1;
1587} 1587}
1588 1588
… …
1671 hit_map (op, j, op->attacktype, 1); 1671 hit_map (op, j, op->attacktype, 1);
1672 } 1672 }
1673 1673
1674 /* insert the other arch */ 1674 /* insert the other arch */
1675 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1675 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1676 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1676 m->insert (op->other_arch->instance (), hx, hy, op);
1677 } 1677 }
1678 1678
1679 /* restore to the center location and damage */ 1679 /* restore to the center location and damage */
1680 op->stats.dam = dam_save; 1680 op->stats.dam = dam_save;
1681 1681
… …
1870 1870
1871 mflags = get_map_flags (m, &m, x, y, &x, &y); 1871 mflags = get_map_flags (m, &m, x, y, &x, &y);
1872 1872
1873 if (mflags & P_OUT_OF_MAP) 1873 if (mflags & P_OUT_OF_MAP)
1874 { 1874 {
1875 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1875 op->failmsg ("Nothing is there.");
1876 return 0; 1876 return 0;
1877 } 1877 }
1878 1878
1879 if (mflags & P_IS_ALIVE && spell->attacktype) 1879 if (mflags & P_IS_ALIVE && spell->attacktype)
1880 { 1880 {
1881 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1881 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1882 if (QUERY_FLAG (target, FLAG_MONSTER)) 1882 if (target->flag [FLAG_MONSTER])
1883 { 1883 {
1884 /* oky doky. got a target monster. Lets make a blinding attack */ 1884 /* oky doky. got a target monster. Lets make a blinding attack */
1885 if (target->head) 1885 if (target->head)
1886 target = target->head; 1886 target = target->head;
1887 1887
… …
1891 } 1891 }
1892 1892
1893 /* no live target, perhaps a wall is in the way? */ 1893 /* no live target, perhaps a wall is in the way? */
1894 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1894 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1895 { 1895 {
1896 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1896 op->failmsg ("Something is in the way.");
1897 return 0; 1897 return 0;
1898 } 1898 }
1899 } 1899 }
1900 1900
1901 /* ok, looks groovy to just insert a new light on the map */ 1901 /* ok, looks groovy to just insert a new light on the map */
1902 tmp = arch_to_object (spell->other_arch); 1902 tmp = spell->other_arch->instance ();
1903 if (!tmp) 1903 if (!tmp)
1904 { 1904 {
1905 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1905 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1906 return 0; 1906 return 0;
1907 } 1907 }
… …
1914 ); 1914 );
1915 1915
1916 if (dir) 1916 if (dir)
1917 m->insert (tmp, x, y, op); 1917 m->insert (tmp, x, y, op);
1918 else 1918 else
1919 caster->outer_env ()->insert (tmp); 1919 caster->outer_env_or_self ()->insert (tmp);
1920 1920
1921 return 1; 1921 return 1;
1922} 1922}
1923 1923
1924/* cast_cause_disease: this spell looks along <dir> from the 1924/* cast_cause_disease: this spell looks along <dir> from the
… …
1971 /* Only bother looking on this space if there is something living here */ 1971 /* Only bother looking on this space if there is something living here */
1972 if (mflags & P_IS_ALIVE) 1972 if (mflags & P_IS_ALIVE)
1973 { 1973 {
1974 /* search this square for a victim */ 1974 /* search this square for a victim */
1975 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1975 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1976 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1976 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1977 { /* found a victim */ 1977 { /* found a victim */
1978 object *disease = arch_to_object (spell->other_arch); 1978 object *disease = spell->other_arch->instance ();
1979 1979
1980 disease->set_owner (op); 1980 disease->set_owner (op);
1981 set_spell_skill (op, caster, spell, disease); 1981 set_spell_skill (op, caster, spell, disease);
1982 disease->stats.exp = 0; 1982 disease->stats.exp = 0;
1983 disease->level = casting_level (caster, spell); 1983 disease->level = casting_level (caster, spell);
1984 1984
1985 /* do level adjustments */ 1985 /* do level adjustments */
1986 if (disease->stats.wc) 1986 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
1987 disease->stats.wc += dur_mod / 2; 1987 if (disease->magic > 0) disease->magic += dur_mod / 8;
1988 1988 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
1989 if (disease->magic > 0) 1989 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
1990 disease->magic += dur_mod / 8;
1991
1992 if (disease->stats.maxhp > 0)
1993 disease->stats.maxhp += dur_mod;
1994
1995 if (disease->stats.maxgrace > 0)
1996 disease->stats.maxgrace += dur_mod;
1997
1998 if (disease->stats.dam)
1999 {
2000 if (disease->stats.dam > 0)
2001 disease->stats.dam += dam_mod;
2002 else
2003 disease->stats.dam -= dam_mod;
2004 }
2005 1990
2006 if (disease->last_sp) 1991 if (disease->last_sp)
2007 { 1992 {
2008 disease->last_sp -= 2 * dam_mod; 1993 disease->last_sp -= 2 * dam_mod;
1994
2009 if (disease->last_sp < 1) 1995 if (disease->last_sp < 1)
2010 disease->last_sp = 1; 1996 disease->last_sp = 1;
2011 } 1997 }
2012 1998
2013 if (disease->stats.maxsp) 1999 if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod);
2014 { 2000 if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod);
2015 if (disease->stats.maxsp > 0) 2001 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2016 disease->stats.maxsp += dam_mod; 2002 if (disease->last_eat ) disease->last_eat -= dam_mod;
2017 else 2003 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2018 disease->stats.maxsp -= dam_mod; 2004 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2019 }
2020
2021 if (disease->stats.ac)
2022 disease->stats.ac += dam_mod;
2023
2024 if (disease->last_eat)
2025 disease->last_eat -= dam_mod;
2026
2027 if (disease->stats.hp)
2028 disease->stats.hp -= dam_mod;
2029
2030 if (disease->stats.sp)
2031 disease->stats.sp -= dam_mod;
2032 2005
2033 if (infect_object (walk, disease, 1)) 2006 if (infect_object (walk, disease, 1))
2034 { 2007 {
2035 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2008 op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
2036 2009
2037 disease->destroy (); /* don't need this one anymore */ 2010 disease->destroy (); /* don't need this one anymore */
2038 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2011 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2039 return 1; 2012 return 1;
2040 } 2013 }
2041 2014
2042 disease->destroy (); 2015 disease->destroy ();
2043 } 2016 }

Diff Legend

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