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.17 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.19 by root, Wed Dec 13 03:28:42 2006 UTC

140 140
141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
142 return; 142 return;
143 143
144 /* OK, we made a fork */ 144 /* OK, we made a fork */
145 new_bolt = object::create (); 145 new_bolt = tmp->clone ();
146 tmp->copy_to (new_bolt);
147 146
148 /* reduce chances of subsequent forking */ 147 /* reduce chances of subsequent forking */
149 new_bolt->stats.Dex -= 10; 148 new_bolt->stats.Dex -= 10;
150 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 149 tmp->stats.Dex -= 10; /* less forks from main bolt too */
151 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 150 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
249 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 248 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
250 return; 249 return;
251 } 250 }
252 else 251 else
253 { /* Create a copy of this object and put it ahead */ 252 { /* Create a copy of this object and put it ahead */
254 tmp = object::create (); 253 tmp = op->clone ();
255 op->copy_to (tmp); 254
256 tmp->speed_left = -0.1; 255 tmp->speed_left = -0.1;
257 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp); 256 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
258 tmp = insert_ob_in_map (tmp, op->map, op, 0); 257 tmp = insert_ob_in_map (tmp, op->map, op, 0);
259 /* To make up for the decrease at the top of the function */ 258 /* To make up for the decrease at the top of the function */
260 tmp->duration++; 259 tmp->duration++;
309 308
310 tmp->direction = dir; 309 tmp->direction = dir;
311 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 310 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
312 SET_ANIMATION (tmp, dir); 311 SET_ANIMATION (tmp, dir);
313 312
314 set_owner (tmp, op); 313 tmp->set_owner (op);
315 set_spell_skill (op, caster, spob, tmp); 314 set_spell_skill (op, caster, spob, tmp);
316 315
317 tmp->x = op->x + DIRX (tmp); 316 tmp->x = op->x + DIRX (tmp);
318 tmp->y = op->y + DIRY (tmp); 317 tmp->y = op->y + DIRY (tmp);
319 tmp->map = op->map; 318 tmp->map = op->map;
383 /* ok_to_put_more already does things like checks for walls, 382 /* ok_to_put_more already does things like checks for walls,
384 * out of map, etc. 383 * out of map, etc.
385 */ 384 */
386 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 385 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
387 { 386 {
388 tmp = object::create (); 387 tmp = op->clone ();
389 op->copy_to (tmp);
390 tmp->state = 0; 388 tmp->state = 0;
391 tmp->speed_left = -0.21; 389 tmp->speed_left = -0.21;
392 tmp->range--; 390 tmp->range--;
393 tmp->value = 0; 391 tmp->value = 0;
394 tmp->x = dx; 392 tmp->x = dx;
457 } 455 }
458 456
459 /* other_arch contains what this explodes into */ 457 /* other_arch contains what this explodes into */
460 tmp = arch_to_object (op->other_arch); 458 tmp = arch_to_object (op->other_arch);
461 459
462 copy_owner (tmp, op); 460 tmp->set_owner (op);
463 tmp->skill = op->skill; 461 tmp->skill = op->skill;
464 462
465 owner = get_owner (op); 463 owner = op->owner;
466 464
467 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 465 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
468 { 466 {
469 op->destroy (); 467 op->destroy ();
470 return; 468 return;
673 671
674 tmp->direction = dir; 672 tmp->direction = dir;
675 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 673 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
676 SET_ANIMATION (tmp, dir); 674 SET_ANIMATION (tmp, dir);
677 675
678 set_owner (tmp, op); 676 tmp->set_owner (op);
679 set_spell_skill (op, caster, spob, tmp); 677 set_spell_skill (op, caster, spob, tmp);
680 678
681 tmp->x = op->x + freearr_x[dir]; 679 tmp->x = op->x + freearr_x[dir];
682 tmp->y = op->y + freearr_y[dir]; 680 tmp->y = op->y + freearr_y[dir];
683 tmp->map = op->map; 681 tmp->map = op->map;
726 object *new_ob = arch_to_object (op->other_arch); 724 object *new_ob = arch_to_object (op->other_arch);
727 725
728 new_ob->x = op->x; 726 new_ob->x = op->x;
729 new_ob->y = op->y; 727 new_ob->y = op->y;
730 new_ob->level = op->level; 728 new_ob->level = op->level;
731 set_owner (new_ob, op->owner); 729 new_ob->set_owner (op->owner);
732 730
733 /* preserve skill ownership */ 731 /* preserve skill ownership */
734 if (op->skill && op->skill != new_ob->skill) 732 if (op->skill && op->skill != new_ob->skill)
735 { 733 {
736 new_ob->skill = op->skill; 734 new_ob->skill = op->skill;
765#if 0 763#if 0
766 /* Disable this - enabling it makes monsters easier, as 764 /* Disable this - enabling it makes monsters easier, as
767 * when their cone dies when they die. 765 * when their cone dies when they die.
768 */ 766 */
769 /* If no owner left, the spell dies out. */ 767 /* If no owner left, the spell dies out. */
770 if (get_owner (op) == NULL) 768 if (op->owner == NULL)
771 { 769 {
772 op->destroy (); 770 op->destroy ();
773 return; 771 return;
774 } 772 }
775#endif 773#endif
805 { 803 {
806 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 804 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
807 805
808 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 806 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
809 { 807 {
810 object *tmp = object::create (); 808 object *tmp = op->clone ();
811 809
812 op->copy_to (tmp);
813 tmp->x = x; 810 tmp->x = x;
814 tmp->y = y; 811 tmp->y = y;
815 812
816 tmp->duration = op->duration + 1; 813 tmp->duration = op->duration + 1;
817 814
901 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 898 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
902 continue; 899 continue;
903 900
904 success = 1; 901 success = 1;
905 tmp = arch_to_object (spell->other_arch); 902 tmp = arch_to_object (spell->other_arch);
906 set_owner (tmp, op); 903 tmp->set_owner (op);
907 set_spell_skill (op, caster, spell, tmp); 904 set_spell_skill (op, caster, spell, tmp);
908 tmp->level = caster_level (caster, spell); 905 tmp->level = caster_level (caster, spell);
909 tmp->x = sx; 906 tmp->x = sx;
910 tmp->y = sy; 907 tmp->y = sy;
911 tmp->attacktype = spell->attacktype; 908 tmp->attacktype = spell->attacktype;
1033 tmp->direction = i; 1030 tmp->direction = i;
1034 tmp->range = op->range; 1031 tmp->range = op->range;
1035 tmp->stats.dam = op->stats.dam; 1032 tmp->stats.dam = op->stats.dam;
1036 tmp->duration = op->duration; 1033 tmp->duration = op->duration;
1037 tmp->attacktype = op->attacktype; 1034 tmp->attacktype = op->attacktype;
1038 copy_owner (tmp, op); 1035 tmp->set_owner (op);
1039 if (op->skill && op->skill != tmp->skill) 1036 if (op->skill && op->skill != tmp->skill)
1040 { 1037 {
1041 tmp->skill = op->skill; 1038 tmp->skill = op->skill;
1042 } 1039 }
1043 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1040 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1073 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1070 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1074 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1071 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1075 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1072 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1076 tmp->attacktype = spell->attacktype; 1073 tmp->attacktype = spell->attacktype;
1077 1074
1078 set_owner (tmp, op); 1075 tmp->set_owner (op);
1079 set_spell_skill (op, caster, spell, tmp); 1076 set_spell_skill (op, caster, spell, tmp);
1080 tmp->x = dx; 1077 tmp->x = dx;
1081 tmp->y = dy; 1078 tmp->y = dy;
1082 insert_ob_in_map (tmp, m, op, 0); 1079 insert_ob_in_map (tmp, m, op, 0);
1083 return 1; 1080 return 1;
1227 { 1224 {
1228 /* how much woe to inflict :) */ 1225 /* how much woe to inflict :) */
1229 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1226 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1230 } 1227 }
1231 1228
1232 set_owner (effect, op); 1229 effect->set_owner (op);
1233 set_spell_skill (op, caster, spell, effect); 1230 set_spell_skill (op, caster, spell, effect);
1234 1231
1235 /* ok, tell it where to be, and insert! */ 1232 /* ok, tell it where to be, and insert! */
1236 effect->x = target->x; 1233 effect->x = target->x;
1237 effect->y = target->y; 1234 effect->y = target->y;
1261 { 1258 {
1262 op->destroy (); 1259 op->destroy ();
1263 return; 1260 return;
1264 } 1261 }
1265 1262
1266 owner = get_owner (op); 1263 owner = op->owner;
1267#if 0 1264#if 0
1268 /* It'd make things nastier if this wasn't here - spells cast by 1265 /* It'd make things nastier if this wasn't here - spells cast by
1269 * monster that are then killed would continue to survive 1266 * monster that are then killed would continue to survive
1270 */ 1267 */
1271 if (owner == NULL) 1268 if (owner == NULL)
1301 } 1298 }
1302 1299
1303 op->x = new_x; 1300 op->x = new_x;
1304 op->y = new_y; 1301 op->y = new_y;
1305 op->map = m; 1302 op->map = m;
1306 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1303 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1307 if (i > 0 && i != op->direction) 1304 if (i > 0 && i != op->direction)
1308 { 1305 {
1309 op->direction = i; 1306 op->direction = i;
1310 SET_ANIMATION (op, op->direction); 1307 SET_ANIMATION (op, op->direction);
1311 } 1308 }
1693 SET_FLAG (head, FLAG_FRIENDLY); 1690 SET_FLAG (head, FLAG_FRIENDLY);
1694 /* Prevent uncontolled outbreaks of self replicating monsters. 1691 /* Prevent uncontolled outbreaks of self replicating monsters.
1695 Typical use case is charm, go somwhere, use aggravation to make hostile. 1692 Typical use case is charm, go somwhere, use aggravation to make hostile.
1696 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1693 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1697 CLEAR_FLAG (head, FLAG_GENERATOR); 1694 CLEAR_FLAG (head, FLAG_GENERATOR);
1698 set_owner (head, op); 1695 head->set_owner (op);
1699 set_spell_skill (op, caster, spell, head); 1696 set_spell_skill (op, caster, spell, head);
1700 add_friendly_object (head); 1697 add_friendly_object (head);
1701 head->attack_movement = PETMOVE; 1698 head->attack_movement = PETMOVE;
1702 done_one = 1; 1699 done_one = 1;
1703 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1700 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1731 int i, j, dam_save, dir, mflags; 1728 int i, j, dam_save, dir, mflags;
1732 sint16 nx, ny, hx, hy; 1729 sint16 nx, ny, hx, hy;
1733 object *owner; 1730 object *owner;
1734 maptile *m; 1731 maptile *m;
1735 1732
1736 owner = get_owner (op); 1733 owner = op->owner;
1737 1734
1738 /* the following logic makes sure that the ball doesn't move into a wall, 1735 /* the following logic makes sure that the ball doesn't move into a wall,
1739 * and makes sure that it will move along a wall to try and get at it's 1736 * and makes sure that it will move along a wall to try and get at it's
1740 * victim. The block immediately below more or less chooses a random 1737 * victim. The block immediately below more or less chooses a random
1741 * offset to move the ball, eg, keep it mostly on course, with some 1738 * offset to move the ball, eg, keep it mostly on course, with some
1820 } 1817 }
1821 1818
1822 /* restore to the center location and damage */ 1819 /* restore to the center location and damage */
1823 op->stats.dam = dam_save; 1820 op->stats.dam = dam_save;
1824 1821
1825 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1822 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1826 1823
1827 if (i >= 0) 1824 if (i >= 0)
1828 { /* we have a preferred direction! */ 1825 { /* we have a preferred direction! */
1829 /* pick another direction if the preferred dir is blocked. */ 1826 /* pick another direction if the preferred dir is blocked. */
1830 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1827 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1856 maptile *m; 1853 maptile *m;
1857#endif 1854#endif
1858 int basedir; 1855 int basedir;
1859 object *owner; 1856 object *owner;
1860 1857
1861 owner = get_owner (op); 1858 owner = op->owner;
1862 if (op->duration == 0 || owner == NULL) 1859 if (op->duration == 0 || owner == NULL)
1863 { 1860 {
1864 op->destroy (); 1861 op->destroy ();
1865 return; 1862 return;
1866 } 1863 }
1971 return 0; 1968 return 0;
1972 1969
1973 tmp = get_archetype (SWARM_SPELL); 1970 tmp = get_archetype (SWARM_SPELL);
1974 tmp->x = op->x; 1971 tmp->x = op->x;
1975 tmp->y = op->y; 1972 tmp->y = op->y;
1976 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1973 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1977 set_spell_skill (op, caster, spell, tmp); 1974 set_spell_skill (op, caster, spell, tmp);
1978 1975
1979 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1976 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
1980 tmp->spell = arch_to_object (spell->other_arch); 1977 tmp->spell = arch_to_object (spell->other_arch);
1981 1978
2125 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2122 for (walk = get_map_ob (m, x, y); walk; walk = walk->above)
2126 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2123 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2127 { /* found a victim */ 2124 { /* found a victim */
2128 object *disease = arch_to_object (spell->other_arch); 2125 object *disease = arch_to_object (spell->other_arch);
2129 2126
2130 set_owner (disease, op); 2127 disease->set_owner (op);
2131 set_spell_skill (op, caster, spell, disease); 2128 set_spell_skill (op, caster, spell, disease);
2132 disease->stats.exp = 0; 2129 disease->stats.exp = 0;
2133 disease->level = caster_level (caster, spell); 2130 disease->level = caster_level (caster, spell);
2134 2131
2135 /* do level adjustments */ 2132 /* do level adjustments */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines