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.59 by root, Sat May 17 15:25:19 2008 UTC vs.
Revision 1.67 by root, Mon Sep 29 10:32:50 2008 UTC

… …
148 new_bolt->duration++; 148 new_bolt->duration++;
149 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 149 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
150 new_bolt->stats.dam++; 150 new_bolt->stats.dam++;
151 tmp->stats.dam /= 2; /* reduce father bolt damage */ 151 tmp->stats.dam /= 2; /* reduce father bolt damage */
152 tmp->stats.dam++; 152 tmp->stats.dam++;
153
153 if ((new_bolt = m->insert (new_bolt, sx, sy, op))) 154 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
154 update_turn_face (new_bolt); 155 update_turn_face (new_bolt);
155} 156}
156 157
157/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 158/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
… …
164 sint16 x, y; 165 sint16 x, y;
165 maptile *m; 166 maptile *m;
166 167
167 if (--op->duration < 0) 168 if (--op->duration < 0)
168 { 169 {
169 op->destroy (); 170 op->drop_and_destroy ();
170 return; 171 return;
171 } 172 }
172 173
173 hit_map (op, 0, op->attacktype, 1); 174 hit_map (op, 0, op->attacktype, 1);
174 175
… …
306 307
307 maptile *newmap; 308 maptile *newmap;
308 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 309 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
309 if (mflags & P_OUT_OF_MAP) 310 if (mflags & P_OUT_OF_MAP)
310 { 311 {
311 tmp->destroy (); 312 tmp->drop_and_destroy ();
312 return 0; 313 return 0;
313 } 314 }
314 315
315 tmp->map = newmap; 316 tmp->map = newmap;
316 317
317 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 318 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
318 { 319 {
319 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
320 { 321 {
321 tmp->destroy (); 322 tmp->drop_and_destroy ();
322 return 0; 323 return 0;
323 } 324 }
324 325
325 tmp->x = op->x; 326 tmp->x = op->x;
326 tmp->y = op->y; 327 tmp->y = op->y;
… …
392void 393void
393explode_bullet (object *op) 394explode_bullet (object *op)
394{ 395{
395 object *tmp, *owner; 396 object *tmp, *owner;
396 397
397 if (op->other_arch == NULL) 398 if (!op->other_arch)
398 { 399 {
399 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 400 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
400 op->destroy (); 401 op->destroy ();
401 return; 402 return;
402 } 403 }
… …
444 tmp->set_owner (op); 445 tmp->set_owner (op);
445 tmp->skill = op->skill; 446 tmp->skill = op->skill;
446 447
447 owner = op->owner; 448 owner = op->owner;
448 449
449 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 450 if ((tmp->attacktype & AT_HOLYWORD
451 || tmp->attacktype & AT_GODPOWER)
452 && owner
453 && !tailor_god_spell (tmp, owner))
450 { 454 {
451 op->destroy (); 455 op->destroy ();
452 return; 456 return;
453 } 457 }
454 458
… …
520 { 524 {
521 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
522 { 526 {
523 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
524 528
529 // TODO: can't understand the following if's
525 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
526 { 531 {
527 if (!QUERY_FLAG (op, FLAG_REMOVED)) 532 if (!QUERY_FLAG (op, FLAG_REMOVED))
528 { 533 {
529 op->destroy (); 534 op->destroy ();
… …
742 check_spell_knockback (op); 747 check_spell_knockback (op);
743 748
744 if (op->destroyed ()) 749 if (op->destroyed ())
745 return; 750 return;
746 751
747 if ((op->duration--) < 0) 752 if (op->duration-- < 0)
748 { 753 {
749 op->destroy (); 754 op->destroy ();
750 return; 755 return;
751 } 756 }
752 /* Object has hit maximum range, so don't have it move 757 /* Object has hit maximum range, so don't have it move
… …
859 864
860 success = 1; 865 success = 1;
861 tmp = arch_to_object (spell->other_arch); 866 tmp = arch_to_object (spell->other_arch);
862 tmp->set_owner (op); 867 tmp->set_owner (op);
863 set_spell_skill (op, caster, spell, tmp); 868 set_spell_skill (op, caster, spell, tmp);
864 tmp->level = caster_level (caster, spell); 869 tmp->level = casting_level (caster, spell);
865 tmp->attacktype = spell->attacktype; 870 tmp->attacktype = spell->attacktype;
866 871
867 /* holy word stuff */ 872 /* holy word stuff */
868 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 873 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
869 if (!tailor_god_spell (tmp, op)) 874 if (!tailor_god_spell (tmp, op))
… …
1111 effect = arch_to_object (spell->other_arch); 1116 effect = arch_to_object (spell->other_arch);
1112 else 1117 else
1113 return 0; 1118 return 0;
1114 1119
1115 /* tailor the effect by priest level and worshipped God */ 1120 /* tailor the effect by priest level and worshipped God */
1116 effect->level = caster_level (caster, spell); 1121 effect->level = casting_level (caster, spell);
1117 effect->attacktype = spell->attacktype; 1122 effect->attacktype = spell->attacktype;
1118 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1123 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1119 { 1124 {
1120 if (tailor_god_spell (effect, op)) 1125 if (tailor_god_spell (effect, op))
1121 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1126 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op));
… …
1178void 1183void
1179move_missile (object *op) 1184move_missile (object *op)
1180{ 1185{
1181 if (op->range-- <= 0) 1186 if (op->range-- <= 0)
1182 { 1187 {
1183 op->destroy (); 1188 op->drop_and_destroy ();
1184 return; 1189 return;
1185 } 1190 }
1186 1191
1187 mapxy pos (op); 1192 mapxy pos (op);
1188 pos.move (op->direction); 1193 pos.move (op->direction);
… …
1450 1455
1451 /* We precompute some values here so that we don't have to keep 1456 /* We precompute some values here so that we don't have to keep
1452 * doing it over and over again. 1457 * doing it over and over again.
1453 */ 1458 */
1454 god = find_god (determine_god (op)); 1459 god = find_god (determine_god (op));
1455 level = caster_level (caster, spell); 1460 level = casting_level (caster, spell);
1456 range = spell->range + SP_level_range_adjust (caster, spell); 1461 range = spell->range + SP_level_range_adjust (caster, spell);
1457 1462
1458 /* On the bright side, no monster should ever have a race of GOD_... 1463 /* On the bright side, no monster should ever have a race of GOD_...
1459 * so even if the player doesn't worship a god, if race=GOD_.., it 1464 * so even if the player doesn't worship a god, if race=GOD_.., it
1460 * won't ever match anything. 1465 * won't ever match anything.
… …
1610 * about. was called move_ball_lightning, but since more than the ball 1615 * about. was called move_ball_lightning, but since more than the ball
1611 * lightning spell used it, that seemed misnamed. 1616 * lightning spell used it, that seemed misnamed.
1612 * op is the spell effect. 1617 * op is the spell effect.
1613 * note that duration is handled by process_object() in time.c 1618 * note that duration is handled by process_object() in time.c
1614 */ 1619 */
1615
1616void 1620void
1617move_ball_spell (object *op) 1621move_ball_spell (object *op)
1618{ 1622{
1619 int i, j, dam_save, dir, mflags; 1623 int i, j, dam_save, dir, mflags;
1620 sint16 nx, ny, hx, hy; 1624 sint16 nx, ny, hx, hy;
… …
1739 return; 1743 return;
1740 } 1744 }
1741 1745
1742 if (!op->duration || !owner->is_on_map ()) 1746 if (!op->duration || !owner->is_on_map ())
1743 { 1747 {
1744 op->destroy (); 1748 op->drop_and_destroy ();
1745 return; 1749 return;
1746 } 1750 }
1747 1751
1748 op->duration--; 1752 op->duration--;
1749 1753
1750 int basedir = op->direction; 1754 int basedir = op->direction;
1751 if (!basedir) 1755 if (!basedir)
1756 {
1752 /* spray in all directions! 8) */ 1757 /* spray in all directions! 8) */
1753 basedir = (op->facing += op->state) % 8 + 1; 1758 op->facing = (op->facing + op->state) & 7;
1759 basedir = op->facing + 1;
1760 }
1754 1761
1755#if 0 1762#if 0
1756 // this is bogus: it causes wrong places to be checked below 1763 // this is bogus: it causes wrong places to be checked below
1757 // (a wall 2 cells away will block the effect...) and 1764 // (a wall 2 cells away will block the effect...) and
1758 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1765 // doesn't work for SP_BULLET anyhow, so again tests the wrong
… …
1840{ 1847{
1841 if (!spell->other_arch) 1848 if (!spell->other_arch)
1842 return 0; 1849 return 0;
1843 1850
1844 object *tmp = archetype::get (SWARM_SPELL); 1851 object *tmp = archetype::get (SWARM_SPELL);
1852
1845 set_spell_skill (op, caster, spell, tmp); 1853 set_spell_skill (op, caster, spell, tmp);
1846 tmp->level = caster_level (caster, spell); /* needed later, to get level dep. right. */ 1854 tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */
1847 tmp->spell = spell->other_arch->instance (); 1855 tmp->spell = spell->other_arch->instance ();
1848 tmp->attacktype = tmp->spell->attacktype; 1856 tmp->attacktype = tmp->spell->attacktype;
1849 1857
1850 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1858 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1851 if (!tailor_god_spell (tmp, op)) 1859 if (!tailor_god_spell (tmp, op))
… …
1994 object *disease = arch_to_object (spell->other_arch); 2002 object *disease = arch_to_object (spell->other_arch);
1995 2003
1996 disease->set_owner (op); 2004 disease->set_owner (op);
1997 set_spell_skill (op, caster, spell, disease); 2005 set_spell_skill (op, caster, spell, disease);
1998 disease->stats.exp = 0; 2006 disease->stats.exp = 0;
1999 disease->level = caster_level (caster, spell); 2007 disease->level = casting_level (caster, spell);
2000 2008
2001 /* do level adjustments */ 2009 /* do level adjustments */
2002 if (disease->stats.wc) 2010 if (disease->stats.wc)
2003 disease->stats.wc += dur_mod / 2; 2011 disease->stats.wc += dur_mod / 2;
2004 2012

Diff Legend

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