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.37 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.55 by root, Sat May 17 00:17:02 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* This file contains all the spell attack code. Grouping this code 24/* This file contains all the spell attack code. Grouping this code
26 * together should hopefully make it easier to find the relevent bits 25 * together should hopefully make it easier to find the relevent bits
27 * of code 26 * of code
… …
337 move_bolt (tmp); 336 move_bolt (tmp);
338 337
339 return 1; 338 return 1;
340} 339}
341 340
342
343
344/*************************************************************************** 341/***************************************************************************
345 * 342 *
346 * BULLET/BALL CODE 343 * BULLET/BALL CODE
347 * 344 *
348 ***************************************************************************/ 345 ***************************************************************************/
349 346
350/* expands an explosion. op is a piece of the 347/* expands an explosion. op is a piece of the
351 * explosion - this expans it in the different directions. 348 * explosion - this expands it in the different directions.
352 * At least that is what I think this does. 349 * At least that is what I think this does.
353 */ 350 */
354void 351void
355explosion (object *op) 352explosion (object *op)
356{ 353{
… …
390 } 387 }
391 } 388 }
392 } 389 }
393} 390}
394 391
395
396/* Causes an object to explode, eg, a firebullet, 392/* Causes an object to explode, eg, a firebullet,
397 * poison cloud ball, etc. op is the object to 393 * poison cloud ball, etc. op is the object to
398 * explode. 394 * explode.
399 */ 395 */
400void 396void
… …
409 return; 405 return;
410 } 406 }
411 407
412 if (op->env) 408 if (op->env)
413 { 409 {
414 object *env = object_get_env_recursive (op); 410 object *env = op->outer_env ();
411
415 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 412 if (!env->map || out_of_map (env->map, env->x, env->y))
416 { 413 {
417 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 414 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
418 op->destroy (); 415 op->destroy ();
419 return; 416 return;
420 } 417 }
… …
487 484
488 /* Prevent recursion */ 485 /* Prevent recursion */
489 op->move_on = 0; 486 op->move_on = 0;
490 487
491 tmp->insert_at (op, op); 488 tmp->insert_at (op, op);
489 tmp->play_sound (tmp->sound);
490
492 /* remove the firebullet */ 491 /* remove the firebullet */
493 op->destroy (); 492 op->destroy ();
494} 493}
495 494
496/* checks to see what op should do, given the space it is on 495/* checks to see what op should do, given the space it is on
… …
612 * we remove the magic flag - that can be derived from 611 * we remove the magic flag - that can be derived from
613 * spob->attacktype. 612 * spob->attacktype.
614 * This function sets up the appropriate owner and skill 613 * This function sets up the appropriate owner and skill
615 * pointers. 614 * pointers.
616 */ 615 */
617
618int 616int
619fire_bullet (object *op, object *caster, int dir, object *spob) 617fire_bullet (object *op, object *caster, int dir, object *spob)
620{ 618{
621 object *tmp = NULL; 619 object *tmp = NULL;
622 int mflags; 620 int mflags;
623 621
624 if (!spob->other_arch) 622 if (!spob->other_arch)
625 return 0; 623 return 0;
626 624
627 tmp = arch_to_object (spob->other_arch); 625 tmp = spob->other_arch->instance ();
628 if (tmp == NULL) 626 if (!tmp)
629 return 0; 627 return 0;
630 628
631 /* peterm: level dependency for bolts */ 629 /* peterm: level dependency for bolts */
632 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 630 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
633 tmp->attacktype = spob->attacktype; 631 tmp->attacktype = spob->attacktype;
634 if (spob->slaying) 632 if (spob->slaying)
635 tmp->slaying = spob->slaying; 633 tmp->slaying = spob->slaying;
636 634
… …
646 SET_ANIMATION (tmp, dir); 644 SET_ANIMATION (tmp, dir);
647 645
648 tmp->set_owner (op); 646 tmp->set_owner (op);
649 set_spell_skill (op, caster, spob, tmp); 647 set_spell_skill (op, caster, spob, tmp);
650 648
651 tmp->x = op->x + freearr_x[dir]; 649 tmp->x = op->x + freearr_x[dir];
652 tmp->y = op->y + freearr_y[dir]; 650 tmp->y = op->y + freearr_y[dir];
653 tmp->map = op->map; 651 tmp->map = op->map;
654 652
655 maptile *newmap; 653 maptile *newmap;
656 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 654 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
657 if (mflags & P_OUT_OF_MAP) 655 if (mflags & P_OUT_OF_MAP)
… …
820 818
821 /* Need to know what the movetype of the object we are about 819 /* Need to know what the movetype of the object we are about
822 * to create is, so we can know if the space we are about to 820 * to create is, so we can know if the space we are about to
823 * insert it into is blocked. 821 * insert it into is blocked.
824 */ 822 */
825 movetype = spell->other_arch->clone.move_type; 823 movetype = spell->other_arch->move_type;
826 824
827 for (i = range_min; i <= range_max; i++) 825 for (i = range_min; i <= range_max; i++)
828 { 826 {
829 sint16 x, y, d; 827 sint16 x, y, d;
830 828
… …
909 else 907 else
910 tmp->duration += caster->level / 3; 908 tmp->duration += caster->level / 3;
911 } 909 }
912 910
913 if (!(tmp->move_type & MOVE_FLY_LOW)) 911 if (!(tmp->move_type & MOVE_FLY_LOW))
914 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 912 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
915 913
916 if (!tmp->move_on && tmp->stats.dam) 914 if (!tmp->move_on && tmp->stats.dam)
917 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 915 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
918 916
919 m->insert (tmp, sx, sy, op); 917 m->insert (tmp, sx, sy, op);
920 918
921 /* This is used for tracking spells so that one effect doesn't hit 919 /* This is used for tracking spells so that one effect doesn't hit
922 * a single space too many times. 920 * a single space too many times.
… …
934 * 932 *
935 * BOMB related code 933 * BOMB related code
936 * 934 *
937 ****************************************************************************/ 935 ****************************************************************************/
938 936
939
940/* This handles an exploding bomb. 937/* This handles an exploding bomb.
941 * op is the original bomb object. 938 * op is the original bomb object.
942 */ 939 */
943void 940void
944animate_bomb (object *op) 941animate_bomb (object *op)
945{ 942{
946 int i;
947 object *env, *tmp;
948
949 if (op->state != NUM_ANIMATIONS (op) - 1) 943 if (op->state != NUM_ANIMATIONS (op) - 1)
950 return; 944 return;
951 945
952 env = object_get_env_recursive (op); 946 object *env = op->outer_env ();
953 947
954 if (op->env) 948 if (op->env)
955 { 949 {
956 if (env->map == NULL) 950 if (env->map == NULL)
957 return; 951 return;
958
959 if (env->type == PLAYER)
960 esrv_del_item (env->contr, op->count);
961 952
962 if (!(op = op->insert_at (env, op))) 953 if (!(op = op->insert_at (env, op)))
963 return; 954 return;
964 } 955 }
965 956
… …
976 * but using the cast_bullet isn't really feasible, 967 * but using the cast_bullet isn't really feasible,
977 * so just set up the appropriate values. 968 * so just set up the appropriate values.
978 */ 969 */
979 if (archetype *at = archetype::find (SPLINT)) 970 if (archetype *at = archetype::find (SPLINT))
980 { 971 {
981 for (i = 1; i < 9; i++) 972 for (int i = 1; i < 9; i++)
982 { 973 {
983 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 974 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
984 continue; 975 continue;
985 976
986 tmp = arch_to_object (at); 977 object *tmp = arch_to_object (at);
987 tmp->direction = i; 978 tmp->direction = i;
988 tmp->range = op->range; 979 tmp->range = op->range;
989 tmp->stats.dam = op->stats.dam; 980 tmp->stats.dam = op->stats.dam;
990 tmp->duration = op->duration; 981 tmp->duration = op->duration;
991 tmp->attacktype = op->attacktype; 982 tmp->attacktype = op->attacktype;
… …
1005} 996}
1006 997
1007int 998int
1008create_bomb (object *op, object *caster, int dir, object *spell) 999create_bomb (object *op, object *caster, int dir, object *spell)
1009{ 1000{
1010
1011 object *tmp; 1001 object *tmp;
1012 int mflags; 1002 int mflags;
1013 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1003 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1014 maptile *m; 1004 maptile *m;
1015 1005
… …
1017 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1007 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1018 { 1008 {
1019 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1009 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1020 return 0; 1010 return 0;
1021 } 1011 }
1012
1022 tmp = arch_to_object (spell->other_arch); 1013 tmp = arch_to_object (spell->other_arch);
1023 1014
1024 /* level dependencies for bomb */ 1015 /* level dependencies for bomb */
1025 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1016 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1026 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1017 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
… …
1047 * dir is the direction to look in. 1038 * dir is the direction to look in.
1048 * range is how far out to look. 1039 * range is how far out to look.
1049 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1040 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1050 * this info is used for blocked magic/unholy spaces. 1041 * this info is used for blocked magic/unholy spaces.
1051 */ 1042 */
1052
1053object * 1043object *
1054get_pointed_target (object *op, int dir, int range, int type) 1044get_pointed_target (object *op, int dir, int range, int type)
1055{ 1045{
1056 object *target; 1046 object *target;
1057 sint16 x, y; 1047 sint16 x, y;
… …
1076 return NULL; 1066 return NULL;
1077 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1067 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1078 return NULL; 1068 return NULL;
1079 1069
1080 if (mflags & P_IS_ALIVE) 1070 if (mflags & P_IS_ALIVE)
1081 {
1082 for (target = GET_MAP_OB (mp, x, y); target; target = target->above) 1071 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1083 { 1072 if (QUERY_FLAG (target, FLAG_MONSTER))
1084 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1085 {
1086 return target; 1073 return target;
1087 }
1088 }
1089 }
1090 } 1074 }
1075
1091 return NULL; 1076 return NULL;
1092} 1077}
1093
1094 1078
1095/* cast_smite_arch() - the priest points to a creature and causes 1079/* cast_smite_arch() - the priest points to a creature and causes
1096 * a 'godly curse' to decend. 1080 * a 'godly curse' to decend.
1097 * usual params - 1081 * usual params -
1098 * op = player 1082 * op = player
1099 * caster = object casting the spell. 1083 * caster = object casting the spell.
1100 * dir = direction being cast 1084 * dir = direction being cast
1101 * spell = spell object 1085 * spell = spell object
1102 */ 1086 */
1103
1104int 1087int
1105cast_smite_spell (object *op, object *caster, int dir, object *spell) 1088cast_smite_spell (object *op, object *caster, int dir, object *spell)
1106{ 1089{
1107 object *effect, *target; 1090 object *effect, *target;
1108 object *god = find_god (determine_god (op)); 1091 object *god = find_god (determine_god (op));
… …
1186 effect->insert_at (target, op); 1169 effect->insert_at (target, op);
1187 1170
1188 return 1; 1171 return 1;
1189} 1172}
1190 1173
1191
1192/**************************************************************************** 1174/****************************************************************************
1193 * 1175 *
1194 * MAGIC MISSILE code. 1176 * MAGIC MISSILE code.
1195 * note that the fire_bullet is used to fire the missile. The 1177 * note that the fire_bullet is used to fire the missile. The
1196 * code here is just to move the missile. 1178 * code here is just to move the missile.
… …
1266 * we do this by creating a force and inserting it in the 1248 * we do this by creating a force and inserting it in the
1267 * object. if time is 0, the object glows permanently. To truely 1249 * object. if time is 0, the object glows permanently. To truely
1268 * make this work for non-living objects, we would have to 1250 * make this work for non-living objects, we would have to
1269 * give them the capability to have an inventory. b.t. 1251 * give them the capability to have an inventory. b.t.
1270 */ 1252 */
1271
1272int 1253int
1273make_object_glow (object *op, int radius, int time) 1254make_object_glow (object *op, int radius, int time)
1274{ 1255{
1275 object *tmp;
1276
1277 /* some things are unaffected... */ 1256 /* some things are unaffected... */
1278 if (op->path_denied & PATH_LIGHT) 1257 if (op->path_denied & PATH_LIGHT)
1279 return 0; 1258 return 0;
1280 1259
1281 tmp = get_archetype (FORCE_NAME); 1260 object *tmp = get_archetype (FORCE_NAME);
1282 tmp->speed = 0.01; 1261 tmp->speed = 0.01;
1283 tmp->stats.food = time; 1262 tmp->stats.food = time;
1284 SET_FLAG (tmp, FLAG_IS_USED_UP); 1263 SET_FLAG (tmp, FLAG_IS_USED_UP);
1285 tmp->glow_radius = radius; 1264 tmp->glow_radius = radius;
1286 if (tmp->glow_radius > MAX_LIGHT_RADII) 1265 if (tmp->glow_radius > MAX_LIGHT_RADII)
1287 tmp->glow_radius = MAX_LIGHT_RADII; 1266 tmp->glow_radius = MAX_LIGHT_RADII;
1288 1267
1289 tmp->x = op->x;
1290 tmp->y = op->y;
1291 if (tmp->speed < MIN_ACTIVE_SPEED)
1292 tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1293 tmp = insert_ob_in_ob (tmp, op); 1268 tmp = insert_ob_in_ob (tmp, op);
1269
1294 if (tmp->glow_radius > op->glow_radius) 1270 if (tmp->glow_radius > op->glow_radius)
1295 op->glow_radius = tmp->glow_radius; 1271 op->glow_radius = tmp->glow_radius;
1296 1272
1297 if (!tmp->env || op != tmp->env)
1298 {
1299 LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1300 return 0;
1301 }
1302 return 1; 1273 return 1;
1303} 1274}
1304 1275
1305int 1276int
1306cast_destruction (object *op, object *caster, object *spell_ob) 1277cast_destruction (object *op, object *caster, object *spell_ob)
… …
1397 { 1368 {
1398 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1369 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1399 return 0; 1370 return 0;
1400 } 1371 }
1401 1372
1373 tmp = tmp->head_ ();
1374
1402 /* If we've already got a force of this type, don't add a new one. */ 1375 /* If we've already got a force of this type, don't add a new one. */
1403 for (force = tmp->inv; force != NULL; force = force->below) 1376 for (force = tmp->inv; force; force = force->below)
1404 { 1377 {
1405 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1378 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1406 { 1379 {
1407 if (force->name == spell_ob->name) 1380 if (force->name == spell_ob->name)
1408 { 1381 {
… …
1414 return 0; 1387 return 0;
1415 } 1388 }
1416 } 1389 }
1417 } 1390 }
1418 1391
1419 if (force == NULL) 1392 if (!force)
1420 { 1393 {
1421 force = get_archetype (FORCE_NAME); 1394 force = get_archetype (FORCE_NAME);
1422 force->subtype = FORCE_CHANGE_ABILITY; 1395 force->subtype = FORCE_CHANGE_ABILITY;
1396
1423 if (spell_ob->race) 1397 if (spell_ob->race)
1424 force->name = spell_ob->race; 1398 force->name = spell_ob->race;
1425 else 1399 else
1426 force->name = spell_ob->name; 1400 force->name = spell_ob->name;
1427 1401
… …
1437 { 1411 {
1438 force->duration = duration; 1412 force->duration = duration;
1439 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1413 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1440 } 1414 }
1441 else 1415 else
1442 {
1443 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1416 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1444 } 1417
1445 return 1; 1418 return 1;
1446 } 1419 }
1420
1447 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1421 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1448 force->speed = 1.f; 1422 force->speed = 1.f;
1449 force->speed_left = -1.f; 1423 force->speed_left = -1.f;
1450 SET_FLAG (force, FLAG_APPLIED); 1424 SET_FLAG (force, FLAG_APPLIED);
1451 1425
… …
1624 } 1598 }
1625 1599
1626 /* charm */ 1600 /* charm */
1627 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1601 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1628 { 1602 {
1603 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1604
1629 /* Prevent uncontolled outbreaks of self replicating monsters. 1605 /* Prevent uncontrolled outbreaks of self replicating monsters.
1630 Typical use case is charm, go somwhere, use aggravation to make hostile. 1606 Typical use case is charm, go somwhere, use aggravation to make hostile.
1631 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1607 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1632 CLEAR_FLAG (head, FLAG_GENERATOR); 1608 CLEAR_FLAG (head, FLAG_GENERATOR);
1633 head->set_owner (op); 1609 head->set_owner (op);
1634 set_spell_skill (op, caster, spell, head); 1610 set_spell_skill (op, caster, spell, head);
… …
1753 1729
1754 op->direction = i; 1730 op->direction = i;
1755 } 1731 }
1756} 1732}
1757 1733
1758
1759/* move_swarm_spell: peterm 1734/* move_swarm_spell: peterm
1760 * This is an implementation of the swarm spell. It was written for 1735 * This is an implementation of the swarm spell. It was written for
1761 * meteor swarm, but it could be used for any swarm. A swarm spell 1736 * meteor swarm, but it could be used for any swarm. A swarm spell
1762 * is a special type of object that casts swarms of other types 1737 * is a special type of object that casts swarms of other types
1763 * of spells. Which spell it casts is flexible. It fires the spells 1738 * of spells. Which spell it casts is flexible. It fires the spells
1764 * from a set of squares surrounding the caster, in a given direction. 1739 * from a set of squares surrounding the caster, in a given direction.
1765 */ 1740 */
1766
1767void 1741void
1768move_swarm_spell (object *op) 1742move_swarm_spell (object *op)
1769{ 1743{
1770#if 0 1744#if 0
1771 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1745 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1772 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1746 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1773 sint16 target_x, target_y, origin_x, origin_y; 1747 sint16 target_x, target_y, origin_x, origin_y;
1774 int adjustdir; 1748 int adjustdir;
1775 maptile *m; 1749 maptile *m;
1776#endif 1750#endif
1777 int basedir;
1778 object *owner; 1751 object *owner = op->env;
1779 1752
1780 owner = op->owner; 1753 if (!op->duration || !owner->is_on_map ())
1781 if (op->duration == 0 || owner == NULL)
1782 { 1754 {
1783 op->destroy (); 1755 op->destroy ();
1784 return; 1756 return;
1785 } 1757 }
1786 1758
1787 op->duration--; 1759 op->duration--;
1788 1760
1789 basedir = op->direction; 1761 int basedir = op->direction;
1790 if (basedir == 0) 1762 if (!basedir)
1791 {
1792 /* spray in all directions! 8) */ 1763 /* spray in all directions! 8) */
1793 basedir = rndm (1, 8); 1764 basedir = rndm (1, 8);
1794 }
1795 1765
1796#if 0 1766#if 0
1797 // this is bogus: it causes wrong places to be checked below 1767 // this is bogus: it causes wrong places to be checked below
1798 // (a wall 2 cells away will block the effect...) and 1768 // (a wall 2 cells away will block the effect...) and
1799 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1769 // doesn't work for SP_BULLET anyhow, so again tests the wrong
… …
1862 fire_bullet (owner, op, basedir, op->spell); 1832 fire_bullet (owner, op, basedir, op->spell);
1863 else if (op->spell->subtype == SP_MAGIC_MISSILE) 1833 else if (op->spell->subtype == SP_MAGIC_MISSILE)
1864 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell); 1834 fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell);
1865 } 1835 }
1866} 1836}
1867
1868
1869
1870 1837
1871/* fire_swarm: 1838/* fire_swarm:
1872 * The following routine creates a swarm of objects. It actually 1839 * The following routine creates a swarm of objects. It actually
1873 * sets up a specific swarm object, which then fires off all 1840 * sets up a specific swarm object, which then fires off all
1874 * the parts of the swarm. 1841 * the parts of the swarm.
… …
1877 * caster: the caster (owner, wand, rod, scroll) 1844 * caster: the caster (owner, wand, rod, scroll)
1878 * dir: the direction everything will be fired in 1845 * dir: the direction everything will be fired in
1879 * spell - the spell that is this spell. 1846 * spell - the spell that is this spell.
1880 * n: the number to be fired. 1847 * n: the number to be fired.
1881 */ 1848 */
1882
1883int 1849int
1884fire_swarm (object *op, object *caster, object *spell, int dir) 1850fire_swarm (object *op, object *caster, object *spell, int dir)
1885{ 1851{
1886 object *tmp;
1887 int i;
1888
1889 if (!spell->other_arch) 1852 if (!spell->other_arch)
1890 return 0; 1853 return 0;
1891 1854
1892 tmp = get_archetype (SWARM_SPELL); 1855 object *tmp = archetype::get (SWARM_SPELL);
1893 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1894 set_spell_skill (op, caster, spell, tmp); 1856 set_spell_skill (op, caster, spell, tmp);
1895
1896 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1857 tmp->level = caster_level (caster, spell); /* needed later, to get level dep. right. */
1897 tmp->spell = arch_to_object (spell->other_arch); 1858 tmp->spell = spell->other_arch->instance ();
1898
1899 tmp->attacktype = tmp->spell->attacktype; 1859 tmp->attacktype = tmp->spell->attacktype;
1900 1860
1901 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1861 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1902 if (!tailor_god_spell (tmp, op)) 1862 if (!tailor_god_spell (tmp, op))
1903 return 1; 1863 return 1;
1904 1864
1905 tmp->duration = SP_level_duration_adjust (caster, spell); 1865 tmp->duration = SP_level_duration_adjust (caster, spell);
1906 for (i = 0; i < spell->duration; i++) 1866 for (int i = 0; i < spell->duration; i++)
1907 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1867 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1908 1868
1909 tmp->direction = dir; 1869 tmp->direction = dir;
1910 tmp->invisible = 1; 1870 tmp->invisible = 1;
1911 1871
1912 tmp->insert_at (op, op); 1872 op->insert (tmp);
1873
1913 return 1; 1874 return 1;
1914} 1875}
1915
1916 1876
1917/* See the spells documentation file for why this is its own 1877/* See the spells documentation file for why this is its own
1918 * function. 1878 * function.
1919 */ 1879 */
1920int 1880int
… …
1982 1942
1983 m->insert (tmp, x, y, op); 1943 m->insert (tmp, x, y, op);
1984 return 1; 1944 return 1;
1985} 1945}
1986 1946
1987
1988
1989
1990/* cast_cause_disease: this spell looks along <dir> from the 1947/* cast_cause_disease: this spell looks along <dir> from the
1991 * player and infects someone. 1948 * player and infects someone.
1992 * op is the player/monster, caster is the object, dir is the direction 1949 * op is the player/monster, caster is the object, dir is the direction
1993 * to cast, disease_arch is the specific disease, and type is the spell number 1950 * to cast, disease_arch is the specific disease, and type is the spell number
1994 * perhaps this should actually be in disease.c? 1951 * perhaps this should actually be in disease.c?
1995 */ 1952 */
1996
1997int 1953int
1998cast_cause_disease (object *op, object *caster, object *spell, int dir) 1954cast_cause_disease (object *op, object *caster, object *spell, int dir)
1999{ 1955{
2000 sint16 x, y; 1956 sint16 x, y;
2001 int i, mflags, range, dam_mod, dur_mod; 1957 int i, mflags, range, dam_mod, dur_mod;
… …
2008 /* If casting from a scroll, no direction will be available, so refer to the 1964 /* If casting from a scroll, no direction will be available, so refer to the
2009 * direction the player is pointing. 1965 * direction the player is pointing.
2010 */ 1966 */
2011 if (!dir) 1967 if (!dir)
2012 dir = op->facing; 1968 dir = op->facing;
1969
2013 if (!dir) 1970 if (!dir)
2014 return 0; /* won't find anything if casting on ourself, so just return */ 1971 return 0; /* won't find anything if casting on ourself, so just return */
2015 1972
2016 /* Calculate these once here */ 1973 /* Calculate these once here */
2017 range = spell->range + SP_level_range_adjust (caster, spell); 1974 range = spell->range + SP_level_range_adjust (caster, spell);
… …
2051 /* do level adjustments */ 2008 /* do level adjustments */
2052 if (disease->stats.wc) 2009 if (disease->stats.wc)
2053 disease->stats.wc += dur_mod / 2; 2010 disease->stats.wc += dur_mod / 2;
2054 2011
2055 if (disease->magic > 0) 2012 if (disease->magic > 0)
2056 disease->magic += dur_mod / 4; 2013 disease->magic += dur_mod / 8;
2057 2014
2058 if (disease->stats.maxhp > 0) 2015 if (disease->stats.maxhp > 0)
2059 disease->stats.maxhp += dur_mod; 2016 disease->stats.maxhp += dur_mod;
2060 2017
2061 if (disease->stats.maxgrace > 0) 2018 if (disease->stats.maxgrace > 0)
… …
2099 if (infect_object (walk, disease, 1)) 2056 if (infect_object (walk, disease, 1))
2100 { 2057 {
2101 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2058 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2102 2059
2103 disease->destroy (); /* don't need this one anymore */ 2060 disease->destroy (); /* don't need this one anymore */
2104 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op); 2061 walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2105 return 1; 2062 return 1;
2106 } 2063 }
2107 2064
2108 disease->destroy (); 2065 disease->destroy ();
2109 } 2066 }

Diff Legend

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