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.58 by root, Sat May 17 14:57:23 2008 UTC vs.
Revision 1.71 by root, Mon Dec 22 21:51:11 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 ();
… …
732 } 737 }
733#endif 738#endif
734 739
735 hit_map (op, 0, op->attacktype, 0); 740 hit_map (op, 0, op->attacktype, 0);
736 741
742 if (!op->is_on_map ())
743 return;
744
737 /* Check to see if we should push anything. 745 /* Check to see if we should push anything.
738 * Spell objects with weight push whatever they encounter to some 746 * Spell objects with weight push whatever they encounter to some
739 * degree. 747 * degree.
740 */ 748 */
741 if (op->weight) 749 if (op->weight)
750 {
742 check_spell_knockback (op); 751 check_spell_knockback (op);
743 752
744 if (op->destroyed ()) 753 if (!op->is_on_map ())
745 return; 754 return;
755 }
746 756
747 if ((op->duration--) < 0) 757 if (op->duration-- < 0)
748 { 758 {
749 op->destroy (); 759 op->destroy ();
750 return; 760 return;
751 } 761 }
752 /* Object has hit maximum range, so don't have it move 762 /* Object has hit maximum range, so don't have it move
… …
859 869
860 success = 1; 870 success = 1;
861 tmp = arch_to_object (spell->other_arch); 871 tmp = arch_to_object (spell->other_arch);
862 tmp->set_owner (op); 872 tmp->set_owner (op);
863 set_spell_skill (op, caster, spell, tmp); 873 set_spell_skill (op, caster, spell, tmp);
864 tmp->level = caster_level (caster, spell); 874 tmp->level = casting_level (caster, spell);
865 tmp->attacktype = spell->attacktype; 875 tmp->attacktype = spell->attacktype;
866 876
867 /* holy word stuff */ 877 /* holy word stuff */
868 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 878 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
869 if (!tailor_god_spell (tmp, op)) 879 if (!tailor_god_spell (tmp, op))
… …
998 int mflags; 1008 int mflags;
999 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1009 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1000 maptile *m; 1010 maptile *m;
1001 1011
1002 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1012 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1013
1014 // when creating a bomb below ourself it should always work, even
1015 // when movement is blocked (somehow we got here, somehow we are here,
1016 // so we should also be able to make a bomb here). (originally added
1017 // to fix create bomb traps in doors, which cast with dir=0).
1018 if (dir)
1019 {
1003 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1020 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1004 { 1021 {
1005 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1022 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1006 return 0; 1023 return 0;
1024 }
1007 } 1025 }
1008 1026
1009 tmp = arch_to_object (spell->other_arch); 1027 tmp = arch_to_object (spell->other_arch);
1010 1028
1011 /* level dependencies for bomb */ 1029 /* level dependencies for bomb */
… …
1111 effect = arch_to_object (spell->other_arch); 1129 effect = arch_to_object (spell->other_arch);
1112 else 1130 else
1113 return 0; 1131 return 0;
1114 1132
1115 /* tailor the effect by priest level and worshipped God */ 1133 /* tailor the effect by priest level and worshipped God */
1116 effect->level = caster_level (caster, spell); 1134 effect->level = casting_level (caster, spell);
1117 effect->attacktype = spell->attacktype; 1135 effect->attacktype = spell->attacktype;
1118 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) 1136 if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1119 { 1137 {
1120 if (tailor_god_spell (effect, op)) 1138 if (tailor_god_spell (effect, op))
1121 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); 1139 new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op));
… …
1178void 1196void
1179move_missile (object *op) 1197move_missile (object *op)
1180{ 1198{
1181 if (op->range-- <= 0) 1199 if (op->range-- <= 0)
1182 { 1200 {
1183 op->destroy (); 1201 op->drop_and_destroy ();
1184 return; 1202 return;
1185 } 1203 }
1186 1204
1187 mapxy pos (op); 1205 mapxy pos (op);
1188 pos.move (op->direction); 1206 pos.move (op->direction);
… …
1240 1258
1241 object *tmp = get_archetype (FORCE_NAME); 1259 object *tmp = get_archetype (FORCE_NAME);
1242 tmp->speed = 0.01; 1260 tmp->speed = 0.01;
1243 tmp->stats.food = time; 1261 tmp->stats.food = time;
1244 SET_FLAG (tmp, FLAG_IS_USED_UP); 1262 SET_FLAG (tmp, FLAG_IS_USED_UP);
1245 tmp->glow_radius = radius;
1246 if (tmp->glow_radius > MAX_LIGHT_RADII)
1247 tmp->glow_radius = MAX_LIGHT_RADII; 1263 tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius);
1248
1249 tmp = insert_ob_in_ob (tmp, op); 1264 tmp = insert_ob_in_ob (tmp, op);
1250 1265
1251 if (tmp->glow_radius > op->glow_radius) 1266 if (tmp->glow_radius > op->glow_radius)
1252 op->glow_radius = tmp->glow_radius; 1267 op->glow_radius = tmp->glow_radius;
1253 1268
… …
1450 1465
1451 /* We precompute some values here so that we don't have to keep 1466 /* We precompute some values here so that we don't have to keep
1452 * doing it over and over again. 1467 * doing it over and over again.
1453 */ 1468 */
1454 god = find_god (determine_god (op)); 1469 god = find_god (determine_god (op));
1455 level = caster_level (caster, spell); 1470 level = casting_level (caster, spell);
1456 range = spell->range + SP_level_range_adjust (caster, spell); 1471 range = spell->range + SP_level_range_adjust (caster, spell);
1457 1472
1458 /* On the bright side, no monster should ever have a race of GOD_... 1473 /* 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 1474 * so even if the player doesn't worship a god, if race=GOD_.., it
1460 * won't ever match anything. 1475 * won't ever match anything.
… …
1603 } /* for y */ 1618 } /* for y */
1604 1619
1605 return 1; 1620 return 1;
1606} 1621}
1607 1622
1608
1609/* Move_ball_spell: This handles ball type spells that just sort of wander 1623/* Move_ball_spell: This handles ball type spells that just sort of wander
1610 * about. was called move_ball_lightning, but since more than the ball 1624 * about. was called move_ball_lightning, but since more than the ball
1611 * lightning spell used it, that seemed misnamed. 1625 * lightning spell used it, that seemed misnamed.
1612 * op is the spell effect. 1626 * op is the spell effect.
1613 * note that duration is handled by process_object() in time.c 1627 * note that duration is handled by process_object() in time.c
1614 */ 1628 */
1615
1616void 1629void
1617move_ball_spell (object *op) 1630move_ball_spell (object *op)
1618{ 1631{
1619 int i, j, dam_save, dir, mflags; 1632 int i, j, dam_save, dir, mflags;
1620 sint16 nx, ny, hx, hy; 1633 sint16 nx, ny, hx, hy;
… …
1639 for (i = 1; i < 9; i++) 1652 for (i = 1; i < 9; i++)
1640 { 1653 {
1641 /* i bit 0: alters sign of offset 1654 /* i bit 0: alters sign of offset
1642 * other bits (i / 2): absolute value of offset 1655 * other bits (i / 2): absolute value of offset
1643 */ 1656 */
1644
1645 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1657 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1646 int tmpdir = absdir (op->direction + offset); 1658 int tmpdir = absdir (op->direction + offset);
1647 1659
1648 nx = op->x + freearr_x[tmpdir]; 1660 nx = op->x + freearr_x[tmpdir];
1649 ny = op->y + freearr_y[tmpdir]; 1661 ny = op->y + freearr_y[tmpdir];
… …
1651 { 1663 {
1652 dir = tmpdir; 1664 dir = tmpdir;
1653 break; 1665 break;
1654 } 1666 }
1655 } 1667 }
1668
1656 if (dir == 0) 1669 if (dir == 0)
1657 { 1670 {
1658 nx = op->x; 1671 nx = op->x;
1659 ny = op->y; 1672 ny = op->y;
1660 m = op->map; 1673 m = op->map;
… …
1730 int adjustdir; 1743 int adjustdir;
1731 maptile *m; 1744 maptile *m;
1732#endif 1745#endif
1733 object *owner = op->env; 1746 object *owner = op->env;
1734 1747
1748 if (!owner) // MUST not happen, remove when true TODO
1749 {
1750 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1751 op->destroy ();
1752 return;
1753 }
1754
1735 if (!op->duration || !owner->is_on_map ()) 1755 if (!op->duration || !owner->is_on_map ())
1736 { 1756 {
1737 op->destroy (); 1757 op->drop_and_destroy ();
1738 return; 1758 return;
1739 } 1759 }
1740 1760
1741 op->duration--; 1761 op->duration--;
1742 1762
1743 int basedir = op->direction; 1763 int basedir = op->direction;
1744 if (!basedir) 1764 if (!basedir)
1765 {
1745 /* spray in all directions! 8) */ 1766 /* spray in all directions! 8) */
1746 basedir = (op->facing += op->state) % 8 + 1; 1767 op->facing = (op->facing + op->state) & 7;
1768 basedir = op->facing + 1;
1769 }
1747 1770
1748#if 0 1771#if 0
1749 // this is bogus: it causes wrong places to be checked below 1772 // this is bogus: it causes wrong places to be checked below
1750 // (a wall 2 cells away will block the effect...) and 1773 // (a wall 2 cells away will block the effect...) and
1751 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1774 // doesn't work for SP_BULLET anyhow, so again tests the wrong
… …
1833{ 1856{
1834 if (!spell->other_arch) 1857 if (!spell->other_arch)
1835 return 0; 1858 return 0;
1836 1859
1837 object *tmp = archetype::get (SWARM_SPELL); 1860 object *tmp = archetype::get (SWARM_SPELL);
1861
1838 set_spell_skill (op, caster, spell, tmp); 1862 set_spell_skill (op, caster, spell, tmp);
1839 tmp->level = caster_level (caster, spell); /* needed later, to get level dep. right. */ 1863 tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */
1840 tmp->spell = spell->other_arch->instance (); 1864 tmp->spell = spell->other_arch->instance ();
1841 tmp->attacktype = tmp->spell->attacktype; 1865 tmp->attacktype = tmp->spell->attacktype;
1842 1866
1843 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1867 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1844 if (!tailor_god_spell (tmp, op)) 1868 if (!tailor_god_spell (tmp, op))
… …
1846 1870
1847 tmp->duration = SP_level_duration_adjust (caster, spell); 1871 tmp->duration = SP_level_duration_adjust (caster, spell);
1848 for (int i = 0; i < spell->duration; i++) 1872 for (int i = 0; i < spell->duration; i++)
1849 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1873 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1850 1874
1875 tmp->invisible = 1;
1876 tmp->flag [FLAG_NO_DROP] = 1; // make sure it stays in inv, or else
1851 tmp->direction = dir; 1877 tmp->direction = dir;
1852 tmp->invisible = 1;
1853 tmp->facing = rndm (1, 8); // initial firing direction 1878 tmp->facing = rndm (1, 8); // initial firing direction
1854 tmp->state = rndm (4) * 2 + 1; // direction increment 1879 tmp->state = rndm (4) * 2 + 1; // direction increment
1855 1880
1856 op->insert (tmp); 1881 op->insert (tmp);
1857 1882
… …
1869 int dam, mflags; 1894 int dam, mflags;
1870 maptile *m; 1895 maptile *m;
1871 1896
1872 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1897 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1873 1898
1874 if (!dir) 1899 if (dir)
1875 {
1876 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1877 return 0;
1878 } 1900 {
1879
1880 x = op->x + freearr_x[dir]; 1901 x = op->x + freearr_x[dir];
1881 y = op->y + freearr_y[dir]; 1902 y = op->y + freearr_y[dir];
1882 m = op->map; 1903 m = op->map;
1883 1904
1884 mflags = get_map_flags (m, &m, x, y, &x, &y); 1905 mflags = get_map_flags (m, &m, x, y, &x, &y);
1885 1906
1886 if (mflags & P_OUT_OF_MAP) 1907 if (mflags & P_OUT_OF_MAP)
1887 { 1908 {
1888 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1909 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1889 return 0; 1910 return 0;
1890 } 1911 }
1891 1912
1892 if (mflags & P_IS_ALIVE && spell->attacktype) 1913 if (mflags & P_IS_ALIVE && spell->attacktype)
1893 { 1914 {
1894 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1915 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1895 if (QUERY_FLAG (target, FLAG_MONSTER)) 1916 if (QUERY_FLAG (target, FLAG_MONSTER))
1896 { 1917 {
1897 /* oky doky. got a target monster. Lets make a blinding attack */ 1918 /* oky doky. got a target monster. Lets make a blinding attack */
1898 if (target->head) 1919 if (target->head)
1899 target = target->head; 1920 target = target->head;
1900 1921
1901 hit_player (target, dam, op, spell->attacktype, 1); 1922 hit_player (target, dam, op, spell->attacktype, 1);
1902 return 1; /* one success only! */ 1923 return 1; /* one success only! */
1924 }
1903 } 1925 }
1904 }
1905 1926
1906 /* no live target, perhaps a wall is in the way? */ 1927 /* no live target, perhaps a wall is in the way? */
1907 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1928 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1908 { 1929 {
1909 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1930 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1910 return 0; 1931 return 0;
1932 }
1911 } 1933 }
1912 1934
1913 /* ok, looks groovy to just insert a new light on the map */ 1935 /* ok, looks groovy to just insert a new light on the map */
1914 tmp = arch_to_object (spell->other_arch); 1936 tmp = arch_to_object (spell->other_arch);
1915 if (!tmp) 1937 if (!tmp)
1916 { 1938 {
1917 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1939 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1918 return 0; 1940 return 0;
1919 } 1941 }
1942
1920 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1943 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1944
1921 if (tmp->glow_radius) 1945 if (tmp->glow_radius)
1922 {
1923 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1946 tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell));
1924 if (tmp->glow_radius > MAX_LIGHT_RADII)
1925 tmp->glow_radius = MAX_LIGHT_RADII;
1926 }
1927 1947
1948 if (dir)
1928 m->insert (tmp, x, y, op); 1949 m->insert (tmp, x, y, op);
1950 else
1951 caster->outer_env ()->insert (tmp);
1952
1929 return 1; 1953 return 1;
1930} 1954}
1931 1955
1932/* cast_cause_disease: this spell looks along <dir> from the 1956/* cast_cause_disease: this spell looks along <dir> from the
1933 * player and infects someone. 1957 * player and infects someone.
… …
1986 object *disease = arch_to_object (spell->other_arch); 2010 object *disease = arch_to_object (spell->other_arch);
1987 2011
1988 disease->set_owner (op); 2012 disease->set_owner (op);
1989 set_spell_skill (op, caster, spell, disease); 2013 set_spell_skill (op, caster, spell, disease);
1990 disease->stats.exp = 0; 2014 disease->stats.exp = 0;
1991 disease->level = caster_level (caster, spell); 2015 disease->level = casting_level (caster, spell);
1992 2016
1993 /* do level adjustments */ 2017 /* do level adjustments */
1994 if (disease->stats.wc) 2018 if (disease->stats.wc)
1995 disease->stats.wc += dur_mod / 2; 2019 disease->stats.wc += dur_mod / 2;
1996 2020

Diff Legend

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