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.88 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.99 by root, Fri Mar 26 01:04:45 2010 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 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
37/* 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
38 * 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)
39 * but moved here so it could be applied to bolts too 39 * but moved here so it could be applied to bolts too
40 * op is the spell object. 40 * op is the spell object.
41 */ 41 */
42void 42static void
43check_spell_knockback (object *op) 43check_spell_knockback (object *op)
44{ 44{
45 int weight_move; 45 int weight_move;
46 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 */
47 47
… …
93 * also be safe for objects. 93 * also be safe for objects.
94 * This does return if successful or not, but 94 * This does return if successful or not, but
95 * I don't see us doing anything useful with that information 95 * I don't see us doing anything useful with that information
96 * right now. 96 * right now.
97 */ 97 */
98 move_object (tmp, absdir (op->stats.sp)); 98 tmp->move (absdir (op->stats.sp));
99 } 99 }
100 100
101 } 101 }
102} 102}
103 103
… …
108 ***************************************************************************/ 108 ***************************************************************************/
109 109
110/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
111 * is the first piece of the fork. 111 * is the first piece of the fork.
112 */ 112 */
113void 113static void
114forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
115{ 115{
116 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 */
117 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
118 maptile *m; 118 maptile *m;
… …
277 int mflags; 277 int mflags;
278 278
279 if (!spob->other_arch) 279 if (!spob->other_arch)
280 return 0; 280 return 0;
281 281
282 tmp = arch_to_object (spob->other_arch); 282 tmp = spob->other_arch->instance ();
283 if (tmp == NULL) 283 if (tmp == NULL)
284 return 0; 284 return 0;
285 285
286 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
287 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);
… …
389 389
390/* Causes an object to explode, eg, a firebullet, 390/* Causes an object to explode, eg, a firebullet,
391 * poison cloud ball, etc. op is the object to 391 * poison cloud ball, etc. op is the object to
392 * explode. 392 * explode.
393 */ 393 */
394void 394static void
395explode_bullet (object *op) 395explode_bullet (object *op)
396{ 396{
397 object *tmp, *owner; 397 object *tmp, *owner;
398 398
399 if (!op->other_arch) 399 if (!op->other_arch)
… …
439 if (op->destroyed ()) 439 if (op->destroyed ())
440 return; 440 return;
441 } 441 }
442 442
443 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
444 tmp = arch_to_object (op->other_arch); 444 tmp = op->other_arch->instance ();
445 445
446 tmp->set_owner (op); 446 tmp->set_owner (op);
447 tmp->skill = op->skill; 447 tmp->skill = op->skill;
448 448
449 owner = op->owner; 449 owner = op->owner;
… …
660 return 0; 660 return 0;
661 } 661 }
662 662
663 tmp->map = newmap; 663 tmp->map = newmap;
664 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
665 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)))
666 { 679 {
667 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
668 { 681 {
669 tmp->destroy (); 682 tmp->destroy ();
… …
687 * CONE RELATED FUNCTIONS 700 * CONE RELATED FUNCTIONS
688 * 701 *
689 *****************************************************************************/ 702 *****************************************************************************/
690 703
691/* 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" */
692void 705static void
693cone_drop (object *op) 706cone_drop (object *op)
694{ 707{
695 object *new_ob = arch_to_object (op->other_arch); 708 object *new_ob = op->other_arch->instance ();
696 709
697 new_ob->level = op->level; 710 new_ob->level = op->level;
698 new_ob->set_owner (op->owner); 711 new_ob->set_owner (op->owner);
699 712
700 /* preserve skill ownership */ 713 /* preserve skill ownership */
… …
861 874
862 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
863 continue; 876 continue;
864 877
865 success = 1; 878 success = 1;
866 tmp = arch_to_object (spell->other_arch); 879 tmp = spell->other_arch->instance ();
867 tmp->set_owner (op); 880 tmp->set_owner (op);
868 set_spell_skill (op, caster, spell, tmp); 881 set_spell_skill (op, caster, spell, tmp);
869 tmp->level = casting_level (caster, spell); 882 tmp->level = casting_level (caster, spell);
870 tmp->attacktype = spell->attacktype; 883 tmp->attacktype = spell->attacktype;
871 884
… …
973 for (int i = 1; i < 9; i++) 986 for (int i = 1; i < 9; i++)
974 { 987 {
975 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]))
976 continue; 989 continue;
977 990
978 object *tmp = arch_to_object (at); 991 object *tmp = at->instance ();
979 tmp->direction = i; 992 tmp->direction = i;
980 tmp->range = op->range; 993 tmp->range = op->range;
981 tmp->stats.dam = op->stats.dam; 994 tmp->stats.dam = op->stats.dam;
982 tmp->duration = op->duration; 995 tmp->duration = op->duration;
983 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
… …
1017 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1018 return 0; 1031 return 0;
1019 } 1032 }
1020 } 1033 }
1021 1034
1022 tmp = arch_to_object (spell->other_arch); 1035 tmp = spell->other_arch->instance ();
1023 1036
1024 /* level dependencies for bomb */ 1037 /* level dependencies for bomb */
1025 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1038 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1026 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);
1027 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1040 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
… …
1047 * dir is the direction to look in. 1060 * dir is the direction to look in.
1048 * range is how far out to look. 1061 * range is how far out to look.
1049 * 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.
1050 * this info is used for blocked magic/unholy spaces. 1063 * this info is used for blocked magic/unholy spaces.
1051 */ 1064 */
1052object * 1065static object *
1053get_pointed_target (object *op, int dir, int range, int type) 1066get_pointed_target (object *op, int dir, int range, int type)
1054{ 1067{
1055 object *target; 1068 object *target;
1056 sint16 x, y; 1069 sint16 x, y;
1057 int dist, mflags; 1070 int dist, mflags;
… …
1121 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1134 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1122 return 0; 1135 return 0;
1123 } 1136 }
1124 1137
1125 if (spell->other_arch) 1138 if (spell->other_arch)
1126 effect = arch_to_object (spell->other_arch); 1139 effect = spell->other_arch->instance ();
1127 else 1140 else
1128 return 0; 1141 return 0;
1129 1142
1130 /* tailor the effect by priest level and worshipped God */ 1143 /* tailor the effect by priest level and worshipped God */
1131 effect->level = casting_level (caster, spell); 1144 effect->level = casting_level (caster, spell);
… …
1244 * we do this by creating a force and inserting it in the 1257 * we do this by creating a force and inserting it in the
1245 * object. if time is 0, the object glows permanently. To truely 1258 * object. if time is 0, the object glows permanently. To truely
1246 * make this work for non-living objects, we would have to 1259 * make this work for non-living objects, we would have to
1247 * give them the capability to have an inventory. b.t. 1260 * give them the capability to have an inventory. b.t.
1248 */ 1261 */
1249int 1262static int
1250make_object_glow (object *op, int radius, int time) 1263make_object_glow (object *op, int radius, int time)
1251{ 1264{
1252 /* some things are unaffected... */ 1265 /* some things are unaffected... */
1253 if (op->path_denied & PATH_LIGHT) 1266 if (op->path_denied & PATH_LIGHT)
1254 return 0; 1267 return 0;
… …
1287 else 1300 else
1288 op->skill = 0; 1301 op->skill = 0;
1289 1302
1290 op->change_skill (find_skill_by_name (op, op->skill)); 1303 op->change_skill (find_skill_by_name (op, op->skill));
1291 1304
1305 dynbuf buf;
1292 unordered_mapwalk (op, -range, -range, range, range) 1306 unordered_mapwalk (buf, op, -range, -range, range, range)
1293 { 1307 {
1294 mapspace &ms = m->at (nx, ny); 1308 mapspace &ms = m->at (nx, ny);
1295 1309
1296 if (ms.flags () & P_IS_ALIVE) 1310 if (ms.flags () & P_IS_ALIVE)
1297 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1311 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1312 {
1313 next = tmp->above;
1314
1298 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ()) 1315 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1299 { 1316 {
1300 tmp = tmp->head_ (); 1317 tmp = tmp->head_ ();
1301 1318
1302 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ()) 1319 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1303 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ()))) 1320 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1304 { 1321 {
1305 if (spell_ob->subtype == SP_DESTRUCTION) 1322 if (spell_ob->subtype == SP_DESTRUCTION)
1306 { 1323 {
1307 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1324 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1308 1325
1309 if (spell_ob->other_arch) 1326 if (spell_ob->other_arch)
1310 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1327 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1311 } 1328 }
1312 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100) 1329 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1313 { 1330 {
1314 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1331 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1315 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1332 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1316 } 1333 }
1317 } 1334 }
1318 } 1335 }
1336 }
1319 } 1337 }
1320 1338
1321 op->skill = skill; 1339 op->skill = skill;
1322 return 1; 1340 return 1;
1323} 1341}
… …
1325/*************************************************************************** 1343/***************************************************************************
1326 * 1344 *
1327 * CURSE 1345 * CURSE
1328 * 1346 *
1329 ***************************************************************************/ 1347 ***************************************************************************/
1330
1331int 1348int
1332cast_curse (object *op, object *caster, object *spell_ob, int dir) 1349cast_curse (object *op, object *caster, object *spell_ob, int dir)
1333{ 1350{
1334 object *god = find_god (determine_god (op)); 1351 object *god = find_god (determine_god (op));
1335 object *tmp, *force; 1352 object *tmp, *force;
… …
1413 force->stats.wc = spell_ob->stats.wc; 1430 force->stats.wc = spell_ob->stats.wc;
1414 1431
1415 change_abil (tmp, force); /* Mostly to display any messages */ 1432 change_abil (tmp, force); /* Mostly to display any messages */
1416 insert_ob_in_ob (force, tmp); 1433 insert_ob_in_ob (force, tmp);
1417 tmp->update_stats (); 1434 tmp->update_stats ();
1435
1418 return 1; 1436 return 1;
1419
1420} 1437}
1421 1438
1422/********************************************************************** 1439/**********************************************************************
1423 * mood change 1440 * mood change
1424 * Arguably, this may or may not be an attack spell. But since it 1441 * Arguably, this may or may not be an attack spell. But since it
… …
1453 else if (god && spell->race == shstr_GOD_FRIEND) 1470 else if (god && spell->race == shstr_GOD_FRIEND)
1454 race = god->race; 1471 race = god->race;
1455 else 1472 else
1456 race = spell->race; 1473 race = spell->race;
1457 1474
1475 dynbuf buf;
1458 unordered_mapwalk (op, -range, -range, range, range) 1476 unordered_mapwalk (buf, op, -range, -range, range, range)
1459 { 1477 {
1460 mapspace &ms = m->at (nx, ny); 1478 mapspace &ms = m->at (nx, ny);
1461 1479
1462 /* If there is nothing living on this space, no need to go further */ 1480 /* If there is nothing living on this space, no need to go further */
1463 if (!ms.flags () & P_IS_ALIVE) 1481 if (!ms.flags () & P_IS_ALIVE)
… …
1525 Ryo, august 14th 1543 Ryo, august 14th
1526 */ 1544 */
1527 if (head->level > level) 1545 if (head->level > level)
1528 continue; 1546 continue;
1529 1547
1530 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1548 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1531 /* Failed, no effect */ 1549 /* Failed, no effect */
1532 continue; 1550 continue;
1533 } 1551 }
1534 1552
1535 /* Done with saving throw. Now start affecting the monster */ 1553 /* Done with saving throw. Now start affecting the monster */
… …
1577 head->stats.exp = 0; 1595 head->stats.exp = 0;
1578 } 1596 }
1579 1597
1580 /* If a monster was effected, put an effect in */ 1598 /* If a monster was effected, put an effect in */
1581 if (done_one && spell->other_arch) 1599 if (done_one && spell->other_arch)
1582 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1600 m->insert (spell->other_arch->instance (), nx, ny, op);
1583 } 1601 }
1584 1602
1585 return 1; 1603 return 1;
1586} 1604}
1587 1605
… …
1670 hit_map (op, j, op->attacktype, 1); 1688 hit_map (op, j, op->attacktype, 1);
1671 } 1689 }
1672 1690
1673 /* insert the other arch */ 1691 /* insert the other arch */
1674 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1692 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1675 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1693 m->insert (op->other_arch->instance (), hx, hy, op);
1676 } 1694 }
1677 1695
1678 /* restore to the center location and damage */ 1696 /* restore to the center location and damage */
1679 op->stats.dam = dam_save; 1697 op->stats.dam = dam_save;
1680 1698
… …
1896 return 0; 1914 return 0;
1897 } 1915 }
1898 } 1916 }
1899 1917
1900 /* ok, looks groovy to just insert a new light on the map */ 1918 /* ok, looks groovy to just insert a new light on the map */
1901 tmp = arch_to_object (spell->other_arch); 1919 tmp = spell->other_arch->instance ();
1902 if (!tmp) 1920 if (!tmp)
1903 { 1921 {
1904 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1922 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1905 return 0; 1923 return 0;
1906 } 1924 }
… …
1972 { 1990 {
1973 /* search this square for a victim */ 1991 /* search this square for a victim */
1974 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1992 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1975 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1993 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
1976 { /* found a victim */ 1994 { /* found a victim */
1977 object *disease = arch_to_object (spell->other_arch); 1995 object *disease = spell->other_arch->instance ();
1978 1996
1979 disease->set_owner (op); 1997 disease->set_owner (op);
1980 set_spell_skill (op, caster, spell, disease); 1998 set_spell_skill (op, caster, spell, disease);
1981 disease->stats.exp = 0; 1999 disease->stats.exp = 0;
1982 disease->level = casting_level (caster, spell); 2000 disease->level = casting_level (caster, spell);
… …
2032 if (infect_object (walk, disease, 1)) 2050 if (infect_object (walk, disease, 1))
2033 { 2051 {
2034 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2052 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2035 2053
2036 disease->destroy (); /* don't need this one anymore */ 2054 disease->destroy (); /* don't need this one anymore */
2037 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2055 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
2038 return 1; 2056 return 1;
2039 } 2057 }
2040 2058
2041 disease->destroy (); 2059 disease->destroy ();
2042 } 2060 }

Diff Legend

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