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.87 by root, Mon Oct 12 04:02:17 2009 UTC vs.
Revision 1.114 by root, Wed Nov 16 23:42:03 2016 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,2013,2014,2015,2016 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
25 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
… …
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 }
… …
639 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob); 640 tmp->stats.hp = spob->duration + SP_level_duration_adjust (caster, spob);
640 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob); 641 tmp->stats.maxhp = spob->range + SP_level_range_adjust (caster, spob);
641 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);
642 643
643 tmp->direction = dir; 644 tmp->direction = dir;
644 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (tmp->flag [FLAG_IS_TURNABLE])
645 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
646 647
647 tmp->set_owner (op); 648 tmp->set_owner (op);
648 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
649 650
… …
659 return 0; 660 return 0;
660 } 661 }
661 662
662 tmp->map = newmap; 663 tmp->map = newmap;
663 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
664 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)))
665 { 679 {
666 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!tmp->flag [FLAG_REFLECTING])
667 { 681 {
668 tmp->destroy (); 682 tmp->destroy ();
669 return 0; 683 return 0;
670 } 684 }
671 685
… …
686 * CONE RELATED FUNCTIONS 700 * CONE RELATED FUNCTIONS
687 * 701 *
688 *****************************************************************************/ 702 *****************************************************************************/
689 703
690/* 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" */
691void 705static void
692cone_drop (object *op) 706cone_drop (object *op)
693{ 707{
694 object *new_ob = arch_to_object (op->other_arch); 708 object *new_ob = op->other_arch->instance ();
695 709
696 new_ob->level = op->level; 710 new_ob->level = op->level;
697 new_ob->set_owner (op->owner); 711 new_ob->set_owner (op->owner);
698 712
699 /* preserve skill ownership */ 713 /* preserve skill ownership */
… …
715 op->set_speed (0); 729 op->set_speed (0);
716 return; 730 return;
717 } 731 }
718 732
719 /* lava saves it's life, but not yours :) */ 733 /* lava saves it's life, but not yours :) */
720 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 734 if (op->flag [FLAG_LIFESAVE])
721 { 735 {
722 hit_map (op, 0, op->attacktype, 0); 736 hit_map (op, 0, op->attacktype, 0);
723 return; 737 return;
724 } 738 }
725 739
… …
806 MoveType movetype; 820 MoveType movetype;
807 821
808 if (!spell->other_arch) 822 if (!spell->other_arch)
809 return 0; 823 return 0;
810 824
811 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)
812 { 826 {
813 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!");
814 return 0; 828 return 0;
815 } 829 }
816 830
817 if (!dir) 831 if (!dir)
818 { 832 {
… …
860 874
861 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
862 continue; 876 continue;
863 877
864 success = 1; 878 success = 1;
865 tmp = arch_to_object (spell->other_arch); 879 tmp = spell->other_arch->instance ();
866 tmp->set_owner (op); 880 tmp->set_owner (op);
867 set_spell_skill (op, caster, spell, tmp); 881 set_spell_skill (op, caster, spell, tmp);
868 tmp->level = casting_level (caster, spell); 882 tmp->level = casting_level (caster, spell);
869 tmp->attacktype = spell->attacktype; 883 tmp->attacktype = spell->attacktype;
870 884
… …
972 for (int i = 1; i < 9; i++) 986 for (int i = 1; i < 9; i++)
973 { 987 {
974 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]))
975 continue; 989 continue;
976 990
977 object *tmp = arch_to_object (at); 991 object *tmp = at->instance ();
978 tmp->direction = i; 992 tmp->direction = i;
979 tmp->range = op->range; 993 tmp->range = op->range;
980 tmp->stats.dam = op->stats.dam; 994 tmp->stats.dam = op->stats.dam;
981 tmp->duration = op->duration; 995 tmp->duration = op->duration;
982 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
983 tmp->set_owner (op); 997 tmp->set_owner (op);
984 if (op->skill && op->skill != tmp->skill) 998 if (op->skill && op->skill != tmp->skill)
985 tmp->skill = op->skill; 999 tmp->skill = op->skill;
986 1000
987 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1001 if (tmp->flag [FLAG_IS_TURNABLE])
988 SET_ANIMATION (tmp, i); 1002 SET_ANIMATION (tmp, i);
989 1003
990 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);
991 move_bullet (tmp); 1005 move_bullet (tmp);
992 } 1006 }
… …
1011 // 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).
1012 if (dir) 1026 if (dir)
1013 { 1027 {
1014 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))
1015 { 1029 {
1016 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 op->failmsg ("There is something in the way.");
1017 return 0; 1031 return 0;
1018 } 1032 }
1019 } 1033 }
1020 1034
1021 tmp = arch_to_object (spell->other_arch); 1035 tmp = spell->other_arch->instance ();
1022 1036
1023 /* level dependencies for bomb */ 1037 /* level dependencies for bomb */
1024 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1038 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1025 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);
1026 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1040 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
… …
1046 * dir is the direction to look in. 1060 * dir is the direction to look in.
1047 * range is how far out to look. 1061 * range is how far out to look.
1048 * 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.
1049 * this info is used for blocked magic/unholy spaces. 1063 * this info is used for blocked magic/unholy spaces.
1050 */ 1064 */
1051object * 1065static object *
1052get_pointed_target (object *op, int dir, int range, int type) 1066get_pointed_target (object *op, int dir, int range, int type)
1053{ 1067{
1054 object *target; 1068 object *target;
1055 sint16 x, y; 1069 sint16 x, y;
1056 int dist, mflags; 1070 int dist, mflags;
… …
1075 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1089 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1076 return NULL; 1090 return NULL;
1077 1091
1078 if (mflags & P_IS_ALIVE) 1092 if (mflags & P_IS_ALIVE)
1079 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)
1080 if (QUERY_FLAG (target, FLAG_MONSTER)) 1094 if (target->flag [FLAG_MONSTER])
1081 return target; 1095 return target;
1082 } 1096 }
1083 1097
1084 return NULL; 1098 return NULL;
1085} 1099}
1086 1100
1087/* cast_smite_arch() - the priest points to a creature and causes 1101/* cast_smite_spell() - the priest points to a creature and causes
1088 * a 'godly curse' to decend. 1102 * a 'godly curse' to decend.
1089 * usual params - 1103 * usual params -
1090 * op = player 1104 * op = player
1091 * caster = object casting the spell. 1105 * caster = object casting the spell.
1092 * dir = direction being cast 1106 * dir = direction being cast
… …
1095int 1109int
1096cast_smite_spell (object *op, object *caster, int dir, object *spell) 1110cast_smite_spell (object *op, object *caster, int dir, object *spell)
1097{ 1111{
1098 object *effect, *target; 1112 object *effect, *target;
1099 object *god = find_god (determine_god (op)); 1113 object *god = find_god (determine_god (op));
1100 int range;
1101 1114
1102 range = spell->range + SP_level_range_adjust (caster, spell);
1103 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);
1104 1116
1105 /* Bunch of conditions for casting this spell. Note that only 1117 /* Bunch of conditions for casting this spell. Note that only
1106 * require a god if this is a cleric spell (requires grace). 1118 * require a god if this is a cleric spell (requires grace).
1107 * 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
… …
1115 || target->flag [FLAG_REFL_SPELL] 1127 || target->flag [FLAG_REFL_SPELL]
1116 || (!god && spell->stats.grace) 1128 || (!god && spell->stats.grace)
1117 || (god && target->title == god->name) 1129 || (god && target->title == god->name)
1118 || (god && target->race.contains (god->race))) 1130 || (god && target->race.contains (god->race)))
1119 { 1131 {
1120 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1132 op->failmsg ("Your request is unheeded.");
1121 return 0; 1133 return 0;
1122 } 1134 }
1123 1135
1124 if (spell->other_arch) 1136 if (spell->other_arch)
1125 effect = arch_to_object (spell->other_arch); 1137 effect = spell->other_arch->instance ();
1126 else 1138 else
1127 return 0; 1139 return 0;
1128 1140
1129 /* tailor the effect by priest level and worshipped God */ 1141 /* tailor the effect by priest level and worshipped God */
1130 effect->level = casting_level (caster, spell); 1142 effect->level = casting_level (caster, spell);
… …
1133 { 1145 {
1134 if (tailor_god_spell (effect, op)) 1146 if (tailor_god_spell (effect, op))
1135 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));
1136 else 1148 else
1137 { 1149 {
1138 new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored."); 1150 op->failmsg ("Your request is ignored.");
1139 return 0; 1151 return 0;
1140 } 1152 }
1141 } 1153 }
1142 1154
1143 /* size of the area of destruction */ 1155 /* size of the area of destruction */
… …
1147 if (effect->attacktype & AT_DEATH) 1159 if (effect->attacktype & AT_DEATH)
1148 { 1160 {
1149 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1161 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1150 1162
1151 /* casting death spells at undead isn't a good thing */ 1163 /* casting death spells at undead isn't a good thing */
1152 if (QUERY_FLAG (target, FLAG_UNDEAD)) 1164 if (target->flag [FLAG_UNDEAD])
1153 { 1165 {
1154 if (random_roll (0, 2, op, PREFER_LOW)) 1166 if (random_roll (0, 2, op, PREFER_LOW))
1155 { 1167 {
1156 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1168 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1157 effect->x = op->x; 1169 effect->x = op->x;
… …
1243 * 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
1244 * object. if time is 0, the object glows permanently. To truely 1256 * object. if time is 0, the object glows permanently. To truely
1245 * make this work for non-living objects, we would have to 1257 * make this work for non-living objects, we would have to
1246 * give them the capability to have an inventory. b.t. 1258 * give them the capability to have an inventory. b.t.
1247 */ 1259 */
1248int 1260static int
1249make_object_glow (object *op, int radius, int time) 1261make_object_glow (object *op, int radius, int time)
1250{ 1262{
1251 /* some things are unaffected... */ 1263 /* some things are unaffected... */
1252 if (op->path_denied & PATH_LIGHT) 1264 if (op->path_denied & PATH_LIGHT)
1253 return 0; 1265 return 0;
1254 1266
1255 object *tmp = get_archetype (FORCE_NAME); 1267 object *tmp = archetype::get (FORCE_NAME);
1256 tmp->speed = 0.01; 1268 tmp->set_speed (0.01);
1257 tmp->stats.food = time; 1269 tmp->stats.food = time;
1258 SET_FLAG (tmp, FLAG_IS_USED_UP); 1270 tmp->set_flag (FLAG_IS_USED_UP);
1259 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius)); 1271 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1260 tmp = insert_ob_in_ob (tmp, op); 1272 tmp = insert_ob_in_ob (tmp, op);
1261 1273
1262 if (tmp->glow_radius > op->glow_radius) 1274 if (tmp->glow_radius > op->glow_radius)
1263 op->set_glow_radius (tmp->glow_radius); 1275 op->set_glow_radius (tmp->glow_radius);
… …
1272 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);
1273 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);
1274 1286
1275 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1287 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1276 1288
1277 /* destruction doesn't use another spell object, so we need 1289 dynbuf buf;
1278 * update op's skill pointer so that exp is properly awarded.
1279 */
1280 const shstr skill = op->skill;
1281
1282 if (caster == op)
1283 op->skill = spell_ob->skill;
1284 else if (caster->skill)
1285 op->skill = caster->skill;
1286 else
1287 op->skill = 0;
1288
1289 op->change_skill (find_skill_by_name (op, op->skill));
1290
1291 unordered_mapwalk (op, -range, -range, range, range) 1290 unordered_mapwalk (buf, op, -range, -range, range, range)
1292 { 1291 {
1293 mapspace &ms = m->at (nx, ny); 1292 mapspace &ms = m->at (nx, ny);
1294 1293
1295 if (ms.flags () & P_IS_ALIVE) 1294 if (ms.flags () & P_IS_ALIVE)
1296 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
1297 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ()) 1299 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1298 { 1300 {
1299 tmp = tmp->head_ (); 1301 tmp = tmp->head_ ();
1300 1302
1301 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ()) 1303 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1302 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ()))) 1304 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1303 { 1305 {
1304 if (spell_ob->subtype == SP_DESTRUCTION) 1306 if (spell_ob->subtype == SP_DESTRUCTION)
1305 { 1307 {
1306 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1308 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1307 1309
1308 if (spell_ob->other_arch) 1310 if (spell_ob->other_arch)
1309 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1311 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1310 } 1312 }
1311 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)
1312 { 1314 {
1313 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1315 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1314 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1316 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1315 } 1317 }
1316 } 1318 }
1317 } 1319 }
1320 }
1318 } 1321 }
1319 1322
1320 op->skill = skill;
1321 return 1; 1323 return 1;
1322} 1324}
1323 1325
1324/*************************************************************************** 1326/***************************************************************************
1325 * 1327 *
1326 * CURSE 1328 * CURSE
1327 * 1329 *
1328 ***************************************************************************/ 1330 ***************************************************************************/
1329
1330int 1331int
1331cast_curse (object *op, object *caster, object *spell_ob, int dir) 1332cast_curse (object *op, object *caster, object *spell_ob, int dir)
1332{ 1333{
1333 object *god = find_god (determine_god (op)); 1334 object *god = find_god (determine_god (op));
1334 object *tmp, *force; 1335 object *tmp, *force;
1335 1336
1336 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);
1337 if (!tmp) 1338 if (!tmp)
1338 { 1339 {
1339 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.");
1340 return 0; 1341 return 0;
1341 } 1342 }
1342 1343
1343 tmp = tmp->head_ (); 1344 tmp = tmp->head_ ();
1344 1345
… …
1359 } 1360 }
1360 } 1361 }
1361 1362
1362 if (!force) 1363 if (!force)
1363 { 1364 {
1364 force = get_archetype (FORCE_NAME); 1365 force = archetype::get (FORCE_NAME);
1365 force->subtype = FORCE_CHANGE_ABILITY; 1366 force->subtype = FORCE_CHANGE_ABILITY;
1366 1367
1367 if (spell_ob->race) 1368 if (spell_ob->race)
1368 force->name = spell_ob->race; 1369 force->name = spell_ob->race;
1369 else 1370 else
… …
1387 1388
1388 return 1; 1389 return 1;
1389 } 1390 }
1390 1391
1391 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;
1392 force->speed = 1.f;
1393 force->speed_left = -1.f; 1393 force->speed_left = -1.f;
1394 SET_FLAG (force, FLAG_APPLIED); 1394 force->set_speed (1.f);
1395 force->set_flag (FLAG_APPLIED);
1395 1396
1396 if (god) 1397 if (god)
1397 { 1398 {
1398 if (spell_ob->last_grace) 1399 if (spell_ob->last_grace)
1399 force->path_repelled = god->path_repelled; 1400 force->path_repelled = god->path_repelled;
… …
1412 force->stats.wc = spell_ob->stats.wc; 1413 force->stats.wc = spell_ob->stats.wc;
1413 1414
1414 change_abil (tmp, force); /* Mostly to display any messages */ 1415 change_abil (tmp, force); /* Mostly to display any messages */
1415 insert_ob_in_ob (force, tmp); 1416 insert_ob_in_ob (force, tmp);
1416 tmp->update_stats (); 1417 tmp->update_stats ();
1418
1417 return 1; 1419 return 1;
1418
1419} 1420}
1420 1421
1421/********************************************************************** 1422/**********************************************************************
1422 * mood change 1423 * mood change
1423 * 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
… …
1452 else if (god && spell->race == shstr_GOD_FRIEND) 1453 else if (god && spell->race == shstr_GOD_FRIEND)
1453 race = god->race; 1454 race = god->race;
1454 else 1455 else
1455 race = spell->race; 1456 race = spell->race;
1456 1457
1458 dynbuf buf;
1457 unordered_mapwalk (op, -range, -range, range, range) 1459 unordered_mapwalk (buf, op, -range, -range, range, range)
1458 { 1460 {
1459 mapspace &ms = m->at (nx, ny); 1461 mapspace &ms = m->at (nx, ny);
1460 1462
1461 /* 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 */
1462 if (!ms.flags () & P_IS_ALIVE) 1464 if (!(ms.flags () & P_IS_ALIVE))
1463 continue; 1465 continue;
1464 1466
1465 // players can only affect spaces that they can actually see 1467 // players can only affect spaces that they can actually see
1466 if (caster 1468 if (caster
1467 && caster->contr 1469 && caster->contr
… …
1481 1483
1482 /* 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 */
1483 if (race && head->race && !strstr (race, head->race)) 1485 if (race && head->race && !strstr (race, head->race))
1484 continue; 1486 continue;
1485 1487
1486 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1488 if (head->flag [FLAG_UNDEAD] && !spell->flag [FLAG_UNDEAD])
1487 continue; 1489 continue;
1488 1490
1489 /* Now do a bunch of stuff related to saving throws */ 1491 /* Now do a bunch of stuff related to saving throws */
1490 best_at = -1; 1492 best_at = -1;
1491 if (spell->attacktype) 1493 if (spell->attacktype)
… …
1524 Ryo, august 14th 1526 Ryo, august 14th
1525 */ 1527 */
1526 if (head->level > level) 1528 if (head->level > level)
1527 continue; 1529 continue;
1528 1530
1529 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))))
1530 /* Failed, no effect */ 1532 /* Failed, no effect */
1531 continue; 1533 continue;
1532 } 1534 }
1533 1535
1534 /* Done with saving throw. Now start affecting the monster */ 1536 /* Done with saving throw. Now start affecting the monster */
1535 done_one = 0; 1537 done_one = 0;
1536 1538
1537 /* aggravation */ 1539 /* aggravation */
1538 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1540 if (spell->flag [FLAG_MONSTER])
1539 { 1541 {
1540 CLEAR_FLAG (head, FLAG_SLEEP); 1542 head->clr_flag (FLAG_SLEEP);
1541 remove_friendly_object (head); 1543 remove_friendly_object (head);
1542 done_one = 1; 1544 done_one = 1;
1543 head->enemy = op; 1545 head->enemy = op;
1544 } 1546 }
1545 1547
1546 /* calm monsters */ 1548 /* calm monsters */
1547 if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE)) 1549 if (spell->flag [FLAG_UNAGGRESSIVE] && !head->flag [FLAG_UNAGGRESSIVE])
1548 { 1550 {
1549 SET_FLAG (head, FLAG_UNAGGRESSIVE); 1551 head->set_flag (FLAG_UNAGGRESSIVE);
1550 head->enemy = NULL; 1552 head->enemy = NULL;
1551 done_one = 1; 1553 done_one = 1;
1552 } 1554 }
1553 1555
1554 /* berserk monsters */ 1556 /* berserk monsters */
1555 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1557 if (spell->flag [FLAG_BERSERK] && !head->flag [FLAG_BERSERK])
1556 { 1558 {
1557 SET_FLAG (head, FLAG_BERSERK); 1559 head->set_flag (FLAG_BERSERK);
1558 done_one = 1; 1560 done_one = 1;
1559 } 1561 }
1560 1562
1561 /* charm */ 1563 /* charm */
1562 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1564 if (spell->flag [FLAG_NO_ATTACK] && !head->flag [FLAG_FRIENDLY])
1563 { 1565 {
1564 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster)); 1566 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1565 1567
1566 /* Prevent uncontrolled outbreaks of self replicating monsters. 1568 /* Prevent uncontrolled outbreaks of self replicating monsters.
1567 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.
1568 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. */
1569 CLEAR_FLAG (head, FLAG_GENERATOR); 1571 head->clr_flag (FLAG_GENERATOR);
1570 head->set_owner (op); 1572 head->set_owner (op);
1571 set_spell_skill (op, caster, spell, head); 1573 set_spell_skill (op, caster, spell, head);
1572 add_friendly_object (head); 1574 add_friendly_object (head);
1573 head->attack_movement = PETMOVE; 1575 head->attack_movement = PETMOVE;
1574 done_one = 1; 1576 done_one = 1;
… …
1576 head->stats.exp = 0; 1578 head->stats.exp = 0;
1577 } 1579 }
1578 1580
1579 /* If a monster was effected, put an effect in */ 1581 /* If a monster was effected, put an effect in */
1580 if (done_one && spell->other_arch) 1582 if (done_one && spell->other_arch)
1581 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1583 m->insert (spell->other_arch->instance (), nx, ny, op);
1582 } 1584 }
1583 1585
1584 return 1; 1586 return 1;
1585} 1587}
1586 1588
… …
1669 hit_map (op, j, op->attacktype, 1); 1671 hit_map (op, j, op->attacktype, 1);
1670 } 1672 }
1671 1673
1672 /* insert the other arch */ 1674 /* insert the other arch */
1673 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))))
1674 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1676 m->insert (op->other_arch->instance (), hx, hy, op);
1675 } 1677 }
1676 1678
1677 /* restore to the center location and damage */ 1679 /* restore to the center location and damage */
1678 op->stats.dam = dam_save; 1680 op->stats.dam = dam_save;
1679 1681
… …
1868 1870
1869 mflags = get_map_flags (m, &m, x, y, &x, &y); 1871 mflags = get_map_flags (m, &m, x, y, &x, &y);
1870 1872
1871 if (mflags & P_OUT_OF_MAP) 1873 if (mflags & P_OUT_OF_MAP)
1872 { 1874 {
1873 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1875 op->failmsg ("Nothing is there.");
1874 return 0; 1876 return 0;
1875 } 1877 }
1876 1878
1877 if (mflags & P_IS_ALIVE && spell->attacktype) 1879 if (mflags & P_IS_ALIVE && spell->attacktype)
1878 { 1880 {
1879 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)
1880 if (QUERY_FLAG (target, FLAG_MONSTER)) 1882 if (target->flag [FLAG_MONSTER])
1881 { 1883 {
1882 /* oky doky. got a target monster. Lets make a blinding attack */ 1884 /* oky doky. got a target monster. Lets make a blinding attack */
1883 if (target->head) 1885 if (target->head)
1884 target = target->head; 1886 target = target->head;
1885 1887
… …
1889 } 1891 }
1890 1892
1891 /* no live target, perhaps a wall is in the way? */ 1893 /* no live target, perhaps a wall is in the way? */
1892 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)))
1893 { 1895 {
1894 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1896 op->failmsg ("Something is in the way.");
1895 return 0; 1897 return 0;
1896 } 1898 }
1897 } 1899 }
1898 1900
1899 /* 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 */
1900 tmp = arch_to_object (spell->other_arch); 1902 tmp = spell->other_arch->instance ();
1901 if (!tmp) 1903 if (!tmp)
1902 { 1904 {
1903 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1905 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1904 return 0; 1906 return 0;
1905 } 1907 }
… …
1969 /* 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 */
1970 if (mflags & P_IS_ALIVE) 1972 if (mflags & P_IS_ALIVE)
1971 { 1973 {
1972 /* search this square for a victim */ 1974 /* search this square for a victim */
1973 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)
1974 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1976 if (walk->flag [FLAG_MONSTER] || (walk->type == PLAYER))
1975 { /* found a victim */ 1977 { /* found a victim */
1976 object *disease = arch_to_object (spell->other_arch); 1978 object *disease = spell->other_arch->instance ();
1977 1979
1978 disease->set_owner (op); 1980 disease->set_owner (op);
1979 set_spell_skill (op, caster, spell, disease); 1981 set_spell_skill (op, caster, spell, disease);
1980 disease->stats.exp = 0; 1982 disease->stats.exp = 0;
1981 disease->level = casting_level (caster, spell); 1983 disease->level = casting_level (caster, spell);
1982 1984
1983 /* do level adjustments */ 1985 /* do level adjustments */
1984 if (disease->stats.wc) 1986 if (disease->stats.wc ) disease->stats.wc += dur_mod / 2;
1985 disease->stats.wc += dur_mod / 2; 1987 if (disease->magic > 0) disease->magic += dur_mod / 8;
1986 1988 if (disease->stats.maxhp > 0) disease->stats.maxhp += dur_mod;
1987 if (disease->magic > 0) 1989 if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
1988 disease->magic += dur_mod / 8;
1989
1990 if (disease->stats.maxhp > 0)
1991 disease->stats.maxhp += dur_mod;
1992
1993 if (disease->stats.maxgrace > 0)
1994 disease->stats.maxgrace += dur_mod;
1995
1996 if (disease->stats.dam)
1997 {
1998 if (disease->stats.dam > 0)
1999 disease->stats.dam += dam_mod;
2000 else
2001 disease->stats.dam -= dam_mod;
2002 }
2003 1990
2004 if (disease->last_sp) 1991 if (disease->last_sp)
2005 { 1992 {
2006 disease->last_sp -= 2 * dam_mod; 1993 disease->last_sp -= 2 * dam_mod;
1994
2007 if (disease->last_sp < 1) 1995 if (disease->last_sp < 1)
2008 disease->last_sp = 1; 1996 disease->last_sp = 1;
2009 } 1997 }
2010 1998
2011 if (disease->stats.maxsp) 1999 if (disease->stats.dam ) disease->stats.dam += copysignl (disease->stats.dam , dam_mod);
2012 { 2000 if (disease->stats.maxsp) disease->stats.maxsp += copysignl (disease->stats.maxsp, dam_mod);
2013 if (disease->stats.maxsp > 0) 2001 if (disease->stats.ac ) disease->stats.ac += dam_mod;
2014 disease->stats.maxsp += dam_mod; 2002 if (disease->last_eat ) disease->last_eat -= dam_mod;
2015 else 2003 if (disease->stats.hp ) disease->stats.hp -= dam_mod;
2016 disease->stats.maxsp -= dam_mod; 2004 if (disease->stats.sp ) disease->stats.sp -= dam_mod;
2017 }
2018
2019 if (disease->stats.ac)
2020 disease->stats.ac += dam_mod;
2021
2022 if (disease->last_eat)
2023 disease->last_eat -= dam_mod;
2024
2025 if (disease->stats.hp)
2026 disease->stats.hp -= dam_mod;
2027
2028 if (disease->stats.sp)
2029 disease->stats.sp -= dam_mod;
2030 2005
2031 if (infect_object (walk, disease, 1)) 2006 if (infect_object (walk, disease, 1))
2032 { 2007 {
2033 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));
2034 2009
2035 disease->destroy (); /* don't need this one anymore */ 2010 disease->destroy (); /* don't need this one anymore */
2036 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2011 walk->map->insert (archetype::get (shstr_detect_magic), x, y, op);
2037 return 1; 2012 return 1;
2038 } 2013 }
2039 2014
2040 disease->destroy (); 2015 disease->destroy ();
2041 } 2016 }

Diff Legend

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